diff options
Diffstat (limited to 'net-firewall')
| -rw-r--r-- | net-firewall/iptables/ChangeLog | 6 | ||||
| -rw-r--r-- | net-firewall/iptables/Manifest | 11 | ||||
| -rw-r--r-- | net-firewall/iptables/files/iptables-1.4.0-in6-glibc-2.8.patch | 26 | ||||
| -rw-r--r-- | net-firewall/iptables/iptables-1.4.0-r1.ebuild | 3 |
4 files changed, 39 insertions, 7 deletions
diff --git a/net-firewall/iptables/ChangeLog b/net-firewall/iptables/ChangeLog index c50ede4d888e..397aa7a2b46c 100644 --- a/net-firewall/iptables/ChangeLog +++ b/net-firewall/iptables/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-firewall/iptables # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/ChangeLog,v 1.166 2008/03/14 01:19:48 beandog Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/ChangeLog,v 1.167 2008/06/09 09:31:42 vapier Exp $ + + 09 Jun 2008; Mike Frysinger <vapier@gentoo.org> + +files/iptables-1.4.0-in6-glibc-2.8.patch, iptables-1.4.0-r1.ebuild: + Use the correct API for accessing ip6 structs #225505 by Jose daLuz. 14 Mar 2008; Steve Dibb <beandog@gentoo.org> iptables-1.3.8-r3.ebuild: amd64 stable, bug 208147 diff --git a/net-firewall/iptables/Manifest b/net-firewall/iptables/Manifest index f607a5be66a5..57844478bd70 100644 --- a/net-firewall/iptables/Manifest +++ b/net-firewall/iptables/Manifest @@ -16,6 +16,7 @@ AUX iptables-1.3.7-more-exact-check-grep.patch 602 RMD160 80c80f9d2a2567b164932a AUX iptables-1.3.7-sparc64.patch 629 RMD160 15655e9ef5047055f9930de11d313e7e9377f083 SHA1 7ca7c7d54840c94a3bd4054f0e0ef38067937b49 SHA256 cd76d6b43d55f77df0af7ad493df3f6f07756b1e410121a2a6045a97b7ce7647 AUX iptables-1.3.7-test-dir.patch 890 RMD160 9767d237580dfe162f1377dd65bc928b57db8c19 SHA1 4782ddbc85e832b84020adb477224f713aae5784 SHA256 1ad36b68840396e45ca71fe93984caaaac105fddf102fda92fe24067206bccf1 AUX iptables-1.4.0-dev-files.patch 1523 RMD160 ad3dd979f20f87d78bc19f6cf906bc2fc6206389 SHA1 c0f8e615c65dd43e9b25bcf3c7f44e9f32b7b6fd SHA256 bce920b13a4b94411f23177fb03ca19084508c6121de634d7de1df19bb468afa +AUX iptables-1.4.0-in6-glibc-2.8.patch 707 RMD160 fe02ae798356522734237fee1bd4b6c9efa47437 SHA1 5c929e66e1176dd3aba6bb4bae8964d2c0bc9891 SHA256 d6bd6fb4fc9002a9aad2bd41830d50610486c200ea5ff104bb691f5da8ff62a8 DIST iptables-1.3.0-imq1.diff 5369 RMD160 8ca1fa3bfea02d27232d8d8cb0a12586dd4537b5 SHA1 bdf665cacc985fceaadf119ae7a756caca1589ad SHA256 0f9d36e48b3f1e83ef9e1d39c19e7271a889a31c65c396c416200eb143f1795b DIST iptables-1.3.5.tar.bz2 191820 RMD160 3364e0f37f67ba4aa9ac9caa6f11adb67887e528 SHA1 6dbeeee13517fa02852960b6f6e51115c7548a09 SHA256 1d8ee8634d167b0f1a8872b6547910c11bae676699faf2b4bc2c84a128449c3c DIST iptables-1.3.6-imq.diff 5723 RMD160 7158923558f9ad82973cda9dbec2c10b86e13e9c SHA1 1a2d7d9bcb10e7d4e69f445d4882ab598b57855e SHA256 f507319d01dd1810b497e0700a67d8f9668dd1363b1f8e1b09097cf2bbc26ab7 @@ -37,14 +38,14 @@ EBUILD iptables-1.3.8-r1.ebuild 6219 RMD160 715c30797cb164645b0deb7d2ae7e7bc0463 EBUILD iptables-1.3.8-r2.ebuild 7047 RMD160 4ab8cb0ad342ee29b10c4e36dee8f29b5bc0b1fb SHA1 7f13a955ba23ae4177979c608145ddd8ddf78d22 SHA256 d0da420ae4be177d29eb0192702c9e797940749f9551671f39149a000e8d97e3 EBUILD iptables-1.3.8-r3.ebuild 7057 RMD160 fe4d2cdabb0b3d4d963bd80cb5445427a9dc7d93 SHA1 dbdae40cf23cb2cd62fcfda67576025f338b90cb SHA256 75f3209cc715949fba4bcab1af4e107deaa8d769d089be4f383f8f074fa83690 EBUILD iptables-1.3.8.ebuild 5655 RMD160 54dfc7ce735c4a1c81af1ef1ad71859bc0e478e0 SHA1 d8b0f148549e5ffa6d86674291e0bb8f21f3d0db SHA256 1674842ce149e1e22c0f91e6348ca8f1369347acf7170b70c83bed5f11bd9289 -EBUILD iptables-1.4.0-r1.ebuild 6188 RMD160 ba51e39939581dc8e79879b3275d6ba1b426d4ec SHA1 9abbab0a028910a9965d5dca71a5f7632fe8cfd9 SHA256 d09ad9f4359a33bba7ff071b868e2be136d69b92ff1257bcfaa1b741a15ab071 +EBUILD iptables-1.4.0-r1.ebuild 6246 RMD160 6f4a33f4599496158dc973ff5950e63fbdc26b16 SHA1 9b0b04ad379a2ce8dd51237a5e54caf9dbe81515 SHA256 6995a46e06f66e0dc61704a249bb73d2dd948be619d37c15bb369d0d5073137d EBUILD iptables-1.4.0.ebuild 5972 RMD160 8395840f3652843133b6267ff204e40e3ecd3ef2 SHA1 bcc1adc3e2ffb1b452ef35e6e7b7f477bf313398 SHA256 409f00e4342fde45648716a7613425cc8c8a8c0f676af8c18c50c5c704a29c5a -MISC ChangeLog 31807 RMD160 12bd003dfc78e7765f911e3892e7f39459a4564e SHA1 de48aed70ca50a008eaaa490bd01d9da91164c00 SHA256 5683def312c91c6231751d0c6de5a339760a28d38f78c40c8bbb35388067ca82 +MISC ChangeLog 31999 RMD160 26bf465fd5edebaf1b8f90dff5d29b3abfd374c5 SHA1 af04675d2a42bb564673983272c2b8649c8d8439 SHA256 20fed0ee59ba3dd4cae628ed70524c075418395006a5aca3265a9b3300a5977d MISC metadata.xml 1015 RMD160 0bb4f52ba327423420cdcc23db5cee7063c44d57 SHA1 5b4bae641caf5a6e8b55e1f152097b439ec64fed SHA256 5f5208578deb289580374039a678ee613fe0ed13fe131e24b82a4c5b3ee72a9c -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.7 (GNU/Linux) -iD8DBQFH3N83j9hvisErhMIRArMjAKCF1gW14k9rQ4j5Bgfhh/G/Geqd1wCgmT9J -XfwstbB1NoLeXC3jkGSq+ls= -=zWbf +iD8DBQFITPiEj9hvisErhMIRAp3yAKDTIHXfWnnBm61ObP8zEkIWd37H4QCgkU2B +eOrXgKQn08RvWJfNGvrsdVc= +=HjJp -----END PGP SIGNATURE----- diff --git a/net-firewall/iptables/files/iptables-1.4.0-in6-glibc-2.8.patch b/net-firewall/iptables/files/iptables-1.4.0-in6-glibc-2.8.patch new file mode 100644 index 000000000000..a46a146409e3 --- /dev/null +++ b/net-firewall/iptables/files/iptables-1.4.0-in6-glibc-2.8.patch @@ -0,0 +1,26 @@ +use the proper api to access the data structures + +http://bugs.gentoo.org/225505 + +--- libiptc/libip6tc.c ++++ libiptc/libip6tc.c +@@ -113,7 +113,7 @@ + #include "libiptc.c" + + #define BIT6(a, l) \ +- ((ntohl(a->in6_u.u6_addr32[(l) / 32]) >> (31 - ((l) & 31))) & 1) ++ ((ntohl(a->s6_addr32[(l) / 32]) >> (31 - ((l) & 31))) & 1) + + int + ipv6_prefix_length(const struct in6_addr *a) +--- ip6tables.c ++++ ip6tables.c +@@ -678,7 +678,7 @@ + for (i = 0, j = 0; i < n; i++) { + int k; + for (k = 0; k < 4; k++) +- addrp[j].in6_u.u6_addr32[k] &= maskp->in6_u.u6_addr32[k]; ++ addrp[j].s6_addr32[k] &= maskp->s6_addr32[k]; + j++; + for (k = 0; k < j - 1; k++) { + if (IN6_ARE_ADDR_EQUAL(&addrp[k], &addrp[j - 1])) { diff --git a/net-firewall/iptables/iptables-1.4.0-r1.ebuild b/net-firewall/iptables/iptables-1.4.0-r1.ebuild index 2a17119f9420..5cdcda7785c3 100644 --- a/net-firewall/iptables/iptables-1.4.0-r1.ebuild +++ b/net-firewall/iptables/iptables-1.4.0-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/iptables-1.4.0-r1.ebuild,v 1.3 2008/01/11 17:47:01 pva Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/iptables-1.4.0-r1.ebuild,v 1.4 2008/06/09 09:31:42 vapier Exp $ inherit eutils toolchain-funcs linux-info @@ -66,6 +66,7 @@ src_unpack() { cd "${S}" epatch "${FILESDIR}"/${P}-dev-files.patch + epatch "${FILESDIR}"/${P}-in6-glibc-2.8.patch #225505 # this provide's grsec's stealth match EPATCH_OPTS="-p0" \ |