Version bump to 1.6 for bug 108124 and also a purge.

(Portage version: 2.0.53_rc4)

12 files changed, 26 insertions, 247 deletions

diff --git a/mail-filter/gld/ChangeLog b/mail-filter/gld/ChangeLog
index adea2191a105..59965e7f949c 100644
--- a/mail-filter/gld/ChangeLog
+++ b/mail-filter/gld/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for mail-filter/gld
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/gld/ChangeLog,v 1.24 2005/08/21 11:44:07 slarti Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/gld/ChangeLog,v 1.25 2005/10/08 08:36:12 slarti Exp $
+
+*gld-1.6 (08 Oct 2005)
+
+  08 Oct 2005; Tom Martin <slarti@gentoo.org>
+  -files/gld-1.5.2-mxgrey-fix.patch, -gld-1.4.ebuild, -gld-1.5.ebuild,
+  -gld-1.5-r1.ebuild, -gld-1.5-r2.ebuild, +gld-1.6.ebuild:
+  Version bump to 1.6 for bug 108124 and also a purge.
 
   21 Aug 2005; Tom Martin <slarti@gentoo.org>
   +files/gld-1.5.2-mxgrey-fix.patch, gld-1.5.2.ebuild:
diff --git a/mail-filter/gld/Manifest b/mail-filter/gld/Manifest
index 790b06310c04..2437dd8bbbd8 100644
--- a/mail-filter/gld/Manifest
+++ b/mail-filter/gld/Manifest
@@ -1,25 +1,17 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 974cd6869dfa50025d5a8f8097f29b3f ChangeLog 3867
-MD5 ee053a16e9eae0a66bd394e135dbe16b gld-1.5-r1.ebuild 1595
-MD5 fd1a136fe1866eb522142c76feafa47e gld-1.4.ebuild 1159
-MD5 9b90c83173d174bf703b7cd1962b298f gld-1.5.ebuild 1363
-MD5 c06c8a7fc6d211a8f437ee1f1023b230 gld-1.5-r2.ebuild 1592
-MD5 8a1c6c5f4c13a4109f6f4198fdd1874b metadata.xml 223
-MD5 92553e000dd0a23d31042352b053cbdf gld-1.5.2.ebuild 1562
-MD5 916c55bdbe2dcf1a53507a6d0028158c files/gld-1.5.2-mxgrey-fix.patch 1696
+MD5 96d50f09283d0a87235b23ce0795499e files/Makefile.in 980
 MD5 408be3de93fe18f0361ad976ab36589f files/digest-gld-1.4 55
 MD5 4ec33dbb0fd9c8a61e86f738deb457e4 files/digest-gld-1.5 55
+MD5 4ec33dbb0fd9c8a61e86f738deb457e4 files/digest-gld-1.5-r1 55
 MD5 4ec33dbb0fd9c8a61e86f738deb457e4 files/digest-gld-1.5-r2 55
-MD5 96d50f09283d0a87235b23ce0795499e files/Makefile.in 980
-MD5 4e2b779070d26c7675574fe2420541b8 files/gld.rc 544
 MD5 63658f0d53451dbb79e4330fd997bfab files/digest-gld-1.5.2 57
-MD5 4ec33dbb0fd9c8a61e86f738deb457e4 files/digest-gld-1.5-r1 55
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDCHdZCHk4+ZoBpvsRAgukAJ9xBrEFIH26v54pJ2WF0EcQ+mp+WgCeKZ9J
-Pc+6zcYVsnu4Jv0NmHR6M9o=
-=C0hJ
------END PGP SIGNATURE-----
+MD5 f91281c6461e403a77e5351e89e398be files/digest-gld-1.6 55
+MD5 916c55bdbe2dcf1a53507a6d0028158c files/gld-1.5.2-mxgrey-fix.patch 1696
+MD5 4e2b779070d26c7675574fe2420541b8 files/gld.rc 544
+MD5 fd1a136fe1866eb522142c76feafa47e gld-1.4.ebuild 1159
+MD5 ee053a16e9eae0a66bd394e135dbe16b gld-1.5-r1.ebuild 1595
+MD5 c06c8a7fc6d211a8f437ee1f1023b230 gld-1.5-r2.ebuild 1592
+MD5 92553e000dd0a23d31042352b053cbdf gld-1.5.2.ebuild 1562
+MD5 9b90c83173d174bf703b7cd1962b298f gld-1.5.ebuild 1363
+MD5 c06c8a7fc6d211a8f437ee1f1023b230 gld-1.6.ebuild 1592
+MD5 8a1c6c5f4c13a4109f6f4198fdd1874b metadata.xml 223
diff --git a/mail-filter/gld/files/digest-gld-1.4 b/mail-filter/gld/files/digest-gld-1.4
deleted file mode 100644
index 409a45933846..000000000000
--- a/mail-filter/gld/files/digest-gld-1.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 0913b8e940a02f1ea011c6601474f08b gld-1.4.tgz 35714
diff --git a/mail-filter/gld/files/digest-gld-1.5 b/mail-filter/gld/files/digest-gld-1.5
deleted file mode 100644
index 9642302f57d8..000000000000
--- a/mail-filter/gld/files/digest-gld-1.5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 0696b6c469a19bfb92bf93b19955cab6 gld-1.5.tgz 39132
diff --git a/mail-filter/gld/files/digest-gld-1.5-r1 b/mail-filter/gld/files/digest-gld-1.5-r1
deleted file mode 100644
index 9642302f57d8..000000000000
--- a/mail-filter/gld/files/digest-gld-1.5-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 0696b6c469a19bfb92bf93b19955cab6 gld-1.5.tgz 39132
diff --git a/mail-filter/gld/files/digest-gld-1.5-r2 b/mail-filter/gld/files/digest-gld-1.5-r2
deleted file mode 100644
index 9642302f57d8..000000000000
--- a/mail-filter/gld/files/digest-gld-1.5-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 0696b6c469a19bfb92bf93b19955cab6 gld-1.5.tgz 39132
diff --git a/mail-filter/gld/files/digest-gld-1.6 b/mail-filter/gld/files/digest-gld-1.6
new file mode 100644
index 000000000000..6f536e654c6f
--- /dev/null
+++ b/mail-filter/gld/files/digest-gld-1.6
@@ -0,0 +1 @@
+MD5 95cfe17b92767db4460385972c7f6774 gld-1.6.tgz 40333
diff --git a/mail-filter/gld/files/gld-1.5.2-mxgrey-fix.patch b/mail-filter/gld/files/gld-1.5.2-mxgrey-fix.patch
deleted file mode 100644
index c13e4dc8f971..000000000000
--- a/mail-filter/gld/files/gld-1.5.2-mxgrey-fix.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- gld-1.5.2/greylist.c.orig	2005-08-17 00:44:06.000000000 +0200
-+++ gld-1.5.2/greylist.c	2005-08-17 00:40:32.000000000 +0200
-@@ -181,10 +181,29 @@
- 
- 	if(conf->update==1)
- 		{
--  		if(conf->lightd==1 && fnotdomain==1)
--			snprintf(query,sizeof(query)-1,"update greylist set last=%d,n=n+1 where ip='%s' and sender='%s' and recipient='%s'",ts,ip,osender,orecipient);
--
--        	snprintf(query,sizeof(query)-1,"update greylist set last=%d,n=n+1 where ip='%s' and sender='%s' and recipient='%s'",ts,ip,sender,recipient);
-+
-+		if(ts-n>conf->mini)
-+			{
-+	  		if(conf->lightd==1 && fnotdomain==1)
-+				snprintf(query,sizeof(query)-1,"update greylist set last=%d,n=n+1 where ip='%s' and sender='%s' and recipient='%s'",ts,ip,osender,orecipient);
-+
-+        		snprintf(query,sizeof(query)-1,"update greylist set last=%d,n=n+1 where ip='%s' and sender='%s' and recipient='%s'",ts,ip,sender,recipient);
-+		}
-+		else
-+		{
-+			//
-+			// We have NOT reached the greylist-timeout, so we do NOT increase the message-counter (SQL-field n),
-+			// because otherwise we will braek the MXGREY-option.
-+			// In fact this means that the THIRD retry will immidiately pass the greylist, as mxgrey checks only for ip and (n>1).
-+			//
-+			// 2005-08-16   martin@it4linux.de
-+			// 
-+
-+			if(conf->lightd==1 && fnotdomain==1)
-+				snprintf(query,sizeof(query)-1,"update greylist set last=%d where ip='%s' and sender='%s' and recipient='%s'",ts,ip,osender,orecipient);
-+
-+	        	snprintf(query,sizeof(query)-1,"update greylist set last=%d where ip='%s' and sender='%s' and recipient='%s'",ts,ip,sender,recipient);
-+		}
- 
-         	SQLQuery(query);
-         	if(conf->debug==1) printf("%d: Query=(%s)\n",pid,query);
diff --git a/mail-filter/gld/gld-1.4.ebuild b/mail-filter/gld/gld-1.4.ebuild
deleted file mode 100644
index 8bc52eaa1a1a..000000000000
--- a/mail-filter/gld/gld-1.4.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/gld/gld-1.4.ebuild,v 1.5 2004/11/13 12:44:34 slarti Exp $
-
-DESCRIPTION="A standalone anti-spam greylisting algorithm on top of Postfix"
-HOMEPAGE="http://www.gasmi.net/gld.html"
-SRC_URI="http://www.gasmi.net/down/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86 ~ppc"
-IUSE=""
-DEPEND="virtual/libc
-	dev-db/mysql
-	sys-libs/zlib
-	>=dev-libs/openssl-0.9.6"
-RDEPEND="${DEPEND}
-	>=mail-mta/postfix-2.1"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	cp ${FILESDIR}/Makefile.in ${S}/Makefile.in
-}
-
-src_compile() {
-	econf || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	dobin gld
-
-	insinto /etc
-	newins gld.conf gld.conf.sample
-
-	dodoc HISTORY LICENSE README
-
-	dodir /usr/share/doc/${PF}/sql
-	insinto /usr/share/doc/${PF}/sql
-	doins tables.sql
-
-	newinitd ${FILESDIR}/gld.rc gld
-}
-
-pkg_postinst() {
-	echo
-	einfo "Please read /usr/share/doc/${PF}/README.gz for details on how to setup"
-	einfo "gld."
-	echo
-	einfo "The tables.sql file is located at /usr/share/doc/${PF}/sql/tables.sql."
-	echo
-}
diff --git a/mail-filter/gld/gld-1.5-r1.ebuild b/mail-filter/gld/gld-1.5-r1.ebuild
deleted file mode 100644
index 5f91e35801c6..000000000000
--- a/mail-filter/gld/gld-1.5-r1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/gld/gld-1.5-r1.ebuild,v 1.4 2005/04/16 18:48:42 mr_bones_ Exp $
-
-DESCRIPTION="A standalone anti-spam greylisting algorithm on top of Postfix"
-HOMEPAGE="http://www.gasmi.net/gld.html"
-SRC_URI="http://www.gasmi.net/down/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~ppc"
-IUSE="postgres"
-# Not adding a mysql USE flag. The package defaults to it, so we will too.
-DEPEND="virtual/libc
-	sys-libs/zlib
-	>=dev-libs/openssl-0.9.6
-	postgres? ( dev-db/postgresql )
-	!postgres? ( dev-db/mysql )"
-RDEPEND="${DEPEND}
-	>=mail-mta/postfix-2.1"
-
-MY_P="${P}.1"
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-#	cp ${FILESDIR}/Makefile.in ${S}/Makefile.in
-}
-
-src_compile() {
-	# It's kind of weird. $(use_with postgres pgsql) won't work...
-	if use postgres ; then
-		myconf="${myconf} --with-pgsql"
-	fi
-
-	econf ${myconf} \
-	|| die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	dobin gld
-
-	insinto /etc
-	newins gld.conf gld.conf.sample
-	dosed 's:^LOOPBACKONLY=.*:LOOPBACKONLY=1:' /etc/gld.conf.sample
-	dosed 's:^#USER=.*:USER=nobody:' /etc/gld.conf.sample
-	dosed 's:^#GROUP=.*:GROUP=nobody:' /etc/gld.conf.sample
-
-	dodoc HISTORY README*
-
-	insinto /usr/share/${PN}/sql
-	doins table*
-
-	newinitd ${FILESDIR}/gld.rc gld
-}
-
-pkg_postinst() {
-	echo
-	einfo "Please read /usr/share/doc/${PF}/README.gz for details on how to setup"
-	einfo "gld."
-	echo
-	einfo "The tables.*sql files are located at /usr/share/${PN}/sql."
-	echo
-}
diff --git a/mail-filter/gld/gld-1.5.ebuild b/mail-filter/gld/gld-1.5.ebuild
deleted file mode 100644
index 31e93c5a7849..000000000000
--- a/mail-filter/gld/gld-1.5.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/gld/gld-1.5.ebuild,v 1.5 2005/06/05 11:55:22 hansmi Exp $
-
-DESCRIPTION="A standalone anti-spam greylisting algorithm on top of Postfix"
-HOMEPAGE="http://www.gasmi.net/gld.html"
-SRC_URI="http://www.gasmi.net/down/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-DEPEND="virtual/libc
-	dev-db/mysql
-	sys-libs/zlib
-	>=dev-libs/openssl-0.9.6"
-RDEPEND="${DEPEND}
-	>=mail-mta/postfix-2.1"
-
-MY_P="${P}.1"
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-#	cp ${FILESDIR}/Makefile.in ${S}/Makefile.in
-}
-
-src_compile() {
-	econf || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	dobin gld
-
-	insinto /etc
-	newins gld.conf gld.conf.sample
-	dosed 's:^LOOPBACKONLY=.*:LOOPBACKONLY=1:' /etc/gld.conf.sample
-	dosed 's:^#USER=.*:USER=nobody:' /etc/gld.conf.sample
-	dosed 's:^#GROUP=.*:GROUP=nobody:' /etc/gld.conf.sample
-
-	dodoc HISTORY LICENSE README*
-
-	dodir /usr/share/doc/${PF}/sql
-	insinto /usr/share/doc/${PF}/sql
-	doins table*
-
-	newinitd ${FILESDIR}/gld.rc gld
-}
-
-pkg_postinst() {
-	echo
-	einfo "Please read /usr/share/doc/${PF}/README.gz for details on how to setup"
-	einfo "gld."
-	echo
-	einfo "The tables.*sql files are located at /usr/share/doc/${PF}/sql."
-	echo
-}
diff --git a/mail-filter/gld/gld-1.5-r2.ebuild b/mail-filter/gld/gld-1.6.ebuild
index 85b2ed3ca0d8..c5d00fb67ed4 100644
--- a/mail-filter/gld/gld-1.5-r2.ebuild
+++ b/mail-filter/gld/gld-1.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/gld/gld-1.5-r2.ebuild,v 1.1 2005/04/20 15:18:09 slarti Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/gld/gld-1.6.ebuild,v 1.1 2005/10/08 08:36:12 slarti Exp $
 
 DESCRIPTION="A standalone anti-spam greylisting algorithm on top of Postfix"
 HOMEPAGE="http://www.gasmi.net/gld.html"
@@ -19,9 +19,6 @@ DEPEND="virtual/libc
 RDEPEND="${DEPEND}
 	>=mail-mta/postfix-2.1"
 
-MY_P="${P}.1"
-S="${WORKDIR}/${MY_P}"
-
 src_unpack() {
 	unpack ${A}
 	cd ${S}
@@ -57,10 +54,10 @@ src_install() {
 }
 
 pkg_postinst() {
-	echo
+	einfo
 	einfo "Please read /usr/share/doc/${PF}/README.gz for details on how to setup"
 	einfo "gld."
-	echo
-	einfo "The tables.*sql files are located at /usr/share/${PN}/sql."
-	echo
+	einfo
+	einfo "The sql files have been installed to /usr/share/${PN}/sql."
+	einfo
 }