From: William Thomson Date: Sun, 14 Jan 2007 18:16:20 +0000 (+0000) Subject: Reverted back to fowner/fperms due to access violations during re-emering. Bumped... X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=42f65d66f2e8111db37ee4be1fd14be57d500440;p=gentoo.git Reverted back to fowner/fperms due to access violations during re-emering. Bumped package to latest versions via contributions from ovaron2, thank you. Package-Manager: portage-2.1.2_rc4-r6 --- diff --git a/mail-filter/assp/ChangeLog b/mail-filter/assp/ChangeLog index ada7b16c4196..1862b8b03618 100644 --- a/mail-filter/assp/ChangeLog +++ b/mail-filter/assp/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for mail-filter/assp # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/mail-filter/assp/ChangeLog,v 1.7 2007/01/10 17:08:48 wltjr Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-filter/assp/ChangeLog,v 1.8 2007/01/14 18:16:20 wltjr Exp $ + +*assp-1.2.6 (14 Jan 2007) + + 14 Jan 2007; William L. Thomson Jr. + +files/assp-1.2.6.patch, assp-1.2.5-r5.ebuild, +assp-1.2.6.ebuild: + Reverted back to fowner/fperms due to access violations during re-emering. + Bumped package to latest versions via contributions from ovaron2, thank you. *assp-1.2.5-r5 (10 Jan 2007) diff --git a/mail-filter/assp/Manifest b/mail-filter/assp/Manifest index 9e50c8a4a8c2..96297fd2c5a1 100644 --- a/mail-filter/assp/Manifest +++ b/mail-filter/assp/Manifest @@ -2,19 +2,28 @@ AUX assp-1.2.5.patch 11949 RMD160 d55dd566ea2af6fd7ee2f24226b1cb4cb1995335 SHA1 MD5 ad064d8872bf51d35074350d0f4a663c files/assp-1.2.5.patch 11949 RMD160 d55dd566ea2af6fd7ee2f24226b1cb4cb1995335 files/assp-1.2.5.patch 11949 SHA256 5471e110974fceb3c4429f7570c8d024510985c684f399ece76a9012dde0da58 files/assp-1.2.5.patch 11949 +AUX assp-1.2.6.patch 16401 RMD160 7ea2e37d6cff8b40cda604e400f3d85a745a86ac SHA1 7cee8a6b41f68f17c8466f083a66cee6d35810a7 SHA256 f4dcd2c0a5aa5c66d9a2f23a56c7bcba931c3ffe0c747c257f90b2c58736e185 +MD5 f33ecf1d9d1d11ea8bcdb2319c77066c files/assp-1.2.6.patch 16401 +RMD160 7ea2e37d6cff8b40cda604e400f3d85a745a86ac files/assp-1.2.6.patch 16401 +SHA256 f4dcd2c0a5aa5c66d9a2f23a56c7bcba931c3ffe0c747c257f90b2c58736e185 files/assp-1.2.6.patch 16401 AUX asspd.init 657 RMD160 066f56f95cd7177c669cb4db993401c5f164f16e SHA1 218b1d1d566d7a1f3d340c3a2266c38457878d88 SHA256 4ec543f7c2f006d80dcb592d50f44a41e8aa2cd449f65a6e1cd53996e67b2fde MD5 67bc4fa59ed71fe1f93e2fb365ed74ab files/asspd.init 657 RMD160 066f56f95cd7177c669cb4db993401c5f164f16e files/asspd.init 657 SHA256 4ec543f7c2f006d80dcb592d50f44a41e8aa2cd449f65a6e1cd53996e67b2fde files/asspd.init 657 DIST ASSP_1.2.5-Install.zip 244225 RMD160 748798f39918e6519be755d8e44a288fc82d636c SHA1 8060e36e81d58fab76c4eddab136428e0cbf3555 SHA256 282325e0434ef8554fe281a2b25267fde99254ea83bc7073c2acfbc47c2d31af -EBUILD assp-1.2.5-r5.ebuild 2646 RMD160 11c66b6f447b6131580e5a3c3853183f47aaf116 SHA1 d75658326e221bb225affb5596bdec035a87563e SHA256 d65fc374a6009c0e63c9a15c462bbb038d151e155e2613c5e09d10b8777f907c -MD5 89fc53114420b38f3a2283b3e79d5e76 assp-1.2.5-r5.ebuild 2646 -RMD160 11c66b6f447b6131580e5a3c3853183f47aaf116 assp-1.2.5-r5.ebuild 2646 -SHA256 d65fc374a6009c0e63c9a15c462bbb038d151e155e2613c5e09d10b8777f907c assp-1.2.5-r5.ebuild 2646 -MISC ChangeLog 1943 RMD160 2f75c010090603713d0db6a19b53df6a3bf9b466 SHA1 9ef1e65b0a64a10265f788cdc900101f296d9927 SHA256 df3b9a5fd16db1a6734eeb1e099b97d19d61ec017d0e73b8baaf96f1e91b4e9d -MD5 8c51767a49ccb59cfbd4e6468be004fc ChangeLog 1943 -RMD160 2f75c010090603713d0db6a19b53df6a3bf9b466 ChangeLog 1943 -SHA256 df3b9a5fd16db1a6734eeb1e099b97d19d61ec017d0e73b8baaf96f1e91b4e9d ChangeLog 1943 +DIST ASSP_1.2.6-Install.zip 245745 RMD160 35b7808ef6cd8819e0c29d147c42fc409d69e540 SHA1 1eccc893a29798355746007afcbf02c09c5d0a53 SHA256 0eea1a645305c16916593fb3e2580401122de5f7c36534e2200df36766aca3fd +EBUILD assp-1.2.5-r5.ebuild 2661 RMD160 061d67742dd60173de66b2f3b33233def996652f SHA1 153c128e6006968b96c17ef0018593e56fa4b80c SHA256 ee0c7d57f09836d72949ad54324c607cf9f15c824304b6f69caf09b60cc19376 +MD5 51f0b20f95b2d36a43f1947e89593e36 assp-1.2.5-r5.ebuild 2661 +RMD160 061d67742dd60173de66b2f3b33233def996652f assp-1.2.5-r5.ebuild 2661 +SHA256 ee0c7d57f09836d72949ad54324c607cf9f15c824304b6f69caf09b60cc19376 assp-1.2.5-r5.ebuild 2661 +EBUILD assp-1.2.6.ebuild 2704 RMD160 11c5cffb74ac4d60f9b14b42effed3a1814a8690 SHA1 156cccb8e1e58f903781d559a7b0cb50b7898cf4 SHA256 da05516e909c3a9835e4666e363764466990ba802fda938aff73e77afe73ce71 +MD5 7a547228ac1660a8b9ca129b89efdbf2 assp-1.2.6.ebuild 2704 +RMD160 11c5cffb74ac4d60f9b14b42effed3a1814a8690 assp-1.2.6.ebuild 2704 +SHA256 da05516e909c3a9835e4666e363764466990ba802fda938aff73e77afe73ce71 assp-1.2.6.ebuild 2704 +MISC ChangeLog 2253 RMD160 06ec6dfd74625923bd2009e57cbca63ab9835b00 SHA1 a43355096cc829aae91343e0c97e3002f78f4fa6 SHA256 949d929c6b001e4ce676e5b29f36cc8ce87b3b90224c23339f6287dd2674edf6 +MD5 b1e7675c5122dee8f53fde4482c9c444 ChangeLog 2253 +RMD160 06ec6dfd74625923bd2009e57cbca63ab9835b00 ChangeLog 2253 +SHA256 949d929c6b001e4ce676e5b29f36cc8ce87b3b90224c23339f6287dd2674edf6 ChangeLog 2253 MISC metadata.xml 808 RMD160 dc6fd8b7e0ae86eb40342064e3820cd8fbd83193 SHA1 c24f1667c370bfff799a6289bcdafc06b405f8ec SHA256 b33778bfaa6a4537f5e5ea54bee8641126c9655505b26c85cc11a91cc288b5a6 MD5 31d7bb0d82eeb1c4fde76228f3d71a8d metadata.xml 808 RMD160 dc6fd8b7e0ae86eb40342064e3820cd8fbd83193 metadata.xml 808 @@ -22,3 +31,6 @@ SHA256 b33778bfaa6a4537f5e5ea54bee8641126c9655505b26c85cc11a91cc288b5a6 metadata MD5 24d9ce96160cb290c6872107dc5b6928 files/digest-assp-1.2.5-r5 247 RMD160 5eb32c5a2e77a2e5b0e74aaaa95059be0e0d6f85 files/digest-assp-1.2.5-r5 247 SHA256 8829c42c614f1cdf2569938d0d02d82300c4acb6dccb999aafd400ae23461656 files/digest-assp-1.2.5-r5 247 +MD5 397e3a17bf5a7aa227a56ae5b949e5a1 files/digest-assp-1.2.6 247 +RMD160 62ff070b13b038c5bfaf31b579a0e64e585d79da files/digest-assp-1.2.6 247 +SHA256 020336ad57d85e5c03a76dbbc5c041ee345f51ad0ec4ea015671215ec1adc512 files/digest-assp-1.2.6 247 diff --git a/mail-filter/assp/assp-1.2.5-r5.ebuild b/mail-filter/assp/assp-1.2.5-r5.ebuild index edf4386a56ae..522e016a2c2a 100644 --- a/mail-filter/assp/assp-1.2.5-r5.ebuild +++ b/mail-filter/assp/assp-1.2.5-r5.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/mail-filter/assp/assp-1.2.5-r5.ebuild,v 1.1 2007/01/10 17:08:48 wltjr Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-filter/assp/assp-1.2.5-r5.ebuild,v 1.2 2007/01/14 18:16:20 wltjr Exp $ inherit eutils @@ -62,8 +62,8 @@ src_unpack() { src_install() { # Configuration directory dodir /etc/assp - chown assp:assp /etc/assp - chmod 770 /etc/assp + fowners assp:assp /etc/assp + fperms 770 /etc/assp # Setup directories for mail to be stored for filter keepdir /var/lib/assp/spam /var/lib/assp/notspam @@ -71,8 +71,8 @@ src_install() { # Logs directory keepdir /var/log/assp - chown assp:assp -R /var/log/assp - chmod 770 /var/log/assp + fowners assp:assp -R /var/log/assp + fperms 770 /var/log/assp # Install the app exeinto /usr/share/assp @@ -83,18 +83,18 @@ src_install() { doins *.txt *.sav # Lock down the files/data - chown assp:assp -R /usr/share/assp - chmod 770 /usr/share/assp + fowners assp:assp -R /usr/share/assp + fperms 770 /usr/share/assp # Data storage - chown assp:assp -R /var/lib/assp - chmod 770 /var/lib/assp + fowners assp:assp -R /var/lib/assp + fperms 770 /var/lib/assp # PID directory dodir /var/run/assp keepdir /var/run/assp - chown assp:assp -R /var/run/assp - chmod 770 /var/run/assp + fowners assp:assp -R /var/run/assp + fperms 770 /var/run/assp # Install the init.d script to listen newinitd "${FILESDIR}/asspd.init" asspd diff --git a/mail-filter/assp/assp-1.2.6.ebuild b/mail-filter/assp/assp-1.2.6.ebuild new file mode 100644 index 000000000000..9eb05d2c9d88 --- /dev/null +++ b/mail-filter/assp/assp-1.2.6.ebuild @@ -0,0 +1,126 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/mail-filter/assp/assp-1.2.6.ebuild,v 1.1 2007/01/14 18:16:20 wltjr Exp $ + +inherit eutils + +DESCRIPTION="Anti-Spam SMTP Proxy written in Perl." +HOMEPAGE="http://assp.sourceforge.net/" +MY_PN=ASSP +SRC_URI="mirror://sourceforge/${PN}/${MY_PN}_${PV}-Install.zip" +LICENSE="GPL-2" +SLOT="0" + +KEYWORDS="~amd64 ~x86" + +IUSE="ldap spf srs" + +DEPEND="app-arch/unzip" + +RDEPEND="dev-lang/perl + dev-perl/Net-DNS + dev-perl/File-ReadBackwards + dev-perl/Compress-Zlib + dev-perl/Email-Valid + virtual/perl-Digest-MD5 + virtual/perl-Time-HiRes + spf? ( dev-perl/Mail-SPF-Query ) + srs? ( dev-perl/Mail-SRS ) + ldap? ( dev-perl/perl-ldap )" + +S=${WORKDIR}/${MY_PN} + +pkg_setup() { + enewgroup assp + enewuser assp -1 -1 /dev/null assp +} + +src_unpack() { + unpack ${A} + cd "${S}" + + local FILES=" + assp.pl + freshclam.sh + move2num.pl + rebuildspamdb.pl + repair.pl + stats.sh + stat.pl + " + # just being safe + for file in ${FILES}; do + edos2unix ${file} + done + + # patch is against unix-format, so patch after dos2unix + epatch ${FILESDIR}/assp-${PV}.patch + + # remove windows stuff + rm "${S}/addservice.pl" + rm -f "${S}/Win32-quickstart-guide.txt" +} + +src_install() { + # Configuration directory + dodir /etc/assp + + insinto /etc/assp + doins nodelay.txt + + fowners assp:assp /etc/assp -R + fperms 770 /etc/assp + + # Setup directories for mail to be stored for filter + keepdir /var/lib/assp/spam /var/lib/assp/notspam + keepdir /var/lib/assp/errors/spam /var/lib/assp/errors/notspam + + # Logs directory + keepdir /var/log/assp + fowners assp:assp -R /var/log/assp + fperms 770 /var/log/assp + + # Install the app + exeinto /usr/share/assp + doexe *.pl *.sh + insinto /usr/share/assp + doins -r images/ + + insinto /usr/share/assp + doins *.txt + + # Lock down the files/data + fowners assp:assp -R /usr/share/assp + fperms 770 /usr/share/assp + + # Data storage + fowners assp:assp -R /var/lib/assp + fperms 770 /var/lib/assp + + # PID directory + dodir /var/run/assp + keepdir /var/run/assp + fowners assp:assp -R /var/run/assp + fperms 770 /var/run/assp + + # Install the init.d script to listen + newinitd "${FILESDIR}/asspd.init" asspd + + dohtml *.htm +} + +pkg_postinst() { + elog + elog "To configure ASSP, start /etc/init.d/asspd then point" + elog "your browser to http://localhost:55555" + elog "Username: admin Password: nospam4me (CHANGE ASAP!)" + elog + elog "File permissions have been set to use assp:assp" + elog "with mode 770 on directories. When you configure" + elog "ASSP, make sure and use the user assp." + elog + elog "Don't change any path related options." + elog + elog "See the on-line docs for a complete tutorial." + elog +} diff --git a/mail-filter/assp/files/assp-1.2.6.patch b/mail-filter/assp/files/assp-1.2.6.patch new file mode 100644 index 000000000000..e985bbe7ced9 --- /dev/null +++ b/mail-filter/assp/files/assp-1.2.6.patch @@ -0,0 +1,346 @@ +diff -Naur assporg/ASSP/assp.pl x/ASSP/assp.pl +--- assporg/ASSP/assp.pl 2007-01-13 13:17:58.000000000 +0100 ++++ x/ASSP/assp.pl 2007-01-13 15:01:24.000000000 +0100 +@@ -52,13 +52,10 @@ + if($ARGV[0]) { + $base=$ARGV[0]; + } else { +- # the last one is the one used if all else fails +- foreach ('.','assp','/usr/local/assp','/home/assp','/usr/assp','/applications/assp','/assp','.') { +- $base=$_; +- last if -e "$base/assp.cfg"; ++ $base='/etc/assp/'; + } +-} +-if ( !-e "$base/images/noIcon.png") ++ ++if ( !-e "/usr/share/assp/images/noIcon.png") + { die "Abort: folder 'images' not correctly installed";} + + loadConfig(); +@@ -86,7 +83,7 @@ + 'The address:port of your message handling system\'s smtp server. If only the port is entered, or the keyword __INBOUND__:port is used, then the connection will be established to the same IP where the connection was received. This is usefull when you have several IPs with different domains/profiles in your MTA.
Examples: "127.0.0.1:125","127.0.0.1:125|127.0.0.5:125", "10.0.1.3", "10.0.1.3:1025", "__INBOUND__:125", "125", etc.'], + [AsAService,'As a Service',0,checkbox,0,'(.*)',undef, + 'In Windows 2000 / NT you can run it as a service; requires win32::daemon. Requires start from the service control panel.'], +-[AsADaemon,'As a Daemon',0,checkbox,0,'(.*)',undef, ++[AsADaemon,'As a Daemon',0,checkbox,1,'(.*)',undef, + 'In Linux/BSD/Unix/OSX fork and close file handles, kinda like "perl assp.pl &" but better. Requires restart.'], + [myName,'My Name',40,textinput,'ASSP.nospam','(\S+)',undef, + 'What the program calls itself in the email "received by" header. Usually ASSP.nospam.'], +@@ -912,10 +909,10 @@ + 'This user must have CREATE privilege on database to create tables + automatically'], + [mypassword,'MySQL password',40,textinput,'','(\S*)',undef,''], +-[logfile,'ASSP Logfile',40,textinput,'maillog.txt','(\S*)',ConfigChangeLogfile, ++[logfile,'ASSP Logfile',40,textinput,'/var/log/assp/maillog.txt','(\S*)',ConfigChangeLogfile, + 'Blank if you don\'t want a log file. Change it to maillog.log if you don\'t want auto rollover. + NOTE: Changing this field requires restarting ASSP before changes take effect.'], +-[pidfile,'PID File',40,textinput,'pid','(\S*)',undef,'Blank to skip writing a pid file. *nix users need pid files. ++[pidfile,'PID File',40,textinput,'asspd.pid','(\S*)',undef,'Blank to skip writing a pid file. *nix users need pid files. + Leave it blank in Windows.
You have to restart the service before you get a pid file in the new location.
+
Notes On File Path
+ +@@ -979,9 +976,9 @@ + '], + + [0,0,0,'heading','Security'], +-[runAsUser,'Run as UID',20,textinput,'nobody','(\S*)',undef, ++[runAsUser,'Run as UID',20,textinput,'assp','(\S*)',undef, + 'The *nix user name to assume after startup: assp or nobody -- requires ASSP restart.'], +-[runAsGroup,'Run as GID',20,textinput,'nobody','(\S*)',undef, ++[runAsGroup,'Run as GID',20,textinput,'assp','(\S*)',undef, + 'The *nix group to assume after startup: assp or nogroup -- requires ASSP restart.'], + [ChangeRoot,'Change Root',40,textinput,'','(.*)',undef, + 'Non-blank means to run in chroot jail in *nix. You need an etc/protocols file to make this work
+@@ -1106,7 +1103,7 @@ + } + } + # load configuration file +- open(F,"<$base/assp.cfg"); local $/; (%Config)=split(/:=|\n/,); close F; ++ open(F,"); close F; + # set nonexistent settings to default values + foreach $c (@Config) { + if ($c->[0] && !(exists $Config{$c->[0]})) { +@@ -1446,19 +1443,19 @@ + $silent=1; + } + +-if($pidfile) {open(F,">$base/$pidfile"); print F $$; close F;} ++if($pidfile) {open(F,">/var/run/assp/$pidfile"); print F $$; close F;} + + sub RemovePid { + if ($pidfile) { + d('RemovePid'); +- unlink("$base/$pidfile"); ++ unlink("/var/run/assp/$pidfile"); + } + } + + if($DEBUG) {open(DEBUG, ">$base/".time.".dbg"); binmode(DEBUG); my $oldfh = select(DEBUG); $| = 1; select($oldfh);} + my $logdir = $1 if $logfile=~/(.*)\/.*/; +- mkdir "$base/$logdir",0777 if $logdir; +-if($logfile && open(LOG,">>$base/$logfile")) {my $oldfh = select(LOG); $| = 1; select($oldfh);} ++ mkdir "$logdir",0777 if $logdir; ++if($logfile && open(LOG,">>$logfile")) {my $oldfh = select(LOG); $| = 1; select($oldfh);} + + if($AsAService) { + eval(<<'EOT'); +@@ -1652,16 +1649,16 @@ + -d "$base/$correctednotspam" or mkdir "$base/$correctednotspam",0700; + my $pbdir = $1 if $pbdb=~/(.*)\/.*/; + mkdir "$base/$pbdir",0700 if $pbdir; +- -d "$base/notes" or mkdir "$base/notes",0700; +- if ( !-e "$base/reports/whitereport.txt") { +- -d "$base/reports" or mkdir "$base/reports",0700; +- copy("whitereport.txt", "reports/whitereport.txt"); +- copy("whiteremovereport.txt", "reports/whiteremovereport.txt"); +- copy("redreport.txt", "reports/redreport.txt"); +- copy("redremovereport.txt", "reports/redremovereport.txt"); +- copy("helpreport.txt", "reports/helpreport.txt"); +- copy("notspamreport.txt", "reports/notspamreport.txt"); +- copy("spamreport.txt", "reports/spamreport.txt"); ++ -d "/etc/assp/notes" or mkdir "/etc/assp/notes",0700; ++ if ( !-e "/etc/assp/reports/whitereport.txt") { ++ -d "/etc/assp/reports" or mkdir "/etc/assp/reports",0700; ++ copy("/usr/share/assp/whitereport.txt", "/etc/assp/reports/whitereport.txt"); ++ copy("/usr/share/assp/whiteremovereport.txt", "/etc/assp/reports/whiteremovereport.txt"); ++ copy("/usr/share/assp/redreport.txt", "/etc/assp/reports/redreport.txt"); ++ copy("/usr/share/assp/redremovereport.txt", "/etc/assp/reports/redremovereport.txt"); ++ copy("/usr/share/assp/helpreport.txt", "/etc/assp/reports/helpreport.txt"); ++ copy("/usr/share/assp/notspamreport.txt", "/etc/assp/reports/notspamreport.txt"); ++ copy("/usr/share/assp/spamreport.txt", "/etc/assp/reports/spamreport.txt"); + } + + +@@ -2073,7 +2070,7 @@ + # roll log every $LogRollDays days, at midnight + my $t=int((time()+Time::Local::timelocal(localtime())-Time::Local::timelocal(gmtime()))/($LogRollDays*24*3600)); + +- if($logfile && $mlogLastT && $t != $mlogLastT && $logfile ne "maillog.log" && $asspLog) { ++ if($logfile && $mlogLastT && $t != $mlogLastT && $logfile ne "/var/log/assp/maillog.log" && $asspLog) { + # roll the log + + my ($sec,$min,$hour,$mday,$mon,$year) = localtime(time); +@@ -2084,7 +2081,7 @@ + if (!$logdir) { + $archivelogfile = "$mm.$logfile"; + } else { +- mkdir "$base/$logdir",0777; ++ mkdir "$logdir",0777; + $archivelogfile = "$logdir/$mm.$logdirfile"; + } + my $msg="$m: Rolling log file -- archive saved as '$archivelogfile'\n"; +@@ -2092,8 +2089,8 @@ + print $msg unless $silent; + + close LOG; +- rename("$base/$logfile", "$base/$archivelogfile"); +- if(open(LOG,">>$base/$logfile")) {my $oldfh = select(LOG); $| = 1; select($oldfh);} ++ rename("$logfile", "$archivelogfile"); ++ if(open(LOG,">>$logfile")) {my $oldfh = select(LOG); $| = 1; select($oldfh);} + print LOG "$m new log file -- old log file renamed to '$archivelogfile'\n"; + SaveConfig(); + } +@@ -3683,7 +3680,7 @@ + return 1; + } + my ($per_result, $smtp_comment, $header_comment, $spf_fail); +- foreach my $recip (split(' ', $this->{rcpt})) { ++ foreach my $recip (split('/var/lib/assp/', $this->{rcpt})) { + ($per_result, $smtp_comment, $header_comment, $spf_fail) = + $query->result2($recip); + # Keep processing SPF records until all recipients are checked +@@ -5243,8 +5240,8 @@ + + + +- ReturnMail($this->{mailfrom},"$base/$file",$sub,"$this->{rcpt}\n\n$this->{report}\n") if ($EmailErrorsReply==1 || $EmailErrorsReply==3); +- ReturnMail($EmailErrorsTo,"$base/$file",$sub,"$this->{rcpt}\n\n$this->{report}\n",$this->{mailfrom}) if ($EmailErrorsTo && ($EmailErrorsReply==2 || $EmailErrorsReply==3)); ++ ReturnMail($this->{mailfrom},"/etc/assp/$file",$sub,"$this->{rcpt}\n\n$this->{report}\n") if ($EmailErrorsReply==1 || $EmailErrorsReply==3); ++ ReturnMail($EmailErrorsTo,"/etc/assp/$file",$sub,"$this->{rcpt}\n\n$this->{report}\n",$this->{mailfrom}) if ($EmailErrorsTo && ($EmailErrorsReply==2 || $EmailErrorsReply==3)); + + stateReset($fh); + $this->{getline}=\&getline; +@@ -5377,13 +5374,13 @@ + + if (($this->{reporttype}==2) || ($this->{reporttype}==3)) { + +-ReturnMail($this->{mailfrom},"$base/$file",'',"$this->{rcpt}\n\n$this->{report}\n") if ($EmailWhitelistReply==1 || $EmailWhitelistReply==3); ++ReturnMail($this->{mailfrom},"/etc/assp/$file",'',"$this->{rcpt}\n\n$this->{report}\n") if ($EmailWhitelistReply==1 || $EmailWhitelistReply==3); + +-ReturnMail($EmailWhitelistTo,"$base/$file",'',"$this->{rcpt}\n\n$this->{report}\n",$this->{mailfrom}) if ( $EmailWhitelistTo && ($EmailWhitelistReply==2 || $EmailWhitelistReply==3)); ++ReturnMail($EmailWhitelistTo,"/etc/assp/$file",'',"$this->{rcpt}\n\n$this->{report}\n",$this->{mailfrom}) if ( $EmailWhitelistTo && ($EmailWhitelistReply==2 || $EmailWhitelistReply==3)); + } else { +- ReturnMail($this->{mailfrom},"$base/$file",'',"$this->{rcpt}\n\n$this->{report}\n") if ($EmailRedlistReply==1 || $EmailRedlistReply==3); ++ ReturnMail($this->{mailfrom},"/etc/assp/$file",'',"$this->{rcpt}\n\n$this->{report}\n") if ($EmailRedlistReply==1 || $EmailRedlistReply==3); + +-ReturnMail($EmailRedlistTo,"$base/$file",'',"$this->{rcpt}\n\n$this->{report}\n",$this->{mailfrom}) if ( $EmailRedlistTo && ($EmailRedlistReply==2 || $EmailRedlistReply==3)); ++ReturnMail($EmailRedlistTo,"/etc/assp//$file",'',"$this->{rcpt}\n\n$this->{report}\n",$this->{mailfrom}) if ( $EmailRedlistTo && ($EmailRedlistReply==2 || $EmailRedlistReply==3)); + } + delete $this->{report}; + stateReset($fh); +@@ -5531,8 +5528,8 @@ + my $file=($this->{reporttype}==0) ? "reports/spamreport.txt" : "reports/notspamreport.txt"; + + +- ReturnMail($this->{mailfrom},"$base/$file",$sub,"$this->{rcpt}\n\n$this->{report}\n") if ($EmailErrorsReply==1 || $EmailErrorsReply==3); +- ReturnMail($EmailErrorsTo,"$base/$file",$sub,"$this->{rcpt}\n\n$this->{report}\n",$this->{mailfrom}) if ($EmailErrorsTo && ($EmailErrorsReply==2 || $EmailErrorsReply==3)); ++ ReturnMail($this->{mailfrom},"/etc/assp/$file",$sub,"$this->{rcpt}\n\n$this->{report}\n") if ($EmailErrorsReply==1 || $EmailErrorsReply==3); ++ ReturnMail($EmailErrorsTo,"/etc/assp/$file",$sub,"$this->{rcpt}\n\n$this->{report}\n",$this->{mailfrom}) if ($EmailErrorsTo && ($EmailErrorsReply==2 || $EmailErrorsReply==3)); + + delete $this->{report}; + stateReset($fh); +@@ -6010,7 +6007,7 @@ + $a{lc $1}=1; + } + } +- foreach $a (split(' ',lc $this->{rcpt})) { ++ foreach $a (split('/var/lib/assp/',lc $this->{rcpt})) { + $a{$a}=1; + } + foreach $a (keys %a) { +@@ -6470,10 +6467,10 @@ + if($UseSubjectsAsMaillogNames || $isspam==2 || $isspam==3) { + + $sub.="--".(++$Counter); +- return "$base/$maillog/$sub$maillogExt"; ++ return "/var/lib/assp/$maillog/$sub$maillogExt"; + } else { + my $fn=(time + $Counter++ ) % $MaxFiles; +- "$base/$maillog/$fn$maillogExt"; ++ "/var/lib/assp/$maillog/$fn$maillogExt"; + } + } + +@@ -7759,7 +7756,7 @@ + $m=~s/^... (...) +(\d+) (\S+) ..(..)/$1-$2-$4 $3 /; + my $indent=" " x length($m); + if(!$pat) { +- open(F,"<$base/$logfile"); ++ open(F,"<$logfile"); + seek(F,-$MaillogTailBytes,2) || seek(F,0,0); + local $/; + $s=; +@@ -7821,7 +7818,7 @@ + my %replace; + my $j=0; + my $highlightExpr='=~s/('; +- foreach (map/^([^-].*)/, split(' ',$pat)) { ++ foreach (map/^([^-].*)/, split('/var/lib/assp/',$pat)) { + $replace{lc $_}=$highlights[$j % @highlights]; # pick highlight style + $highlightExpr.=quotemeta($_).'|'; + if ($MaillogTailWrapColumn>0) { +@@ -7982,7 +7979,7 @@ + + else { + #$fil="$base/$fil" if $fil!~/^(([a-z]:)?[\/\\]|\Q$base\E)/; +- $fil="$base/$fil" if $fil!~/^\Q$base\E/i; ++ $fil="/etc/assp/$fil" if $fil!~/^\Q\/etc\/assp\/\E/i; + if ($qs{B1}=~/delete/i) { + unlink($fil); + } +@@ -8206,7 +8203,7 @@ + } + + if ($fil !~ /^\Q$base\E/i) { +- $fil="$base/$fil"; ++ $fil="/usr/share/assp/$fil"; + } + if (-e $fil) { + my $mtime; +@@ -8541,9 +8538,9 @@ + } + + sub SaveConfig { +- rename("$base/assp.cfg.bak","$base/assp.cfg.bak.bak"); +- rename("$base/assp.cfg","$base/assp.cfg.bak"); +- open(F,">$base/assp.cfg"); ++ rename("/etc/assp/assp.cfg.bak","/etc/assp/assp.cfg.bak.bak"); ++ rename("/etc/assp/assp.cfg","/etc/assp/assp.cfg.bak"); ++ open(F,">/etc/assp/assp.cfg"); + foreach (sort keys %Config) {print F "$_:=$Config{$_}\n";} + close F; + } +@@ -8724,8 +8721,8 @@ + # the option list is actually saved in a file. + $fromfile = 1; + my $fil = $1; +- if ($fil !~ /^(([a-z]:)?[\/\\]|\Q$base\E)/){ +- $fil = "$base/$fil"; ++ if ($fil !~ /^(([a-z]:)?[\/\\]|\Q\/etc\/assp\/\E)/){ ++ $fil = "/etc/assp/$fil"; + }; + local $/; + my @s = stat($fil); +@@ -8891,7 +8888,7 @@ + sub ConfigChangeLogfile {my ($name, $old, $new)=@_; + close LOG if $logfile; + $logfile=$new; +- if($logfile && open(LOG,">>$base/$logfile")) {my $oldfh = select(LOG); $| = 1; select($oldfh);} ++ if($logfile && open(LOG,">>$logfile")) {my $oldfh = select(LOG); $| = 1; select($oldfh);} + mlog(0,"log file changed to '$new' from '$old' per admin request"); + ''; + } +@@ -9242,7 +9239,7 @@ + # called on SIG HUP + my %newConfig; + mlog(0,"sig HUP -- reloading config"); +- open(F,"<$base/assp.cfg"); local $/; (%newConfig)=split(/:=|\n/,); close F; ++ open(F,"); close F; + foreach $c (@Config) { + my ($name,$nicename,$size,$func,$default,$valid,$onchange,$description)=@$c; + if($Config{$name} ne $newConfig{$name}) { +@@ -9270,7 +9267,7 @@ + } + # reopen log file, just for fun. + close LOG; +- if(open(LOG,">>$base/$logfile")) {my $oldfh = select(LOG); $| = 1; select($oldfh);} ++ if(open(LOG,">>$logfile")) {my $oldfh = select(LOG); $| = 1; select($oldfh);} + print LOG "Logfile reopened on HUP\n"; + } + +diff -Naur assporg/ASSP/move2num.pl x/ASSP/move2num.pl +--- assporg/ASSP/move2num.pl 2007-01-13 13:17:58.000000000 +0100 ++++ x/ASSP/move2num.pl 2007-01-13 13:07:36.000000000 +0100 +@@ -3,7 +3,7 @@ + # renames files to numbers + # (c) John Hanna, John Calvi 2003 under the terms of the GPL + +-open(F,"); close F; ++open(F,"); close F; + $spamlog=$Config{spamlog} && "$Config{base}/$Config{spamlog}" || 'spam'; + $notspamlog=$Config{notspamlog} && "$Config{base}/$Config{notspamlog}" || 'notspam'; + $MaxFiles=$Config{MaxFiles} || 14003; +diff -Naur assporg/ASSP/rebuildspamdb.pl x/ASSP/rebuildspamdb.pl +--- assporg/ASSP/rebuildspamdb.pl 2007-01-13 13:17:58.000000000 +0100 ++++ x/ASSP/rebuildspamdb.pl 2007-01-13 13:07:36.000000000 +0100 +@@ -4,7 +4,7 @@ + # (c) John Hanna 2003 under the terms of the GPL + # Updated July 2004 for simple proxy support. + +-open(F,"); close F; ++open(F,"); close F; + $spamlog=$Config{spamlog} && "$Config{base}/$Config{spamlog}" || 'spam'; + $notspamlog=$Config{notspamlog} && "$Config{base}/$Config{notspamlog}" || 'notspam'; + $correctedspam=$Config{correctedspam} && "$Config{base}/$Config{correctedspam}" || 'errors/spam'; +@@ -13,7 +13,7 @@ + $whitelistdb=$Config{whitelistdb} && "$Config{base}/$Config{whitelistdb}" || 'whitelist'; + $MaxWhitelistDays=$Config{MaxWhitelistDays} || 90; + $OrderedTieHashSize=$Config{OrderedTieHashSize} || 5000; +-$Log=$Config{logfile} && "$Config{base}/$Config{logfile}" || 'maillog.txt'; ++$Log=$Config{logfile}; + $whiteRE=$Config{whiteRE}; + $KeepWhitelistedSpam=$Config{KeepWhitelistedSpam}; + $proxyserver=$Config{proxyserver}; +diff -Naur assporg/ASSP/stats.sh x/ASSP/stats.sh +--- assporg/ASSP/stats.sh 2007-01-13 16:49:03.000000000 +0100 ++++ x/ASSP/stats.sh 2007-01-13 16:49:31.000000000 +0100 +@@ -52,7 +52,7 @@ + # your system's 'newsyslog' functionality. You can send a SIGHUP to + # ASSP when you roll the log so it starts afresh..KRL + +-tail -300 -f /usr/local/assp/maillog.log | \ ++tail -n 300 -f /var/log/assp/maillog.txt | \ + awk ' \ + /whitelisted/ { \ + printf("%s %s \033[1;32m%-15s L\033[0mW %s \033[1;32m->\033[0m %s\n", \ diff --git a/mail-filter/assp/files/digest-assp-1.2.6 b/mail-filter/assp/files/digest-assp-1.2.6 new file mode 100644 index 000000000000..4e0bc062def1 --- /dev/null +++ b/mail-filter/assp/files/digest-assp-1.2.6 @@ -0,0 +1,3 @@ +MD5 94c22168b5013d3869136dccbd1c283c ASSP_1.2.6-Install.zip 245745 +RMD160 35b7808ef6cd8819e0c29d147c42fc409d69e540 ASSP_1.2.6-Install.zip 245745 +SHA256 0eea1a645305c16916593fb3e2580401122de5f7c36534e2200df36766aca3fd ASSP_1.2.6-Install.zip 245745