diff -Nru iodine-0.7.0/debian/changelog iodine-0.7.0/debian/changelog --- iodine-0.7.0/debian/changelog 2019-02-09 20:09:13.000000000 +0000 +++ iodine-0.7.0/debian/changelog 2020-09-26 16:48:15.000000000 +0000 @@ -1,3 +1,27 @@ +iodine (0.7.0-10) unstable; urgency=medium + + * Use /run/iodine instead of /var/run/iodine. + Thanks to Russell Coker for the bug report. (Closes: #856822) + * Use uscan version 4. + * Update years of packaging copyright. + * Set Rules-Requires-Root: no. + * Drop unneeded version constraints from (build) dependencies. + * Wrap long lines in changelog entries: 0.4.0-1. + * Remove obsolete fields Contact, Name from debian/upstream/metadata. + * Annotate test-only build dependencies with . + * Add Pre-Depends: ${misc:Pre-Depends} in debian/control for support of + new enough init-system-helpers. Thanks to lintian. + * Install systemd unit with dh_installsystemd in debian/rules instead of + manually via dh_install. + * Update long description. Remove ancient reference to nstx. + * Add patch to disable AI_ADDRCONFIG because of issues in glibc. + Cf. #952740. + * Use debhelper-compat 13, and update tmpfile(s) handling. + * Simplify logcheck file handling. + * Set upstream metadata fields: Bug-Submit. + + -- gregor herrmann Sat, 26 Sep 2020 18:48:15 +0200 + iodine (0.7.0-9) unstable; urgency=medium * Add debian/upstream/metadata. @@ -607,7 +631,8 @@ * New upstream release. * Fix debian/watch. * Don't create manpages anymore, now included in upstream tarball. - * Change debian/rules; upstream Makefile now includes install and test targets. + * Change debian/rules; upstream Makefile now includes install and test + targets. * Move makedev from Build-Depends to Depends. * Add password option to debconf questions and /etc/default/iodine. * Change order in postinst. diff -Nru iodine-0.7.0/debian/compat iodine-0.7.0/debian/compat --- iodine-0.7.0/debian/compat 2019-02-09 20:09:13.000000000 +0000 +++ iodine-0.7.0/debian/compat 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -10 diff -Nru iodine-0.7.0/debian/control iodine-0.7.0/debian/control --- iodine-0.7.0/debian/control 2019-02-09 20:09:13.000000000 +0000 +++ iodine-0.7.0/debian/control 2020-09-26 16:48:15.000000000 +0000 @@ -3,8 +3,8 @@ Uploaders: tony mancill Section: net Priority: optional -Build-Depends: check (>= 0.9.10-3), - debhelper (>= 10), +Build-Depends: check , + debhelper-compat (= 13), help2man, libsystemd-dev [linux-any], pkg-config, @@ -14,11 +14,12 @@ Vcs-Browser: https://git.toastfreeware.priv.at/debian/iodine.git/ Vcs-Git: https://git.toastfreeware.priv.at/debian/iodine.git Homepage: https://code.kryo.se/iodine +Rules-Requires-Root: no Package: iodine Architecture: any -Depends: ${shlibs:Depends}, - ${misc:Depends}, +Depends: ${misc:Depends}, + ${shlibs:Depends}, adduser, lsb-base, net-tools, @@ -30,11 +31,8 @@ iproute2, network-manager-iodine, network-manager-iodine-gnome +Pre-Depends: ${misc:Pre-Depends} Description: tool for tunneling IPv4 data through a DNS server This is a piece of software that lets you tunnel IPv4 data through a DNS server. This can be usable in different situations where internet access is firewalled, but DNS queries are allowed. - . - iodine is similar to nstx but has password authentication, brings up the - tun interface automatically and lets the user specify the IP address as a - command line option. diff -Nru iodine-0.7.0/debian/copyright iodine-0.7.0/debian/copyright --- iodine-0.7.0/debian/copyright 2019-02-09 20:09:13.000000000 +0000 +++ iodine-0.7.0/debian/copyright 2020-09-26 16:48:15.000000000 +0000 @@ -41,8 +41,8 @@ License: MIT Files: debian/* -Copyright: 2007-2019, gregor herrmann - 2007-2019, tony mancill +Copyright: 2007-2020, gregor herrmann + 2007-2020, tony mancill License: GPL-1+ Files: debian/iodine-client-start diff -Nru iodine-0.7.0/debian/iodined.service iodine-0.7.0/debian/iodined.service --- iodine-0.7.0/debian/iodined.service 2019-02-09 20:09:13.000000000 +0000 +++ iodine-0.7.0/debian/iodined.service 2020-09-26 16:48:15.000000000 +0000 @@ -5,7 +5,7 @@ [Service] EnvironmentFile=/etc/default/iodine -ExecStart=/usr/sbin/iodined -f -u iodine -t /var/run/iodine $IODINED_ARGS -P ${IODINED_PASSWORD} +ExecStart=/usr/sbin/iodined -f -u iodine -t /run/iodine $IODINED_ARGS -P ${IODINED_PASSWORD} Restart=on-failure Type=simple diff -Nru iodine-0.7.0/debian/iodined.tmpfile iodine-0.7.0/debian/iodined.tmpfile --- iodine-0.7.0/debian/iodined.tmpfile 2019-02-09 20:09:13.000000000 +0000 +++ iodine-0.7.0/debian/iodined.tmpfile 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -d /var/run/iodine - - - diff -Nru iodine-0.7.0/debian/iodined.tmpfiles iodine-0.7.0/debian/iodined.tmpfiles --- iodine-0.7.0/debian/iodined.tmpfiles 1970-01-01 00:00:00.000000000 +0000 +++ iodine-0.7.0/debian/iodined.tmpfiles 2020-09-26 16:48:15.000000000 +0000 @@ -0,0 +1 @@ +d /run/iodine - - - diff -Nru iodine-0.7.0/debian/iodine.install iodine-0.7.0/debian/iodine.install --- iodine-0.7.0/debian/iodine.install 2019-02-09 20:09:13.000000000 +0000 +++ iodine-0.7.0/debian/iodine.install 2020-09-26 16:48:15.000000000 +0000 @@ -1,2 +1 @@ debian/iodine-client-start usr/sbin -debian/iodined.service lib/systemd/system/ 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 2019-02-09 20:09:13.000000000 +0000 +++ iodine-0.7.0/debian/iodine.iodined.init 2020-09-26 16:48:15.000000000 +0000 @@ -22,7 +22,7 @@ DAEMON_ARGS="" PIDFILE=/var/run/$NAME.pid SCRIPTNAME=/etc/init.d/$NAME -CHROOTDIR=/var/run/iodine +CHROOTDIR=/run/iodine # Exit if the package is not installed [ -x "$DAEMON" ] || exit 0 diff -Nru iodine-0.7.0/debian/iodine.iodined.logcheck.ignore.server iodine-0.7.0/debian/iodine.iodined.logcheck.ignore.server --- iodine-0.7.0/debian/iodine.iodined.logcheck.ignore.server 1970-01-01 00:00:00.000000000 +0000 +++ iodine-0.7.0/debian/iodine.iodined.logcheck.ignore.server 2020-09-26 16:48:15.000000000 +0000 @@ -0,0 +1,2 @@ +^\w{3} [ :[:digit:]]{11} [._[:alnum:]-]+ iodined: accepted version for user #[[:digit:]]+ from [.[:digit:]]{7,15}$ +^\w{3} [ :[:digit:]]{11} [._[:alnum:]-]+ iodined: accepted password from user #[[:digit:]]+, given IP [.[:digit:]]{7,15}$ diff -Nru iodine-0.7.0/debian/iodine.logcheck.ignore.server iodine-0.7.0/debian/iodine.logcheck.ignore.server --- iodine-0.7.0/debian/iodine.logcheck.ignore.server 2019-02-09 20:09:13.000000000 +0000 +++ iodine-0.7.0/debian/iodine.logcheck.ignore.server 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -^\w{3} [ :[:digit:]]{11} [._[:alnum:]-]+ iodined: accepted version for user #[[:digit:]]+ from [.[:digit:]]{7,15}$ -^\w{3} [ :[:digit:]]{11} [._[:alnum:]-]+ iodined: accepted password from user #[[:digit:]]+, given IP [.[:digit:]]{7,15}$ diff -Nru iodine-0.7.0/debian/patches/addrconfig.patch iodine-0.7.0/debian/patches/addrconfig.patch --- iodine-0.7.0/debian/patches/addrconfig.patch 1970-01-01 00:00:00.000000000 +0000 +++ iodine-0.7.0/debian/patches/addrconfig.patch 2020-09-26 16:48:15.000000000 +0000 @@ -0,0 +1,18 @@ +Description: Disable AI_ADDRCONFIG + Cf. #952740 +Origin: vendor +Forwarded: not-needed +Author: gregor herrmann +Last-Update: 2020-07-12 + +--- a/src/common.c ++++ b/src/common.c +@@ -154,7 +154,7 @@ + /* AI_ADDRCONFIG misbehaves on windows, and does not exist in OpenBSD */ + hints.ai_flags = flags; + #else +- hints.ai_flags = AI_ADDRCONFIG | flags; ++ hints.ai_flags = flags; + #endif + hints.ai_socktype = SOCK_DGRAM; + hints.ai_protocol = IPPROTO_UDP; 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 2019-02-09 20:09:13.000000000 +0000 +++ iodine-0.7.0/debian/patches/cross.patch 2020-09-26 16:48:15.000000000 +0000 @@ -8,7 +8,8 @@ Forwarded: https://github.com/yarrick/iodine/pull/33 Author: Helmut Grohne Reviewed-by: gregor herrmann -Last-Update: 2019-02-09 +Last-Update: 2019-08-04 +Applied-Upstream: https://github.com/yarrick/iodine/commit/024481c94b97ef37981621cdc38f8b20f8919418 --- a/src/osflags +++ b/src/osflags diff -Nru iodine-0.7.0/debian/patches/series iodine-0.7.0/debian/patches/series --- iodine-0.7.0/debian/patches/series 2019-02-09 20:09:13.000000000 +0000 +++ iodine-0.7.0/debian/patches/series 2020-09-26 16:48:15.000000000 +0000 @@ -3,3 +3,4 @@ 0001-osflags-use-pkg-config-for-systemd-support.patch kfreebsd-hurd.patch cross.patch +addrconfig.patch diff -Nru iodine-0.7.0/debian/postinst iodine-0.7.0/debian/postinst --- iodine-0.7.0/debian/postinst 2019-02-09 20:09:13.000000000 +0000 +++ iodine-0.7.0/debian/postinst 2020-09-26 16:48:15.000000000 +0000 @@ -30,7 +30,7 @@ fi # and we want a special user - adduser --quiet --system --home /var/run/iodine iodine + adduser --quiet --system --home /run/iodine iodine # generate/update /etc/default/iodine if [ ! -e $CONFIGFILE ]; then diff -Nru iodine-0.7.0/debian/preinst iodine-0.7.0/debian/preinst --- iodine-0.7.0/debian/preinst 1970-01-01 00:00:00.000000000 +0000 +++ iodine-0.7.0/debian/preinst 2020-09-26 16:48:15.000000000 +0000 @@ -0,0 +1,42 @@ +#!/bin/sh +# preinst script for #PACKAGE# +# +# see: dh_installdeb(1) + +set -e + +# summary of how this script can be called: +# * `install' +# * `install' +# * `upgrade' +# * `abort-upgrade' +# for details, see https://www.debian.org/doc/debian-policy/ or +# the debian-policy package + + +case "$1" in + install) + ;; + + upgrade) + # change the HOME dir of iodine + if [ -n "$2" ] && dpkg --compare-versions "$2" lt "0.7.0-10~"; then + usermod -d /run/iodine iodine + fi + ;; + + abort-upgrade) + ;; + + *) + echo "preinst called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 diff -Nru iodine-0.7.0/debian/rules iodine-0.7.0/debian/rules --- iodine-0.7.0/debian/rules 2019-02-09 20:09:13.000000000 +0000 +++ iodine-0.7.0/debian/rules 2020-09-26 16:48:15.000000000 +0000 @@ -28,6 +28,11 @@ override_dh_installinit: dh_installinit --name=iodined +override_dh_installtmpfiles: + dh_installtmpfiles --name=iodined + +override_dh_installsystemd: + dh_installsystemd --name=iodined + override_dh_installlogcheck: - dh_installlogcheck - mv $(TMP)/etc/logcheck/ignore.d.server/iodine $(TMP)/etc/logcheck/ignore.d.server/iodined + dh_installlogcheck --name=iodined diff -Nru iodine-0.7.0/debian/upstream/metadata iodine-0.7.0/debian/upstream/metadata --- iodine-0.7.0/debian/upstream/metadata 2019-02-09 20:09:13.000000000 +0000 +++ iodine-0.7.0/debian/upstream/metadata 2020-09-26 16:48:15.000000000 +0000 @@ -1,6 +1,5 @@ --- Bug-Database: https://github.com/yarrick/iodine/issues -Contact: Erik Ekman -Name: iodine +Bug-Submit: https://github.com/yarrick/iodine/issues/new Repository: https://github.com/yarrick/iodine.git Repository-Browse: https://github.com/yarrick/iodine diff -Nru iodine-0.7.0/debian/watch iodine-0.7.0/debian/watch --- iodine-0.7.0/debian/watch 2019-02-09 20:09:13.000000000 +0000 +++ iodine-0.7.0/debian/watch 2020-09-26 16:48:15.000000000 +0000 @@ -1,3 +1,3 @@ -version=3 +version=4 opts=uversionmangle=s/-rc/~rc/ \ - https://code.kryo.se/iodine/iodine-([\d\w\.-]+)\.tar\.gz + https://code.kryo.se/@PACKAGE@/@PACKAGE@@ANY_VERSION@\.tar\.gz$