diff options
| -rw-r--r-- | iptables/.md5sum.i686 | 2 | ||||
| -rw-r--r-- | iptables/.md5sum.x86_64 | 2 | ||||
| -rwxr-xr-x | iptables/Pkgfile | 6 | ||||
| -rw-r--r-- | iptables/fix-build-with-3.2.patch | 20 |
4 files changed, 4 insertions, 26 deletions
diff --git a/iptables/.md5sum.i686 b/iptables/.md5sum.i686 index c490ec7d4..a81121d37 100644 --- a/iptables/.md5sum.i686 +++ b/iptables/.md5sum.i686 @@ -1,3 +1,3 @@ fa9d407948150f7c6d2cbf1c4182a427 fix-build-with-3.2.patch -40a15608ec57b50e9377cace546dd115 iptables-1.4.13.tar.bz2 +5ab24ad683f76689cfe7e0c73f44855d iptables-1.4.14.tar.bz2 c4f416633e88935e966873f4ea89775c rc.iptables diff --git a/iptables/.md5sum.x86_64 b/iptables/.md5sum.x86_64 index c490ec7d4..a81121d37 100644 --- a/iptables/.md5sum.x86_64 +++ b/iptables/.md5sum.x86_64 @@ -1,3 +1,3 @@ fa9d407948150f7c6d2cbf1c4182a427 fix-build-with-3.2.patch -40a15608ec57b50e9377cace546dd115 iptables-1.4.13.tar.bz2 +5ab24ad683f76689cfe7e0c73f44855d iptables-1.4.14.tar.bz2 c4f416633e88935e966873f4ea89775c rc.iptables diff --git a/iptables/Pkgfile b/iptables/Pkgfile index 37a68b098..f6c299f0b 100755 --- a/iptables/Pkgfile +++ b/iptables/Pkgfile @@ -5,11 +5,10 @@ # Depends on: name=iptables -version=1.4.13 +version=1.4.14 release=1 source=(ftp://ftp.netfilter.org/pub/iptables/$name-$version.tar.bz2 - rc.iptables - fix-build-with-3.2.patch) + rc.iptables) build() { source /etc/blfs-bootscripts @@ -18,7 +17,6 @@ build() { tar xvf $scripts-$scriptsversion.tar.bz2 cd $name-$version - patch -p1 < ../fix-build-with-3.2.patch ./configure --prefix=/usr \ --exec_prefix="" \ --libdir=/lib \ diff --git a/iptables/fix-build-with-3.2.patch b/iptables/fix-build-with-3.2.patch deleted file mode 100644 index 0b580af11..000000000 --- a/iptables/fix-build-with-3.2.patch +++ /dev/null @@ -1,20 +0,0 @@ - -Include the __aligned_* from 3.2 include/types.h to fix build. - -Signed-off-by: Thomas Backlund <tmb@mageia.org> - - ---- iptables-1.4.12.2/include/xtables.h.in.orig 2012-01-02 19:19:09.000000000 +0200 -+++ iptables-1.4.12.2/include/xtables.h.in 2012-01-06 16:22:57.900569755 +0200 -@@ -34,6 +34,11 @@ - #define XTABLES_VERSION "libxtables.so.@libxtables_vmajor@" - #define XTABLES_VERSION_CODE @libxtables_vmajor@ - -+/* copied from linux 3.2 include/types.h to fix build */ -+#define __aligned_u64 __u64 __attribute__((aligned(8))) -+#define __aligned_be64 __be64 __attribute__((aligned(8))) -+#define __aligned_le64 __le64 __attribute__((aligned(8))) -+ - struct in_addr; - - /* |