diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2009-11-14 09:26:49 +0100 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2009-11-14 09:26:49 +0100 |
commit | 0221529e47401282409d4d97b533818241da8fca (patch) | |
tree | 2654a76ee4cef141a93e15e66a2e038277a93362 | |
parent | 05e92cbeda75035f1c127510679b9d0eb6e1946a (diff) |
update to latest upstream version
- simplify and just use default extensions builtin
-rw-r--r-- | package/iptables/Makefile | 27 |
1 files changed, 10 insertions, 17 deletions
diff --git a/package/iptables/Makefile b/package/iptables/Makefile index 292fc8297..412730cd6 100644 --- a/package/iptables/Makefile +++ b/package/iptables/Makefile @@ -4,9 +4,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= iptables -PKG_VERSION:= 1.4.3.2 +PKG_VERSION:= 1.4.5 PKG_RELEASE:= 1 -PKG_MD5SUM:= 545698693b636cfc844aafc6729fd48a +PKG_MD5SUM:= 44f13990132c20299c1994cd6f425140 PKG_DESCR:= The netfilter firewalling software PKG_SECTION:= net PKG_URL:= http://www.netfilter.org @@ -18,7 +18,10 @@ PKG_SITES:= http://www.netfilter.org/projects/iptables/files/ \ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 include ${TOPDIR}/mk/package.mk -include ${LINUX_DIR}/.config + +# right now default extensions are builtin +# use --disable-static in CONFIGURE_ARGS to change and optimize package +#include ${LINUX_DIR}/.config $(eval $(call PKG_template,IPTABLES,iptables,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,IPTABLES_UTILS,iptables-utils,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) @@ -27,9 +30,7 @@ $(eval $(call PKG_template,IP6TABLES,ip6tables,${PKG_VERSION}-${PKG_RELEASE},${P endif CONFIGURE_STYLE:= gnu -CONFIGURE_ARGS+= --enable-devel \ - --libexecdir=/usr/lib \ - --with-kernel='${LINUX_DIR}' +CONFIGURE_ARGS+= --enable-devel BUILD_STYLE:= auto INSTALL_STYLE:= auto @@ -41,15 +42,9 @@ endif post-install: ${SUB_INSTALL-m} ${SUB_INSTALL-y} ${INSTALL_DIR} ${IDIR_IPTABLES}/usr/lib ${INSTALL_DIR} ${IDIR_IPTABLES}/usr/sbin - ${INSTALL_DIR} ${IDIR_IPTABLES}/usr/lib/xtables ${INSTALL_BIN} ${WRKINST}/usr/sbin/iptables ${IDIR_IPTABLES}/usr/sbin/ - (cd ${WRKINST}/usr/lib/xtables ; \ - ${INSTALL_DATA} libipt_*.so ${IDIR_IPTABLES}/usr/lib/xtables/ \ - ) - (cd ${WRKINST}/usr/lib/xtables ; \ - ${INSTALL_DATA} libxt_*.so ${IDIR_IPTABLES}/usr/lib/xtables/ \ - ) ${CP} ${WRKINST}/usr/lib/libiptc.so* ${IDIR_IPTABLES}/usr/lib + ${CP} ${WRKINST}/usr/lib/libip4tc.so* ${IDIR_IPTABLES}/usr/lib ${CP} ${WRKINST}/usr/lib/libxtables.so* ${IDIR_IPTABLES}/usr/lib iptables-utils-install: @@ -57,11 +52,9 @@ iptables-utils-install: ${INSTALL_BIN} ${WRKINST}/usr/sbin/iptables-{save,restore} ${IDIR_IPTABLES_UTILS}/usr/sbin/ ip6tables-install: + ${INSTALL_DIR} ${IDIR_IP6TABLES}/usr/lib ${INSTALL_DIR} ${IDIR_IP6TABLES}/usr/sbin - ${INSTALL_DIR} ${IDIR_IP6TABLES}/usr/lib/xtables ${INSTALL_BIN} ${WRKINST}/usr/sbin/ip6tables ${IDIR_IP6TABLES}/usr/sbin/ - (cd ${WRKINST}/usr/lib/xtables ; \ - ${INSTALL_DATA} libip6t_*.so ${IDIR_IP6TABLES}/usr/lib/xtables/ \ - ) + ${CP} ${WRKINST}/usr/lib/libip6tc.so* ${IDIR_IP6TABLES}/usr/lib include ${TOPDIR}/mk/pkg-bottom.mk |