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

Accepting request 143650 from home:jsmeix:branches:Printing

Browse Source 
Version upgrade to 3.12.11

OBS-URL: https://build.opensuse.org/request/show/143650
OBS-URL: https://build.opensuse.org/package/show/Printing/hplip?expand=0&rev=59
This commit is contained in:
Johannes Meixner 2012-11-30 11:22:19 +00:00 committed by Git OBS Bridge
parent d7f4ed5f98
commit 147129274d
7 changed files with 62 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
no-chgrp_lp_hplip_Logdir.diff → disable-chgrp_lp.diff
View File

@ -1,18 +1,18 @@
--- Makefile.am.orig 2012-09-04 14:34:06.000000000 +0200
+++ Makefile.am 2012-09-28 11:18:21.065027065 +0200
--- 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 774 $(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 774 $(DESTDIR)$(hplip_Logdir)
chmod 777 $(DESTDIR)$(hplip_Logdir)
endif #FULL_BUILD
install-dist_hplip_tmpDATA:
@ -20,12 +20,12 @@
test -z "$(DESTDIR)$(hplip_tmpdir)" || mkdir -p $(DESTDIR)$(hplip_tmpdir)
- chgrp "lp" -R $(DESTDIR)$(hplip_tmpdir)
+# chgrp "lp" -R $(DESTDIR)$(hplip_tmpdir)
chmod 1774 $(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 1774 $(DESTDIR)$(hplip_tmpdir)
chmod 1777 $(DESTDIR)$(hplip_tmpdir)
endif #FULL_BUILD

11
fix-no-return-in-nonvoid-function.diff
View File

@ -1,11 +0,0 @@
--- scan/sane/hpaio.c.orig 2012-09-04 14:32:55.000000000 +0200
+++ scan/sane/hpaio.c 2012-09-28 14:20:24.595427330 +0200
@@ -368,7 +368,7 @@ extern const SANE_Option_Descriptor * sa
if (strcmp(*((char **)handle), "SCL-PML") == 0)
return sclpml_get_option_descriptor(handle, option);
else
- return SANE_STATUS_UNSUPPORTED;
+ return NULL;
} /* sane_hpaio_get_option_descriptor() */
extern SANE_Status sane_hpaio_control_option(SANE_Handle handle, SANE_Int option, SANE_Action action, void * pValue, SANE_Int * pInfo )

3
hplip-3.12.10a.tar.gz
View File

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

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

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

17
hplip.changes
View File

@ -1,3 +1,18 @@
-------------------------------------------------------------------
Thu Nov 29 15:27:51 CET 2012 - jsmeix@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.
-------------------------------------------------------------------
Wed Oct 10 14:23:14 CEST 2012 - jsmeix@suse.de
@ -44,7 +59,7 @@ Thu Oct 4 13:37:56 CEST 2012 - jsmeix@suse.de
-------------------------------------------------------------------
Fri Sep 28 12:42:33 UTC 2012 - mmeister@suse.com
- Fixed fix-no-return-in-nonvoid-function.diff because
- Adapted fix-no-return-in-nonvoid-function.diff because
HP's upstream fix is insufficient (not 64-bit safe),
see https://bugs.launchpad.net/hplip/+bug/1017496
- Adapted no-chgrp_lp_hplip_Logdir.diff so that it

59
hplip.spec
View File

@ -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 @@ Summary: HP's Printing, Scanning, and Faxing Software
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) <hplip@hp.com>"
Source0: hplip-%{version}.tar.gz
# Patch0...Patch9 is for patches from HP:
@ -73,10 +77,6 @@ Patch10: fix-uninitialized-variables.diff
# 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 @@ Source106: hp-systray.wrapper
# 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 @@ with the scan drivers in HPLIP for standard HP all-in-one printers.
# 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 @@ install -m 755 %{SOURCE106} %{buildroot}%{_bindir}/hp-systray.wrapper
# 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 @@ exit 0
%{_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

6
no-hplip_cron.diff
View File

@ -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)