[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#682554: marked as done (unblock: dkms/2.2.0.3-1.1)

Your message dated Sun, 12 Aug 2012 22:47:34 +0100
with message-id <1344808054.2978.98.camel@jacala.jungle.funky-badger.org>
and subject line Re: Bug#682554: unblock: dkms/2.2.0.3-1.1
has caused the Debian Bug report #682554,
regarding unblock: dkms/2.2.0.3-1.1
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 owner@bugs.debian.org
immediately.)


-- 
682554: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=682554
Debian Bug Tracking System
Contact owner@bugs.debian.org with problems
--- Begin Message --- 
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock

Please unblock package dkms

My NMU dkms 2.2.0.3-1.1 fixes two bugs:
  #666023 (serious): /usr/lib/dkms/common.postinst fails if /lib/modules
                     does not exist
  #657145 (important): leaves unowned empty directores, e.g.
                       /lib/modules/$KVERS/updates, after removal

unblock dkms/2.2.0.3-1.1


Regards,

Andreas

diff -Nru dkms-2.2.0.3/debian/changelog dkms-2.2.0.3/debian/changelog
--- dkms-2.2.0.3/debian/changelog	2011-12-07 20:30:49.000000000 +0100
+++ dkms-2.2.0.3/debian/changelog	2012-07-19 22:21:01.000000000 +0200
@@ -1,3 +1,11 @@
+dkms (2.2.0.3-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Do not fail if /lib/modules does not exist.  (Closes: #666023)
+  * Remove the directory where the module was installed.  (Closes: #657145)
+
+ -- Andreas Beckmann <debian@abeckmann.de>  Thu, 19 Jul 2012 22:20:45 +0200
+
 dkms (2.2.0.3-1) unstable; urgency=low
 
   * [e24a52f] Imported Upstream version 2.2.0.3
diff -Nru dkms-2.2.0.3/debian/patches/657145.patch dkms-2.2.0.3/debian/patches/657145.patch
--- dkms-2.2.0.3/debian/patches/657145.patch	1970-01-01 01:00:00.000000000 +0100
+++ dkms-2.2.0.3/debian/patches/657145.patch	2012-07-19 22:21:01.000000000 +0200
@@ -0,0 +1,21 @@
+From: Andreas Beckmann <debian@abeckmann.de>
+Subject: remove the directory where the module was installed
+ after removing a module try to remove the path (below
+ /lib/modules/KVERS) were the module was installed to cleanup any
+ remaining empty directories
+Bug-Debian: http://bugs.debian.org/657145
+
+diff --git a/dkms b/dkms
+index 042acc0..c96cd8f 100644
+--- a/dkms
++++ b/dkms
+@@ -1579,6 +1579,9 @@ do_uninstall()
+ 	    echo $" - Uninstallation"
+ 	    echo $"   - Deleting from: $install_tree/$1${real_dest_module_location}/"
+ 	    rm -f "$install_tree/$1${real_dest_module_location}/${dest_module_name[$count]}$module_suffix"
++	    dir_to_remove="${real_dest_module_location#/}"
++	    while [ "${dir_to_remove}" != "${dir_to_remove#/}" ]; do dir_to_remove="${dir_to_remove#/}" ; done
++	    (cd "$install_tree/$1" && rmdir --parents --ignore-fail-on-non-empty "${dir_to_remove}" || true)
+ 	    echo $" - Original module"
+ 	    if [[ -e $dkms_tree/$module/original_module/$1/$2/${dest_module_name[$count]}$module_suffix ]]; then
+ 		case "$running_distribution" in
diff -Nru dkms-2.2.0.3/debian/patches/666023.patch dkms-2.2.0.3/debian/patches/666023.patch
--- dkms-2.2.0.3/debian/patches/666023.patch	1970-01-01 01:00:00.000000000 +0100
+++ dkms-2.2.0.3/debian/patches/666023.patch	2012-07-19 22:21:01.000000000 +0200
@@ -0,0 +1,17 @@
+From: Andreas Beckmann <debian@abeckmann.de>
+Subject: do not fail if /lib/modules does not exist
+Bug-Debian: http://bugs.debian.org/666023
+
+diff --git a/dkms_common.postinst b/dkms_common.postinst
+index d8cf3a7..0c8cfc1 100644
+--- a/dkms_common.postinst
++++ b/dkms_common.postinst
+@@ -146,7 +146,7 @@ if [ -z "$NAME" ] || [ -z "$VERSION" ]; then
+     exit 1
+ fi
+ 
+-KERNELS=$(ls /lib/modules/)
++KERNELS=$(ls /lib/modules/ 2>/dev/null || true)
+ CURRENT_KERNEL=$(uname -r)
+ 
+ #We never want to keep an older version side by side to prevent conflicts
diff -Nru dkms-2.2.0.3/debian/patches/series dkms-2.2.0.3/debian/patches/series
--- dkms-2.2.0.3/debian/patches/series	2011-12-07 20:30:49.000000000 +0100
+++ dkms-2.2.0.3/debian/patches/series	2012-07-19 22:21:01.000000000 +0200
@@ -0,0 +1,2 @@
+666023.patch
+657145.patch

--- End Message ---
--- Begin Message --- 
On Mon, 2012-07-23 at 18:41 +0200, Andreas Beckmann wrote:
> Please unblock package dkms
> 
> My NMU dkms 2.2.0.3-1.1 fixes two bugs:
>   #666023 (serious): /usr/lib/dkms/common.postinst fails if /lib/modules
>                      does not exist
>   #657145 (important): leaves unowned empty directores, e.g.
>                        /lib/modules/$KVERS/updates, after removal

Unblocked; thanks.

Regards,

Adam

--- End Message ---
Reply to: