[arch-commits] Commit in nftables/trunk (PKGBUILD nftables-reload nftables.service)

Sébastien Luttringer seblu at archlinux.org
Sun Jan 1 05:06:03 UTC 2017


    Date: Sunday, January 1, 2017 @ 05:06:02
  Author: seblu
Revision: 285005

upgpkg: nftables 1:0.7-2

Modified:
  nftables/trunk/PKGBUILD
  nftables/trunk/nftables.service
Deleted:
  nftables/trunk/nftables-reload

------------------+
 PKGBUILD         |    9 +++------
 nftables-reload  |    3 ---
 nftables.service |    2 +-
 3 files changed, 4 insertions(+), 10 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-12-31 20:42:40 UTC (rev 285004)
+++ PKGBUILD	2017-01-01 05:06:02 UTC (rev 285005)
@@ -4,7 +4,7 @@
 pkgname=nftables
 epoch=1
 pkgver=0.7
-pkgrel=1
+pkgrel=2
 pkgdesc='Netfilter tables userspace tools'
 arch=('i686' 'x86_64')
 url='https://netfilter.org/projects/nftables/'
@@ -16,13 +16,11 @@
 # 2016-11-03: https sources download is broken with curl
 source=("http://netfilter.org/projects/nftables/files/nftables-$pkgver.tar.bz2"{,.sig}
         'nftables.conf'
-        'nftables.service'
-        'nftables-reload')
+        'nftables.service')
 sha1sums=('c003fa8b63b1b44c52de345a4d84487d81865a98'
           'SKIP'
           'a7146fad414f9e827e2e83b630308890c876b80d'
-          '65833b9c5b777cfb3a0776060c569a727ce6f460'
-          'd9f40e751b44dd9dc9fdb3b7eba3cc0a9b7e1b01')
+          '59185e947ebfd599954800ad2c774171b3f4cd58')
 
 prepare() {
   cd $pkgname-$pkgver
@@ -55,7 +53,6 @@
   install -Dm644 nftables.conf "$pkgdir/etc/nftables.conf"
   # systemd
   install -Dm644 nftables.service "$pkgdir/usr/lib/systemd/system/nftables.service"
-  install -Dm755 nftables-reload "$pkgdir/usr/lib/systemd/scripts/nftables-reload"
 }
 
 # vim:set ts=2 sw=2 et:

Deleted: nftables-reload
===================================================================
--- nftables-reload	2016-12-31 20:42:40 UTC (rev 285004)
+++ nftables-reload	2017-01-01 05:06:02 UTC (rev 285005)
@@ -1,3 +0,0 @@
-#!/usr/bin/nft -f
-flush ruleset
-include "/etc/nftables.conf"

Modified: nftables.service
===================================================================
--- nftables.service	2016-12-31 20:42:40 UTC (rev 285004)
+++ nftables.service	2017-01-01 05:06:02 UTC (rev 285005)
@@ -7,7 +7,7 @@
 [Service]
 Type=oneshot
 ExecStart=/usr/bin/nft -f /etc/nftables.conf
-ExecReload=/usr/bin/nft -f /usr/lib/systemd/scripts/nftables-reload
+ExecReload=/usr/bin/nft flush ruleset ';' include '"/etc/nftables.conf"'
 ExecStop=/usr/bin/nft flush ruleset
 RemainAfterExit=yes
 



More information about the arch-commits mailing list