Debian

Available patches from Ubuntu

To see Ubuntu differences wrt. to Debian, write down a grep-dctrl query identifying the packages you're interested in:
grep-dctrl -n -sPackage Sources.Debian
(e.g. -FPackage linux-ntfs or linux-ntfs)

Modified packages are listed below:

Debian ( Changelog | PTS | Bugs ) Ubuntu ( Changelog | txt | LP | Bugs ) | Diff from Ubuntu

Source: dahdi-linux

dahdi-linux (1:2.11.1~dfsg-1ubuntu6) focal; urgency=medium * Linux 5.4 compatibility (LP: #1848584) - debian/patches/kernel-compat-5.4.patch -- Paolo Pisati <paolo.pisati@canonical.com> Mon, 11 Nov 2019 12:43:16 +0000 dahdi-linux (1:2.11.1~dfsg-1ubuntu5) disco; urgency=medium * Linux 5.0 compatibility (LP: #1813058) - d/p/kernel-compat-5.0.patch -- Marcelo Henrique Cerri <marcelo.cerri@canonical.com> Thu, 07 Feb 2019 10:15:57 -0200 dahdi-linux (1:2.11.1~dfsg-1ubuntu4) bionic; urgency=medium * Linux 4.15 compatibility (LP: #1737746) - d/p/kernel-compat-4.15_0001-xpp-move-command_timer-functions-to-xbus-core.patch - d/p/kernel-compat-4.15_0002-fix-building-with-4.15-init_timer-setup_timer.patch -- Marcelo Henrique Cerri <marcelo.cerri@canonical.com> Wed, 03 Jan 2018 12:41:02 +0000 dahdi-linux (1:2.11.1~dfsg-1ubuntu3) artful; urgency=medium * Linux 4.13 compatibility (LP: #1706424) - debian/patches/kernel-compat-4.13.patch -- Seth Forshee <seth.forshee@canonical.com> Wed, 09 Aug 2017 12:50:29 -0500 dahdi-linux (1:2.11.1~dfsg-1ubuntu2) artful; urgency=medium * debian/patches/kernel-compat-4.11.patch: Miscellaneous updates to fix build issues with 4.11 (LP: #1691828) -- Seth Forshee <seth.forshee@canonical.com> Wed, 28 Jun 2017 15:55:50 -0500 dahdi-linux (1:2.11.1~dfsg-1ubuntu1) artful; urgency=low * Merge from Debian testing. Remaining changes: - DKMS support: - debian/control: - dahdi-linux depends additionally on (dahdi-dkms | dahdi-source). - dahdi-dkms added - debian/dahdi-dkms.install.in - debian/dahdi-dkms.postinst - debian/dahdi-dkms.prerm - debian/dkms.conf.in - debian/rules: - Add code to generate dkms package - d/p/oslec-echo-in-kernel.diff Disable build of echo.ko in favour of the same module provided by the kernel. - DEP-8 support (debian/tests/*) - Import modifications by Javier Uruen Val <javi@warp.es>: - debian/system.conf (pre-defined config shipped with dahdi-linux) - debian/modules-load.d/dahdi-linux.conf: - add dahdi_dummy - add dahdi_transcode * Dropped: - debian/dahdi-source.install (for lintian) - debian/lintian/dahdi-source - debian/modules (->debian/modules-load.d/dahdi-linux.conf) -- Stefan Bader <stefan.bader@canonical.com> Mon, 12 Jun 2017 12:02:13 +0200

Modifications :
  1. Download patch debian/modules-load.d/dahdi-linux.conf

    --- 1:2.11.1~dfsg-1/debian/modules-load.d/dahdi-linux.conf 2016-09-20 20:45:12.000000000 +0000 +++ 1:2.11.1~dfsg-1ubuntu6/debian/modules-load.d/dahdi-linux.conf 2017-08-09 17:50:29.000000000 +0000 @@ -5,3 +5,5 @@ # systems the module dahdi needs to be loaded explicitly. For the # systems above it is harmless anyway dahdi +dahdi_dummy +dahdi_transcode
  2. Download patch debian/dahdi-linux.install

    --- 1:2.11.1~dfsg-1/debian/dahdi-linux.install 2016-09-20 20:46:04.000000000 +0000 +++ 1:2.11.1~dfsg-1ubuntu6/debian/dahdi-linux.install 2017-08-09 17:50:29.000000000 +0000 @@ -2,3 +2,4 @@ drivers/dahdi/xpp/xpp.conf etc/dahdi drivers/dahdi/xpp/init_card_* usr/share/dahdi/ drivers/dahdi/xpp/XppConfig.pm usr/share/dahdi/ debian/modules-load.d/dahdi-linux.conf etc/modules-load.d +debian/system.conf etc/dahdi
  3. Download patch debian/tests/control

    --- 1:2.11.1~dfsg-1/debian/tests/control 1970-01-01 00:00:00.000000000 +0000 +++ 1:2.11.1~dfsg-1ubuntu6/debian/tests/control 2017-08-09 17:50:29.000000000 +0000 @@ -0,0 +1,4 @@ +Tests: dkms-modules +Depends: dahdi-dkms +Restrictions: needs-root, isolation-machine +
  4. Download patch debian/rules

    --- 1:2.11.1~dfsg-1/debian/rules 2016-09-20 20:00:33.000000000 +0000 +++ 1:2.11.1~dfsg-1ubuntu6/debian/rules 2017-08-09 17:50:29.000000000 +0000 @@ -9,6 +9,9 @@ ifneq (,$(findstring debug,$(DEB_BUILD_O CFLAGS += -g 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) + ## MODULE-ASSISTANT STUFF # prefix of the target package name PREFIX:=dahdi @@ -75,10 +78,19 @@ ifneq ($(wildcard drivers/dahdi/xpp/firm @echo "Tarball is not DFSG-compliant. Use './debian/rules get-orig-source'" exit 1 endif + # For DKMS + sed -e "s|#CVERSION#|$(CVERSION)|" \ + debian/dkms.conf.in > debian/dkms.conf + sed -e "s|#CVERSION#|$(CVERSION)|" \ + debian/dahdi-dkms.install.in > debian/dahdi-dkms.install + $(MAKE) docs $(MAKE) $(GENERATED_SOURCES) override_dh_auto_clean: + # Delete the generated dkms files + rm -f debian/dahdi-dkms.install + rm -f debian/dkms.conf rm -f $(GENERATED_SOURCES) rm -f dahdi/include/version.h [ ! -f Makefile ] || $(MAKE) dist-clean || true
  5. Download patch debian/dahdi-dkms.postinst

    --- 1:2.11.1~dfsg-1/debian/dahdi-dkms.postinst 1970-01-01 00:00:00.000000000 +0000 +++ 1:2.11.1~dfsg-1ubuntu6/debian/dahdi-dkms.postinst 2017-08-09 17:50:29.000000000 +0000 @@ -0,0 +1,58 @@ +#!/bin/sh + +set -e + +NAME=dahdi +PACKAGE_NAME=$NAME-dkms + +CVERSION=`dpkg-query -W -f='${Version}' $PACKAGE_NAME | cut -d\: -f2` + +ARCH=`dpkg --print-architecture` +case $ARCH in + amd64) + ARCH="x86_64" + ;; + lpia) + ARCH="i686" + ;; + i386) + ARCH="i686" + ;; + armel) + ;; + *) + echo "WARNING: potentially unsupported arch: $ARCH" + ARCH="$ARCH" + ;; +esac + + + +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
  6. Download patch debian/tests/dkms-modules

    --- 1:2.11.1~dfsg-1/debian/tests/dkms-modules 1970-01-01 00:00:00.000000000 +0000 +++ 1:2.11.1~dfsg-1ubuntu6/debian/tests/dkms-modules 2017-08-09 17:50:29.000000000 +0000 @@ -0,0 +1,26 @@ +#!/bin/sh + +# +# Check DKMS installation +# +dkms status +dkms status -k $(uname -r) | grep -q ": installed" +if [ $? -ne 0 ]; then + echo "DKMS installation: failed for $(uname -r)!" + exit 1 +fi +echo "DKMS installation: OK" + +# +# Load the dummy module +# +modprobe dahdi_dummy + +if [ $? -ne 0 ]; then + echo "Dummy module load: failed!" + exit 1 +fi +echo "Dummy module load: OK" + +exit 0 +
  7. Download patch debian/patches/kernel-compat-4.15_0001-xpp-move-command_timer-functions-to-xbus-core.patch

    --- 1:2.11.1~dfsg-1/debian/patches/kernel-compat-4.15_0001-xpp-move-command_timer-functions-to-xbus-core.patch 1970-01-01 00:00:00.000000000 +0000 +++ 1:2.11.1~dfsg-1ubuntu6/debian/patches/kernel-compat-4.15_0001-xpp-move-command_timer-functions-to-xbus-core.patch 2018-01-02 18:18:52.000000000 +0000 @@ -0,0 +1,90 @@ +From 529b104aacaa6164d39e955003718bf15edcf08e Mon Sep 17 00:00:00 2001 +From: Tzafrir Cohen <tzafrir.cohen@xorcom.com> +Date: Mon, 1 Jan 2018 16:06:25 +0200 +Subject: [PATCH 1/2] xpp: move command_timer functions to xbus-core + +Would allow to later fully initializing the command_timer in xbus-core.c +rather than xbus-pcm.c . +--- + drivers/dahdi/xpp/xbus-core.c | 30 ++++++++++++++++++++++++++++++ + drivers/dahdi/xpp/xbus-pcm.c | 30 ------------------------------ + 2 files changed, 30 insertions(+), 30 deletions(-) + +--- a/drivers/dahdi/xpp/xbus-core.c ++++ b/drivers/dahdi/xpp/xbus-core.c +@@ -1304,6 +1304,36 @@ + return 0; + } + ++static void xbus_command_timer(unsigned long param) ++{ ++ xbus_t *xbus = (xbus_t *)param; ++ struct timeval now; ++ ++ BUG_ON(!xbus); ++ do_gettimeofday(&now); ++ xbus_command_queue_tick(xbus); ++ if (!xbus->self_ticking) /* Must be 1KHz rate */ ++ mod_timer(&xbus->command_timer, jiffies + 1); ++} ++ ++void xbus_set_command_timer(xbus_t *xbus, bool on) ++{ ++ XBUS_DBG(SYNC, xbus, "%s\n", (on) ? "ON" : "OFF"); ++ if (on) { ++ if (!timer_pending(&xbus->command_timer)) { ++ XBUS_DBG(SYNC, xbus, "add_timer\n"); ++ xbus->command_timer.function = xbus_command_timer; ++ xbus->command_timer.data = (unsigned long)xbus; ++ xbus->command_timer.expires = jiffies + 1; ++ add_timer(&xbus->command_timer); ++ } ++ } else if (timer_pending(&xbus->command_timer)) { ++ XBUS_DBG(SYNC, xbus, "del_timer\n"); ++ del_timer(&xbus->command_timer); ++ } ++ xbus->self_ticking = !on; ++} ++ + bool xbus_setflags(xbus_t *xbus, int flagbit, bool on) + { + unsigned long flags; +--- a/drivers/dahdi/xpp/xbus-pcm.c ++++ b/drivers/dahdi/xpp/xbus-pcm.c +@@ -353,36 +353,6 @@ + (syncer) ? syncer->busname : "NO-SYNC"); + } + +-static void xbus_command_timer(unsigned long param) +-{ +- xbus_t *xbus = (xbus_t *)param; +- struct timeval now; +- +- BUG_ON(!xbus); +- do_gettimeofday(&now); +- xbus_command_queue_tick(xbus); +- if (!xbus->self_ticking) /* Must be 1KHz rate */ +- mod_timer(&xbus->command_timer, jiffies + 1); +-} +- +-void xbus_set_command_timer(xbus_t *xbus, bool on) +-{ +- XBUS_DBG(SYNC, xbus, "%s\n", (on) ? "ON" : "OFF"); +- if (on) { +- if (!timer_pending(&xbus->command_timer)) { +- XBUS_DBG(SYNC, xbus, "add_timer\n"); +- xbus->command_timer.function = xbus_command_timer; +- xbus->command_timer.data = (unsigned long)xbus; +- xbus->command_timer.expires = jiffies + 1; +- add_timer(&xbus->command_timer); +- } +- } else if (timer_pending(&xbus->command_timer)) { +- XBUS_DBG(SYNC, xbus, "del_timer\n"); +- del_timer(&xbus->command_timer); +- } +- xbus->self_ticking = !on; +-} +- + /* + * Called when the Astribank replies to a sync change request + */
  8. Download patch debian/control

    --- 1:2.11.1~dfsg-1/debian/control 2016-09-21 18:55:11.000000000 +0000 +++ 1:2.11.1~dfsg-1ubuntu6/debian/control 2017-08-09 17:50:29.000000000 +0000 @@ -1,7 +1,8 @@ Source: dahdi-linux Section: comm Priority: optional -Maintainer: Debian VoIP Team <pkg-voip-maintainers@lists.alioth.debian.org> +Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com> +XSBC-Original-Maintainer: Debian VoIP Team <pkg-voip-maintainers@lists.alioth.debian.org> Uploaders: Tzafrir Cohen <tzafrir@debian.org>, Mark Purcell <msp@debian.org>, Faidon Liambotis <paravoid@debian.org> Build-Depends: debhelper (>= 9), bzip2, asciidoc Standards-Version: 3.9.8 @@ -12,7 +13,7 @@ Vcs-Browser: https://anonscm.debian.org/ Package: dahdi-linux Architecture: all Multi-Arch: foreign -Depends: ${misc:Depends}, procps, fxload +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 @@ -34,3 +35,16 @@ Description: DAHDI telephony interface - 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 +Architecture: all +Depends: ${misc:Depends}, dkms, make, libc6-dev, gcc, wget, gawk +Recommends: dahdi-linux +Description: DAHDI telephony interface (dkms 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 kernel modules and their required setup environment. + . + The dkms package will automatically compile the driver for your current + kernel version.
  9. Download patch debian/dahdi-dkms.install.in

    --- 1:2.11.1~dfsg-1/debian/dahdi-dkms.install.in 1970-01-01 00:00:00.000000000 +0000 +++ 1:2.11.1~dfsg-1ubuntu6/debian/dahdi-dkms.install.in 2017-08-09 17:50:29.000000000 +0000 @@ -0,0 +1,6 @@ +Makefile usr/src/dahdi-#CVERSION# +build_tools usr/src/dahdi-#CVERSION# +drivers usr/src/dahdi-#CVERSION# +include usr/src/dahdi-#CVERSION# +debian/dkms.conf usr/src/dahdi-#CVERSION# +.version usr/src/dahdi-#CVERSION#
  10. Download patch debian/patches/kernel-compat-4.15_0002-fix-building-with-4.15-init_timer-setup_timer.patch
  11. Download patch debian/patches/series

    --- 1:2.11.1~dfsg-1/debian/patches/series 2016-09-21 09:07:34.000000000 +0000 +++ 1:2.11.1~dfsg-1ubuntu6/debian/patches/series 2019-11-11 12:43:16.000000000 +0000 @@ -7,3 +7,11 @@ tor2-request_firmware pciradio-request_firmware hotplug_mod_params wcfxo-wctdm-set-spantype.patch +# Additional Ubuntu patches: +oslec-echo-in-kernel.diff +kernel-compat-4.11.patch +kernel-compat-4.13.patch +kernel-compat-4.15_0001-xpp-move-command_timer-functions-to-xbus-core.patch +kernel-compat-4.15_0002-fix-building-with-4.15-init_timer-setup_timer.patch +kernel-compat-5.0.patch +kernel-compat-5.4.patch
  12. Download patch debian/patches/kernel-compat-4.11.patch
  13. Download patch debian/system.conf
  14. Download patch debian/patches/kernel-compat-4.13.patch
  15. Download patch debian/dkms.conf.in

    --- 1:2.11.1~dfsg-1/debian/dkms.conf.in 1970-01-01 00:00:00.000000000 +0000 +++ 1:2.11.1~dfsg-1ubuntu6/debian/dkms.conf.in 2017-08-09 17:50:29.000000000 +0000 @@ -0,0 +1,142 @@ +PACKAGE_VERSION="#CVERSION#" + +# Items below here should not have to change with each driver version +PACKAGE_NAME="dahdi" +MAKE[0]="(make modules KVERS=$kernelver MODULES_EXTRA='dahdi_dummy dahdi_echocan_oslec'; make KVERS=$kernelver; make KVERS=$kernelver firmware-loaders; echo : > drivers/dahdi/vpmadt032_loader/.vpmadt032_x86_32.o.cmd; echo : > drivers/dahdi/vpmadt032_loader/.vpmadt032_x86_64.o.cmd; make KVERS=$kernelver)" +#Do not make clean, because Sangoma drivers need Module.symvers +CLEAN="/bin/true" +#CLEAN="make KERNVER=$kernelver clean" + +#MAKE[0]="make modules KERNVER=$kernelver DOWNLOAD=echo" +#CLEAN="make KERNVER=$kernelver clean DOWNLOAD=echo" + +BUILT_MODULE_NAME[0]="dahdi_dummy" +BUILT_MODULE_LOCATION[0]="drivers/dahdi/" +DEST_MODULE_LOCATION[0]="/kernel/drivers/telephony/dahdi" + +BUILT_MODULE_NAME[1]="dahdi_dynamic_eth" +BUILT_MODULE_LOCATION[1]="drivers/dahdi/" +DEST_MODULE_LOCATION[1]="/kernel/drivers/telephony/dahdi" + +BUILT_MODULE_NAME[2]="dahdi_dynamic" +BUILT_MODULE_LOCATION[2]="drivers/dahdi/" +DEST_MODULE_LOCATION[2]="/kernel/drivers/telephony/dahdi" + +BUILT_MODULE_NAME[3]="dahdi_dynamic_loc" +BUILT_MODULE_LOCATION[3]="drivers/dahdi/" +DEST_MODULE_LOCATION[3]="/kernel/drivers/telephony/dahdi" + +BUILT_MODULE_NAME[4]="dahdi_echocan_jpah" +BUILT_MODULE_LOCATION[4]="drivers/dahdi/" +DEST_MODULE_LOCATION[4]="/kernel/drivers/telephony/dahdi" + +BUILT_MODULE_NAME[5]="dahdi_echocan_kb1" +BUILT_MODULE_LOCATION[5]="drivers/dahdi/" +DEST_MODULE_LOCATION[5]="/kernel/drivers/telephony/dahdi" + +BUILT_MODULE_NAME[6]="dahdi_echocan_mg2" +BUILT_MODULE_LOCATION[6]="drivers/dahdi/" +DEST_MODULE_LOCATION[6]="/kernel/drivers/telephony/dahdi" + +BUILT_MODULE_NAME[7]="dahdi_echocan_sec2" +BUILT_MODULE_LOCATION[7]="drivers/dahdi/" +DEST_MODULE_LOCATION[7]="/kernel/drivers/telephony/dahdi" + +BUILT_MODULE_NAME[8]="dahdi_echocan_sec" +BUILT_MODULE_LOCATION[8]="drivers/dahdi/" +DEST_MODULE_LOCATION[8]="/kernel/drivers/telephony/dahdi" + +BUILT_MODULE_NAME[9]="dahdi" +BUILT_MODULE_LOCATION[9]="drivers/dahdi/" +DEST_MODULE_LOCATION[9]="/kernel/drivers/telephony/dahdi" + +BUILT_MODULE_NAME[10]="dahdi_transcode" +BUILT_MODULE_LOCATION[10]="drivers/dahdi/" +DEST_MODULE_LOCATION[10]="/kernel/drivers/telephony/dahdi" + +BUILT_MODULE_NAME[11]="pciradio" +BUILT_MODULE_LOCATION[11]="drivers/dahdi/" +DEST_MODULE_LOCATION[11]="/kernel/drivers/telephony/dahdi" + +BUILT_MODULE_NAME[12]="tor2" +BUILT_MODULE_LOCATION[12]="drivers/dahdi/" +DEST_MODULE_LOCATION[12]="/kernel/drivers/telephony/dahdi" + +BUILT_MODULE_NAME[13]="wcb4xxp" +BUILT_MODULE_LOCATION[13]="drivers/dahdi/wcb4xxp/" +DEST_MODULE_LOCATION[13]="/kernel/drivers/telephony/dahdi" + +BUILT_MODULE_NAME[14]="wcfxo" +BUILT_MODULE_LOCATION[14]="drivers/dahdi/" +DEST_MODULE_LOCATION[14]="/kernel/drivers/telephony/dahdi" + +BUILT_MODULE_NAME[15]="wct1xxp" +BUILT_MODULE_LOCATION[15]="drivers/dahdi/" +DEST_MODULE_LOCATION[15]="/kernel/drivers/telephony/dahdi" + +BUILT_MODULE_NAME[16]="wct4xxp" +BUILT_MODULE_LOCATION[16]="drivers/dahdi/wct4xxp/" +DEST_MODULE_LOCATION[16]="/kernel/drivers/telephony/dahdi" + +BUILT_MODULE_NAME[17]="wctc4xxp" +BUILT_MODULE_LOCATION[17]="drivers/dahdi/wctc4xxp/" +DEST_MODULE_LOCATION[17]="/kernel/drivers/telephony/dahdi" + +BUILT_MODULE_NAME[18]="wctdm" +BUILT_MODULE_LOCATION[18]="drivers/dahdi/" +DEST_MODULE_LOCATION[18]="/kernel/drivers/telephony/dahdi" + +BUILT_MODULE_NAME[19]="wctdm24xxp" +BUILT_MODULE_LOCATION[19]="drivers/dahdi/wctdm24xxp/" +DEST_MODULE_LOCATION[19]="/kernel/drivers/telephony/dahdi" + +BUILT_MODULE_NAME[20]="wcte11xp" +BUILT_MODULE_LOCATION[20]="drivers/dahdi/" +DEST_MODULE_LOCATION[20]="/kernel/drivers/telephony/dahdi" + +BUILT_MODULE_NAME[21]="wcte12xp" +BUILT_MODULE_LOCATION[21]="drivers/dahdi/wcte12xp/" +DEST_MODULE_LOCATION[21]="/kernel/drivers/telephony/dahdi" + +BUILT_MODULE_NAME[22]="xpd_fxo" +BUILT_MODULE_LOCATION[22]="drivers/dahdi/xpp/" +DEST_MODULE_LOCATION[22]="/kernel/drivers/telephony/dahdi" + +BUILT_MODULE_NAME[23]="xpd_fxs" +BUILT_MODULE_LOCATION[23]="drivers/dahdi/xpp/" +DEST_MODULE_LOCATION[23]="/kernel/drivers/telephony/dahdi" + +BUILT_MODULE_NAME[24]="xpd_pri" +BUILT_MODULE_LOCATION[24]="drivers/dahdi/xpp/" +DEST_MODULE_LOCATION[24]="/kernel/drivers/telephony/dahdi" + +BUILT_MODULE_NAME[25]="xpp" +BUILT_MODULE_LOCATION[25]="drivers/dahdi/xpp/" +DEST_MODULE_LOCATION[25]="/kernel/drivers/telephony/dahdi" + +BUILT_MODULE_NAME[26]="xpp_usb" +BUILT_MODULE_LOCATION[26]="drivers/dahdi/xpp/" +DEST_MODULE_LOCATION[26]="/kernel/drivers/telephony/dahdi" + +BUILT_MODULE_NAME[27]="xpd_bri" +BUILT_MODULE_LOCATION[27]="drivers/dahdi/xpp/" +DEST_MODULE_LOCATION[27]="/kernel/drivers/telephony/dahdi" + +BUILT_MODULE_NAME[28]="dahdi_voicebus" +BUILT_MODULE_LOCATION[28]="drivers/dahdi/voicebus/" +DEST_MODULE_LOCATION[28]="/kernel/drivers/telephony/dahdi/voicebus" + +#Added by Debian / Ubuntu +BUILT_MODULE_NAME[29]="opvxa1200" +BUILT_MODULE_LOCATION[29]="drivers/dahdi/opvxa1200" +DEST_MODULE_LOCATION[29]="/kernel/drivers/telephony/dahdi" + +BUILT_MODULE_NAME[30]="dahdi_echocan_oslec" +BUILT_MODULE_LOCATION[30]="drivers/dahdi/" +DEST_MODULE_LOCATION[30]="/kernel/drivers/telephony/dahdi" + +BUILT_MODULE_NAME[31]="dahdi_vpmadt032_loader" +BUILT_MODULE_LOCATION[31]="drivers/dahdi/" +DEST_MODULE_LOCATION[31]="/kernel/drivers/telephony/dahdi" + +AUTOINSTALL=yes
  16. Download patch debian/patches/kernel-compat-5.0.patch

    --- 1:2.11.1~dfsg-1/debian/patches/kernel-compat-5.0.patch 1970-01-01 00:00:00.000000000 +0000 +++ 1:2.11.1~dfsg-1ubuntu6/debian/patches/kernel-compat-5.0.patch 2019-02-07 12:15:57.000000000 +0000 @@ -0,0 +1,18 @@ +--- a/include/dahdi/kernel.h ++++ b/include/dahdi/kernel.h +@@ -1695,4 +1695,15 @@ + + #endif /* DAHDI_PRINK_MACROS_USE_debug */ + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 0, 0) ++static inline void do_gettimeofday(struct timeval *tv) ++{ ++ struct timespec64 now; ++ ++ ktime_get_real_ts64(&now); ++ tv->tv_sec = now.tv_sec; ++ tv->tv_usec = now.tv_nsec/1000; ++} ++#endif ++ + #endif /* _DAHDI_KERNEL_H */
  17. Download patch debian/dahdi-dkms.prerm

    --- 1:2.11.1~dfsg-1/debian/dahdi-dkms.prerm 1970-01-01 00:00:00.000000000 +0000 +++ 1:2.11.1~dfsg-1ubuntu6/debian/dahdi-dkms.prerm 2017-08-09 17:50:29.000000000 +0000 @@ -0,0 +1,22 @@ +#!/bin/sh + +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|purge) + echo "Removing all DKMS Modules" + dkms remove -m $NAME -v $CVERSION --all > /dev/null + echo "Done." + ;; + purge) + delgroup --quiet $NAME + ;; +esac + +exit 0
  18. Download patch debian/patches/kernel-compat-5.4.patch

    --- 1:2.11.1~dfsg-1/debian/patches/kernel-compat-5.4.patch 1970-01-01 00:00:00.000000000 +0000 +++ 1:2.11.1~dfsg-1ubuntu6/debian/patches/kernel-compat-5.4.patch 2019-11-11 12:43:16.000000000 +0000 @@ -0,0 +1,29 @@ +Description: Fix FTBFS for kernel 5.4 +Author: Paolo Pisati <paolo.pisati@canonical.com> +--- a/Makefile ++++ b/Makefile +@@ -53,7 +53,7 @@ + + DAHDI_BUILD_ALL:=m + +-KMAKE=+$(MAKE) -C $(KSRC) SUBDIRS=$(PWD)/drivers/dahdi DAHDI_INCLUDE=$(PWD)/include DAHDI_MODULES_EXTRA="$(DAHDI_MODULES_EXTRA)" HOTPLUG_FIRMWARE=$(HOTPLUG_FIRMWARE) ++KMAKE=+$(MAKE) -C $(KSRC) M=$(PWD)/drivers/dahdi DAHDI_INCLUDE=$(PWD)/include DAHDI_MODULES_EXTRA="$(DAHDI_MODULES_EXTRA)" HOTPLUG_FIRMWARE=$(HOTPLUG_FIRMWARE) + + ROOT_PREFIX:= + +--- a/include/dahdi/kernel.h ++++ b/include/dahdi/kernel.h +@@ -68,9 +68,13 @@ + + #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 26) + #ifdef CONFIG_PCI ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 4, 0) ++#include <linux/pci.h> ++#else + #include <linux/pci-aspm.h> + #endif + #endif ++#endif + + #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29) + #define HAVE_NET_DEVICE_OPS
  19. Download patch debian/patches/oslec-echo-in-kernel.diff

    --- 1:2.11.1~dfsg-1/debian/patches/oslec-echo-in-kernel.diff 1970-01-01 00:00:00.000000000 +0000 +++ 1:2.11.1~dfsg-1ubuntu6/debian/patches/oslec-echo-in-kernel.diff 2017-08-09 17:50:29.000000000 +0000 @@ -0,0 +1,21 @@ +Description: Do not build echo.ko + Do not build the echo module. This module is in-kernel since v3.15 and + newer (though not by version) than the code here. Luckily the oslec.h + header which defines the interface has not changed because it is not + a public header in the kernel. +Forwarded: no +Author: Stefan Bader <stefan.bader@canonical.com> + +Index: dahdi-linux-2.11.1~dfsg/drivers/dahdi/Kbuild +=================================================================== +--- dahdi-linux-2.11.1~dfsg.orig/drivers/dahdi/Kbuild ++++ dahdi-linux-2.11.1~dfsg/drivers/dahdi/Kbuild +@@ -67,7 +67,7 @@ obj-m += $(DAHDI_MODULES_EXTRA) + # well: + ifneq (,$(wildcard $(src)/../staging/echo/echo.c)) + obj-m += dahdi_echocan_oslec.o +-obj-m += ../staging/echo/echo.o ++#obj-m += ../staging/echo/echo.o + endif + + CFLAGS_MODULE += -I$(DAHDI_INCLUDE) -I$(src)

Debian ( Changelog | PTS | Bugs ) Ubuntu ( Changelog | txt | LP | Bugs ) | Diff from Ubuntu

Source: dahdi-tools

dahdi-tools (1:2.11.1-3ubuntu1) bionic; urgency=medium * Merge from Debian unstable. Remaining change: - debian/control: Depend on (dahdi-dkms | dahdi-source) and gawk -- Bhavani Shankar <bhavi@ubuntu.com> Wed, 01 Nov 2017 18:54:11 +0530

Modifications :
  1. Download patch debian/control

    --- 1:2.11.1-3/debian/control 2017-10-11 06:13:56.000000000 +0000 +++ 1:2.11.1-3ubuntu1/debian/control 2017-10-12 00:14:01.000000000 +0000 @@ -1,7 +1,8 @@ Source: dahdi-tools Section: comm Priority: optional -Maintainer: Debian VoIP Team <pkg-voip-maintainers@lists.alioth.debian.org> +Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com> +XSBC-Original-Maintainer: Debian VoIP Team <pkg-voip-maintainers@lists.alioth.debian.org> Uploaders: Tzafrir Cohen <tzafrir@debian.org>, Mark Purcell <msp@debian.org> # groff, man-db and asciidoc are required for generating documentation Build-Depends: debhelper (>= 10), @@ -25,7 +26,9 @@ Vcs-Browser: https://anonscm.debian.org/ Package: dahdi Architecture: linux-any Multi-Arch: foreign -Depends: ${shlibs:Depends}, ${perl:Depends}, ${misc:Depends}, procps, fxload, dahdi-linux, usbutils +#Jmdault 20090601: the init scripts needs the kernel drivers, so we require +#either the dkms module (preferred) or the source pkg (with module-assistant) +Depends: ${shlibs:Depends}, ${perl:Depends}, ${misc:Depends}, procps, fxload, dahdi-linux, usbutils, dahdi-dkms | dahdi-source, gawk Conflicts: zaptel Replaces: zaptel Description: utilities for using the DAHDI kernel modules

Debian ( Changelog | PTS | Bugs ) Ubuntu ( Changelog | txt | LP | Bugs ) | Diff from Ubuntu

Source: fxload

fxload (0.0.20081013-1ubuntu2) bionic; urgency=high * No change rebuild to pick up -fPIE compiler default -- Balint Reczey <rbalint@ubuntu.com> Tue, 03 Apr 2018 12:23:57 +0000 fxload (0.0.20081013-1ubuntu1) maverick; urgency=low * Merge from debian unstable. (LP: #587824) Remaining changes: - Use DEVNAME from the environment in preference to DEVICE (LP: #156085) -- Jean-Louis Dupond <jean-louis@dupond.be> Wed, 05 May 2010 03:58:58 +0100

Modifications :
  1. Download patch debian/patches/use_devname

    --- 0.0.20081013-1/debian/patches/use_devname 1970-01-01 00:00:00.000000000 +0000 +++ 0.0.20081013-1ubuntu2/debian/patches/use_devname 2010-06-02 20:29:21.000000000 +0000 @@ -0,0 +1,53 @@ +--- fxload-0.0.20081013.orig/main.c ++++ fxload-0.0.20081013/main.c +@@ -33,7 +33,7 @@ + * + * -L <path> -- Create a symbolic link to the device. + * -m <mode> -- Set the permissions on the device after download. +- * -D <path> -- Use this device, instead of $DEVICE ++ * -D <path> -- Use this device, instead of $DEVNAME or $DEVICE + * + * -V -- Print version ID for program + * +@@ -42,10 +42,10 @@ + * expects these environment variables which are passed by hotplug to + * its sub-scripts: + * +- * DEVICE=<path> +- * This is the path to the device is /proc/bus/usb. It is the +- * complete path to the device, that I can pass to open and +- * manipulate as a USB device. ++ * DEVNAME=<path>, DEVICE=<path> ++ * This is the path to the device in /dev/bus/usb or ++ * /proc/bus/usb. It is the complete path to the device, that ++ * I can pass to open and manipulate as a USB device. + */ + + # include <stdlib.h> +@@ -90,13 +90,16 @@ int main(int argc, char*argv[]) + { + const char *link_path = 0; + const char *ihex_path = 0; +- const char *device_path = getenv("DEVICE"); ++ const char *device_path = getenv("DEVNAME"); + const char *type = 0; + const char *stage1 = 0; + mode_t mode = 0; + int opt; + int config = -1; + ++ if (!device_path) ++ device_path = getenv("DEVICE"); ++ + while ((opt = getopt (argc, argv, "2vV?D:I:L:c:lm:s:t:")) != EOF) + switch (opt) { + +@@ -190,7 +193,7 @@ usage: + fputs ("\t\t[-I firmware_hexfile] ", stderr); + fputs ("[-s loader] [-c config_byte]\n", stderr); + fputs ("\t\t[-L link] [-m mode]\n", stderr); +- fputs ("... [-D devpath] overrides DEVICE= in env\n", stderr); ++ fputs ("... [-D devpath] overrides DEVNAME= and DEVICE= in env\n", stderr); + fputs ("... device types: one of an21, fx, fx2, fx2lp\n", stderr); + fputs ("... at least one of -I, -L, -m is required\n", stderr); + return -1;
  2. Download patch debian/control

    --- 0.0.20081013-1/debian/control 2010-04-20 05:33:15.000000000 +0000 +++ 0.0.20081013-1ubuntu2/debian/control 2010-06-02 20:29:48.000000000 +0000 @@ -1,7 +1,8 @@ Source: fxload Section: admin Priority: optional -Maintainer: Fumitoshi UKAI <ukai@debian.or.jp> +Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com> +XSBC-Original-Maintainer: Fumitoshi UKAI <ukai@debian.or.jp> Uploaders: Tzafrir Cohen <tzafrir@debian.org> Build-Depends: debhelper (>= 7) Standards-Version: 3.8.4
  3. Download patch debian/patches/series

    --- 0.0.20081013-1/debian/patches/series 2010-04-20 05:40:59.000000000 +0000 +++ 0.0.20081013-1ubuntu2/debian/patches/series 2010-06-02 20:29:21.000000000 +0000 @@ -1,2 +1,3 @@ destdir remove_ident +use_devname

Debian ( Changelog | PTS | Bugs ) Ubuntu ( Changelog | txt | LP | Bugs ) | Diff from Ubuntu

Source: libuser

libuser (1:0.62~dfsg-0.1ubuntu2) yakkety; urgency=medium * Build using dpkg-dev's hardening support. -- Matthias Klose <doko@ubuntu.com> Wed, 05 Oct 2016 05:31:01 +0200 libuser (1:0.62~dfsg-0.1ubuntu1) yakkety; urgency=medium * Build-depend on hardening-wrapper to support the 'hardening' build flag. -- Steve Langasek <steve.langasek@ubuntu.com> Sat, 09 Jul 2016 22:42:44 -0700

Modifications :
  1. Download patch debian/rules

    --- 1:0.62~dfsg-0.1/debian/rules 2016-05-27 12:38:51.000000000 +0000 +++ 1:0.62~dfsg-0.1ubuntu2/debian/rules 2016-10-05 03:30:58.000000000 +0000 @@ -1,7 +1,7 @@ #!/usr/bin/make -f export DH_VERBOSE=1 -export DEB_BUILD_OPTIONS=hardening=+all +export DEB_BUILD_MAINT_OPTIONS=hardening=+all %: dh $@ --with python2,autoreconf --parallel
  2. Download patch debian/control

    --- 1:0.62~dfsg-0.1/debian/control 2016-05-27 12:38:51.000000000 +0000 +++ 1:0.62~dfsg-0.1ubuntu2/debian/control 2016-10-05 03:30:37.000000000 +0000 @@ -1,7 +1,8 @@ Source: libuser Section: admin Priority: optional -Maintainer: Ghe Rivero <ghe@debian.org> +Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com> +XSBC-Original-Maintainer: Ghe Rivero <ghe@debian.org> Uploaders: Tzafrir Cohen <tzafrir@debian.org>, Build-Depends:

Debian ( Changelog | PTS | Bugs ) Ubuntu ( Changelog | txt | LP | Bugs ) | Diff from Ubuntu

Source: mediastreamer2

mediastreamer2 (1:2.16.1-4ubuntu1) eoan; urgency=medium * debian/patches/gcc-9-compatibility.patch: fix wrong uses of strncpy with off-by-one errors. Closes: #925775. -- Steve Langasek <steve.langasek@ubuntu.com> Thu, 08 Aug 2019 09:08:09 -0700 mediastreamer2 (1:2.16.1-4build2) eoan; urgency=medium * No-change rebuild against libvpx6 -- Steve Langasek <steve.langasek@ubuntu.com> Thu, 08 Aug 2019 15:35:22 +0000 mediastreamer2 (1:2.16.1-4build1) disco; urgency=medium * No-change rebuild against latest glew -- Jeremy Bicha <jbicha@ubuntu.com> Fri, 23 Nov 2018 19:58:16 -0500

Modifications :
  1. Download patch debian/patches/gcc-9-compatibility.patch

    --- 1:2.16.1-4/debian/patches/gcc-9-compatibility.patch 1970-01-01 00:00:00.000000000 +0000 +++ 1:2.16.1-4ubuntu1/debian/patches/gcc-9-compatibility.patch 2019-08-08 16:08:09.000000000 +0000 @@ -0,0 +1,97 @@ +Description: fix wrong uses of strncpy with off-by-one errors + gcc 9 detects wrong uses of strncpy that may result in strings that are not + null terminated. Fix afew invocations of strncpy that have this problem. + (If null-termination was not desired, this should be using memcpy instead.) +Author: Steve Langasek <steve.langasek@ubuntu.com> +Last-Modified: 2019-08-08 +Bug-Debian: https://bugs.debian.org/925775 + +Index: mediastreamer2-2.16.1/src/audiofilters/tonedetector.c +=================================================================== +--- mediastreamer2-2.16.1.orig/src/audiofilters/tonedetector.c ++++ mediastreamer2-2.16.1/src/audiofilters/tonedetector.c +@@ -173,7 +173,8 @@ + if (gs->dur>=tone_def->min_duration && !gs->event_sent){ + MSToneDetectorEvent event; + +- strncpy(event.tone_name,tone_def->tone_name,sizeof(event.tone_name)); ++ strncpy(event.tone_name,tone_def->tone_name,sizeof(event.tone_name)-1); ++ event.tone_name[7] = '\0'; + event.tone_start_time=gs->starttime; + ms_filter_notify(f,MS_TONE_DETECTOR_EVENT,&event); + gs->event_sent=TRUE; +Index: mediastreamer2-2.16.1/src/audiofilters/pulseaudio.c +=================================================================== +--- mediastreamer2-2.16.1.orig/src/audiofilters/pulseaudio.c ++++ mediastreamer2-2.16.1/src/audiofilters/pulseaudio.c +@@ -235,7 +235,7 @@ + if (sourceCard!= NULL) { + pa_device_t *sourceCard_data = (pa_device_t *)sourceCard->data; + pa_device->bidirectionnal = 1; +- strncpy(pa_device->source_name,sourceCard_data->name, PA_STRING_SIZE -1); ++ strncpy(pa_device->source_name,sourceCard_data->name, PA_STRING_SIZE); + *pa_source_list = bctbx_list_remove(*pa_source_list, sourceCard->data); + ms_free(sourceCard_data); + } +Index: mediastreamer2-2.16.1/src/voip/ice.c +=================================================================== +--- mediastreamer2-2.16.1.orig/src/voip/ice.c ++++ mediastreamer2-2.16.1/src/voip/ice.c +@@ -2748,7 +2748,8 @@ + } + + candidate = ms_new0(IceCandidate, 1); +- strncpy(candidate->taddr.ip, ip, sizeof(candidate->taddr.ip)); ++ strncpy(candidate->taddr.ip, ip, sizeof(candidate->taddr.ip) - 1); ++ candidate->taddr.ip[sizeof(candidate->taddr.ip)-1] = '\0'; + candidate->taddr.port = port; + candidate->taddr.family = family; + candidate->type = candidate_type; +@@ -3033,7 +3034,7 @@ + /* We found a candidate that should have the same foundation, so copy it from this candidate. */ + IceCandidate *other_candidate = (IceCandidate *)l->data; + if (strlen(other_candidate->foundation) > 0) { +- strncpy(candidate->foundation, other_candidate->foundation, sizeof(candidate->foundation) - 1); ++ strncpy(candidate->foundation, other_candidate->foundation, sizeof(candidate->foundation)); + return; + } + /* If the foundation of the other candidate is empty we need to assign a new one, so continue. */ +@@ -3314,8 +3315,8 @@ + bctbx_list_t *elem; + + memset(&foundation, 0, sizeof(foundation)); +- strncpy(foundation.local, pair->local->foundation, sizeof(foundation.local) - 1); +- strncpy(foundation.remote, pair->remote->foundation, sizeof(foundation.remote) - 1); ++ strncpy(foundation.local, pair->local->foundation, sizeof(foundation.local)); ++ strncpy(foundation.remote, pair->remote->foundation, sizeof(foundation.remote)); + + elem = bctbx_list_find_custom(*list, (bctbx_compare_func)ice_find_pair_foundation, &foundation); + if (elem == NULL) { +Index: mediastreamer2-2.16.1/tools/mediastream.c +=================================================================== +--- mediastreamer2-2.16.1.orig/tools/mediastream.c ++++ mediastreamer2-2.16.1/tools/mediastream.c +@@ -1295,6 +1295,7 @@ + return FALSE; + } + strncpy(ip,localhost, MIN(len, strlen(localhost))); ++ ip[len-1] = '\0'; + return TRUE; + } + iplen=semicolon-addr; +@@ -1308,13 +1309,11 @@ + static bool_t parse_ice_addr(char *addr, char *type, size_t type_len, char *ip, size_t ip_len, int *port) + { + char *semicolon=NULL; +- size_t slen; + + semicolon=strrchr(addr,':'); + if (semicolon==NULL) return FALSE; +- slen=MIN(strlen(semicolon+1),type_len); +- strncpy(type,semicolon+1,slen); +- type[slen]='\0'; ++ strncpy(type,semicolon+1,type_len); ++ type[type_len-1]='\0'; + *semicolon='\0'; + return parse_addr(addr,ip,ip_len,port); + }
  2. Download patch debian/control

    --- 1:2.16.1-4/debian/control 2018-10-10 21:04:34.000000000 +0000 +++ 1:2.16.1-4ubuntu1/debian/control 2019-08-08 15:35:21.000000000 +0000 @@ -1,6 +1,7 @@ Source: mediastreamer2 Priority: optional -Maintainer: Debian VoIP Team <pkg-voip-maintainers@lists.alioth.debian.org> +Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com> +XSBC-Original-Maintainer: Debian VoIP Team <pkg-voip-maintainers@lists.alioth.debian.org> Uploaders: Mark Purcell <msp@debian.org>, Kilian Krause <kilian@debian.org>, Tzafrir Cohen <tzafrir@debian.org>,
  3. Download patch debian/patches/series

    --- 1:2.16.1-4/debian/patches/series 2018-10-10 21:04:34.000000000 +0000 +++ 1:2.16.1-4ubuntu1/debian/patches/series 2019-08-08 15:57:47.000000000 +0000 @@ -5,3 +5,4 @@ ffmpeg-input-buffer-padding.patch srtp2.patch gcc-8-compatibility.patch gcc-8-compatibility-2.patch +gcc-9-compatibility.patch
  1. dahdi-linux
  2. dahdi-tools
  3. fxload
  4. libuser
  5. mediastreamer2