Merge pull request #10599 from suvari/master
cups-filters, hplip: rebuild
This commit is contained in:
Kamil ATLI
GitHub
@@ -40,9 +40,9 @@
|
||||
<Dependency>openldap-client</Dependency>
|
||||
<Dependency>avahi-devel</Dependency>
|
||||
<Dependency>avahi-glib-devel</Dependency>
|
||||
<Dependency versionFrom="8.2.1">qpdf-devel</Dependency>
|
||||
<Dependency versionFrom="9.15">ghostscript-devel</Dependency>
|
||||
<Dependency versionFrom="0.34.0">poppler-devel</Dependency>
|
||||
<Dependency versionFrom="9.1.0">qpdf-devel</Dependency>
|
||||
<Dependency versionFrom="9.53">ghostscript-devel</Dependency>
|
||||
<Dependency versionFrom="22.07.0">poppler-devel</Dependency>
|
||||
<Dependency>mupdf-devel</Dependency>
|
||||
</BuildDependencies>
|
||||
</Source>
|
||||
@@ -62,9 +62,9 @@
|
||||
<Dependency>poppler-cpp</Dependency>
|
||||
<Dependency>mit-kerberos</Dependency>
|
||||
<Dependency>libjpeg-turbo</Dependency>
|
||||
<Dependency versionFrom="5.1.3">qpdf</Dependency>
|
||||
<Dependency versionFrom="9.15">ghostscript</Dependency>
|
||||
<Dependency versionFrom="0.34.0">poppler</Dependency>
|
||||
<Dependency versionFrom="9.1.0">qpdf</Dependency>
|
||||
<Dependency versionFrom="9.53">ghostscript</Dependency>
|
||||
<Dependency versionFrom="22.07.0">poppler</Dependency>
|
||||
<Dependency>e2fsprogs</Dependency>
|
||||
<Dependency>avahi-glib</Dependency>
|
||||
<Dependency>avahi-libs</Dependency>
|
||||
@@ -96,6 +96,13 @@
|
||||
</Package>
|
||||
|
||||
<History>
|
||||
<Update release="23">
|
||||
<Date>2022-08-06</Date>
|
||||
<Version>1.28.15</Version>
|
||||
<Comment>Rebuild</Comment>
|
||||
<Name>Mustafa Cinasal</Name>
|
||||
<Email>muscnsl@gmail.com</Email>
|
||||
</Update>
|
||||
<Update release="22">
|
||||
<Date>2022-05-28</Date>
|
||||
<Version>1.28.15</Version>
|
||||
|
||||
@@ -0,0 +1,622 @@
|
||||
From: Zdenek Dohnal <zdohnal@redhat.com>
|
||||
Date: Fri, 31 Jan 2020 13:50:05 +0100
|
||||
Subject: models.dat: Re-add drivers missing from 3.19.1
|
||||
|
||||
several printers were removed in 3.19.1, but actually someone still uses them
|
||||
reported upstream https://bugs.launchpad.net/hplip/+bug/1843592
|
||||
bugzillas 1742949, 1740132, 1739855
|
||||
|
||||
Origin: https://src.fedoraproject.org/rpms/hplip/blob/master/f/hplip-missing-drivers.patch
|
||||
---
|
||||
Makefile.in | 4 +
|
||||
cups_drv.inc | 2 +
|
||||
data/models/models.dat | 477 ++++++++++++++++++++++++++++++++++++++++++++++++-
|
||||
prnt/drv/hpcups.drv.in | 16 ++
|
||||
4 files changed, 490 insertions(+), 9 deletions(-)
|
||||
|
||||
diff --git a/Makefile.in b/Makefile.in
|
||||
index aef0fbc..cdee8e7 100644
|
||||
--- a/Makefile.in
|
||||
+++ b/Makefile.in
|
||||
@@ -1621,6 +1621,7 @@ am__dist_ppd_DATA_DIST = prnt/ps/hp-laserjet_3050-ps.ppd.gz \
|
||||
ppd/hpcups/hp-laserjet_cm1418fnw-pcl3.ppd.gz \
|
||||
ppd/hpcups/hp-laserjet_cp1025.ppd.gz \
|
||||
ppd/hpcups/hp-laserjet_cp1025nw.ppd.gz \
|
||||
+ ppd/hpcups/hp-laserjet_cp_1025nw.ppd.gz \
|
||||
ppd/hpcups/hp-laserjet_m1005.ppd.gz \
|
||||
ppd/hpcups/hp-laserjet_m101-m106.ppd.gz \
|
||||
ppd/hpcups/hp-laserjet_m109-m112.ppd.gz \
|
||||
@@ -1738,6 +1739,7 @@ am__dist_ppd_DATA_DIST = prnt/ps/hp-laserjet_3050-ps.ppd.gz \
|
||||
ppd/hpcups/hp-laserjet_professional_p1608dn.ppd.gz \
|
||||
ppd/hpcups/hp-laserjet_professional_p1609dn.ppd.gz \
|
||||
ppd/hpcups/hp-laserjet_professional_p_1102w.ppd.gz \
|
||||
+ ppd/hpcups/hp-laserjet_professional_p1102w.ppd.gz \
|
||||
ppd/hpcups/hp-laserjet_tank_1020.ppd.gz \
|
||||
ppd/hpcups/hp-laserjet_tank_150x.ppd.gz \
|
||||
ppd/hpcups/hp-laserjet_tank_250x.ppd.gz \
|
||||
@@ -4106,6 +4108,7 @@ dist_unrel_DATA =
|
||||
@HPLIP_CLASS_DRIVER_FALSE@ ppd/hpcups/hp-laserjet_cm1418fnw-pcl3.ppd.gz \
|
||||
@HPLIP_CLASS_DRIVER_FALSE@ ppd/hpcups/hp-laserjet_cp1025.ppd.gz \
|
||||
@HPLIP_CLASS_DRIVER_FALSE@ ppd/hpcups/hp-laserjet_cp1025nw.ppd.gz \
|
||||
+@HPLIP_CLASS_DRIVER_FALSE@ ppd/hpcups/hp-laserjet_cp_1025nw.ppd.gz \
|
||||
@HPLIP_CLASS_DRIVER_FALSE@ ppd/hpcups/hp-laserjet_m1005.ppd.gz \
|
||||
@HPLIP_CLASS_DRIVER_FALSE@ ppd/hpcups/hp-laserjet_m101-m106.ppd.gz \
|
||||
@HPLIP_CLASS_DRIVER_FALSE@ ppd/hpcups/hp-laserjet_m109-m112.ppd.gz \
|
||||
@@ -4222,6 +4225,7 @@ dist_unrel_DATA =
|
||||
@HPLIP_CLASS_DRIVER_FALSE@ ppd/hpcups/hp-laserjet_professional_p1607dn.ppd.gz \
|
||||
@HPLIP_CLASS_DRIVER_FALSE@ ppd/hpcups/hp-laserjet_professional_p1608dn.ppd.gz \
|
||||
@HPLIP_CLASS_DRIVER_FALSE@ ppd/hpcups/hp-laserjet_professional_p1609dn.ppd.gz \
|
||||
+@HPLIP_CLASS_DRIVER_FALSE@ ppd/hpcups/hp-laserjet_professional_p1102w.ppd.gz \
|
||||
@HPLIP_CLASS_DRIVER_FALSE@ ppd/hpcups/hp-laserjet_professional_p_1102w.ppd.gz \
|
||||
@HPLIP_CLASS_DRIVER_FALSE@ ppd/hpcups/hp-laserjet_tank_1020.ppd.gz \
|
||||
@HPLIP_CLASS_DRIVER_FALSE@ ppd/hpcups/hp-laserjet_tank_150x.ppd.gz \
|
||||
diff --git a/cups_drv.inc b/cups_drv.inc
|
||||
index a87ea98..e39bde4 100644
|
||||
--- a/cups_drv.inc
|
||||
+++ b/cups_drv.inc
|
||||
@@ -411,6 +411,7 @@ cups_ppd_printers = \
|
||||
ppd/hpcups/hp-laserjet_cm1418fnw-pcl3.ppd.gz \
|
||||
ppd/hpcups/hp-laserjet_cp1025.ppd.gz \
|
||||
ppd/hpcups/hp-laserjet_cp1025nw.ppd.gz \
|
||||
+ ppd/hpcups/hp-laserjet_cp_1025nw.ppd.gz \
|
||||
ppd/hpcups/hp-laserjet_m1005.ppd.gz \
|
||||
ppd/hpcups/hp-laserjet_m101-m106.ppd.gz \
|
||||
ppd/hpcups/hp-laserjet_m109-m112.ppd.gz \
|
||||
@@ -527,6 +528,7 @@ cups_ppd_printers = \
|
||||
ppd/hpcups/hp-laserjet_professional_p1607dn.ppd.gz \
|
||||
ppd/hpcups/hp-laserjet_professional_p1608dn.ppd.gz \
|
||||
ppd/hpcups/hp-laserjet_professional_p1609dn.ppd.gz \
|
||||
+ ppd/hpcups/hp-laserjet_professional_p1102w.ppd.gz \
|
||||
ppd/hpcups/hp-laserjet_professional_p_1102w.ppd.gz \
|
||||
ppd/hpcups/hp-laserjet_tank_1020.ppd.gz \
|
||||
ppd/hpcups/hp-laserjet_tank_150x.ppd.gz \
|
||||
diff --git a/data/models/models.dat b/data/models/models.dat
|
||||
index 12e9a08..7d9650b 100644
|
||||
--- a/data/models/models.dat
|
||||
+++ b/data/models/models.dat
|
||||
@@ -2104,7 +2104,7 @@ usb-pid=411
|
||||
usb-vid=3f0
|
||||
wifi-config=0
|
||||
|
||||
-[hp_laserjet_100_colormfp_m175]
|
||||
+[hp_laserjet_100_colormfp_m175nw]
|
||||
align-type=0
|
||||
clean-type=0
|
||||
color-cal-type=0
|
||||
@@ -2119,14 +2119,6 @@ io-support=14
|
||||
job-storage=0
|
||||
linefeed-cal-type=0
|
||||
model1=HP LaserJet 100 Color MFP M175
|
||||
-model2=HP LaserJet 100 Color MFP M175a
|
||||
-model3=HP LaserJet 100 Color MFP M175b
|
||||
-model4=HP LaserJet 100 Color MFP M175c
|
||||
-model5=HP LaserJet 100 Color MFP M175e
|
||||
-model6=HP LaserJet 100 Color MFP M175nw
|
||||
-model7=HP LaserJet 100 Color MFP M175p
|
||||
-model8=HP LaserJet 100 Color MFP M175q
|
||||
-model9=HP LaserJet 100 Color MFP M175r
|
||||
ppd-name=hp-laserjet_100_color_mfp_m175-ps.ppd
|
||||
monitor-type=0
|
||||
panel-check-type=0
|
||||
@@ -2165,6 +2157,378 @@ usb-pid=62a
|
||||
usb-vid=3f0
|
||||
wifi-config=3
|
||||
|
||||
+[hp_laserjet_100_colormfp_m175r]
|
||||
+align-type=0
|
||||
+clean-type=0
|
||||
+color-cal-type=0
|
||||
+copy-type=0
|
||||
+embedded-server-type=1
|
||||
+fax-type=0
|
||||
+fw-download=False
|
||||
+icon=hp_color_laserjet_cm1312_mfp.png
|
||||
+io-mfp-mode=3
|
||||
+io-mode=1
|
||||
+io-support=14
|
||||
+job-storage=0
|
||||
+linefeed-cal-type=0
|
||||
+model1=HP LaserJet 100 Color MFP M175
|
||||
+ppd-name=hp-laserjet_100_color_mfp_m175-ps.ppd
|
||||
+monitor-type=0
|
||||
+panel-check-type=0
|
||||
+pcard-type=0
|
||||
+plugin=1
|
||||
+plugin-reason=64
|
||||
+power-settings=0
|
||||
+pq-diag-type=0
|
||||
+r-type=0
|
||||
+r0-agent1-kind=4
|
||||
+r0-agent1-sku=CE310A
|
||||
+r0-agent1-type=1
|
||||
+r0-agent2-kind=4
|
||||
+r0-agent2-sku=CE311A
|
||||
+r0-agent2-type=4
|
||||
+r0-agent3-kind=4
|
||||
+r0-agent3-sku=CE313A
|
||||
+r0-agent3-type=5
|
||||
+r0-agent4-kind=4
|
||||
+r0-agent4-sku=CE312A
|
||||
+r0-agent4-type=6
|
||||
+scan-src=3
|
||||
+scan-type=5
|
||||
+status-battery-check=0
|
||||
+status-dynamic-counters=0
|
||||
+status-type=10
|
||||
+support-released=True
|
||||
+support-subtype=219b2b
|
||||
+support-type=2
|
||||
+support-ver=3.11.7
|
||||
+tech-class=Postscript
|
||||
+family-class=Undefined
|
||||
+tech-subclass=Normal
|
||||
+tech-type=4
|
||||
+usb-pid=62a
|
||||
+usb-vid=3f0
|
||||
+wifi-config=3
|
||||
+
|
||||
+[hp_laserjet_100_colormfp_m175q]
|
||||
+align-type=0
|
||||
+clean-type=0
|
||||
+color-cal-type=0
|
||||
+copy-type=0
|
||||
+embedded-server-type=1
|
||||
+fax-type=0
|
||||
+fw-download=False
|
||||
+icon=hp_color_laserjet_cm1312_mfp.png
|
||||
+io-mfp-mode=3
|
||||
+io-mode=1
|
||||
+io-support=14
|
||||
+job-storage=0
|
||||
+linefeed-cal-type=0
|
||||
+model1=HP LaserJet 100 Color MFP M175
|
||||
+ppd-name=hp-laserjet_100_color_mfp_m175-ps.ppd
|
||||
+monitor-type=0
|
||||
+panel-check-type=0
|
||||
+pcard-type=0
|
||||
+plugin=1
|
||||
+plugin-reason=64
|
||||
+power-settings=0
|
||||
+pq-diag-type=0
|
||||
+r-type=0
|
||||
+r0-agent1-kind=4
|
||||
+r0-agent1-sku=CE310A
|
||||
+r0-agent1-type=1
|
||||
+r0-agent2-kind=4
|
||||
+r0-agent2-sku=CE311A
|
||||
+r0-agent2-type=4
|
||||
+r0-agent3-kind=4
|
||||
+r0-agent3-sku=CE313A
|
||||
+r0-agent3-type=5
|
||||
+r0-agent4-kind=4
|
||||
+r0-agent4-sku=CE312A
|
||||
+r0-agent4-type=6
|
||||
+scan-src=3
|
||||
+scan-type=5
|
||||
+status-battery-check=0
|
||||
+status-dynamic-counters=0
|
||||
+status-type=10
|
||||
+support-released=True
|
||||
+support-subtype=219b2b
|
||||
+support-type=2
|
||||
+support-ver=3.11.7
|
||||
+tech-class=Postscript
|
||||
+family-class=Undefined
|
||||
+tech-subclass=Normal
|
||||
+tech-type=4
|
||||
+usb-pid=62a
|
||||
+usb-vid=3f0
|
||||
+wifi-config=3
|
||||
+
|
||||
+[hp_laserjet_100_colormfp_m175p]
|
||||
+align-type=0
|
||||
+clean-type=0
|
||||
+color-cal-type=0
|
||||
+copy-type=0
|
||||
+embedded-server-type=1
|
||||
+fax-type=0
|
||||
+fw-download=False
|
||||
+icon=hp_color_laserjet_cm1312_mfp.png
|
||||
+io-mfp-mode=3
|
||||
+io-mode=1
|
||||
+io-support=14
|
||||
+job-storage=0
|
||||
+linefeed-cal-type=0
|
||||
+model1=HP LaserJet 100 Color MFP M175
|
||||
+ppd-name=hp-laserjet_100_color_mfp_m175-ps.ppd
|
||||
+monitor-type=0
|
||||
+panel-check-type=0
|
||||
+pcard-type=0
|
||||
+plugin=1
|
||||
+plugin-reason=64
|
||||
+power-settings=0
|
||||
+pq-diag-type=0
|
||||
+r-type=0
|
||||
+r0-agent1-kind=4
|
||||
+r0-agent1-sku=CE310A
|
||||
+r0-agent1-type=1
|
||||
+r0-agent2-kind=4
|
||||
+r0-agent2-sku=CE311A
|
||||
+r0-agent2-type=4
|
||||
+r0-agent3-kind=4
|
||||
+r0-agent3-sku=CE313A
|
||||
+r0-agent3-type=5
|
||||
+r0-agent4-kind=4
|
||||
+r0-agent4-sku=CE312A
|
||||
+r0-agent4-type=6
|
||||
+scan-src=3
|
||||
+scan-type=5
|
||||
+status-battery-check=0
|
||||
+status-dynamic-counters=0
|
||||
+status-type=10
|
||||
+support-released=True
|
||||
+support-subtype=219b2b
|
||||
+support-type=2
|
||||
+support-ver=3.11.7
|
||||
+tech-class=Postscript
|
||||
+family-class=Undefined
|
||||
+tech-subclass=Normal
|
||||
+tech-type=4
|
||||
+usb-pid=62a
|
||||
+usb-vid=3f0
|
||||
+wifi-config=3
|
||||
+
|
||||
+[hp_laserjet_100_colormfp_m175e]
|
||||
+align-type=0
|
||||
+clean-type=0
|
||||
+color-cal-type=0
|
||||
+copy-type=0
|
||||
+embedded-server-type=1
|
||||
+fax-type=0
|
||||
+fw-download=False
|
||||
+icon=hp_color_laserjet_cm1312_mfp.png
|
||||
+io-mfp-mode=3
|
||||
+io-mode=1
|
||||
+io-support=2
|
||||
+job-storage=0
|
||||
+linefeed-cal-type=0
|
||||
+model1=HP LaserJet 100 Color MFP M175
|
||||
+ppd-name=hp-laserjet_100_color_mfp_m175-ps.ppd
|
||||
+monitor-type=0
|
||||
+panel-check-type=0
|
||||
+pcard-type=0
|
||||
+plugin=1
|
||||
+plugin-reason=64
|
||||
+power-settings=0
|
||||
+pq-diag-type=0
|
||||
+r-type=0
|
||||
+r0-agent1-kind=4
|
||||
+r0-agent1-sku=CE310A
|
||||
+r0-agent1-type=1
|
||||
+r0-agent2-kind=4
|
||||
+r0-agent2-sku=CE311A
|
||||
+r0-agent2-type=4
|
||||
+r0-agent3-kind=4
|
||||
+r0-agent3-sku=CE313A
|
||||
+r0-agent3-type=5
|
||||
+r0-agent4-kind=4
|
||||
+r0-agent4-sku=CE312A
|
||||
+r0-agent4-type=6
|
||||
+scan-src=3
|
||||
+scan-type=5
|
||||
+status-battery-check=0
|
||||
+status-dynamic-counters=0
|
||||
+status-type=10
|
||||
+support-released=True
|
||||
+support-subtype=219b2b
|
||||
+support-type=2
|
||||
+support-ver=3.11.7
|
||||
+tech-class=Postscript
|
||||
+family-class=Undefined
|
||||
+tech-subclass=Normal
|
||||
+tech-type=4
|
||||
+usb-pid=62a
|
||||
+usb-vid=3f0
|
||||
+wifi-config=-1
|
||||
+
|
||||
+[hp_laserjet_100_colormfp_m175a]
|
||||
+align-type=0
|
||||
+clean-type=0
|
||||
+color-cal-type=0
|
||||
+copy-type=0
|
||||
+embedded-server-type=1
|
||||
+ppd-name=hp-laserjet_100_color_mfp_m175-ps.ppd
|
||||
+family-ppd=hp-postscript-laserjet-pro.ppd
|
||||
+fax-type=0
|
||||
+fw-download=False
|
||||
+icon=hp_color_laserjet_cm1312_mfp.png
|
||||
+io-mfp-mode=3
|
||||
+io-mode=1
|
||||
+io-support=2
|
||||
+job-storage=0
|
||||
+linefeed-cal-type=0
|
||||
+model1=HP LaserJet 100 Color MFP M175
|
||||
+monitor-type=0
|
||||
+panel-check-type=0
|
||||
+pcard-type=0
|
||||
+plugin=1
|
||||
+plugin-reason=64
|
||||
+power-settings=0
|
||||
+pq-diag-type=0
|
||||
+r-type=0
|
||||
+r0-agent1-kind=4
|
||||
+r0-agent1-sku=CE310A
|
||||
+r0-agent1-type=1
|
||||
+r0-agent2-kind=4
|
||||
+r0-agent2-sku=CE311A
|
||||
+r0-agent2-type=4
|
||||
+r0-agent3-kind=4
|
||||
+r0-agent3-sku=CE313A
|
||||
+r0-agent3-type=5
|
||||
+r0-agent4-kind=4
|
||||
+r0-agent4-sku=CE312A
|
||||
+r0-agent4-type=6
|
||||
+scan-src=3
|
||||
+scan-type=5
|
||||
+status-battery-check=0
|
||||
+status-dynamic-counters=0
|
||||
+status-type=10
|
||||
+support-released=True
|
||||
+support-subtype=219b2b
|
||||
+support-type=2
|
||||
+support-ver=3.11.7
|
||||
+tech-class=Postscript
|
||||
+family-class=Undefined
|
||||
+tech-subclass=Normal
|
||||
+tech-type=4
|
||||
+usb-pid=62a
|
||||
+usb-vid=3f0
|
||||
+wifi-config=-1
|
||||
+
|
||||
+[hp_laserjet_100_colormfp_m175c]
|
||||
+align-type=0
|
||||
+clean-type=0
|
||||
+color-cal-type=0
|
||||
+copy-type=0
|
||||
+embedded-server-type=1
|
||||
+fax-type=0
|
||||
+fw-download=False
|
||||
+icon=hp_color_laserjet_cm1312_mfp.png
|
||||
+io-mfp-mode=3
|
||||
+io-mode=1
|
||||
+io-support=2
|
||||
+job-storage=0
|
||||
+linefeed-cal-type=0
|
||||
+model1=HP LaserJet 100 Color MFP M175
|
||||
+ppd-name=hp-laserjet_100_color_mfp_m175-ps.ppd
|
||||
+monitor-type=0
|
||||
+panel-check-type=0
|
||||
+pcard-type=0
|
||||
+plugin=1
|
||||
+plugin-reason=64
|
||||
+power-settings=0
|
||||
+pq-diag-type=0
|
||||
+r-type=0
|
||||
+r0-agent1-kind=4
|
||||
+r0-agent1-sku=CE310A
|
||||
+r0-agent1-type=1
|
||||
+r0-agent2-kind=4
|
||||
+r0-agent2-sku=CE311A
|
||||
+r0-agent2-type=4
|
||||
+r0-agent3-kind=4
|
||||
+r0-agent3-sku=CE313A
|
||||
+r0-agent3-type=5
|
||||
+r0-agent4-kind=4
|
||||
+r0-agent4-sku=CE312A
|
||||
+r0-agent4-type=6
|
||||
+scan-src=3
|
||||
+scan-type=5
|
||||
+status-battery-check=0
|
||||
+status-dynamic-counters=0
|
||||
+status-type=10
|
||||
+support-released=True
|
||||
+support-subtype=219b2b
|
||||
+support-type=2
|
||||
+support-ver=3.11.7
|
||||
+tech-class=Postscript
|
||||
+family-class=Undefined
|
||||
+tech-subclass=Normal
|
||||
+tech-type=4
|
||||
+usb-pid=62a
|
||||
+usb-vid=3f0
|
||||
+wifi-config=-1
|
||||
+
|
||||
+[hp_laserjet_100_colormfp_m175b]
|
||||
+align-type=0
|
||||
+clean-type=0
|
||||
+color-cal-type=0
|
||||
+copy-type=0
|
||||
+embedded-server-type=1
|
||||
+fax-type=0
|
||||
+fw-download=False
|
||||
+icon=hp_color_laserjet_cm1312_mfp.png
|
||||
+io-mfp-mode=3
|
||||
+io-mode=1
|
||||
+io-support=2
|
||||
+job-storage=0
|
||||
+linefeed-cal-type=0
|
||||
+model1=HP LaserJet 100 Color MFP M175
|
||||
+ppd-name=hp-laserjet_100_color_mfp_m175-ps.ppd
|
||||
+monitor-type=0
|
||||
+panel-check-type=0
|
||||
+pcard-type=0
|
||||
+plugin=1
|
||||
+plugin-reason=64
|
||||
+power-settings=0
|
||||
+pq-diag-type=0
|
||||
+r-type=0
|
||||
+r0-agent1-kind=4
|
||||
+r0-agent1-sku=CE310A
|
||||
+r0-agent1-type=1
|
||||
+r0-agent2-kind=4
|
||||
+r0-agent2-sku=CE311A
|
||||
+r0-agent2-type=4
|
||||
+r0-agent3-kind=4
|
||||
+r0-agent3-sku=CE313A
|
||||
+r0-agent3-type=5
|
||||
+r0-agent4-kind=4
|
||||
+r0-agent4-sku=CE312A
|
||||
+r0-agent4-type=6
|
||||
+scan-src=3
|
||||
+scan-type=5
|
||||
+status-battery-check=0
|
||||
+status-dynamic-counters=0
|
||||
+status-type=10
|
||||
+support-released=True
|
||||
+support-subtype=219b2b
|
||||
+support-type=2
|
||||
+support-ver=3.11.7
|
||||
+tech-class=Postscript
|
||||
+family-class=Undefined
|
||||
+tech-subclass=Normal
|
||||
+tech-type=4
|
||||
+usb-pid=62a
|
||||
+usb-vid=3f0
|
||||
+wifi-config=-1
|
||||
+
|
||||
[officejet_100_mobile_l411]
|
||||
align-type=-1
|
||||
clean-type=1
|
||||
@@ -17867,6 +18231,58 @@ usb-pid=2c17
|
||||
usb-vid=3f0
|
||||
wifi-config=0
|
||||
|
||||
+[hp_laserjet_cp_1025nw]
|
||||
+align-type=0
|
||||
+clean-type=0
|
||||
+color-cal-type=0
|
||||
+copy-type=0
|
||||
+embedded-server-type=1
|
||||
+fax-type=0
|
||||
+fw-download=False
|
||||
+icon=hp_color_laserjet_cp2025.png
|
||||
+io-mfp-mode=1
|
||||
+io-mode=1
|
||||
+io-support=14
|
||||
+job-storage=0
|
||||
+linefeed-cal-type=0
|
||||
+model1=HP LaserJet Pro CP 1025nw Color Printer Series
|
||||
+monitor-type=0
|
||||
+panel-check-type=0
|
||||
+pcard-type=0
|
||||
+plugin=1
|
||||
+plugin-reason=1
|
||||
+power-settings=0
|
||||
+pq-diag-type=0
|
||||
+r-type=0
|
||||
+r0-agent1-kind=4
|
||||
+r0-agent1-sku=CE310A
|
||||
+r0-agent1-type=1
|
||||
+r0-agent2-kind=4
|
||||
+r0-agent2-sku=CE311A
|
||||
+r0-agent2-type=4
|
||||
+r0-agent3-kind=4
|
||||
+r0-agent3-sku=CE313A
|
||||
+r0-agent3-type=5
|
||||
+r0-agent4-kind=4
|
||||
+r0-agent4-sku=CE312A
|
||||
+r0-agent4-type=6
|
||||
+scan-src=0
|
||||
+scan-type=0
|
||||
+status-battery-check=0
|
||||
+status-dynamic-counters=0
|
||||
+status-type=8
|
||||
+support-released=True
|
||||
+support-subtype=219b2b
|
||||
+support-type=2
|
||||
+support-ver=3.12.4
|
||||
+tech-class=LJZjsColor
|
||||
+family-class=LJ-Class4
|
||||
+tech-subclass=Advanced
|
||||
+tech-type=4
|
||||
+usb-pid=112a
|
||||
+usb-vid=3f0
|
||||
+wifi-config=3
|
||||
+
|
||||
[hp_laserjet_cp1025nw]
|
||||
align-type=0
|
||||
clean-type=0
|
||||
@@ -18468,6 +18884,49 @@ usb-pid=3011
|
||||
usb-vid=3f0
|
||||
wifi-config=0
|
||||
|
||||
+[hp_laserjet_professional_p1102w]
|
||||
+align-type=0
|
||||
+clean-type=0
|
||||
+color-cal-type=0
|
||||
+copy-type=0
|
||||
+embedded-server-type=0
|
||||
+fax-type=0
|
||||
+fw-download=False
|
||||
+icon=HP_LaserJet_1012.png
|
||||
+io-mfp-mode=6
|
||||
+io-mode=1
|
||||
+io-support=10
|
||||
+job-storage=0
|
||||
+linefeed-cal-type=0
|
||||
+model1=HP LaserJet Professional P1102w Printer
|
||||
+monitor-type=0
|
||||
+panel-check-type=0
|
||||
+pcard-type=0
|
||||
+plugin=1
|
||||
+plugin-reason=1
|
||||
+power-settings=0
|
||||
+pq-diag-type=0
|
||||
+r-type=0
|
||||
+r0-agent1-kind=4
|
||||
+r0-agent1-sku=85A
|
||||
+r0-agent1-type=1
|
||||
+scan-src=0
|
||||
+scan-type=0
|
||||
+status-battery-check=0
|
||||
+status-dynamic-counters=0
|
||||
+status-type=8
|
||||
+support-released=True
|
||||
+support-subtype=219b2b
|
||||
+support-type=2
|
||||
+support-ver=3.10.4
|
||||
+tech-class=LJZjsMono
|
||||
+family-class=LJ-Class4
|
||||
+tech-subclass=NoAutoDuplex
|
||||
+tech-type=3
|
||||
+usb-pid=32a
|
||||
+usb-vid=3f0
|
||||
+wifi-config=3
|
||||
+
|
||||
[hp_laserjet_professional_p1102]
|
||||
align-type=0
|
||||
clean-type=0
|
||||
diff --git a/prnt/drv/hpcups.drv.in b/prnt/drv/hpcups.drv.in
|
||||
index 494758d..af65389 100644
|
||||
--- a/prnt/drv/hpcups.drv.in
|
||||
+++ b/prnt/drv/hpcups.drv.in
|
||||
@@ -22688,6 +22688,14 @@ Group "RLT/HP Real Life Technologies"
|
||||
Attribute "Product" "" "(HP LaserJet Professional p1102 Printer)"
|
||||
Attribute "Product" "" "(HP LaserJet Professional p1102s Printer)"
|
||||
}
|
||||
+ {
|
||||
+ ModelName "HP LaserJet Professional p1102w"
|
||||
+ Attribute "NickName" "" "HP LaserJet Professional p1102w, hpcups $Version, requires proprietary plugin"
|
||||
+ Attribute "ShortNickName" "" "HP LaserJet Professional p1102w hpijs"
|
||||
+ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp laserjet professional p1102w;DES:hp laserjet professional p1102w;"
|
||||
+ PCFileName "hp-laserjet_professional_p1102w.ppd"
|
||||
+ Attribute "Product" "" "(HP LaserJet Professional p1102w Printer)"
|
||||
+ }
|
||||
{
|
||||
ModelName "HP LaserJet Professional p1106"
|
||||
Attribute "NickName" "" "HP LaserJet Professional p1106, hpcups $Version"
|
||||
@@ -23122,6 +23130,14 @@ Group "RLT/HP Real Life Technologies"
|
||||
PCFileName "hp-laserjet_cp1025nw.ppd"
|
||||
Attribute "Product" "" "(HP LaserJet Pro cp1025nw Color Printer Series)"
|
||||
}
|
||||
+ {
|
||||
+ ModelName "HP LaserJet Cp 1025nw"
|
||||
+ Attribute "NickName" "" "HP LaserJet Cp 1025nw, hpcups $Version, requires proprietary plugin"
|
||||
+ Attribute "ShortNickName" "" "HP LaserJet Cp 1025nw hpijs"
|
||||
+ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp laserjet cp 1025nw;DES:hp laserjet cp 1025nw;"
|
||||
+ PCFileName "hp-laserjet_cp_1025nw.ppd"
|
||||
+ Attribute "Product" "" "(HP LaserJet Pro Cp 1025nw Color Printer Series)"
|
||||
+ }
|
||||
}
|
||||
} // End LJZjsColor (for proprietary plugin)
|
||||
|
||||
@@ -0,0 +1,47 @@
|
||||
--- hplip-3.22.6/protocol/hp_ipp.c 2022-06-28 20:44:38.000000000 +0200
|
||||
+++ hplip-3.22.6/protocol/hp_ipp.c.new 2022-06-28 20:56:14.336097721 +0200
|
||||
@@ -110,7 +110,7 @@
|
||||
}
|
||||
|
||||
if ( info == NULL )
|
||||
- snprintf( info,sizeof(info), name );
|
||||
+ snprintf( info, sizeof(info), "%s", name );
|
||||
|
||||
sprintf( printer_uri, "ipp://localhost/printers/%s", name );
|
||||
|
||||
--- hplip-3.22.6/protocol/hp_ipp.c 2022-06-28 21:08:10.000000000 +0200
|
||||
+++ hplip-3.22.6/protocol/hp_ipp.c.new 2022-06-28 21:14:15.921484059 +0200
|
||||
@@ -511,27 +511,27 @@
|
||||
|
||||
if ( strcmp(attr_name, "printer-name") == 0 &&
|
||||
val_tag == IPP_TAG_NAME ) {
|
||||
- snprintf(t_printer->name, sizeof(t_printer->name),ippGetString(attr, 0, NULL) );
|
||||
+ snprintf(t_printer->name, sizeof(t_printer->name), "%s", ippGetString(attr, 0, NULL) );
|
||||
}
|
||||
else if ( strcmp(attr_name, "device-uri") == 0 &&
|
||||
val_tag == IPP_TAG_URI ) {
|
||||
- snprintf(t_printer->device_uri,sizeof(t_printer->device_uri), ippGetString(attr, 0, NULL) );
|
||||
+ snprintf(t_printer->device_uri,sizeof(t_printer->device_uri), "%s", ippGetString(attr, 0, NULL) );
|
||||
}
|
||||
else if ( strcmp(attr_name, "printer-uri-supported") == 0 &&
|
||||
val_tag == IPP_TAG_URI ) {
|
||||
- snprintf(t_printer->printer_uri,sizeof(t_printer->printer_uri), ippGetString(attr, 0, NULL) );
|
||||
+ snprintf(t_printer->printer_uri,sizeof(t_printer->printer_uri), "%s", ippGetString(attr, 0, NULL) );
|
||||
}
|
||||
else if ( strcmp(attr_name, "printer-info") == 0 &&
|
||||
val_tag == IPP_TAG_TEXT ) {
|
||||
- snprintf(t_printer->info,sizeof(t_printer->info), ippGetString(attr, 0, NULL) );
|
||||
+ snprintf(t_printer->info,sizeof(t_printer->info), "%s", ippGetString(attr, 0, NULL) );
|
||||
}
|
||||
else if ( strcmp(attr_name, "printer-location") == 0 &&
|
||||
val_tag == IPP_TAG_TEXT ) {
|
||||
- snprintf(t_printer->location,sizeof(t_printer->location),ippGetString(attr, 0, NULL) );
|
||||
+ snprintf(t_printer->location,sizeof(t_printer->location),"%s", ippGetString(attr, 0, NULL) );
|
||||
}
|
||||
else if ( strcmp(attr_name, "printer-make-and-model") == 0 &&
|
||||
val_tag == IPP_TAG_TEXT ) {
|
||||
- snprintf(t_printer->make_model,sizeof(t_printer->make_model),ippGetString(attr, 0, NULL) );
|
||||
+ snprintf(t_printer->make_model,sizeof(t_printer->make_model),"%s", ippGetString(attr, 0, NULL) );
|
||||
}
|
||||
else if ( strcmp(attr_name, "printer-state") == 0 &&
|
||||
val_tag == IPP_TAG_ENUM ) {
|
||||
@@ -0,0 +1,39 @@
|
||||
--- hplip-3.22.4/createPPD.sh 2022-04-26 06:16:59.000000000 +0200
|
||||
+++ hplip-3.22.4/createPPD.sh.new 2022-04-30 14:42:35.877365900 +0200
|
||||
@@ -55,16 +55,16 @@
|
||||
else
|
||||
cp prnt/ps/hp-postscript*.ppd ppd/classppd/ps
|
||||
for i in ppd/classppd/ps/*.ppd; do
|
||||
- gzip -c "$i" > "$i.gz"
|
||||
+ gzip -nc "$i" > "$i.gz"
|
||||
done
|
||||
fi
|
||||
#cp prnt/spd/*.ppd ppd/classppd/hpcups/.
|
||||
#cp prnt/ps/hp-postscript*.ppd.gz ppd/classppd/ps
|
||||
for i in ppd/classppd/hpcups/*.ppd; do
|
||||
- gzip -c "$i" > "$i.gz"
|
||||
+ gzip -nc "$i" > "$i.gz"
|
||||
done
|
||||
#for i in ppd/classppd/ps/*.ppd; do
|
||||
- # gzip -c "$i" > "$i.gz"
|
||||
+ # gzip -nc "$i" > "$i.gz"
|
||||
#done
|
||||
|
||||
cat > class_cups_drv.inc <<EOF
|
||||
@@ -83,14 +83,14 @@
|
||||
install -d ppd/hpcups
|
||||
ppdc -d ppd/hpcups prnt/drv/hpcups.drv
|
||||
for i in ppd/hpcups/*.ppd; do
|
||||
- gzip -c "$i" > "$i.gz"
|
||||
+ gzip -nc "$i" > "$i.gz"
|
||||
done
|
||||
|
||||
install -d ppd/hpijs
|
||||
ppdc -d ppd/hpijs prnt/drv/hpijs.drv
|
||||
echo "gzip ppd files..."
|
||||
for i in ppd/hpijs/*.ppd; do
|
||||
- gzip -c "$i" > "$i.gz"
|
||||
+ gzip -nc "$i" > "$i.gz"
|
||||
done
|
||||
echo "building foomatic_drv.inc..."
|
||||
./hpijs-drv > foomatic_drv.inc $shadow
|
||||
@@ -87,6 +87,9 @@
|
||||
<Patch level="1">pisilinux/hp-systray-consume-session-param.patch</Patch>
|
||||
<Patch level="1">Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch</Patch>
|
||||
<Patch level="1">0025-Remove-all-ImageProcessor-functionality-which-is-clo.patch</Patch>
|
||||
<Patch level="1">Re-add-drivers-missing-from-3.19.1.patch</Patch>
|
||||
<Patch level="1">reproducible-gzip.patch</Patch>
|
||||
<Patch level="1">fix-Werror-format-security.patch</Patch>
|
||||
</Patches>
|
||||
</Source>
|
||||
|
||||
@@ -186,6 +189,13 @@
|
||||
</Package>
|
||||
|
||||
<History>
|
||||
<Update release="14">
|
||||
<Date>2022-08-06</Date>
|
||||
<Version>3.22.6</Version>
|
||||
<Comment>Rebuild</Comment>
|
||||
<Name>Mustafa Cinasal</Name>
|
||||
<Email>muscnsl@gmail.com</Email>
|
||||
</Update>
|
||||
<Update release="13">
|
||||
<Date>2022-07-02</Date>
|
||||
<Version>3.22.6</Version>
|
||||
|
||||
Reference in New Issue
Block a user