aboutsummaryrefslogtreecommitdiffstats
path: root/main/iptables
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2011-06-02 09:27:08 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2011-06-02 09:31:58 +0000
commitedc59b03d23e0c48bc9787779d4853944c9a6590 (patch)
tree0ec0e25379038e22f26d06ad15431e078048dc50 /main/iptables
parente54e60c8d467f3fa8b735ac73c89ebc1aafbd85f (diff)
downloadaports-edc59b03d23e0c48bc9787779d4853944c9a6590.tar.bz2
aports-edc59b03d23e0c48bc9787779d4853944c9a6590.tar.xz
main/iptables: fix broken iptables-multi link
Diffstat (limited to 'main/iptables')
-rw-r--r--main/iptables/0001-build-Fix-ip6-tables-symlinks-to-point-to-xtables-mu.patch28
-rw-r--r--main/iptables/APKBUILD25
2 files changed, 45 insertions, 8 deletions
diff --git a/main/iptables/0001-build-Fix-ip6-tables-symlinks-to-point-to-xtables-mu.patch b/main/iptables/0001-build-Fix-ip6-tables-symlinks-to-point-to-xtables-mu.patch
new file mode 100644
index 0000000000..2470953663
--- /dev/null
+++ b/main/iptables/0001-build-Fix-ip6-tables-symlinks-to-point-to-xtables-mu.patch
@@ -0,0 +1,28 @@
+From 6962dbafecd066d7c826ad68195f851a0e0d4c66 Mon Sep 17 00:00:00 2001
+From: Natanael Copa <ncopa@alpinelinux.org>
+Date: Thu, 2 Jun 2011 09:09:49 +0000
+Subject: [PATCH] build: Fix ip6?tables symlinks to point to xtables-multi
+
+iptables-multi have been renamed to xtables-multi. The install script
+symlinks was not updated.
+---
+ Makefile.am | 6 +++---
+ 1 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 13e144e..741729b 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -96,6 +96,6 @@ config.status: extensions/GNUmakefile.in \
+ install-exec-hook:
+ -if test -z "${DESTDIR}"; then /sbin/ldconfig; fi;
+ ${INSTALL} -dm0755 "${DESTDIR}${bindir}";
+- for i in ${v4_bin_links}; do ${LN_S} -f "${sbindir}/iptables-multi" "${DESTDIR}${bindir}/$$i"; done;
+- for i in ${v4_sbin_links}; do ${LN_S} -f iptables-multi "${DESTDIR}${sbindir}/$$i"; done;
+- for i in ${v6_sbin_links}; do ${LN_S} -f ip6tables-multi "${DESTDIR}${sbindir}/$$i"; done;
++ for i in ${v4_bin_links}; do ${LN_S} -f "${sbindir}/xtables-multi" "${DESTDIR}${bindir}/$$i"; done;
++ for i in ${v4_sbin_links}; do ${LN_S} -f xtables-multi "${DESTDIR}${sbindir}/$$i"; done;
++ for i in ${v6_sbin_links}; do ${LN_S} -f xtables-multi "${DESTDIR}${sbindir}/$$i"; done;
+--
+1.7.5.3
+
diff --git a/main/iptables/APKBUILD b/main/iptables/APKBUILD
index 10a422df2e..d8ba43d534 100644
--- a/main/iptables/APKBUILD
+++ b/main/iptables/APKBUILD
@@ -3,36 +3,43 @@
pkgname=iptables
pkgver=1.4.11
-pkgrel=0
+pkgrel=1
pkgdesc="Linux kernel firewall, NAT and packet mangling tools"
url="http://www.iptables.org/"
arch="all"
license=GPL-2
source="http://iptables.org/projects/iptables/files/$pkgname-$pkgver.tar.bz2
iptables-1.4.2-include-in.patch
+ 0001-build-Fix-ip6-tables-symlinks-to-point-to-xtables-mu.patch
iptables.initd
iptables.confd
ip6tables.confd
"
-makedepends="linux-headers"
+makedepends="linux-headers autoconf automake"
subpackages="ip6tables $pkgname-doc $pkgname-dev"
-build() {
- local i
+prepare() {
cd "$srcdir/$pkgname-$pkgver"
- for i in ../*.patch; do
- msg "Applying $i..."
- patch -p1 -i $i || return 1
+ local i
+ for i in $source; do
+ case $i in
+ *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
+ esac
done
+ ./autogen.sh
+}
+build() {
+ cd "$srcdir/$pkgname-$pkgver"
./configure --prefix=/usr \
--mandir=/usr/share/man \
--sbindir=/sbin \
--without-kernel \
--enable-devel \
--enable-libipq \
- --enable-shared
+ --enable-shared \
+ || return 1
make || return 1
}
@@ -55,6 +62,7 @@ package() {
}
ip6tables() {
+ depends="iptables"
mkdir -p "$subpkgdir"/sbin \
"$subpkgdir"/etc/init.d/ \
"$subpkgdir"/var/lib/ip6tables \
@@ -69,6 +77,7 @@ ip6tables() {
md5sums="4d77c912d17364e2515fda27d398e15e iptables-1.4.11.tar.bz2
ec3e80a1b0ea3e13e4e60824b7ebd1b9 iptables-1.4.2-include-in.patch
+1c46a110ae864ef6449a6b7c65c1e9e5 0001-build-Fix-ip6-tables-symlinks-to-point-to-xtables-mu.patch
2202ac150a5dfe32a8363b0ad565ee1d iptables.initd
956ebf5ab69e5a1e1d3983541eab643b iptables.confd
91933090bd9d493c91dcffc0221def61 ip6tables.confd"