Tweaked patch a bit further, fixed a few path issues mostly for admin web gui.

Package-Manager: portage-2.1.3.7

4 files changed, 160 insertions, 5 deletions

diff --git a/mail-filter/assp/ChangeLog b/mail-filter/assp/ChangeLog
index e20dac7ef3d1..9c1a5f685afb 100644
--- a/mail-filter/assp/ChangeLog
+++ b/mail-filter/assp/ChangeLog
@@ -1,6 +1,12 @@
 # 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.19 2007/09/05 18:38:08 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/assp/ChangeLog,v 1.20 2007/09/06 15:45:15 wltjr Exp $
+
+*assp-1.3.3.1-r4 (06 Sep 2007)
+
+  06 Sep 2007; William L. Thomson Jr. <wltjr@gentoo.org>
+  +assp-1.3.3.1-r4.ebuild:
+  Tweaked patch a bit further, fixed a few path issues mostly for admin web gui.
 
 *assp-1.3.3.1-r3 (05 Sep 2007)
 
diff --git a/mail-filter/assp/Manifest b/mail-filter/assp/Manifest
index e22ec1f64a3d..702b16949a01 100644
--- a/mail-filter/assp/Manifest
+++ b/mail-filter/assp/Manifest
@@ -9,6 +9,7 @@ SHA256 4ec543f7c2f006d80dcb592d50f44a41e8aa2cd449f65a6e1cd53996e67b2fde files/as
 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
@@ -17,10 +18,14 @@ EBUILD assp-1.3.3.1-r3.ebuild 3329 RMD160 5a31751865febfc0612f6466a16eb86f0405b8
 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
-MISC ChangeLog 4738 RMD160 4866451ebfcd2a2d49294fede84e7cca8b53cbe0 SHA1 3c7ef7e20823a97798bd51bfb155d96a233bbc88 SHA256 35c2409ba147fbb6b905d6524732b6d2395c4ea7126a2b7cc43e20ff34fef5e4
-MD5 036fdd3da64e83bbde36bcab50f47e7f ChangeLog 4738
-RMD160 4866451ebfcd2a2d49294fede84e7cca8b53cbe0 ChangeLog 4738
-SHA256 35c2409ba147fbb6b905d6524732b6d2395c4ea7126a2b7cc43e20ff34fef5e4 ChangeLog 4738
+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
 MISC metadata.xml 808 RMD160 dc6fd8b7e0ae86eb40342064e3820cd8fbd83193 SHA1 c24f1667c370bfff799a6289bcdafc06b405f8ec SHA256 b33778bfaa6a4537f5e5ea54bee8641126c9655505b26c85cc11a91cc288b5a6
 MD5 31d7bb0d82eeb1c4fde76228f3d71a8d metadata.xml 808
 RMD160 dc6fd8b7e0ae86eb40342064e3820cd8fbd83193 metadata.xml 808
@@ -31,3 +36,6 @@ SHA256 020336ad57d85e5c03a76dbbc5c041ee345f51ad0ec4ea015671215ec1adc512 files/di
 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
diff --git a/mail-filter/assp/assp-1.3.3.1-r4.ebuild b/mail-filter/assp/assp-1.3.3.1-r4.ebuild
new file mode 100644
index 000000000000..df6e6d1b0b48
--- /dev/null
+++ b/mail-filter/assp/assp-1.3.3.1-r4.ebuild
@@ -0,0 +1,135 @@
+# 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/files/digest-assp-1.3.3.1-r4 b/mail-filter/assp/files/digest-assp-1.3.3.1-r4
new file mode 100644
index 000000000000..3a6f47155742
--- /dev/null
+++ b/mail-filter/assp/files/digest-assp-1.3.3.1-r4
@@ -0,0 +1,6 @@
+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