[arch-commits] Commit in iptables/trunk (5 files)

[Ronald van Haren]

    Date: Wednesday, September 19, 2018 @ 13:12:11
  Author: ronald
Revision: 335011

upgpkg: iptables 1:1.6.2-3

force downgrade to 1.6.2

Modified:
  iptables/trunk/PKGBUILD	(contents, properties)
Deleted:
  iptables/trunk/arptables
  iptables/trunk/arptables.service
  iptables/trunk/ebtables
  iptables/trunk/ebtables.service

-------------------+
 PKGBUILD          |   58 ++++++++++++++++++++++------------------------------
 arptables         |   21 ------------------
 arptables.service |   13 -----------
 ebtables          |   21 ------------------
 ebtables.service  |   13 -----------
 5 files changed, 25 insertions(+), 101 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-09-19 13:04:06 UTC (rev 335010)
+++ PKGBUILD	2018-09-19 13:12:11 UTC (rev 335011)
@@ -2,8 +2,9 @@
 # Contributor: Thomas Baechler <thomas at archlinux.org>
 
 pkgname=iptables
-pkgver=1.8.0
-pkgrel=2
+pkgver=1.6.2
+pkgrel=3
+epoch=1
 pkgdesc='Linux kernel packet control tool'
 arch=(x86_64)
 license=(GPL2)
@@ -10,16 +11,18 @@
 url='http://www.netfilter.org/projects/iptables/index.html'
 depends=(glibc bash libnftnl libpcap)
 makedepends=(linux-api-headers)
-provides=(ebtables arptables)
-conflicts=(ebtables arptables)
-replaces=(ebtables arptables)
 source=(http://www.netfilter.org/projects/iptables/files/${pkgname}-${pkgver}.tar.bz2{,.sig}
         empty.rules
         simple_firewall.rules
-        empty-{filter,mangle,nat,raw,security}.rules
-        {iptables,ip6tables,ebtables,arptables}.service
-        iptables-flush arptables ebtables)
-sha1sums=('04924fd00dbaf8189f0777af90f7bdb73ac7e47c'
+        empty-filter.rules
+        empty-mangle.rules
+        empty-nat.rules
+        empty-raw.rules
+        empty-security.rules
+        iptables.service
+        ip6tables.service
+        iptables-flush)
+sha1sums=('6279effbf8f2c7ff53d19ae13308f8a6e6a60dd9'
           'SKIP'
           '83b3363878e3660ce23b2ad325b53cbd6c796ecf'
           'f085a71f467e4d7cb2cf094d9369b0bcc4bab6ec'
@@ -30,11 +33,7 @@
           'ebbd1424a1564fd45f455a81c61ce348f0a14c2e'
           '49be9443fc302dd0fda78b63d64e884cadb61603'
           '9cec592787e32451f58fa608ea057870e07aa704'
-          '052fe6a802d5c7be015881787ed716819db1ca0a'
-          'f15bd7937a10fbfcc6443f55a25cd566a460ebe7'
-          'e7abda09c61142121b6695928d3b71ccd8fdf73a'
-          '1502ebe011f44e5553d9cbd5023755cd9f3e8c75'
-          '436f8adb727e93e92a07834ba0e93f4364587901')
+          'e7abda09c61142121b6695928d3b71ccd8fdf73a')
 validpgpkeys=('C09DB2063F1D7034BA6152ADAB4655A126D292E4') # Netfilter Core Team
 
 prepare() {
@@ -64,26 +63,19 @@
   make DESTDIR="$pkgdir" install
 
   cd "$srcdir"
-  install -Dm644 empty.rules "$pkgdir/etc/iptables/empty.rules"
-  install -Dm644 simple_firewall.rules "$pkgdir/etc/iptables/simple_firewall.rules"
+  install -Dm644 empty.rules "${pkgdir}"/etc/iptables/empty.rules
+  install -Dm644 simple_firewall.rules "${pkgdir}"/etc/iptables/simple_firewall.rules
 
   install -d "$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 -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
 
-  for unit in iptables ip6tables arptables ebtables; do
-    install -Dm644 ${unit}.service "$pkgdir/usr/lib/systemd/system/${unit}.service"
-  done
+  # install systemd files
+  install -Dm644 iptables.service \
+    "$pkgdir/usr/lib/systemd/system/iptables.service"
+  install -Dm644 ip6tables.service \
+    "$pkgdir/usr/lib/systemd/system/ip6tables.service"
+  install -Dm755 iptables-flush \
+    "$pkgdir/usr/lib/systemd/scripts/iptables-flush"
+}
 
-  for helper in iptables-flush arptables ebtables; do
-    install -Dm755 $helper \
-      "$pkgdir/usr/lib/systemd/scripts/$helper"
-  done
-
-  # install iptables-apply
-  cd $srcdir/$pkgname-$pkgver
-  install -Dm755 $pkgname/iptables-apply \
-      "$pkgdir/usr/bin/iptables-apply"
-  gzip --to-stdout --best $pkgname/iptables-apply.8 > \
-      "$pkgdir/usr/share/man/man8/iptables-apply.8.gz"
-}


Property changes on: iptables/trunk/PKGBUILD
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Deleted: arptables
===================================================================
--- arptables	2018-09-19 13:04:06 UTC (rev 335010)
+++ arptables	2018-09-19 13:12:11 UTC (rev 335011)
@@ -1,21 +0,0 @@
-#!/bin/bash
-
-CONFIG_FILE='/etc/arptables.conf'
-
-case $1 in
-  start)
-    arptables-restore < "$CONFIG_FILE"
-  ;;
-  stop)
-    arptables-restore < /dev/null
-  ;;
-  save)
-    arptables-save > "$CONFIG_FILE"
-  ;;
-  *)
-    echo "usage: ${0##*/} {start|stop|save}" >&2
-    exit 1
-  ;;
-esac
-
-# vim:set ts=2 sw=2 ft=sh et:

Deleted: arptables.service
===================================================================
--- arptables.service	2018-09-19 13:04:06 UTC (rev 335010)
+++ arptables.service	2018-09-19 13:12:11 UTC (rev 335011)
@@ -1,13 +0,0 @@
-[Unit]
-Description=ARP Tables
-Before=network-pre.target
-Wants=network-pre.target
-
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-ExecStart=/usr/lib/systemd/scripts/arptables start
-ExecStop=/usr/lib/systemd/scripts/arptables stop
-
-[Install]
-WantedBy=multi-user.target

Deleted: ebtables
===================================================================
--- ebtables	2018-09-19 13:04:06 UTC (rev 335010)
+++ ebtables	2018-09-19 13:12:11 UTC (rev 335011)
@@ -1,21 +0,0 @@
-#!/bin/bash
-
-CONFIG_FILE='/etc/ebtables.conf'
-
-case $1 in
-  start)
-    ebtables-restore < "$CONFIG_FILE"
-  ;;
-  stop)
-    ebtables -F
-  ;;
-  save)
-    ebtables-save > "$CONFIG_FILE"
-  ;;
-  *)
-    echo "usage: ${0##*/} {start|stop|save}" >&2
-    exit 1
-  ;;
-esac
-
-# vim:set ts=2 sw=2 ft=sh et:

Deleted: ebtables.service
===================================================================
--- ebtables.service	2018-09-19 13:04:06 UTC (rev 335010)
+++ ebtables.service	2018-09-19 13:12:11 UTC (rev 335011)
@@ -1,13 +0,0 @@
-[Unit]
-Description=Ethernet bridge table
-Before=network-pre.target
-Wants=network-pre.target
-
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-ExecStart=/usr/lib/systemd/scripts/ebtables start
-ExecStop=/usr/lib/systemd/scripts/ebtables stop
-
-[Install]
-WantedBy=multi-user.target