pool/hplip
SHA256
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 1111603 from Printing

Browse Source 
- Update to hplip 3.23.5
  * added new CUPS filter hpcdmfax
- Support for new printers:
  * HP Smart Tank 520_540 series
  * HP Smart Tank 580-590 series
  * HP Smart Tank 5100 series
  * HP Smart Tank 210-220 series
  * HP Color LaserJet Enterprise 6700dn
  * HP Color LaserJet Enterprise 6700
  * HP Color LaserJet Enterprise 6701dn
  * HP Color LaserJet Enterprise 6701
  * HP Color LaserJet Enterprise X654dn
  * HP Color LaserJet Enterprise X65455dn
  * HP Color LaserJet Enterprise X654
  * HP Color LaserJet Enterprise X65465dn
  * HP Color LaserJet Enterprise X654 65 PPM
  * HP Color LaserJet Enterprise X654 55 to 65ppm License
  * HP Color LaserJet Enterprise X654 Down License
  * HP Color LaserJet Enterprise MFP 6800dn
  * HP Color LaserJet Enterprise Flow MFP 6800zf
  * HP Color LaserJet Enterprise Flow MFP 6800zfsw
  * HP Color LaserJet Enterprise Flow MFP 6800zfw+
  * HP Color LaserJet Enterprise MFP 6800
  * HP Color LaserJet Enterprise MFP 6801
  * HP Color LaserJet Enterprise MFP 6801 zfsw
  * HP Color LaserJet Enterprise Flow MFP 6801zfw+
  * HP Color LaserJet Enterprise MFP X677 55 to 65ppm License
  * HP Color LaserJet Enterprise MFP X677 65ppm
  * HP Color LaserJet Enterprise MFP X677s
  * HP Color LaserJet Enterprise Flow MFP X677z

OBS-URL: https://build.opensuse.org/request/show/1111603
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/hplip?expand=0&rev=149
This commit is contained in:
Ana Guerrero 2023-09-22 19:46:38 +00:00 committed by Git OBS Bridge
commit b2ebf03955
9 changed files with 150 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
add_missing_includes_and_define_GNU_SOURCE.patch
View File

@ -1,6 +1,20 @@
diff -urEbwB hplip-3.20.9/common/utils.c hplip-3.20.9.new/common/utils.c
--- hplip-3.20.9/common/utils.c 2020-09-23 07:24:09.000000000 +0200
+++ hplip-3.20.9.new/common/utils.c 2020-11-23 12:21:21.471541779 +0100
From d52301159a5add137b46e7183970ea1f1cbfe8ac Mon Sep 17 00:00:00 2001
From: Martin Wilck <mwilck@suse.com>
Date: Fri, 15 Sep 2023 18:27:13 +0200
Subject: [PATCH 04/19] add missing includes and define GNU_SOURCE
---
common/utils.c | 5 +++++
io/hpmud/jd.c | 1 +
protocol/hp_ipp.c | 4 ++++
scan/sane/bb_ledm.c | 1 +
scan/sane/sclpml.c | 5 +++++
5 files changed, 16 insertions(+)
diff --git a/common/utils.c b/common/utils.c
index d8ecee9..6f5cef9 100644
--- a/common/utils.c
+++ b/common/utils.c
@@ -1,9 +1,14 @@
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE
@ -16,9 +30,10 @@ diff -urEbwB hplip-3.20.9/common/utils.c hplip-3.20.9.new/common/utils.c
extern int errno;
diff -urEbwBN hplip-3.20.9/io/hpmud/jd.c hplip-3.20.9.new/io/hpmud/jd.c
--- hplip-3.20.9/io/hpmud/jd.c 2020-09-23 07:24:10.000000000 +0200
+++ hplip-3.20.9.new/io/hpmud/jd.c 2020-11-23 12:12:14.920243467 +0100
diff --git a/io/hpmud/jd.c b/io/hpmud/jd.c
index be3c823..c15ed9c 100644
--- a/io/hpmud/jd.c
+++ b/io/hpmud/jd.c
@@ -31,6 +31,7 @@
#endif
@ -27,22 +42,25 @@ diff -urEbwBN hplip-3.20.9/io/hpmud/jd.c hplip-3.20.9.new/io/hpmud/jd.c
#include "hpmud.h"
#include "hpmudi.h"
diff -urEbwBN hplip-3.20.9/protocol/hp_ipp.c hplip-3.20.9.new/protocol/hp_ipp.c
--- hplip-3.20.9/protocol/hp_ipp.c 2020-09-23 07:24:16.000000000 +0200
+++ hplip-3.20.9.new/protocol/hp_ipp.c 2020-11-23 12:12:21.624283957 +0100
@@ -18,6 +18,9 @@
diff --git a/protocol/hp_ipp.c b/protocol/hp_ipp.c
index 8b72c65..9b05f5e 100644
--- a/protocol/hp_ipp.c
+++ b/protocol/hp_ipp.c
@@ -18,6 +18,10 @@ Boston, MA 02110-1301, USA.
\******************************************************************************/
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE
+#endif
+
#include <cups/cups.h>
#include <cups/language.h>
diff -urEbwBN hplip-3.20.9/scan/sane/bb_ledm.c hplip-3.20.9.new/scan/sane/bb_ledm.c
--- hplip-3.20.9/scan/sane/bb_ledm.c 2020-09-23 07:24:20.000000000 +0200
+++ hplip-3.20.9.new/scan/sane/bb_ledm.c 2020-11-23 12:12:21.628283981 +0100
#include <cups/ppd.h>
diff --git a/scan/sane/bb_ledm.c b/scan/sane/bb_ledm.c
index 4b18af8..eaf1299 100644
--- a/scan/sane/bb_ledm.c
+++ b/scan/sane/bb_ledm.c
@@ -27,6 +27,7 @@
# include "xml.h"
# include <stdlib.h>
@ -51,9 +69,10 @@ diff -urEbwBN hplip-3.20.9/scan/sane/bb_ledm.c hplip-3.20.9.new/scan/sane/bb_led
# include <stdint.h>
# define _STRINGIZE(x) #x
diff -urEbwBN hplip-3.20.9/scan/sane/sclpml.c hplip-3.20.9.new/scan/sane/sclpml.c
--- hplip-3.20.9/scan/sane/sclpml.c 2020-09-23 07:24:20.000000000 +0200
+++ hplip-3.20.9.new/scan/sane/sclpml.c 2020-11-23 12:12:21.628283981 +0100
diff --git a/scan/sane/sclpml.c b/scan/sane/sclpml.c
index 9a5975f..3250541 100644
--- a/scan/sane/sclpml.c
+++ b/scan/sane/sclpml.c
@@ -25,11 +25,16 @@
\************************************************************************************/
@ -71,3 +90,6 @@ diff -urEbwBN hplip-3.20.9/scan/sane/sclpml.c hplip-3.20.9.new/scan/sane/sclpml.
#include "sane.h"
#include "saneopts.h"
#include "common.h"
--
2.42.0

33
fix-printer-attributes-parsing.patch
View File

@ -1,8 +1,17 @@
Index: hplip-3.22.10/protocol/hp_ipp.c
===================================================================
--- hplip-3.22.10.orig/protocol/hp_ipp.c
+++ hplip-3.22.10/protocol/hp_ipp.c
@@ -43,6 +43,12 @@ Boston, MA 02110-1301, USA.
From 0bd5dd829e6f5509fda6cb09430ff14faa432941 Mon Sep 17 00:00:00 2001
From: Martin Wilck <mwilck@suse.com>
Date: Fri, 15 Sep 2023 18:32:08 +0200
Subject: [PATCH 19/19] hplip: fix printer attributes parsing
---
protocol/hp_ipp.c | 21 ++++++++++++++-------
1 file changed, 14 insertions(+), 7 deletions(-)
diff --git a/protocol/hp_ipp.c b/protocol/hp_ipp.c
index 9b05f5e..3ba83fa 100644
--- a/protocol/hp_ipp.c
+++ b/protocol/hp_ipp.c
@@ -43,6 +43,13 @@ Boston, MA 02110-1301, USA.
#define _STRINGIZE(x) #x
#define STRINGIZE(x) _STRINGIZE(x)
@ -12,19 +21,20 @@ Index: hplip-3.22.10/protocol/hp_ipp.c
+ dst[size - 1] = '\0'; \
+ } while (0)
+
http_t* acquireCupsInstance()
+
http_t *acquireCupsInstance()
{
@@ -113,7 +119,7 @@ int addCupsPrinter(char *name, char *dev
if (http == NULL)
@@ -113,7 +120,7 @@ int addCupsPrinter(char *name, char *device_uri, char *location, char *ppd_file,
}
if ( info == NULL )
- snprintf( info,sizeof(info), name );
+ hplip_strlcpy( info, name, sizeof(info));
sprintf( printer_uri, "ipp://localhost/printers/%s", name );
sprintf(printer_uri, "ipp://localhost/printers/%s", name);
@@ -514,27 +520,27 @@ int __parsePrinterAttributes(ipp_t *resp
@@ -518,27 +525,27 @@ int __parsePrinterAttributes(ipp_t *response, printer_t **printer_list)
if ( strcmp(attr_name, "printer-name") == 0 &&
val_tag == IPP_TAG_NAME ) {
@ -58,3 +68,6 @@ Index: hplip-3.22.10/protocol/hp_ipp.c
}
else if ( strcmp(attr_name, "printer-state") == 0 &&
val_tag == IPP_TAG_ENUM ) {
--
2.42.0

27
hp_ipp.h-add-missing-prototypes.patch
View File

@ -1,7 +1,17 @@
diff -urEbwBN hplip-3.20.9/protocol/hp_ipp.h hplip-3.20.9.new/protocol/hp_ipp.h
--- hplip-3.20.9/protocol/hp_ipp.h 2020-09-23 07:24:16.000000000 +0200
+++ hplip-3.20.9.new/protocol/hp_ipp.h 2020-11-23 12:17:09.178020748 +0100
@@ -149,6 +149,7 @@
From 10fe460cca9536dbb52c30fa8bec5c6a01e94ea0 Mon Sep 17 00:00:00 2001
From: Martin Wilck <mwilck@suse.com>
Date: Fri, 15 Sep 2023 18:28:47 +0200
Subject: [PATCH 09/19] hp_ipp.h: add missing prototypes
---
protocol/hp_ipp.h | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/protocol/hp_ipp.h b/protocol/hp_ipp.h
index 032be9a..518d0ae 100644
--- a/protocol/hp_ipp.h
+++ b/protocol/hp_ipp.h
@@ -149,6 +149,7 @@ int auth_cancel_req = 0; // 0--> authentication cancel is not requested,
http_t* acquireCupsInstance();
@ -9,8 +19,8 @@ diff -urEbwBN hplip-3.20.9/protocol/hp_ipp.h hplip-3.20.9.new/protocol/hp_ipp.h
const char *getCupsErrorString(int status);
void freePrinterList(printer_t *list);
@@ -162,6 +163,11 @@
ipp_t * networkDoRequest(ipp_t *request, char* device_uri);
@@ -163,6 +164,11 @@ ipp_t *usbDoFileRequest(ipp_t *request, int iFileHandle,char *device_uri, const
ipp_t * networkDoRequest(ipp_t *request, char* device_uri,const char *resource);
ipp_t * getDeviceStatusAttributes(char* device_uri,char* printer_name, int *count);
int getCupsPrinters(printer_t **printer_list);
+int addCupsPrinter(char *name, char *device_uri, char *location, char *ppd_file,
@ -20,4 +30,7 @@ diff -urEbwBN hplip-3.20.9/protocol/hp_ipp.h hplip-3.20.9.new/protocol/hp_ipp.h
+int controlCupsPrinter(char *pr_name, int op);
HPIPP_RESULT parseResponseHeader(char* header, int *content_length, int *chunked, int* header_size);
HPIPP_RESULT prepend_http_header(raw_ipp *raw_request);
HPIPP_RESULT prepend_http_header(raw_ipp *raw_request,const char *resource);
--
2.42.0

3
hplip-3.22.10.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:533c3f2f6b53e4163ded4fd81d1f11ae6162a0f6451bd5e62a8382d0c1366624
size 29333247

6
hplip-3.22.10.tar.gz.asc
View File

@ -1,6 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iF0EABECAB0WIQRKui9m29WpWJSRDgZz13DNpZBHuQUCY1qE5wAKCRBz13DNpZBH
udspAJ4ySBCmJKGZ/YlOKRo2Z6N0vGniYACfQ9mtdi2GC12Tt1HQRYol+xu6QIw=
=XQRp
-----END PGP SIGNATURE-----

3
hplip-3.23.5.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:f68e5ed749b122fc3654a69c4206e840a53b68d981e55e023fb4d3fb8995cbc8
size 30111293

6
hplip-3.23.5.tar.gz.asc Normal file
View File

@ -0,0 +1,6 @@
-----BEGIN PGP SIGNATURE-----
iF0EABECAB0WIQRKui9m29WpWJSRDgZz13DNpZBHuQUCZHmkOQAKCRBz13DNpZBH
uaeIAJwPrdTl+21cxNCTG84Ub1BuzxxEsQCggx2wTXJbL5e42gw1OdoXzr+Kz3A=
=p6wA
-----END PGP SIGNATURE-----

56
hplip.changes
View File

@ -1,3 +1,59 @@
-------------------------------------------------------------------
Fri Sep 15 16:09:11 UTC 2023 - Martin Wilck <mwilck@suse.com>
- Update to hplip 3.23.5
* added new CUPS filter hpcdmfax
- Support for new printers:
* HP Smart Tank 520_540 series
* HP Smart Tank 580-590 series
* HP Smart Tank 5100 series
* HP Smart Tank 210-220 series
* HP Color LaserJet Enterprise 6700dn
* HP Color LaserJet Enterprise 6700
* HP Color LaserJet Enterprise 6701dn
* HP Color LaserJet Enterprise 6701
* HP Color LaserJet Enterprise X654dn
* HP Color LaserJet Enterprise X65455dn
* HP Color LaserJet Enterprise X654
* HP Color LaserJet Enterprise X65465dn
* HP Color LaserJet Enterprise X654 65 PPM
* HP Color LaserJet Enterprise X654 55 to 65ppm License
* HP Color LaserJet Enterprise X654 Down License
* HP Color LaserJet Enterprise MFP 6800dn
* HP Color LaserJet Enterprise Flow MFP 6800zf
* HP Color LaserJet Enterprise Flow MFP 6800zfsw
* HP Color LaserJet Enterprise Flow MFP 6800zfw+
* HP Color LaserJet Enterprise MFP 6800
* HP Color LaserJet Enterprise MFP 6801
* HP Color LaserJet Enterprise MFP 6801 zfsw
* HP Color LaserJet Enterprise Flow MFP 6801zfw+
* HP Color LaserJet Enterprise MFP X677 55 to 65ppm License
* HP Color LaserJet Enterprise MFP X677 65ppm
* HP Color LaserJet Enterprise MFP X677s
* HP Color LaserJet Enterprise Flow MFP X677z
* HP Color LaserJet Enterprise MFP X67765dn
* HP Color LaserJet Enterprise Flow MFP X67765zs
* HP Color LaserJet Enterprise Flow MFP X67765z+
* HP Color LaserJet Enterprise MFP X677
* HP Color LaserJet Enterprise MFP X67755dn
* HP Color LaserJet Enterprise Flow MFP X67755zs
* HP Color LaserJet Enterprise Flow MFP X67755z+
* HP Color LaserJet Enterprise MFP X677dn
* HP Color LaserJet Enterprise Flow MFP X677zs
* HP Color LaserJet Enterprise Flow MFP X677z+
* HP Color LaserJet Enterprise 5700dn
* HP Color LaserJet Enterprise 5700
* HP Color LaserJet Enterprise X55745dn
* HP Color LaserJet Enterprise X55745
* HP Color LaserJet Enterprise MFP 5800dn
* HP Color LaserJet Enterprise MFP 5800f
* HP Color LaserJet Enterprise Flow MFP 5800zf
* HP Color LaserJet Enterprise MFP 5800
* HP Color LaserJet Enterprise MFP X57945
* HP Color LaserJet Enterprise Flow MFP X57945zs
* HP Color LaserJet Enterprise MFP X57945dn
* HP Color LaserJet Enterprise Flow MFP X57945z
-------------------------------------------------------------------
Wed Mar 29 04:59:28 UTC 2023 - Antonio Larrosa <alarrosa@suse.com>

3
hplip.spec
View File

@ -24,7 +24,7 @@
%define pyexe %{_bindir}/python3
%global use_qt5 1
Name: hplip
Version: 3.22.10
Version: 3.23.5
Release: 0
Summary: HP's Printing, Scanning, and Faxing Software
License: BSD-3-Clause AND GPL-2.0-or-later AND MIT
@ -706,6 +706,7 @@ exit 0
%dir %{_prefix}/lib/cups/filter
%{_prefix}/lib/cups/filter/hpcups
%{_prefix}/lib/cups/filter/hpcupsfax
%{_prefix}/lib/cups/filter/hpcdmfax
%{_prefix}/lib/cups/filter/pstotiff
%dir %{_datadir}/cups
%dir %{_datadir}/cups/model