network/tinc: Updated for version 1.0.32.

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

5 files changed, 90 insertions, 4 deletions

diff --git a/network/tinc/doinst.sh b/network/tinc/doinst.sh
new file mode 100644
index 000000000000..590559fd22f7
--- /dev/null
+++ b/network/tinc/doinst.sh
@@ -0,0 +1,26 @@
+config() {
+  NEW="$1"
+  OLD="$(dirname $NEW)/$(basename $NEW .new)"
+  # If there's no config file by that name, mv it over:
+  if [ ! -r $OLD ]; then
+    mv $NEW $OLD
+  elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then
+    # toss the redundant copy
+    rm $NEW
+  fi
+  # Otherwise, we leave the .new copy for the admin to consider...
+}
+
+preserve_perms() {
+  NEW="$1"
+  OLD="$(dirname ${NEW})/$(basename ${NEW} .new)"
+  if [ -e ${OLD} ]; then
+    cp -a ${OLD} ${NEW}.incoming
+    cat ${NEW} > ${NEW}.incoming
+    mv ${NEW}.incoming ${NEW}
+  fi
+  config ${NEW}
+}
+
+preserve_perms etc/rc.d/rc.tinc.new
+config etc/logrotate.d/tinc.new
diff --git a/network/tinc/rc.tinc b/network/tinc/rc.tinc
new file mode 100644
index 000000000000..d163c22973b4
--- /dev/null
+++ b/network/tinc/rc.tinc
@@ -0,0 +1,40 @@
+#!/bin/sh
+ 
+VPNS=$(ls /etc/tinc)
+ 
+start () {
+	for VPN in $VPNS; do
+		echo "Starting tinc daemon for $VPN..."
+		/usr/sbin/tincd -n "$VPN" -d1 --logfile=/var/log/tinc."$VPN"
+	done
+}
+ 
+stop () {
+	for VPN in $VPNS; do
+		echo "Stopping tinc daemon for $VPN..."
+		/usr/sbin/tincd -n "$VPN"  -k
+	done
+}
+ 
+restart () {
+	stop
+	sleep 1
+	start
+}
+ 
+case "$1" in
+	("start")
+		start
+		;;
+	("stop")
+		stop
+		;;
+	("restart")
+		restart
+		;;
+	(*)
+		echo "Usage: $0 <start|stop|restart>"
+		exit 1
+esac
+ 
+exit 0
diff --git a/network/tinc/tinc.SlackBuild b/network/tinc/tinc.SlackBuild
index 8ad0977380c6..a0b5955ed707 100644
--- a/network/tinc/tinc.SlackBuild
+++ b/network/tinc/tinc.SlackBuild
@@ -32,7 +32,7 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=tinc
-VERSION=${VERSION:-1.0.31}
+VERSION=${VERSION:-1.0.32}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -101,11 +101,20 @@ mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a  README  $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
+# Add an init script
+mkdir -p $PKG/etc/rc.d
+cat $CWD/rc.$PRGNAM > $PKG/etc/rc.d/rc.$PRGNAM.new
+chmod 0644 $PKG/etc/rc.d/rc.$PRGNAM.new
+
+mkdir -p $PKG/etc/logrotate.d
+cat $CWD/$PRGNAM.logrotate > $PKG/etc/logrotate.d/$PRGNAM.new
+
 find $PKG/usr/doc/$PRGNAM-$VERSION -type f -exec chmod 644 {} \;
 find $PKG/usr/doc/$PRGNAM-$VERSION -type d -exec chmod 755 {} \;
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/network/tinc/tinc.info b/network/tinc/tinc.info
index 91af56489ec2..24082d36b24f 100644
--- a/network/tinc/tinc.info
+++ b/network/tinc/tinc.info
@@ -1,8 +1,8 @@
 PRGNAM="tinc"
-VERSION="1.0.31"
+VERSION="1.0.32"
 HOMEPAGE="https://www.tinc-vpn.org/"
-DOWNLOAD="https://www.tinc-vpn.org/packages/tinc-1.0.31.tar.gz"
-MD5SUM="7a96f7eb12dfd43b21852b4207d860f2"
+DOWNLOAD="https://www.tinc-vpn.org/packages/tinc-1.0.32.tar.gz"
+MD5SUM="f6d1c4d48a38b0f8e0e9629ddd97c425"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/tinc/tinc.logrotate b/network/tinc/tinc.logrotate
new file mode 100644
index 000000000000..71521b24bde9
--- /dev/null
+++ b/network/tinc/tinc.logrotate
@@ -0,0 +1,11 @@
+/var/log/tinc.* {
+  rotate 10
+  notifempty
+  size=5M
+  compress
+  delaycompress
+  sharedscripts
+  postrotate
+    /etc/rc.d/rc.tinc restart
+  endscript
+}