Your message dated Sat, 13 Sep 2025 21:54:00 +0000
with message-id <[email protected]>
and subject line Bug#1102475: fixed in osmocom-dahdi-linux
0.0~git20250226.6dada77-1
has caused the Debian Bug report #1102475,
regarding osmocom-dahdi-linux: dkms updates to sync with src:dahdi-linux
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 [email protected]
immediately.)
--
1102475: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1102475
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Source: osmocom-dahdi-linux
Version: 0.0~git20241003.b2ea348-4
Severity: normal
Tags: patch
Hi,
I'm attaching two patches to synchronize the -dkms package with
src:dahdi-linux s.t. both support the same range of kernel versions.
Andreas
>From a224d0512d73a1d72136d3ddf4fbdfd32fcd89ee Mon Sep 17 00:00:00 2001
From: Andreas Beckmann <[email protected]>
Date: Sat, 5 Apr 2025 00:14:54 +0200
Subject: [PATCH 1/2] import 1190-timer_setup.patch from src:dahdi-linux
---
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 <[email protected]>
+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 5e32499..7076dd7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
#dahdi_dummy_removed_comment.patch
no_firmware_download.patch
recode-to-utf8.patch
+1190-timer_setup.patch
--
2.39.5
>From 4649c0b62be36717cff2771eac6381af38c37330 Mon Sep 17 00:00:00 2001
From: Andreas Beckmann <[email protected]>
Date: Sat, 5 Apr 2025 00:15:25 +0200
Subject: [PATCH 2/2] dkms.conf: relax to BUILD_EXCLUSIVE_KERNEL_MIN="4.3"
---
debian/osmocom-dahdi-dkms.dkms | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/debian/osmocom-dahdi-dkms.dkms b/debian/osmocom-dahdi-dkms.dkms
index aabda02..f1523d6 100644
--- a/debian/osmocom-dahdi-dkms.dkms
+++ b/debian/osmocom-dahdi-dkms.dkms
@@ -1,8 +1,8 @@
PACKAGE_NAME="osmocom-dahdi"
PACKAGE_VERSION="#MODULE_VERSION#"
-# the API of timer_setup() and friends
-BUILD_EXCLUSIVE_KERNEL_MIN="4.15"
+# strscpy() was introduced in Linux v4.3
+BUILD_EXCLUSIVE_KERNEL_MIN="4.3"
# CONFIG_DAHDI_PPP is enabled unconditionally
# hdlc_open() and friends are used unconditionally
--
2.39.5
--- End Message ---
--- Begin Message ---
Source: osmocom-dahdi-linux
Source-Version: 0.0~git20250226.6dada77-1
Done: Thorsten Alteholz <[email protected]>
We believe that the bug you reported is fixed in the latest version of
osmocom-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 [email protected],
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Thorsten Alteholz <[email protected]> (supplier of updated osmocom-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 [email protected])
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512
Format: 1.8
Date: Sat, 13 Sep 2025 08:10:34 +0000
Source: osmocom-dahdi-linux
Architecture: source
Version: 0.0~git20250226.6dada77-1
Distribution: unstable
Urgency: medium
Maintainer: Debian Mobcom Maintainers
<[email protected]>
Changed-By: Thorsten Alteholz <[email protected]>
Closes: 1102475 1106552
Changes:
osmocom-dahdi-linux (0.0~git20250226.6dada77-1) unstable; urgency=medium
.
* New upstream release. (Closes: #1106552)
* debian/control: bump standard to 4.7.2 (no changes)
* add debian/gbp.conf
* add 1190-timer_setup.patch to sync with dahdi-linux
(Closes: #1102475)
(thanks a lot to Andreas Beckmann)
Checksums-Sha1:
a169f2999ff604f93106d13cfb2ba009a629a183 2589
osmocom-dahdi-linux_0.0~git20250226.6dada77-1.dsc
beec1fd90cd8bf2fcc744f963874516c4d208896 1227584
osmocom-dahdi-linux_0.0~git20250226.6dada77.orig.tar.xz
86714cc3e19047d59b97edd53c6dec4c9304fc7b 8252
osmocom-dahdi-linux_0.0~git20250226.6dada77-1.debian.tar.xz
e55752cf3666e1c006964c4904ae91a3402e55c1 6897
osmocom-dahdi-linux_0.0~git20250226.6dada77-1_amd64.buildinfo
Checksums-Sha256:
728686356ae52cea612284a987bf2895d2757a3aab75ce45eb37c3496622e15c 2589
osmocom-dahdi-linux_0.0~git20250226.6dada77-1.dsc
21682d49cf17700830fa91d715f68155739c6c05f8f10b558297ef36dd659622 1227584
osmocom-dahdi-linux_0.0~git20250226.6dada77.orig.tar.xz
bc8af2668c0889e6fe117cf119553e5394217f3c9e972107a5dcbd28d482e1b2 8252
osmocom-dahdi-linux_0.0~git20250226.6dada77-1.debian.tar.xz
b6330919043864609dab6681c433a400d7658548b17969c9238ebea38662ad46 6897
osmocom-dahdi-linux_0.0~git20250226.6dada77-1_amd64.buildinfo
Files:
9d90e4b34848440015f1ef16bbcdb233 2589 comm optional
osmocom-dahdi-linux_0.0~git20250226.6dada77-1.dsc
83b29f8b678a8c2ad1affc161de1daf2 1227584 comm optional
osmocom-dahdi-linux_0.0~git20250226.6dada77.orig.tar.xz
bef2c84001e95e8d144fbe580ef56014 8252 comm optional
osmocom-dahdi-linux_0.0~git20250226.6dada77-1.debian.tar.xz
c9771e073c02b6d70d786925699292c0 6897 comm optional
osmocom-dahdi-linux_0.0~git20250226.6dada77-1_amd64.buildinfo
-----BEGIN PGP SIGNATURE-----
iQKnBAEBCgCRFiEEYgH7/9u94Hgi6ruWlvysDTh7WEcFAmjFLe1fFIAAAAAALgAo
aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDYy
MDFGQkZGREJCREUwNzgyMkVBQkI5Njk2RkNBQzBEMzg3QjU4NDcTHGRlYmlhbkBh
bHRlaG9sei5kZQAKCRCW/KwNOHtYR1MED/9DeTLRrwuLInUqWewfL+YUwBfPCF8B
wuCFSc8q97F6bU1/EM1lq7rDc3xWyaG6hmBQeyPwK0HYT/aDAcV202HujGgOmfS7
ydfxKQFZnQTI4gqxOsdRJa6OIoRBuymJGjYkg0YDKNCFBdxpBnklOcr+IsGilwPr
FOgfIRNUQDJNx++pYc0iqG5+g1wdxHDAhEqvQa/bHeeDT6PzIIWESKiguNcJ1tCC
ksvNZ55VmWHLCQzNAgqxZUAZWzxchSSr73kFMfRZ+wHQDckNu8CNMejQ8s70WpBH
l/BwmoKlSMenmYCpLVpQCxQKxxrKsr2gyC2eH1NF0uBw0Yl+sqXhVLVi1enyXEY+
eAMrVZkn09zGg7FOHETU+4+Fh7wKI0HRNrKFiHmwH7mr8pTLLltqUbai/4QqikiH
yo6eHpbGgxyu3TkwfTu23XmRZXEFT/+5O17wLw+1Anzi9dSksN4vnJFTlWWZ18DY
qg3lOp5PHeU8avpgRQ7u63sk4DJ92NPHGjx8imIkYK2Rwip5sQCM6lj0O1Y4F0r0
hBCw1YxF/Vm2/EHojODqoEU+tUCUKH1MpU9LJzIN+ILMXl08yYzF7gUbQhXbJAno
okOeQlOfLZ47pxxOqWGxBm6byPhZbnPhjsQRCjHgBWVJOf+B/wbS3whWUGa5S2ph
Q0yKFRRfx85fSQ==
=npw2
-----END PGP SIGNATURE-----
pgp9xjeXxzXOx.pgp
Description: PGP signature
--- End Message ---
