Accepting request 345335 from home:ecsos
update to 3.15.11. Some other changes, see hplip.changes OBS-URL: https://build.opensuse.org/request/show/345335 OBS-URL: https://build.opensuse.org/package/show/Printing/hplip?expand=0&rev=122
This commit is contained in:
Tomáš Chvátal
committed by
Git OBS Bridge
Git OBS Bridge
parent
2fdecea380
commit
6b5e16a864
@@ -1,5 +1,41 @@
|
||||
--- protocol/hp_ipp.c.orig 2015-04-14 11:53:09.000000000 +0200
|
||||
+++ protocol/hp_ipp.c 2015-05-19 13:12:47.000000000 +0200
|
||||
diff -Pdpru hplip-3.15.11.orig/io/hpmud/jd.c hplip-3.15.11/io/hpmud/jd.c
|
||||
--- hplip-3.15.11.orig/io/hpmud/jd.c 2015-11-12 11:29:02.000000000 +0100
|
||||
+++ hplip-3.15.11/io/hpmud/jd.c 2015-11-19 16:49:59.902956345 +0100
|
||||
@@ -31,6 +31,7 @@
|
||||
#endif
|
||||
|
||||
#include <signal.h>
|
||||
+#include <stdlib.h>
|
||||
#include "hpmud.h"
|
||||
#include "hpmudi.h"
|
||||
|
||||
diff -Pdpru hplip-3.15.11.orig/protocol/discovery/mdns.c hplip-3.15.11/protocol/discovery/mdns.c
|
||||
--- hplip-3.15.11.orig/protocol/discovery/mdns.c 2015-11-12 11:29:01.000000000 +0100
|
||||
+++ hplip-3.15.11/protocol/discovery/mdns.c 2015-11-19 16:46:02.785546885 +0100
|
||||
@@ -24,7 +24,11 @@
|
||||
Author: Sanjay Kumar
|
||||
\*****************************************************************************/
|
||||
|
||||
-//#include <stdio.h>
|
||||
+#ifndef _GNU_SOURCE
|
||||
+#define _GNU_SOURCE
|
||||
+#endif
|
||||
+
|
||||
+#include <stdio.h>
|
||||
#include <string.h>
|
||||
#include <syslog.h>
|
||||
#include <sys/socket.h>
|
||||
@@ -32,6 +36,7 @@
|
||||
#include <netdb.h>
|
||||
#include <arpa/inet.h>
|
||||
#include "mdns.h"
|
||||
+#include <unistd.h>
|
||||
|
||||
/* Convert "www.google.com" to "3www6google3com". */
|
||||
static int mdns_convert_name_to_dns(const char *name, int name_size, char *dns_name)
|
||||
diff -Pdpru hplip-3.15.11.orig/protocol/hp_ipp.c hplip-3.15.11/protocol/hp_ipp.c
|
||||
--- hplip-3.15.11.orig/protocol/hp_ipp.c 2015-11-12 11:29:01.000000000 +0100
|
||||
+++ hplip-3.15.11/protocol/hp_ipp.c 2015-11-19 16:45:57.890095775 +0100
|
||||
@@ -18,6 +18,9 @@ Boston, MA 02110-1301, USA.
|
||||
|
||||
\******************************************************************************/
|
||||
@@ -10,8 +46,31 @@
|
||||
|
||||
#include <cups/cups.h>
|
||||
#include <cups/language.h>
|
||||
--- scan/sane/sclpml.c.orig 2015-04-14 11:53:17.000000000 +0200
|
||||
+++ scan/sane/sclpml.c 2015-05-19 13:45:44.000000000 +0200
|
||||
diff -Pdpru hplip-3.15.11.orig/scan/sane/bb_ledm.c hplip-3.15.11/scan/sane/bb_ledm.c
|
||||
--- hplip-3.15.11.orig/scan/sane/bb_ledm.c 2015-11-12 11:28:47.000000000 +0100
|
||||
+++ hplip-3.15.11/scan/sane/bb_ledm.c 2015-11-19 16:48:12.798968122 +0100
|
||||
@@ -27,6 +27,7 @@
|
||||
# include "xml.h"
|
||||
# include <stdlib.h>
|
||||
|
||||
+# include <unistd.h>
|
||||
# include <stdint.h>
|
||||
|
||||
# define _STRINGIZE(x) #x
|
||||
diff -Pdpru hplip-3.15.11.orig/scan/sane/hpaio.c hplip-3.15.11/scan/sane/hpaio.c
|
||||
--- hplip-3.15.11.orig/scan/sane/hpaio.c 2015-11-12 11:28:47.000000000 +0100
|
||||
+++ hplip-3.15.11/scan/sane/hpaio.c 2015-11-19 16:49:04.461174386 +0100
|
||||
@@ -45,6 +45,7 @@
|
||||
#include "ledm.h"
|
||||
#include "sclpml.h"
|
||||
#include "escl.h"
|
||||
+#include "io.h"
|
||||
|
||||
#define DEBUG_DECLARE_ONLY
|
||||
#include "sanei_debug.h"
|
||||
diff -Pdpru hplip-3.15.11.orig/scan/sane/sclpml.c hplip-3.15.11/scan/sane/sclpml.c
|
||||
--- hplip-3.15.11.orig/scan/sane/sclpml.c 2015-11-12 11:28:47.000000000 +0100
|
||||
+++ hplip-3.15.11/scan/sane/sclpml.c 2015-11-19 16:48:16.290576562 +0100
|
||||
@@ -25,11 +25,16 @@
|
||||
|
||||
\************************************************************************************/
|
||||
@@ -29,34 +88,3 @@
|
||||
#include "sane.h"
|
||||
#include "saneopts.h"
|
||||
#include "common.h"
|
||||
--- scan/sane/bb_ledm.c.orig 2015-05-19 13:47:53.000000000 +0200
|
||||
+++ scan/sane/bb_ledm.c 2015-05-19 13:48:42.000000000 +0200
|
||||
@@ -26,7 +26,7 @@
|
||||
# include "http.h"
|
||||
# include "xml.h"
|
||||
# include <stdlib.h>
|
||||
-
|
||||
+# include <unistd.h>
|
||||
# include <stdint.h>
|
||||
|
||||
# define _STRINGIZE(x) #x
|
||||
--- scan/sane/hpaio.c.orig 2015-04-14 11:53:17.000000000 +0200
|
||||
+++ scan/sane/hpaio.c 2015-05-19 13:51:21.000000000 +0200
|
||||
@@ -43,6 +43,7 @@
|
||||
#include "hpaio.h"
|
||||
# include "ledm.h"
|
||||
#include "sclpml.h"
|
||||
+#include "io.h"
|
||||
|
||||
#define DEBUG_DECLARE_ONLY
|
||||
#include "sanei_debug.h"
|
||||
--- io/hpmud/jd.c.orig 2015-05-19 13:46:39.000000000 +0200
|
||||
+++ io/hpmud/jd.c 2015-05-19 13:47:01.000000000 +0200
|
||||
@@ -31,6 +31,7 @@
|
||||
#endif
|
||||
|
||||
#include <signal.h>
|
||||
+#include <stdlib.h>
|
||||
#include "hpmud.h"
|
||||
#include "hpmudi.h"
|
||||
|
||||
|
||||
@@ -1,20 +0,0 @@
|
||||
--- installer/distros.dat.orig 2014-04-04 12:40:20.000000000 +0200
|
||||
+++ installer/distros.dat 2014-04-09 16:01:30.000000000 +0200
|
||||
@@ -150,7 +150,7 @@ drv_dir=/usr/share/cups/drv/HP
|
||||
cups_path_with_bitness=0
|
||||
ui_toolkit=qt4
|
||||
native_cups=1
|
||||
-open_mdns_port=/bin/bash ./init-suse-firewall
|
||||
+open_mdns_port=/bin/true
|
||||
pre_depend_cmd=su -c "zypper refresh"
|
||||
|
||||
[suse:12.2:cups]
|
||||
@@ -270,7 +270,7 @@ drv_dir=/usr/share/cups/drv/HP
|
||||
cups_path_with_bitness=0
|
||||
ui_toolkit=qt4
|
||||
native_cups=1
|
||||
-open_mdns_port=/bin/bash ./init-suse-firewall
|
||||
+open_mdns_port=/bin/true
|
||||
pre_depend_cmd=su -c "zypper refresh"
|
||||
|
||||
[suse:12.3:cups]
|
||||
3
hplip-3.15.11.tar.gz
Normal file
3
hplip-3.15.11.tar.gz
Normal file
@@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:33c4711bde04a34b81f3f70e6277a0375dded171469e5aa8b9cef1a14a407c6d
|
||||
size 22277756
|
||||
7
hplip-3.15.11.tar.gz.asc
Normal file
7
hplip-3.15.11.tar.gz.asc
Normal file
@@ -0,0 +1,7 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
Version: GnuPG v1.4.11 (GNU/Linux)
|
||||
|
||||
iEYEABECAAYFAlZEazsACgkQc9dwzaWQR7m3UACgg+Msyrw5eUu3E3fYuWbLzEE6
|
||||
9bgAnic5tdUXV8L6kYmUUyAnr8MlJ6WU
|
||||
=zfDs
|
||||
-----END PGP SIGNATURE-----
|
||||
@@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:a1f58fe8707373c193728a7fd826523e99c30e3ca7f660faa75531acdff89d6d
|
||||
size 22027325
|
||||
@@ -1,7 +0,0 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
Version: GnuPG v1.4.11 (GNU/Linux)
|
||||
|
||||
iEYEABECAAYFAlX2z8EACgkQc9dwzaWQR7mrjQCg1MPmG47ae3zvUk/N9ttQNAsq
|
||||
ZH4AoOa9lePyg+gH5dvMf//5Pv9IDRRN
|
||||
=7lGg
|
||||
-----END PGP SIGNATURE-----
|
||||
@@ -1,3 +1,90 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Nov 19 11:25:19 UTC 2015 - ecsos@opensuse.org
|
||||
|
||||
- Version upgrade to 3.15.11:
|
||||
Significant Changes:
|
||||
- Provided custom apparmor profiles and selinux policy for
|
||||
HPLIP.
|
||||
- Supported auto-discovery of network scanners.
|
||||
Added Support for the Following New Printers:
|
||||
HP Color LaserJet Pro MFP M274n
|
||||
HP LaserJet Enterprise M506 series
|
||||
HP Laserjet Enterprise M506n
|
||||
HP Laserjet Enterprise M506dn
|
||||
HP Laserjet Enterprise M506x
|
||||
HP Laserjet Enterprise M506dh
|
||||
HP Color Laserjet Pro M452dn
|
||||
HP Color Laserjet Pro M452dw
|
||||
HP Color Laserjet Pro M452nw
|
||||
HP Laserjet Pro MFP M426fdn
|
||||
HP Laserjet Pro MFP M426fdw
|
||||
HP Laserjet Pro MFP M427dn
|
||||
HP Laserjet Pro MFP M427fdw
|
||||
HP Laserjet Pro MFP M426dw
|
||||
HP Laserjet Pro MFP M427dw
|
||||
HP Laserjet Enterprise MFP M527dn
|
||||
HP Laserjet Enterprise MFP M527f
|
||||
HP Laserjet Enterprise Flow MFP M527c
|
||||
HP Laserjet Enterprise Flow MFP M527z
|
||||
HP Color LaserJet Enterprise MFP M577 Series
|
||||
HP Color LaserJet Enterprise MFP M577dn
|
||||
HP Color LaserJet Enterprise MFP M577f
|
||||
HP Color LaserJet Enterprise Flow MFP M577z
|
||||
HP Color LaserJet Enterprise Flow MFP M577c
|
||||
HP LaserJet Pro M402-M403 series
|
||||
HP LaserJet Pro M402-M403 n-dn series
|
||||
HP LaserJet Pro M402dw
|
||||
HP LaserJet Pro M402n
|
||||
HP LaserJet Pro M402dn
|
||||
HP LaserJet Pro M402d
|
||||
HP LaserJet Pro M403n
|
||||
HP LaserJet Pro M403dw
|
||||
HP LaserJet Pro M403dn
|
||||
HP LaserJet Pro M403d
|
||||
HP Color Laserjet Pro MFP M477fnw
|
||||
HP Color Laserjet Pro MFP M477fdn
|
||||
HP Color Laserjet Pro MFP M477fdw
|
||||
HP Envy 5543 All-in-One Printer
|
||||
HP Envy 5544 All-in-One Printer
|
||||
HP Envy 5546 All-in-One Printer
|
||||
HP Envy 5542 e-All-in-One Printer
|
||||
HP DeskJet 2134 All-in-One Printer
|
||||
HP DeskJet 3633 All-in-One Printer
|
||||
HP DeskJet 3634 All-in-One Printer
|
||||
HP OfficeJet 4654 All-in-One Printer
|
||||
HP ENVY 4524 All-in-One Printer
|
||||
HP ENVY 4523 All-in-One Printer
|
||||
HP ENVY 4520 All-in-One Printer
|
||||
HP DeskJet Ink Advantage Ultra 4720 All-in-One Printer series
|
||||
HP DeskJet Ink Advantage Ultra 4729 All-in-One Printer
|
||||
HP DeskJet Ink Advantage 5640 All-in-One Printer series
|
||||
HP DeskJet Ink Advantage 5645 All-in-One Printer
|
||||
HP DeskJet Ink Advantage 4675 All-in-One
|
||||
HP DeskJet Ink Advantage 4676 All-in-One
|
||||
HP DeskJet Ink Advantage 4535 All-in-One
|
||||
HP DeskJet Ink Advantage 4536 All-in-One
|
||||
HP DeskJet Ink Advantage 5570 All-in-One
|
||||
HP DeskJet Ink Advantage 5575 All-in-One
|
||||
HP Scanjet Pro 3500 f1 Flatbed Scanner
|
||||
HP ENVY 5531 e-All-in-One Printer
|
||||
HP ENVY 5532 e-All-in-One Printer
|
||||
HP ENVY 5534 e-All-in-One Printer
|
||||
HP ENVY 5536 e-All-in-One Printer
|
||||
HP ENVY 5539 e-All-in-One Printer
|
||||
Added support for the following new Distro's:
|
||||
- Ubuntu 15.10
|
||||
- Fedora 23
|
||||
- OpenSUSE 42.1
|
||||
Issues fixed:
|
||||
- Provided knowledge base article to unblock the ports and
|
||||
enable SLP and mDNS services using opensuse firewall utility
|
||||
at http://hplipopensource.com/node/375
|
||||
- remove patch104: do_not_open_mdns_port.diff, no more need
|
||||
- insert check for Leap so Leap can use his own cups
|
||||
- insert check for 13.2 and Leap for udev-dirs because of
|
||||
rpmlint-error: directory not owned by package
|
||||
- fix rpmlint-error: incorrect fsf-address
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Oct 7 15:59:10 CEST 2015 - jsmeix@suse.de
|
||||
|
||||
|
||||
30
hplip.spec
30
hplip.spec
@@ -16,8 +16,14 @@
|
||||
#
|
||||
|
||||
|
||||
%if 0%{?suse_version} == 1315 && 0%{?is_opensuse}
|
||||
%define is_leap 1
|
||||
%else
|
||||
%define is_leap 0
|
||||
%endif
|
||||
|
||||
Name: hplip
|
||||
Version: 3.15.9
|
||||
Version: 3.15.11
|
||||
Release: 0
|
||||
Summary: HP's Printing, Scanning, and Faxing Software
|
||||
License: BSD-3-Clause and GPL-2.0+ and MIT
|
||||
@@ -41,10 +47,6 @@ Source102: hpijs.1.gz
|
||||
# Patch100... is for special Suse patches:
|
||||
# Patch101 change-udev-rules.diff changes the udev rules file 56-hpmud.rules
|
||||
Patch101: change-udev-rules.diff
|
||||
# Patch104 do_not_open_mdns_port.diff deactivates the open_mdns_port functionality
|
||||
# in distros.dat for SUSE distros to avoid security issues when ports in the firewall
|
||||
# get opened. see https://bugs.launchpad.net/bugs/426161
|
||||
Patch104: do_not_open_mdns_port.diff
|
||||
# Patch106 disable_hp-upgrade.patch disables hp-upgrade/upgrade.py for security reasons,
|
||||
# see https://bugzilla.novell.com/show_bug.cgi?id=853405
|
||||
# To upgrade HPLIP an openSUSE software package manager like YaST or zypper should be used.
|
||||
@@ -72,13 +74,13 @@ Patch108: add_missing_includes_and_define_GNU_SOURCE.patch
|
||||
# In contrast when it was built with CUPS < 1.6 there must not be a run-time requirement
|
||||
# for a CUPS version to ensure it works on SLE12 both with CUPS 1.7.5 and CUPS 1.5.4.
|
||||
# For suse_version values see https://en.opensuse.org/openSUSE:Build_Service_cross_distribution_howto
|
||||
%if 0%{?suse_version} > 1320
|
||||
%if 0%{?suse_version} > 1320 || %{is_leap}
|
||||
# For openSUSE after 13.2 (i.e. for current openSUSE Factory) CUPS > 1.5 is provided and required:
|
||||
BuildRequires: cups > 1.5
|
||||
BuildRequires: cups-devel > 1.5
|
||||
Requires: cups > 1.5
|
||||
%endif
|
||||
%if 0%{?suse_version} == 1315
|
||||
%if 0%{?suse_version} == 1315 && !%{is_leap}
|
||||
# For SLE12 build it with traditional CUPS 1.5.4 to ensure it works on SLE12 both with CUPS 1.7.5 and CUPS 1.5.4.
|
||||
# Only in the Printing project for SLE12 use cups154 and cups154-devel (from the cups154-SLE12 source package):
|
||||
BuildRequires: cups154
|
||||
@@ -340,10 +342,6 @@ This sub-package is only required by developers.
|
||||
%setup -q
|
||||
# Patch101 change-udev-rules.diff changes the udev rules file 56-hpmud.rules
|
||||
%patch101 -b .change-udev-rules.orig
|
||||
# Patch104 do_not_open_mdns_port.diff deactivates the open_mdns_port functionality
|
||||
# in distros.dat for SUSE distros to avoid security issues when ports in the firewall
|
||||
# get opened. see https://bugs.launchpad.net/bugs/426161
|
||||
%patch104 -b .do_not_open_mdns_port.orig
|
||||
# Patch106 disable_hp-upgrade.patch disables hp-upgrade/upgrade.py for security reasons,
|
||||
# see https://bugzilla.novell.com/show_bug.cgi?id=853405
|
||||
# To upgrade HPLIP an openSUSE software package manager like YaST or zypper should be used.
|
||||
@@ -351,7 +349,11 @@ This sub-package is only required by developers.
|
||||
%patch107 -p1 -b .udev_rules_dir.orig
|
||||
# Patch108 add_missing_includes_and_define_GNU_SOURCE.patch adds missing '#include <...>'
|
||||
# and missing '#define _GNU_SOURCE' see https://bugs.launchpad.net/hplip/+bug/1456590
|
||||
%patch108 -b .add_missing_includes_and_define_GNU_SOURCE.orig
|
||||
%patch108 -p1 -b .add_missing_includes_and_define_GNU_SOURCE.orig
|
||||
# rpmlint: fix incorrect-fsf-address
|
||||
find . -type f | xargs sed -i -e 's:59 Temple Place\, Suite 330\, Boston\, MA 02111-1307 USA:51 Franklin Street\, Fifth Floor\, Boston\, MA 02110-1301 USA:g'
|
||||
find . -type f | xargs sed -i -e 's:59 Temple Place\, Suite 330\, Boston\, MA 02111-1307 USA:51 Franklin Street\, Fifth Floor\, Boston\, MA 02110-1301 USA:g'
|
||||
find . -type f | xargs sed -i -e 's:59 Temple Place\, Suite 330\, Boston\, MA 02111-1307 USA:51 Franklin Street\, Fifth Floor\, Boston\, MA 02110-1301 USA:g'
|
||||
|
||||
%build
|
||||
# If AUTOMAKE='automake --foreign' is not set, autoreconf (in fact automake)
|
||||
@@ -641,7 +643,7 @@ exit 0
|
||||
%files
|
||||
%defattr(-, root, root)
|
||||
%config %{_sysconfdir}/xdg/autostart/hplip-systray.desktop
|
||||
%if 0%{?suse_version} == 1110
|
||||
%if 0%{?suse_version} == 1110 || 0%{?suse_version} == 1320 || %{is_leap}
|
||||
%dir /usr/lib/udev
|
||||
%dir /usr/lib/udev/rules.d
|
||||
%endif
|
||||
@@ -711,6 +713,7 @@ exit 0
|
||||
%{_libdir}/libhpip.so.*
|
||||
%{_libdir}/libhpipp.so.*
|
||||
%{_libdir}/libhpmud.so.*
|
||||
%{_libdir}/libhpdiscovery.so.*
|
||||
%dir %{_libexecdir}/cups
|
||||
%dir %{_libexecdir}/cups/backend
|
||||
%{_libexecdir}/cups/backend/hp
|
||||
@@ -743,6 +746,7 @@ exit 0
|
||||
%{_libdir}/libhpip.so
|
||||
%{_libdir}/libhpipp.so
|
||||
%{_libdir}/libhpmud.so
|
||||
%{_libdir}/libhpdiscovery.so
|
||||
%{_libdir}/*.la
|
||||
%{_libdir}/sane/libsane-hpaio.so
|
||||
%{_libdir}/sane/*.la
|
||||
|
||||
Reference in New Issue
Block a user