summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEray Aslan <eras@gentoo.org>2012-11-20 15:21:19 +0000
committerEray Aslan <eras@gentoo.org>2012-11-20 15:21:19 +0000
commitc3cd97cc864fbee2ef3cfbd019118985fd883608 (patch)
tree7c69b3bf9f305e0a923e16c2d760252d37d8879d /mail-filter/libspf2
parentStable for HPPA (bug #443788). (diff)
downloadhistorical-c3cd97cc864fbee2ef3cfbd019118985fd883608.tar.gz
historical-c3cd97cc864fbee2ef3cfbd019118985fd883608.tar.bz2
historical-c3cd97cc864fbee2ef3cfbd019118985fd883608.zip
Fix ipv6 failures - bug #443984. Thanks to Peter Danzmayr
Package-Manager: portage-2.2.0_alpha142/cvs/Linux x86_64 Manifest-Sign-Key: 0x77F1F175586A3B1F
Diffstat (limited to 'mail-filter/libspf2')
-rw-r--r--mail-filter/libspf2/ChangeLog8
-rw-r--r--mail-filter/libspf2/Manifest30
-rw-r--r--mail-filter/libspf2/files/libspf2-1.2.9-ipv6.patch61
-rw-r--r--mail-filter/libspf2/libspf2-1.2.9-r3.ebuild43
4 files changed, 127 insertions, 15 deletions
diff --git a/mail-filter/libspf2/ChangeLog b/mail-filter/libspf2/ChangeLog
index 614b135aca48..78b4dac48511 100644
--- a/mail-filter/libspf2/ChangeLog
+++ b/mail-filter/libspf2/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for mail-filter/libspf2
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/libspf2/ChangeLog,v 1.46 2012/11/03 09:31:28 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/libspf2/ChangeLog,v 1.47 2012/11/20 15:21:09 eras Exp $
+
+*libspf2-1.2.9-r3 (20 Nov 2012)
+
+ 20 Nov 2012; Eray Aslan <eras@gentoo.org> +files/libspf2-1.2.9-ipv6.patch,
+ +libspf2-1.2.9-r3.ebuild:
+ Fix ipv6 failures - bug #443984. Thanks to Peter Danzmayr
03 Nov 2012; Eray Aslan <eras@gentoo.org> libspf2-1.2.9-r2.ebuild:
Add static USE flag to control building static binaries
diff --git a/mail-filter/libspf2/Manifest b/mail-filter/libspf2/Manifest
index bda34516a24f..e17b774da131 100644
--- a/mail-filter/libspf2/Manifest
+++ b/mail-filter/libspf2/Manifest
@@ -1,28 +1,30 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
+AUX libspf2-1.2.9-ipv6.patch 1796 SHA256 0c879a8d0daa40083f8cf757c674e5a7ddab38f727f33807e750beca52b1066f SHA512 d79187ba3bdf6f093600f5ad9a530e17791689e141861b09486ee4a54a9c54d9c100c19ab45839c28aa8535fb6af9b2bbcac937a2b4b2519feaff52d51515ded WHIRLPOOL e332c5fc47e2e1fbf0e4891d50e142c615ab7b574ac032b62d4f7c8294ada7a6c3a0744decb4d912d700beaf55ecf560b4bccac5670acf7847f209570bd428f5
DIST libspf2-1.2.8.tar.gz 575270 SHA256 3b1cc6c891451b97b094b3e3b40348a952048a4d27ca16c0e50d0fb53938e07f
DIST libspf2-1.2.9.tar.gz 518001 SHA256 4837f6b063b1431673754cbf6bef8979de5ffc4d7f26f6b93abd42787ba04862 SHA512 3137571f438704c176c5251e7b93fd0a8b6b04e52ad37218685b42b1fc5da6286baee578da1a14291d185216bd2a909cca3e55d64ffe580e71be059d1043a248 WHIRLPOOL 6579abf5080c319030ed7200d21b7bdfd3d4cf8207b4f3e6132be485024959bc06536fadf9d8c6898911ffa19977f738ec6a65d268d64d8aea06f89e94278e5e
EBUILD libspf2-1.2.8.ebuild 717 SHA256 29b4ad0978c64249c0c7d5edd41a32a69a1766a1f64182321657b9d859ec2537 SHA512 95eeec4da07fe74f05c53fe6238bec7bf49d3d0db770c9fed9a269331fbc20640046074f2f06389ed9dcbb906d788da9050475224c282ba21c4384fa8191ed4f WHIRLPOOL d91b39eefda3ab37fa3639177f286d6d617a921f02b447a6f8443cf120476e4990503db7901d4d3ebb9cd55b129d2d3d984d3f2fcc10d43a9bf39af3fa7b365a
EBUILD libspf2-1.2.9-r1.ebuild 1174 SHA256 9830f2939bbc52c05dec993ddd148d1f1c5ba207dd68a99d9e9c16bbf65a75d3 SHA512 2c70224dfa06a80adb50a95296664351f6f0fca049151b05c05c7288ada1191ba285e9c52083061f93b86915c67e0c58dae25f83c777abb36e607944b59675ce WHIRLPOOL 78d081315642909418ec05df51803264cbea9cfdecb617962041c3656bcfc26f9ef7c02d41de1f694e0fb04eeac07df59c90212106a1f7b62441fca5e26e5150
EBUILD libspf2-1.2.9-r2.ebuild 1215 SHA256 e579a77b20f8cddbd85b24337a7c556e8d81eedad61c5007d21af5d22ba0d822 SHA512 7f30c63988e41e1bfdccab7eb4ff2791781c61b9389b3fbc7212d505fa97e734f727ba6983b84a94c0a83a5cf9ab1e2495bd7ed061e8e4dad8684eefb065aa2e WHIRLPOOL 5ff134833ec1d1fba99b6531c8b7d3fbd81360b8e42fee15aec69c9bbb297a2a28ac828cb157cd312b1461f836bad349e110080cb568a52d55bcb6ff5080d503
+EBUILD libspf2-1.2.9-r3.ebuild 1253 SHA256 abaf5975a1bba8970b845a6533f13924ed2e918a2002c66ce0963cfd024e5a97 SHA512 3da8db5d6a85f6be143215f53e974e2187e31e4521d0dceb43037deaadac18c56c0abf4d07f59159aef63d9feb23b3a7ad89ea2e22d18a634dc412ab56a488bb WHIRLPOOL 9d231976bee477f609aa54bd6e922918f7151c72ccfac1be9d20068f29e61f5694a200312ad0f8d6663da54be8d741c3d4acf46a9ab76fd46b03ae49bf5c634c
EBUILD libspf2-1.2.9.ebuild 704 SHA256 bcc2c73b7b91c20bac231d6e1fccf6f667eac2ea17116a601df27c29cb054257 SHA512 408716cd5b8ad9ef3860ae58a1891ea31d6735404aa54805d8492475def6c3198a1ac6ed1bda6d1c48c4d3a9093e3a78ea13f88bd1b3c0abca206d2817cc8609 WHIRLPOOL 04ded27d59ed4189d8d76e56c62ddfcbb896a7906ac4854eb451fc7e6b87b012ab2727e4bcd21a1872b30405ed25592e81f0e94c028232d8a6c60f5768e9c770
-MISC ChangeLog 5646 SHA256 c9a86cd18895c2007f540b4f85e8bc8147f316c50becdc5c05177ea642cbe59f SHA512 76b3e4c596cf88dbd52ab4dfe00ea99657dd463910385ea1882cd3c24d2dba4727d5be216a1e025c0cc8916206db1c11bb8d70657f66ce7c878b928909e91202 WHIRLPOOL 89a22bc133b6fa24b3a7add6347b25703fd9e565effb10c980379a9a8f795c9247503a2c07190d7a3a4cc79a79633ecb8ebe2b268f353b7b0b0f5519e8ad752f
+MISC ChangeLog 5846 SHA256 e77f38bca8a258004aa628bb45f9c17ee75eb051a2d9997f2e7bded9d0607a9c SHA512 21662e5f9e70fe05549846e71e851928ff043409e60d34d590d669030186c571d496f80647c8370a9eef3bbd6ce3c72674cf789e380c0a8d0fc9eb0ac1f5ff90 WHIRLPOOL dec8dd259533b90b2fba8843ef72f2bbe9cd7a964dd71478b5273e222645e28a1ad2cf7064833f83e58aa402a1d970308f1a6460b8a4fa900d685d17ac27f416
MISC metadata.xml 583 SHA256 dba9e1a0fbcc46391bc214d782be104d80ac12bd4559783d6f86b6d4fd72c17e SHA512 3d8883a381d4bf5c05b4f1b79193556516560dd7dc3804b79752da6a5f1709da0b58fd0835fe141965945f636c798987b0c02b26921d1fd9c59f15673107d378 WHIRLPOOL 12bd2f670b13581e3b850cbfe3d49d4ed8e18b0b291b7f6d4d5fa9255b7e51252b49924de9139a46fc54eb7a7f109142f2c1beeb1ef87e5f2a9d07666990b34c
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (GNU/Linux)
-iQIcBAEBCAAGBQJQlOR6AAoJEHfx8XVYajsf6MgP/RDiCNyGJgw8K2EybD9cup9v
-fjy6l7h5B78mfsNqzNmw8mxEYmqSxyzA0Yog6wM5vrabRFuTfaDyUwSpPfZPpRjC
-p75Eo95vhzUQE+izi5o6RixyI/oky4utHwyTpax6G9KIAJWyJTJUWf4phrA2YnUp
-q5iDuoh463/oWwcsJIlBUs1jXdVJAfDzjNy192M2Us+IxA01hoz79HJMMKNOT0zh
-xr+fgrhOWGiyTre6LA6EL4WOXpquO2DzsEo42bpDR76XswbCIFUlf6nAdqotL+65
-O4PgdXyaWtfTMhE8dTjkLePAKslc1YmcGB5sCA1R3ju96ro7+s6gEvKyyrm2E3O0
-0OTJZRwttT5vGX6UoYtIzPOgxOJe8hINWamTsCw7Q6WtWkQkckJR9sLwk6dRlWQs
-toxMGQDsR26XwWN6GQAs3exJghGR5Py845qg+TgdyBTNv3MZTBRG7wWz98RonWrN
-F2JSAsSQM9G4JujhlTS5XFF57PTEclEkTBl1UQl5fFM9YsPOT17In0PQMsUZs9vr
-UrrMhpoON4Du6L+E2cSkC3TZbdGQQyyzmP2WOPgxd+umECMrEknK6ipCuD69H0Dj
-3mP2sCvrVkw+Auow0blV5fMjGT8cbsM+t8fsuD6FKWMwK6kiNJQDraw6P6YBtBb+
-x6HKq1HFf3kVR35gPQUf
-=WB1j
+iQIcBAEBCAAGBQJQq5/vAAoJEHfx8XVYajsfjKQP/12Q/Wo/URrt/FZiP2uQdlMg
+4sVego2uO8xh4GO8ywF8ZY6PbNryvdXBPqvdM2V6mLm50wszvVTyDV/kHEdrR0f/
+KHB4pCrQPGGVI1X9O2N41IP8mr/whJI/zQwq8Uu1ldliZ0SnnEBfJMBDL+ARZ5UH
+I6cNYGxEf6N9VWP9IpxcINgjTyIb1BpuyqW1gV5ciu7vmcDUMP4jEo7wq9tcm1WU
+Y8djBndXkPZkci8N9X8rgtvHn913NRHW/ELBoU/sB9KVTd8PNn2zeQSH7lO+p2XI
+OQ7MKwefR3ApH872Hgb0KplPNyNY+aWxe5pXVj07UCguA1iBNySiV/gdIGmJMLW1
+xIak99w9IhbQ+Xci9fsoc3nlttzQ0zUv4vp9LBdbvHVHvZ2zrjH/YNCnpmxGB3kM
+uvcVw6M2UzguPwojmo3OoCUqUsZ8uYjkoYL4Evl9po4O34CGgs1UF6azsLC8tq22
+x6pmxznPMuAe58EfM6b7HS88vsAFy88iHmX5/GwUkWqEtNYbrU8Wcfh6USX3a1UH
+1R7mT3+j894Ce79gcoqTPm4tJe6cb5fsebuf6amaP+1rU07jsO0L/1OKxggNe6Vf
+9rXmY0ViSU5gSXiKRa9cbu8w2ur2lERCU5ziiEXlc6k3xhPR5tK7E001HUwlKPjm
+AGnsupzw9sgziaLK1Xro
+=Wd8O
-----END PGP SIGNATURE-----
diff --git a/mail-filter/libspf2/files/libspf2-1.2.9-ipv6.patch b/mail-filter/libspf2/files/libspf2-1.2.9-ipv6.patch
new file mode 100644
index 000000000000..76e8cd37c27d
--- /dev/null
+++ b/mail-filter/libspf2/files/libspf2-1.2.9-ipv6.patch
@@ -0,0 +1,61 @@
+$NetBSD: patch-aa,v 1.1 2009/09/08 10:36:27 tron Exp $
+
+Fix an abort() caused by miscalculating the size of an internal buffer.
+This can crash applications using "libspf2" (e.g. "milter-greylist")
+in an e-mail gets delivered via SMTP over IPv6 depending on the
+remote machine's IPv6 address.
+
+--- src/libspf2/spf_expand.c.orig 2008-11-03 21:29:00.000000000 +0000
++++ src/libspf2/spf_expand.c 2009-09-08 11:27:52.000000000 +0100
+@@ -245,7 +245,7 @@
+ case PARM_CLIENT_IP: /* SMTP client IP */
+ #ifdef COMPUTE
+ if (compute_length) {
+- len = sizeof(ip6_buf);
++ len = sizeof(ip6_rbuf);
+ if (d->dv.url_encode)
+ len *= 3;
+ buflen += len;
+
+http://www.gossamer-threads.com/lists/spf/devel/35098
+
+--- src/libspf2/spf_compile.c 2008-11-03 15:37:33.000000000 -0500
++++ src/libspf2/spf_compile.c 2009-09-07 23:46:02.000000000 -0400
+@@ -778,7 +778,7 @@
+ const char *end;
+ const char *p;
+
+- char buf[ INET_ADDRSTRLEN ];
++ char buf[ INET6_ADDRSTRLEN ];
+ size_t len;
+ int err;
+
+--- src/libspf2/spf_interpret.c 2008-10-22 11:47:43.000000000 -0400
++++ src/libspf2/spf_interpret.c 2009-09-08 00:42:25.000000000 -0400
+@@ -505,7 +505,7 @@
+ char dst_ip6_buf[ INET6_ADDRSTRLEN ];
+
+ struct in6_addr src_ipv6;
+- int cidr, mask;
++ int cidr, cidr_save, mask;
+ int i;
+ int match;
+
+@@ -517,6 +517,7 @@
+ cidr = SPF_i_mech_cidr(spf_request, mech);
+ if ( cidr == 0 )
+ cidr = 128;
++ cidr_save = cidr;
+
+ match = TRUE;
+ for( i = 0; i < array_elem( ipv6.s6_addr ) && match; i++ )
+@@ -538,7 +539,7 @@
+ INET_NTOP(AF_INET6, &ipv6.s6_addr,
+ dst_ip6_buf, sizeof(dst_ip6_buf));
+ SPF_debugf( "ip_match: %s == %s (/%d): %d",
+- src_ip6_buf, dst_ip6_buf, cidr, match );
++ src_ip6_buf, dst_ip6_buf, cidr_save, match );
+ }
+
+ return match;
+
diff --git a/mail-filter/libspf2/libspf2-1.2.9-r3.ebuild b/mail-filter/libspf2/libspf2-1.2.9-r3.ebuild
new file mode 100644
index 000000000000..cc4cb64de488
--- /dev/null
+++ b/mail-filter/libspf2/libspf2-1.2.9-r3.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/libspf2/libspf2-1.2.9-r3.ebuild,v 1.1 2012/11/20 15:21:09 eras Exp $
+
+EAPI=4
+inherit eutils autotools
+
+DESCRIPTION="libspf2 implements the Sender Policy Framework, a part of the SPF/SRS protocol pair."
+HOMEPAGE="http://www.libspf2.org"
+SRC_URI="http://www.libspf2.org/spf/libspf2-${PV}.tar.gz"
+
+LICENSE="|| ( LGPL-2.1 BSD-2 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="static static-libs"
+
+DEPEND=""
+RDEPEND="!dev-perl/Mail-SPF-Query"
+REQUIRED_USE="static? ( static-libs )"
+
+src_prepare() {
+ epatch "${FILESDIR}/${P}-ipv6.patch"
+ if ! use static; then
+ sed -i -e '/bin_PROGRAMS/s/spfquery_static//' src/spfquery/Makefile.am \
+ -e '/bin_PROGRAMS/s/spftest_static//' src/spftest/Makefile.am \
+ -e '/bin_PROGRAMS/s/spfd_static//' src/spfd/Makefile.am \
+ -e '/bin_PROGRAMS/s/spf_example_static//' src/spf_example/Makefile.am \
+ || die
+ eautoreconf
+ fi
+}
+
+src_configure() {
+ econf \
+ $(use_enable static-libs static)
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+ dodoc README TODO INSTALL
+
+ use static-libs || rm -f "${D}"/usr/lib*/libspf2.la
+}