Package: release.debian.org Severity: normal User: release.debian....@packages.debian.org Usertags: unblock
Please unblock package dahdi-linux * Fix of a serius bug (#923983) * An autopkgtest that works (the existing one was failing) and that checks more functionality. * Many smaller packaging fixes. I initially intended version 1:2.11.1.0.20170917~dfsg-6 to meet the soft freeze deadline and hence included in it a number of cleanups. Apart from those trivial changes, the only real change in the package itself (rather than the tests) was the addition of the script /usr/share/dahdi/dahdi/dahdi-modules that I used extensively in my own private packages and consider well-tested. The upload triggered a bug due to hardwired scripts. I fixed this (no bug filed). I also realised that the tests were not working properly when run in the test bed (I only tried them manually before). Fixed one and did what I could for the other. So sadly there are quite a few changes. But I don't want to see this package removed, as this would force the removal of asterisk as well. -- Tzafrir Debdiff: diff -Nru dahdi-linux-2.11.1.0.20170917~dfsg/debian/changelog dahdi-linux-2.11.1.0.20170917~dfsg/debian/changelog --- dahdi-linux-2.11.1.0.20170917~dfsg/debian/changelog 2018-10-12 14:35:56.000000000 +0300 +++ dahdi-linux-2.11.1.0.20170917~dfsg/debian/changelog 2019-03-10 15:49:50.000000000 +0200 @@ -1,3 +1,31 @@ +dahdi-linux (1:2.11.1.0.20170917~dfsg-7) unstable; urgency=medium + + * dkms: use standard scripts (Closes: #923983). + * work around #923983 at upgrade time. + * Use dh_dkms instead of dh --with dkms, for the m-a -generated package. + * Standard version 4.3.0. + * More comprehensive and robust autopkgtest tests. + - The dkms-modules test is skippable for now. + * debian/dahdi-dkms.install is a generated file. + * dkms metainfo: same license as source. + + -- Tzafrir Cohen <tzaf...@debian.org> Sun, 10 Mar 2019 15:49:50 +0200 + +dahdi-linux (1:2.11.1.0.20170917~dfsg-6) unstable; urgency=medium + + * install dahdi-modules + * A new test: dynamic-loc-call + * dkms: also install oct612 module (Closes: #922008) + * dkms test: try loading all modules + * Rules-Require-Root: no + * rules: remove get-orig-source + * trivial lintian fixes + * debhelper compat level 12 + * rules: Use dpkg makefiles instead of our own parsing + * tests: uninstall modules + + -- Tzafrir Cohen <tzaf...@debian.org> Mon, 04 Mar 2019 23:29:36 +0200 + dahdi-linux (1:2.11.1.0.20170917~dfsg-5) unstable; urgency=medium * Added dpkg-dev as dependency for dpkg-architecture used by the @@ -95,7 +123,7 @@ - Patch dahdi_linux_extra updated to the 2.9.2 branch. * Use hotplug support: - patch hotplug_mod_params: change default of module parameters. - * Multiarch support. + * Multiarch support. * udev rules moved to package dahdi (in source package dahdi-tools). * Add a test for non-free files in case uscan was used. * Remove unused variables from control file. @@ -115,7 +143,7 @@ dahdi-linux (1:2.7.0+dfsg-1) unstable; urgency=low - [ Tzafrir Cohen ] + [ Tzafrir Cohen ] * New upstream release: - Patch fix_define_dev dropped: merged upstream. - Patch fix_xpp_usermode dropped: merged upstream. @@ -155,13 +183,13 @@ * Updated dahdi-linux-extra: - "Upstream" is now a complete git mirror. - Actually include ap400 in the list of modules to build. - - Updated OpenVox drivers: opvxa1200 is a subdirectory + - Updated OpenVox drivers: opvxa1200 is a subdirectory - Updated OpenVox drivers: opvxd115 added (digital cards). * Patch define_spinlock: include a (slightly big) build fix from upstream. * Standards version 3.9.2 (no change needed). * Switch to dh. * Patch notest: Remove a bogus upstream 'test' target. - * Lintian override for an odd interpteter a dummy kernel module init script. + * Lintian override for an odd interpteter a dummy kernel module init script. * Dahdi udev rules are now named 'dahdi-linux.conf'. * Patch xpp_fix_2fxs6fxo: bugfix for Xorcom 2FXX6FXO module code. @@ -171,7 +199,7 @@ * New Upstream release. - Patch uk_rotary dropped: merged upstream. - - Patch oslec_include_2634 dropped: merged upstream. + - Patch oslec_include_2634 dropped: merged upstream. - Patch xpp_usb_buffer_2635 dropped: merged upstream. - Patch voicebus_sem_h_2635 dropped: merged upstream. * dahdi_linux_extra now includes AP400 drivers (Closes: #582095). @@ -195,7 +223,7 @@ dahdi-linux (1:2.3.0.1+dfsg-1) unstable; urgency=low * New upstream version (Closes: #546319). - * Patch no_dummy removed: merged upstream. + * Patch no_dummy removed: merged upstream. * Patch wcb4xxp_extra_trunk removed: merged upstream. * Patch chanmute: make it also explicitly disable the untested DAHDI_AUDIO_NOTIFY. @@ -214,10 +242,10 @@ * Patch wcb4xxp_extra_trunk: backport extra PCI IDs for wcb4xxp (more HFC-[248]S cards). * Switch to a @debian.org address. - * Dpkg V3 format (it was quilt already). + * Dpkg V3 format (it was quilt already). * Remove lintian override that is no longer needed. * Patch dahdi_linux_extra: manually fix to remove a leading '---'. - * dahdi-modules packages now depend on the linux-image versions. + * dahdi-modules packages now depend on the linux-image versions. * Other minor updates to the packaging of the dahdi-modules package. -- Tzafrir Cohen <tzaf...@debian.org> Sun, 18 Apr 2010 17:14:02 +0300 @@ -229,17 +257,17 @@ * Dropped patch wcfxo_reset_fix: merged upstream. * Section name of dahdi-source: kernel * Also provide an example xpp.conf . - * Patch uk_rotary (Closes: #546329). + * Patch uk_rotary (Closes: #546329). * Override the bogus lintian warning for 'm-a a-i dahdi' * Remove some remaining Zaptel left-overs. * Replaced extra drivers and patches with huge patch dahdi_linux_extra (Closes: #564720). - * Patch xpp_udev_rules_2632: fix XPP udev rules (Closes: #562024). - * Also copy the .version file, to make sure modules have versions. + * Patch xpp_udev_rules_2632: fix XPP udev rules (Closes: #562024). + * Also copy the .version file, to make sure modules have versions. * Move xpp udev rules under /lib. Name still kept for the sake of simplicity (thanks, Lintian, Closes: #566876). - * Patch no_dummy: use dahdi internal timing instead of dahdi_dummy. - * Patch chanmute: Enable CHANMUTE optimization (for xpp, mostly). + * Patch no_dummy: use dahdi internal timing instead of dahdi_dummy. + * Patch chanmute: Enable CHANMUTE optimization (for xpp, mostly). [ Mark Purcell ] * Cleanup debian/watch @@ -252,19 +280,19 @@ * New openvox drivers: r113 from their SVN. * Fix copyright file for origin of OpenVox drivers. * Use new zaphfc drivers (r5) from http://code.google.com/p/zaphfc/ . - Note that those use hardhdlc in system.conf (Closes: #532345). + Note that those use hardhdlc in system.conf (Closes: #532345). * Remove obsolete bristuff drivers we don't build anyway. - Leave vzaphfc for now as this is practically upstream (Completely + Leave vzaphfc for now as this is practically upstream (Completely closes: #548061). * Not applying bri_dchan. Astribank BRI spans will use hardhdlc. * Patch wcfxo_reset_fix: Closes: #546331 . * Replace 'dh_clean -k' with dh_prep * Standards version 3.8.3 (no change needed). - * Patch mmx_auto: relied on ARCH to tell between i386 and x86_64, which + * Patch mmx_auto: relied on ARCH to tell between i386 and x86_64, which is not a good idea on newer kernels. Use DAHDI_ARCH instead. * Remove useless postinst and preinst. debhelper adds them anyway - (and with the -e). - * Do include examples of dahdi-linux . + (and with the -e). + * Do include examples of dahdi-linux . -- Tzafrir Cohen <tzafrir.co...@xorcom.com> Sun, 04 Oct 2009 22:47:30 +0200 @@ -274,7 +302,7 @@ * New upstream release [ Tzafrir Cohen ] - * Enable MMX optimization on i386 that supports it (x86, not x86_64). + * Enable MMX optimization on i386 that supports it (x86, not x86_64). Doubles OSLEC's performance: - Adds patches mmx_auto and mmx_fix from upstream bug report. - Fixes patch oslec_kbuild to use it if enabled. @@ -292,11 +320,11 @@ * Actually build OpenVox drivers. * opvxa1200.c: rev. 1.4.12.4 (battery fixes and such) * Fix '${match}' in udev rules file (hardwire). - * no_firmware_download: Disable downloading a binary kernel module at + * no_firmware_download: Disable downloading a binary kernel module at build time. [ Victor Seva ] - * fix debian/watch. + * fix debian/watch. -- Mark Purcell <m...@debian.org> Wed, 20 May 2009 07:22:46 +1000 @@ -304,22 +332,22 @@ [ Tzafrir Cohen ] * Zaptel renamed DAHDI and split to dahdi-linux and dahdi-tools. - * DAHDI is incompatible (ABI and API) with Zaptel. All modules need to + * DAHDI is incompatible (ABI and API) with Zaptel. All modules need to be adapted. * OSLEC wrapper included upstream. Includeing a version of the OSLEC code from the kernel staging directory. - Patch oslec_kernelorg: Upstream kernel.org OSLEC code. * Dropping some aparantly unused external Zaptel drivers. * Extra drivers moved from kernel/ to drivers/dahdi/ to fit the kernel tree. - * UDEV rules are handled here as well. No need to change device names, + * UDEV rules are handled here as well. No need to change device names, only set permissions. - * Patch fix_readme_astribank: Fix an asciidoc formatting issue. + * Patch fix_readme_astribank: Fix an asciidoc formatting issue. * Patch oslec_kbuild: Make oslec's build unconditional. * Fix for zaphfc with DAHDI (by Timo Teräs <timo.te...@iki.fi>) * qozap no longer included: Use wcb4xxp instead. * ztgsm no longer built: nobody really used it. * cwain and vzaphfc currently included but not built. - * Don't generate static device files automatically. Provide a script + * Don't generate static device files automatically. Provide a script to do that. Until we know if there is an actual use for the non-udev setup. @@ -327,7 +355,7 @@ * Update Description: fixes description-starts-with-package-name * Add ${misc:Depends} - debhelper-but-no-misc-depends * Add myself to uploaders - * debian/compat -> 7 + * debian/compat -> 7 - Fixes:package-uses-deprecated-debhelper-compat-version * Upload to experimental while we await NEW & debian-release @@ -336,7 +364,7 @@ zaptel (1:1.4.11~dfsg-3) unstable; urgency=low * zaptel.init: exit on a different condition: Nicer handling of ztdummy. - * zaptel.init: Give a sane default to XPP_SYNC. + * zaptel.init: Give a sane default to XPP_SYNC. -- Tzafrir Cohen <tzafrir.co...@xorcom.com> Mon, 03 Nov 2008 09:35:23 +0200 @@ -358,7 +386,7 @@ * Patch device_class_2626: Fix building 2.6.26 (Closes: #493397). * Using dh_lintian for lintian overrides, hence requiring debhelper 6.0.7. * Lintian: we know we have direct changes. Too bad we're half-upstream :-( - * Fix doc-base section names. + * Fix doc-base section names. -- Tzafrir Cohen <tzafrir.co...@xorcom.com> Thu, 28 Aug 2008 22:58:23 +0300 @@ -438,7 +466,7 @@ (Closes: #447245). * Adjusted lintian overrides: mknod is now called from a function. * Adjust vzaphfc to netdevice API changes in kernel 2.6.24. - * Once again ignoring 'make distclean' errors: it will fail if we don't + * Once again ignoring 'make distclean' errors: it will fail if we don't have kernel sources / headers for current kernel :-( . * Remove some unnecessary changes from the florz zaphfc patch - fixes zaphfc warning. @@ -550,7 +578,7 @@ zaptel (1:1.4.5~dfsg-1) unstable; urgency=low * New Upstream Maintenance Release - - support for Digium's new 32 channel hardware echo canceler + - support for Digium's new 32 channel hardware echo canceler (VPMADT032) for the TDM800P and TDM2400P [ Tzafrir Cohen ] @@ -603,8 +631,8 @@ zaptel (1:1.4.3~dfsg-2) unstable; urgency=low [ Tzafrir Cohen ] - * Fixed and re-added zaptel_perl. - * And added zaptel_hardware (zaptel hardware lister), just for fun. + * Fixed and re-added zaptel_perl. + * And added zaptel_hardware (zaptel hardware lister), just for fun. -- Tzafrir Cohen <tzafrir.co...@xorcom.com> Sat, 09 Jun 2007 03:36:17 +0300 @@ -920,7 +948,7 @@ * Makefile_kbuild.dpatch: modified, as it was not properly merged in upstream * Makefile_bristuff.dpatch: really build zaptel modules again - * Makefile_xpp: fixed. + * Makefile_xpp: fixed. * debian/modulestest: a script for postbuild of zaptel modules from a svn build * zaptel-source: removing unnecessary dependency on dpatch @@ -930,7 +958,7 @@ zaptel (1:1.2.3-2) unstable; urgency=low * bristuff 0.3.0-PRE1k. Also, renamed the dpatch to simply "bristuff" - * updated version in dot_version.dpatch. + * updated version in dot_version.dpatch. * Include build_tools and .version in copied files * newer versions of genzaptelconf and xpp.dpatch @@ -957,7 +985,7 @@ zaptel (1:1.2.1-2) unstable; urgency=low - * Added bristuff 0.3.0-PRE1d patch. bristuff re-enabled. + * Added bristuff 0.3.0-PRE1d patch. bristuff re-enabled. (Closes: #340627, #344432) * Documentation fixes (Closes: #316801) * Makefile_targets.dpatch is ba its small self @@ -1081,9 +1109,9 @@ zaptel (1:1.0.9.1-2) unstable; urgency=low * Closes: #302836: zaptel-source: zaphfc module missing after - compiling modules. + compiling modules. * Closes: #323753: zaptel-source: cannot compile zaphfc in unstable - with gcc-4.0.1. + with gcc-4.0.1. -- Santiago Ruano Rincon <santi...@unicauca.edu.co> Fri, 19 Aug 2005 00:40:56 -0500 @@ -1129,7 +1157,7 @@ zaptel (1:1.0.9-2) unstable; urgency=low * Import bristuff-0.2.0-RC8h.dpatch - * Enable rtia.dpatch + * Enable rtia.dpatch -- Mark Purcell <m...@debian.org> Mon, 4 Jul 2005 02:35:37 +0100 @@ -1137,7 +1165,7 @@ * New upstream release * Disable bristuff to allow 1.0.9 upload - * Disable rtia to allow 1.0.9 upload + * Disable rtia to allow 1.0.9 upload -- Mark Purcell <m...@debian.org> Sun, 3 Jul 2005 15:51:32 +0100 @@ -1214,7 +1242,7 @@ * Kilian Krause: + Increased urgency for fixing RC-bug and this is the last deb to - allow the whole Debian VoIP suit proceed to testing. + allow the whole Debian VoIP suit proceed to testing. -- Jose Carlos Garcia Sogo <js...@debian.org> Sat, 2 Apr 2005 01:14:23 +0200 @@ -1246,7 +1274,7 @@ -- Kilian Krause <k...@verfaction.de> Thu, 24 Feb 2005 01:42:36 +0100 zaptel (1:1.0.4-2) experimental; urgency=low - + * Better "use" of uname -r in Makefile for zaptel-source -- Santiago Ruano Rincon <santi...@unicauca.edu.co> Mon, 21 Feb 2005 00:27:14 -0500 @@ -1262,8 +1290,8 @@ -- Santiago Ruano Rincon <santi...@unicauca.edu.co> Wed, 26 Jan 2005 23:05:20 -0500 zaptel (1:1.0.2-2) unstable; urgency=low - - * libtonezone out of zaptel-source + + * libtonezone out of zaptel-source * /dev/zap/ are now created by zaptel.postinst and deleted by zaptel.postrm. Now, the zap devices match with the upstream version (Closes: #274384). @@ -1273,13 +1301,13 @@ -- Santiago Ruano Rincon <santi...@unicauca.edu.co> Wed, 24 Nov 2004 22:05:52 -0500 zaptel (1:1.0.2-1) unstable; urgency=low - + * New upstream release (zaptel-1.0.2) - + -- Santiago Ruano Rincon <santi...@unicauca.edu.co> Sat, 30 Oct 2004 00:51:54 -0500 zaptel (1:1.0.0-2) unstable; urgency=low - + * New maintainer (Closes: #251938). * Man pages created for ztcfg, ztmonitor and zttool (Closes: #274632, #274633, #274634). @@ -1288,7 +1316,7 @@ * zaptel-modules can be build from zaptel-source with make-kpkg (Closes: #274085). * Now it compiles for 2.6 Kernels (Closes: #251930). - + -- Santiago Ruano Rincon <santi...@unicauca.edu.co> Sun, 26 Sep 2004 02:05:44 -0500 zaptel (1:1.0.0-1) unstable; urgency=low @@ -1307,7 +1335,7 @@ zaptel (1:0.8.1+1.0-RC1-1) unstable; urgency=low * New upstream release - * Add a debian/watch file + * Add a debian/watch file -- Mark Purcell <m...@debian.org> Wed, 21 Jul 2004 17:51:22 +1000 @@ -1388,4 +1416,3 @@ * Initial Release (Closes: #150874) -- Matt Zimmerman <m...@debian.org> Mon, 17 Jun 2002 10:31:21 -0400 - diff -Nru dahdi-linux-2.11.1.0.20170917~dfsg/debian/compat dahdi-linux-2.11.1.0.20170917~dfsg/debian/compat --- dahdi-linux-2.11.1.0.20170917~dfsg/debian/compat 2018-09-29 16:35:02.000000000 +0300 +++ dahdi-linux-2.11.1.0.20170917~dfsg/debian/compat 2019-03-08 23:29:39.000000000 +0200 @@ -1 +1 @@ -10 +12 diff -Nru dahdi-linux-2.11.1.0.20170917~dfsg/debian/control dahdi-linux-2.11.1.0.20170917~dfsg/debian/control --- dahdi-linux-2.11.1.0.20170917~dfsg/debian/control 2018-10-12 13:07:58.000000000 +0300 +++ dahdi-linux-2.11.1.0.20170917~dfsg/debian/control 2019-03-08 23:29:39.000000000 +0200 @@ -3,23 +3,25 @@ Priority: optional Maintainer: Debian VoIP Team <pkg-voip-maintain...@lists.alioth.debian.org> Uploaders: Tzafrir Cohen <tzaf...@debian.org>, Mark Purcell <m...@debian.org> -Build-Depends: debhelper (>= 10), bzip2, asciidoc-base | asciidoc, +Build-Depends: debhelper (>= 12), bzip2, asciidoc-base | asciidoc, + dkms, tar (>= 1.28) -Standards-Version: 4.2.1 +Standards-Version: 4.3.0 Homepage: http://www.asterisk.org/ Vcs-Git: https://salsa.debian.org/pkg-voip-team/dahdi-linux.git -Vcs-Browser: https://salsa.debian.org/pkg-voip-team/dahdi-linux.git +Vcs-Browser: https://salsa.debian.org/pkg-voip-team/dahdi-linux +Rules-Requires-Root: no Package: dahdi-linux Architecture: all Multi-Arch: foreign Depends: ${misc:Depends}, procps, fxload, dahdi-dkms | dahdi-source Description: DAHDI telephony interface - Linux userspace parts - DAHDI (formly Zaptel) is an interface for telephony devices used by e.g. - the Asterisk PBX software. The dahdi-* packages provide the kernel + DAHDI (formly Zaptel) is an interface for telephony devices used by e.g. + the Asterisk PBX software. The dahdi-* packages provide the kernel DAHDI kernel modules and their required setup environment. . - This package includes the minimal Linux-specific userspace parts: udev + This package includes the minimal Linux-specific userspace parts: udev configuration, xpp initialization scripts. Package: dahdi-source @@ -29,15 +31,15 @@ Depends: ${misc:Depends}, debhelper (>> 4.0), module-assistant (>= 0.8.1), bzip2 Recommends: dahdi-linux Description: DAHDI telephony interface - source code for kernel driver - DAHDI (formly Zaptel) is an interface for telephony devices used by e.g. - the Asterisk PBX software. The dahdi-* packages provide the kernel + DAHDI (formly Zaptel) is an interface for telephony devices used by e.g. + the Asterisk PBX software. The dahdi-* packages provide the kernel DAHDI kernel modules and their required setup environment, as well as basic headers for building DAHDI modules and utilities. . It is normally used to build kernel modules package: m-a a-i dahdi Package: dahdi-dkms -Section: devel +Section: kernel Architecture: all Depends: ${misc:Depends}, dkms, make, libc6-dev, dpkg-dev, gcc, wget, gawk Recommends: dahdi-linux diff -Nru dahdi-linux-2.11.1.0.20170917~dfsg/debian/dahdi-dkms.dkms dahdi-linux-2.11.1.0.20170917~dfsg/debian/dahdi-dkms.dkms --- dahdi-linux-2.11.1.0.20170917~dfsg/debian/dahdi-dkms.dkms 1970-01-01 02:00:00.000000000 +0200 +++ dahdi-linux-2.11.1.0.20170917~dfsg/debian/dahdi-dkms.dkms 2019-03-08 23:29:39.000000000 +0200 @@ -0,0 +1 @@ +debian/dkms.conf diff -Nru dahdi-linux-2.11.1.0.20170917~dfsg/debian/dahdi-dkms.metainfo.xml dahdi-linux-2.11.1.0.20170917~dfsg/debian/dahdi-dkms.metainfo.xml --- dahdi-linux-2.11.1.0.20170917~dfsg/debian/dahdi-dkms.metainfo.xml 2018-10-12 09:25:14.000000000 +0300 +++ dahdi-linux-2.11.1.0.20170917~dfsg/debian/dahdi-dkms.metainfo.xml 2019-03-10 15:49:50.000000000 +0200 @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <component> <id>org.asterisk.dahdi.dkms</id> - <metadata_license>CC0-1.0</metadata_license> - <project_license>GPL-2.0+</project_license> + <metadata_license>GPL-2+</metadata_license> + <project_license>GPL-2+</project_license> <name>dahdi-dkms</name> <summary>AHDI telephony interface (dkms kernel driver)</summary> <description> diff -Nru dahdi-linux-2.11.1.0.20170917~dfsg/debian/dahdi-dkms.postinst dahdi-linux-2.11.1.0.20170917~dfsg/debian/dahdi-dkms.postinst --- dahdi-linux-2.11.1.0.20170917~dfsg/debian/dahdi-dkms.postinst 2018-09-30 14:21:02.000000000 +0300 +++ dahdi-linux-2.11.1.0.20170917~dfsg/debian/dahdi-dkms.postinst 1970-01-01 02:00:00.000000000 +0200 @@ -1,39 +0,0 @@ -#!/bin/sh - -set -e - -NAME=dahdi -PACKAGE_NAME=$NAME-dkms - -CVERSION=`dpkg-query -W -f='${Version}' $PACKAGE_NAME | cut -d\: -f2` - -ARCH=`dpkg-architecture -qDEB_HOST_GNU_CPU` - -case "$1" in - configure) - for POSTINST in /usr/lib/dkms/common.postinst /usr/share/$PACKAGE_NAME/postinst; do - if [ -f $POSTINST ]; then - $POSTINST $NAME $CVERSION /usr/share/$PACKAGE_NAME $ARCH $2 - exit $? - fi - echo "WARNING: $POSTINST does not exist." - done - echo "ERROR: DKMS version is too old and $PACKAGE_NAME was not" - echo "built with legacy DKMS support." - echo "You must either rebuild $PACKAGE_NAME with legacy postinst" - echo "support or upgrade DKMS to a more current version." - exit 1 - ;; - - abort-upgrade|abort-remove|abort-deconfigure) - ;; - - *) - echo "postinst called with unknown argument \`$1'" >&2 - exit 1 - ;; -esac - -#DEBHELPER# - -exit 0 diff -Nru dahdi-linux-2.11.1.0.20170917~dfsg/debian/dahdi-dkms.prerm dahdi-linux-2.11.1.0.20170917~dfsg/debian/dahdi-dkms.prerm --- dahdi-linux-2.11.1.0.20170917~dfsg/debian/dahdi-dkms.prerm 2018-09-30 14:21:02.000000000 +0300 +++ dahdi-linux-2.11.1.0.20170917~dfsg/debian/dahdi-dkms.prerm 2019-03-08 23:29:39.000000000 +0200 @@ -2,18 +2,21 @@ set -e -#DEBHELPER# -NAME=dahdi -PACKAGE_NAME=$NAME-dkms - - -CVERSION=`dpkg-query -W -f='${Version}' $PACKAGE_NAME | cut -d\: -f2` -case "$1" in - remove|upgrade) - echo "Removing all DKMS Modules" - dkms remove -m "$NAME" -v "$CVERSION" --all > /dev/null - echo "Done." +# Work around an upgrade from a system with #923983: +if [ "$1" = "prerm-failed-upgrade" ]; then + case "$2" in + 1:2.11.1.0.20170917~dfsg-[56]) + # The original prerm script tried in this case + # to remove the module that is not there, and failed. + # We should not fail: + if [ ! "$(dkms status -m dahdi -v $2)" ]; then + exit 0 + fi ;; -esac + esac + # If we got here, there was another reason for the upgrade to + # fail. Don't hide it. + exit 1 +fi -exit 0 +#DEBHELPER# diff -Nru dahdi-linux-2.11.1.0.20170917~dfsg/debian/dahdi-linux.install dahdi-linux-2.11.1.0.20170917~dfsg/debian/dahdi-linux.install --- dahdi-linux-2.11.1.0.20170917~dfsg/debian/dahdi-linux.install 2018-09-29 16:35:02.000000000 +0300 +++ dahdi-linux-2.11.1.0.20170917~dfsg/debian/dahdi-linux.install 2019-03-08 23:29:39.000000000 +0200 @@ -1,4 +1,5 @@ drivers/dahdi/xpp/xpp.conf etc/dahdi drivers/dahdi/xpp/init_card_* usr/share/dahdi/ drivers/dahdi/xpp/XppConfig.pm usr/share/dahdi/ +dahdi-modules usr/share/dahdi/ debian/modules-load.d/dahdi-linux.conf etc/modules-load.d diff -Nru dahdi-linux-2.11.1.0.20170917~dfsg/debian/dkms.conf.in dahdi-linux-2.11.1.0.20170917~dfsg/debian/dkms.conf.in --- dahdi-linux-2.11.1.0.20170917~dfsg/debian/dkms.conf.in 2018-09-29 16:36:14.000000000 +0300 +++ dahdi-linux-2.11.1.0.20170917~dfsg/debian/dkms.conf.in 2019-03-08 23:29:39.000000000 +0200 @@ -139,4 +139,8 @@ BUILT_MODULE_LOCATION[31]="drivers/dahdi/" DEST_MODULE_LOCATION[31]="/kernel/drivers/telephony/dahdi" +BUILT_MODULE_NAME[32]="oct612x" +BUILT_MODULE_LOCATION[32]="drivers/dahdi/oct612x/" +DEST_MODULE_LOCATION[32]="/kernel/drivers/telephony/dahdi" + AUTOINSTALL=yes diff -Nru dahdi-linux-2.11.1.0.20170917~dfsg/debian/rules dahdi-linux-2.11.1.0.20170917~dfsg/debian/rules --- dahdi-linux-2.11.1.0.20170917~dfsg/debian/rules 2018-09-29 16:36:14.000000000 +0300 +++ dahdi-linux-2.11.1.0.20170917~dfsg/debian/rules 2019-03-10 14:51:40.000000000 +0200 @@ -10,7 +10,8 @@ endif # For DKMS. Use the full release (e.g.: 2.2.1+dfsg-1ubuntu1) -CVERSION := $(shell dpkg-parsechangelog | grep '^Version:' | cut -d' ' -f2 | cut -d\: -f2) +include /usr/share/dpkg/pkg-info.mk +CVERSION = DEB_VERSION ## MODULE-ASSISTANT STUFF # prefix of the target package name @@ -25,18 +26,9 @@ # load default rules -include $(MA_DIR)/include/common-rules.make -DEBVERSION:=$(shell head -n 1 debian/changelog \ - | sed -e 's/^[^(]*(\([^)]*\)).*/\1/') -DEB_BASE_VERSION:=$(shell echo $(DEBVERSION) | sed -e 's/^.*://' -e 's/-[0-9~.a-z]*$$//') -UPVERSION:=$(shell echo $(DEB_BASE_VERSION) | sed -e 's/[~+]dfsg[0-9]*\(~\|$$\)/\1/' -e 's/~\(rc\|beta\)/-\1/') - -UPFILENAME := $(PACKAGE_SRC)_$(UPVERSION).orig.tar.gz -FILENAME := $(PACKAGE_SRC)_$(DEB_BASE_VERSION).orig.tar.gz -URL := http://downloads.asterisk.org/pub/telephony/$(PACKAGE_SRC)/releases/$(PACKAGE_SRC)-$(UPVERSION).tar.gz - -# If the makefile was properly-writen, there was a good separation +# If the makefile was properly-writen, there was a good separation # between kernel and userspace. As things stand now I'd like to work -# around problems with bilding stuff with HOSTCC by simply providing +# around problems with bilding stuff with HOSTCC by simply providing # the generated headers as part of the source: GENERATED_SOURCES := include/dahdi/version.h BUILD_DATE=$(shell dpkg-parsechangelog --show-field Date) @@ -53,7 +45,7 @@ dh_testroot dh_prep #cp -a $(CURDIR)/debian/generated/* . - make modules KERNEL_SOURCES=$(KSRC) MODVERSIONS=detect KERNEL=linux-$(KVERS) + make modules KERNEL_SOURCES=$(KSRC) MODVERSIONS=detect KERNEL=linux-$(KVERS) make install-modules KERNELRELEASE=$(KVERS) DESTDIR=$(CURDIR)/debian/$(PKGNAME) # The modules are way too big. This is only in kernel 2.6 # (Removed for now: breaks cross-building) @@ -72,7 +64,6 @@ ## END OF M-A SECTION -# FIXME: this should be done by Files-Exclude in debian/copyright: override_dh_auto_build: ifneq ($(wildcard drivers/dahdi/xpp/firmwares/USB_FW.hex),) @echo "Tarball is not DFSG-compliant. Use './debian/rules get-orig-source'" @@ -120,26 +111,7 @@ tar cjf debian/$(SKPG)/usr/src/$(PREFIX).tar.bz2 \ -C $(TARPARDIR) modules \ --mode=go=rX,u+rw,a-s --sort=name --mtime="$(BUILD_DATE)" + rm -rf $(TARPARDIR)/modules -print-version: - @@echo "Debian version: $(DEBVERSION)" - @@echo "Upstream version: $(UPVERSION)" - -TARBALL_DIR=../tarballs/$(PACKAGE_SRC)-$(UPVERSION).tmp -get-orig-source: - @@dh_testdir - @@[ -d ../tarballs/. ]||mkdir -p ../tarballs - @@echo Downloading $(UPFILENAME) from $(URL) ... - @@wget -nv -T10 -t3 --verbose -O ../tarballs/$(UPFILENAME) $(URL) - @@echo Repacking as DFSG-free... - @@mkdir -p $(TARBALL_DIR)/ - @@cd $(TARBALL_DIR) ; \ - tar xfz ../$(UPFILENAME) - @@rm -rf $(TARBALL_DIR)/$(PACKAGE_SRC)-$(UPVERSION)/drivers/dahdi/xpp/firmwares/*.hex - @@rm -f $(TARBALL_DIR)/$(PACKAGE_SRC)-$(UPVERSION)/drivers/dahdi/*.rbt - @@cd $(TARBALL_DIR) ; \ - tar cfz ../$(FILENAME) * - @@echo Cleaning up... - @@$(RM) -rf $(TARBALL_DIR)/ - @@$(RM) -f ../tarballs/$(UPFILENAME) - + # Adding a call explicitly, as 'dh --with dkms' breaks m-i + dh_dkms diff -Nru dahdi-linux-2.11.1.0.20170917~dfsg/debian/tests/control dahdi-linux-2.11.1.0.20170917~dfsg/debian/tests/control --- dahdi-linux-2.11.1.0.20170917~dfsg/debian/tests/control 2018-09-29 16:36:14.000000000 +0300 +++ dahdi-linux-2.11.1.0.20170917~dfsg/debian/tests/control 2019-03-10 14:36:54.000000000 +0200 @@ -1,4 +1,13 @@ Tests: dkms-modules -Depends: dahdi-dkms -Restrictions: needs-root, isolation-machine +Depends: dkms, dahdi-dkms, dahdi-linux +# needs-recommends: dkms recommends kernel headers. +# The alternative would be to try and install them, and ten build and +# install the dkms module in the script. But this is not a proper test +# of how dkms should work. +# And even then, the linux-headers get configured after dahdi-dkms, and +# fail the test (and hense: skippable). +Restrictions: needs-root, isolation-machine, needs-recommends, skippable +Tests: dynamic-loc-call +Depends: dahdi-source, module-assistant, dahdi, asterisk-dahdi, asterisk +Restrictions: needs-root, isolation-machine diff -Nru dahdi-linux-2.11.1.0.20170917~dfsg/debian/tests/dkms-modules dahdi-linux-2.11.1.0.20170917~dfsg/debian/tests/dkms-modules --- dahdi-linux-2.11.1.0.20170917~dfsg/debian/tests/dkms-modules 2018-09-30 14:21:02.000000000 +0300 +++ dahdi-linux-2.11.1.0.20170917~dfsg/debian/tests/dkms-modules 2019-03-10 14:37:29.000000000 +0200 @@ -1,5 +1,13 @@ #!/bin/sh +#excluded_modules="dahdi_dummy|dahdi_vpmadt032_loader" +# * dahdi_vpmadt032_loader: architecture-dependent. May not exist +# * dahdi_echocan_oslec: fails for an odd reason. No time to figure this +# now. Loads and works fine in the m-a test. +excluded_modules="dahdi_vpmadt032_loader|dahdi_echocan_oslec" +dkms_conf="debian/dkms.conf.in" +skip_status=77 + # # Check DKMS installation # @@ -7,21 +15,43 @@ dkms status -k $(uname -r) | grep -q ": installed" if [ $? -ne 0 ]; then echo "DKMS installation: failed for $(uname -r)!" - exit 1 + exit $skip_status fi echo "DKMS installation: OK" # -# Load the base DAHDI module +# Load all the DAHDI modules: # -modprobe -r dahdi -modprobe dahdi -if [ $? -ne 0 ]; then - echo "DAHDI module load: failed!" - exit 1 +set -e + +# Excuded modules: +# * dahdi_vpmadt032_loader is architecture-dependent +# * dahdi_dummy: should not be on this list. It is not built +modules=`awk -F'"' '/^BUILT_MODULE_NAME/ {print $2}' $dkms_conf | grep -E -v "$excluded_modules"` + +echo "Unloading any existing modules:" +/usr/share/dahdi/dahdi-modules unload +echo "Loading all modules: $modules" +find /lib/modules/$(uname -r) -name '*.ko' | grep dahdi +for module in $modules; do + if ! modprobe $module; then + dmesg | tail + echo "Failed to load module $module." + exit 1 + fi +done + +echo "Unloading them all again" +/usr/share/dahdi/dahdi-modules unload +if lsmod | grep -w echo; then + rmmod echo fi -echo "DAHDI module load: OK" + +# uninstall, to not get in the way of the m-a test +dkms uninstall dahdi/`dkms status dahdi | cut -d, -f2 | head -n1` --all + +echo "DAHDI modules load: OK" exit 0 diff -Nru dahdi-linux-2.11.1.0.20170917~dfsg/debian/tests/dynamic-loc-call dahdi-linux-2.11.1.0.20170917~dfsg/debian/tests/dynamic-loc-call --- dahdi-linux-2.11.1.0.20170917~dfsg/debian/tests/dynamic-loc-call 1970-01-01 02:00:00.000000000 +0200 +++ dahdi-linux-2.11.1.0.20170917~dfsg/debian/tests/dynamic-loc-call 2019-03-10 13:54:40.000000000 +0200 @@ -0,0 +1,118 @@ +#!/bin/sh +set -e +# +# Check: +# * module-assistant installation +# * Create dynamic local spans +# * Generate spans and configure them, in both DAHDI and Asterisk levels. +# * a DAHDI call in Asterisk using the DAHD-dynamic module +# + +data_dir="debian/tests/dynamic-loc-data" +test_results_dir="/var/log/asterisk/testresults" +num_spans=2 +num_chans=48 +m_a="m-a -i -t -q" + +die() { + echo "[E] $@" + exit 1 +} + +log() { + echo "[I] $@" +} + +cleanup() { + dahdi_span_assignments remove 2>&1 || : + /usr/share/dahdi/dahdi-modules unload || : + packages_to_remove=`dpkg-query -W 'dahdi-modules-*' 2>/dev/null | awk '{print $1}'` + if [ "$packages_to_remove" ]; then + dpkg --purge $packages_to_remove + fi +} + +setup() { + cp -a $data_dir/dahdi/* /etc/dahdi/ + cp -a $data_dir/asterisk/* /etc/asterisk/ + systemctl restart asterisk || : # Also makes sure it is running +} + +# Build and install module using module-assistant. +# Does nothing if module is already built. +m_a_mod_build() { + $m_a prepare 2>&1 + $m_a a-i dahdi 2>&1 + if ! m-a list dahdi | grep -q 'deb$'; then + die "Module Assistant dahdi installation: failed for $(uname -r)." + fi + log "Module Assistant dahdi module installed." +} + +# local "dynamic" spans don't need hardware. They are dummy spans that +# use much of the DAHDI mechanism without any hardware +load_dynamic_spans() { + # An explicit modprobe is needed because dahdi_cfg uses the dahdi devices: + modprobe dahdi + if [ $? != 0 ]; then + die "Failed to load module dahdi: $?" + fi + + # Generate the devices for the dynamic spans: + dahdi_cfg -c /etc/dahdi/dynamic.conf + if [ `dahdi_span_assignments list | wc -l ` != "$num_spans" ]; then + dahdi_span_assignments list + die "Dynamic spans were not generated." + fi + + # The spans will get automatically created and configured in Asterisk + # using the udev hooks. It should take less than a second + sleep 5 + if [ `lsdahdi | grep '(In use)' | wc -l ` != "$num_chans" ]; then + lsdahdi + die "Spans not created or channels not properly registered in Asterisk." + fi + log "Asterisk configured with DAHDI channels." +} + +# Make a test call using the TestClient and TestServer applications. +# We make sure that the call was set up (which shows that the D-channels +# on both spans work OK) and that they can properly talk to each other +# (which probably shows that the B-channels in both spans are OK). +test_asterisk_call() { + id=`date +%H%M%S` # would be nice to avoid collisions + rm -f "$test_results_dir/$id"-*.txt + asterisk -rx "channel originate DAHDI/1/1234567890 application TestClient $id" + for i in `seq 90`; do + if grep -q FAIL "$test_results_dir/$id"-*.txt 2>/dev/null; then + cat "$test_results_dir/$id"-*.txt + die "Test DAHDI call in Asterisk failed (id: $id)." + fi + end_lines=`grep -- "-- END TEST--" "$test_results_dir/$id"-*.txt 2>/dev/null | wc -l` + if [ "$end_lines" = "2" ]; then # Test ended, that is: OK, in both sides + log "Test DAHDI call in Asterisk ended OK." + return + fi + sleep 1 + done + die "Test DAHDI call in Asterisk timed out." +} + +# initial cleanup: start with a clean slate. +cleanup 2>&1 +setup + +m_a_mod_build +load_dynamic_spans +test_asterisk_call + +# Final cleanup, because I don't want to leave the DAHDI modules loaded. +# Asterisk is left running. +cleanup + +if lsmod | grep dahdi; then + die "a DAHDI module is still loaded. Aborting" +fi + +exit 0 + diff -Nru dahdi-linux-2.11.1.0.20170917~dfsg/debian/tests/dynamic-loc-data/asterisk/chan_dahdi.conf dahdi-linux-2.11.1.0.20170917~dfsg/debian/tests/dynamic-loc-data/asterisk/chan_dahdi.conf --- dahdi-linux-2.11.1.0.20170917~dfsg/debian/tests/dynamic-loc-data/asterisk/chan_dahdi.conf 1970-01-01 02:00:00.000000000 +0200 +++ dahdi-linux-2.11.1.0.20170917~dfsg/debian/tests/dynamic-loc-data/asterisk/chan_dahdi.conf 2019-03-08 23:29:39.000000000 +0200 @@ -0,0 +1,13 @@ +[globals] +[channels] +context = test +switchtype = national + +[span1] +dahdichan=1-23 +signalling = pri_cpe + +[span2] +dahdichan=25-47 +signalling = pri_net + diff -Nru dahdi-linux-2.11.1.0.20170917~dfsg/debian/tests/dynamic-loc-data/asterisk/extensions.conf dahdi-linux-2.11.1.0.20170917~dfsg/debian/tests/dynamic-loc-data/asterisk/extensions.conf --- dahdi-linux-2.11.1.0.20170917~dfsg/debian/tests/dynamic-loc-data/asterisk/extensions.conf 1970-01-01 02:00:00.000000000 +0200 +++ dahdi-linux-2.11.1.0.20170917~dfsg/debian/tests/dynamic-loc-data/asterisk/extensions.conf 2019-03-08 23:29:39.000000000 +0200 @@ -0,0 +1,3 @@ +[test] +exten => 1234567890,1,TestServer() + same => n,Hangup() diff -Nru dahdi-linux-2.11.1.0.20170917~dfsg/debian/tests/dynamic-loc-data/dahdi/assigned-spans.conf dahdi-linux-2.11.1.0.20170917~dfsg/debian/tests/dynamic-loc-data/dahdi/assigned-spans.conf --- dahdi-linux-2.11.1.0.20170917~dfsg/debian/tests/dynamic-loc-data/dahdi/assigned-spans.conf 1970-01-01 02:00:00.000000000 +0200 +++ dahdi-linux-2.11.1.0.20170917~dfsg/debian/tests/dynamic-loc-data/dahdi/assigned-spans.conf 2019-03-08 23:29:39.000000000 +0200 @@ -0,0 +1,13 @@ +# +# Autogenerated by /usr/sbin/dahdi_span_assignments on Sat Mar 2 12:15:19 IST 2019 +# Map devices + local spans to span + base channel number + +# Device: [] @ /sys/devices/dahdi_dummy +#/sys/devices/dahdi_dummy 1:3:100 + +# Device: [DYN/loc/1:0] @ /sys/devices/dynamic:loc:0 +DYN/loc/1:0 1:1:1 + +# Device: [DYN/loc/1:1] @ /sys/devices/dynamic:loc:1 +DYN/loc/1:1 1:2:25 + diff -Nru dahdi-linux-2.11.1.0.20170917~dfsg/debian/tests/dynamic-loc-data/dahdi/dynamic.conf dahdi-linux-2.11.1.0.20170917~dfsg/debian/tests/dynamic-loc-data/dahdi/dynamic.conf --- dahdi-linux-2.11.1.0.20170917~dfsg/debian/tests/dynamic-loc-data/dahdi/dynamic.conf 1970-01-01 02:00:00.000000000 +0200 +++ dahdi-linux-2.11.1.0.20170917~dfsg/debian/tests/dynamic-loc-data/dahdi/dynamic.conf 2019-03-08 23:29:39.000000000 +0200 @@ -0,0 +1,2 @@ +dynamic=loc,1:0,24,0 +dynamic=loc,1:1,24,0 diff -Nru dahdi-linux-2.11.1.0.20170917~dfsg/debian/tests/dynamic-loc-data/dahdi/system.conf dahdi-linux-2.11.1.0.20170917~dfsg/debian/tests/dynamic-loc-data/dahdi/system.conf --- dahdi-linux-2.11.1.0.20170917~dfsg/debian/tests/dynamic-loc-data/dahdi/system.conf 1970-01-01 02:00:00.000000000 +0200 +++ dahdi-linux-2.11.1.0.20170917~dfsg/debian/tests/dynamic-loc-data/dahdi/system.conf 2019-03-10 10:31:28.000000000 +0200 @@ -0,0 +1,12 @@ +span=1,0,0,esf,b8zs +span=2,1,0,esf,b8zs +bchan=1-23,25-47 +dchan=24,48 +# We use oslec, but as we build other echo cancellers, at least try to +# load them: +echocanceller=oslec,1-15,25-39 +echocanceller=jpah,16,40 +echocanceller=kb1,17-18,41-42 +echocanceller=mg2,19-21,43-45 +echocanceller=sec,22,46 +echocanceller=sec2,23,47 diff -Nru dahdi-linux-2.11.1.0.20170917~dfsg/debian/watch dahdi-linux-2.11.1.0.20170917~dfsg/debian/watch --- dahdi-linux-2.11.1.0.20170917~dfsg/debian/watch 2018-09-29 16:35:02.000000000 +0300 +++ dahdi-linux-2.11.1.0.20170917~dfsg/debian/watch 2019-03-08 23:29:39.000000000 +0200 @@ -2,6 +2,6 @@ opts=uversionmangle=s/\-rc/~rc/,dversionmangle=s/\~dfsg//,oversionmangle=s/$/\~dfsg/,pgpsigurlmangle=s/$/.asc/ \ http://downloads.asterisk.org/pub/telephony/dahdi-linux/releases/dahdi-linux-(.*)\.tar\.gz\ - debian svn-upgrade + debian uupdate unblock dahdi-linux/1:2.11.1.0.20170917~dfsg-7 -- System Information: Debian Release: buster/sid APT prefers testing APT policy: (500, 'testing') Architecture: amd64 (x86_64) Kernel: Linux 4.19.0-2-amd64 (SMP w/4 CPU cores) Kernel taint flags: TAINT_OOT_MODULE, TAINT_UNSIGNED_MODULE Locale: LANG=en_IL, LC_CTYPE=en_IL (charmap=UTF-8), LANGUAGE=en_IL:en (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash Init: systemd (via /run/systemd/system) LSM: AppArmor: enabled