Import Debian changes 1.0.19-1

tinc (1.0.19-1) unstable; urgency=low

  * New upstream release.
  * Bump debian/compat so tinc gets built with hardening flags.
  * Allow tinc-pidfile in /etc/network/interfaces.

debian/README.Debian

@@ -20,6 +20,7 @@ tinc-config <directory>
 tinc-debug <level>
 tinc-mlock yes
 tinc-logfile <filename>
+tinc-pidfile <filename>
 tinc-chroot yes
 tinc-user <username>
 
@@ -32,10 +33,11 @@ iface vpn inet static
 	tinc-debug 1
 	tinc-mlock yes
 	tinc-user nobody
+	tinc-pidfile /tmp/tinc.pid
 
 This will start a tinc daemon that reads its configuration from
 /etc/tinc/myvpn, logs at debug level 1, locks itself in RAM, runs as user
-nobody, and creates a network interface called "vpn". Ifup then sets the
-address and netmask on that interface.
+nobody, writes the PID to /tmp/tinc.pid, and creates a network interface called
+"vpn". Ifup then sets the address and netmask on that interface.
 
- -- Guus Sliepen <guus@debian.org>, Fri, 24 June 2011, 18:10:53 +0200
+ -- Guus Sliepen <guus@debian.org>, Fri, 25 June 2012, 20:28:35 +0200

debian/changelog

@@ -1,3 +1,11 @@
+tinc (1.0.19-1) unstable; urgency=low
+
+  * New upstream release.
+  * Bump debian/compat so tinc gets built with hardening flags.
+  * Allow tinc-pidfile in /etc/network/interfaces.
+
+ -- Guus Sliepen <guus@debian.org>  Mon, 25 Jun 2012 20:29:22 +0200
+
 tinc (1.0.18-1) unstable; urgency=low
 
   * New upstream release.

debian/compat

@@ -1 +1 @@
-7
+9

debian/control

@@ -3,7 +3,7 @@ Section: net
 Priority: optional
 Maintainer: Guus Sliepen <guus@debian.org>
 Standards-Version: 3.9.3
-Build-Depends: libssl-dev, debhelper (>= 7.0.50~), gettext, texi2html, texinfo, zlib1g-dev, liblzo2-dev, libvdeplug-dev
+Build-Depends: libssl-dev, debhelper (>= 9), gettext, texi2html, texinfo, zlib1g-dev, liblzo2-dev, libvdeplug-dev
 Homepage: http://www.tinc-vpn.org/
 
 Package: tinc

debian/tinc.if-pre-up

@@ -14,6 +14,7 @@ set -e
 [ -n "$IF_TINC_DEBUG" ]           && EXTRA="$EXTRA -d$IF_TINC_DEBUG"
 [ -n "$IF_TINC_MLOCK" ]           && EXTRA="$EXTRA --mlock"
 [ -n "$IF_TINC_LOGFILE" ]         && EXTRA="$EXTRA --logfile=$IF_TINC_LOGFILE"
+[ -n "$IF_TINC_PIDFILE" ]         && EXTRA="$EXTRA --logfile=$IF_TINC_PIDFILE"
 [ -n "$IF_TINC_CHROOT" ]          && EXTRA="$EXTRA --chroot"
 [ -n "$IF_TINC_USER" ]            && EXTRA="$EXTRA --user=$IF_TINC_USER"
 

debian/tinc.if-up

@@ -5,4 +5,4 @@ set -e
 [ "$METHOD" = loopback ] && exit 0
 [ -n "$IF_TINC_NET" ] && exit 0
 
-invoke-rc.d tinc alarm
+invoke-rc.d tinc alarm || exit 0