Update PKGBUILD and services

+ service file is exactly like official PKGBUILD
+ remove redundant make-depends
+ fix duplicated opt-depends
+ add json and readline config options like official PKGBUILD
+ do not disable debug, because this is a VCS package intended for
  debugging (mostly).

4 files changed, 16 insertions, 16 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 80916ece1e2f..f62550d56839 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = nftables-git
 	pkgdesc = Netfilter tables userspace tools
-	pkgver = 1.0.0
+	pkgver = 1.0.4.r39.g46980cdd
 	pkgrel = 1
 	epoch = 1
 	url = https://netfilter.org/projects/nftables/
@@ -9,10 +9,9 @@ pkgbase = nftables-git
 	license = GPL2
 	makedepends = asciidoc
 	makedepends = git
-	makedepends = bison
-	makedepends = flex
+	makedepends = python
 	depends = libmnl
-	depends = libnftnl-git
+	depends = libnftnl
 	depends = gmp
 	depends = readline
 	depends = ncurses
@@ -26,6 +25,6 @@ pkgbase = nftables-git
 	source = nftables.service
 	sha256sums = SKIP
 	sha256sums = 2aff88019097d21dbfa4713f5b54c184751c86376e458b683f8d90f3abd232a8
-	sha256sums = 3c6a34a400022450df0b6e97b3f16eea5cab7741a0e5f16858b46a3e6591b5af
+	sha256sums = deffeef36fe658867dd9203ec13dec85047a6d224ea63334dcf60db97e1809ea
 
 pkgname = nftables-git
diff --git a/.gitignore b/.gitignore
index f84d92a82402..39eacb3107ea 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ nftables/
 pkg/
 src/
 *.tar.*
+*.log
diff --git a/PKGBUILD b/PKGBUILD
index 491a7f0b0db9..51d42bce8944 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,19 +1,19 @@
-# Maintainer: Máté Eckl <ecklm94@gmail.com>
+# Maintainer: a821 mail de
+# Contributor: Máté Eckl <ecklm94@gmail.com>
 # Contributor: Anatol Pomozov <anatol.pomozov@gmail.com>
 # Contributor: Steven Allen <steven@stebalien.com>
 
 pkgname=nftables-git
 epoch=1
-pkgver=1.0.0
+pkgver=1.0.4.r39.g46980cdd
 pkgrel=1
 pkgdesc='Netfilter tables userspace tools'
-arch=(x86_64)
+arch=('x86_64')
 url='https://netfilter.org/projects/nftables/'
 license=('GPL2')
+depends=('libmnl' 'libnftnl' 'gmp' 'readline' 'ncurses' 'jansson')
 optdepends=('python: Python bindings')
-depends=(libmnl libnftnl-git gmp readline ncurses jansson)
-makedepends=(asciidoc git bison flex)
-optdepends=('python: Python bindings')
+makedepends=('asciidoc' 'git' 'python')
 backup=('etc/nftables.conf')
 provides=(nftables)
 conflicts=(nftables)
@@ -23,7 +23,7 @@ source=(git://git.netfilter.org/nftables
 install=nftables.install
 sha256sums=('SKIP'
             '2aff88019097d21dbfa4713f5b54c184751c86376e458b683f8d90f3abd232a8'
-            '3c6a34a400022450df0b6e97b3f16eea5cab7741a0e5f16858b46a3e6591b5af')
+            'deffeef36fe658867dd9203ec13dec85047a6d224ea63334dcf60db97e1809ea')
 
 pkgver() {
   cd nftables
@@ -37,7 +37,8 @@ build() {
     --prefix=/usr \
     --sbindir=/usr/bin \
     --sysconfdir=/usr/share \
-    --with-json
+    --with-json \
+    --with-cli=readline
   make
 }
 
@@ -49,3 +50,5 @@ package() {
   # systemd
   install -Dm644 "$srcdir/nftables.service" "$pkgdir/usr/lib/systemd/system/nftables.service"
 }
+
+# vim: set ts=2 sw=2 et:
diff --git a/nftables.service b/nftables.service
index 6305b625cc45..464d8df21921 100644
--- a/nftables.service
+++ b/nftables.service
@@ -7,9 +7,6 @@ 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