[arch-commits] Commit in nftables/repos/extra-x86_64 (7 files)

Sébastien Luttringer seblu at gemini.archlinux.org
Wed Jul 28 22:33:36 UTC 2021


    Date: Wednesday, July 28, 2021 @ 22:33:36
  Author: seblu
Revision: 420591

archrelease: copy trunk to extra-x86_64

Added:
  nftables/repos/extra-x86_64/PKGBUILD
    (from rev 420590, nftables/trunk/PKGBUILD)
  nftables/repos/extra-x86_64/nftables.conf
    (from rev 420590, nftables/trunk/nftables.conf)
  nftables/repos/extra-x86_64/nftables.install
    (from rev 420590, nftables/trunk/nftables.install)
  nftables/repos/extra-x86_64/nftables.service
    (from rev 420590, nftables/trunk/nftables.service)
Deleted:
  nftables/repos/extra-x86_64/PKGBUILD
  nftables/repos/extra-x86_64/nftables.conf
  nftables/repos/extra-x86_64/nftables.service

------------------+
 PKGBUILD         |  117 ++++++++++++++++++++++++++---------------------------
 nftables.conf    |   65 ++++++++++++-----------------
 nftables.install |   10 ++++
 nftables.service |   27 +++++-------
 4 files changed, 108 insertions(+), 111 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2021-07-28 22:33:30 UTC (rev 420590)
+++ PKGBUILD	2021-07-28 22:33:36 UTC (rev 420591)
@@ -1,58 +0,0 @@
-# Maintainer: Sébastien "Seblu" Luttringer <seblu at archlinux.org>
-
-pkgname=nftables
-epoch=1
-pkgver=0.9.9
-pkgrel=1
-pkgdesc='Netfilter tables userspace tools'
-arch=('x86_64')
-url='https://netfilter.org/projects/nftables/'
-license=('GPL2')
-depends=('libmnl' 'libnftnl' 'gmp' 'readline' 'ncurses' 'jansson')
-optdepends=('python: Python bindings')
-makedepends=('asciidoc' 'python')
-backup=('etc/nftables.conf')
-validpgpkeys=('37D964ACC04981C75500FB9BD55D978A8A1420E4') # Netfilter Core Team
-source=("https://netfilter.org/projects/nftables/files/nftables-$pkgver.tar.bz2"{,.sig}
-        'nftables.conf'
-        'nftables.service')
-sha256sums=('76ef2dc7fd0d79031a8369487739a217ca83996b3a746cec5bda79da11e3f1b4'
-            'SKIP'
-            '7b00611bb0533ca2f4abce14e22e9de39c344e241d4eae884c5e594d1b1ce8df'
-            '3c6a34a400022450df0b6e97b3f16eea5cab7741a0e5f16858b46a3e6591b5af')
-
-prepare() {
-  cd $pkgname-$pkgver
-  # apply patch from the source array (should be a pacman feature)
-  local filename
-  for filename in "${source[@]}"; do
-    if [[ "$filename" =~ \.patch$ ]]; then
-      msg2 "Applying patch ${filename##*/}"
-      patch -p1 -N -i "$srcdir/${filename##*/}"
-    fi
-  done
-  :
-}
-
-build() {
-  cd $pkgname-$pkgver
-  ./configure \
-    --prefix=/usr \
-    --sbindir=/usr/bin \
-    --sysconfdir=/usr/share \
-    --with-json \
-    --disable-debug
-  make
-}
-
-package() {
-  pushd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-  popd
-  # basic safe firewall config
-  install -Dm644 nftables.conf "$pkgdir/etc/nftables.conf"
-  # systemd
-  install -Dm644 nftables.service "$pkgdir/usr/lib/systemd/system/nftables.service"
-}
-
-# vim:set ts=2 sw=2 et:

Copied: nftables/repos/extra-x86_64/PKGBUILD (from rev 420590, nftables/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2021-07-28 22:33:36 UTC (rev 420591)
@@ -0,0 +1,59 @@
+# Maintainer: Sébastien "Seblu" Luttringer <seblu at archlinux.org>
+
+pkgname=nftables
+epoch=1
+pkgver=0.9.9
+pkgrel=6
+pkgdesc='Netfilter tables userspace tools'
+arch=('x86_64')
+url='https://netfilter.org/projects/nftables/'
+license=('GPL2')
+depends=('libmnl' 'libnftnl' 'gmp' 'readline' 'ncurses' 'jansson')
+optdepends=('python: Python bindings')
+makedepends=('asciidoc' 'python')
+backup=('etc/nftables.conf')
+validpgpkeys=('37D964ACC04981C75500FB9BD55D978A8A1420E4') # Netfilter Core Team
+source=("https://netfilter.org/projects/nftables/files/nftables-$pkgver.tar.bz2"{,.sig}
+        'nftables.conf'
+        'nftables.service')
+install=nftables.install
+sha256sums=('76ef2dc7fd0d79031a8369487739a217ca83996b3a746cec5bda79da11e3f1b4'
+            'SKIP'
+            '2aff88019097d21dbfa4713f5b54c184751c86376e458b683f8d90f3abd232a8'
+            'deffeef36fe658867dd9203ec13dec85047a6d224ea63334dcf60db97e1809ea')
+
+prepare() {
+  cd $pkgname-$pkgver
+  # apply patch from the source array (should be a pacman feature)
+  local filename
+  for filename in "${source[@]}"; do
+    if [[ "$filename" =~ \.patch$ ]]; then
+      msg2 "Applying patch ${filename##*/}"
+      patch -p1 -N -i "$srcdir/${filename##*/}"
+    fi
+  done
+  :
+}
+
+build() {
+  cd $pkgname-$pkgver
+  ./configure \
+    --prefix=/usr \
+    --sbindir=/usr/bin \
+    --sysconfdir=/usr/share \
+    --with-json \
+    --disable-debug
+  make
+}
+
+package() {
+  pushd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
+  popd
+  # basic safe firewall config
+  install -Dm644 nftables.conf "$pkgdir/etc/nftables.conf"
+  # systemd
+  install -Dm644 nftables.service "$pkgdir/usr/lib/systemd/system/nftables.service"
+}
+
+# vim:set ts=2 sw=2 et:

Deleted: nftables.conf
===================================================================
--- nftables.conf	2021-07-28 22:33:30 UTC (rev 420590)
+++ nftables.conf	2021-07-28 22:33:36 UTC (rev 420591)
@@ -1,38 +0,0 @@
-#!/usr/bin/nft -f
-# ipv4/ipv6 Simple & Safe Firewall
-# you can find examples in /usr/share/nftables/
-
-table inet filter {
-  chain input {
-    type filter hook input priority 0;
-
-    # allow established/related connections
-    ct state {established, related} accept
-
-    # early drop of invalid connections
-    ct state invalid drop
-
-    # allow from loopback
-    iifname lo accept
-
-    # allow icmp
-    ip protocol icmp accept
-    meta l4proto ipv6-icmp accept
-
-    # allow ssh
-    tcp dport ssh accept
-
-    # everything else
-    reject with icmpx type port-unreachable
-  }
-  chain forward {
-    type filter hook forward priority 0;
-    drop
-  }
-  chain output {
-    type filter hook output priority 0;
-  }
-
-}
-
-# vim:set ts=2 sw=2 et:

Copied: nftables/repos/extra-x86_64/nftables.conf (from rev 420590, nftables/trunk/nftables.conf)
===================================================================
--- nftables.conf	                        (rev 0)
+++ nftables.conf	2021-07-28 22:33:36 UTC (rev 420591)
@@ -0,0 +1,27 @@
+#!/usr/bin/nft -f
+# vim:set ts=2 sw=2 et:
+
+# IPv4/IPv6 Simple & Safe firewall ruleset.
+# More examples in /usr/share/nftables/ and /usr/share/doc/nftables/examples/.
+
+table inet filter
+delete table inet filter
+table inet filter {
+  chain input {
+    type filter hook input priority filter
+    policy drop
+
+    ct state invalid drop comment "early drop of invalid connections"
+    ct state {established, related} accept comment "allow tracked connections"
+    iifname lo accept comment "allow from loopback"
+    ip protocol icmp accept comment "allow icmp"
+    meta l4proto ipv6-icmp accept comment "allow icmp v6"
+    tcp dport ssh accept comment "allow sshd"
+    pkttype host limit rate 5/second counter reject with icmpx type admin-prohibited
+    counter
+  }
+  chain forward {
+    type filter hook forward priority filter
+    policy drop
+  }
+}

Copied: nftables/repos/extra-x86_64/nftables.install (from rev 420590, nftables/trunk/nftables.install)
===================================================================
--- nftables.install	                        (rev 0)
+++ nftables.install	2021-07-28 22:33:36 UTC (rev 420591)
@@ -0,0 +1,10 @@
+## arg 1:  the new package version
+## arg 2:  the old package version
+post_upgrade() {
+  (( $(vercmp "$2" '1:0.9.9-1') > 0 )) || cat <<EOF
+==> Stopping/restarting the nftables service does NOT flush the ruleset anymore.
+==> The nftables.conf file requires a delete/flush directive to be restarted.
+==> See examples in /usr/share/nftables/ and /usr/share/doc/nftables/examples.
+==> The nftables service reload has been removed as it is now equivalent to a restart.
+EOF
+}

Deleted: nftables.service
===================================================================
--- nftables.service	2021-07-28 22:33:30 UTC (rev 420590)
+++ nftables.service	2021-07-28 22:33:36 UTC (rev 420591)
@@ -1,15 +0,0 @@
-[Unit]
-Description=Netfilter Tables
-Documentation=man:nft(8)
-Wants=network-pre.target
-Before=network-pre.target
-
-[Service]
-Type=oneshot
-ExecStart=/usr/bin/nft -f /etc/nftables.conf
-ExecReload=/usr/bin/nft flush ruleset ';' include '"/etc/nftables.conf"'
-ExecStop=/usr/bin/nft flush ruleset
-RemainAfterExit=yes
-
-[Install]
-WantedBy=multi-user.target

Copied: nftables/repos/extra-x86_64/nftables.service (from rev 420590, nftables/trunk/nftables.service)
===================================================================
--- nftables.service	                        (rev 0)
+++ nftables.service	2021-07-28 22:33:36 UTC (rev 420591)
@@ -0,0 +1,12 @@
+[Unit]
+Description=Netfilter Tables
+Documentation=man:nft(8)
+Wants=network-pre.target
+Before=network-pre.target
+
+[Service]
+Type=oneshot
+ExecStart=/usr/bin/nft -f /etc/nftables.conf
+
+[Install]
+WantedBy=multi-user.target



More information about the arch-commits mailing list