Changed dep to virtual/perl-Time-HiRes. Also switched from fowners/fperms to chown/chmod due to perms not be corrected/adjusted if dirs already exist with diff owner/perms

(Portage version: 2.1.2_rc4-r6)
 (Unsigned Manifest commit)

5 files changed, 11 insertions, 305 deletions

diff --git a/mail-filter/assp/Manifest b/mail-filter/assp/Manifest
index e076e4061e09..9e50c8a4a8c2 100644
--- a/mail-filter/assp/Manifest
+++ b/mail-filter/assp/Manifest
@@ -7,25 +7,18 @@ 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-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-r4.ebuild 2659 RMD160 74e12014672f4c204037c721824491b453f321c1 SHA1 9292c267dee90693a66a9460d04e8b9e1e34084d SHA256 e31c0d30b9c4d1fe47d895c9e95916bdd9cff77f9bb4b826a7454149625a5057
-MD5 2faa5dfbf56604f35781029b167dc91d assp-1.2.5-r4.ebuild 2659
-RMD160 74e12014672f4c204037c721824491b453f321c1 assp-1.2.5-r4.ebuild 2659
-SHA256 e31c0d30b9c4d1fe47d895c9e95916bdd9cff77f9bb4b826a7454149625a5057 assp-1.2.5-r4.ebuild 2659
-MISC ChangeLog 1606 RMD160 7bf80bc5e407abeafa47fbbc1c6c72e3686e0e0e SHA1 d48cdf1dc0ea431931b3c1d8b8a76fb61213c48e SHA256 d4e2af4d769d3ecc76ded920130359f40048abeab1875b26ce1f335597d7b121
-MD5 94f6c4452a4c3c21111e468c9a9c33df ChangeLog 1606
-RMD160 7bf80bc5e407abeafa47fbbc1c6c72e3686e0e0e ChangeLog 1606
-SHA256 d4e2af4d769d3ecc76ded920130359f40048abeab1875b26ce1f335597d7b121 ChangeLog 1606
+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
 MISC metadata.xml 808 RMD160 dc6fd8b7e0ae86eb40342064e3820cd8fbd83193 SHA1 c24f1667c370bfff799a6289bcdafc06b405f8ec SHA256 b33778bfaa6a4537f5e5ea54bee8641126c9655505b26c85cc11a91cc288b5a6
 MD5 31d7bb0d82eeb1c4fde76228f3d71a8d metadata.xml 808
 RMD160 dc6fd8b7e0ae86eb40342064e3820cd8fbd83193 metadata.xml 808
 SHA256 b33778bfaa6a4537f5e5ea54bee8641126c9655505b26c85cc11a91cc288b5a6 metadata.xml 808
-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
-MD5 24d9ce96160cb290c6872107dc5b6928 files/digest-assp-1.2.5-r4 247
-RMD160 5eb32c5a2e77a2e5b0e74aaaa95059be0e0d6f85 files/digest-assp-1.2.5-r4 247
-SHA256 8829c42c614f1cdf2569938d0d02d82300c4acb6dccb999aafd400ae23461656 files/digest-assp-1.2.5-r4 247
+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
diff --git a/mail-filter/assp/assp-1.2.5-r3.ebuild b/mail-filter/assp/assp-1.2.5-r3.ebuild
deleted file mode 100644
index 381b19f27061..000000000000
--- a/mail-filter/assp/assp-1.2.5-r3.ebuild
+++ /dev/null
@@ -1,159 +0,0 @@
-# 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/assp-1.2.5-r4.ebuild b/mail-filter/assp/assp-1.2.5-r4.ebuild
deleted file mode 100644
index 4178e84bd199..000000000000
--- a/mail-filter/assp/assp-1.2.5-r4.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# 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-r4.ebuild,v 1.1 2006/11/22 19:00:28 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}
-	cd "${S}"
-	epatch ${FILESDIR}/assp-${PV}.patch
-
-	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
-
-	# 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
deleted file mode 100644
index b1a96621e5e7..000000000000
--- a/mail-filter/assp/files/digest-assp-1.2.5-r3
+++ /dev/null
@@ -1,3 +0,0 @@
-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
diff --git a/mail-filter/assp/files/digest-assp-1.2.5-r4 b/mail-filter/assp/files/digest-assp-1.2.5-r4
deleted file mode 100644
index b1a96621e5e7..000000000000
--- a/mail-filter/assp/files/digest-assp-1.2.5-r4
+++ /dev/null
@@ -1,3 +0,0 @@
-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