aboutsummaryrefslogtreecommitdiffstats
path: root/main
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2011-06-09 07:45:42 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2011-06-09 07:50:52 +0000
commit430f6f34880c7da0094e4610da80545f2d5deb26 (patch)
treed972cdbd26c7349d9f436a6ec9be8cfbfc650f9a /main
parent8d964cde92d5bbb9336471986b5d4098f6961357 (diff)
downloadaports-430f6f34880c7da0094e4610da80545f2d5deb26.tar.bz2
aports-430f6f34880c7da0094e4610da80545f2d5deb26.tar.xz
main/iptables: upgrade to 1.4.11.1
Diffstat (limited to 'main')
-rw-r--r--main/iptables/0001-build-Fix-ip6-tables-symlinks-to-point-to-xtables-mu.patch28
-rw-r--r--main/iptables/APKBUILD9
2 files changed, 3 insertions, 34 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
deleted file mode 100644
index 2470953663..0000000000
--- a/main/iptables/0001-build-Fix-ip6-tables-symlinks-to-point-to-xtables-mu.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-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 d8ba43d534..8f7e02c04f 100644
--- a/main/iptables/APKBUILD
+++ b/main/iptables/APKBUILD
@@ -2,15 +2,14 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=iptables
-pkgver=1.4.11
-pkgrel=1
+pkgver=1.4.11.1
+pkgrel=0
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
@@ -27,7 +26,6 @@ prepare() {
*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
esac
done
- ./autogen.sh
}
build() {
@@ -75,9 +73,8 @@ ip6tables() {
"$subpkgdir"/etc/init.d/ip6tables
}
-md5sums="4d77c912d17364e2515fda27d398e15e iptables-1.4.11.tar.bz2
+md5sums="7de6e1ae7ed8a2025f184763a6a24b9a iptables-1.4.11.1.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"