Ping
On Sun, Dec 23, 2018 at 01:25:14PM +0100, Henrik Friedrichsen wrote:
> Pretty simple update.
>
> The previously required Net::Server's HUP handling patch is now upstream.
>
> OK?
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/mail/spampd/Makefile,v
> retrieving revision 1.8
> diff -u -p -r1.8 Makefile
> --- Makefile 24 Aug 2018 19:16:36 -0000 1.8
> +++ Makefile 23 Dec 2018 12:23:46 -0000
> @@ -4,7 +4,7 @@ COMMENT= SMTP/LMTP proxy for Spamassass
>
> GH_ACCOUNT= mpaperno
> GH_PROJECT= spampd
> -GH_TAGNAME= 2.51
> +GH_TAGNAME= 2.52
>
> CATEGORIES= mail
>
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/mail/spampd/distinfo,v
> retrieving revision 1.2
> diff -u -p -r1.2 distinfo
> --- distinfo 24 Aug 2018 19:16:36 -0000 1.2
> +++ distinfo 23 Dec 2018 12:23:46 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (spampd-2.51.tar.gz) = k8w+8Z7P8iSsAPbHoOAo8Fnsg5cDMp9FZ4RrdQlkrAc=
> -SIZE (spampd-2.51.tar.gz) = 215462
> +SHA256 (spampd-2.52.tar.gz) = K6Jh2QW0U+q15OgsJyaxCMnoLiNy6/wwl1jBKWQA4Xo=
> +SIZE (spampd-2.52.tar.gz) = 217711
> Index: patches/patch-spampd_pl
> ===================================================================
> RCS file: /cvs/ports/mail/spampd/patches/patch-spampd_pl,v
> retrieving revision 1.1
> diff -u -p -r1.1 patch-spampd_pl
> --- patches/patch-spampd_pl 24 Aug 2018 19:16:36 -0000 1.1
> +++ patches/patch-spampd_pl 23 Dec 2018 12:23:46 -0000
> @@ -1,55 +1,41 @@
> -$OpenBSD: patch-spampd_pl,v 1.1 2018/08/24 19:16:36 sthen Exp $
> +$OpenBSD$
>
> Index: spampd.pl
> --- spampd.pl.orig
> +++ spampd.pl
> -@@ -798,7 +798,13 @@ sub mylog($$$) {
> - $self->log($level, $msg);
> - }
> -
> -+# Override Net::Server's HUP handling - just gracefully restart all the
> children.
> -+sub sig_hup {
> -+ my $self = shift;
> -+ $self->hup_children;
> -+}
> -
> -+
> - ################## SETUP ######################
> -
> -
> -@@ -816,8 +822,8 @@ my $childtimeout = 6*60; # child process per-command t
> - my $satimeout = 285; # SpamAssassin timeout in seconds (15s less than
> Postfix
> - # default for smtp_data_done_timeout)
> - my $pidfile = '/var/run/spampd.pid'; # write pid to file
> --my $user = 'mail'; # user to run as
> --my $group = 'mail'; # group to run as
> -+my $user = '_spampd'; # user to run as
> -+my $group = '_spampd'; # group to run as
> - my $tagall = 0; # mark-up all msgs with SA, not just spam
> - my $maxsize = 64; # max. msg size to scan with SA, in KB.
> - my $rh = 0; # log which rules were hit
> -@@ -1078,9 +1084,9 @@ Options:
> +@@ -772,8 +772,8 @@ my $childtimeout = 6 * 60;
> + my $satimeout = 285; # SpamAssassin
> timeout in seconds (15s less than Postfix
> + # default for
> smtp_data_done_timeout)
> + my $pidfile = '/var/run/spampd.pid'; # write pid to file
> +-my $user = 'mail'; # user to run as
> +-my $group = 'mail'; # group to run as
> ++my $user = '_spampd'; # user to run as
> ++my $group = '_spampd'; # group to run as
> + my $tagall = 0; # mark-up all msgs
> with SA, not just spam
> + my $maxsize = 64; # max. msg size to
> scan with SA, in KB.
> + my $rh = 0; # log which rules
> were hit
> +@@ -995,9 +995,9 @@ Options:
> --pid=filename Store the daemon's process ID in this file.
> - Default is /var/run/spampd.pid
> + or -p filename Default is /var/run/spampd.pid
> --user=username Specifies the user that the daemon runs as.
> -- Default is mail.
> -+ Default is _spampd.
> +- or -u username Default is mail.
> ++ or -u username Default is _spampd.
> --group=groupname Specifies the group that the daemon runs as.
> -- Default is mail.
> -+ Default is _spampd.
> +- or -g groupname Default is mail.
> ++ or -g groupname Default is _spampd.
> +
> --nodetach Don't detach from the console and fork into
> - background. Useful for some daemon control
> - tools or when running as a win32 service
> -@@ -1414,7 +1420,7 @@ Spevifies what UNIX socket spampd will relay to. If th
> - =item B<--group=groupname> or B<--g=groupname>
> + background. Useful for some daemon control
> +@@ -1334,7 +1334,7 @@ Specifies what UNIX socket spampd will relay to. If th
> + =item B<--group=groupname> or B<-g=groupname>
>
> - Specifies the user and group that the proxy will run as. Default is
> + Specifies the user and/or group that the proxy will run as. Default is
> -I<mail>/I<mail>.
> +I<_spampd>/I<_spampd>.
>
> - =item B<--children=n> or B<--c=n>
> + =item B<--children=n> or B<-c=n>
>
> -@@ -1553,7 +1559,7 @@ Things like the auto-whitelist and other plugin (razor
> +@@ -1479,7 +1479,7 @@ Things like the auto-whitelist and other plugin (razor
> written to here.
> Defaul is /var/spool/spamassassin/spampd. A good place for this is in the
> same
> place your bayes_path SA config setting points to (if any). Make sure this
> Index: pkg/PLIST
> ===================================================================
> RCS file: /cvs/ports/mail/spampd/pkg/PLIST,v
> retrieving revision 1.2
> diff -u -p -r1.2 PLIST
> --- pkg/PLIST 29 Nov 2014 10:18:48 -0000 1.2
> +++ pkg/PLIST 23 Dec 2018 12:23:46 -0000
> @@ -1,13 +1,11 @@
> @comment $OpenBSD: PLIST,v 1.2 2014/11/29 10:18:48 ajacoutot Exp $
> -@comment homedir needed to store the .spamassassin bayes DB
> @newgroup _spampd:746
> @newuser _spampd:746:_spampd:daemon:spampd user:/var/spampd:/sbin/nologin
> +@comment homedir needed to store the .spamassassin bayes DB
> @extraunexec rm -rf /var/spampd/.spamassassin
> +@rcscript ${RCDIR}/spampd
> @man man/man8/spampd.8
> sbin/spampd
> @owner _spampd
> @group _spampd
> @sample /var/spampd/
> -@owner
> -@group
> -@rcscript ${RCDIR}/spampd
