diff -Nru foo2zjs-20200505dfsg0/debian/NEWS foo2zjs-20200505dfsg0/debian/NEWS --- foo2zjs-20200505dfsg0/debian/NEWS 2021-09-06 18:30:27.000000000 +0000 +++ foo2zjs-20200505dfsg0/debian/NEWS 2024-04-10 21:38:27.000000000 +0000 @@ -1,3 +1,21 @@ +foo2zjs (20200505dfsg0-2ubuntu6) noble; urgency=medium + + We use /var/lib/foo2zjs/firmware/ as directory for firmware files + from now on. /lib/firmware/ is only for firmware files managed by + the kernel and therefore on classic Ubuntu installations using a + snapped kernel (Currently Noble with TPM-backed FDE) it is not even + accessible for the system (LP: #2060814). + + Firmware files will get moved from the old directories automatically + during installation. Only exception is an update to Noble (24.04 + LTS) with TPM-backed FDE, here you need to re-download your firmware + files (or better, use your HP LaserJet printers with the HPLIP + Printer Application from the Snap Store, once you download the + proprietary plugin, it manages the firmware and needed updates fully + automatically). + + -- Till Kamppeter Wed, 10 Apr 2024 23:38:27 +0200 + foo2zjs (20200505dfsg0-2ubuntu1) impish; urgency=medium Update: Patch for links in getweb script replaced by one to switch diff -Nru foo2zjs-20200505dfsg0/debian/changelog foo2zjs-20200505dfsg0/debian/changelog --- foo2zjs-20200505dfsg0/debian/changelog 2024-03-31 08:53:41.000000000 +0000 +++ foo2zjs-20200505dfsg0/debian/changelog 2024-04-10 21:38:27.000000000 +0000 @@ -1,3 +1,13 @@ +foo2zjs (20200505dfsg0-2ubuntu6) noble; urgency=low + + * Use /var/lib/foo2zjs/firmware/ as directory for firmware files. + /lib/firmware/ is only for firmware files managed by the kernel and + therefore on classic Ubuntu installations using a snapped kernel + (Currently Noble with TPM-backed FDE) it is not even accessible + for the system (LP: #2060814). + + -- Till Kamppeter Wed, 10 Apr 2024 23:38:27 +0200 + foo2zjs (20200505dfsg0-2ubuntu5) noble; urgency=medium * No-change rebuild for CVE-2024-3094 diff -Nru foo2zjs-20200505dfsg0/debian/patches/0012-Use-the-same-firmware-folder-for-all-HP-LJ-printers.patch foo2zjs-20200505dfsg0/debian/patches/0012-Use-the-same-firmware-folder-for-all-HP-LJ-printers.patch --- foo2zjs-20200505dfsg0/debian/patches/0012-Use-the-same-firmware-folder-for-all-HP-LJ-printers.patch 2021-09-04 06:56:18.000000000 +0000 +++ foo2zjs-20200505dfsg0/debian/patches/0012-Use-the-same-firmware-folder-for-all-HP-LJ-printers.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,96 +0,0 @@ -From: Didier Raboud -Date: Tue, 4 Oct 2016 11:43:55 +0200 -Subject: Use the same firmware folder for all HP LJ printers - ---- - hplj1000 | 6 ------ - hplj10xx.conf | 10 +++++----- - 2 files changed, 5 insertions(+), 11 deletions(-) - -diff --git a/hplj1000 b/hplj1000 -index bb87a79..2f22631 100755 ---- a/hplj1000 -+++ b/hplj1000 -@@ -90,37 +90,31 @@ case "$0" in - MODEL=P1005; FWMODEL=$MODEL - USB1=0x03f0 #Vendor - USB2=0x3d17 #Model -- FWDIR=/usr/share/foo2xqx/firmware - ;; - *P1006) - MODEL=P1006; FWMODEL=$MODEL - USB1=0x03f0 #Vendor - USB2=0x3e17 #Model -- FWDIR=/usr/share/foo2xqx/firmware - ;; - *P1007) - MODEL=P1007; FWMODEL=P1005 # Alias - USB1=0x03f0 #Vendor - USB2=0x4817 #Model -- FWDIR=/usr/share/foo2xqx/firmware - ;; - *P1008) - MODEL=P1008; FWMODEL=P1006 # Alias - USB1=0x03f0 #Vendor - USB2=0x4917 #Model -- FWDIR=/usr/share/foo2xqx/firmware - ;; - *P1505) - MODEL=P1505; FWMODEL=$MODEL - USB1=0x03f0 #Vendor - USB2=0x3f17 #Model -- FWDIR=/usr/share/foo2xqx/firmware - ;; - *P1505n) - MODEL=P1505n; FWMODEL=$MODEL - USB1=0x03f0 #Vendor - USB2=0x4017 #Model -- FWDIR=/usr/share/foo2xqx/firmware - ;; - *1000) - MODEL=1000; FWMODEL=$MODEL -diff --git a/hplj10xx.conf b/hplj10xx.conf -index a2083bb..fe32eea 100644 ---- a/hplj10xx.conf -+++ b/hplj10xx.conf -@@ -15,35 +15,35 @@ - attach 100 { - match "vendor" "0x03f0"; - match "product" "0x3d17"; -- action "cat /usr/share/foo2xqx/firmware/sihpP1005.dl > /dev/$device-name"; -+ action "cat /lib/firmware/hp/sihpP1005.dl > /dev/$device-name"; - }; - - # Firmware download HP LaserJet P1006 printer - attach 100 { - match "vendor" "0x03f0"; - match "product" "0x3e17"; -- action "cat /usr/share/foo2xqx/firmware/sihpP1006.dl > /dev/$device-name"; -+ action "cat /lib/firmware/hp/sihpP1006.dl > /dev/$device-name"; - }; - - # Firmware download HP LaserJet P1007 printer - attach 100 { - match "vendor" "0x03f0"; - match "product" "0x4817"; -- action "cat /usr/share/foo2xqx/firmware/sihpP1005.dl > /dev/$device-name"; -+ action "cat /lib/firmware/hp/sihpP1005.dl > /dev/$device-name"; - }; - - # Firmware download HP LaserJet P1008 printer - attach 100 { - match "vendor" "0x03f0"; - match "product" "0x4917"; -- action "cat /usr/share/foo2xqx/firmware/sihpP1006.dl > /dev/$device-name"; -+ action "cat /lib/firmware/hp/sihpP1006.dl > /dev/$device-name"; - }; - - # Firmware download HP LaserJet P1505 printer - attach 100 { - match "vendor" "0x03f0"; - match "product" "0x3f17"; -- action "cat /usr/share/foo2xqx/firmware/sihpP1505.dl > /dev/$device-name"; -+ action "cat /lib/firmware/hp/sihpP1505.dl > /dev/$device-name"; - }; - - # Firmware download HP LaserJet 1000 printer diff -Nru foo2zjs-20200505dfsg0/debian/patches/0012-firmware-dir-in-var-closes-517957-and-allows-kernel-snap.patch foo2zjs-20200505dfsg0/debian/patches/0012-firmware-dir-in-var-closes-517957-and-allows-kernel-snap.patch --- foo2zjs-20200505dfsg0/debian/patches/0012-firmware-dir-in-var-closes-517957-and-allows-kernel-snap.patch 1970-01-01 00:00:00.000000000 +0000 +++ foo2zjs-20200505dfsg0/debian/patches/0012-firmware-dir-in-var-closes-517957-and-allows-kernel-snap.patch 2024-04-10 21:32:12.000000000 +0000 @@ -0,0 +1,164 @@ +--- a/arm2hpdl.1in ++++ b/arm2hpdl.1in +@@ -31,7 +31,7 @@ + + .SH FILES + .BR /usr/bin/arm2hpdl, +-.BR /usr/share/foo2*/firmware/ ++.BR /var/lib/foo2zjs/firmware/* + .SH SEE ALSO + .BR foo2zjs (1) + .SH "AUTHOR" +--- a/getweb.in ++++ b/getweb.in +@@ -127,7 +127,7 @@ + putfw() { + inputname=$1 + outputname=$2 +- $ARM2HPDL $inputname > /usr/share/foo2zjs/firmware/$outputname ++ $ARM2HPDL $inputname > /var/lib/foo2zjs/firmware/$outputname + rm $inputname + } + +--- a/hplj1000 ++++ b/hplj1000 +@@ -48,7 +48,7 @@ + # + # Directory to find downloadable HP firmware files sihpMMMM.dl + # +-FWDIR=/usr/share/foo2zjs/firmware ++FWDIR=/var/lib/foo2zjs/firmware + + # + # Program used to determine USB printer id information +@@ -90,37 +90,31 @@ + MODEL=P1005; FWMODEL=$MODEL + USB1=0x03f0 #Vendor + USB2=0x3d17 #Model +- FWDIR=/usr/share/foo2xqx/firmware + ;; + *P1006) + MODEL=P1006; FWMODEL=$MODEL + USB1=0x03f0 #Vendor + USB2=0x3e17 #Model +- FWDIR=/usr/share/foo2xqx/firmware + ;; + *P1007) + MODEL=P1007; FWMODEL=P1005 # Alias + USB1=0x03f0 #Vendor + USB2=0x4817 #Model +- FWDIR=/usr/share/foo2xqx/firmware + ;; + *P1008) + MODEL=P1008; FWMODEL=P1006 # Alias + USB1=0x03f0 #Vendor + USB2=0x4917 #Model +- FWDIR=/usr/share/foo2xqx/firmware + ;; + *P1505) + MODEL=P1505; FWMODEL=$MODEL + USB1=0x03f0 #Vendor + USB2=0x3f17 #Model +- FWDIR=/usr/share/foo2xqx/firmware + ;; + *P1505n) + MODEL=P1505n; FWMODEL=$MODEL + USB1=0x03f0 #Vendor + USB2=0x4017 #Model +- FWDIR=/usr/share/foo2xqx/firmware + ;; + *1000) + MODEL=1000; FWMODEL=$MODEL +--- a/hplj10xx.conf ++++ b/hplj10xx.conf +@@ -15,61 +15,61 @@ + attach 100 { + match "vendor" "0x03f0"; + match "product" "0x3d17"; +- action "cat /usr/share/foo2xqx/firmware/sihpP1005.dl > /dev/$device-name"; ++ action "cat /var/lib/foo2zjs/firmware/sihpP1005.dl > /dev/$device-name"; + }; + + # Firmware download HP LaserJet P1006 printer + attach 100 { + match "vendor" "0x03f0"; + match "product" "0x3e17"; +- action "cat /usr/share/foo2xqx/firmware/sihpP1006.dl > /dev/$device-name"; ++ action "cat /var/lib/foo2zjs/firmware/sihpP1006.dl > /dev/$device-name"; + }; + + # Firmware download HP LaserJet P1007 printer + attach 100 { + match "vendor" "0x03f0"; + match "product" "0x4817"; +- action "cat /usr/share/foo2xqx/firmware/sihpP1005.dl > /dev/$device-name"; ++ action "cat /var/lib/foo2zjs/firmware/sihpP1005.dl > /dev/$device-name"; + }; + + # Firmware download HP LaserJet P1008 printer + attach 100 { + match "vendor" "0x03f0"; + match "product" "0x4917"; +- action "cat /usr/share/foo2xqx/firmware/sihpP1006.dl > /dev/$device-name"; ++ action "cat /var/lib/foo2zjs/firmware/sihpP1006.dl > /dev/$device-name"; + }; + + # Firmware download HP LaserJet P1505 printer + attach 100 { + match "vendor" "0x03f0"; + match "product" "0x3f17"; +- action "cat /usr/share/foo2xqx/firmware/sihpP1505.dl > /dev/$device-name"; ++ action "cat /var/lib/foo2zjs/firmware/sihpP1505.dl > /dev/$device-name"; + }; + + # Firmware download HP LaserJet 1000 printer + attach 100 { + match "vendor" "0x03f0"; + match "product" "0x0517"; +- action "cat /usr/share/foo2zjs/firmware/sihp1000.dl > /dev/$device-name"; ++ action "cat /var/lib/foo2zjs/firmware/sihp1000.dl > /dev/$device-name"; + }; + + # Firmware download HP LaserJet 1005 printer + attach 100 { + match "vendor" "0x03f0"; + match "product" "0x1317"; +- action "cat /usr/share/foo2zjs/firmware/sihp1005.dl > /dev/$device-name"; ++ action "cat /var/lib/foo2zjs/firmware/sihp1005.dl > /dev/$device-name"; + }; + + # Firmware download HP LaserJet 1018 printer + attach 100 { + match "vendor" "0x03f0"; + match "product" "0x4117"; +- action "cat /usr/share/foo2zjs/firmware/sihp1018.dl > /dev/$device-name"; ++ action "cat /var/lib/foo2zjs/firmware/sihp1018.dl > /dev/$device-name"; + }; + + # Firmware download HP LaserJet 1020 printer + attach 100 { + match "vendor" "0x03f0"; + match "product" "0x2b17"; +- action "cat /usr/share/foo2zjs/firmware/sihp1020.dl > /dev/$device-name"; ++ action "cat /var/lib/foo2zjs/firmware/sihp1020.dl > /dev/$device-name"; + }; +--- a/usb_printerid.1in ++++ b/usb_printerid.1in +@@ -26,7 +26,7 @@ + MFG:Hewlett-Packard;MDL:HP LaserJet 1020;CMD:ACL;CLS:PRINTER;\e + DES:HP LaserJet 1020; + +-# cp /usr/share/foo2zjs/firmware/sihp1020.dl /dev/usb/lp0 ++# cp /var/lib/foo2zjs/firmware/sihp1020.dl /dev/usb/lp0 + + # usb_printerid /dev/usb/lp0 + GET_DEVICE_ID string: +@@ -37,7 +37,7 @@ + + .SH FILES + .BR /usr/bin/usb_printerid, +-.BR /usr/share/foo2*/firmware/* ++.BR /var/lib/foo2zjs/firmware/* + .SH SEE ALSO + .BR arm2hpdl (1) + .SH "AUTHOR" diff -Nru foo2zjs-20200505dfsg0/debian/patches/0013-Firmware-directory-is-lib-firmware-hp-Closes-517957.patch foo2zjs-20200505dfsg0/debian/patches/0013-Firmware-directory-is-lib-firmware-hp-Closes-517957.patch --- foo2zjs-20200505dfsg0/debian/patches/0013-Firmware-directory-is-lib-firmware-hp-Closes-517957.patch 2021-09-04 06:56:19.000000000 +0000 +++ foo2zjs-20200505dfsg0/debian/patches/0013-Firmware-directory-is-lib-firmware-hp-Closes-517957.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,72 +0,0 @@ -From: Didier Raboud -Date: Tue, 4 Oct 2016 11:43:56 +0200 -Subject: Firmware directory is /lib/firmware/hp/ (Closes: #517957) - ---- - arm2hpdl.1in | 2 +- - getweb.in | 2 +- - hplj1000 | 2 +- - usb_printerid.1in | 4 ++-- - 4 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/arm2hpdl.1in b/arm2hpdl.1in -index 213d21b..33e6ccd 100644 ---- a/arm2hpdl.1in -+++ b/arm2hpdl.1in -@@ -31,7 +31,7 @@ $ arm2hpdl sihp1005.img > sihp1005.dl - - .SH FILES - .BR /usr/bin/arm2hpdl, --.BR /usr/share/foo2*/firmware/ -+.BR /lib/firmware/hp/* - .SH SEE ALSO - .BR foo2zjs (1) - .SH "AUTHOR" -diff --git a/getweb.in b/getweb.in -index 11f2aa6..3322de6 100755 ---- a/getweb.in -+++ b/getweb.in -@@ -127,7 +127,7 @@ fi - putfw() { - inputname=$1 - outputname=$2 -- $ARM2HPDL $inputname > /usr/share/foo2zjs/firmware/$outputname -+ $ARM2HPDL $inputname > /lib/firmware/hp/$outputname - rm $inputname - } - -diff --git a/hplj1000 b/hplj1000 -index 2f22631..21ca570 100755 ---- a/hplj1000 -+++ b/hplj1000 -@@ -48,7 +48,7 @@ USB_BACKEND=/usr/lib/cups/backend/usb - # - # Directory to find downloadable HP firmware files sihpMMMM.dl - # --FWDIR=/usr/share/foo2zjs/firmware -+FWDIR=/lib/firmware/hp - - # - # Program used to determine USB printer id information -diff --git a/usb_printerid.1in b/usb_printerid.1in -index 0454ef6..34817e4 100644 ---- a/usb_printerid.1in -+++ b/usb_printerid.1in -@@ -26,7 +26,7 @@ GET_DEVICE_ID string: - MFG:Hewlett-Packard;MDL:HP LaserJet 1020;CMD:ACL;CLS:PRINTER;\e - DES:HP LaserJet 1020; - --# cp /usr/share/foo2zjs/firmware/sihp1020.dl /dev/usb/lp0 -+# cp /lib/firmware/hp/sihp1020.dl /dev/usb/lp0 - - # usb_printerid /dev/usb/lp0 - GET_DEVICE_ID string: -@@ -37,7 +37,7 @@ DES:HP LaserJet 1020;FWVER:20050309; - - .SH FILES - .BR /usr/bin/usb_printerid, --.BR /usr/share/foo2*/firmware/* -+.BR /lib/firmware/hp/* - .SH SEE ALSO - .BR arm2hpdl (1) - .SH "AUTHOR" diff -Nru foo2zjs-20200505dfsg0/debian/patches/series foo2zjs-20200505dfsg0/debian/patches/series --- foo2zjs-20200505dfsg0/debian/patches/series 2021-09-06 18:23:15.000000000 +0000 +++ foo2zjs-20200505dfsg0/debian/patches/series 2024-04-10 21:38:27.000000000 +0000 @@ -9,8 +9,7 @@ 0009-Launch-the-_gui.tcl-directly-instead-of-launching-wi.patch 0010-Correct-the-path-for-the-usb_printerid-program.patch 0011-Improve-getweb-also-for-installing-the-firmware.patch -0012-Use-the-same-firmware-folder-for-all-HP-LJ-printers.patch -0013-Firmware-directory-is-lib-firmware-hp-Closes-517957.patch +0012-firmware-dir-in-var-closes-517957-and-allows-kernel-snap.patch 0014-Don-t-delete-printer-profile-in-clean-target.patch 0015-Fixes-errors-and-hyphen-as-minus-in-manpages.patch 0016-Fix-various-spelling-errors.patch diff -Nru foo2zjs-20200505dfsg0/debian/printer-driver-foo2zjs.dirs foo2zjs-20200505dfsg0/debian/printer-driver-foo2zjs.dirs --- foo2zjs-20200505dfsg0/debian/printer-driver-foo2zjs.dirs 2021-09-04 06:56:18.000000000 +0000 +++ foo2zjs-20200505dfsg0/debian/printer-driver-foo2zjs.dirs 2024-04-10 21:19:05.000000000 +0000 @@ -1 +1 @@ -/lib/firmware/hp/ +/var/lib/foo2zjs/firmware/ diff -Nru foo2zjs-20200505dfsg0/debian/printer-driver-foo2zjs.postinst foo2zjs-20200505dfsg0/debian/printer-driver-foo2zjs.postinst --- foo2zjs-20200505dfsg0/debian/printer-driver-foo2zjs.postinst 2021-09-04 06:56:18.000000000 +0000 +++ foo2zjs-20200505dfsg0/debian/printer-driver-foo2zjs.postinst 2024-04-10 21:37:03.000000000 +0000 @@ -5,7 +5,10 @@ if [ "$1" = configure ]; then # Move user-downloaded firmware files if ls /usr/share/foo2zjs/firmware/*.dl >/dev/null 2>/dev/null; then - mv /usr/share/foo2zjs/firmware/*.dl /lib/firmware/hp/ 2>/dev/null + mv /usr/share/foo2zjs/firmware/*.dl /var/lib/foo2zjs/firmware/ 2>/dev/null + fi + if ls /lib/firmware/hp/*.dl >/dev/null 2>/dev/null; then + mv /lib/firmware/hp/*.dl /var/lib/foo2zjs/firmware/ 2>/dev/null fi fi