diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-04-02 07:37:27 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-04-02 07:37:27 +0200 |
| commit | 7236e468162b3af51c0acecad10fbef1838c06ad (patch) | |
| tree | 9c8027cf769aaa7ef7f0a6330b34d7666238b920 /package/iptables | |
| parent | a691abc857458de0023f5e532feee866af0218ed (diff) | |
| parent | 309f13ab6858e1c1639814e210a6c86380ca717b (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/iptables')
| -rw-r--r-- | package/iptables/Makefile | 2 | ||||
| -rw-r--r-- | package/iptables/patches/patch-include_linux_netfilter_xt_osf_h | 12 |
2 files changed, 1 insertions, 13 deletions
diff --git a/package/iptables/Makefile b/package/iptables/Makefile index 89c9994c9..d9fa9fd2a 100644 --- a/package/iptables/Makefile +++ b/package/iptables/Makefile @@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= iptables PKG_VERSION:= 1.4.21 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= 536d048c8e8eeebcd9757d0863ebb0c0 PKG_DESCR:= The netfilter firewalling software PKG_SECTION:= firewall diff --git a/package/iptables/patches/patch-include_linux_netfilter_xt_osf_h b/package/iptables/patches/patch-include_linux_netfilter_xt_osf_h deleted file mode 100644 index 00dd62ca8..000000000 --- a/package/iptables/patches/patch-include_linux_netfilter_xt_osf_h +++ /dev/null @@ -1,12 +0,0 @@ ---- iptables-1.4.20.orig/include/linux/netfilter/xt_osf.h 2013-08-06 17:48:43.000000000 +0200 -+++ iptables-1.4.20/include/linux/netfilter/xt_osf.h 2013-09-04 11:34:30.000000000 +0200 -@@ -21,6 +21,9 @@ - #define _XT_OSF_H - - #include <linux/types.h> -+#if !defined(__GLIBC__) -+#include <linux/tcp.h> -+#endif - - #define MAXGENRELEN 32 - |