Date: Wed, 14 Jan 2015 01:56:43 +0000 From: bugzilla-noreply@freebsd.org To: freebsd-ports-bugs@FreeBSD.org Subject: [Bug 196534] mail/spampd: update to spampd-2.42(patched files) Message-ID: <bug-196534-13-mUZ41EMS28@https.bugs.freebsd.org/bugzilla/> In-Reply-To: <bug-196534-13@https.bugs.freebsd.org/bugzilla/> References: <bug-196534-13@https.bugs.freebsd.org/bugzilla/>
next in thread | previous in thread | raw e-mail | index | archive | help
https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=196534 --- Comment #1 from vfx9as@gmail.com --- attachment 151387(patched) diff -rcN spampd.org/Makefile spampd/Makefile *** spampd.org/Makefile Wed Mar 12 06:49:40 2014 --- spampd/Makefile Tue Jan 6 03:39:16 2015 *************** *** 2,11 **** # $FreeBSD: head/mail/spampd/Makefile 347936 2014-03-11 21:49:40Z adamw $ PORTNAME= spampd ! PORTVERSION= 2.30 ! PORTREVISION= 5 CATEGORIES= mail perl5 ! MASTER_SITES= http://www.worlddesign.com/Content/rd/mta/spampd/ MAINTAINER= ports@FreeBSD.org COMMENT= Spamassassin SMTP Proxy --- 2,16 ---- # $FreeBSD: head/mail/spampd/Makefile 347936 2014-03-11 21:49:40Z adamw $ PORTNAME= spampd ! PORTVERSION= 2.42 CATEGORIES= mail perl5 ! ! USE_GITHUB= yes ! GH_ACCOUNT= mpaperno ! GH_COMMIT= 17dae4a ! GH_PROJECT= ${PORTNAME} ! ! WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= Spamassassin SMTP Proxy *************** *** 16,25 **** NO_BUILD= yes PLIST_FILES= sbin/spampd USES= perl5 shebangfix ! SHEBANG_FILES= spampd USE_RC_SUBR= spampd do-install: ! @${INSTALL_SCRIPT} ${WRKSRC}/spampd ${STAGEDIR}${PREFIX}/sbin .include <bsd.port.mk> --- 21,31 ---- NO_BUILD= yes PLIST_FILES= sbin/spampd USES= perl5 shebangfix ! SHEBANG_FILES= spampd.pl USE_RC_SUBR= spampd do-install: ! @${INSTALL_SCRIPT} ${WRKSRC}/spampd.pl \ ! ${STAGEDIR}${PREFIX}/sbin/spampd .include <bsd.port.mk> diff -rcN spampd.org/distinfo spampd/distinfo *** spampd.org/distinfo Thu Jan 23 00:30:13 2014 --- spampd/distinfo Tue Jan 6 01:02:56 2015 *************** *** 1,2 **** ! SHA256 (spampd-2.30.tar.gz) = 6885544f4d1b339ebe3ad58068434397280a6526f682e78f7d0246aef6a09979 ! SIZE (spampd-2.30.tar.gz) = 25001 --- 1,3 ---- ! SHA256 (spampd-2.42.tar.gz) = c6dcef8df0c471b3982e777bcccfe343f1f6f921113c2b369a76144724b1d15d ! SIZE (spampd-2.42.tar.gz) = 202504 ! diff -rcN spampd.org/files/patch-setsid spampd/files/patch-setsid *** spampd.org/files/patch-setsid Thu Jan 23 02:40:44 2014 --- spampd/files/patch-setsid Thu Jan 1 09:00:00 1970 *************** *** 1,11 **** - --- spampd.orig Mon Nov 29 16:34:40 2004 - +++ spampd Mon Nov 29 16:34:50 2004 - @@ -825,7 +825,7 @@ - syslog_ident => 'spampd', - syslog_facility => 'mail', - background => $background, - - # setsid => 1, - + setsid => 1, - pid_file => $pidfile, - user => $user, - group => $group, --- 0 ---- diff -rcN spampd.org/files/patch-spampd.pl spampd/files/patch-spampd.pl *** spampd.org/files/patch-spampd.pl Thu Jan 1 09:00:00 1970 --- spampd/files/patch-spampd.pl Tue Jan 6 03:28:11 2015 *************** *** 0 **** --- 1,29 ---- + *** spampd.pl.org Tue Jan 6 03:22:56 2015 + --- spampd.pl Tue Jan 6 03:22:14 2015 + *************** + *** 912,917 **** + --- 912,918 ---- + my $sa_options = { + 'dont_copy_prefs' => 1, + 'debug' => $debug, + + 'user_dir' => (getpwnam($user))[7], + 'local_tests_only' => $options{'local-only'} || 0, + 'home_dir_for_helpers' => $sa_home_dir, + 'userstate_dir' => $sa_home_dir, + *************** + *** 961,967 **** + syslog_ident => 'spampd', + syslog_facility => 'mail', + background => $background, + ! # setsid => 1, + pid_file => $pidfile, + user => $user, + group => $group, + --- 962,968 ---- + syslog_ident => 'spampd', + syslog_facility => 'mail', + background => $background, + ! setsid => 1, + pid_file => $pidfile, + user => $user, + group => $group, diff -rcN spampd.org/files/patch-user_dir spampd/files/patch-user_dir *** spampd.org/files/patch-user_dir Thu Jan 23 02:40:44 2014 --- spampd/files/patch-user_dir Thu Jan 1 09:00:00 1970 *************** *** 1,10 **** - --- spampd.orig Thu Dec 8 09:54:07 2005 - +++ spampd Thu Dec 8 09:54:07 2005 - @@ -793,6 +793,7 @@ - my $assassin = Mail::SpamAssassin->new({ - 'dont_copy_prefs' => 1, - 'debug' => $debug, - + 'user_dir' => (getpwnam($user))[7], - 'local_tests_only' => $options{'local-only'} || 0 }); - - $options{'auto-whitelist'} and eval { --- 0 ---- -- You are receiving this mail because: You are the assignee for the bug.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?bug-196534-13-mUZ41EMS28>