Hello community, here is the log from the commit of package hplip for openSUSE:Factory checked in at 2012-12-03 09:39:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/hplip (Old) and /work/SRC/openSUSE:Factory/.hplip.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "hplip", Maintainer is "jsm...@suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/hplip/hplip.changes 2012-10-12 08:11:31.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.hplip.new/hplip.changes 2012-12-03 09:39:33.000000000 +0100 @@ -1,0 +2,15 @@ +Thu Nov 29 15:27:51 CET 2012 - jsm...@suse.de + +- Version upgrade to 3.12.11: + Several more supported printers and all-in-one devices + (in particular several "HP LaserJet Enterprise" models). + Several bug fixes. + For details see + http://hplipopensource.com/hplip-web/release_notes.html +- fix-no-return-in-nonvoid-function.diff is no longer needed + because it is now completely fixed in the upstream sources. +- disable-chgrp_lp.diff replaces no-chgrp_lp_hplip_Logdir.diff + and does basically the same but is adapted for HPLIP 3.12.11. +- Adapted no-hplip_cron.diff for HPLIP 3.12.11. + +------------------------------------------------------------------- @@ -47 +62 @@ -- Fixed fix-no-return-in-nonvoid-function.diff because +- Adapted fix-no-return-in-nonvoid-function.diff because Old: ---- fix-no-return-in-nonvoid-function.diff hplip-3.12.10a.tar.gz no-chgrp_lp_hplip_Logdir.diff New: ---- disable-chgrp_lp.diff hplip-3.12.11.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hplip.spec ++++++ --- /var/tmp/diff_new_pack.TOLyjW/_old 2012-12-03 09:39:36.000000000 +0100 +++ /var/tmp/diff_new_pack.TOLyjW/_new 2012-12-03 09:39:36.000000000 +0100 @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: hplip # BuildRequires foomatic-filters to avoid /usr/lib/rpm/brp-symlink ERROR: # link target doesn't exist (neither in build root nor in installed system): @@ -53,17 +54,20 @@ License: BSD-3-Clause and GPL-2.0+ and MIT Group: Hardware/Printing # HPLIP has reached 1.0 status. With this release a date encoded revision number is used: -# x.y.m : x = major release number, y = year (eg: 6 = 2006), m = month (eg: 6a = second release in June) +# x.y.m : x = major release number, y = year (e.g.: 12 = 2012), m = month (e.g.: 10 = October) +# additionally the month could have an 'a' 'b' 'c' suffix (e.g.: 10a = second release in October) +# where 'a' or 'b' do not mean 'alpha' or 'beta' but 'second' or 'third' release in the month +# (usually bugfix releases have the suffix like 3.12.10a = first bugfix release for 3.12.10). # Official releases have a 3 digit number and release candidates have a 4 digit number: x.y.m.rc -Version: 3.12.10a +Version: 3.12.11 Release: 0 Url: http://hplipopensource.com # Source0...Source9 is for sources from HP: -# URL for Source0: http://prdownloads.sourceforge.net/hplip/hplip-3.12.10a.tar.gz -# URL to verify Source0: http://prdownloads.sourceforge.net/hplip/hplip-3.12.10a.tar.gz.asc +# URL for Source0: http://prdownloads.sourceforge.net/hplip/hplip-3.12.11.tar.gz +# URL to verify Source0: http://prdownloads.sourceforge.net/hplip/hplip-3.12.11.tar.gz.asc # How to verify Source0 see: http://hplipopensource.com/node/327 # For example: /usr/bin/gpg --keyserver pgp.mit.edu --recv-keys 0xA59047B9 -# /usr/bin/gpg --verify hplip-3.12.10a.tar.gz.asc hplip-3.12.10a.tar.gz +# /usr/bin/gpg --verify hplip-3.12.11.tar.gz.asc hplip-3.12.11.tar.gz # must result: Good signature from "HPLIP (HP Linux Imaging and Printing) <hp...@hp.com>" Source0: hplip-%{version}.tar.gz # Patch0...Patch9 is for patches from HP: @@ -73,10 +77,6 @@ # Patch11 fix_gcc44_glib.diff is obsolete since version 3.9.6b because it is fixed in the source. # Patch12 hplip-3.9.8-CVE-2010-4267.patch fixes a remote buffer overflow in hpmud/pml.c: Patch12: hplip-3.9.8-CVE-2010-4267.patch -# Fix validation errors about no return values for non-void functions. -# An upstream bug report is open at -# https://bugs.launchpad.net/hplip/+bug/1017496 -Patch13: fix-no-return-in-nonvoid-function.diff # Source100... is for special Suse sources: # Source100 is the primary source for the suse_update_desktop_file stuff. # It is found automatically in $RPM_SOURCE_DIR by 'suse_update_desktop_file -i hplip': @@ -104,11 +104,13 @@ # Patch100... is for special Suse patches: # Patch101 changes the udev rules files 55-hpmud.rules and 56-hpmud_support.rules: Patch101: change-udev-rules.diff -# Patch102 no-chgrp_lp_hplip_Logdir.diff deactivates the "chgrp lp -R /var/log/hp" in Makefile.am -# because during install this results "Operation not permitted" -# this is done in the files section via attr(0774,root,lp) -# where mode 0774 matches to what is set in Makefile.am: -Patch102: no-chgrp_lp_hplip_Logdir.diff +# Patch102 disable-chgrp_lp.diff deactivates the "chgrp lp" in Makefile.am +# because during build this results "Operation not permitted". +# Instead it is done in the files section via attr(0775,root,lp) +# where mode 0775 is used instead of mode 0777 as in Makefile.am +# because a public writable directory /var/log/hp/ is not allowed +# to avoid security issues: +Patch102: disable-chgrp_lp.diff # Patch103 no-hplip_cron.diff deactivates the "cron" stuff in Makefile.am # because it lets build fail on SLE11 products (possibly an autoconf issue) # and we (i.e. SUSE) do not allow to install /etc/cron.daily/hplip_cron @@ -318,16 +320,15 @@ # Patch12 hplip-3.9.8-CVE-2010-4267.patch # fixes a remote buffer overflow in hpmud/pml.c: %patch12 -# Patch13 fix-no-return-in-nonvoid-function.diff -# fixes no-return-in-nonvoid-function errors -%patch13 # Patch101 change-udev-rules.diff # changes the udev rules files 55-hpmud.rules and 56-hpmud_support.rules: %patch101 -# Patch102 no-chgrp_lp_hplip_Logdir.diff deactivates the "chgrp lp -R /var/log/hp" in Makefile.am -# because during install this results "Operation not permitted" -# this is done in the files section via attr(0774,root,lp) -# where mode 0774 matches to what is set in Makefile.am: +# Patch102 disable-chgrp_lp.diff deactivates the "chgrp lp" in Makefile.am +# because during build this results "Operation not permitted". +# Instead it is done in the files section via attr(0775,root,lp) +# where mode 0775 is used instead of mode 0777 as in Makefile.am +# because a public writable directory /var/log/hp/ is not allowed +# to avoid security issues: %patch102 # Patch103 no-hplip_cron.diff deactivates the "cron" stuff in Makefile.am # because it lets build fail on SLE11 products (possibly an autoconf issue) @@ -507,8 +508,16 @@ # Change /etc/xdg/autostart/hplip-systray.desktop to call hp-systray.wrapper: sed -i -e '/^Exec=hp-systray$/s/hp-systray/hp-systray.wrapper/;' %{buildroot}/etc/xdg/autostart/hplip-systray.desktop # End of "Desktop autostart notification tray stuff". -# Find duplicate files: -%fdupes -s %{buildroot} +# Run fdupes: +# The RPM macro fdupes runs /usr/bin/fdupes that links files with identical content. +# Never run fdupes carelessly over the whole buildroot directory +# because in older openSUSE and SLE11 versions fdupes +# links files with different owner, group, or permissions +# see https://bugzilla.novell.com/show_bug.cgi?id=784670 +# and even in current openSUSE versions fdupes links across sub-package boundaries, +# compare https://bugzilla.novell.com/show_bug.cgi?id=784869 +# so that fdupes can only run for specific directories where linking files is safe: +%fdupes -s %{buildroot}/%{_datadir}/hplip/data/images %post %if 0%{?suse_version} > 1130 @@ -665,8 +674,8 @@ %{_datadir}/cups/model/manufacturer-PPDs/%{name}/ %{_datadir}/%{name}/data/models/models.dat # Use fixed "/var/log/hp" because this is hardcoded in the HPLIP sources. -# Regarding attr(0774,root,lp) see no-chgrp_lp_hplip_Logdir.diff (Patch102): -%dir %attr(0774,root,lp) /var/log/hp +# Regarding attr(0775,root,lp) see disable-chgrp_lp.diff (Patch102): +%dir %attr(0775,root,lp) /var/log/hp # Use fixed "/var/lib/hp" because this is hardcoded in the HPLIP sources: %dir /var/lib/hp ++++++ disable-chgrp_lp.diff ++++++ --- Makefile.am.orig 2012-11-20 10:55:15.000000000 +0100 +++ Makefile.am 2012-11-29 16:08:51.000000000 +0100 @@ -552,24 +552,24 @@ endif install-dist_hplip_LogDATA: if FULL_BUILD test -z "$(DESTDIR)$(hplip_Logdir)" || mkdir -p $(DESTDIR)$(hplip_Logdir) - chgrp "lp" -R $(DESTDIR)$(hplip_Logdir) +# chgrp "lp" -R $(DESTDIR)$(hplip_Logdir) chmod 777 $(DESTDIR)$(hplip_Logdir) endif #FULL_BUILD if HPLIP_BUILD test -z "$(DESTDIR)$(hplip_Logdir)" || mkdir -p $(DESTDIR)$(hplip_Logdir) - chgrp "lp" -R $(DESTDIR)$(hplip_Logdir) +# chgrp "lp" -R $(DESTDIR)$(hplip_Logdir) chmod 777 $(DESTDIR)$(hplip_Logdir) endif #FULL_BUILD install-dist_hplip_tmpDATA: if FULL_BUILD test -z "$(DESTDIR)$(hplip_tmpdir)" || mkdir -p $(DESTDIR)$(hplip_tmpdir) - chgrp "lp" -R $(DESTDIR)$(hplip_tmpdir) +# chgrp "lp" -R $(DESTDIR)$(hplip_tmpdir) chmod 1777 $(DESTDIR)$(hplip_tmpdir) endif #FULL_BUILD if HPLIP_BUILD test -z "$(DESTDIR)$(hplip_tmpdir)" || mkdir -p $(DESTDIR)$(hplip_tmpdir) - chgrp "lp" -R $(DESTDIR)$(hplip_tmpdir) +# chgrp "lp" -R $(DESTDIR)$(hplip_tmpdir) chmod 1777 $(DESTDIR)$(hplip_tmpdir) endif #FULL_BUILD ++++++ hplip-3.12.10a.tar.gz -> hplip-3.12.11.tar.gz ++++++ /work/SRC/openSUSE:Factory/hplip/hplip-3.12.10a.tar.gz /work/SRC/openSUSE:Factory/.hplip.new/hplip-3.12.11.tar.gz differ: char 5, line 1 ++++++ no-hplip_cron.diff ++++++ --- /var/tmp/diff_new_pack.TOLyjW/_old 2012-12-03 09:39:36.000000000 +0100 +++ /var/tmp/diff_new_pack.TOLyjW/_new 2012-12-03 09:39:36.000000000 +0100 @@ -1,5 +1,5 @@ ---- Makefile.am.after-no-chgrp_lp_hplip_Logdir.diff 2012-09-28 15:17:30.000000000 +0200 -+++ Makefile.am 2012-09-28 15:19:34.000000000 +0200 +--- Makefile.am.disable-chgrp_lp.diff.applied 2012-11-29 16:49:56.000000000 +0100 ++++ Makefile.am 2012-11-29 16:51:13.000000000 +0100 @@ -107,8 +107,8 @@ hp_mkuri_LDADD = -ldl libhpmud.la hp_mkuri_CFLAGS = -DCONFDIR=\"$(hplip_confdir)\" @@ -12,7 +12,7 @@ # hpmud.rules rulesdir = /etc/udev/rules.d @@ -573,17 +573,17 @@ if HPLIP_BUILD - chmod 1774 $(DESTDIR)$(hplip_tmpdir) + chmod 1777 $(DESTDIR)$(hplip_tmpdir) endif #FULL_BUILD -install-dist_cronDATA:$(dist_cron_DATA) -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
