[arch-commits] Commit in iptables/repos (26 files)
Ronald van Haren
ronald at archlinux.org
Wed Mar 25 08:11:53 UTC 2015
Date: Wednesday, March 25, 2015 @ 09:11:52
Author: ronald
Revision: 234673
archrelease: copy trunk to testing-i686, testing-x86_64
Added:
iptables/repos/testing-i686/
iptables/repos/testing-i686/PKGBUILD
(from rev 234672, iptables/trunk/PKGBUILD)
iptables/repos/testing-i686/empty-filter.rules
(from rev 234672, iptables/trunk/empty-filter.rules)
iptables/repos/testing-i686/empty-mangle.rules
(from rev 234672, iptables/trunk/empty-mangle.rules)
iptables/repos/testing-i686/empty-nat.rules
(from rev 234672, iptables/trunk/empty-nat.rules)
iptables/repos/testing-i686/empty-raw.rules
(from rev 234672, iptables/trunk/empty-raw.rules)
iptables/repos/testing-i686/empty-security.rules
(from rev 234672, iptables/trunk/empty-security.rules)
iptables/repos/testing-i686/empty.rules
(from rev 234672, iptables/trunk/empty.rules)
iptables/repos/testing-i686/ip6tables.service
(from rev 234672, iptables/trunk/ip6tables.service)
iptables/repos/testing-i686/iptables-flush
(from rev 234672, iptables/trunk/iptables-flush)
iptables/repos/testing-i686/iptables.service
(from rev 234672, iptables/trunk/iptables.service)
iptables/repos/testing-i686/iptables_upstream940.patch
(from rev 234672, iptables/trunk/iptables_upstream940.patch)
iptables/repos/testing-i686/simple_firewall.rules
(from rev 234672, iptables/trunk/simple_firewall.rules)
iptables/repos/testing-x86_64/
iptables/repos/testing-x86_64/PKGBUILD
(from rev 234672, iptables/trunk/PKGBUILD)
iptables/repos/testing-x86_64/empty-filter.rules
(from rev 234672, iptables/trunk/empty-filter.rules)
iptables/repos/testing-x86_64/empty-mangle.rules
(from rev 234672, iptables/trunk/empty-mangle.rules)
iptables/repos/testing-x86_64/empty-nat.rules
(from rev 234672, iptables/trunk/empty-nat.rules)
iptables/repos/testing-x86_64/empty-raw.rules
(from rev 234672, iptables/trunk/empty-raw.rules)
iptables/repos/testing-x86_64/empty-security.rules
(from rev 234672, iptables/trunk/empty-security.rules)
iptables/repos/testing-x86_64/empty.rules
(from rev 234672, iptables/trunk/empty.rules)
iptables/repos/testing-x86_64/ip6tables.service
(from rev 234672, iptables/trunk/ip6tables.service)
iptables/repos/testing-x86_64/iptables-flush
(from rev 234672, iptables/trunk/iptables-flush)
iptables/repos/testing-x86_64/iptables.service
(from rev 234672, iptables/trunk/iptables.service)
iptables/repos/testing-x86_64/iptables_upstream940.patch
(from rev 234672, iptables/trunk/iptables_upstream940.patch)
iptables/repos/testing-x86_64/simple_firewall.rules
(from rev 234672, iptables/trunk/simple_firewall.rules)
-------------------------------------------+
testing-i686/PKGBUILD | 80 ++++++++++++++++++++++++++++
testing-i686/empty-filter.rules | 6 ++
testing-i686/empty-mangle.rules | 8 ++
testing-i686/empty-nat.rules | 7 ++
testing-i686/empty-raw.rules | 5 +
testing-i686/empty-security.rules | 6 ++
testing-i686/empty.rules | 6 ++
testing-i686/ip6tables.service | 12 ++++
testing-i686/iptables-flush | 18 ++++++
testing-i686/iptables.service | 12 ++++
testing-i686/iptables_upstream940.patch | 52 ++++++++++++++++++
testing-i686/simple_firewall.rules | 11 +++
testing-x86_64/PKGBUILD | 80 ++++++++++++++++++++++++++++
testing-x86_64/empty-filter.rules | 6 ++
testing-x86_64/empty-mangle.rules | 8 ++
testing-x86_64/empty-nat.rules | 7 ++
testing-x86_64/empty-raw.rules | 5 +
testing-x86_64/empty-security.rules | 6 ++
testing-x86_64/empty.rules | 6 ++
testing-x86_64/ip6tables.service | 12 ++++
testing-x86_64/iptables-flush | 18 ++++++
testing-x86_64/iptables.service | 12 ++++
testing-x86_64/iptables_upstream940.patch | 52 ++++++++++++++++++
testing-x86_64/simple_firewall.rules | 11 +++
24 files changed, 446 insertions(+)
Copied: iptables/repos/testing-i686/PKGBUILD (from rev 234672, iptables/trunk/PKGBUILD)
===================================================================
--- testing-i686/PKGBUILD (rev 0)
+++ testing-i686/PKGBUILD 2015-03-25 08:11:52 UTC (rev 234673)
@@ -0,0 +1,80 @@
+# $Id$
+# Maintainer: Ronald van Haren <ronald.archlinux.org>
+# Contributor: Thomas Baechler <thomas at archlinux.org>
+
+pkgname=iptables
+pkgver=1.4.21
+pkgrel=2
+pkgdesc='Linux kernel packet control tool'
+arch=('i686' 'x86_64')
+license=('GPL2')
+url='http://www.netfilter.org/projects/iptables/index.html'
+depends=('glibc' 'bash')
+makedepends=('linux-api-headers')
+source=(http://www.netfilter.org/projects/iptables/files/${pkgname}-${pkgver}.tar.bz2{,.sig} \
+ iptables_upstream940.patch
+ empty.rules
+ simple_firewall.rules
+ empty-filter.rules
+ empty-mangle.rules
+ empty-nat.rules
+ empty-raw.rules
+ empty-security.rules
+ iptables.service
+ ip6tables.service
+ iptables-flush)
+sha1sums=('85d4160537546a23a7e42bc26dd7ee62a0ede4c8'
+ 'SKIP'
+ 'ae7f56344ae6b1fc5e1761ae2ca1d1be47815d44'
+ '83b3363878e3660ce23b2ad325b53cbd6c796ecf'
+ 'f085a71f467e4d7cb2cf094d9369b0bcc4bab6ec'
+ 'd9f9f06b46b4187648e860afa0552335aafe3ce4'
+ 'c45b738b5ec4cfb11611b984c21a83b91a2d58f3'
+ '1694d79b3e6e9d9d543f6a6e75fed06066c9a6c6'
+ '7db53bb882f62f6c677cc8559cff83d8bae2ef73'
+ 'ebbd1424a1564fd45f455a81c61ce348f0a14c2e'
+ '9306cba67dbeaa004af084a816f66920a6a10faf'
+ '38fa2ffe7965e63b494d333f69193029c1258c28'
+ 'e7abda09c61142121b6695928d3b71ccd8fdf73a')
+validpgpkeys=('57FF5E9C9AA67A860B557AF7A4111F89BB5F58CC') # Netfilter Core Team
+
+prepare() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+
+ # use system one
+ rm include/linux/types.h
+
+ # https://bugzilla.netfilter.org/show_bug.cgi?id=940
+ patch -Np1 -i "${srcdir}/iptables_upstream940.patch"
+}
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+
+ ./configure --prefix=/usr \
+ --libexecdir=/usr/lib/iptables --sysconfdir=/etc \
+ --with-xtlibdir=/usr/lib/iptables \
+ --enable-devel --enable-shared \
+ --sbindir=/usr/bin
+ make
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+
+ make DESTDIR="${pkgdir}" install
+
+ cd "${srcdir}"
+ install -D -m644 empty.rules "${pkgdir}"/etc/iptables/empty.rules
+ install -D -m644 simple_firewall.rules "${pkgdir}"/etc/iptables/simple_firewall.rules
+
+ mkdir -p "${pkgdir}"/var/lib/{iptables,ip6tables}
+ install -m644 empty-{filter,mangle,nat,raw,security}.rules "${pkgdir}"/var/lib/iptables
+ install -m644 empty-{filter,mangle,nat,raw,security}.rules "${pkgdir}"/var/lib/ip6tables
+
+ # install systemd files
+ install -Dm644 ${srcdir}/iptables.service ${pkgdir}/usr/lib/systemd/system/iptables.service
+ install -Dm644 ${srcdir}/ip6tables.service ${pkgdir}/usr/lib/systemd/system/ip6tables.service
+ install -Dm755 ${srcdir}/iptables-flush ${pkgdir}/usr/lib/systemd/scripts/iptables-flush
+}
+
Copied: iptables/repos/testing-i686/empty-filter.rules (from rev 234672, iptables/trunk/empty-filter.rules)
===================================================================
--- testing-i686/empty-filter.rules (rev 0)
+++ testing-i686/empty-filter.rules 2015-03-25 08:11:52 UTC (rev 234673)
@@ -0,0 +1,6 @@
+# Empty iptables filter table rule file
+*filter
+:INPUT ACCEPT [0:0]
+:FORWARD ACCEPT [0:0]
+:OUTPUT ACCEPT [0:0]
+COMMIT
Copied: iptables/repos/testing-i686/empty-mangle.rules (from rev 234672, iptables/trunk/empty-mangle.rules)
===================================================================
--- testing-i686/empty-mangle.rules (rev 0)
+++ testing-i686/empty-mangle.rules 2015-03-25 08:11:52 UTC (rev 234673)
@@ -0,0 +1,8 @@
+# Empty iptables mangle table rules file
+*mangle
+:PREROUTING ACCEPT [0:0]
+:INPUT ACCEPT [0:0]
+:FORWARD ACCEPT [0:0]
+:OUTPUT ACCEPT [0:0]
+:POSTROUTING ACCEPT [0:0]
+COMMIT
Copied: iptables/repos/testing-i686/empty-nat.rules (from rev 234672, iptables/trunk/empty-nat.rules)
===================================================================
--- testing-i686/empty-nat.rules (rev 0)
+++ testing-i686/empty-nat.rules 2015-03-25 08:11:52 UTC (rev 234673)
@@ -0,0 +1,7 @@
+# Empty iptables nat table rules file
+*nat
+:PREROUTING ACCEPT [0:0]
+:INPUT ACCEPT [0:0]
+:OUTPUT ACCEPT [0:0]
+:POSTROUTING ACCEPT [0:0]
+COMMIT
Copied: iptables/repos/testing-i686/empty-raw.rules (from rev 234672, iptables/trunk/empty-raw.rules)
===================================================================
--- testing-i686/empty-raw.rules (rev 0)
+++ testing-i686/empty-raw.rules 2015-03-25 08:11:52 UTC (rev 234673)
@@ -0,0 +1,5 @@
+# Empty iptables raw table rules file
+*raw
+:PREROUTING ACCEPT [0:0]
+:OUTPUT ACCEPT [0:0]
+COMMIT
Copied: iptables/repos/testing-i686/empty-security.rules (from rev 234672, iptables/trunk/empty-security.rules)
===================================================================
--- testing-i686/empty-security.rules (rev 0)
+++ testing-i686/empty-security.rules 2015-03-25 08:11:52 UTC (rev 234673)
@@ -0,0 +1,6 @@
+# Empty iptables security table rules file
+*security
+:INPUT ACCEPT [0:0]
+:FORWARD ACCEPT [0:0]
+:OUTPUT ACCEPT [0:0]
+COMMIT
Copied: iptables/repos/testing-i686/empty.rules (from rev 234672, iptables/trunk/empty.rules)
===================================================================
--- testing-i686/empty.rules (rev 0)
+++ testing-i686/empty.rules 2015-03-25 08:11:52 UTC (rev 234673)
@@ -0,0 +1,6 @@
+# Empty iptables rule file
+*filter
+:INPUT ACCEPT [0:0]
+:FORWARD ACCEPT [0:0]
+:OUTPUT ACCEPT [0:0]
+COMMIT
Copied: iptables/repos/testing-i686/ip6tables.service (from rev 234672, iptables/trunk/ip6tables.service)
===================================================================
--- testing-i686/ip6tables.service (rev 0)
+++ testing-i686/ip6tables.service 2015-03-25 08:11:52 UTC (rev 234673)
@@ -0,0 +1,12 @@
+[Unit]
+Description=IPv6 Packet Filtering Framework
+
+[Service]
+Type=oneshot
+ExecStart=/usr/bin/ip6tables-restore /etc/iptables/ip6tables.rules
+ExecReload=/usr/bin/ip6tables-restore /etc/iptables/ip6tables.rules
+ExecStop=/usr/lib/systemd/scripts/iptables-flush 6
+RemainAfterExit=yes
+
+[Install]
+WantedBy=multi-user.target
Copied: iptables/repos/testing-i686/iptables-flush (from rev 234672, iptables/trunk/iptables-flush)
===================================================================
--- testing-i686/iptables-flush (rev 0)
+++ testing-i686/iptables-flush 2015-03-25 08:11:52 UTC (rev 234673)
@@ -0,0 +1,18 @@
+#!/bin/bash
+#
+# Usage: iptables-flush [6]
+#
+
+iptables=ip$1tables
+if ! type -p "$iptables"; then
+ echo "error: invalid argument"
+ exit 1
+fi
+
+while read -r table; do
+ tables+=("/var/lib/$iptables/empty-$table.rules")
+done <"/proc/net/ip$1_tables_names"
+
+if (( ${#tables[*]} )); then
+ cat "${tables[@]}" | "$iptables-restore"
+fi
Copied: iptables/repos/testing-i686/iptables.service (from rev 234672, iptables/trunk/iptables.service)
===================================================================
--- testing-i686/iptables.service (rev 0)
+++ testing-i686/iptables.service 2015-03-25 08:11:52 UTC (rev 234673)
@@ -0,0 +1,12 @@
+[Unit]
+Description=Packet Filtering Framework
+
+[Service]
+Type=oneshot
+ExecStart=/usr/bin/iptables-restore /etc/iptables/iptables.rules
+ExecReload=/usr/bin/iptables-restore /etc/iptables/iptables.rules
+ExecStop=/usr/lib/systemd/scripts/iptables-flush
+RemainAfterExit=yes
+
+[Install]
+WantedBy=multi-user.target
Copied: iptables/repos/testing-i686/iptables_upstream940.patch (from rev 234672, iptables/trunk/iptables_upstream940.patch)
===================================================================
--- testing-i686/iptables_upstream940.patch (rev 0)
+++ testing-i686/iptables_upstream940.patch 2015-03-25 08:11:52 UTC (rev 234673)
@@ -0,0 +1,52 @@
+From 87cb94ba87208c369a349ff6b3767e2ba63d673c Mon Sep 17 00:00:00 2001
+From: Kazunori Kojima <kjm.kznr at gmail.com>
+Date: Wed, 14 May 2014 01:19:46 +0900
+Subject: [PATCH] extensions: S/DNPT: fix invalid output in save function
+
+ip6tables-save output is invalid rule.
+---
+ extensions/libip6t_DNPT.c | 4 ++--
+ extensions/libip6t_SNPT.c | 4 ++--
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/extensions/libip6t_DNPT.c b/extensions/libip6t_DNPT.c
+index a442de6..4659ec8 100644
+--- a/extensions/libip6t_DNPT.c
++++ b/extensions/libip6t_DNPT.c
+@@ -65,12 +65,12 @@ static void DNPT_save(const void *ip, const struct xt_entry_target *target)
+
+ if (memcmp(&info->src_pfx.in6, &zero_addr, sizeof(zero_addr)) != 0 ||
+ info->src_pfx_len != 0)
+- printf("--src-pfx %s/%u ",
++ printf(" --src-pfx %s/%u ",
+ xtables_ip6addr_to_numeric(&info->src_pfx.in6),
+ info->src_pfx_len);
+ if (memcmp(&info->dst_pfx.in6, &zero_addr, sizeof(zero_addr)) != 0 ||
+ info->dst_pfx_len != 0)
+- printf("--dst-pfx %s/%u ",
++ printf(" --dst-pfx %s/%u ",
+ xtables_ip6addr_to_numeric(&info->dst_pfx.in6),
+ info->dst_pfx_len);
+ }
+diff --git a/extensions/libip6t_SNPT.c b/extensions/libip6t_SNPT.c
+index 4f10de0..bd3ab28 100644
+--- a/extensions/libip6t_SNPT.c
++++ b/extensions/libip6t_SNPT.c
+@@ -65,12 +65,12 @@ static void SNPT_save(const void *ip, const struct xt_entry_target *target)
+
+ if (memcmp(&info->src_pfx.in6, &zero_addr, sizeof(zero_addr)) != 0 ||
+ info->src_pfx_len != 0)
+- printf("--src-pfx %s/%u ",
++ printf(" --src-pfx %s/%u ",
+ xtables_ip6addr_to_numeric(&info->src_pfx.in6),
+ info->src_pfx_len);
+ if (memcmp(&info->dst_pfx.in6, &zero_addr, sizeof(zero_addr)) != 0 ||
+ info->dst_pfx_len != 0)
+- printf("--dst-pfx %s/%u ",
++ printf(" --dst-pfx %s/%u ",
+ xtables_ip6addr_to_numeric(&info->dst_pfx.in6),
+ info->dst_pfx_len);
+ }
+--
+1.9.2
+
Copied: iptables/repos/testing-i686/simple_firewall.rules (from rev 234672, iptables/trunk/simple_firewall.rules)
===================================================================
--- testing-i686/simple_firewall.rules (rev 0)
+++ testing-i686/simple_firewall.rules 2015-03-25 08:11:52 UTC (rev 234673)
@@ -0,0 +1,11 @@
+*filter
+:INPUT DROP [0:0]
+:FORWARD DROP [0:0]
+:OUTPUT ACCEPT [0:0]
+-A INPUT -p icmp -j ACCEPT
+-A INPUT -m conntrack --ctstate RELATED,ESTABLISHED -j ACCEPT
+-A INPUT -i lo -j ACCEPT
+-A INPUT -p tcp -j REJECT --reject-with tcp-reset
+-A INPUT -p udp -j REJECT --reject-with icmp-port-unreachable
+-A INPUT -j REJECT --reject-with icmp-proto-unreachable
+COMMIT
Copied: iptables/repos/testing-x86_64/PKGBUILD (from rev 234672, iptables/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2015-03-25 08:11:52 UTC (rev 234673)
@@ -0,0 +1,80 @@
+# $Id$
+# Maintainer: Ronald van Haren <ronald.archlinux.org>
+# Contributor: Thomas Baechler <thomas at archlinux.org>
+
+pkgname=iptables
+pkgver=1.4.21
+pkgrel=2
+pkgdesc='Linux kernel packet control tool'
+arch=('i686' 'x86_64')
+license=('GPL2')
+url='http://www.netfilter.org/projects/iptables/index.html'
+depends=('glibc' 'bash')
+makedepends=('linux-api-headers')
+source=(http://www.netfilter.org/projects/iptables/files/${pkgname}-${pkgver}.tar.bz2{,.sig} \
+ iptables_upstream940.patch
+ empty.rules
+ simple_firewall.rules
+ empty-filter.rules
+ empty-mangle.rules
+ empty-nat.rules
+ empty-raw.rules
+ empty-security.rules
+ iptables.service
+ ip6tables.service
+ iptables-flush)
+sha1sums=('85d4160537546a23a7e42bc26dd7ee62a0ede4c8'
+ 'SKIP'
+ 'ae7f56344ae6b1fc5e1761ae2ca1d1be47815d44'
+ '83b3363878e3660ce23b2ad325b53cbd6c796ecf'
+ 'f085a71f467e4d7cb2cf094d9369b0bcc4bab6ec'
+ 'd9f9f06b46b4187648e860afa0552335aafe3ce4'
+ 'c45b738b5ec4cfb11611b984c21a83b91a2d58f3'
+ '1694d79b3e6e9d9d543f6a6e75fed06066c9a6c6'
+ '7db53bb882f62f6c677cc8559cff83d8bae2ef73'
+ 'ebbd1424a1564fd45f455a81c61ce348f0a14c2e'
+ '9306cba67dbeaa004af084a816f66920a6a10faf'
+ '38fa2ffe7965e63b494d333f69193029c1258c28'
+ 'e7abda09c61142121b6695928d3b71ccd8fdf73a')
+validpgpkeys=('57FF5E9C9AA67A860B557AF7A4111F89BB5F58CC') # Netfilter Core Team
+
+prepare() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+
+ # use system one
+ rm include/linux/types.h
+
+ # https://bugzilla.netfilter.org/show_bug.cgi?id=940
+ patch -Np1 -i "${srcdir}/iptables_upstream940.patch"
+}
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+
+ ./configure --prefix=/usr \
+ --libexecdir=/usr/lib/iptables --sysconfdir=/etc \
+ --with-xtlibdir=/usr/lib/iptables \
+ --enable-devel --enable-shared \
+ --sbindir=/usr/bin
+ make
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+
+ make DESTDIR="${pkgdir}" install
+
+ cd "${srcdir}"
+ install -D -m644 empty.rules "${pkgdir}"/etc/iptables/empty.rules
+ install -D -m644 simple_firewall.rules "${pkgdir}"/etc/iptables/simple_firewall.rules
+
+ mkdir -p "${pkgdir}"/var/lib/{iptables,ip6tables}
+ install -m644 empty-{filter,mangle,nat,raw,security}.rules "${pkgdir}"/var/lib/iptables
+ install -m644 empty-{filter,mangle,nat,raw,security}.rules "${pkgdir}"/var/lib/ip6tables
+
+ # install systemd files
+ install -Dm644 ${srcdir}/iptables.service ${pkgdir}/usr/lib/systemd/system/iptables.service
+ install -Dm644 ${srcdir}/ip6tables.service ${pkgdir}/usr/lib/systemd/system/ip6tables.service
+ install -Dm755 ${srcdir}/iptables-flush ${pkgdir}/usr/lib/systemd/scripts/iptables-flush
+}
+
Copied: iptables/repos/testing-x86_64/empty-filter.rules (from rev 234672, iptables/trunk/empty-filter.rules)
===================================================================
--- testing-x86_64/empty-filter.rules (rev 0)
+++ testing-x86_64/empty-filter.rules 2015-03-25 08:11:52 UTC (rev 234673)
@@ -0,0 +1,6 @@
+# Empty iptables filter table rule file
+*filter
+:INPUT ACCEPT [0:0]
+:FORWARD ACCEPT [0:0]
+:OUTPUT ACCEPT [0:0]
+COMMIT
Copied: iptables/repos/testing-x86_64/empty-mangle.rules (from rev 234672, iptables/trunk/empty-mangle.rules)
===================================================================
--- testing-x86_64/empty-mangle.rules (rev 0)
+++ testing-x86_64/empty-mangle.rules 2015-03-25 08:11:52 UTC (rev 234673)
@@ -0,0 +1,8 @@
+# Empty iptables mangle table rules file
+*mangle
+:PREROUTING ACCEPT [0:0]
+:INPUT ACCEPT [0:0]
+:FORWARD ACCEPT [0:0]
+:OUTPUT ACCEPT [0:0]
+:POSTROUTING ACCEPT [0:0]
+COMMIT
Copied: iptables/repos/testing-x86_64/empty-nat.rules (from rev 234672, iptables/trunk/empty-nat.rules)
===================================================================
--- testing-x86_64/empty-nat.rules (rev 0)
+++ testing-x86_64/empty-nat.rules 2015-03-25 08:11:52 UTC (rev 234673)
@@ -0,0 +1,7 @@
+# Empty iptables nat table rules file
+*nat
+:PREROUTING ACCEPT [0:0]
+:INPUT ACCEPT [0:0]
+:OUTPUT ACCEPT [0:0]
+:POSTROUTING ACCEPT [0:0]
+COMMIT
Copied: iptables/repos/testing-x86_64/empty-raw.rules (from rev 234672, iptables/trunk/empty-raw.rules)
===================================================================
--- testing-x86_64/empty-raw.rules (rev 0)
+++ testing-x86_64/empty-raw.rules 2015-03-25 08:11:52 UTC (rev 234673)
@@ -0,0 +1,5 @@
+# Empty iptables raw table rules file
+*raw
+:PREROUTING ACCEPT [0:0]
+:OUTPUT ACCEPT [0:0]
+COMMIT
Copied: iptables/repos/testing-x86_64/empty-security.rules (from rev 234672, iptables/trunk/empty-security.rules)
===================================================================
--- testing-x86_64/empty-security.rules (rev 0)
+++ testing-x86_64/empty-security.rules 2015-03-25 08:11:52 UTC (rev 234673)
@@ -0,0 +1,6 @@
+# Empty iptables security table rules file
+*security
+:INPUT ACCEPT [0:0]
+:FORWARD ACCEPT [0:0]
+:OUTPUT ACCEPT [0:0]
+COMMIT
Copied: iptables/repos/testing-x86_64/empty.rules (from rev 234672, iptables/trunk/empty.rules)
===================================================================
--- testing-x86_64/empty.rules (rev 0)
+++ testing-x86_64/empty.rules 2015-03-25 08:11:52 UTC (rev 234673)
@@ -0,0 +1,6 @@
+# Empty iptables rule file
+*filter
+:INPUT ACCEPT [0:0]
+:FORWARD ACCEPT [0:0]
+:OUTPUT ACCEPT [0:0]
+COMMIT
Copied: iptables/repos/testing-x86_64/ip6tables.service (from rev 234672, iptables/trunk/ip6tables.service)
===================================================================
--- testing-x86_64/ip6tables.service (rev 0)
+++ testing-x86_64/ip6tables.service 2015-03-25 08:11:52 UTC (rev 234673)
@@ -0,0 +1,12 @@
+[Unit]
+Description=IPv6 Packet Filtering Framework
+
+[Service]
+Type=oneshot
+ExecStart=/usr/bin/ip6tables-restore /etc/iptables/ip6tables.rules
+ExecReload=/usr/bin/ip6tables-restore /etc/iptables/ip6tables.rules
+ExecStop=/usr/lib/systemd/scripts/iptables-flush 6
+RemainAfterExit=yes
+
+[Install]
+WantedBy=multi-user.target
Copied: iptables/repos/testing-x86_64/iptables-flush (from rev 234672, iptables/trunk/iptables-flush)
===================================================================
--- testing-x86_64/iptables-flush (rev 0)
+++ testing-x86_64/iptables-flush 2015-03-25 08:11:52 UTC (rev 234673)
@@ -0,0 +1,18 @@
+#!/bin/bash
+#
+# Usage: iptables-flush [6]
+#
+
+iptables=ip$1tables
+if ! type -p "$iptables"; then
+ echo "error: invalid argument"
+ exit 1
+fi
+
+while read -r table; do
+ tables+=("/var/lib/$iptables/empty-$table.rules")
+done <"/proc/net/ip$1_tables_names"
+
+if (( ${#tables[*]} )); then
+ cat "${tables[@]}" | "$iptables-restore"
+fi
Copied: iptables/repos/testing-x86_64/iptables.service (from rev 234672, iptables/trunk/iptables.service)
===================================================================
--- testing-x86_64/iptables.service (rev 0)
+++ testing-x86_64/iptables.service 2015-03-25 08:11:52 UTC (rev 234673)
@@ -0,0 +1,12 @@
+[Unit]
+Description=Packet Filtering Framework
+
+[Service]
+Type=oneshot
+ExecStart=/usr/bin/iptables-restore /etc/iptables/iptables.rules
+ExecReload=/usr/bin/iptables-restore /etc/iptables/iptables.rules
+ExecStop=/usr/lib/systemd/scripts/iptables-flush
+RemainAfterExit=yes
+
+[Install]
+WantedBy=multi-user.target
Copied: iptables/repos/testing-x86_64/iptables_upstream940.patch (from rev 234672, iptables/trunk/iptables_upstream940.patch)
===================================================================
--- testing-x86_64/iptables_upstream940.patch (rev 0)
+++ testing-x86_64/iptables_upstream940.patch 2015-03-25 08:11:52 UTC (rev 234673)
@@ -0,0 +1,52 @@
+From 87cb94ba87208c369a349ff6b3767e2ba63d673c Mon Sep 17 00:00:00 2001
+From: Kazunori Kojima <kjm.kznr at gmail.com>
+Date: Wed, 14 May 2014 01:19:46 +0900
+Subject: [PATCH] extensions: S/DNPT: fix invalid output in save function
+
+ip6tables-save output is invalid rule.
+---
+ extensions/libip6t_DNPT.c | 4 ++--
+ extensions/libip6t_SNPT.c | 4 ++--
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/extensions/libip6t_DNPT.c b/extensions/libip6t_DNPT.c
+index a442de6..4659ec8 100644
+--- a/extensions/libip6t_DNPT.c
++++ b/extensions/libip6t_DNPT.c
+@@ -65,12 +65,12 @@ static void DNPT_save(const void *ip, const struct xt_entry_target *target)
+
+ if (memcmp(&info->src_pfx.in6, &zero_addr, sizeof(zero_addr)) != 0 ||
+ info->src_pfx_len != 0)
+- printf("--src-pfx %s/%u ",
++ printf(" --src-pfx %s/%u ",
+ xtables_ip6addr_to_numeric(&info->src_pfx.in6),
+ info->src_pfx_len);
+ if (memcmp(&info->dst_pfx.in6, &zero_addr, sizeof(zero_addr)) != 0 ||
+ info->dst_pfx_len != 0)
+- printf("--dst-pfx %s/%u ",
++ printf(" --dst-pfx %s/%u ",
+ xtables_ip6addr_to_numeric(&info->dst_pfx.in6),
+ info->dst_pfx_len);
+ }
+diff --git a/extensions/libip6t_SNPT.c b/extensions/libip6t_SNPT.c
+index 4f10de0..bd3ab28 100644
+--- a/extensions/libip6t_SNPT.c
++++ b/extensions/libip6t_SNPT.c
+@@ -65,12 +65,12 @@ static void SNPT_save(const void *ip, const struct xt_entry_target *target)
+
+ if (memcmp(&info->src_pfx.in6, &zero_addr, sizeof(zero_addr)) != 0 ||
+ info->src_pfx_len != 0)
+- printf("--src-pfx %s/%u ",
++ printf(" --src-pfx %s/%u ",
+ xtables_ip6addr_to_numeric(&info->src_pfx.in6),
+ info->src_pfx_len);
+ if (memcmp(&info->dst_pfx.in6, &zero_addr, sizeof(zero_addr)) != 0 ||
+ info->dst_pfx_len != 0)
+- printf("--dst-pfx %s/%u ",
++ printf(" --dst-pfx %s/%u ",
+ xtables_ip6addr_to_numeric(&info->dst_pfx.in6),
+ info->dst_pfx_len);
+ }
+--
+1.9.2
+
Copied: iptables/repos/testing-x86_64/simple_firewall.rules (from rev 234672, iptables/trunk/simple_firewall.rules)
===================================================================
--- testing-x86_64/simple_firewall.rules (rev 0)
+++ testing-x86_64/simple_firewall.rules 2015-03-25 08:11:52 UTC (rev 234673)
@@ -0,0 +1,11 @@
+*filter
+:INPUT DROP [0:0]
+:FORWARD DROP [0:0]
+:OUTPUT ACCEPT [0:0]
+-A INPUT -p icmp -j ACCEPT
+-A INPUT -m conntrack --ctstate RELATED,ESTABLISHED -j ACCEPT
+-A INPUT -i lo -j ACCEPT
+-A INPUT -p tcp -j REJECT --reject-with tcp-reset
+-A INPUT -p udp -j REJECT --reject-with icmp-port-unreachable
+-A INPUT -j REJECT --reject-with icmp-proto-unreachable
+COMMIT
More information about the arch-commits
mailing list