Package: isdnutils
Version: 1:3.25+dfsg1-3.3
Followup-For: Bug #710359
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu trusty ubuntu-patch
Hi Rolf, Jan-Michael,
I've just updated the isdnutils package in Ubuntu based on the one currently
in unstable. In the process, I've identified several changes that I think
you will want in Debian; indeed, it seems that several of the issues I
identified while doing the merge already have bug reports filed for them in
Debian:
- #698785 isdnutils-base: installs inittab snippet into /etc/cron.d
- #710359 isdnlog: postinst uses /usr/share/doc content (Policy 12.3)
- #696829 isdnutils-base: Old /etc/init.d/isdnutils is not purged during
upgrade from squeeze
Attached is a patch including the various fixes from Ubuntu that I think are
most relevant.
These are:
* debian/patches/no-imake.patch: Don't build xisdnload/xmonisdn using
xmkmf/imake. This patch was dropped in Debian without explanation;
it still applies and seems to still be a good idea for eventual
upstreaming, since imake is quite obsolete.
* capi.conf: Fix typo for fcdsl2 firmware. LP: #189132.
* Handle migrating the blacklist file from
/etc/modprobe.d/blacklist-capiutils.conf to the path used in Debian,
/etc/modprobe.d/capiutils.conf. (This may not be required in Debian; if
not, feel free to ignore this .maintscript bit)
* Handle rename of /etc/ppp/ip-down.d/99-ipppd and /etc/ppp/ip-up.d/00-ipppd
to /etc/ppp/ip-down.d/ipppd and /etc/ppp/ip-up.d/ipppd
* Handle rename of /etc/init.d/isdnutils to /etc/init.d/isdnutils-base
(closes: #696829)
* Drop debian/isdnutils-base.cron.d, which isn't a cronjob example at all
but an inittab example gone astray. (closes: #698785)
* debian/patches/vbox-configure-quoting.patch: fix wrong handling of paths
with embedded quotes; this confuses vbox's configure script something
fierce, and causes files to be missed from debian/tmp'/usr/share/doc/'
at install time.
* Apply patches that were preserved in the 3.0 (quilt) migration, but
were not applied, seemingly inadvertently:
- debian/patches/capifax.additional_error_codes.patch
- debian/patches/capifax.3_1kHz_audio.patch
* Fix isdnlog, isdnvboxserver, and ipppd to not ship files used in the
postinst under /usr/share/doc. (closes: #710359)
It would be great if you could look these over and see if you think they're
appropriate for Debian.
Thanks,
--
Steve Langasek Give me a lever long enough and a Free OS
Debian Developer to set it on, and I can move the world.
Ubuntu Developer http://www.debian.org/
slanga...@ubuntu.com vor...@debian.org
=== modified file 'debian/capi.conf'
--- debian/capi.conf 2005-09-22 09:38:06 +0000
+++ debian/capi.conf 2013-11-08 17:49:30 +0000
@@ -15,7 +15,7 @@
#fxusb - - - - - -
#fcclassic - - 0x150 10 - -
#fcdsl fdslbase.bin DSS1 - - - -
-#fcdsl2 fdsl2base.bin DSS1 - - - -
+#fcdsl2 fds2base.bin DSS1 - - - -
#fcdslsl fdssbase.bin DSS1 - - - -
#fcdslslusb fdlubase.frm DSS1 - - - -
#fcdslusba fdlabase.frm DSS1 - - - -
=== added file 'debian/capiutils.maintscript'
--- debian/capiutils.maintscript 1970-01-01 00:00:00 +0000
+++ debian/capiutils.maintscript 2013-11-08 19:17:23 +0000
@@ -0,0 +1 @@
+mv_conffile /etc/modprobe.d/blacklist-capiutils.conf /etc/modprobe.d/capiutils.conf 1:3.25+dfsg1-6
=== modified file 'debian/control'
--- debian/control 2013-03-26 03:39:07 +0000
+++ debian/control 2013-11-15 17:44:27 +0000
@@ -7,7 +7,7 @@
Standards-Version: 3.9.3
Build-Depends: debhelper (>= 9), bzip2, libncurses5-dev | libncurses-dev,
xutils-dev | imake, tcl-dev, linuxdoc-tools (>=0.9.20), groff, libtool,
- libxaw7-dev, libreadline-dev, libpcap0.8-dev, autotools-dev,
+ libxaw7-dev, libreadline-gplv2-dev, libpcap0.8-dev, autotools-dev,
automake, autoconf, libssl-dev, psutils,
lsb-release, po-debconf, ppp-dev
Homepage: http://www.isdn4linux.de
=== modified file 'debian/ipppd.examples'
--- debian/ipppd.examples 2012-04-30 23:40:53 +0000
+++ debian/ipppd.examples 2013-11-15 05:40:58 +0000
@@ -1,3 +1,2 @@
-debian/ipppd.DEVICE
debian/auth-down
debian/auth-up
=== modified file 'debian/ipppd.install.in'
--- debian/ipppd.install.in 2012-06-24 00:56:11 +0000
+++ debian/ipppd.install.in 2013-11-15 05:41:08 +0000
@@ -1,3 +1,4 @@
usr/sbin/ipppstats
usr/sbin/ipppd
debian/ioptions /etc/ppp/
+debian/ipppd.DEVICE /usr/share/isdn/default
=== added file 'debian/ipppd.maintscript'
--- debian/ipppd.maintscript 1970-01-01 00:00:00 +0000
+++ debian/ipppd.maintscript 2013-11-15 03:41:43 +0000
@@ -0,0 +1,2 @@
+mv_conffile /etc/ppp/ip-down.d/99-ipppd /etc/ppp/ip-down.d/ipppd 1:3.25+dfsg1-6
+mv_conffile /etc/ppp/ip-up.d/00-ipppd /etc/ppp/ip-up.d/ipppd 1:3.25+dfsg1-6
=== modified file 'debian/ipppd.postinst'
--- debian/ipppd.postinst 2013-06-06 12:36:01 +0000
+++ debian/ipppd.postinst 2013-11-15 05:41:43 +0000
@@ -64,7 +64,7 @@
ucf --three-way --debconf-ok "$tempfile" /etc/isdn/device.$IPPPX
ucfr ipppd /etc/isdn/device.$IPPPX
- gzip -dc /usr/share/doc/ipppd/examples/ipppd.DEVICE.gz > "$tempfile"
+ cp /usr/share/isdn/default/ipppd.DEVICE "$tempfile"
perl -i -pe '$_ = "" if /^# REMOVE the/; $_ = "" if /^# Warning! not configured yet!/; s,^name X.,name '"$ISPLOGIN"',; s,^#ms-get-dns,ms-get-dns,;' "$tempfile"
ucf --three-way --debconf-ok "$tempfile" /etc/isdn/ipppd.$IPPPX
ucfr ipppd /etc/isdn/ipppd.$IPPPX
=== modified file 'debian/isdnlog.examples'
--- debian/isdnlog.examples 2012-01-11 12:17:14 +0000
+++ debian/isdnlog.examples 2013-11-15 05:32:58 +0000
@@ -1,3 +1,6 @@
-isdnlog/samples/*
-debian/isdnlog.DEVICE
+isdnlog/samples/isdnlog.*
+isdnlog/samples/provider
+isdnlog/samples/reload
+isdnlog/samples/rtest.dat
+isdnlog/samples/stop
debian/callerid.conf
=== modified file 'debian/isdnlog.install.in'
--- debian/isdnlog.install.in 2012-06-24 00:56:11 +0000
+++ debian/isdnlog.install.in 2013-11-15 05:39:30 +0000
@@ -12,3 +12,7 @@
isdnlog/README /usr/share/doc/isdnlog/de
isdnlog/TODO /usr/share/doc/isdnlog/de
isdnlog/contrib/winpopup/winpopup /usr/share/doc/isdnlog/de
+debian/isdnlog.DEVICE /usr/share/isdn/default
+isdnlog/samples/isdn.conf /usr/share/isdn/default
+isdnlog/samples/isdn.conf.?? /usr/share/isdn/default
+isdnlog/samples/rate.conf* /usr/share/isdn/default
=== modified file 'debian/isdnlog.postinst'
--- debian/isdnlog.postinst 2013-03-03 09:34:44 +0000
+++ debian/isdnlog.postinst 2013-11-15 05:32:15 +0000
@@ -26,7 +26,7 @@
if [ "$country" = other ]; then
country=default
fi
- defdir=/usr/share/doc/isdnlog/examples/
+ defdir=/usr/share/isdn/default
conffile=/etc/isdn/isdn.conf
tempfile=$(mktemp -t isdnutils.XXXXXX)
trap 'rm -f "$tempfile"' EXIT
@@ -58,7 +58,7 @@
ucfr isdnlog /etc/isdn/$cfg
done
- sed '/REMOVE the next line/,/REMOVE the above/d' < /usr/share/doc/isdnlog/examples/isdnlog.DEVICE > "$tempfile"
+ sed '/REMOVE the next line/,/REMOVE the above/d' < /usr/share/isdn/default/isdnlog.DEVICE > "$tempfile"
ucf --three-way --debconf-ok "$tempfile" /etc/isdn/isdnlog.isdnctrl0
ucfr isdnlog /etc/isdn/isdnlog.isdnctrl0
if [ -x /etc/init.d/isdnutils-base ]; then
=== removed file 'debian/isdnutils-base.cron.d'
--- debian/isdnutils-base.cron.d 2012-04-30 23:40:53 +0000
+++ debian/isdnutils-base.cron.d 1970-01-01 00:00:00 +0000
@@ -1,5 +0,0 @@
-# Change the line below for your local requirements and uncomment them.
-# Use "init q" to reread inittab.
-# look at the mgetty manpage for more information (mgetty isn't standard!)
-#
-#I0:2345:respawn:/sbin/mgetty -D -m '"" ATZ OK AT&Eyourmsnhere OK AT&B512 OK' -s 38400 ttyI0
=== added file 'debian/isdnutils-base.maintscript'
--- debian/isdnutils-base.maintscript 1970-01-01 00:00:00 +0000
+++ debian/isdnutils-base.maintscript 2013-11-15 03:41:47 +0000
@@ -0,0 +1 @@
+mv_conffile /etc/init.d/isdnutils /etc/init.d/isdnutils-base 1:3.25+dfsg1-6
=== modified file 'debian/isdnvboxserver.postinst'
--- debian/isdnvboxserver.postinst 2013-03-26 03:39:07 +0000
+++ debian/isdnvboxserver.postinst 2013-11-15 07:14:09 +0000
@@ -124,7 +124,7 @@
# on initial installation it won't exist, and "old" name == new name
# so create it here if necessary
mkdir -p "$VBOX_SPOOL/incoming" "$VBOX_SPOOL/messages"
- cp /usr/share/doc/isdnvboxserver/examples/standard.tcl.example "$VBOX_SPOOL/./standard.tcl"
+ cp /usr/share/isdnvboxserver/default/standard.tcl "$VBOX_SPOOL/."
fi
if chown -R "$VBOX_DUSER" "$VBOX_SPOOL"; then
: #OK
=== modified file 'debian/patches/capifax.3_1kHz_audio.patch'
--- debian/patches/capifax.3_1kHz_audio.patch 2010-06-26 12:47:04 +0000
+++ debian/patches/capifax.3_1kHz_audio.patch 2013-11-08 21:15:10 +0000
@@ -1,5 +1,7 @@
---- isdnutils-3.6.2005-01-03/capifax/capifax.c 1998-10-23 14:50:47.000000000 +0200
-+++ isdnutils-3.6.2005-01-03.patched/capifax/capifax.c 2006-03-01 12:58:03.907855308 +0100
+Index: trunk/capifax/capifax.c
+===================================================================
+--- trunk.orig/capifax/capifax.c
++++ trunk/capifax/capifax.c
@@ -175,7 +175,7 @@
}
}
@@ -18,7 +20,7 @@
B1PROTOCOL, B2PROTOCOL, B3PROTOCOL, (unsigned char *)&B3conf);
do {
Handle_CAPI_Msg();
-@@ -254,7 +254,7 @@
+@@ -256,7 +256,7 @@
}
void usage(void) {
@@ -27,7 +29,7 @@
exit(1);
}
-@@ -263,9 +263,10 @@
+@@ -265,9 +265,10 @@
int BChannels, Contr;
int c;
int ret;
@@ -39,7 +41,7 @@
switch (c) {
case 'v':
verbose++;
-@@ -279,6 +280,9 @@
+@@ -281,6 +282,9 @@
case 'h':
headLine = strdup(optarg);
break;
@@ -49,7 +51,7 @@
case '?':
usage();
}
-@@ -304,7 +308,7 @@
+@@ -306,7 +310,7 @@
fprintf(stderr, "No B-Channels available\n");
return -3;
}
=== added file 'debian/patches/no-imake.patch'
--- debian/patches/no-imake.patch 1970-01-01 00:00:00 +0000
+++ debian/patches/no-imake.patch 2013-11-14 17:50:23 +0000
@@ -0,0 +1,99 @@
+Description: Don't build xisdnload/xmonisdn using xmkmf/imake
+
+Index: trunk/xisdnload/Makefile.in
+===================================================================
+--- trunk.orig/xisdnload/Makefile.in
++++ trunk/xisdnload/Makefile.in
+@@ -17,23 +17,28 @@
+ all: xisdnload
+
+ xisdnload:
+- CFLAGS= ; MAKEFLAGS= ; $(MAKE) -f Makefile EXTRA_DEFINES="$(EDEF)"
++ gcc -g -O2 -fno-strict-aliasing -I/usr/X11R6/include -c xisdnload.c
++ gcc -o xisdnload -L/usr/X11R6/lib xisdnload.o -lXaw -lXmu -lXt -lSM -lICE -lXpm -lXext -lX11
+
+ config:
+- @cp Makefile.in GNUmakefile
+- @xmkmf
++ cp -p Makefile.in GNUmakefile
++ cp -p Makefile.in Makefile
+
+ clean:
+- $(MAKE) -f Makefile clean
++ rm -f xisdnload xisdnload.o
+
+ distclean: clean
+ rm -f Makefile Makefile.bak GNUmakefile
+
+ install-man: xisdnload.man
+- $(MAKE) -f Makefile $(MANDIROPTS) install.man
++ install -d $(DESTDIR)/usr/share/man/man1
++ install -c -m 644 xisdnload.man $(DESTDIR)/usr/share/man/man1/xisdnload.1x
+
+ install: xisdnload install-man
+- $(MAKE) -f Makefile $(BINDIROPT) install
++ install -d $(DESTDIR)/usr/bin
++ install -d $(DESTDIR)/etc/X11/app-defaults
++ install -c -m 0755 -s xisdnload $(DESTDIR)/usr/bin/
++ install -c -m 644 XISDNLoad.ad $(DESTDIR)/etc/X11/app-defaults/XISDNLoad
+
+ uninstall:
+ rm -f $(DESTDIR)$(CONFIG_BINDIR)/xisdnload
+Index: trunk/xmonisdn/Makefile.in
+===================================================================
+--- trunk.orig/xmonisdn/Makefile.in
++++ trunk/xmonisdn/Makefile.in
+@@ -24,10 +24,10 @@
+ ifeq (../.config,$(wildcard ../.config))
+ include ../.config
+ ifneq ($(CONFIG_XMONISDN_UPCMD),"")
+- I4LU_DEFINES += -DNETUP_COMMAND=\\\"'$(shell echo $(CONFIG_XMONISDN_UPCMD))'\\\"
++ I4LU_DEFINES += -DNETUP_COMMAND=\"'$(shell echo $(CONFIG_XMONISDN_UPCMD))'\"
+ endif
+ ifneq ($(CONFIG_XMONISDN_DOWNCMD),"")
+- I4LU_DEFINES += -DNETDOWN_COMMAND=\\\"'$(shell echo $(CONFIG_XMONISDN_DOWNCMD))'\\\"
++ I4LU_DEFINES += -DNETDOWN_COMMAND=\"'$(shell echo $(CONFIG_XMONISDN_DOWNCMD))'\"
+ endif
+ MAN1DIROPT = MANDIR=$(CONFIG_MANDIR)/man1
+ MAN3DIROPT = LIBMANDIR=$(CONFIG_MANDIR)/man3
+@@ -48,7 +48,9 @@
+ mkdir -p X11/bitmaps
+ cp netinactive netwaiting netactive \
+ netactiveout netstart netstop X11/bitmaps
+- CFLAGS= ; MAKEFLAGS= ; $(MAKE) -f Makefile EXTRA_DEFINES="$(I4LU_DEFINES)"
++ gcc -g -O2 -fno-strict-aliasing $(I4LU_DEFINES) -I. -I/usr/X11R6/include -c Net.c
++ gcc -g -O2 -fno-strict-aliasing $(I4LU_DEFINES) -I. -I/usr/X11R6/include -c xmonisdn.c
++ gcc -o xmonisdn -L/usr/X11R6/lib Net.o xmonisdn.o -lXaw -lXmu -lXt -lSM -lICE -lXpm -lXext -lX11 -lm
+ rm -rf X11
+
+ xmonisdn.man: xmonisdn.man.in Makefile
+@@ -63,20 +65,24 @@
+ < $< > $@
+
+ config:
+- @cp Makefile.in GNUmakefile
+- @xmkmf
++ cp -p Makefile.in GNUmakefile
++ cp -p Makefile.in Makefile
+
+ clean:
+- $(MAKE) -f Makefile clean
++ rm -f *.o xmonisdn
+
+ distclean: clean
+ rm -f Makefile GNUmakefile Makefile.bak xmonisdn.man
+
+ install-man: xmonisdn.man
+- $(MAKE) -f Makefile $(MANDIROPTS) install.man
++ install -d $(DESTDIR)/usr/X11R6/man/man1
++ install -c -m 644 xmonisdn.man $(DESTDIR)/usr/X11R6/man/man1/xmonisdn.1x
+
+ install: xmonisdn install-man
+- $(MAKE) -f Makefile $(BINDIROPT) install.all
++ install -d $(DESTDIR)/usr/bin
++ install -d $(DESTDIR)/usr/X11R6/include/X11/bitmaps
++ install -c -m 0755 -s xmonisdn $(DESTDIR)/usr/bin/
++ install -c -m 644 netinactive netwaiting netactive netactiveout netstart netstop $(DESTDIR)/usr/X11R6/include/X11/bitmaps
+
+ uninstall:
+ rm -f $(DESTDIR)$(CONFIG_BINDIR)/xmonisdn
=== modified file 'debian/patches/series'
--- debian/patches/series 2012-07-30 03:53:00 +0000
+++ debian/patches/series 2013-11-15 04:23:28 +0000
@@ -5,3 +5,7 @@
libtool.patch
ipppd-replace-gpl-code.patch
capiinfo-autotools.patch
+capifax.additional_error_codes.patch
+capifax.3_1kHz_audio.patch
+no-imake.patch
+vbox-configure-quoting.patch
=== added file 'debian/patches/vbox-configure-quoting.patch'
--- debian/patches/vbox-configure-quoting.patch 1970-01-01 00:00:00 +0000
+++ debian/patches/vbox-configure-quoting.patch 2013-11-15 04:34:44 +0000
@@ -0,0 +1,21 @@
+Description: fix wrong handling of paths with embedded quotes
+ This confuses vbox's configure script something fierce, and causes files to
+ be missed from debian/tmp'/usr/share/man/' at install time.
+Author: Steve Langasek <steve.langa...@ubuntu.com>
+
+Index: trunk/vbox/configure.in
+===================================================================
+--- trunk.orig/vbox/configure.in
++++ trunk/vbox/configure.in
+@@ -26,6 +26,11 @@
+ AC_SUBST(VERSION)
+ AC_SUBST(VERDATE)
+
++CONFIG_BINDIR=`eval echo ${CONFIG_BINDIR:-"/usr/man"}`
++CONFIG_MANDIR=`eval echo ${CONFIG_MANDIR:-"/usr/man"}`
++CONFIG_SBINDIR=`eval echo ${CONFIG_SBINDIR:-"/sbin"}`
++VBOX_DOCDIR=`eval echo ${VBOX_DOCDIR:-"/usr/share/doc/vbox"}`
++
+ dnl #------------------------------------------------------------------------#
+ dnl # Checks for programs: #
+ dnl #------------------------------------------------------------------------#
=== modified file 'debian/rules'
--- debian/rules 2012-07-30 03:53:00 +0000
+++ debian/rules 2013-11-15 03:08:18 +0000
@@ -52,6 +52,8 @@
debian/tmp/usr/share/man/man5/vbox.5
install -m 0644 vbox/examples/vboxrc.example \
debian/isdnvboxclient/usr/share/doc/isdnvboxclient/examples/vboxrc
+ install -m 0644 vbox/examples/standard.tcl.example \
+ debian/isdnvboxserver/usr/share/isdnvboxserver/default/standard.tcl
# remove some unwanted stuff
set -e
