update

7 files changed, 29 insertions, 28 deletions

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..231e22026970
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,4 @@
+pkg/
+src/
+tcpcrypt/
+*.pkg.tar
diff --git a/PKGBUILD b/PKGBUILD
index b23a7b25a2e4..62dacb43a7f4 100755..100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 # Maintainer: mutantmonkey <aur@mutantmonkey.in>
 
 pkgname=tcpcrypt-git
-pkgver=308.bb990b1
+pkgver=312.866994c
 pkgrel=1
 pkgdesc="Transparent user space implementation for the tcpcrypt TCP extensions"
 arch=('i686' 'x86_64')
@@ -16,11 +16,13 @@ conflicts=('tcpcrypt')
 install='tcpcrypt.install'
 backup=('etc/conf.d/tcpcryptd.conf')
 source=("git+https://github.com/scslab/tcpcrypt.git"
-        'tcpcryptd.conf'
-        'tcpcryptd.service')
+        'tcpcryptd.conf' 'tcpcryptd.service'
+        'tcpcryptd.tmpfiles' 'tcpcryptd.sysusers')
 sha256sums=('SKIP'
             'a41bfa7b0c8f527f96c993f68e0a02265ad672fe6c2e10f41bc00b8b1f819305'
-            '68a3227f971dce0056bbe8768b570fade4ee8b17aca2e354c35352f2bf0a7028')
+            '68a3227f971dce0056bbe8768b570fade4ee8b17aca2e354c35352f2bf0a7028'
+            '95393df0fca7e228e36b9594e29a3f32514c8f7229b329e0b9a37dab4985b28f'
+            'e9c73c4eeff3f14f0fedd14a529f8c81f591ada543b91e82252e5b2b8f11d916')
 
 pkgver() {
   cd tcpcrypt
@@ -29,19 +31,18 @@ pkgver() {
 
 prepare() {
   cd tcpcrypt
-  mkdir -p m4
 
-  sed -i 's:AC_PROG_LIBTOOL:LT_INIT:' configure.ac
+  mkdir -p m4
   ./bootstrap.sh
 }
 
 build() {
   cd tcpcrypt
 
-  export JAIL_DIR="/run/tcpcryptd"
-  export JAIL_USER="tcpcryptd"
-  export DIVERT_PORT="1666"
-  export CONTROL_SOCKET="/run/tcpcryptd.control"
+  export JAIL_DIR=/run/tcpcryptd
+  export JAIL_USER=tcpcryptd
+  export DIVERT_PORT=1666
+  export CONTROL_SOCKET=\"/run/tcpcryptd.control\"
 
   ./configure --prefix=/usr
   make
@@ -54,9 +55,11 @@ package() {
   install -dm755 "$pkgdir/usr/lib/tmpfiles.d"
   echo 'd /run/tcpcryptd 0700 tcpcryptd tcpcryptd' >"$pkgdir/usr/lib/tmpfiles.d/tcpcryptd.conf"
 
-  install -Dm644 "$srcdir"/tcpcrypt/LICENSE  "$pkgdir"/usr/share/licenses/"$pkgname"/LICENSE
-  install -Dm644 "$srcdir"/tcpcryptd.conf    "$pkgdir"/etc/conf.d/tcpcryptd.conf
-  install -Dm644 "$srcdir"/tcpcryptd.service "$pkgdir"/usr/lib/systemd/system/tcpcryptd.service
+  install -Dm644 "$srcdir"/tcpcrypt/LICENSE   "$pkgdir"/usr/share/licenses/"$pkgname"/LICENSE
+  install -Dm644 "$srcdir"/tcpcryptd.conf     "$pkgdir"/etc/conf.d/tcpcryptd.conf
+  install -Dm644 "$srcdir"/tcpcryptd.service  "$pkgdir"/usr/lib/systemd/system/tcpcryptd.service
+  install -Dm644 "$srcdir"/tcpcryptd.tmpfiles "$pkgdir"/usr/lib/tmpfiles.d/tcpcryptd.conf
+  install -Dm644 "$srcdir"/tcpcryptd.sysusers "$pkgdir"/usr/lib/sysusers.d/tcpcryptd.conf
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/tcpcrypt.install b/tcpcrypt.install
index da3a67f1d497..aa606613ec5f 100755..100644
--- a/tcpcrypt.install
+++ b/tcpcrypt.install
@@ -1,12 +1,4 @@
 post_install() {
-    getent passwd tcpcryptd &>/dev/null || {
-        echo -n ">>> Creating tcpcryptd system user... "
-        /usr/sbin/useradd --system --user-group --home /run/tcpcryptd tcpcryptd
-        echo "done"
-    }
-    chown tcpcryptd:tcpcryptd /run/tcpcryptd
-    chmod 700 /run/tcpcryptd
-
   echo "To start tcpcrypt, run 'systemctl start tcpcryptd.service'. Secure"
   echo "connections should Just Work between tcpcrypt-enabled machines."
   echo "To start it at boot, run 'systemctl enable tcpcryptd.service'"
@@ -18,17 +10,14 @@ post_install() {
   echo
   echo "For debugging, run 'tcnetstat' to list all active encrypted connections"
   echo "Run 'iptables -vnL' to check if iptables rules were set up correctly"
+  post_upgrade
 }
 
 post_upgrade() {
-    chown -R tcpcryptd:tcpcryptd /run/tcpcryptd
-    chmod 700 /run/tcpcryptd
+  systemd-sysusers tcpcryptd.conf
+  systemd-tmpfiles --create tcpcryptd.conf
 }
 
 pre_remove() {
-    getent passwd tcpcryptd &>/dev/null && {
-        echo -n ">>> Removing tcpcryptd system user... "
-        /usr/sbin/userdel tcpcryptd
-        echo "done"
-    }
+  echo
 }
diff --git a/tcpcryptd.conf b/tcpcryptd.conf
index a08648b044f4..a08648b044f4 100755..100644
--- a/tcpcryptd.conf
+++ b/tcpcryptd.conf
diff --git a/tcpcryptd.service b/tcpcryptd.service
index a9126f634a68..a9126f634a68 100755..100644
--- a/tcpcryptd.service
+++ b/tcpcryptd.service
diff --git a/tcpcryptd.sysusers b/tcpcryptd.sysusers
new file mode 100644
index 000000000000..6465a41eb454
--- /dev/null
+++ b/tcpcryptd.sysusers
@@ -0,0 +1 @@
+u tcpcryptd   -      "Tcpcrypt Daemon" /run/tcpcryptd
diff --git a/tcpcryptd.tmpfiles b/tcpcryptd.tmpfiles
new file mode 100644
index 000000000000..8ad1fdd65f6d
--- /dev/null
+++ b/tcpcryptd.tmpfiles
@@ -0,0 +1,4 @@
+# systemd tmpfile settings for tcpcryptd
+# See tmpfiles.d(5) for details
+
+d /run/tcpcryptd 0700 tcpcryptd tcpcryptd -