diff --git a/srcpkgs/iptables/iptables-devel.template b/srcpkgs/iptables/iptables-devel.template index e002ca63d93..da749ffbb75 100644 --- a/srcpkgs/iptables/iptables-devel.template +++ b/srcpkgs/iptables/iptables-devel.template @@ -1,12 +1,11 @@ # Template file for 'iptables-devel'. # -depends="iptables>=1.4.13" +depends="iptables>=${version}" short_desc="${sourcepkg} (development files)" long_desc="${long_desc} This package contains files for development, headers, static libs, etc." - do_install() { vmove usr/include usr vmove usr/lib/pkgconfig usr/lib diff --git a/srcpkgs/iptables/template b/srcpkgs/iptables/template index 1884c943c6a..c2ab8bc8b7a 100644 --- a/srcpkgs/iptables/template +++ b/srcpkgs/iptables/template @@ -1,15 +1,15 @@ # Template file for 'iptables' pkgname=iptables -version=1.4.13 -homepage="http://www.iptables.org" -distfiles="$homepage/projects/iptables/files/$pkgname-$version.tar.bz2" +version=1.4.14 build_style=gnu-configure -configure_args="--enable-devel --enable-libipq --enable-shared --enable-static" +configure_args="--enable-libipq --enable-shared --enable-static" +subpackages="$pkgname-devel" short_desc="Linux IPv[46] packet filtering ruleset" maintainer="Juan RP " homepage="http://www.netfilter.org/" license="GPL-2" -checksum=321e2600fc4541a958e44cafd85a42864b0035404097e0f2e082d474029b9ded +distfiles="$homepage/projects/iptables/files/$pkgname-$version.tar.bz2" +checksum=9be675696f41cd4f35cc332b667d285fe9489ca93c8e1f77804bd04b3315a522 long_desc=" iptables is the userspace command line program used to configure the Linux IPv4 packet filtering ruleset. It is targeted towards system administrators. @@ -20,23 +20,14 @@ long_desc=" The iptables package also includes ip6tables. ip6tables is used for configuring the IPv6 packet filter." -subpackages="$pkgname-devel" - -pre_configure() { - # Fix build with kernel-libc-headers >= 3.2 - sed -i '/if_packet/i#define __aligned_u64 __u64 __attribute__((aligned(8)))' \ - extensions/libxt_pkttype.c - sed -i '87 i libxt_RATEEST.so: libxt_RATEEST.oo' extensions/GNUmakefile.in - sed -i '88 i \\t${AM_VERBOSE_CCLD} ${CCLD} ${AM_LDFLAGS} -lm -shared ${LDFLAGS} -o $@ $<;\n' \ - extensions/GNUmakefile.in -} - post_install() { + # systemd services. vinstall ${FILESDIR}/iptables.service 644 lib/systemd/system vinstall ${FILESDIR}/ip6tables.service 644 lib/systemd/system vinstall ${FILESDIR}/iptables-flush.scripts 755 \ lib/systemd/scripts iptables-flush + # Configuration files and rules. for f in empty.rules simple_firewall.rules; do vinstall ${FILESDIR}/${f} 644 etc/iptables done