Bug#710712: pu: package isdnutils/1:3.25+dfsg1-3.3~deb7u1

[Andreas Beckmann <anbe@debian.org>]

Package: release.debian.org
Severity: normal
Tags: wheezy
User: release.debian.org@packages.debian.org
Usertags: pu

Hi,

I just found an error in the ipppd postinst that might create a symlink
in / instead of /dev/ due to inconsistent chdir use.  (#710707)
(Code looks like
    if this ; then cd /dev ; MAKEDEV ; fi
    if that ; then ln -sf isdnctrl0 isdnctrl ; fi )
I fixed this and added cleanup for the bad link in the filesystem root.
Furthermore I cherry-picked a patch from experimental fixing an
uninitialized variable being used in two .config scripts causing
failures. A proposed debdiff is attached.

I intend to NMU isdnutils to get this fixed in sid/jessie first and
thereafter I'd like to see this fixed in wheezy r1, too. What are the
timing constraints for 7.1? How long can I delay the NMU to sid? Should
I raise the urgency for sid?


Andreas

diff --git a/debian/changelog b/debian/changelog
index 3a2ef6d..ad44d60 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,21 @@
+isdnutils (1:3.25+dfsg1-3.3~deb7u1) wheezy; urgency=low
+
+  * Rebuild for wheezy.
+
+ -- Andreas Beckmann <anbe@debian.org>  Sat, 01 Jun 2013 21:14:15 +0200
+
+isdnutils (1:3.25+dfsg1-3.3) unstable; urgency=low
+
+  [ Andreas Beckmann ]
+  * Non-maintainer upload.
+  * ipppd.postinst: Create isdnctrl symlink as /dev/isdnctrl and cleanup
+    possibly misplaced symlink /isdnctrl.  (Closes: #710707)
+
+  [ Christoph Biedl ]
+  * unbreak debian/{ipppd,isdnlog}.config once more. Closes: #696660
+
+ -- Andreas Beckmann <anbe@debian.org>  Sat, 01 Jun 2013 21:04:39 +0200
+
 isdnutils (1:3.25+dfsg1-3+nmu2) unstable; urgency=medium
 
   * Non-maintainer upload.
diff --git a/debian/gbp.conf b/debian/gbp.conf
new file mode 100644
index 0000000..0bb78a0
--- /dev/null
+++ b/debian/gbp.conf
@@ -0,0 +1,3 @@
+[DEFAULT]
+debian-branch = wheezy
+upstream-branch = dfsg
diff --git a/debian/ipppd.config b/debian/ipppd.config
index 33d9ae9..9d9fd50 100644
--- a/debian/ipppd.config
+++ b/debian/ipppd.config
@@ -37,6 +37,7 @@ if [ -s "/etc/isdn/device.$ipppd_if" -o -s "/etc/isdn/ipppd.$ipppd_if" ]; then
 fi
 
 db_input high ipppd/ispphone || true
+status=0
 db_go || status=$?
 if [ $status -eq 30 ]; then
         db_stop
diff --git a/debian/ipppd.postinst b/debian/ipppd.postinst
index ccf442d..2702edb 100644
--- a/debian/ipppd.postinst
+++ b/debian/ipppd.postinst
@@ -27,8 +27,12 @@ case "$1" in
 	fi
 	# FIXME BUG! MAKEDEV should create the link by itself
 	if [ ! -d /dev/.udev/ ] && [ ! -d /run/udev ] ; then
-	    rm -f isdnctrl
-	    ln -s isdnctrl0 isdnctrl
+	    rm -f /dev/isdnctrl
+	    ln -s isdnctrl0 /dev/isdnctrl
+	fi
+	if [ -L /isdnctrl ]; then
+	    # Cleanup possibly misplaced symlink created by 1:3.25+dfsg1-3+nmu2
+	    rm /isdnctrl
 	fi
 	cd "$old_pwd"
         forcerestart=false
diff --git a/debian/isdnlog.config b/debian/isdnlog.config
index 938a6da..68ef9a7 100644
--- a/debian/isdnlog.config
+++ b/debian/isdnlog.config
@@ -36,6 +36,7 @@ if [ -s /etc/isdn/isdn.conf ]; then
     fi
 fi
 db_input high isdnlog/country || true
+status=0
 db_go || status=$?
 if [ $status -eq 30 ]; then
 	exit 1	# cancel selected