Bump to version 20030616_p7. Add patch to treat the sql user id as string.

8 files changed, 139 insertions, 11 deletions

diff --git a/net-mail/amavisd-new/ChangeLog b/net-mail/amavisd-new/ChangeLog
index eb3dce31e790..42605938c74c 100644
--- a/net-mail/amavisd-new/ChangeLog
+++ b/net-mail/amavisd-new/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-mail/amavisd-new
 # Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/amavisd-new/ChangeLog,v 1.6 2003/11/12 21:48:39 max Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/amavisd-new/ChangeLog,v 1.7 2004/01/14 19:53:04 max Exp $
+
+*amavisd-new-20030616_p7 (14 Jan 2004)
+
+  14 Jan 2004; Max Kalika <max@gentoo.org> amavisd-new-20030616_p4.ebuild,
+  amavisd-new-20030616_p5.ebuild, amavisd-new-20030616_p6.ebuild,
+  amavisd-new-20030616_p7.ebuild, files/uid-as-string.patch:
+  Bump to version 20030616_p7. Add patch to treat the sql user id as string.
 
   12 Nov 2003; <max@gentoo.org> amavisd-new-20030616_p4.ebuild,
   amavisd-new-20030616_p5.ebuild, amavisd-new-20030616_p6.ebuild:
diff --git a/net-mail/amavisd-new/Manifest b/net-mail/amavisd-new/Manifest
index 47cf4d921b76..5711c0b76fa4 100644
--- a/net-mail/amavisd-new/Manifest
+++ b/net-mail/amavisd-new/Manifest
@@ -1,9 +1,12 @@
-MD5 4a0557d2c95a80191374ce2f7136e432 amavisd-new-20030616_p5.ebuild 2494
-MD5 42b7b78e37c7107b9a71f362592685a0 amavisd-new-20030616_p4.ebuild 2494
-MD5 0c8bbc073cecbc7cd7ce645fd29b5767 ChangeLog 2287
+MD5 fd8dc45a97924b894c35641c5dbb89fc amavisd-new-20030616_p5.ebuild 2490
+MD5 f3224295339338f3943522f5ea9d59fa amavisd-new-20030616_p7.ebuild 2651
+MD5 e6b1ceac16c6dbc0d4e984f76b62b987 amavisd-new-20030616_p4.ebuild 2490
+MD5 179db43a89721a9f6b45f0d4ba1fb7e1 ChangeLog 2607
 MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
-MD5 3fc0967b27f5d26ee5ef92087af7717b amavisd-new-20030616_p6.ebuild 2569
+MD5 cf129673ec295ac40234098f5e2f21be amavisd-new-20030616_p6.ebuild 2565
 MD5 1f1f4cf9c92f92f966361a8ac08aa543 files/amavisd.rc6 305
+MD5 8bae863e2b884ccbdb5fb4d4b28c62e2 files/uid-as-string.patch 630
 MD5 aaacf14c899eec1d21540060c1998ebe files/digest-amavisd-new-20030616_p4 75
 MD5 3d9eca93d9877f4e54b46205a89577bb files/digest-amavisd-new-20030616_p5 75
 MD5 4af50566468c016f4a33e887ea0c0a8e files/digest-amavisd-new-20030616_p6 75
+MD5 1a92ea74f38290a7e6e27c2bb839345d files/digest-amavisd-new-20030616_p7 75
diff --git a/net-mail/amavisd-new/amavisd-new-20030616_p4.ebuild b/net-mail/amavisd-new/amavisd-new-20030616_p4.ebuild
index 99f47a2ebd81..ae1bca45e395 100644
--- a/net-mail/amavisd-new/amavisd-new-20030616_p4.ebuild
+++ b/net-mail/amavisd-new/amavisd-new-20030616_p4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/amavisd-new/amavisd-new-20030616_p4.ebuild,v 1.7 2003/11/14 21:26:27 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/amavisd-new/amavisd-new-20030616_p4.ebuild,v 1.8 2004/01/14 19:53:04 max Exp $
 
 inherit eutils
 
diff --git a/net-mail/amavisd-new/amavisd-new-20030616_p5.ebuild b/net-mail/amavisd-new/amavisd-new-20030616_p5.ebuild
index 09616b4d30df..f25c512f8358 100644
--- a/net-mail/amavisd-new/amavisd-new-20030616_p5.ebuild
+++ b/net-mail/amavisd-new/amavisd-new-20030616_p5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/amavisd-new/amavisd-new-20030616_p5.ebuild,v 1.7 2003/11/14 21:26:28 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/amavisd-new/amavisd-new-20030616_p5.ebuild,v 1.8 2004/01/14 19:53:04 max Exp $
 
 inherit eutils
 
diff --git a/net-mail/amavisd-new/amavisd-new-20030616_p6.ebuild b/net-mail/amavisd-new/amavisd-new-20030616_p6.ebuild
index bfceaf360bfb..eb3f023bee11 100644
--- a/net-mail/amavisd-new/amavisd-new-20030616_p6.ebuild
+++ b/net-mail/amavisd-new/amavisd-new-20030616_p6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/amavisd-new/amavisd-new-20030616_p6.ebuild,v 1.4 2003/11/14 21:26:28 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/amavisd-new/amavisd-new-20030616_p6.ebuild,v 1.5 2004/01/14 19:53:04 max Exp $
 
 inherit eutils
 
diff --git a/net-mail/amavisd-new/amavisd-new-20030616_p7.ebuild b/net-mail/amavisd-new/amavisd-new-20030616_p7.ebuild
new file mode 100644
index 000000000000..3381d235161f
--- /dev/null
+++ b/net-mail/amavisd-new/amavisd-new-20030616_p7.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/amavisd-new/amavisd-new-20030616_p7.ebuild,v 1.1 2004/01/14 19:53:04 max Exp $
+
+inherit eutils
+
+DESCRIPTION="High-performance interface between the MTA and content checkers."
+HOMEPAGE="http://www.ijs.si/software/amavisd/"
+SRC_URI="http://www.ijs.si/software/amavisd/${PN}-${PV/_/-}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="x86"
+IUSE="ldap mysql postgres milter"
+
+DEPEND=">=sys-apps/sed-4"
+
+RDEPEND="${DEPEND}
+	>=sys-apps/coreutils-5.0-r3
+	app-arch/gzip
+	app-arch/bzip2
+	app-arch/arc
+	app-arch/lha
+	app-arch/unarj
+	app-arch/unrar
+	app-arch/zoo
+	dev-perl/Archive-Tar
+	dev-perl/Archive-Zip
+	dev-perl/Compress-Zlib
+	dev-perl/Convert-TNEF
+	dev-perl/Convert-UUlib
+	dev-perl/MIME-Base64
+	dev-perl/MIME-tools
+	>=dev-perl/MailTools-1.58
+	dev-perl/net-server
+	>=dev-perl/libnet-1.12
+	dev-perl/Digest-MD5
+	dev-perl/IO-stringy
+	dev-perl/Time-HiRes
+	dev-perl/Unix-Syslog
+	dev-perl/Mail-SpamAssassin
+	virtual/mta
+	virtual/antivirus
+	ldap? ( dev-perl/perl-ldap )
+	mysql? ( dev-perl/DBD-mysql )
+	postgres? ( dev-perl/DBD-Pg )
+	milter? ( >=net-mail/sendmail-8.12 )"
+
+S="${WORKDIR}/${PN}-${PV/_*/}"
+
+src_unpack() {
+	unpack ${A} && cd "${S}"
+	epatch "${FILESDIR}/uid-as-string.patch"
+}
+
+src_compile() {
+	if [ "`use milter`" ] ; then
+		cd "${S}/helper-progs"
+
+		econf --with-runtime-dir=/var/run/amavis \
+			--with-sockname=/var/run/amavis/amavisd.sock \
+			--with-user=amavis
+		emake || die "compile problem"
+
+		cd "${S}"
+	fi
+}
+
+src_install() {
+	enewgroup amavis
+	enewuser amavis -1 /bin/false /var/lib/amavis amavis
+
+	dosbin amavisd
+
+	insinto /etc
+	doins amavisd.conf
+	dosed "s:^#\\?\\\$MYHOME[^;]*;:\$MYHOME = '/var/run/amavis';:" \
+		/etc/amavisd.conf
+	dosed "s:^#\\?\\\$daemon_user[^;]*;:\$daemon_user = 'amavis';:" \
+		/etc/amavisd.conf
+	dosed "s:^#\\?\\\$daemon_group[^;]*;:\$daemon_group = 'amavis';:" \
+		/etc/amavisd.conf
+	if [ "$(domainname)" = "(none)" ] ; then
+		dosed "s:^#\\?\\\$mydomain[^;]*;:\$mydomain = '$(hostname)';:" \
+			/etc/amavisd.conf
+	else
+		dosed "s:^#\\?\\\$mydomain[^;]*;:\$mydomain = '$(domainname)';:" \
+			/etc/amavisd.conf
+	fi
+
+	exeinto /etc/init.d
+	newexe "${FILESDIR}/amavisd.rc6" amavisd
+
+	keepdir /var/spool/amavis /var/run/amavis
+	fowners amavis:amavis /var/spool/amavis /var/run/amavis
+	fperms 0750 /var/spool/amavis /var/run/amavis
+
+	newdoc test-messages/README README.samples
+	dodoc AAAREADME.first INSTALL LDAP.schema LICENSE MANIFEST RELEASE_NOTES \
+		README_FILES/* test-messages/sample-*
+
+	if [ "`use milter`" ] ; then
+		cd "${S}/helper-progs"
+		einstall
+	fi
+}
diff --git a/net-mail/amavisd-new/files/digest-amavisd-new-20030616_p7 b/net-mail/amavisd-new/files/digest-amavisd-new-20030616_p7
new file mode 100644
index 000000000000..169d32645468
--- /dev/null
+++ b/net-mail/amavisd-new/files/digest-amavisd-new-20030616_p7
@@ -0,0 +1 @@
+MD5 e6f35be1e14861e3869debdd9bdfbfba amavisd-new-20030616-p7.tar.gz 315850
diff --git a/net-mail/amavisd-new/files/uid-as-string.patch b/net-mail/amavisd-new/files/uid-as-string.patch
new file mode 100644
index 000000000000..b06fb2c0cbf4
--- /dev/null
+++ b/net-mail/amavisd-new/files/uid-as-string.patch
@@ -0,0 +1,11 @@
+--- amavisd.orig	2004-01-13 08:20:59.000000000 -0800
++++ amavisd	2004-01-13 08:21:16.000000000 -0800
+@@ -4968,7 +4968,7 @@
+ 		#            B0: boolean, nonexistent field treated as false,
+ 		#            B1: boolean, nonexistent field treated as true
+ 		my $nf = sub {Amavis::Lookup::SQLfield->new($sql_policy,@_)}; #shorthand
+-		$user_id_sql		= $nf->('id',                  'N');
++		$user_id_sql		= $nf->('id',                  'S');
+ 		$virus_lovers_sql       = $nf->('virus_lover',         'B0');
+ 		$spam_lovers_sql        = $nf->('spam_lover',          'B-');
+ 		$banned_files_lovers_sql= $nf->('banned_files_lover',  'B-');