iptables: update to 1.4.11.

srcpkgs/iptables/iptables-devel.template

@@ -5,16 +5,13 @@ long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-revision=1
-
 Add_dependency run glibc-devel
 Add_dependency run kernel-headers
 Add_dependency run iptables
 
 do_install()
 {
-	mkdir -p ${DESTDIR}/usr/lib ${DESTDIR}/usr/share/man
-	mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
-	mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/share/man/man3 ${DESTDIR}/usr/share/man
+	vmove usr/include usr
+	vmove usr/lib/pkgconfig usr
+	vmove usr/share/man/man3 usr/share/man
 }

srcpkgs/iptables/template

@@ -1,14 +1,13 @@
 # Template file for 'iptables'
 pkgname=iptables
-version=1.4.7
-revision=2
+version=1.4.11
 distfiles="http://www.iptables.org/projects/iptables/files/$pkgname-$version.tar.bz2"
-build_style=gnu_configure
-configure_args="--enable-devel --enable-libipq --sbindir=/sbin
---with-kernel=/usr/src/kernel-headers-$(${XBPS_PKGDB_CMD} version kernel-headers)"
+build_style=custom-install
 short_desc="Linux IPv[46] packet filtering ruleset"
 maintainer="Juan RP <xtraeme@gmail.com>"
-checksum=9f61f389cabdde79e26ca78c336db1b6373b67f80f7cfcb3e9d9ff520b325452
+homepage="http://www.netfilter.org/"
+license="GPL-2"
+checksum=c436df01657b30fe1ee7bb14324e5250adefaaaad8fde5760f95f3db55ae4618
 long_desc="
  iptables is the userspace command line program used to configure the Linux
  2.4.x and 2.6.x IPv4 packet filtering ruleset. It is targeted towards system
@@ -20,6 +19,7 @@ long_desc="
  The iptables package also includes ip6tables. ip6tables is used for
  configuring the IPv6 packet filter."
 
+keep_empty_dirs=yes
 openrc_services="iptables default false"
 conf_files="
 /etc/conf.d/iptables
@@ -28,27 +28,32 @@ conf_files="
 subpackages="$pkgname-devel"
 
 Add_dependency run glibc
+Add_dependency build sed
 Add_dependency build kernel-headers
 
-pre_configure()
+do_build()
 {
-	export PATH="/bin:/sbin:/usr/bin:/usr/sbin:$PATH"
-
 	sed -i '87 i libxt_RATEEST.so: libxt_RATEEST.oo' \
-		${wrksrc}/extensions/GNUmakefile.in
+		extensions/GNUmakefile.in
 	sed -i '88 i \\t${AM_VERBOSE_CCLD} ${CCLD} ${AM_LDFLAGS} -lm -shared ${LDFLAGS} -o $@ $<;\n' \
-		${wrksrc}/extensions/GNUmakefile.in
+		extensions/GNUmakefile.in
+
+	./configure ${CONFIGURE_SHARED_ARGS} --enable-devel --enable-libipq \
+		--sbindir=/sbin \
+		--with-kernel=/usr/src/kernel-headers-$(${XBPS_PKGDB_CMD} version kernel-headers)
+
+	make ${makejobs}
 }
 
-post_install()
+do_install()
 {
-	install -d ${DESTDIR}/etc/{conf.d,iptables}
-	install -m644 ${FILESDIR}/iptables.confd ${DESTDIR}/etc/conf.d/iptables
-	install -m644 ${FILESDIR}/ip6tables.confd \
-		${DESTDIR}/etc/conf.d/ip6tables
-	install -D -m755 ${FILESDIR}/iptables.rc \
-		${DESTDIR}/etc/init.d/iptables
-	install -m644 ${FILESDIR}/*.rules ${DESTDIR}/etc/iptables
-	install -d ${DESTDIR}/var/lib/iptables
-	touch -f ${DESTDIR}/var/lib/iptables/.empty_on_purpose
+	make DESTDIR=${DESTDIR} install
+
+	vinstall ${FILESDIR}/iptables.confd 644 etc/conf.d iptables
+	vinstall ${FILESDIR}/ip6tables.confd 644 etc/conf.d ip6tables
+	vinstall ${FILESDIR}/iptables.rc 755 etc/init.d iptables
+	for f in $(${FILESDIR}/*.rules); do
+		vinstall ${f} 644 etc/iptables
+	done
+	vmkdir var/lib/iptables
 }