From 8569693b15fa96f2959d6a823a01cb19bbb9043a Mon Sep 17 00:00:00 2001
From: Gaming4JC <g4jc@openmailbox.org>
Date: Sat, 25 Jul 2015 14:55:24 -0400
Subject: more updates to tcpcrypt installer

---
 pcr/tcpcrypt/PKGBUILD         |  17 +++++++++++------
 pcr/tcpcrypt/PKGBUILD.sig     | Bin 543 -> 543 bytes
 pcr/tcpcrypt/tcpcrypt.install |   1 +
 pcr/tcpcrypt/tcpcrypt.service |   2 +-
 4 files changed, 13 insertions(+), 7 deletions(-)

(limited to 'pcr/tcpcrypt')

diff --git a/pcr/tcpcrypt/PKGBUILD b/pcr/tcpcrypt/PKGBUILD
index 5260e1e2f..d92aad9d0 100644
--- a/pcr/tcpcrypt/PKGBUILD
+++ b/pcr/tcpcrypt/PKGBUILD
@@ -24,11 +24,15 @@ validpgpkeys=('CB6E213A349B8DF9E96B622AC3F4FFCF3EAE8697') # PKGBUILD Maintainer'
 sha512sums=('53fcbe63bd0cd65d50341312972f393620058269cf027d283ca033392d6582cf7c0a4478ec21e37f5dd24b62381aa33915179e235e204c3be9243428a0744fa7'
 'SKIP'
 'SKIP'
-'f44342325e831a94ed24cd5d2838dfc64d84d0eaceab13f1928c754db51ccc29f643c5ef2dab022f3000f1b82214f1a4b97388e5c2475e0401041d2fff747da8'
-'0d64943f2bc778cbf1a52debe349413f00b729d605d26f35e1335c8e4c0f9aff8526593835d48e4e4847e0fcada2c6a980f60baddb2c66eb445099a9f89bdaeb')
+'80176d6d8cbee5ea5512b142d82005307af7b99e51d76a298b93cb91cc8e59d8917c29ebe82d29da74fe4a83737b24806a974765531a588c21bb0fd9b637e7d9'
+'36cdbdf3f78ee05e328b2c9e53057aa84432314cb0bf10d92a5e32b0378cf5ca1cfcdbd2af42cefa215d0f6045badc79abc65a2bc9be1e3fbf762637e69f230b')
 
-pkgver() {
-tar -ztvf v$pkgver-rc1.tar.gz | head -n1 | awk '{print $6}' | sed "s/tcpcrypt-//" | sed "s/\///" | sed "s/-rc1///" # get latest version number
+prepare() {
+  cd $srcdir/$pkgname-$pkgver-rc1
+  mkdir -p m4
+
+  sed -i 's:AC_PROG_LIBTOOL:LT_INIT:' configure.ac
+  ./bootstrap.sh
 }
 
 build() {
@@ -36,13 +40,14 @@ build() {
   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 $pkgname-$pkgver
+  cd $srcdir/$pkgname-$pkgver-rc1
+
   ./configure --prefix=/usr
   make
 }
 
 package() {
-  cd $srcdir/$pkgname-$pkgver
+  cd $srcdir/$pkgname-$pkgver-rc1
   make DESTDIR=$pkgdir install
 
   install -Dm644 $srcdir/$pkgname-$pkgver-rc1/LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE
diff --git a/pcr/tcpcrypt/PKGBUILD.sig b/pcr/tcpcrypt/PKGBUILD.sig
index 36c62ce9e..45b341c74 100644
Binary files a/pcr/tcpcrypt/PKGBUILD.sig and b/pcr/tcpcrypt/PKGBUILD.sig differ
diff --git a/pcr/tcpcrypt/tcpcrypt.install b/pcr/tcpcrypt/tcpcrypt.install
index 0bf2ed9bd..bcfccbe9a 100644
--- a/pcr/tcpcrypt/tcpcrypt.install
+++ b/pcr/tcpcrypt/tcpcrypt.install
@@ -1,4 +1,5 @@
 post_install() {
+libtool --finish /usr/lib
 JAIL_DIR=/var/run/tcpcryptd
 JAIL_USER=tcpcryptd
     if [ ! -d "$JAIL_DIR" ]
diff --git a/pcr/tcpcrypt/tcpcrypt.service b/pcr/tcpcrypt/tcpcrypt.service
index b83a7b65c..de945b762 100644
--- a/pcr/tcpcrypt/tcpcrypt.service
+++ b/pcr/tcpcrypt/tcpcrypt.service
@@ -3,7 +3,7 @@ Description=Network traffic encryption (tcpcrypt)
 After=network.target
 
 [Service]
-ExecStart=/usr/bin/tcpcryptd -f -C aes -U tcpcryptd -J /var/run/tcpcryptd -p 777
+ExecStart=/usr/bin/tcpcryptd -f -C aes -U tcpcryptd -J /run/tcpcryptd -p 777
 PrivateDevices=yes
 ExecStartPost=/usr/bin/iptables -I INPUT ! -i lo -p tcp -j NFQUEUE --queue-num 777
 ExecStartPost=/usr/bin/iptables -I OUTPUT ! -o lo -p tcp -j NFQUEUE --queue-num 777
-- 
cgit v1.2.3