Import Debian changes 1.1~pre7-1

tinc (1.1~pre7-1) experimental; urgency=high

  * New upstream release.
    - Drop packets forwarded via TCP if they are too big (CVE-2013-1428).

debian/changelog

@@ -1,3 +1,10 @@
+tinc (1.1~pre7-1) experimental; urgency=high
+
+  * New upstream release.
+    - Drop packets forwarded via TCP if they are too big (CVE-2013-1428).
+
+ -- Guus Sliepen <guus@debian.org>  Tue, 23 Apr 2013 11:37:38 +0200
+
 tinc (1.1~pre6-1) experimental; urgency=low
 
   * New upstream release.

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 (>>1.0.0), debhelper (>= 9), texi2html, texinfo, zlib1g-dev, liblzo2-dev, libncurses5-dev, libreadline-dev
+Build-Depends: libssl-dev (>>1.0.0), debhelper (>= 9), texi2html, texinfo, zlib1g-dev, liblzo2-dev, libncurses5-dev, libreadline-dev, libvdeplug-dev
 Homepage: http://www.tinc-vpn.org/
 
 Package: tinc

debian/rules

@@ -15,7 +15,7 @@
 	dh $@ --parallel
 
 override_dh_auto_configure:
-	dh_auto_configure -- --disable-uml --disable-vde
+	dh_auto_configure -- --enable-uml --enable-vde
 
 override_dh_auto_build:
 	dh_auto_build

debian/tinc.files

@@ -1,5 +1,5 @@
 usr/sbin/tincd
-usr/sbin/tincctl
+usr/sbin/tinc
 usr/share/man
 etc
 usr/share/doc/tinc

debian/tinc.if-post-down

@@ -3,7 +3,7 @@
 set -e
 
 if [ "$IF_TINC_NET" ] ; then
-	tincctl -n "$IF_TINC_NET" stop
+	tinc -n "$IF_TINC_NET" stop
 	sleep 0.1
 	i=0;
 	while [ -f "/var/run/tinc.$IF_TINC_NET.pid" ] ; do

debian/tinc.init

@@ -19,7 +19,7 @@
 # Based on Lubomir Bulej's Redhat init script.
 
 DAEMON="/usr/sbin/tincd"
-CONTROL="/usr/sbin/tincctl"
+CONTROL="/usr/sbin/tinc"
 NAME="tinc"
 DESC="tinc daemons"
 TCONF="/etc/tinc"

debian/tinc.install

@@ -1,6 +1,6 @@
 usr/sbin/tincd
-usr/sbin/tincctl
+usr/sbin/tinc
 usr/share/man/man5
 usr/share/man/man8/tincd.*
-usr/share/man/man8/tincctl.*
+usr/share/man/man8/tinc.*
 usr/share/info