Bug#717445: pu: package ndiswrapper/1.57-1+deb7u1
Package: release.debian.org
Severity: normal
Tags: wheezy
User: release.debian.org@packages.debian.org
Usertags: pu
Hi,
there are two bugs affecting ndiswrapper-dkms that should be fixed in
wheezy:
* the module fails to build for a kernel that is not running (#693638)
* dkms throws up during kernel upgrades (#690747)
The changes are cherry-picked from 1.58-1 and adjusted for 1.57.
I can do a NMU, but I'd prefer a maintainer upload fixing this.
@jak (Cc:ed): Shall I push my wheezy branch to the git repo?
Andreas
diff -Nru ndiswrapper-1.57/debian/changelog ndiswrapper-1.57/debian/changelog
--- ndiswrapper-1.57/debian/changelog 2012-03-05 16:49:17.000000000 +0100
+++ ndiswrapper-1.57/debian/changelog 2013-07-21 00:07:16.000000000 +0200
@@ -1,3 +1,13 @@
+ndiswrapper (1.57-1+deb7u1) wheezy; urgency=low
+
+ * Non-maintainer upload.
+ * Cherry-pick from 1.58-1:
+ - Use $KERNELRELEASE as target kernel version (Closes: #693638)
+ - Add BUILT_MODULE_NAME to dkms config file (Workaround for: #690747)
+ * ndiswrapper-use-KERNELRELEASE.patch: Adjust for 1.57.
+
+ -- Andreas Beckmann <anbe@debian.org> Sun, 21 Jul 2013 00:06:37 +0200
+
ndiswrapper (1.57-1) unstable; urgency=low
* Imported Upstream version 1.57
diff -Nru ndiswrapper-1.57/debian/ndiswrapper-dkms.dkms.in ndiswrapper-1.57/debian/ndiswrapper-dkms.dkms.in
--- ndiswrapper-1.57/debian/ndiswrapper-dkms.dkms.in 2012-03-05 16:49:17.000000000 +0100
+++ ndiswrapper-1.57/debian/ndiswrapper-dkms.dkms.in 2013-07-20 23:55:18.000000000 +0200
@@ -1,4 +1,5 @@
PACKAGE_NAME="ndiswrapper"
PACKAGE_VERSION="@VERSION@"
DEST_MODULE_LOCATION[0]="/updates"
+BUILT_MODULE_NAME[0]="ndiswrapper"
AUTOINSTALL="yes"
diff -Nru ndiswrapper-1.57/debian/patches/ndiswrapper-use-KERNELRELEASE.patch ndiswrapper-1.57/debian/patches/ndiswrapper-use-KERNELRELEASE.patch
--- ndiswrapper-1.57/debian/patches/ndiswrapper-use-KERNELRELEASE.patch 1970-01-01 01:00:00.000000000 +0100
+++ ndiswrapper-1.57/debian/patches/ndiswrapper-use-KERNELRELEASE.patch 2013-07-21 00:05:26.000000000 +0200
@@ -0,0 +1,22 @@
+From: Ben Hutchings <ben@decadent.org.uk>
+Subject: Use $KERNELRELEASE as target kernel version
+Bug-Debian: http://bugs.debian.org/693638
+
+We must not assume that the running kernel version is the target
+version! DKMS and later Kbuild set $KERNELRELEASE to be the target
+kernel version.
+
+--- a/driver/Makefile
++++ b/driver/Makefile
+@@ -12,7 +12,11 @@
+ # By default, we try to compile the modules for the currently running
+ # kernel. But it's the first approximation, as we will re-read the
+ # version from the kernel sources.
++ifeq (,$(KERNELRELEASE))
+ KVERS ?= $(shell uname -r)
++else
++KVERS ?= $(KERNELRELEASE)
++endif
+
+ # KBUILD is the path to the Linux kernel build tree. It is usually the
+ # same as the kernel source tree, except when the kernel was compiled in
diff -Nru ndiswrapper-1.57/debian/patches/series ndiswrapper-1.57/debian/patches/series
--- ndiswrapper-1.57/debian/patches/series 2012-03-05 16:49:17.000000000 +0100
+++ ndiswrapper-1.57/debian/patches/series 2013-07-20 23:55:18.000000000 +0200
@@ -1 +1,2 @@
ndiswrapper-harden.patch
+ndiswrapper-use-KERNELRELEASE.patch
Reply to: