# HG changeset patch
# User Ivo Smits <Ivo@UFO-Net.nl>
# Date 1485695348 -3600
# Node ID 18e0b8bdeeccdeff1286deb79919cde02539f6cd
# Parent  c87212fe8883f60f722265d25f24c9a8175e3693
Actually renamed debian directory

diff -r c87212fe8883 -r 18e0b8bdeecc deb/build.sh
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/deb/build.sh	Sun Jan 29 14:09:08 2017 +0100
@@ -0,0 +1,20 @@
+#!/bin/sh
+set -e
+VERSION=`cat ../version`-0
+ARCH=`dpkg --print-architecture`
+rm -r data 2>/dev/null || true
+cp -r static data
+mkdir -p data/usr data/usr/sbin data/DEBIAN
+sed "s/%ARCHITECTURE%/${ARCH}/" -i data/DEBIAN/control
+sed "s/%VERSION%/${VERSION}/" -i data/DEBIAN/control
+if [ -n "${NACL_SHARED}" ]; then
+	sed "s/\\(Depends: .*\\)/\\1, libnacl | libnacl-ref | libnacl-build/" -i data/DEBIAN/control
+fi
+cp ../out/quicktun.raw data/usr/sbin/
+cp ../out/quicktun.nacl0 data/usr/sbin/
+cp ../out/quicktun.nacltai data/usr/sbin/
+cp ../out/quicktun.debian data/usr/sbin/
+cp ../out/quicktun.keypair data/usr/sbin/
+cp ../out/quicktun data/usr/sbin/
+fakeroot dpkg-deb --build data quicktun-${VERSION}_${ARCH}.deb
+mv quicktun*.deb ../out/
diff -r c87212fe8883 -r 18e0b8bdeecc deb/static/DEBIAN/control
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/deb/static/DEBIAN/control	Sun Jan 29 14:09:08 2017 +0100
@@ -0,0 +1,8 @@
+Package: quicktun
+Version: %VERSION%
+Section: net
+Priority: optional
+Architecture: %ARCHITECTURE%
+Depends: bash, daemon, iproute (>= 20100519-1) | iproute2 | openvpn, passwd, coreutils
+Maintainer: Ivo Smits <ivo@ucis.nl>
+Description: Very simple, yet secure VPN software
diff -r c87212fe8883 -r 18e0b8bdeecc deb/static/DEBIAN/postinst
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/deb/static/DEBIAN/postinst	Sun Jan 29 14:09:08 2017 +0100
@@ -0,0 +1,6 @@
+#!/bin/sh
+if [ "$1" = "configure" ]; then
+	if ! getent passwd quicktun >/dev/null; then
+		/usr/sbin/useradd -d /nonexistent -N -r -s /bin/false -g nogroup quicktun
+	fi
+fi
diff -r c87212fe8883 -r 18e0b8bdeecc deb/static/DEBIAN/prerm
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/deb/static/DEBIAN/prerm	Sun Jan 29 14:09:08 2017 +0100
@@ -0,0 +1,4 @@
+#!/bin/sh
+if [ "$1" = "remove" ]; then
+	/usr/sbin/userdel quicktun
+fi
diff -r c87212fe8883 -r 18e0b8bdeecc deb/static/etc/network/if-down.d/quicktun
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/deb/static/etc/network/if-down.d/quicktun	Sun Jan 29 14:09:08 2017 +0100
@@ -0,0 +1,8 @@
+#!/bin/sh
+test -n "${IF_QT_REMOTE_ADDRESS}" || exit 0
+if [ -z "${IF_QT_NO_PRECREATE}" ]; then
+        RUNUSER="quicktun"
+else
+        RUNUSER="root"
+fi
+daemon -n "quicktun.${IFACE}" -u "${RUNUSER}" --stop
diff -r c87212fe8883 -r 18e0b8bdeecc deb/static/etc/network/if-post-down.d/quicktun
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/deb/static/etc/network/if-post-down.d/quicktun	Sun Jan 29 14:09:08 2017 +0100
@@ -0,0 +1,15 @@
+#!/bin/sh
+test -n "${IF_QT_REMOTE_ADDRESS}" || exit 0
+test -z "${IF_QT_NO_PRECREATE}" || exit 0
+if [ -x /usr/sbin/openvpn ]; then
+	/usr/sbin/openvpn --rmtun --dev "${IFACE}"
+elif [ -x /sbin/ip ] && /sbin/ip tuntap 2>&1 >/dev/null; then
+	if [ -n "${IF_QT_TUN_MODE}" ] && [ "${IF_QT_TUN_MODE}" = "1" ]; then
+	        DEVTYPE="tun"
+	else
+	        DEVTYPE="tap"
+	fi
+	/sbin/ip tuntap del dev "${IFACE}" mode "${DEVTYPE}"
+elif [ -x /usr/sbin/tunctl ]; then
+	/usr/sbin/tunctl -d "${IFACE}"
+fi
diff -r c87212fe8883 -r 18e0b8bdeecc deb/static/etc/network/if-pre-up.d/quicktun
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/deb/static/etc/network/if-pre-up.d/quicktun	Sun Jan 29 14:09:08 2017 +0100
@@ -0,0 +1,17 @@
+#!/bin/sh
+test -n "${IF_QT_REMOTE_ADDRESS}" || exit 0
+test -z "${IF_QT_NO_PRECREATE}" || exit 0
+if [ -n "${IF_QT_TUN_MODE}" ] && [ "${IF_QT_TUN_MODE}" = "1" ]; then
+	DEVTYPE="tun"
+else
+	DEVTYPE="tap"
+fi
+if [ -x /usr/sbin/openvpn ]; then
+	/usr/sbin/openvpn --mktun --dev "${IFACE}" --dev-type "${DEVTYPE}" --user quicktun
+elif [ -x /sbin/ip ] && /sbin/ip tuntap 2>&1 >/dev/null; then
+	/sbin/ip tuntap add dev "${IFACE}" mode "${DEVTYPE}" user quicktun
+elif [ -x /usr/sbin/tunctl ]; then
+	/usr/sbin/tunctl -u quicktun -t "${IFACE}"
+else
+	echo "Unable to pre-create tun/tap interface. Run QuickTun as root by setting QT_NO_PRECREATE."
+fi
diff -r c87212fe8883 -r 18e0b8bdeecc deb/static/etc/network/if-up.d/quicktun
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/deb/static/etc/network/if-up.d/quicktun	Sun Jan 29 14:09:08 2017 +0100
@@ -0,0 +1,8 @@
+#!/bin/sh
+test -n "${IF_QT_REMOTE_ADDRESS}" || exit 0
+if [ -z "${IF_QT_NO_PRECREATE}" ]; then
+	RUNUSER="quicktun"
+else
+	RUNUSER="root"
+fi
+/usr/bin/daemon -n "quicktun.${IFACE}" -u "${RUNUSER}" -i -l daemon.err -b daemon.debug -o daemon.debug /usr/sbin/quicktun.debian
diff -r c87212fe8883 -r 18e0b8bdeecc debian/build.sh
--- a/debian/build.sh	Fri Jan 27 20:33:19 2017 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-#!/bin/sh
-set -e
-VERSION=`cat ../version`-0
-ARCH=`dpkg --print-architecture`
-rm -r data 2>/dev/null || true
-cp -r static data
-mkdir -p data/usr data/usr/sbin data/DEBIAN
-sed "s/%ARCHITECTURE%/${ARCH}/" -i data/DEBIAN/control
-sed "s/%VERSION%/${VERSION}/" -i data/DEBIAN/control
-if [ -n "${NACL_SHARED}" ]; then
-	sed "s/\\(Depends: .*\\)/\\1, libnacl | libnacl-ref | libnacl-build/" -i data/DEBIAN/control
-fi
-cp ../out/quicktun.raw data/usr/sbin/
-cp ../out/quicktun.nacl0 data/usr/sbin/
-cp ../out/quicktun.nacltai data/usr/sbin/
-cp ../out/quicktun.debian data/usr/sbin/
-cp ../out/quicktun.keypair data/usr/sbin/
-cp ../out/quicktun data/usr/sbin/
-fakeroot dpkg-deb --build data quicktun-${VERSION}_${ARCH}.deb
-mv quicktun*.deb ../out/
diff -r c87212fe8883 -r 18e0b8bdeecc debian/static/DEBIAN/control
--- a/debian/static/DEBIAN/control	Fri Jan 27 20:33:19 2017 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-Package: quicktun
-Version: %VERSION%
-Section: net
-Priority: optional
-Architecture: %ARCHITECTURE%
-Depends: bash, daemon, iproute (>= 20100519-1) | iproute2 | openvpn, passwd, coreutils
-Maintainer: Ivo Smits <ivo@ucis.nl>
-Description: Very simple, yet secure VPN software
diff -r c87212fe8883 -r 18e0b8bdeecc debian/static/DEBIAN/postinst
--- a/debian/static/DEBIAN/postinst	Fri Jan 27 20:33:19 2017 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-#!/bin/sh
-if [ "$1" = "configure" ]; then
-	if ! getent passwd quicktun >/dev/null; then
-		/usr/sbin/useradd -d /nonexistent -N -r -s /bin/false -g nogroup quicktun
-	fi
-fi
diff -r c87212fe8883 -r 18e0b8bdeecc debian/static/DEBIAN/prerm
--- a/debian/static/DEBIAN/prerm	Fri Jan 27 20:33:19 2017 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-#!/bin/sh
-if [ "$1" = "remove" ]; then
-	/usr/sbin/userdel quicktun
-fi
diff -r c87212fe8883 -r 18e0b8bdeecc debian/static/etc/network/if-down.d/quicktun
--- a/debian/static/etc/network/if-down.d/quicktun	Fri Jan 27 20:33:19 2017 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-#!/bin/sh
-test -n "${IF_QT_REMOTE_ADDRESS}" || exit 0
-if [ -z "${IF_QT_NO_PRECREATE}" ]; then
-        RUNUSER="quicktun"
-else
-        RUNUSER="root"
-fi
-daemon -n "quicktun.${IFACE}" -u "${RUNUSER}" --stop
diff -r c87212fe8883 -r 18e0b8bdeecc debian/static/etc/network/if-post-down.d/quicktun
--- a/debian/static/etc/network/if-post-down.d/quicktun	Fri Jan 27 20:33:19 2017 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-#!/bin/sh
-test -n "${IF_QT_REMOTE_ADDRESS}" || exit 0
-test -z "${IF_QT_NO_PRECREATE}" || exit 0
-if [ -x /usr/sbin/openvpn ]; then
-	/usr/sbin/openvpn --rmtun --dev "${IFACE}"
-elif [ -x /sbin/ip ] && /sbin/ip tuntap 2>&1 >/dev/null; then
-	if [ -n "${IF_QT_TUN_MODE}" ] && [ "${IF_QT_TUN_MODE}" = "1" ]; then
-	        DEVTYPE="tun"
-	else
-	        DEVTYPE="tap"
-	fi
-	/sbin/ip tuntap del dev "${IFACE}" mode "${DEVTYPE}"
-elif [ -x /usr/sbin/tunctl ]; then
-	/usr/sbin/tunctl -d "${IFACE}"
-fi
diff -r c87212fe8883 -r 18e0b8bdeecc debian/static/etc/network/if-pre-up.d/quicktun
--- a/debian/static/etc/network/if-pre-up.d/quicktun	Fri Jan 27 20:33:19 2017 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-#!/bin/sh
-test -n "${IF_QT_REMOTE_ADDRESS}" || exit 0
-test -z "${IF_QT_NO_PRECREATE}" || exit 0
-if [ -n "${IF_QT_TUN_MODE}" ] && [ "${IF_QT_TUN_MODE}" = "1" ]; then
-	DEVTYPE="tun"
-else
-	DEVTYPE="tap"
-fi
-if [ -x /usr/sbin/openvpn ]; then
-	/usr/sbin/openvpn --mktun --dev "${IFACE}" --dev-type "${DEVTYPE}" --user quicktun
-elif [ -x /sbin/ip ] && /sbin/ip tuntap 2>&1 >/dev/null; then
-	/sbin/ip tuntap add dev "${IFACE}" mode "${DEVTYPE}" user quicktun
-elif [ -x /usr/sbin/tunctl ]; then
-	/usr/sbin/tunctl -u quicktun -t "${IFACE}"
-else
-	echo "Unable to pre-create tun/tap interface. Run QuickTun as root by setting QT_NO_PRECREATE."
-fi
diff -r c87212fe8883 -r 18e0b8bdeecc debian/static/etc/network/if-up.d/quicktun
--- a/debian/static/etc/network/if-up.d/quicktun	Fri Jan 27 20:33:19 2017 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-#!/bin/sh
-test -n "${IF_QT_REMOTE_ADDRESS}" || exit 0
-if [ -z "${IF_QT_NO_PRECREATE}" ]; then
-	RUNUSER="quicktun"
-else
-	RUNUSER="root"
-fi
-/usr/bin/daemon -n "quicktun.${IFACE}" -u "${RUNUSER}" -i -l daemon.err -b daemon.debug -o daemon.debug /usr/sbin/quicktun.debian