Your message dated Fri, 04 Apr 2025 08:35:16 +0000
with message-id <e1u0cwc-002eep...@fasolo.debian.org>
and subject line Bug#1101409: fixed in dahdi-linux 1:3.1.0+git20230717~dfsg-10.1
has caused the Debian Bug report #1101409,
regarding dahdi-dkms: dkms updates
to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact ow...@bugs.debian.org
immediately.)
--
1101409: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1101409
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems
--- Begin Message ---
Package: dahdi-dkms
Version: 1:3.1.0+git20230717~dfsg-10
Severity: serious
Hi,
I have again a few updates for the -dkms package.
dkms.conf contains a duplicate module definition which can cause subtle
errors with dkms, therefore I'll make dkms error out on such dkms.conf
files in an upcoming dkms upload. Thus the severity serious as that will
break building modules from your package.
Then I'm setting BUILD_EXCLUSIVE_KERNEL_MIN in dkms.conf to the oldest
supported version and fix up some version constraints, that is something
mostly interesting for QA purposes.
Andreas
>From fe296f9dfe6266c6ff241eb45e360a940b5d4c0e Mon Sep 17 00:00:00 2001
From: Andreas Beckmann <a...@debian.org>
Date: Thu, 6 Feb 2025 16:48:06 +0100
Subject: [PATCH 1/4] dkms.conf: drop duplicate module
---
debian/dkms.conf.in | 4 ----
1 file changed, 4 deletions(-)
diff --git a/debian/dkms.conf.in b/debian/dkms.conf.in
index 089d33c..66d98ee 100644
--- a/debian/dkms.conf.in
+++ b/debian/dkms.conf.in
@@ -21,10 +21,6 @@ BUILT_MODULE_NAME+=("dahdi_dummy")
BUILT_MODULE_LOCATION+=("drivers/dahdi/")
DEST_MODULE_LOCATION+=("/kernel/drivers/telephony/dahdi")
-BUILT_MODULE_NAME+=("dahdi_dynamic_eth")
-BUILT_MODULE_LOCATION+=("drivers/dahdi/")
-DEST_MODULE_LOCATION+=("/kernel/drivers/telephony/dahdi")
-
BUILT_MODULE_NAME+=("dahdi_dynamic")
BUILT_MODULE_LOCATION+=("drivers/dahdi/")
DEST_MODULE_LOCATION+=("/kernel/drivers/telephony/dahdi")
--
2.39.5
>From b40fc82008eec06508695498bfb2e50e304743d7 Mon Sep 17 00:00:00 2001
From: Andreas Beckmann <a...@debian.org>
Date: Tue, 25 Mar 2025 11:33:57 +0100
Subject: [PATCH 2/4] dkms.conf: declare BUILD_EXCLUSIVE_KERNEL_MIN="4.3"
---
debian/dkms.conf.in | 3 +++
1 file changed, 3 insertions(+)
diff --git a/debian/dkms.conf.in b/debian/dkms.conf.in
index 66d98ee..221b7af 100644
--- a/debian/dkms.conf.in
+++ b/debian/dkms.conf.in
@@ -3,6 +3,9 @@ PACKAGE_VERSION="#CVERSION#"
# PCI is required for most devices. USB is used by xpp/ and icE1usb.
BUILD_EXCLUSIVE_CONFIG="CONFIG_PCI CONFIG_USB"
+# strscpy() was introduced in Linux v4.3
+BUILD_EXCLUSIVE_KERNEL_MIN="4.3"
+
# 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)"
--
2.39.5
>From e8e034884318a39fe149b7d44e5c8510f0d2a53e Mon Sep 17 00:00:00 2001
From: Andreas Beckmann <a...@debian.org>
Date: Tue, 25 Mar 2025 11:49:45 +0100
Subject: [PATCH 3/4] timer_setup() was introduced in Linux v4.14
but with a slightly different interface than from Linux v4.15 onwards
---
debian/patches/1190-timer_setup.patch | 41 +++++++++++++++++++++++++++
debian/patches/series | 1 +
2 files changed, 42 insertions(+)
create mode 100644 debian/patches/1190-timer_setup.patch
diff --git a/debian/patches/1190-timer_setup.patch
b/debian/patches/1190-timer_setup.patch
new file mode 100644
index 0000000..23875d9
--- /dev/null
+++ b/debian/patches/1190-timer_setup.patch
@@ -0,0 +1,41 @@
+Author: Andreas Beckmann <a...@debian.org>
+Description: timer_setup() was introduced in Linux v4.14
+
+--- a/include/dahdi/kernel.h
++++ b/include/dahdi/kernel.h
+@@ -1410,7 +1410,16 @@ static inline short dahdi_txtone_nextsam
+ #define TIMER_DATA_TYPE unsigned long
+ #endif
+
+-#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 13, 0)
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 14, 0)
++
++/* timer_setup and friends in 4.14 had a slightly different interface than in
4.15+ */
++#define timer_setup(timer, callback, flags) __setup_timer((timer),
(TIMER_FUNC_TYPE)(callback), (TIMER_DATA_TYPE)(timer), (flags))
++#undef from_timer
++#define from_timer(var, callback_timer, timer_fieldname) \
++ container_of((struct timer_list *)(callback_timer), \
++ typeof(*var), timer_fieldname)
++
++#else
+
+ #ifdef RHEL_RELEASE_VERSION
+ #if RHEL_RELEASE_CODE > RHEL_RELEASE_VERSION(7, 5)
+@@ -1422,7 +1431,7 @@ static inline short dahdi_txtone_nextsam
+
+ #ifndef DAHDI_HAVE_TIMER_SETUP
+ /**
+- * timer_setup - Added in 4.13.0. We can make a direct translation to the
++ * timer_setup - Added in 4.14.0. We can make a direct translation to the
+ * setup_timer interface since DAHDI does not pass any flags to any of the
+ * timer_setup functions.
+ *
+@@ -1513,7 +1522,7 @@ static inline void *PDE_DATA(const struc
+ #endif /* 4.0.0 */
+ #endif /* 4.10.0 */
+ #endif /* 4.11.0 */
+-#endif /* 4.13.0 */
++#endif /* 4.14.0 */
+ #else /* >= 4.15.0 */
+
+ #ifndef TIMER_DATA_TYPE
diff --git a/debian/patches/series b/debian/patches/series
index 9de7885..02dbdbe 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -16,3 +16,4 @@
1160-inline-first.patch
1170-ascii-source.patch
1180-UBUNTU-SAUCE-linux-6.11-fix-MAX-redefinition-warning.patch
+1190-timer_setup.patch
--
2.39.5
>From 82e58be23b9c0f438a33649de022adbd522898bc Mon Sep 17 00:00:00 2001
From: Andreas Beckmann <a...@debian.org>
Date: Tue, 25 Mar 2025 12:02:25 +0100
Subject: [PATCH 4/4] dahdi-dkms: drop superfluous dependencies
---
debian/control | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/debian/control b/debian/control
index ef33f6c..a3fef46 100644
--- a/debian/control
+++ b/debian/control
@@ -43,7 +43,7 @@ Description: DAHDI telephony interface - source code for
kernel driver
Package: dahdi-dkms
Section: kernel
Architecture: all
-Depends: ${misc:Depends}, dkms (>= 2.8.4-3~), make, libc6-dev, dpkg-dev, gcc,
gawk
+Depends: ${misc:Depends},
Recommends: dahdi-linux
Description: DAHDI telephony interface (dkms kernel driver)
DAHDI (formerly Zaptel) is an interface for telephony devices used by e.g.
--
2.39.5
--- End Message ---
--- Begin Message ---
Source: dahdi-linux
Source-Version: 1:3.1.0+git20230717~dfsg-10.1
Done: Andreas Beckmann <a...@debian.org>
We believe that the bug you reported is fixed in the latest version of
dahdi-linux, which is due to be installed in the Debian FTP archive.
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to 1101...@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Andreas Beckmann <a...@debian.org> (supplier of updated dahdi-linux package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmas...@ftp-master.debian.org)
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
Format: 1.8
Date: Fri, 04 Apr 2025 09:39:52 +0200
Source: dahdi-linux
Architecture: source
Version: 1:3.1.0+git20230717~dfsg-10.1
Distribution: unstable
Urgency: medium
Maintainer: Debian VoIP Team <pkg-voip-maintain...@lists.alioth.debian.org>
Changed-By: Andreas Beckmann <a...@debian.org>
Closes: 1101409
Changes:
dahdi-linux (1:3.1.0+git20230717~dfsg-10.1) unstable; urgency=medium
.
[ Andreas Beckmann ]
* Non-maintainer upload.
* dkms.conf: Drop duplicate module. (Closes: #1101409)
* dkms.conf: Declare BUILD_EXCLUSIVE_KERNEL_MIN="4.3".
* timer_setup() was introduced in Linux v4.14.
* dahdi-dkms: Drop superfluous dependencies.
.
[ Victor Seva ]
* debian/gbp.conf: Switch to debian/latest upstream/latest for branches.
Checksums-Sha1:
b5618de2ca429287e560c3f636d0e2f3d8c031bd 2437
dahdi-linux_3.1.0+git20230717~dfsg-10.1.dsc
1b6af29dff88b913b4780f27825f96c62b60c831 52004
dahdi-linux_3.1.0+git20230717~dfsg-10.1.debian.tar.xz
774b575b7bfa12574d4db10c3c854c771efc8354 6301
dahdi-linux_3.1.0+git20230717~dfsg-10.1_source.buildinfo
Checksums-Sha256:
74c624c941eece5456455142d9abf058130e8c11dc5bb5638202a4fe2fb62223 2437
dahdi-linux_3.1.0+git20230717~dfsg-10.1.dsc
ccac2f2c088acdea96c9770e1867501e663a7700e99e79426cba18c2e33a775c 52004
dahdi-linux_3.1.0+git20230717~dfsg-10.1.debian.tar.xz
7fd7d831521365496601cf9608b66db9b00bf4cc76ed922d0cbec9dbe8864b12 6301
dahdi-linux_3.1.0+git20230717~dfsg-10.1_source.buildinfo
Files:
084e9ed28316b0f004240d8961e20c9d 2437 comm optional
dahdi-linux_3.1.0+git20230717~dfsg-10.1.dsc
6b8b7f2ae308b14cbbef908cf2060934 52004 comm optional
dahdi-linux_3.1.0+git20230717~dfsg-10.1.debian.tar.xz
755c2ea9162dad78cd514c221bcae781 6301 comm optional
dahdi-linux_3.1.0+git20230717~dfsg-10.1_source.buildinfo
-----BEGIN PGP SIGNATURE-----
iQJEBAEBCAAuFiEE6/MKMKjZxjvaRMaUX7M/k1np7QgFAmfvjkMQHGFuYmVAZGVi
aWFuLm9yZwAKCRBfsz+TWentCMynEACQrLDkGYeybgdGGkX3e5FWE8NmW8+j3Xyc
Nvlxnfe/XF5AStOxJbICS+1eLne5p6fUW6XBNOOOGuuAah/HaCAhWJfxFuATqPS9
Z7PJhi3PXzSamwUukp7a8+cWJ0EGvcwGN9y42W1SdyXW5bmsh76V769RP6Jxw7mE
J7AFdZVt2HPGiUf5ouyskkVJ1CJ47jSsBpAxxEaMfwfkDnTeSG6wEj4Q0wPCAPBL
BI6yg8Pk2zRSrtWhNJWYAEhWlkJa2fSX9OmwGnNj0I+ltE6ofrcy9eQxvBpmn1Nr
ArBCeyG7Co6WFF3U0PrfYFmjDEqndxzu4NVZqQqtvdlzaUmeNJ7WI7wwFSnrtoqk
dVQoDNsdq5snu2713lWfameGu1cqP36uLH646GQVIROMuSplAexsjuFc1CO6sDTf
UCsOA/BTraJjcinKCLHK20uiM7hMXbANWJrU0uzQCosubZQeW7DUvX8KTUnzPEMa
p2M+RUs8AL5oTWggNEdR/ZeMGS1wB2GDuGk+JMnnQAo2C9oBmOzw3p5qazDIQBUu
EyX4KjU8xyEduR8zDDPSyrTDmLQU6X1CF7K1xjt3oDxUtWdnGF+Hke4YgdAavt0S
TVrbby9Rse0O+1ge2zK9hYgggE8+7sm8fhUBpaJTutNmK0aPckqB85pQYLDw+j1h
wRzB4XJV/g==
=CbIK
-----END PGP SIGNATURE-----
pgpVM_JZ5_McZ.pgp
Description: PGP signature
--- End Message ---
