diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-05-13 13:44:08 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-05-13 13:44:08 +0200 |
| commit | 05d715df3ac052fb41a5ab42369d05a3e2a82de3 (patch) | |
| tree | e99502f671b83f6898a77b78f88fdc67be8aa251 /package/iptables | |
| parent | e251f8299bf34e329613e68116d47e124192bc84 (diff) | |
resolve merge conflict
Diffstat (limited to 'package/iptables')
| -rw-r--r-- | package/iptables/Makefile | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/package/iptables/Makefile b/package/iptables/Makefile index 93e8500d0..477619c78 100644 --- a/package/iptables/Makefile +++ b/package/iptables/Makefile @@ -9,11 +9,6 @@ PKG_RELEASE:= 5 PKG_MD5SUM:= 536d048c8e8eeebcd9757d0863ebb0c0 PKG_DESCR:= netfilter firewalling software PKG_SECTION:= firewall -PKG_DEPENDS:= kmod-ip-nf-iptables kmod-nf-conntrack -PKG_DEPENDS+= kmod-nf-conntrack-ipv4 kmod-full-nat -PKG_DEPENDS+= kmod-ip-nf-target-masquerade kmod-ip-nf-target-reject -PKG_DEPENDS+= kmod-ip-nf-filter kmod-ip-nf-match-state -PKG_DEPENDS+= kmod-netfilter-xt-target-tcpmss PKG_BUILDDEP:= autotool libnetfilter_conntrack PKG_URL:= http://www.netfilter.org/ PKG_SITES:= http://www.netfilter.org/projects/iptables/files/ @@ -24,7 +19,7 @@ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 PKG_SUBPKGS:= IPTABLES IP6TABLES PKGSD_IPTABLES:= iptables for IPv4 PKGSD_IP6TABLES:= iptables for IPv6 -PKGSS_IP6TABLES:= iptables kmod-ip6-nf-iptables kmod-nf-conntrack-ipv6 kmod-ip6-nf-filter kmod-ip6-nf-target-reject +PKGSS_IP6TABLES:= iptables include ${TOPDIR}/mk/package.mk |