Accepting request 213206 from Printing

cups fixes for bnc#857372 and bnc#856731 (forwarded request 213204 from jsmeix)

OBS-URL: https://build.opensuse.org/request/show/213206
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/cups?expand=0&rev=114
This commit is contained in:
Stephan Kulow 2014-01-09 16:24:05 +00:00 committed by Git OBS Bridge
commit b022b45394
3 changed files with 41 additions and 7 deletions

View File

@ -0,0 +1,15 @@
--- data/cups.socket.in.orig 2014-01-08 15:31:12.000000000 +0100
+++ data/cups.socket.in 2014-01-08 15:33:07.000000000 +0100
@@ -3,8 +3,10 @@ Description=CUPS Printing Service Socket
[Socket]
ListenStream=@CUPS_DEFAULT_DOMAINSOCKET@
-ListenStream=631
-ListenDatagram=0.0.0.0:631
+ListenStream=127.0.0.1:631
+ListenStream=[::1]:631
+ListenDatagram=127.0.0.1:631
+ListenDatagram=[::1]:631
BindIPv6Only=ipv6-only
[Install]

View File

@ -1,11 +1,28 @@
-------------------------------------------------------------------
Wed Jan 8 16:07:44 CET 2014 - jsmeix@suse.de
- cups-0002-systemd-listen-only-on-localhost-for-socket-activation.patch
fixes the systemd cups.socket file so that systemd listens only
on localhost (bnc#857372).
- Do no longer use the Ghostscript fonts for CUPS. Instead be
in compliance with upstream and use CUPS' own Monospace fonts
in /usr/share/cups/fonts because those fonts are hardcoded
used by the CUPS filters bannertops (for CUPS banner pages and
the CUPS test page that is a special kind of banner page)
and texttops (when printing plain text files). Without CUPS'
own Monospace fonts bannertops and texttops create PostScript
that uses those fonts but without those fonts embedded which
results that PostScript interpreters use a (different) fallback
font or fail to print for some PostScript printers (bnc#856731).
-------------------------------------------------------------------
Wed Oct 9 04:15:45 UTC 2013 - crrodriguez@opensuse.org
- patch cups-move-everything-to-run.patch missed to move
CUPS_STATEDIR to run, so systemd sockets are still created
in /var/run
- Add required tmpfiles.d config snippet to ensure /run/cups
is always available.
- Add required tmpfiles.d config snippet to ensure /run/cups
is always available.
-------------------------------------------------------------------
Fri Jul 5 14:33:53 CEST 2013 - jsmeix@suse.de

View File

@ -1,7 +1,7 @@
#
# spec file for package cups
#
# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -183,6 +183,9 @@ Patch109: str4190.patch
# Patch110 avoids any possible busy loop in cups-polld in case of unusual issues
# by sleeping interval seconds see https://bugzilla.novell.com/show_bug.cgi?id=828228
Patch110: cups-polld_avoid_busy_loop.patch
# Patch111 fixes the systemd cups.socket file so that systemd listens only on localhost
# (i.e. where the cupsd itself listens by default). Patch111 must be applied on top of Patch105.
Patch111: cups-0002-systemd-listen-only-on-localhost-for-socket-activation.patch
# Install into this non-root directory (required when norootforbuild is used):
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@ -329,6 +332,9 @@ printer drivers for CUPS.
%patch109
# Patch110 avoids any possible busy loop in cups-polld
%patch110
# Patch111 fixes the systemd cups.socket file so that systemd listens only on localhost
# (i.e. where the cupsd itself listens by default). Patch111 must be applied on top of Patch105.
%patch111
%build
# Disable SILENT run of make so that make runs verbose as usual:
@ -388,10 +394,6 @@ sed -i -e 's|/var/lock|/run/lock|g' $RPM_BUILD_ROOT/etc/init.d/cups
# Source103: cups.sysconfig
install -d -m755 $RPM_BUILD_ROOT/var/adm/fillup-templates
install -m 644 %{SOURCE103} $RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.cups
# Use Ghostscript fonts instead of CUPS fonts:
rm -r $RPM_BUILD_ROOT/usr/share/cups/fonts
mkdir -p $RPM_BUILD_ROOT/usr/share/ghostscript/fonts
ln -sf /usr/share/ghostscript/fonts $RPM_BUILD_ROOT/usr/share/cups/
# Make directory for ssl files:
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/cups/ssl
# Add a client.conf as template (Source108: cups-client.conf):