diff -Nru iodine-0.7.0/debian/changelog iodine-0.7.0/debian/changelog --- iodine-0.7.0/debian/changelog 2018-05-15 21:32:00.000000000 +0000 +++ iodine-0.7.0/debian/changelog 2019-02-09 20:09:13.000000000 +0000 @@ -1,3 +1,20 @@ +iodine (0.7.0-9) unstable; urgency=medium + + * Add debian/upstream/metadata. + * Refresh existing patches. + - 0001-osflags-use-pkg-config-for-systemd-support.patch: add 7b1df75 from + upstream Git as a preparation for the new cross.patch + - kfreebsd-hurd.patch: offset as a result of the former + * Add new patch cross.patch to fix cross compilation. + Allows one to pass PKG_CONFIG to the build system, which happens in + debian/rules, in order to bypass the build architecture pkg-config. + Thanks to Helmut Grohne for the bug report and the initial patch which was + slightly modified to apply against upstream's Git HEAD. (Closes: #921822) + * Update years of packaging copyright. + * Remove trailing whitespace from debian/*. + + -- gregor herrmann Sat, 09 Feb 2019 21:09:13 +0100 + iodine (0.7.0-8) unstable; urgency=medium * New version of iodine-client-start (1.0.6 + one commit) pulled from @@ -132,13 +149,13 @@ * Add patch 0001-Fix-authentication-bypass-bug.patch from upstream's iodine-0.6.0 branch. - + This fixes a security problem where the client could bypass the password check by continuing after getting an error from the server and guessing the network parameters and the server would still accept the rest of the setup and also network traffic. The patch adds checks for normal and raw mode that user has authenticated before allowing any other communication. - + Thanks to Salvatore Bonaccorso for the bug report, and Erik Ekman for backporting the fix super fast. (Closes: #751834) @@ -452,7 +469,7 @@ * Add Swedish debconf translation, thanks to Martin Bagge (closes: #504247). * Fix "Init script starts iodined even if it is already running" by removing the "--pidfile" option from the start-stop-daemon calls; - doesn't work for a forking process. Thanks to Michael Goetze for + doesn't work for a forking process. Thanks to Michael Goetze for the bug report (closes: #511887). * Set debhelper compatibility level to 7; adapt debian/{control,compat,rules} and add debian/iodine.{docs,examples,links}. @@ -603,4 +620,3 @@ * Initial release. -- gregor herrmann Fri, 26 Jan 2007 14:03:30 +0100 - diff -Nru iodine-0.7.0/debian/copyright iodine-0.7.0/debian/copyright --- iodine-0.7.0/debian/copyright 2018-05-15 21:32:00.000000000 +0000 +++ iodine-0.7.0/debian/copyright 2019-02-09 20:09:13.000000000 +0000 @@ -41,8 +41,8 @@ License: MIT Files: debian/* -Copyright: 2007-2018, gregor herrmann - 2007-2018, tony mancill +Copyright: 2007-2019, gregor herrmann + 2007-2019, tony mancill License: GPL-1+ Files: debian/iodine-client-start @@ -73,4 +73,3 @@ LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - diff -Nru iodine-0.7.0/debian/iodine.iodined.init iodine-0.7.0/debian/iodine.iodined.init --- iodine-0.7.0/debian/iodine.iodined.init 2018-05-15 21:32:00.000000000 +0000 +++ iodine-0.7.0/debian/iodine.iodined.init 2019-02-09 20:09:13.000000000 +0000 @@ -58,7 +58,7 @@ [ "$VERBOSE" != no ] && log_failure_msg "$CHROOTDIR does not exist and can't be created." exit 0 fi -} +} # # Function that starts the daemon/service @@ -69,7 +69,7 @@ get_config # check CHROOTDIR check_chrootdir - # + # # Return # 0 if daemon has been started # 1 if daemon was already running diff -Nru iodine-0.7.0/debian/NEWS iodine-0.7.0/debian/NEWS --- iodine-0.7.0/debian/NEWS 2018-05-15 21:32:00.000000000 +0000 +++ iodine-0.7.0/debian/NEWS 2019-02-09 20:09:13.000000000 +0000 @@ -4,4 +4,3 @@ client need to use the same protocol version! -- gregor herrmann Sat, 03 Jul 2010 19:03:26 +0200 - diff -Nru iodine-0.7.0/debian/patches/0001-osflags-use-pkg-config-for-systemd-support.patch iodine-0.7.0/debian/patches/0001-osflags-use-pkg-config-for-systemd-support.patch --- iodine-0.7.0/debian/patches/0001-osflags-use-pkg-config-for-systemd-support.patch 2018-05-15 21:32:00.000000000 +0000 +++ iodine-0.7.0/debian/patches/0001-osflags-use-pkg-config-for-systemd-support.patch 2019-02-09 20:09:13.000000000 +0000 @@ -16,15 +16,22 @@ Change libsystemd-daemon to libsystemd. +From 7b1df75e3aad8a9a01cbbf2f2ff377cbc5a1ea4b Mon Sep 17 00:00:00 2001 +From: Pascal Ernster +Date: Sat, 30 Apr 2016 18:27:15 +0200 +Subject: [PATCH] Fix compilation with systemd>=230 and for older systemd + versions without compat-libs + diff --git a/src/osflags b/src/osflags index 9eda8f0..0f8a26c 100755 --- a/src/osflags +++ b/src/osflags -@@ -19,7 +19,7 @@ link) +@@ -19,7 +19,8 @@ link) Linux) FLAGS=""; [ -e /usr/include/selinux/selinux.h ] && FLAGS="$FLAGS -lselinux"; - [ -e /usr/include/systemd/sd-daemon.h ] && FLAGS="$FLAGS -lsystemd-daemon"; ++ [ -e /usr/include/systemd/sd-daemon.h ] && FLAGS="$FLAGS $(pkg-config --libs libsystemd-daemon)"; + [ -e /usr/include/systemd/sd-daemon.h ] && FLAGS="$FLAGS $(pkg-config --libs libsystemd)"; echo $FLAGS; ;; diff -Nru iodine-0.7.0/debian/patches/cross.patch iodine-0.7.0/debian/patches/cross.patch --- iodine-0.7.0/debian/patches/cross.patch 1970-01-01 00:00:00.000000000 +0000 +++ iodine-0.7.0/debian/patches/cross.patch 2019-02-09 20:09:13.000000000 +0000 @@ -0,0 +1,43 @@ +Description: Fix cross compilation + src/osflags hard codes the build architecture pkg-config. After making it + substitutable and substituting it from the build environment, iodine cross + builds successfully. +Origin: vendor +Bug: https://github.com/yarrick/iodine/pull/33 +Bug-Debian: https://bugs.debian.org/921822 +Forwarded: https://github.com/yarrick/iodine/pull/33 +Author: Helmut Grohne +Reviewed-by: gregor herrmann +Last-Update: 2019-02-09 + +--- a/src/osflags ++++ b/src/osflags +@@ -1,5 +1,7 @@ + #!/bin/sh + ++: "${PKG_CONFIG:=pkg-config}" ++ + case $2 in + link) + +@@ -19,8 +21,8 @@ + Linux) + FLAGS=""; + [ -e /usr/include/selinux/selinux.h ] && FLAGS="$FLAGS -lselinux"; +- [ -e /usr/include/systemd/sd-daemon.h ] && FLAGS="$FLAGS $(pkg-config --libs libsystemd-daemon)"; +- [ -e /usr/include/systemd/sd-daemon.h ] && FLAGS="$FLAGS $(pkg-config --libs libsystemd)"; ++ "$PKG_CONFIG" --exists libsystemd-daemon && FLAGS="$FLAGS $($PKG_CONFIG --libs libsystemd-daemon)"; ++ "$PKG_CONFIG" --exists libsystemd && FLAGS="$FLAGS $($PKG_CONFIG --libs libsystemd)"; + echo $FLAGS; + ;; + esac +@@ -36,7 +38,8 @@ + Linux) + FLAGS="-D_GNU_SOURCE" + [ -e /usr/include/selinux/selinux.h ] && FLAGS="$FLAGS -DHAVE_SETCON"; +- [ -e /usr/include/systemd/sd-daemon.h ] && FLAGS="$FLAGS -DHAVE_SYSTEMD"; ++ "$PKG_CONFIG" --exists libsystemd-daemon && FLAGS="$FLAGS -DHAVE_SYSTEMD"; ++ "$PKG_CONFIG" --exists libsystemd && FLAGS="$FLAGS -DHAVE_SYSTEMD"; + echo $FLAGS; + ;; + GNU/kFreeBSD|GNU) diff -Nru iodine-0.7.0/debian/patches/kfreebsd-hurd.patch iodine-0.7.0/debian/patches/kfreebsd-hurd.patch --- iodine-0.7.0/debian/patches/kfreebsd-hurd.patch 2018-05-15 21:32:00.000000000 +0000 +++ iodine-0.7.0/debian/patches/kfreebsd-hurd.patch 2019-02-09 20:09:13.000000000 +0000 @@ -7,7 +7,7 @@ --- a/src/osflags +++ b/src/osflags -@@ -38,6 +38,9 @@ +@@ -39,6 +39,9 @@ [ -e /usr/include/systemd/sd-daemon.h ] && FLAGS="$FLAGS -DHAVE_SYSTEMD"; echo $FLAGS; ;; diff -Nru iodine-0.7.0/debian/patches/series iodine-0.7.0/debian/patches/series --- iodine-0.7.0/debian/patches/series 2018-05-15 21:32:00.000000000 +0000 +++ iodine-0.7.0/debian/patches/series 2019-02-09 20:09:13.000000000 +0000 @@ -2,3 +2,4 @@ verbose-build.patch 0001-osflags-use-pkg-config-for-systemd-support.patch kfreebsd-hurd.patch +cross.patch diff -Nru iodine-0.7.0/debian/postinst iodine-0.7.0/debian/postinst --- iodine-0.7.0/debian/postinst 2018-05-15 21:32:00.000000000 +0000 +++ iodine-0.7.0/debian/postinst 2019-02-09 20:09:13.000000000 +0000 @@ -27,7 +27,7 @@ echo "Creating device /dev/net/tun ..." cd /dev ./MAKEDEV tun || true - fi + fi # and we want a special user adduser --quiet --system --home /var/run/iodine iodine diff -Nru iodine-0.7.0/debian/postrm iodine-0.7.0/debian/postrm --- iodine-0.7.0/debian/postrm 2018-05-15 21:32:00.000000000 +0000 +++ iodine-0.7.0/debian/postrm 2019-02-09 20:09:13.000000000 +0000 @@ -37,5 +37,3 @@ #DEBHELPER# exit 0 - - diff -Nru iodine-0.7.0/debian/rules iodine-0.7.0/debian/rules --- iodine-0.7.0/debian/rules 2018-05-15 21:32:00.000000000 +0000 +++ iodine-0.7.0/debian/rules 2019-02-09 20:09:13.000000000 +0000 @@ -4,6 +4,9 @@ TMP = $(CURDIR)/debian/$(PACKAGE) export DEB_BUILD_MAINT_OPTIONS := hardening=+pie,+bindnow +# needs dpkg-dev 1.19.0 +-include /usr/share/dpkg/buildtools.mk +export PKG_CONFIG ?= pkg-config %: dh $@ diff -Nru iodine-0.7.0/debian/upstream/metadata iodine-0.7.0/debian/upstream/metadata --- iodine-0.7.0/debian/upstream/metadata 1970-01-01 00:00:00.000000000 +0000 +++ iodine-0.7.0/debian/upstream/metadata 2019-02-09 20:09:13.000000000 +0000 @@ -0,0 +1,6 @@ +--- +Bug-Database: https://github.com/yarrick/iodine/issues +Contact: Erik Ekman +Name: iodine +Repository: https://github.com/yarrick/iodine.git +Repository-Browse: https://github.com/yarrick/iodine