Package: release.debian.org Severity: normal User: [email protected] Usertags: freeze-exception
Please unblock package oidentd The only change between 2.0.8-4 (in testing currently) is the fix for bug #672926: adding dependencies and making the init script work with net-tools and iproute. debdiff is attached. unblock oidentd/2.0.8-4.1 -- System Information: Debian Release: wheezy/sid APT prefers testing APT policy: (990, 'testing') Architecture: amd64 (x86_64) Foreign Architectures: armel i386 Kernel: Linux 3.5.0 (SMP w/8 CPU cores) Locale: LANG=de_DE.UTF-8, LC_CTYPE=de_DE.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/bash
diff -u oidentd-2.0.8/debian/changelog oidentd-2.0.8/debian/changelog --- oidentd-2.0.8/debian/changelog +++ oidentd-2.0.8/debian/changelog @@ -1,3 +1,12 @@ +oidentd (2.0.8-4.1) unstable; urgency=low + + * Non-maintainer upload. + * Add patch to add -P in the init script with either iproute or net-tools + (Thanks Andreas Henriksson) + * Add dependency on iproute | net-tools (Closes: #672926) + + -- Michael Stapelberg <[email protected]> Mon, 03 Dec 2012 23:42:59 +0100 + oidentd (2.0.8-4) unstable; urgency=low * Bind to ipv6-socket by default as well (Closes: #533604) diff -u oidentd-2.0.8/debian/control oidentd-2.0.8/debian/control --- oidentd-2.0.8/debian/control +++ oidentd-2.0.8/debian/control @@ -8,7 +8,7 @@ Package: oidentd Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, netbase, adduser +Depends: ${shlibs:Depends}, ${misc:Depends}, netbase, adduser, iproute | net-tools Provides: ident-server Replaces: ident-server Conflicts: ident-server, logcheck-database (<= 1.3.3) only in patch2: unchanged: --- oidentd-2.0.8.orig/debian/patches/oidentd-optional-netstat.patch +++ oidentd-2.0.8/debian/patches/oidentd-optional-netstat.patch @@ -0,0 +1,17 @@ +diff --git a/debian/init b/debian/init +index 86f88e2..b9b9c45 100644 +--- a/debian/init ++++ b/debian/init +@@ -27,7 +27,11 @@ test -f /etc/default/oidentd && . /etc/default/oidentd + + if [ "${OIDENT_BEHIND_PROXY}" = "yes" ]; then + # If we have a default router, then allow it to proxy auth requests to us +- GATEWAY=`netstat -nr | awk '/^0.0.0.0/{print $2;}'` ++ if [ -x /bin/netstat ] && [ -x /usr/bin/awk ]; then ++ GATEWAY=`netstat -nr | awk '/^0.0.0.0/{print $2;}'` ++ elif [ -x /bin/ip ] && [ -x /usr/bin/awk ]; then ++ GATEWAY=`ip route show 0.0.0.0/0 | awk '/^default via /{print $3}'` ++ fi + if [ -n "${GATEWAY}" ]; then + OIDENT_OPTIONS="${OIDENT_OPTIONS} -P ${GATEWAY}" + fi
