From: William Thomson Date: Mon, 20 Nov 2006 22:48:33 +0000 (+0000) Subject: Final got security fix into place. Fixed missing slash from end of multiline sed... X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=767166c4109a7b24287a9b7ecf6b6dcde5e55a42;p=gentoo.git Final got security fix into place. Fixed missing slash from end of multiline sed command. Package-Manager: portage-2.1.2_rc2 --- diff --git a/mail-filter/assp/ChangeLog b/mail-filter/assp/ChangeLog index 53bcce6f01c6..f566bb0e25bb 100644 --- a/mail-filter/assp/ChangeLog +++ b/mail-filter/assp/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for mail-filter/assp # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/mail-filter/assp/ChangeLog,v 1.4 2006/11/20 00:19:52 wltjr Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-filter/assp/ChangeLog,v 1.5 2006/11/20 22:48:33 wltjr Exp $ + +*assp-1.2.5-r3 (20 Nov 2006) + + 20 Nov 2006; William L. Thomson Jr. + +assp-1.2.5-r3.ebuild: + Final got security fix into place. Fixed missing slash from end of multiline + sed command. *assp-1.2.5-r2 (20 Nov 2006) diff --git a/mail-filter/assp/Manifest b/mail-filter/assp/Manifest index 9b93045683ea..df2154579263 100644 --- a/mail-filter/assp/Manifest +++ b/mail-filter/assp/Manifest @@ -11,14 +11,18 @@ EBUILD assp-1.2.5-r2.ebuild 4630 RMD160 a90dd62e51f6276d9d4fb878687f3a4430b2e5fa MD5 8e4488999f3913da019bf9a34f96bd9d assp-1.2.5-r2.ebuild 4630 RMD160 a90dd62e51f6276d9d4fb878687f3a4430b2e5fa assp-1.2.5-r2.ebuild 4630 SHA256 82a133d88e829c7363a1a3930d02ae5d0d9f3d55d768862149ec356ba3b89a13 assp-1.2.5-r2.ebuild 4630 +EBUILD assp-1.2.5-r3.ebuild 4655 RMD160 1a768d546af9271c6f43472d38b061caaea856f5 SHA1 8ffbf39db28a5ef2ad72caa37404649040803dc3 SHA256 2fd13a2e88bc58ac1fe13d3e68a7eb6ec9cc00209270f77342c2a1988e635d24 +MD5 c72659ade797b3072e02fc33a0e48781 assp-1.2.5-r3.ebuild 4655 +RMD160 1a768d546af9271c6f43472d38b061caaea856f5 assp-1.2.5-r3.ebuild 4655 +SHA256 2fd13a2e88bc58ac1fe13d3e68a7eb6ec9cc00209270f77342c2a1988e635d24 assp-1.2.5-r3.ebuild 4655 EBUILD assp-1.2.5.ebuild 4321 RMD160 1abbf6c3ab3af44130adf85a04fcc4e88616db17 SHA1 7c96eae245e3a4537dcc301b252f4fce04256edc SHA256 9e918f2666e4446568b469b2d4084816b2977d27852be888c14ada72d6b07598 MD5 9f8b7037cc9f27f9aad849e3582b2054 assp-1.2.5.ebuild 4321 RMD160 1abbf6c3ab3af44130adf85a04fcc4e88616db17 assp-1.2.5.ebuild 4321 SHA256 9e918f2666e4446568b469b2d4084816b2977d27852be888c14ada72d6b07598 assp-1.2.5.ebuild 4321 -MISC ChangeLog 1043 RMD160 000a567c02678961cac7c3f389b30a9d27ca8576 SHA1 9b8f0a49e423ef4fd8e73a22d65c057c4a770034 SHA256 f135fad9698829fbf3c35441b34b2e67a3ca6fff0c6f7054ac95f49421cb69fd -MD5 1a0a8f7b053b71c81b3f7057bedadc08 ChangeLog 1043 -RMD160 000a567c02678961cac7c3f389b30a9d27ca8576 ChangeLog 1043 -SHA256 f135fad9698829fbf3c35441b34b2e67a3ca6fff0c6f7054ac95f49421cb69fd ChangeLog 1043 +MISC ChangeLog 1250 RMD160 d1028ba295902480eeb72b91aa541aeff777428e SHA1 29089014a027c97dcf455f5c134dbe68ac1e6412 SHA256 65385c8a32134b8bd41e4e1b731d80c6b25f43c6d3046746671d1746563d1f91 +MD5 561279b7a76e0b06b6d649d13605d692 ChangeLog 1250 +RMD160 d1028ba295902480eeb72b91aa541aeff777428e ChangeLog 1250 +SHA256 65385c8a32134b8bd41e4e1b731d80c6b25f43c6d3046746671d1746563d1f91 ChangeLog 1250 MISC metadata.xml 808 RMD160 dc6fd8b7e0ae86eb40342064e3820cd8fbd83193 SHA1 c24f1667c370bfff799a6289bcdafc06b405f8ec SHA256 b33778bfaa6a4537f5e5ea54bee8641126c9655505b26c85cc11a91cc288b5a6 MD5 31d7bb0d82eeb1c4fde76228f3d71a8d metadata.xml 808 RMD160 dc6fd8b7e0ae86eb40342064e3820cd8fbd83193 metadata.xml 808 @@ -32,3 +36,6 @@ SHA256 8829c42c614f1cdf2569938d0d02d82300c4acb6dccb999aafd400ae23461656 files/di MD5 24d9ce96160cb290c6872107dc5b6928 files/digest-assp-1.2.5-r2 247 RMD160 5eb32c5a2e77a2e5b0e74aaaa95059be0e0d6f85 files/digest-assp-1.2.5-r2 247 SHA256 8829c42c614f1cdf2569938d0d02d82300c4acb6dccb999aafd400ae23461656 files/digest-assp-1.2.5-r2 247 +MD5 24d9ce96160cb290c6872107dc5b6928 files/digest-assp-1.2.5-r3 247 +RMD160 5eb32c5a2e77a2e5b0e74aaaa95059be0e0d6f85 files/digest-assp-1.2.5-r3 247 +SHA256 8829c42c614f1cdf2569938d0d02d82300c4acb6dccb999aafd400ae23461656 files/digest-assp-1.2.5-r3 247 diff --git a/mail-filter/assp/assp-1.2.5-r3.ebuild b/mail-filter/assp/assp-1.2.5-r3.ebuild new file mode 100644 index 000000000000..381b19f27061 --- /dev/null +++ b/mail-filter/assp/assp-1.2.5-r3.ebuild @@ -0,0 +1,159 @@ +# Copyright 1999-2006 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-r3.ebuild,v 1.1 2006/11/20 22:48:33 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 + perl-core/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} + + # Replace path for assp.pl to find data files + # Convert PC line returns to Unix + sed -i -e "/foreach /s:('.':('/var/lib/assp/':" \ + -e 's:$base/$pidfile:/var/run/assp/$pidfile:' \ + -e "s:'pid':'asspd.pid':" \ + -e "s:'maillog.txt':'/var/log/assp/maillog.txt':" \ + -e 's:"maillog.log":"/var/log/assp/maillog.log":' \ + -e 's:"$base/$logdir":"$logdir":' \ + -e 's:$base/$logfile:$logfile:' \ + -e 's:glob("$base/$logdir*$logdirfile");:glob("$logdir*$logdirfile");:' \ + -e 's:$base/assp.cfg:/etc/assp/assp.cfg:' \ + -e 's:$base/assp.cfg:/etc/assp/assp.cfg:' \ + -e 's:"$base/$archivelogfile":"$archivelogfile":' \ + -e 's:$base/images:/usr/share/assp/images:' \ + -e 's:$fil="$base/$fil";:$fil="/usr/share/assp/$fil";:' \ + -e 's:"$base/$maillog/:"/var/lib/assp/$maillog/:' \ + -e "/AsADaemon,'As a Daemon',0,checkbox/s:checkbox,0,:checkbox,1,:" \ + -e "s:runAsUser,'Run as UID',20,textinput,'':runAsUser,'Run as UID',20,textinput,'assp':" \ + -e "s:runAsGroup,'Run as GID',20,textinput,'':runAsGroup,'Run as GID',20,textinput,'assp':" \ + -e 's:if ($fil=~/\.\./) {:if (($fil=~/\.\./) or ($fil!~/^images\/.*/)):' \ + -e ":[AvPath,':s:'':/var/lib/clamav/:" \ + -e 's/\r//' \ + "${S}"/assp.pl || die "sed failed" + + # move2num.pl + sed -i -e 's:assp.cfg:/etc/assp/assp.cfg:' \ + -e 's/\r//' \ + "${S}/move2num.pl" || die "sed failed" + + # rebuildspamdb.pl + sed -i -e 's:assp.cfg:/etc/assp/assp.cfg:' \ + -e "s:'maillog.txt';::" \ + -e 's:$Log=$Config{logfile} && "$Config{base}/$Config{logfile}" || :$Log=$Config{logfile};:' \ + -e 's/\r//' \ + "${S}/rebuildspamdb.pl" || die "sed failed" + + # Replace path for default maillog.log + sed -i -e 's:tail -300 -f /usr/local/assp/maillog.log:tail -n 300 -f /var/log/assp/maillog.txt:' \ + -e 's/\r//' \ + "${S}/stats.sh" || die "sed failed" + + # just being safe, same sed stuff called on all modified files above + edos2unix "${S}/freshclam.sh" + edos2unix "${S}/repair.pl" + edos2unix "${S}/stat.pl" + + # rename utils + mv "${S}/freshclam.sh" "${S}/asspfreshclam.sh" + mv "${S}/move2num.pl" "${S}/asspmove2num.pl" + mv "${S}/rebuildspamdb.pl" "${S}/assprebuildspamdb.pl" + mv "${S}/repair.pl" "${S}/assprepair.pl" + mv "${S}/stats.sh" "${S}/asspstats.sh" + mv "${S}/stat.pl" "${S}/asspstat.pl" + + # remove windows stuff + rm "${S}/addservice.pl" + rm -f "${S}/Win32-quickstart-guide.txt" +} + +src_install() { + # Configuration directory + dodir /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 + 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 /var/lib/assp + doins *.txt *.sav + + # 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 "All utilities are prefixed with assp." + elog + elog "See the on-line docs for a complete tutorial." + elog +} diff --git a/mail-filter/assp/files/digest-assp-1.2.5-r3 b/mail-filter/assp/files/digest-assp-1.2.5-r3 new file mode 100644 index 000000000000..b1a96621e5e7 --- /dev/null +++ b/mail-filter/assp/files/digest-assp-1.2.5-r3 @@ -0,0 +1,3 @@ +MD5 ffbb815b24ea5073000dd50143edc311 ASSP_1.2.5-Install.zip 244225 +RMD160 748798f39918e6519be755d8e44a288fc82d636c ASSP_1.2.5-Install.zip 244225 +SHA256 282325e0434ef8554fe281a2b25267fde99254ea83bc7073c2acfbc47c2d31af ASSP_1.2.5-Install.zip 244225