Additional sed improvements, tweaked existing, added new expression. Both thanks to ovaron2 as always.

Package-Manager: portage-2.1.3.15

4 files changed, 202 insertions, 5 deletions

diff --git a/mail-filter/assp/ChangeLog b/mail-filter/assp/ChangeLog
index a99b1e1b2296..feecba12050b 100644
--- a/mail-filter/assp/ChangeLog
+++ b/mail-filter/assp/ChangeLog
@@ -1,6 +1,13 @@
 # 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.22 2007/10/22 03:57:07 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/assp/ChangeLog,v 1.23 2007/10/23 21:57:11 wltjr Exp $
+
+*assp-1.3.3.8-r1 (23 Oct 2007)
+
+  23 Oct 2007; William L. Thomson Jr. <wltjr@gentoo.org>
+  +assp-1.3.3.8-r1.ebuild:
+  Additional sed improvements, tweaked existing, added new expression. Both
+  thanks to ovaron2 as always.
 
   22 Oct 2007; William L. Thomson Jr. <wltjr@gentoo.org>
   assp-1.3.3.8.ebuild:
diff --git a/mail-filter/assp/Manifest b/mail-filter/assp/Manifest
index c930f98c9965..2047974335f0 100644
--- a/mail-filter/assp/Manifest
+++ b/mail-filter/assp/Manifest
@@ -16,14 +16,18 @@ EBUILD assp-1.2.6-r3.ebuild 2793 RMD160 ab3c65b8b3ed8280ed2ceefba0801850405af9c1
 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-r1.ebuild 5838 RMD160 2b308ea0e764505ae2cab38424cf29bf81d0e353 SHA1 3815947a33c2b0e6b458f2daf7c2eb2ded15bab8 SHA256 b07300f21900af81065624e20bc6186b9745f2815e17f65383812e42ac1eeca2
+MD5 8b2ced21b4cba9b5511a0a0cd38261a2 assp-1.3.3.8-r1.ebuild 5838
+RMD160 2b308ea0e764505ae2cab38424cf29bf81d0e353 assp-1.3.3.8-r1.ebuild 5838
+SHA256 b07300f21900af81065624e20bc6186b9745f2815e17f65383812e42ac1eeca2 assp-1.3.3.8-r1.ebuild 5838
 EBUILD assp-1.3.3.8.ebuild 5688 RMD160 d9f27c38c51ff4e88207f7c38006d2cda5828c09 SHA1 992ec19141f1e6e39f18179c9f0d550e9a1cd6ad SHA256 1ec6fd23bba433495aa0f96d5999cc6c3b2279f2505a1dc51ef4256299b6048f
 MD5 0ed7b5ad21ad879214bc234ac292fcc0 assp-1.3.3.8.ebuild 5688
 RMD160 d9f27c38c51ff4e88207f7c38006d2cda5828c09 assp-1.3.3.8.ebuild 5688
 SHA256 1ec6fd23bba433495aa0f96d5999cc6c3b2279f2505a1dc51ef4256299b6048f assp-1.3.3.8.ebuild 5688
-MISC ChangeLog 5498 RMD160 c7ce8430b27151f1cde3a58288d6ee1240f84469 SHA1 93facac88eb717393f8fd353de9b27f41b546fe1 SHA256 5e13fa3f1003d1dfc7af34dcb4034e1954c1866976d125680565d9fb1a7c82af
-MD5 be428a1e942ea17cd64e04896d5a4ae0 ChangeLog 5498
-RMD160 c7ce8430b27151f1cde3a58288d6ee1240f84469 ChangeLog 5498
-SHA256 5e13fa3f1003d1dfc7af34dcb4034e1954c1866976d125680565d9fb1a7c82af ChangeLog 5498
+MISC ChangeLog 5722 RMD160 0f6ed36cd7443192be5cd23ee352334831f725f8 SHA1 ef2c3681c806d9c919f134876aa58d051f38cd51 SHA256 a1835f16c7c7294bf205123de98c0161a5f71cf1d7be9dfe9696cbc6ae8ca0a2
+MD5 249cdc8ad7b3d100f9ada2be32400ab2 ChangeLog 5722
+RMD160 0f6ed36cd7443192be5cd23ee352334831f725f8 ChangeLog 5722
+SHA256 a1835f16c7c7294bf205123de98c0161a5f71cf1d7be9dfe9696cbc6ae8ca0a2 ChangeLog 5722
 MISC metadata.xml 808 RMD160 dc6fd8b7e0ae86eb40342064e3820cd8fbd83193 SHA1 c24f1667c370bfff799a6289bcdafc06b405f8ec SHA256 b33778bfaa6a4537f5e5ea54bee8641126c9655505b26c85cc11a91cc288b5a6
 MD5 31d7bb0d82eeb1c4fde76228f3d71a8d metadata.xml 808
 RMD160 dc6fd8b7e0ae86eb40342064e3820cd8fbd83193 metadata.xml 808
@@ -34,3 +38,6 @@ SHA256 020336ad57d85e5c03a76dbbc5c041ee345f51ad0ec4ea015671215ec1adc512 files/di
 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
+MD5 95c094c1ec31f445a65af9cef8f9e11d files/digest-assp-1.3.3.8-r1 253
+RMD160 995fe1d4f5319bc105612d6ae984b82b0a5bb5f8 files/digest-assp-1.3.3.8-r1 253
+SHA256 a0b9f6b2e2dc0ff3d55c082f83ca899730c762d35961741ce25ad56e19ff110a files/digest-assp-1.3.3.8-r1 253
diff --git a/mail-filter/assp/assp-1.3.3.8-r1.ebuild b/mail-filter/assp/assp-1.3.3.8-r1.ebuild
new file mode 100644
index 000000000000..6887f2e31b24
--- /dev/null
+++ b/mail-filter/assp/assp-1.3.3.8-r1.ebuild
@@ -0,0 +1,180 @@
+# 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-r1.ebuild,v 1.1 2007/10/23 21:57:11 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
+	dev-perl/libwww-perl
+	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|popFileEditor'\('\\'\''pb/pbdb\.\([^\.]*\)\.db\\'\'',|popFileEditor(\\'\''/var/lib/assp/pb/pbdb.\1.db\\'\'',|g' \
+		-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\\/\|\\/var\\/lib\\/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/digest-assp-1.3.3.8-r1 b/mail-filter/assp/files/digest-assp-1.3.3.8-r1
new file mode 100644
index 000000000000..668225500773
--- /dev/null
+++ b/mail-filter/assp/files/digest-assp-1.3.3.8-r1
@@ -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