pcr/tcpcrypt: updated to 0.5

5 files changed, 20 insertions, 49 deletions

diff --git a/pcr/tcpcrypt/PKGBUILD b/pcr/tcpcrypt/PKGBUILD
index cc3262add..774484a48 100644
--- a/pcr/tcpcrypt/PKGBUILD
+++ b/pcr/tcpcrypt/PKGBUILD
@@ -4,7 +4,7 @@
 # Contributor: grawity
 
 pkgname=tcpcrypt
-pkgver=0.3
+pkgver=0.5
 pkgrel=1
 pkgdesc="Transparent user space implementation for the tcpcrypt TCP extensions"
 arch=(i686 x86_64)
@@ -14,21 +14,17 @@ depends=('libnetfilter_queue' 'openssl' 'iptables')
 makedepends=('gcc' 'autoconf' 'automake' 'openssl')
 provides=('tcpcrypt')
 conflicts=('tcpcrypt')
-source=('https://github.com/scslab/tcpcrypt/archive/v0.3-rc1.tar.gz'
-'PKGBUILD.sig'
-'PKGBUILD'
-'tcpcrypt.service'
-'tcpcrypt.install')
-install='tcpcrypt.install'
-validpgpkeys=('CB6E213A349B8DF9E96B622AC3F4FFCF3EAE8697') # PKGBUILD Maintainer's key
-sha512sums=('53fcbe63bd0cd65d50341312972f393620058269cf027d283ca033392d6582cf7c0a4478ec21e37f5dd24b62381aa33915179e235e204c3be9243428a0744fa7'
-'SKIP'
-'SKIP'
-'80176d6d8cbee5ea5512b142d82005307af7b99e51d76a298b93cb91cc8e59d8917c29ebe82d29da74fe4a83737b24806a974765531a588c21bb0fd9b637e7d9'
-'36cdbdf3f78ee05e328b2c9e53057aa84432314cb0bf10d92a5e32b0378cf5ca1cfcdbd2af42cefa215d0f6045badc79abc65a2bc9be1e3fbf762637e69f230b')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/scslab/tcpcrypt/archive/v$pkgver.tar.gz"
+        'tcpcrypt.service'
+        'tcpcrypt.sysusers'
+        'tcpcrypt.tmpfiles')
+sha256sums=('251213be8bfd0b9224f4d8d7a79fe1b8961a180f5a278f128376a66364a38ea3'
+            'be617bf7d3f8050ca3c1ad0c1681634c1d101f5eb75d33776d8a414afb8d6526'
+            '69fe5592f393e2d0e196d189bda98f8737652a992b827cfbd1fcd6a221db893d'
+            '6ed9beaf9998bc3bfdd7c17d253c8b910833240b5d3a0d5daec8cd2f3cdac44b')
 
 prepare() {
-  cd $srcdir/$pkgname-$pkgver-rc1
+  cd "$srcdir"/$pkgname-$pkgver
   mkdir -p m4
 
   sed -i 's:AC_PROG_LIBTOOL:LT_INIT:' configure.ac
@@ -36,20 +32,19 @@ prepare() {
 }
 
 build() {
-  gpg --verify PKGBUILD.sig PKGBUILD
-  echo "Note: If the GPG verification fails, import the PKGBUILD maintainer's GPG key. See: https://wiki.parabola.nu/GnuPG#Import_key"
-  whirlpoolsum=('d01ed6db2d02a0dee8a6d89e116c9ca56575a4085a83be18342c59e54f6df13a370a63716d9aeb1a3d0ea898927b98bcdb3ea9951d68c354b6e33a9547b8ef56')
-  [[ "$(openssl dgst -r -whirlpool v$pkgver-rc1.tar.gz | awk '{print $1}')" = ${whirlpoolsum} ]] && echo "Whirlpool checksum passed." || { echo "Whirlpool checksum failed!!" ;  exit 1; } # This is an added security layer. If SHA512 for some unlikely reason fails, whirlpool will check and abort if it too fails to match.
-  cd $srcdir/$pkgname-$pkgver-rc1
+  cd "$srcdir"/$pkgname-$pkgver
 
   ./configure --prefix=/usr
   make
 }
 
 package() {
-  cd $srcdir/$pkgname-$pkgver-rc1
-  make DESTDIR=$pkgdir install
+  cd "$srcdir"/$pkgname-$pkgver
 
-  install -Dm644 $srcdir/$pkgname-$pkgver-rc1/LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE
+  make DESTDIR="$pkgdir" install
+
+  install -Dm644 "$srcdir"/$pkgname-$pkgver/LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
   install -Dm644 "$srcdir"/tcpcrypt.service "$pkgdir"/usr/lib/systemd/system/tcpcrypt.service
+  install -Dm644 "$srcdir"/tcpcrypt.sysusers "$pkgdir"/usr/lib/sysusers.d/tcpcrypt.conf
+  install -Dm644 "$srcdir"/tcpcrypt.tmpfiles "$pkgdir"/usr/lib/tmpfiles.d/tcpcrypt.conf
 }
diff --git a/pcr/tcpcrypt/PKGBUILD.sig b/pcr/tcpcrypt/PKGBUILD.sig
deleted file mode 100644
index 37d3e73df..000000000
--- a/pcr/tcpcrypt/PKGBUILD.sig
+++ /dev/null
diff --git a/pcr/tcpcrypt/tcpcrypt.install b/pcr/tcpcrypt/tcpcrypt.install
deleted file mode 100644
index bcfccbe9a..000000000
--- a/pcr/tcpcrypt/tcpcrypt.install
+++ /dev/null
@@ -1,27 +0,0 @@
-post_install() {
-libtool --finish /usr/lib
-JAIL_DIR=/var/run/tcpcryptd
-JAIL_USER=tcpcryptd
-    if [ ! -d "$JAIL_DIR" ]
-    then
-        echo "Creating jail directory $JAIL_DIR"
-        (umask 077 && mkdir $JAIL_DIR)
-    fi
-
-    id $JAIL_USER >/dev/null 2>&1
-    if [ $? -ne 0 ]
-    then
-        echo "Creating user and group '$JAIL_USER'"
-        useradd -s /nonexistent -d /nonexistent -M -U $JAIL_USER
-    fi
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  userdel tcpcryptd &>/dev/null
-  groupdel tcpcryptd &>/dev/null
-  rm -rf /var/run/tcpcryptd
-}
\ No newline at end of file
diff --git a/pcr/tcpcrypt/tcpcrypt.sysusers b/pcr/tcpcrypt/tcpcrypt.sysusers
new file mode 100644
index 000000000..596600b40
--- /dev/null
+++ b/pcr/tcpcrypt/tcpcrypt.sysusers
@@ -0,0 +1,2 @@
+g tcpcryptd - - -
+u tcpcryptd - "tcpcrypt daemon user" / /usr/bin/nologin
diff --git a/pcr/tcpcrypt/tcpcrypt.tmpfiles b/pcr/tcpcrypt/tcpcrypt.tmpfiles
new file mode 100644
index 000000000..248c3dbc9
--- /dev/null
+++ b/pcr/tcpcrypt/tcpcrypt.tmpfiles
@@ -0,0 +1 @@
+d /var/run/tcpcryptd 0700 tcpcryptd tcpcryptd