From 16d3f4a41676ba72fdd3b62c6000bec6c3ff046f Mon Sep 17 00:00:00 2001 From: Juan RP Date: Wed, 8 Feb 2012 14:04:00 +0100 Subject: [PATCH] iptables: update to 1.4.12.2. --- srcpkgs/iptables/iptables-devel.template | 6 ++--- srcpkgs/iptables/template | 34 +++++++----------------- 2 files changed, 12 insertions(+), 28 deletions(-) diff --git a/srcpkgs/iptables/iptables-devel.template b/srcpkgs/iptables/iptables-devel.template index 1adb394f32..f4807d06c0 100644 --- a/srcpkgs/iptables/iptables-devel.template +++ b/srcpkgs/iptables/iptables-devel.template @@ -5,13 +5,11 @@ long_desc="${long_desc} This package contains files for development, headers, static libs, etc." -revision=1 - Add_dependency run iptables -do_install() -{ +do_install() { vmove usr/include usr vmove usr/lib/pkgconfig usr/lib vmove usr/share/man/man3 usr/share/man + vmove "usr/lib/*.a" usr/lib } diff --git a/srcpkgs/iptables/template b/srcpkgs/iptables/template index 9575849275..65ec7f21f8 100644 --- a/srcpkgs/iptables/template +++ b/srcpkgs/iptables/template @@ -1,13 +1,15 @@ # Template file for 'iptables' pkgname=iptables -version=1.4.12.1 +version=1.4.12.2 homepage="http://www.iptables.org" distfiles="$homepage/projects/iptables/files/$pkgname-$version.tar.bz2" +build_style=gnu-configure +configure_args="--enable-devel --enable-libipq --enable-shared --enable-static" short_desc="Linux IPv[46] packet filtering ruleset" maintainer="Juan RP " homepage="http://www.netfilter.org/" license="GPL-2" -checksum=77e6581f21f15946a814fa311236e5f3f7c6593180f9d695cea06aa95e464aba +checksum=09fff7dfe6af95675474fd5d0fc67622fac5a0f3d6e02ee614deae9a2e5dae13 long_desc=" iptables is the userspace command line program used to configure the Linux IPv4 packet filtering ruleset. It is targeted towards system administrators. @@ -21,26 +23,17 @@ long_desc=" subpackages="$pkgname-devel" Add_dependency build sed -Add_dependency build kernel-headers -do_configure() { - sed -i '87 i libxt_RATEEST.so: libxt_RATEEST.oo' \ - extensions/GNUmakefile.in +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 - - ./configure ${CONFIGURE_SHARED_ARGS} --enable-devel --enable-libipq \ - --sbindir=/sbin \ - --with-kernel=/usr/src/kernel-headers-$(${XBPS_PKGDB_CMD} version kernel-headers) } -do_build() { - make ${makejobs} -} - -do_install() { - make DESTDIR=${DESTDIR} install - +post_install() { vinstall ${FILESDIR}/iptables.service 644 lib/systemd/system vinstall ${FILESDIR}/ip6tables.service 644 lib/systemd/system vinstall ${FILESDIR}/iptables-flush.scripts 755 \ @@ -53,11 +46,4 @@ do_install() { vinstall ${FILESDIR}/empty-${f}.rules 644 \ var/lib/iptables empty-${f}.rules done - - # Override wrong symlinks from xtables_multi. - for f in iptables iptables-restore iptables-save ip6tables \ - ip6tables-restore ip6tables-save; do - cd ${DESTDIR}/sbin && ln -sf xtables-multi ${f} - done - cd ${DESTDIR}/usr/bin && ln -sf ../../sbin/xtables-multi iptables-xml }