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

Bug#962306: buster-pu: package b43-fwcutter/1:019-4+deb10u1



Package: release.debian.org
Severity: normal
Tags: buster
User: release.debian.org@packages.debian.org
Usertags: pu

Hi,

I'd like to fix some bugs in b43-fwcutter with commits cherry-picked
from the package in sid:

  * Run firmware removal commands under LC_ALL=C.  (Closes: #960791)
    -> installation/upgrade/removal was failing under (some)
       non-English locales, e.g. de_*
  * Do not fail while removing no longer existing files.  (Closes: #956858)
    -> after such a failure, even retrying it under LC_ALL=C would not
       recover
  * Add dependency on pciutils for lspci.
    -> this is used in the postinst
  * Add ca-certificates to Depends so that we can download over https.
    -> the http download sites redirect to https URLs nowadays

The package is already uploaded.


Andreas
diff -Nru b43-fwcutter-019/debian/changelog b43-fwcutter-019/debian/changelog
--- b43-fwcutter-019/debian/changelog	2019-02-07 02:00:18.000000000 +0100
+++ b43-fwcutter-019/debian/changelog	2020-06-06 00:33:14.000000000 +0200
@@ -1,3 +1,16 @@
+b43-fwcutter (1:019-4+deb10u1) buster; urgency=medium
+
+  [ Andreas Beckmann ]
+  * QA upload.
+  * Run firmware removal commands under LC_ALL=C.  (Closes: #960791)
+  * Do not fail while removing no longer existing files.  (Closes: #956858)
+  * Add dependency on pciutils for lspci.
+
+  [ Raphaël Hertzog ]
+  * Add ca-certificates to Depends so that we can download over https.
+
+ -- Andreas Beckmann <anbe@debian.org>  Sat, 06 Jun 2020 00:33:14 +0200
+
 b43-fwcutter (1:019-4) unstable; urgency=medium
 
   [ Andreas Beckmann ]
diff -Nru b43-fwcutter-019/debian/control b43-fwcutter-019/debian/control
--- b43-fwcutter-019/debian/control	2019-02-07 02:00:18.000000000 +0100
+++ b43-fwcutter-019/debian/control	2020-06-06 00:33:14.000000000 +0200
@@ -28,7 +28,9 @@
 Architecture: all
 Depends:
  b43-fwcutter (>= ${source:Version}),
+ pciutils,
  bzip2,
+ ca-certificates,
  wget,
  ${misc:Depends},
 Replaces:
@@ -52,6 +54,8 @@
 Architecture: all
 Depends:
  b43-fwcutter (>= ${source:Version}),
+ pciutils,
+ ca-certificates,
  wget,
  ${misc:Depends},
 Description: firmware installer for the b43legacy driver
diff -Nru b43-fwcutter-019/debian/firmware-b43-installer.postinst b43-fwcutter-019/debian/firmware-b43-installer.postinst
--- b43-fwcutter-019/debian/firmware-b43-installer.postinst	2019-02-07 02:00:18.000000000 +0100
+++ b43-fwcutter-019/debian/firmware-b43-installer.postinst	2020-06-06 00:33:14.000000000 +0200
@@ -11,7 +11,7 @@
 
 DOWNLOAD="${BROADCOM_WL}.tar.bz2"
 
-URL="http://www.lwfinger.com/b43-firmware/${DOWNLOAD}";
+URL="https://www.lwfinger.com/b43-firmware/${DOWNLOAD}";
 
 SHA512SUM="02487e76e3eca7fe97ce2ad7dc9c5d39fac82b8d5f7786cce047f9c85e2426f5b7ea085d84c7d4aae43e0fe348d603e3229211bab601726794ef633441d37a8b"
 
@@ -61,7 +61,7 @@
 catalog="${FIRMWARE_INSTALL_DIR}/${B43}/firmware-${B43}-installer.catalog"
 if [ -f "${catalog}" ]; then
 	echo "$0: Deleting old extracted firmware..." 1>&2
-	xargs -r -0 -a "${catalog}" dpkg-query -S 2>&1 1>/dev/null | sed -es',[^/]\+,,' | xargs -r rm --
+	LC_ALL=C xargs -r -0 -a "${catalog}" dpkg-query -S 2>&1 1>/dev/null | sed -es',[^/]\+,,' | xargs -r rm -f --
 	rm "${catalog}"
 fi
 mkdir -p "${FIRMWARE_INSTALL_DIR}/${B43}"
diff -Nru b43-fwcutter-019/debian/firmware-b43-installer.prerm b43-fwcutter-019/debian/firmware-b43-installer.prerm
--- b43-fwcutter-019/debian/firmware-b43-installer.prerm	2019-02-07 02:00:18.000000000 +0100
+++ b43-fwcutter-019/debian/firmware-b43-installer.prerm	2020-06-06 00:33:14.000000000 +0200
@@ -15,7 +15,7 @@
 	catalog="${FIRMWARE_INSTALL_DIR}/${B43}/firmware-${B43}-installer.catalog"
 	if [ -f "${catalog}" ]; then
 		echo "$0: Deleting installed firmware..." 1>&2
-		xargs -r -0 -a "${catalog}" dpkg-query -S 2>&1 1>/dev/null | sed -es',[^/]\+,,' | xargs -r rm --
+		LC_ALL=C xargs -r -0 -a "${catalog}" dpkg-query -S 2>&1 1>/dev/null | sed -es',[^/]\+,,' | xargs -r rm -f --
 		rm "${catalog}"
 		rmdir --ignore-fail-on-non-empty "${FIRMWARE_INSTALL_DIR}/${B43}"
 	fi
diff -Nru b43-fwcutter-019/debian/firmware-b43legacy-installer.postinst b43-fwcutter-019/debian/firmware-b43legacy-installer.postinst
--- b43-fwcutter-019/debian/firmware-b43legacy-installer.postinst	2019-02-07 02:00:18.000000000 +0100
+++ b43-fwcutter-019/debian/firmware-b43legacy-installer.postinst	2020-06-06 00:33:14.000000000 +0200
@@ -11,7 +11,7 @@
 
 DOWNLOAD="${WL_APSTA}"
 
-URL="http://downloads.openwrt.org/sources/${WL_APSTA}";
+URL="https://downloads.openwrt.org/sources/${WL_APSTA}";
 
 SHA512SUM="d89ed52045307449bbae79a4d1807cc6cd89ae67c4a22e8e8aa51c1396edbb6ed8b157cd0756faf8b660a537b48b62117c57967f2048245b5b102d9d9bca4bbd"
 
@@ -61,7 +61,7 @@
 catalog="${FIRMWARE_INSTALL_DIR}/${B43}/firmware-${B43}-installer.catalog"
 if [ -f "${catalog}" ]; then
 	echo "$0: Deleting old extracted firmware..." 1>&2
-	xargs -r -0 -a "${catalog}" dpkg-query -S 2>&1 1>/dev/null | sed -es',[^/]\+,,' | xargs -r rm --
+	LC_ALL=C xargs -r -0 -a "${catalog}" dpkg-query -S 2>&1 1>/dev/null | sed -es',[^/]\+,,' | xargs -r rm -f --
 	rm "${catalog}"
 fi
 mkdir -p "${FIRMWARE_INSTALL_DIR}/${B43}"
diff -Nru b43-fwcutter-019/debian/firmware-b43legacy-installer.prerm b43-fwcutter-019/debian/firmware-b43legacy-installer.prerm
--- b43-fwcutter-019/debian/firmware-b43legacy-installer.prerm	2019-02-07 02:00:18.000000000 +0100
+++ b43-fwcutter-019/debian/firmware-b43legacy-installer.prerm	2020-06-06 00:33:14.000000000 +0200
@@ -15,7 +15,7 @@
 	catalog="${FIRMWARE_INSTALL_DIR}/${B43}/firmware-${B43}-installer.catalog"
 	if [ -f "${catalog}" ]; then
 		echo "$0: Deleting installed firmware..." 1>&2
-		xargs -r -0 -a "${catalog}" dpkg-query -S 2>&1 1>/dev/null | sed -es',[^/]\+,,' | xargs -r rm --
+		LC_ALL=C xargs -r -0 -a "${catalog}" dpkg-query -S 2>&1 1>/dev/null | sed -es',[^/]\+,,' | xargs -r rm -f --
 		rm "${catalog}"
 		rmdir --ignore-fail-on-non-empty "${FIRMWARE_INSTALL_DIR}/${B43}"
 	fi
diff -Nru b43-fwcutter-019/debian/gbp.conf b43-fwcutter-019/debian/gbp.conf
--- b43-fwcutter-019/debian/gbp.conf	1970-01-01 01:00:00.000000000 +0100
+++ b43-fwcutter-019/debian/gbp.conf	2020-06-06 00:33:14.000000000 +0200
@@ -0,0 +1,2 @@
+[DEFAULT]
+debian-branch = buster

Reply to: