upgpkg: conntrack-tools-git 1.4.6.r44.g2ca6ac9-1

2 files changed, 34 insertions, 10 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a04455c0dc85..ab9ab0a50b38 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,24 +1,28 @@
 pkgbase = conntrack-tools-git
 	pkgdesc = A tool to view and manage the in-kernel connection tracking state table from userspace
-	pkgver = 1.4.4.r35.g210f542
+	pkgver = 1.4.6.r44.g2ca6ac9
 	pkgrel = 1
 	url = https://www.netfilter.org/projects/conntrack-tools/
 	arch = i686
 	arch = x86_64
 	license = GPL2
 	makedepends = git
+	makedepends = systemd
+	makedepends = libtirpc
 	depends = glibc
 	depends = libmnl
 	depends = libnetfilter_conntrack
 	depends = libnetfilter_cttimeout
 	depends = libnetfilter_cthelper
+	depends = libnetfilter_queue
+	depends = libnfnetlink
+	depends = systemd-libs
 	provides = conntrack-tools
 	conflicts = conntrack-tools
 	backup = etc/conntrackd.conf
 	source = git://git.netfilter.org/conntrack-tools
-	source = conntrackd.service::https://git.archlinux.org/svntogit/packages.git/plain/trunk/conntrackd.service?h=packages/conntrack-tools
+	source = conntrackd.service::https://raw.githubusercontent.com/archlinux/svntogit-packages/packages/conntrack-tools/trunk/conntrackd.service
 	sha256sums = SKIP
 	sha256sums = SKIP
 
 pkgname = conntrack-tools-git
-
diff --git a/PKGBUILD b/PKGBUILD
index cf121da6adef..eb079b9a7da0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,23 +1,38 @@
 # Maintainer: Chocobo1 <chocobo1 AT archlinux DOT net>
 
 pkgname=conntrack-tools-git
-pkgver=1.4.4.r35.g210f542
+pkgver=1.4.6.r44.g2ca6ac9
 pkgrel=1
 pkgdesc="A tool to view and manage the in-kernel connection tracking state table from userspace"
 arch=('i686' 'x86_64')
 url="https://www.netfilter.org/projects/conntrack-tools/"
 license=('GPL2')
-depends=('glibc' 'libmnl' 'libnetfilter_conntrack' 'libnetfilter_cttimeout' 'libnetfilter_cthelper')
-makedepends=('git')
+depends=('glibc'
+         'libmnl'
+         'libnetfilter_conntrack'
+         'libnetfilter_cttimeout'
+         'libnetfilter_cthelper'
+         'libnetfilter_queue'
+         'libnfnetlink'
+         'systemd-libs')
+makedepends=('git' 'systemd' 'libtirpc')
 provides=('conntrack-tools')
 conflicts=('conntrack-tools')
 backup=('etc/conntrackd.conf')
 source=("git://git.netfilter.org/conntrack-tools"
-        "conntrackd.service::https://git.archlinux.org/svntogit/packages.git/plain/trunk/conntrackd.service?h=packages/conntrack-tools")
+        "conntrackd.service::https://raw.githubusercontent.com/archlinux/svntogit-packages/packages/conntrack-tools/trunk/conntrackd.service")
 sha256sums=('SKIP'
             'SKIP')
 
 
+prepare() {
+  cd "conntrack-tools"
+
+  sed -i -e 's,/etc/conntrackd/,/etc/,' \
+      -e 's,/var/lock/,/run/lock/,' \
+      "include/conntrackd.h"
+}
+
 pkgver() {
   cd "conntrack-tools"
 
@@ -28,16 +43,21 @@ build() {
   cd "conntrack-tools"
 
   ./autogen.sh
-  ./configure --prefix="/usr" --sbindir="/usr/bin" --enable-systemd
+  ./configure \
+    --prefix="/usr" \
+    --sbindir="/usr/bin" \
+    --enable-systemd
   make
 }
 
 package() {
   cd "conntrack-tools"
 
-  make DESTDIR="$pkgdir" install
+  make \
+    DESTDIR="$pkgdir" \
+    install
 
-  install -Dm644 "$srcdir/conntrackd.service" "$pkgdir/usr/lib/systemd/system/conntrackd.service"
+  install -Dm644 "$srcdir/conntrackd.service" -t "$pkgdir/usr/lib/systemd/system"
 
   # install empty configuration files
   install -Dm644 "/dev/null" "$pkgdir/etc/conntrackd.conf"