network/dnscrypt-proxy: Updated for v2.1.5

Signed-off-by: Andrew Clemons <andrew.clemons@gmail.com>

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

3 files changed, 87 insertions, 66 deletions

diff --git a/network/dnscrypt-proxy/dnscrypt-proxy.SlackBuild b/network/dnscrypt-proxy/dnscrypt-proxy.SlackBuild
index 2c372e1022dc2..95cf313603ad2 100644
--- a/network/dnscrypt-proxy/dnscrypt-proxy.SlackBuild
+++ b/network/dnscrypt-proxy/dnscrypt-proxy.SlackBuild
@@ -33,10 +33,10 @@ BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 
-DNSCRYPT_USER=${TOR_USER:-dnscrypt}
-DNSCRYPT_UID=${TOR_UID:-293}
-DNSCRYPT_GROUP=${TOR_GROUP:-dnscrypt}
-DNSCRYPT_GID=${TOR_GID:-293}
+DNSCRYPT_USER=${DNSCRYPT_USER:-dnscrypt}
+DNSCRYPT_UID=${DNSCRYPT_UID:-293}
+DNSCRYPT_GROUP=${DNSCRYPT_GROUP:-dnscrypt}
+DNSCRYPT_GID=${DNSCRYPT_GID:-293}
 
 if [ -z "$ARCH" ]; then
     case "$( uname -m )" in
@@ -74,16 +74,19 @@ mkdir -p $TMP/$PRGNAM-$VERSION $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
 
-if [ $ARCH == i586 ]; then
+if [[ $ARCH == i?86 ]]; then
     tar xvf $CWD/$PRGNAM-linux_i386-$VERSION.tar.gz --transform="s/linux-i386/$PRGNAM-$VERSION/"
-elif [ $ARCH == x86_64 ]; then
+elif [[ $ARCH == x86_64 ]]; then
     tar xvf $CWD/$PRGNAM-linux_x86_64-$VERSION.tar.gz --transform="s/linux-x86_64/$PRGNAM-$VERSION/"
+else
+    echo "Architecture not supported"
+    exit 1
 fi
 
 cd $PRGNAM-$VERSION
 chown -R root:root .
 
-find -L . $CWD \
+find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
   -o -perm 511 \) -exec chmod 755 {} \; -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
@@ -94,16 +97,19 @@ mkdir -p $PKG/usr/{bin,doc/$PRGNAM-$VERSION} \
     $PKG/var/{log,run}/$PRGNAM \
     $PKG/install
 
-find . $CWD -mindepth 1 -type f \( -name '*.txt' -o -name '*.toml' -o -name '*.pem' \) -exec cp {} $PKG/etc/$PRGNAM/ \; -o \
-    \( -name 'LICENSE' \) -exec cp {} $PKG/usr/doc/$PRGNAM-$VERSION/ \; -o \
-    \( -name 'README.Slackware' \) -exec cp {} $PKG/usr/doc/$PRGNAM-$VERSION/ \; -o \
-    \( -name "$PRGNAM" \) -exec cp {} $PKG/usr/bin/ \; -o \
-    \( -name "$PRGNAM.toml" \) -exec cp {} $PKG/etc/$PRGNAM/ \; -o \
-    \( -name "rc.$PRGNAM" \) -exec cp {} $PKG/etc/rc.d/ \; -o \
-    \( -name 'slack-desc' \) -exec cp {} $PKG/install/ \; 
+cp -a *.txt $PKG/etc/$PRGNAM/
+install -D -m 0644 LICENSE $PKG/usr/doc/$PRGNAM-$VERSION/LICENSE
+install -D -m 0755 $PRGNAM $PKG/usr/bin/$PRGNAM
+install -D -m 0644 $CWD/$PRGNAM.toml $PKG/etc/$PRGNAM/$PRGNAM.toml
+install -D -m 0644 $CWD/README.Slackware $PKG/usr/doc/$PRGNAM-$VERSION/README.Slackware
+install -D -m 0644 $CWD/$PRGNAM.SlackBuild $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+install -D -m 0644 $CWD/rc.$PRGNAM $PKG/etc/rc.d/rc.$PRGNAM
+
+sed -i "s/DNSCRYPT_UID=.*$/DNSCRYPT_UID=$DNSCRYPT_UID/" $CWD/doinst.sh
+sed -i "s/DNSCRYPT_GID=.*$/DNSCRYPT_GID=$DNSCRYPT_GID/" $CWD/doinst.sh
 
-chown $DNSCRYPT_USER:$DNSCRYPT_GROUP $PKG/var/{log,run}/$PRGNAM \
-    $PKG/etc/$PRGNAM/*
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
+/sbin/makepkg -p -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/network/dnscrypt-proxy/doinst.sh b/network/dnscrypt-proxy/doinst.sh
new file mode 100644
index 0000000000000..c6488756566f7
--- /dev/null
+++ b/network/dnscrypt-proxy/doinst.sh
@@ -0,0 +1,18 @@
+#!/bin/bash
+
+# dnscrypt-proxy writes files to its data directories after
+# dropping privileges. This ensures $DNSCRYPT_USER can write
+# files to these directories, without having to change default
+# root:root in slackware.
+#
+# This is a workaround, might not be a elegant solution.
+
+PRGNAM=dnscrypt-proxy
+DNSCRYPT_UID=293
+DNSCRYPT_GID=293
+
+chown $DNSCRYPT_UID:$DNSCRYPT_GID etc/$PRGNAM/*
+
+setfacl -m u:$DNSCRYPT_UID:rwx etc/$PRGNAM
+setfacl -m u:$DNSCRYPT_UID:rwx var/run/$PRGNAM
+setfacl -m u:$DNSCRYPT_UID:rwx var/log/$PRGNAM
diff --git a/network/dnscrypt-proxy/rc.dnscrypt-proxy b/network/dnscrypt-proxy/rc.dnscrypt-proxy
index 2f97005ce0e4f..49cd4dc9849cd 100644
--- a/network/dnscrypt-proxy/rc.dnscrypt-proxy
+++ b/network/dnscrypt-proxy/rc.dnscrypt-proxy
@@ -2,8 +2,6 @@
 
 # Init file for dnscrypt-proxy
 
-PRGNAM=dnscrypt-proxy
-
 CONFDIR="/etc/dnscrypt-proxy"
 LOGDIR="/var/log/dnscrypt-proxy"
 RUNDIR="/var/run/dnscrypt-proxy"
@@ -13,67 +11,66 @@ OPTS="-config $CONFDIR/dnscrypt-proxy.toml -pidfile $RUNDIR/dnscrypt-proxy.pid -
 PID=$(cat /var/run/dnscrypt-proxy/dnscrypt-proxy.pid 2>/dev/null)
 
 start() {
-	echo "Starting DNSCrypt-proxy"
-	/usr/bin/dnscrypt-proxy $OPTS &
+    echo "Starting DNSCrypt-proxy"
+    /usr/bin/dnscrypt-proxy $OPTS &
 }
 
 stop() {
-	echo "Stopping DNSCrypt-proxy"
+    echo "Stopping DNSCrypt-proxy"
 
 if [ -z $PID ]; then
-	echo "Not running"
-	exit 0
+    echo "Not running"
+    exit 0
 fi
+
 if kill -15 $PID 2>/dev/null; then
-	echo "Stopped"
-	rm $RUNDIR/dnscrypt-proxy.pid 2>/dev/null
+    echo "Stopped"
+    rm $RUNDIR/dnscrypt-proxy.pid 2>/dev/null
 else
-	sleep 1
-	if kill -9 $PID 2>/dev/null; then
-		echo "Killed"
-		rm $RUNDIR/dnscrypt-proxy.pid 2>/dev/null
-	else
-		echo "Error"
-		exit 1
-	fi
+    sleep 1
+if kill -9 $PID 2>/dev/null; then
+    echo "Killed"
+    rm $RUNDIR/dnscrypt-proxy.pid 2>/dev/null
+else
+    echo "Error"
+    exit 1
+fi
 fi
+
 }
 
 status() {
-	if [ -z $PID ]; then
-		echo "Not running"
-		exit 1
-	elif kill -0 $PID; then
-		echo $(ps aux | grep $PID)
-		exit 0
-	else
-		echo "$RUNDIR/dnscrypt-proxy.pid present, but $PID is not running. Removing PID file."
-		rm $RUNDIR/dnscrypt-proxy.pid 2>/dev/null
-		exit 1
-	fi
+
+if [ -z $PID ]; then
+    echo "Not running"
+    exit 0
+else
+    echo "Running"
+    exit 0
+fi
+
 }
 
 case "$1" in
-	start)
-		start
-	;;
-
-	stop)
-		stop
-	;;
-
-	restart)
-		stop
-		sleep 3
-		start
-	;;
-
-	status)
-		status
-	;;
-
-	*)
-		echo "Usage: $0 (start|stop|restart|status)"
-esac
 
+start)
+	start
+    ;;
+
+stop)
+    stop
+;;
 
+restart)
+    stop
+    sleep 3
+    start
+;;
+
+status)
+    status
+;;
+
+*)
+	echo "Usage: $0 (start|stop|restart|status)"
+esac