Change ip column to 39 chars in sql tables - bug #430384

Package-Manager: portage-2.2.0_alpha121/cvs/Linux x86_64

4 files changed, 107 insertions, 23 deletions

diff --git a/mail-filter/gld/ChangeLog b/mail-filter/gld/ChangeLog
index e679de4e7632..2c70a103b0c3 100644
--- a/mail-filter/gld/ChangeLog
+++ b/mail-filter/gld/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for mail-filter/gld
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/gld/ChangeLog,v 1.48 2011/06/23 11:52:53 eras Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/gld/ChangeLog,v 1.49 2012/08/12 12:02:47 eras Exp $
+
+*gld-1.7-r2 (12 Aug 2012)
+
+  12 Aug 2012; Eray Aslan <eras@gentoo.org> +gld-1.7-r2.ebuild,
+  files/tables.sql:
+  Change ip column to 39 chars in sql tables - bug #430384
 
   23 Jun 2011; Eray Aslan <eras@gentoo.org> -gld-1.7.ebuild:
   Remove old
diff --git a/mail-filter/gld/Manifest b/mail-filter/gld/Manifest
index 0381fa801f69..7edbfcf16b2a 100644
--- a/mail-filter/gld/Manifest
+++ b/mail-filter/gld/Manifest
@@ -1,26 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX gld.rc 544 RMD160 b0d668ffa01f39ffe7de1b4c805a792607fd434d SHA1 28c3bf17168382fe89c8db2763af3f7723ae3b59 SHA256 040837f1a16f8f6cf72f9f051322e46b4cacad8cc0a97de217e64a42efda03dc
-AUX tables.sql 1141 RMD160 02d45dbe928c545d27839ae052c23f5dcf13299b SHA1 5d0911dae9f14ecc627f8ef05c5b664240622ecc SHA256 4066abd57f4b460041abe36585cbd8cb8e8aae863ff288ce05b2a5788c2f79f5
-DIST gld-1.7.tgz 40241 RMD160 0e8190a668ecd88e19c22aa1f80d9a442d1101cf SHA1 e3a792f6992d063e9d93ce4183f821d78f6cb29f SHA256 c0776f6841afa73b6579e355522d79fd15467de2936f1a4464265e6415cae14b
-EBUILD gld-1.7-r1.ebuild 1670 RMD160 c299e57838298dc92ad34732dbc420edae8d026f SHA1 dbf0bf2fd80e9682d9f6a4fa947fdf27ed6ef26a SHA256 c1945825453b13ae2057756736c3652b2a558f3d899a1c93f43248f897aac00a
-MISC ChangeLog 7056 RMD160 d118442c58938e617fac24b1502d18fed88def4c SHA1 515288e37116ceaa78bc128cc8a445c6f09b3034 SHA256 89d4bcc34b51bf0e0882338006b24b0ec0de2fc481264f217145efad26299a29
-MISC metadata.xml 161 RMD160 273e570423fa3cd9d3f15f7967a43307c8ee9661 SHA1 a1fecd2f7b169d621b88c6ccab9d758209fc8f19 SHA256 4ebf9a8f60040bfb95f13790c1d146a49c69f791f9c421e02a5d96fd6fcb2b32
+AUX gld.rc 544 SHA256 040837f1a16f8f6cf72f9f051322e46b4cacad8cc0a97de217e64a42efda03dc SHA512 a853391b46f26a12e1d20e71fc410ce070d0faa3d45c2307ed790333a98400b1856357b5159b648e9720f91cd6b1c12410216615fe29670cfb50132e1e5ee066 WHIRLPOOL cbfb22c155b8875b6860ea6cbac55a94a11691077f3ded9a2547e9ff660282a768fb51b5d254a8662d8c20708b00c99494d34d193c0b90844eb97d8274723e43
+AUX tables.sql 1141 SHA256 1432a8b52c55299b17cd0aeaa94076aef65f04db66f02554e83a862c298bfc5d SHA512 4501ffb273f7064f1bbb56dd6d3f433532924da52c9007d089c57a27aff9cfda2f4b0a59844d0c8e5ff8ce9218f66316914a5af2c801eacba489d003806bb56a WHIRLPOOL d2278b837ecfe255681bafd5b7ff6693218046be2433f48fb143612d18a4b8df8b0f933cadd0ff67d1c6279f04033c030dca3abddd15ecbe4f3be3c82001c365
+DIST gld-1.7.tgz 40241 SHA256 c0776f6841afa73b6579e355522d79fd15467de2936f1a4464265e6415cae14b SHA512 68bbfd03295c2895608f8404ca1a0942c53003af66d70fda0e2515717ab8e6836f2b609942633b6d70a15b49338a887b5b1082ed1d9bc7c2c0aa3a7735abb13e WHIRLPOOL 815bbf2dc565695ca14eeee5821477e35c5d804c00f33c5e988462b3e6f8f3550c24f56cf6bc77ec9378d7a0cbdc1ba76cd47ae27a40e1cdcc2b3e6ffdd06785
+EBUILD gld-1.7-r1.ebuild 1670 SHA256 c1945825453b13ae2057756736c3652b2a558f3d899a1c93f43248f897aac00a SHA512 ead26d299409350a2cbd06b8bb61d2983894fbd9a1da1c645c495c5bd44207eddb8ce5c2eed3cb390ebe17697fd9935978cd9b7ba7c4d550b85250b918461f84 WHIRLPOOL d02e0b40b13a3d8ae4ea926ee20e3ffcca7cd48cefdb5e0df42fef2e50e0762ce750eecf1771134cde9013151414ad1938e8addcf0c3fd892966cdd24c4aa268
+EBUILD gld-1.7-r2.ebuild 1983 SHA256 b89ad9a19d188d317d64b178800c28d810299776ddb00c188ad3ad69373c00ff SHA512 a5314f96434d0b6d62abb62c4c1b3bfdd5e6c29ecb7fb1e83a61b615b51680959e1b1e528650b12cb1ae44f5dc0632ea4a4223dbbeba010639d10474bf33cc29 WHIRLPOOL 2c9d3b159fb6417b2d9c26f78f8814858c00b7af5d05a5df36d1de4c44912ae94e6316393eee293b45c64a2cb88e16fc6be2d37fe614fea82cabcf7658d56ee0
+MISC ChangeLog 7227 SHA256 dba81854c3ffb95a116cd8c15e3cae53dd54788aaf32f39c81625c00ce0f9fdd SHA512 70b722130f745f90c85e2dc75e068e2d586005490a6fb55933959b611eacf2ef8d291f64cbddd078f5f989db4868b19b93ad347a373bff6376fcdff0d0ea12f9 WHIRLPOOL 5a46d69f633e289ae5be04ad0a9315e197176067d2c23917c1315164f34e95ac34dea9cd5223d41f384ff5cc362cda8481101331325b289e03cf85657aa9490c
+MISC metadata.xml 161 SHA256 4ebf9a8f60040bfb95f13790c1d146a49c69f791f9c421e02a5d96fd6fcb2b32 SHA512 77001eed8032a3b919c30d8dd9314951d3471528e770ef5ad840060e217037f5e1f0eb2cf4c5f90cb2d58e9598c8a38619a1301f890d6dd734900ab6273fb6ec WHIRLPOOL 0d251627fdbf63b5c090313d5bbf3e45acf630331742dc930a0136cc382b7720fe4099c64fd439fd31fe0eed48a4199d6e31692dbdedd34f803f9e2567d46975
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJOAykbAAoJEHfx8XVYajsfozAP/2u8loZexA+cmn6ZWWlJjVZl
-sjmm0A+gCCR4nrQ5nN4cQReRgYKBG/CUzfTWvnTG2RY7dbjBVv5KXZOWnlON6N0P
-/h80k5qIe6QC4N6WtA7PHVszxUi3eOAyJv7AvaC0z68EXN1MkHCT7gci1J1L/8G3
-AtBbbyZIbxMjeO3zgdGiOT2XUQkRc2bqKZMcJbmOY1G+nTApmbtj8JZnPyPd9XEb
-/daS2HbUXylRO+os0LILwnZUTb3XdfZMqKWn9wawEt+VzbcJSqJFWcV9xDstwQIY
-M9l3lp4K0bIpFKbNRlaPNRbAT8rIREOQKEN8L/h+dHpZ4f6LI1l5P5dVDNJv7uw0
-0YIMzU86CwmNx4/2TwclUcCJ+YRLFkUCkz+Gkj0GNmmevNJ3DPvK/4tMOXbJEWe0
-4QusHY95hvuu8qudyjXNFDAoz/FZM2fVwVNxK7sB7ZALojCObEfRi0CGTk01f5aa
-T+ETaNw0ffGygplcbZky4YqMkGv2jb4ix1hgOwsg3hwQO/wuJgVI/lSgZwHxfnCq
-CVfpKGYbMymBxgqBFDKnjA9/L58Pv550bGWQ0nYAAFFRKjMqv+Bb1nj9pRA+/aPH
-w5hUrdusZugPmhjJFoCLq2G3CbWjJbPud7x+ZGri1iz5/xZexa/bOMyerUxYe2zl
-nAN4O/sQxuqATHY5dVlt
-=3prM
+iQIcBAEBCAAGBQJQJ5t1AAoJEHfx8XVYajsfWdEP/2hCWXtaA51lUXSGdVzY4cI7
+3zR50eixXBqzLcSVecXicZw2KOUPPs8qUtAeMElZ5/8fj/SqTO112/nGSP58E+kp
+qBVbhF5Ysrtbv2Kx+u/9tUVnTKHLgFkzXZcrHJo/Pg+JY/gI24pY6h+8vJO069C0
+UMQf0F5Lqp8a2Sn2Q743sTYWNfuWTsDRt3OBgBqngMb1YmBj1pNedL1uK3zDfCys
+vS0MfIFzwh+oG7XlcCTHCQdR7Yg4Wo5iMJK4tx8Jw/N7p/aKfyaTbpYhEtG0HmTK
+iu7Ho8/w5gnOGA+E1IHuEpMjU9ZPfA3/folSWpe3KRag1Klal35n/RXPtUQo8FPy
+N/Rjy/6niv7zHXt4Mm9ZpTvUkk/QA0JlER4PU8wtYsladO8WWWbJG0fITDjcGabN
+1EzzsnMtqxO7ql56uabKc1AtZjJeeotbX5zZbZBv8FiOWWTKAV3ea0UDql3DSP2T
+GjSlFJCacECXsDVWKtAN9sLUdaKZBSCxkIk3q/T6CW/lV1raRAQdI4qXOGI2T8WE
+4Szey8qQmWUiI+ytEpcVUd/kzxXl3Kv+GlPpocVpLxVfDoZoWNIJYwX+6lk5UmJb
+QGOLocmkXx9yKg04yr3EuLHNncKnRbaGUbftbWO54fJBO6OT8du86wi+8ruAK5/5
+y9+TG7WF4tAoEyjiG8Al
+=De0m
 -----END PGP SIGNATURE-----
diff --git a/mail-filter/gld/files/tables.sql b/mail-filter/gld/files/tables.sql
index 98ab4e6f3cf1..245e9a059e36 100644
--- a/mail-filter/gld/files/tables.sql
+++ b/mail-filter/gld/files/tables.sql
@@ -1,5 +1,5 @@
 CREATE TABLE `greylist` (
-	`ip` CHAR( 16 ) CHARACTER SET ascii COLLATE ascii_general_ci NOT NULL COMMENT 'IP of Sending Host',
+	`ip` CHAR( 39 ) CHARACTER SET ascii COLLATE ascii_general_ci NOT NULL COMMENT 'IP of Sending Host',
 	`sender` CHAR( 242 ) CHARACTER SET latin1 COLLATE latin1_general_ci NOT NULL COMMENT 'Address of Sender',
 	`recipient` CHAR( 242 ) CHARACTER SET latin1 COLLATE latin1_general_ci NOT NULL COMMENT 'Address of Recipient',
 	`first` INT( 11 ) NOT NULL DEFAULT '0' COMMENT 'Date, when this Sender has first been seen',
diff --git a/mail-filter/gld/gld-1.7-r2.ebuild b/mail-filter/gld/gld-1.7-r2.ebuild
new file mode 100644
index 000000000000..411b665546dd
--- /dev/null
+++ b/mail-filter/gld/gld-1.7-r2.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/gld/gld-1.7-r2.ebuild,v 1.1 2012/08/12 12:02:47 eras Exp $
+
+EAPI="4"
+
+inherit toolchain-funcs
+
+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="postgres"
+# Not adding a mysql USE flag. The package defaults to it, so we will too.
+DEPEND="sys-libs/zlib
+	>=dev-libs/openssl-0.9.6
+	postgres? ( dev-db/postgresql-server )
+	!postgres? ( virtual/mysql )"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	sed -i gld.conf \
+		-e 's:^LOOPBACKONLY=.*:LOOPBACKONLY=1:' \
+		-e 's:^#USER=.*:USER=nobody:' \
+		-e 's:^#GROUP=.*:GROUP=nobody:' \
+		|| die "sed gld.conf failed"
+
+	sed -i Makefile.in \
+		-e '/ -c /{s|-O2|$(CFLAGS)|g}' \
+		-e '/ -o /{s|-O2|$(CFLAGS) $(LDFLAGS)|g}' \
+		-e '/strip/d' \
+		|| die "sed Makefile.in failed"
+
+	sed -i tables.{my,pg}sql \
+		-e '/ip char/s/16/39/' \
+		|| die "sed sql tables failed"
+}
+
+src_configure() {
+	tc-export CC
+	# It's kind of weird. $(use_with postgres pgsql) won't work if you don't
+	# use it...
+	if use postgres ; then
+		myconf="${myconf} --with-pgsql"
+	fi
+
+	econf ${myconf}
+}
+
+src_install() {
+	dobin gld
+
+	insinto /etc
+	newins gld.conf gld.conf.example
+
+	dodoc HISTORY README*
+
+	insinto /usr/share/${PN}/sql
+	doins *.pgsql *-whitelist.sql "${FILESDIR}"/tables.sql
+
+	newinitd "${FILESDIR}"/gld.rc gld
+}
+
+pkg_preinst() {
+	elog "Please read the README file in /usr/share/doc/${PF} for"
+	elog "details on how to setup gld."
+	elog
+	elog "The sql files have been installed to /usr/share/${PN}/sql."
+	if [[ $REPLACING_VERSIONS == "1.7-r1" ]]; then
+		elog "You might want to use the ALTER_TABLE command to change the"
+		elog "ip field width to 39 chars to accomodate ipv6 addresses."
+		elog "Please see your sql server documentation."
+	fi
+}