Bumped to latest release. Dropped external big patch, using sed instead :). Removed past borked version. Quoted var in older remaining version. Thanks for ovaon2 for TONS of help dialing things in.

Package-Manager: portage-2.1.3.13

10 files changed, 229 insertions, 310 deletions

diff --git a/mail-filter/assp/ChangeLog b/mail-filter/assp/ChangeLog
index 9c1a5f685afb..310087139add 100644
--- a/mail-filter/assp/ChangeLog
+++ b/mail-filter/assp/ChangeLog
@@ -1,6 +1,15 @@
 # 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.20 2007/09/06 15:45:15 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/assp/ChangeLog,v 1.21 2007/10/20 21:27:39 wltjr Exp $
+
+*assp-1.3.3.8 (20 Oct 2007)
+
+  20 Oct 2007; William L. Thomson Jr. <wltjr@gentoo.org> +files/base.patch,
+  assp-1.2.6-r3.ebuild, -assp-1.3.3.1-r3.ebuild, -assp-1.3.3.1-r4.ebuild,
+  +assp-1.3.3.8.ebuild:
+  Bumped to latest release. Dropped external big patch, using sed instead :).
+  Removed past borked version. Quoted var in older remaining version. Thanks
+  for ovaon2 for TONS of help dialing things in.
 
 *assp-1.3.3.1-r4 (06 Sep 2007)
 
diff --git a/mail-filter/assp/Manifest b/mail-filter/assp/Manifest
index 702b16949a01..9b44909b20fe 100644
--- a/mail-filter/assp/Manifest
+++ b/mail-filter/assp/Manifest
@@ -6,26 +6,24 @@ AUX asspd.init 657 RMD160 066f56f95cd7177c669cb4db993401c5f164f16e SHA1 218b1d1d
 MD5 67bc4fa59ed71fe1f93e2fb365ed74ab files/asspd.init 657
 RMD160 066f56f95cd7177c669cb4db993401c5f164f16e files/asspd.init 657
 SHA256 4ec543f7c2f006d80dcb592d50f44a41e8aa2cd449f65a6e1cd53996e67b2fde files/asspd.init 657
+AUX base.patch 560 RMD160 3766d54f56114f87f19ef286b4cac4e6e079834b SHA1 3c9bf668740f2b5ab7d845ab957228d767edc4c6 SHA256 06be11f156db53c83d808b67be30b60047a37bac99fa48314d137b36d23e4a01
+MD5 baf3b28f98574172b192f3d3fa9dbd48 files/base.patch 560
+RMD160 3766d54f56114f87f19ef286b4cac4e6e079834b files/base.patch 560
+SHA256 06be11f156db53c83d808b67be30b60047a37bac99fa48314d137b36d23e4a01 files/base.patch 560
 DIST ASSP_1.2.6-Install.zip 245745 RMD160 35b7808ef6cd8819e0c29d147c42fc409d69e540 SHA1 1eccc893a29798355746007afcbf02c09c5d0a53 SHA256 0eea1a645305c16916593fb3e2580401122de5f7c36534e2200df36766aca3fd
-DIST ASSP_1.3.3.1-Install.zip 362975 RMD160 a4a115f4451b07852a52b539d5047f0217ad9b7c SHA1 12c0f7d788c4dafec6d5eaa169e43967411b08fe SHA256 810bebed2f48a480c7e7458fb9b6e2fbe3f39c441d74aa8471b458aa0e33e47b
-DIST assp-1.3.3.1-r3.patch.tbz2 10319 RMD160 100b5ee15b994c266a60797595c8cd873c92b7f2 SHA1 2de69956496ee7dd3ed5ed156ff39ad034957226 SHA256 5b491f42f8006dcaa176d70976532cbcc4f9814d50721fb1eeddb75588bb8140
-DIST assp-1.3.3.1-r4.patch.tbz2 10121 RMD160 2ebead13474b7281b81476e7827a25106f5fb1ca SHA1 e1e48513eb0eda85377559bf21a0bb451b26f16d SHA256 717b4b2cb2d42402910d8b8317a0ca63747883c31f8908da3c0dcbf81b2a266b
-EBUILD assp-1.2.6-r3.ebuild 2791 RMD160 7ff20e6f23309e0e991b1501f0423700c24ec80b SHA1 52cd8395ea3a060e16454d02352b6c5b60c72317 SHA256 4a85634913a54651a62da4e503a1fa284da2f7c487c9c9af8a056b57e251f4c6
-MD5 6ecc657a4a34c6df374e29e4f86dcb6d assp-1.2.6-r3.ebuild 2791
-RMD160 7ff20e6f23309e0e991b1501f0423700c24ec80b assp-1.2.6-r3.ebuild 2791
-SHA256 4a85634913a54651a62da4e503a1fa284da2f7c487c9c9af8a056b57e251f4c6 assp-1.2.6-r3.ebuild 2791
-EBUILD assp-1.3.3.1-r3.ebuild 3329 RMD160 5a31751865febfc0612f6466a16eb86f0405b8cb SHA1 92d657296357587c90cac5ae943f4397bbc4e1b2 SHA256 67f42e8ed7d8cd55eab3df79dd9bcab88910d529768b2f26fd1cf5963cd9f626
-MD5 0a2c295d1669d10bd3916dde85416fa2 assp-1.3.3.1-r3.ebuild 3329
-RMD160 5a31751865febfc0612f6466a16eb86f0405b8cb assp-1.3.3.1-r3.ebuild 3329
-SHA256 67f42e8ed7d8cd55eab3df79dd9bcab88910d529768b2f26fd1cf5963cd9f626 assp-1.3.3.1-r3.ebuild 3329
-EBUILD assp-1.3.3.1-r4.ebuild 3329 RMD160 34aff48e393f8a14fca6927afa8f9751110390c6 SHA1 1c81c12dcd30a4f3f20153f32d1bd2dc29336653 SHA256 72d16fdccf4896198027d0ce007a135c3e18fe234cde080ed720f93916e822bd
-MD5 d9a8534f978772644d96a4ba80e06d24 assp-1.3.3.1-r4.ebuild 3329
-RMD160 34aff48e393f8a14fca6927afa8f9751110390c6 assp-1.3.3.1-r4.ebuild 3329
-SHA256 72d16fdccf4896198027d0ce007a135c3e18fe234cde080ed720f93916e822bd assp-1.3.3.1-r4.ebuild 3329
-MISC ChangeLog 4936 RMD160 360c2b36589fbe7fa9a44d155817e613cdbf418d SHA1 07ba6c9f0707f0a9c14ae8d44f96e91fb0699b68 SHA256 05738deb9b75dac0f262a2ce5301e32362c873445174d2a9e6f1ca05ffbec474
-MD5 744c0f1fcd80c50303c489c8b081e2bc ChangeLog 4936
-RMD160 360c2b36589fbe7fa9a44d155817e613cdbf418d ChangeLog 4936
-SHA256 05738deb9b75dac0f262a2ce5301e32362c873445174d2a9e6f1ca05ffbec474 ChangeLog 4936
+DIST ASSP_1.3.3.8-Install.zip 332926 RMD160 823307c69887aaaaf0440af637c186d1ac147a33 SHA1 586f149e4f8bce36039ee874e8e4e4cdc16549a7 SHA256 48a84aa63cbcff99833710c7ccbef69933558e98368982456f5ec8d201fad3ba
+EBUILD assp-1.2.6-r3.ebuild 2793 RMD160 ab3c65b8b3ed8280ed2ceefba0801850405af9c1 SHA1 dcce9da8aff5e60bac94e5c497f82483e673f026 SHA256 441607691b87ce26a2a329599c38a85ee085dffb1e65198e244af0aef1133725
+MD5 c8d9390f13bcbd89588e9765582aea86 assp-1.2.6-r3.ebuild 2793
+RMD160 ab3c65b8b3ed8280ed2ceefba0801850405af9c1 assp-1.2.6-r3.ebuild 2793
+SHA256 441607691b87ce26a2a329599c38a85ee085dffb1e65198e244af0aef1133725 assp-1.2.6-r3.ebuild 2793
+EBUILD assp-1.3.3.8.ebuild 5667 RMD160 85c41316ac0290506dd2ddbf5085d6186f64b0b2 SHA1 45e29e65a94c498ea07c33073d89f59f7936c84f SHA256 efa2f03c4cf4f1a65a74252d2dbc97e4fc60efabb4cff1c0fa20d8a3436488cc
+MD5 a127a6a45b7645437fa1033a3e336e72 assp-1.3.3.8.ebuild 5667
+RMD160 85c41316ac0290506dd2ddbf5085d6186f64b0b2 assp-1.3.3.8.ebuild 5667
+SHA256 efa2f03c4cf4f1a65a74252d2dbc97e4fc60efabb4cff1c0fa20d8a3436488cc assp-1.3.3.8.ebuild 5667
+MISC ChangeLog 5344 RMD160 c5b16becec6f40b97fc0c076097dd1ab6514d4f1 SHA1 7d7e9000c5783db30207589efa322ea923842ef2 SHA256 7305f31f9e4bb6518bfeb986e5dca7f1f75796dd39412f8467488cd78ddb10d9
+MD5 f7ad66c4db2ffd1e2a44de87d416405c ChangeLog 5344
+RMD160 c5b16becec6f40b97fc0c076097dd1ab6514d4f1 ChangeLog 5344
+SHA256 7305f31f9e4bb6518bfeb986e5dca7f1f75796dd39412f8467488cd78ddb10d9 ChangeLog 5344
 MISC metadata.xml 808 RMD160 dc6fd8b7e0ae86eb40342064e3820cd8fbd83193 SHA1 c24f1667c370bfff799a6289bcdafc06b405f8ec SHA256 b33778bfaa6a4537f5e5ea54bee8641126c9655505b26c85cc11a91cc288b5a6
 MD5 31d7bb0d82eeb1c4fde76228f3d71a8d metadata.xml 808
 RMD160 dc6fd8b7e0ae86eb40342064e3820cd8fbd83193 metadata.xml 808
@@ -33,9 +31,6 @@ SHA256 b33778bfaa6a4537f5e5ea54bee8641126c9655505b26c85cc11a91cc288b5a6 metadata
 MD5 397e3a17bf5a7aa227a56ae5b949e5a1 files/digest-assp-1.2.6-r3 247
 RMD160 62ff070b13b038c5bfaf31b579a0e64e585d79da files/digest-assp-1.2.6-r3 247
 SHA256 020336ad57d85e5c03a76dbbc5c041ee345f51ad0ec4ea015671215ec1adc512 files/digest-assp-1.2.6-r3 247
-MD5 2c35fd87b8af8c0139f11d09daffa9cd files/digest-assp-1.3.3.1-r3 509
-RMD160 afafec032f5635879e4752192c8d4400cf1d6c9f files/digest-assp-1.3.3.1-r3 509
-SHA256 77516942a305cdd7ef4e0b9ed3b2feea882994959ad574ef3c920e11c31a28aa files/digest-assp-1.3.3.1-r3 509
-MD5 7a77c04b67fa7d24e2e44bdf88e5158c files/digest-assp-1.3.3.1-r4 509
-RMD160 382e482bf602f4e290bf1a299ba98e43197e3f44 files/digest-assp-1.3.3.1-r4 509
-SHA256 32b3daf38f9a29b595dc44a52f213224d54deebd0ad17f008551a403205b24b3 files/digest-assp-1.3.3.1-r4 509
+MD5 95c094c1ec31f445a65af9cef8f9e11d files/digest-assp-1.3.3.8 253
+RMD160 995fe1d4f5319bc105612d6ae984b82b0a5bb5f8 files/digest-assp-1.3.3.8 253
+SHA256 a0b9f6b2e2dc0ff3d55c082f83ca899730c762d35961741ce25ad56e19ff110a files/digest-assp-1.3.3.8 253
diff --git a/mail-filter/assp/assp-1.2.6-r3.ebuild b/mail-filter/assp/assp-1.2.6-r3.ebuild
index c6b9933f91db..b1d0c968a3cf 100644
--- a/mail-filter/assp/assp-1.2.6-r3.ebuild
+++ b/mail-filter/assp/assp-1.2.6-r3.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.6-r3.ebuild,v 1.3 2007/04/06 18:02:57 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/assp/assp-1.2.6-r3.ebuild,v 1.4 2007/10/20 21:27:39 wltjr Exp $
 
 inherit eutils
 
@@ -57,7 +57,7 @@ src_unpack() {
 	sed -i -e 's:if(PopB4SMTPMerak):if($PopB4SMTPMerak):' assp.pl
 
 	# patch is against unix-format, so patch after dos2unix
-	epatch ${FILESDIR}/assp-${PV}.patch
+	epatch "${FILESDIR}"/assp-${PV}.patch
 
 	# remove windows stuff
 	rm "${S}/addservice.pl"
diff --git a/mail-filter/assp/assp-1.3.3.1-r3.ebuild b/mail-filter/assp/assp-1.3.3.1-r3.ebuild
deleted file mode 100644
index ff01ebd79101..000000000000
--- a/mail-filter/assp/assp-1.3.3.1-r3.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# 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.3.3.1-r3.ebuild,v 1.1 2007/09/05 18:38:08 wltjr Exp $
-
-inherit eutils
-
-DESCRIPTION="Anti-Spam SMTP Proxy written in Perl."
-HOMEPAGE="http://assp.sourceforge.net/"
-MY_PN=ASSP_${PV}-Install
-SRC_URI="mirror://sourceforge/${PN}/${MY_PN}.zip
-	mirror://gentoo/${PF}.patch.tbz2"
-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}/ASSP
-
-pkg_setup() {
-	enewgroup assp
-	enewuser assp -1 -1 /dev/null assp
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	local FILES="
-		assp.pl
-		move2num.pl
-		rebuildspamdb.pl
-		repair.pl
-		stats.sh
-		stat.pl
-	"
-	# just being safe
-	for file in ${FILES}; do
-		edos2unix ${file}
-	done
-
-	# fix upstrean error
-	sed -i -e 's:if(PopB4SMTPMerak):if($PopB4SMTPMerak):' assp.pl || \
-		die "Could not fix upstream bug with PopB4SMTPMerak -> $PopB4SMTPMerak"
-
-	# patch is against unix-format, so patch after dos2unix
-	epatch ${WORKDIR}/${PF}.patch
-
-	# remove windows stuff
-	rm "${S}/addservice.pl" || die "Could not remove ${S}/addservice.pl"
-	rm -f "${S}/Win32-quickstart-guide.txt" || die "Could not remove ${S}/Win32-quickstart-guide.txt"
-}
-
-src_install() {
-	# Configuration directory
-	dodir /etc/assp
-
-	insinto /etc/assp
-	# Installs files that are used by assp for black/gray lists,
-	# and domain country lookup. To be changed by admin as needed.
-	doins files/*.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/
-	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 "http://assp.sourceforge.net/docs.html"
-	elog
-	elog "If upgrading, please update your old config to set both"
-	elog "redre.txt and nodelay.txt path of /etc/assp.  There are"
-	elog "also many new options that you should review."
-	elog
-}
diff --git a/mail-filter/assp/assp-1.3.3.1-r4.ebuild b/mail-filter/assp/assp-1.3.3.1-r4.ebuild
deleted file mode 100644
index df6e6d1b0b48..000000000000
--- a/mail-filter/assp/assp-1.3.3.1-r4.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# 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.3.3.1-r4.ebuild,v 1.1 2007/09/06 15:45:15 wltjr Exp $
-
-inherit eutils
-
-DESCRIPTION="Anti-Spam SMTP Proxy written in Perl."
-HOMEPAGE="http://assp.sourceforge.net/"
-MY_PN=ASSP_${PV}-Install
-SRC_URI="mirror://sourceforge/${PN}/${MY_PN}.zip
-	mirror://gentoo/${PF}.patch.tbz2"
-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}/ASSP
-
-pkg_setup() {
-	enewgroup assp
-	enewuser assp -1 -1 /dev/null assp
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	local FILES="
-		assp.pl
-		move2num.pl
-		rebuildspamdb.pl
-		repair.pl
-		stats.sh
-		stat.pl
-	"
-	# just being safe
-	for file in ${FILES}; do
-		edos2unix ${file}
-	done
-
-	# fix upstrean error
-	sed -i -e 's:if(PopB4SMTPMerak):if($PopB4SMTPMerak):' assp.pl || \
-		die "Could not fix upstream bug with PopB4SMTPMerak -> $PopB4SMTPMerak"
-
-	# patch is against unix-format, so patch after dos2unix
-	epatch ${WORKDIR}/${PF}.patch
-
-	# remove windows stuff
-	rm "${S}/addservice.pl" || die "Could not remove ${S}/addservice.pl"
-	rm -f "${S}/Win32-quickstart-guide.txt" || die "Could not remove ${S}/Win32-quickstart-guide.txt"
-}
-
-src_install() {
-	# Configuration directory
-	dodir /etc/assp
-
-	insinto /etc/assp
-	# Installs files that are used by assp for black/gray lists,
-	# and domain country lookup. To be changed by admin as needed.
-	doins files/*.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/
-	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 "http://assp.sourceforge.net/docs.html"
-	elog
-	elog "If upgrading, please update your old config to set both"
-	elog "redre.txt and nodelay.txt path of /etc/assp.  There are"
-	elog "also many new options that you should review."
-	elog
-}
diff --git a/mail-filter/assp/assp-1.3.3.8.ebuild b/mail-filter/assp/assp-1.3.3.8.ebuild
new file mode 100644
index 000000000000..5acd1f721f1d
--- /dev/null
+++ b/mail-filter/assp/assp-1.3.3.8.ebuild
@@ -0,0 +1,179 @@
+# 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.3.3.8.ebuild,v 1.1 2007/10/20 21:27:39 wltjr Exp $
+
+inherit eutils
+
+DESCRIPTION="Anti-Spam SMTP Proxy written in Perl."
+HOMEPAGE="http://assp.sourceforge.net/"
+MY_PN=ASSP_${PV}-Install
+SRC_URI="mirror://sourceforge/${PN}/${MY_PN}.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}/ASSP
+
+pkg_setup() {
+	enewgroup assp
+	enewuser assp -1 -1 /dev/null assp
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	local FILES="
+		assp.pl
+		move2num.pl
+		rebuildspamdb.pl
+		repair.pl
+		stats.sh
+		stat.pl
+	"
+	# just being safe
+	for file in ${FILES}; do
+		edos2unix ${file}
+	done
+
+	# portable changes via sed vs patch
+	sed -i -e 's|file:files/|file:/etc/assp/|' \
+		-e 's|$base/images|/usr/share/assp/images|' \
+		-e 's|logs/maillog.txt|/var/log/assp/maillog.txt|' \
+		-e 's|PID File'\'',40,textinput,'\''pid'\''|PID File'\'',40,textinput,'\''asspd.pid'\''|' \
+		-e 's|Daemon\*\*'\'',0,checkbox,0|Daemon\*\*'\'',0,checkbox,1|' \
+		-e 's|UID\*\*'\'',20,textinput,'\'''\''|UID\*\*'\'',20,textinput,'\''assp'\''|' \
+		-e 's|GID\*\*'\'',20,textinput,'\'''\''|GID\*\*'\'',20,textinput,'\''assp'\''|' \
+		-e 's|$base/assp.cfg|/etc/assp/assp.cfg|g' \
+		-e 's|$base/$pidfile|/var/run/assp/asspd.pid|' \
+		-e 's|mkdir "$base/$logdir",0700 if $logdir;||' \
+		-e 's|mkdir "$base/$logdir",0700;||' \
+		-e 's|$base/$logfile|$logfile|' \
+		-e 's|$base/$logdir|$logdir|' \
+		-e 's|"maillog.log"|"/var/log/assp/maillog.log"|' \
+		-e 's|-d "$base/logs" or mkdir "$base/logs",0700;||' \
+		-e 's|-d "$base/notes" or mkdir "$base/notes",0700;||' \
+		-e 's|-d "$base/docs" or mkdir "$base/docs",0777;||' \
+		-e 's|$base/$archivelogfile|$archivelogfile|' \
+		-e 's|"$base/$file",$sub,"$this|"/etc/assp/$file",$sub,"$this|' \
+		-e 's|"$base/$file",'\'''\'',"$this|"/etc/assp/$file",'\'''\'',"$this|' \
+		-e 's|my $fil=$1; $fil="$base/$fil" if $fil!~/^\\Q$base\\E/i;|my $fil=$1;|' \
+		-e 's|$fil="$base/$fil" if $fil!~/^\\Q$base\\E/i;|$fil="/etc/assp/$fil" if $fil!~/^\\/etc\\/assp\\//i;|' \
+		-e 's|$fil="$base/$fil" if $fil!~/^((\[a-z\]:)?\[\\/\\\\\]\|\\Q$base\\E)/;||' \
+		-e 's|if ($fil !~ /^\\Q$base\\E/i) {|if ($fil !~ /^\\/usr\\/share\\/assp\\//i) {|' \
+		-e 's|$fil="$base/$fil";|$fil="/usr/share/assp/$fil";|' \
+		-e 's|Q$base\\E|Q\\/etc\\/assp\\/\\E|' \
+		-e 's|$fil="$base/$fil"|$fil="/etc/assp/$fil"|' \
+		-e 's|$base/$bf|/etc/assp/$bf|g' \
+		assp.pl || die
+
+	# questionable stuff
+#		-e 's|$fil="$base/$fil" if $fil!~/^\\Q$base\\E/i;|$fil="/etc/assp/$fil" if $fil!~/^\\Q\\/etc\\/assp\\/\\E/i;|' \
+#		-e 's|if ($fil !~ /^\\Q$base\\E/i) {|if ($fil !~ /^\\Q\\/usr\\/share\\/assp\\/\\E/i) {|' \
+#		-e 's|split('\'' '\'', $this|split('\''$base/'\'', $this|' \
+#		-e 's|split('\'' '\'',lc|split('\''$base/'\'',lc|' \
+#		-e 's|split('\'' '\'',$pat)|split('\''$base/'\'',$pat)|' \
+
+
+	# sed move2num.pl
+	sed -i -e 's|assp.cfg|/etc/assp/assp.cfg|' move2num.pl || die
+
+	# sed rebuildspamdb.pl
+	sed -i -e 's|assp.cfg|/etc/assp/assp.cfg|' \
+		-e 's|} && "$Config{base}/$Config{logfile}" \|\| '\''maillog.txt'\'';|};|' \
+		rebuildspamdb.pl || die
+
+	# sed stats.sh
+	sed -i -e 's|usr/local|var/log|' stats.sh || die
+
+	# patch is against unix-format, so patch after dos2unix
+	epatch "${FILESDIR}"/base.patch
+
+	# remove windows stuff
+	rm "${S}/addservice.pl" || die "Could not remove ${S}/addservice.pl"
+	rm -f "${S}/Win32-quickstart-guide.txt" || die "Could not remove ${S}/Win32-quickstart-guide.txt"
+}
+
+src_install() {
+	# Configuration directory
+	dodir /etc/assp/notes
+
+	insinto /etc/assp
+	# Installs files that are used by assp for black/gray lists,
+	# and domain country lookup. To be changed by admin as needed.
+	doins files/*.txt || die
+
+	fowners assp:assp /etc/assp -R
+	fperms 770 /etc/assp /etc/assp/notes
+
+	# 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 || die
+	insinto /usr/share/assp
+	doins -r images/ || die
+
+	# 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 "http://assp.sourceforge.net/docs.html"
+	elog
+	elog "If upgrading, please update your old config to set both"
+	elog "redre.txt and nodelay.txt path of /etc/assp.  There are"
+	elog "also many new options that you should review."
+	elog
+}
diff --git a/mail-filter/assp/files/base.patch b/mail-filter/assp/files/base.patch
new file mode 100644
index 000000000000..dfcf9573e7af
--- /dev/null
+++ b/mail-filter/assp/files/base.patch
@@ -0,0 +1,15 @@
+--- ASSP_1.3.3.7-Install/ASSP/assp.pl	2007-10-20 13:10:09.000000000 -0400
++++ ASSP_1.3.3.7-Install_orig/ASSP/assp.pl	2007-10-20 13:09:47.000000000 -0400
+@@ -83,11 +83,7 @@
+ 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','/etc/assp','/usr/assp','/applications/assp','/assp','.') {
+-  $base=$_;
+-  last if -e "/etc/assp/assp.cfg";
+- }
++  $base='$base/';
+ }
+ if ( !-e "/usr/share/assp/images/noIcon.png")
+ { die "Abort: folder 'images' not correctly installed";}
diff --git a/mail-filter/assp/files/digest-assp-1.3.3.1-r3 b/mail-filter/assp/files/digest-assp-1.3.3.1-r3
deleted file mode 100644
index 924aadbbd24d..000000000000
--- a/mail-filter/assp/files/digest-assp-1.3.3.1-r3
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 9ce0cc17ee9c8d8cb03d258b69812a11 ASSP_1.3.3.1-Install.zip 362975
-RMD160 a4a115f4451b07852a52b539d5047f0217ad9b7c ASSP_1.3.3.1-Install.zip 362975
-SHA256 810bebed2f48a480c7e7458fb9b6e2fbe3f39c441d74aa8471b458aa0e33e47b ASSP_1.3.3.1-Install.zip 362975
-MD5 71af75a312d2a98ab65af86d8630ec02 assp-1.3.3.1-r3.patch.tbz2 10319
-RMD160 100b5ee15b994c266a60797595c8cd873c92b7f2 assp-1.3.3.1-r3.patch.tbz2 10319
-SHA256 5b491f42f8006dcaa176d70976532cbcc4f9814d50721fb1eeddb75588bb8140 assp-1.3.3.1-r3.patch.tbz2 10319
diff --git a/mail-filter/assp/files/digest-assp-1.3.3.1-r4 b/mail-filter/assp/files/digest-assp-1.3.3.1-r4
deleted file mode 100644
index 3a6f47155742..000000000000
--- a/mail-filter/assp/files/digest-assp-1.3.3.1-r4
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 9ce0cc17ee9c8d8cb03d258b69812a11 ASSP_1.3.3.1-Install.zip 362975
-RMD160 a4a115f4451b07852a52b539d5047f0217ad9b7c ASSP_1.3.3.1-Install.zip 362975
-SHA256 810bebed2f48a480c7e7458fb9b6e2fbe3f39c441d74aa8471b458aa0e33e47b ASSP_1.3.3.1-Install.zip 362975
-MD5 ede39ec523c0ee58b3bba4b5eb0d68ce assp-1.3.3.1-r4.patch.tbz2 10121
-RMD160 2ebead13474b7281b81476e7827a25106f5fb1ca assp-1.3.3.1-r4.patch.tbz2 10121
-SHA256 717b4b2cb2d42402910d8b8317a0ca63747883c31f8908da3c0dcbf81b2a266b assp-1.3.3.1-r4.patch.tbz2 10121
diff --git a/mail-filter/assp/files/digest-assp-1.3.3.8 b/mail-filter/assp/files/digest-assp-1.3.3.8
new file mode 100644
index 000000000000..668225500773
--- /dev/null
+++ b/mail-filter/assp/files/digest-assp-1.3.3.8
@@ -0,0 +1,3 @@
+MD5 fad56889a74acc10769789bdc887f620 ASSP_1.3.3.8-Install.zip 332926
+RMD160 823307c69887aaaaf0440af637c186d1ac147a33 ASSP_1.3.3.8-Install.zip 332926
+SHA256 48a84aa63cbcff99833710c7ccbef69933558e98368982456f5ec8d201fad3ba ASSP_1.3.3.8-Install.zip 332926