Hello community, here is the log from the commit of package hplip for openSUSE:Factory checked in at 2015-12-17 15:53:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/hplip (Old) and /work/SRC/openSUSE:Factory/.hplip.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "hplip" Changes: -------- --- /work/SRC/openSUSE:Factory/hplip/hplip.changes 2015-10-19 22:48:22.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.hplip.new/hplip.changes 2015-12-17 15:53:03.000000000 +0100 @@ -1,0 +2,103 @@ +Wed Dec 9 10:55:45 UTC 2015 - tchva...@suse.com + +- Fix build on SLE11 by removing not required and wrongly installed + selinux support config +- Remove another nested conditions that are the same + +------------------------------------------------------------------- +Tue Dec 8 20:09:01 UTC 2015 - tchva...@suse.com + +- Do not bother with fsf address fix, if they move again or if the + package update it we would needlessly fail +- Do not bother with one condition that is equal to the following one + +------------------------------------------------------------------- +Thu Nov 19 11:25:19 UTC 2015 - ec...@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 needed + because since HPLIP 3.15.11 there is no longer "open_mdns_port=..." + in distros.dat for any "SUSE" distribution +- 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 + +------------------------------------------------------------------- Old: ---- do_not_open_mdns_port.diff hplip-3.15.9.tar.gz hplip-3.15.9.tar.gz.asc New: ---- hplip-3.15.11.tar.gz hplip-3.15.11.tar.gz.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hplip.spec ++++++ --- /var/tmp/diff_new_pack.Oe5vT5/_old 2015-12-17 15:53:05.000000000 +0100 +++ /var/tmp/diff_new_pack.Oe5vT5/_new 2015-12-17 15:53:05.000000000 +0100 @@ -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 @@ # 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 @@ # 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 @@ %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,7 @@ %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 %build # If AUTOMAKE='automake --foreign' is not set, autoreconf (in fact automake) @@ -470,6 +468,10 @@ # while in contrast manual printer setup via hp-setup usually "just works" # and it is clear for the user what goes on and in case of failure what went wrong. rm %{buildroot}%{_libexecdir}/systemd/system/hplip-printer@.service +# Remove selinux configurations we are not supporting on SUSE +# force for not on all distributions the files were installed +# Can't be disabled during configure +rm -f %{buildroot}/%{name}.{fc,if,pp,te} # Begin "General tests and adjustments for all PPDs" (see manufacturer-PPDs.spec): pushd %{buildroot}%{_datadir}/cups/model/manufacturer-PPDs/%{name} # Do not pollute the build log file with zillions of meaningless messages: @@ -577,11 +579,7 @@ %post -p /bin/bash %if 0%{?suse_version} > 1130 %udev_rules_update -%endif -%if 0%{?suse_version} >= 1140 %desktop_database_post -%endif -%if 0%{?suse_version} > 1130 %icon_theme_cache_post %else gtk-update-icon-cache %{_datadir}/icons/hicolor || true @@ -604,8 +602,6 @@ %postun -p /bin/bash %if 0%{?suse_version} >= 1140 %desktop_database_postun -%endif -%if 0%{?suse_version} > 1130 %icon_theme_cache_postun %else gtk-update-icon-cache %{_datadir}/icons/hicolor || true @@ -641,7 +637,7 @@ %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 +707,7 @@ %{_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 +740,7 @@ %{_libdir}/libhpip.so %{_libdir}/libhpipp.so %{_libdir}/libhpmud.so +%{_libdir}/libhpdiscovery.so %{_libdir}/*.la %{_libdir}/sane/libsane-hpaio.so %{_libdir}/sane/*.la ++++++ add_missing_includes_and_define_GNU_SOURCE.patch ++++++ --- /var/tmp/diff_new_pack.Oe5vT5/_old 2015-12-17 15:53:06.000000000 +0100 +++ /var/tmp/diff_new_pack.Oe5vT5/_new 2015-12-17 15:53:06.000000000 +0100 @@ -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" - ++++++ hplip-3.15.9.tar.gz -> hplip-3.15.11.tar.gz ++++++ /work/SRC/openSUSE:Factory/hplip/hplip-3.15.9.tar.gz /work/SRC/openSUSE:Factory/.hplip.new/hplip-3.15.11.tar.gz differ: char 5, line 1
