Fixed issue with spam/notspam folders being created in the logging directory instead of /var/lib/assp

Package-Manager: portage-2.1.2_rc1-r6

4 files changed, 173 insertions, 5 deletions

diff --git a/mail-filter/assp/ChangeLog b/mail-filter/assp/ChangeLog
index 7a63c106bab5..c953aedf4c5b 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.2 2006/11/19 06:00:30 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/assp/ChangeLog,v 1.3 2006/11/19 17:32:39 wltjr Exp $
+
+*assp-1.2.5-r1 (19 Nov 2006)
+
+  19 Nov 2006; William L. Thomson Jr. <wltjr@gentoo.org>
+  +assp-1.2.5-r1.ebuild:
+  Fixed issue with spam/notspam folders being created in the logging directory
+  instead of /var/lib/assp
 
   19 Nov 2006; William L. Thomson Jr. <wltjr@gentoo.org> assp-1.2.5.ebuild:
   Added support for SRS via dev-perl/Mail-SRS if srs USE flag is set.
diff --git a/mail-filter/assp/Manifest b/mail-filter/assp/Manifest
index 1aa2756914d3..ba96a84b6b79 100644
--- a/mail-filter/assp/Manifest
+++ b/mail-filter/assp/Manifest
@@ -3,14 +3,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-r1.ebuild 4324 RMD160 a848c4d8bfeb74553ee76cef6a6f4ae0f7d2e8a9 SHA1 0be45b0b139d9b9c4af1f9bc359db11a6628766a SHA256 d9875f468d934e899e464b629dbc88be74908c1ac07de10141dd27000e5b46cb
+MD5 d3aafecfed26b75fe2894abbe606d7c3 assp-1.2.5-r1.ebuild 4324
+RMD160 a848c4d8bfeb74553ee76cef6a6f4ae0f7d2e8a9 assp-1.2.5-r1.ebuild 4324
+SHA256 d9875f468d934e899e464b629dbc88be74908c1ac07de10141dd27000e5b46cb assp-1.2.5-r1.ebuild 4324
 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 531 RMD160 7ea74bd9317a1818954441999ba737b130118db7 SHA1 f9a129df86bb7bebaa95f5a900c1ff6fc32564ee SHA256 2a0dadc4f9e9c8b30d2a0e2a3abe31044e0fefe3b93ba76bb8d291251cae93f9
-MD5 8fc66680f6a6b47908cb0472fa153081 ChangeLog 531
-RMD160 7ea74bd9317a1818954441999ba737b130118db7 ChangeLog 531
-SHA256 2a0dadc4f9e9c8b30d2a0e2a3abe31044e0fefe3b93ba76bb8d291251cae93f9 ChangeLog 531
+MISC ChangeLog 750 RMD160 88f683242f7428f4b0b8f0366913f8c50cfa00d9 SHA1 f573aa380a447c4be67e81c54170a3551ff88278 SHA256 f87ad1a598ddfc4a90c95e06b87e2f1d9ec6be4c49f8b2a139a39d1ca94784d8
+MD5 17f36d34188a8b51aaa1de4efcd2d216 ChangeLog 750
+RMD160 88f683242f7428f4b0b8f0366913f8c50cfa00d9 ChangeLog 750
+SHA256 f87ad1a598ddfc4a90c95e06b87e2f1d9ec6be4c49f8b2a139a39d1ca94784d8 ChangeLog 750
 MISC metadata.xml 808 RMD160 dc6fd8b7e0ae86eb40342064e3820cd8fbd83193 SHA1 c24f1667c370bfff799a6289bcdafc06b405f8ec SHA256 b33778bfaa6a4537f5e5ea54bee8641126c9655505b26c85cc11a91cc288b5a6
 MD5 31d7bb0d82eeb1c4fde76228f3d71a8d metadata.xml 808
 RMD160 dc6fd8b7e0ae86eb40342064e3820cd8fbd83193 metadata.xml 808
@@ -18,3 +22,6 @@ SHA256 b33778bfaa6a4537f5e5ea54bee8641126c9655505b26c85cc11a91cc288b5a6 metadata
 MD5 24d9ce96160cb290c6872107dc5b6928 files/digest-assp-1.2.5 247
 RMD160 5eb32c5a2e77a2e5b0e74aaaa95059be0e0d6f85 files/digest-assp-1.2.5 247
 SHA256 8829c42c614f1cdf2569938d0d02d82300c4acb6dccb999aafd400ae23461656 files/digest-assp-1.2.5 247
+MD5 24d9ce96160cb290c6872107dc5b6928 files/digest-assp-1.2.5-r1 247
+RMD160 5eb32c5a2e77a2e5b0e74aaaa95059be0e0d6f85 files/digest-assp-1.2.5-r1 247
+SHA256 8829c42c614f1cdf2569938d0d02d82300c4acb6dccb999aafd400ae23461656 files/digest-assp-1.2.5-r1 247
diff --git a/mail-filter/assp/assp-1.2.5-r1.ebuild b/mail-filter/assp/assp-1.2.5-r1.ebuild
new file mode 100644
index 000000000000..97f9d0a5335c
--- /dev/null
+++ b/mail-filter/assp/assp-1.2.5-r1.ebuild
@@ -0,0 +1,151 @@
+# 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-r1.ebuild,v 1.1 2006/11/19 17:32:39 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:$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 ":[AvPath,':s:'':/var/lib/clamav/:" \
+		-e 's/\r//' \
+		"${S}"/assp.pl || die "sed failed"
+
+# Security fix - allow only css/gif/jpg/png files
+#		-e '/($fil=/s:$fil=.*):$fil!~/usr/share/assp/.*\\.(css|gif|jpg|png)$/i):' \
+
+	# move2num.pl
+	sed -i -e 's:assp.cfg:/etc/assp/assp.cfg:' \
+		"${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}:' \
+		"${S}/rebuildspamdb.pl" || die "sed failed"
+
+	# Replace path for default maillog.log
+	sed -i -e 's:/usr/local/:/var/log/assp/:' "${S}/stats.sh" \
+		|| die "sed failed"
+
+	# rename utils
+	mv "${S}"/stats.sh "${S}"/asspstats.sh
+	mv "${S}"/stat.pl "${S}"/asspstat.pl
+	mv "${S}"/repair.pl "${S}"/assprepair.pl
+	mv "${S}"/rebuildspamdb.pl "${S}"/assprebuildspamdb.pl
+	mv "${S}"/move2num.pl "${S}"/asspmove2num.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-r1 b/mail-filter/assp/files/digest-assp-1.2.5-r1
new file mode 100644
index 000000000000..b1a96621e5e7
--- /dev/null
+++ b/mail-filter/assp/files/digest-assp-1.2.5-r1
@@ -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