From: Gustavo Zacarias Date: Thu, 8 Mar 2007 18:24:33 +0000 (+0000) Subject: Fix for #166201 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=2eaaaf334cf29c92885d546fce5bdbdf9dd70373;p=gentoo.git Fix for #166201 Package-Manager: portage-2.1.2.2 --- diff --git a/net-firewall/iptables/ChangeLog b/net-firewall/iptables/ChangeLog index 3b25fae3a813..936adfb1880e 100644 --- a/net-firewall/iptables/ChangeLog +++ b/net-firewall/iptables/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-firewall/iptables # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/ChangeLog,v 1.127 2007/02/28 13:41:21 dragonheart Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/ChangeLog,v 1.128 2007/03/08 18:24:33 gustavoz Exp $ + + 08 Mar 2007; Gustavo Zacarias + +files/iptables-1.3.7-sparc64.patch, iptables-1.3.7.ebuild: + Fix for #166201 28 Feb 2007; Daniel Black +files/1.3.5-files/iptables-1.3.5-linux-headers.patch, diff --git a/net-firewall/iptables/Manifest b/net-firewall/iptables/Manifest index 2f518591f306..7c68fe30e653 100644 --- a/net-firewall/iptables/Manifest +++ b/net-firewall/iptables/Manifest @@ -45,6 +45,10 @@ AUX iptables-1.3.7-more-exact-check-grep.patch 602 RMD160 80c80f9d2a2567b164932a MD5 0b0e12c269db9fd7c8e9835f0a9fd3fa files/iptables-1.3.7-more-exact-check-grep.patch 602 RMD160 80c80f9d2a2567b164932adc1e9ddb1392b34791 files/iptables-1.3.7-more-exact-check-grep.patch 602 SHA256 aa26f352dc2b870363b7de1586105a4bf19eb9a6c6703a23f64ef9656017021d files/iptables-1.3.7-more-exact-check-grep.patch 602 +AUX iptables-1.3.7-sparc64.patch 629 RMD160 15655e9ef5047055f9930de11d313e7e9377f083 SHA1 7ca7c7d54840c94a3bd4054f0e0ef38067937b49 SHA256 cd76d6b43d55f77df0af7ad493df3f6f07756b1e410121a2a6045a97b7ce7647 +MD5 312292cd14526a498be912d671fd9ae5 files/iptables-1.3.7-sparc64.patch 629 +RMD160 15655e9ef5047055f9930de11d313e7e9377f083 files/iptables-1.3.7-sparc64.patch 629 +SHA256 cd76d6b43d55f77df0af7ad493df3f6f07756b1e410121a2a6045a97b7ce7647 files/iptables-1.3.7-sparc64.patch 629 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.tar.bz2 185438 RMD160 54d9777f2116ad57253446c42619c726f68ae8f0 SHA1 d0c873b4ce1a928424f38fa8419c96be22fef5d0 SHA256 4394c3de8c55776e54a36a6fcd4f9eeed381f451883049f8268c34c3482f5f1b @@ -64,14 +68,14 @@ EBUILD iptables-1.3.6.ebuild 5727 RMD160 3942518924aa00b35b57572814cc691b64586d5 MD5 bda128f763227c8cb2c899f8f5bf014b iptables-1.3.6.ebuild 5727 RMD160 3942518924aa00b35b57572814cc691b64586d5a iptables-1.3.6.ebuild 5727 SHA256 c5719408d68a0b487239b5b171f6e19f0e1b00857c0c1185ecf65e051dcbdd47 iptables-1.3.6.ebuild 5727 -EBUILD iptables-1.3.7.ebuild 5707 RMD160 e69b2f93c2a19bc67b2013d4f7b80281b563d6a7 SHA1 cc99c440c692a3de8b056e875fc736a1ab4817b3 SHA256 67525baedf0976ff9ffc8b7224a406fdc7006e205e0ca68dc89bd38c833df1fb -MD5 134691d67bd2cb53231c2c7f97e29885 iptables-1.3.7.ebuild 5707 -RMD160 e69b2f93c2a19bc67b2013d4f7b80281b563d6a7 iptables-1.3.7.ebuild 5707 -SHA256 67525baedf0976ff9ffc8b7224a406fdc7006e205e0ca68dc89bd38c833df1fb iptables-1.3.7.ebuild 5707 -MISC ChangeLog 26597 RMD160 5fc47f1723fd3b1b65ccd2ddc337c45a3ddc098d SHA1 c9fc9e51c475d0f7ba2c7959a28f8b56c046129c SHA256 c7984ae579dad463401ee6bf4e619f08a0e31b20f7af878f01bdf8deb6ace901 -MD5 31c3ebb5adc42e03825c1bcf245bf624 ChangeLog 26597 -RMD160 5fc47f1723fd3b1b65ccd2ddc337c45a3ddc098d ChangeLog 26597 -SHA256 c7984ae579dad463401ee6bf4e619f08a0e31b20f7af878f01bdf8deb6ace901 ChangeLog 26597 +EBUILD iptables-1.3.7.ebuild 5753 RMD160 c780316245020b5fa7937f5ea8543ce5edae5f9e SHA1 a48f4c1617988e46937c52a73de2889aa8d7fe17 SHA256 5140c1164cf1a06d6ef195124fd38f8e37b9b0126dc5fd879fdcb86c5f93254a +MD5 ad6ebb1dec2e024b6c751690596308b6 iptables-1.3.7.ebuild 5753 +RMD160 c780316245020b5fa7937f5ea8543ce5edae5f9e iptables-1.3.7.ebuild 5753 +SHA256 5140c1164cf1a06d6ef195124fd38f8e37b9b0126dc5fd879fdcb86c5f93254a iptables-1.3.7.ebuild 5753 +MISC ChangeLog 26729 RMD160 cd5b42eba24d1dceec97c499f060b48b6b0eb02d SHA1 a86b7ee70336fb92d1726cae867ea9fee0e6b9ea SHA256 72d82077ceb54d1059352a39c1187d5bcf4f6d67df6e07435a73b645528235a2 +MD5 2d6bab40a9f5a2c7b8786ffd07c6c01a ChangeLog 26729 +RMD160 cd5b42eba24d1dceec97c499f060b48b6b0eb02d ChangeLog 26729 +SHA256 72d82077ceb54d1059352a39c1187d5bcf4f6d67df6e07435a73b645528235a2 ChangeLog 26729 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164 @@ -89,9 +93,9 @@ MD5 1f40726055a119edf736bd7c7b5620e7 files/digest-iptables-1.3.7 759 RMD160 ee6a5537941ce5689ee0ef7e302b990a0222142c files/digest-iptables-1.3.7 759 SHA256 7d47914b31c063817423c4f38b8f047f2f9094f749991b37e12b3987f644d990 files/digest-iptables-1.3.7 759 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.2 (GNU/Linux) +Version: GnuPG v1.4.6-ecc01.6 (GNU/Linux) -iD8DBQFF5YafmdTrptrqvGERAjsuAJ9+S5CFSYzW6PJho6a5jsN8w0sb9wCaAss4 -osMCowHyMl1RW+XYtEEQEpw= -=UVoE +iD8DBQFF8FTqKRy60XGEcJIRApP5AJ0Vq4N4RoAmhpto79YvQ0UDV12b7QCfU4bs +Nfocb3tzR42IctpIPsRecmo= +=Uq0K -----END PGP SIGNATURE----- diff --git a/net-firewall/iptables/files/iptables-1.3.7-sparc64.patch b/net-firewall/iptables/files/iptables-1.3.7-sparc64.patch new file mode 100644 index 000000000000..68e81644f18b --- /dev/null +++ b/net-firewall/iptables/files/iptables-1.3.7-sparc64.patch @@ -0,0 +1,12 @@ +diff -Nura iptables-1.3.7/Makefile iptables-1.3.7-sparc64/Makefile +--- iptables-1.3.7/Makefile 2006-12-04 08:16:01.000000000 -0300 ++++ iptables-1.3.7-sparc64/Makefile 2007-02-13 23:01:09.000000000 -0300 +@@ -65,7 +65,7 @@ + 32bituser := $(shell echo -e "\#include \n\#if !defined(__sparcv9) && !defined(__arch64__) && !defined(_LP64)\nuserspace_is_32bit\n\#endif" | $(CC) $(CFLAGS) -E - | grep userspace_is_32bit) + ifdef 32bituser + # The kernel is 64-bit, even though userspace is 32. +- CFLAGS+=-DIPT_MIN_ALIGN=8 -DKERNEL_64_USERSPACE_32 ++ CFLAGS+=-DIPT_MIN_ALIGN=8 + else + EXT_LDFLAGS+=-Wl,-m,elf64_sparc + endif diff --git a/net-firewall/iptables/iptables-1.3.7.ebuild b/net-firewall/iptables/iptables-1.3.7.ebuild index d957236eba6a..e703fd2f6b8f 100644 --- a/net-firewall/iptables/iptables-1.3.7.ebuild +++ b/net-firewall/iptables/iptables-1.3.7.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/iptables-1.3.7.ebuild,v 1.4 2007/02/06 12:21:22 dragonheart Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/iptables-1.3.7.ebuild,v 1.5 2007/03/08 18:24:33 gustavoz Exp $ inherit eutils flag-o-matic toolchain-funcs linux-info @@ -56,6 +56,7 @@ src_unpack() { cd "${S}" epatch "${FILESDIR}"/${P}-more-exact-check-grep.patch #159162 + epatch "${FILESDIR}"/${P}-sparc64.patch #166201 EPATCH_OPTS="-p0" \ epatch "${FILESDIR}"/1.3.1-files/install_ipv6_apps.patch