Fix boo#1111351

OBS-URL: https://build.opensuse.org/package/show/Printing/cups?expand=0&rev=353
This commit is contained in:
Dr. Werner Fink 2018-10-18 05:50:09 +00:00 committed by Git OBS Bridge
parent c2cffb1fe3
commit adac94ced2
3 changed files with 39 additions and 4 deletions

View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Thu Oct 18 05:42:23 UTC 2018 - Dr. Werner Fink <werner@suse.de>
- Add patch let-cupsd-start-after-network.patch
Let cuspd start after possible network connection (boo#1111351)
This let cupsd also stop before a used network connection goes
down, hence the cusp does not lock due waiting on remote printers.
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Sep 14 05:30:55 UTC 2018 - antoine.belvire@opensuse.org Fri Sep 14 05:30:55 UTC 2018 - antoine.belvire@opensuse.org

View File

@ -1,7 +1,7 @@
# #
# spec file for package cups # spec file for package cups
# #
# Copyright (c) 2018 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -12,7 +12,7 @@
# license that conforms to the Open Source Definition (Version 1.9) # license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative. # published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/ # Please submit bugfixes or comments via https://bugs.opensuse.org/
# #
@ -62,6 +62,8 @@ Patch10: cups-2.1.0-choose-uri-template.patch
Patch11: cups-2.1.0-default-webcontent-path.patch Patch11: cups-2.1.0-default-webcontent-path.patch
# Patch12 cups-2.1.0-cups-systemd-socket.patch Use systemd socket activation properly: # Patch12 cups-2.1.0-cups-systemd-socket.patch Use systemd socket activation properly:
Patch12: cups-2.1.0-cups-systemd-socket.patch Patch12: cups-2.1.0-cups-systemd-socket.patch
# Patch42 Let cuspd start after possible network connection (boo#1111351)
Patch42: let-cupsd-start-after-network.patch
# Patch100...Patch999 is for private patches from SUSE which are not intended for upstream: # Patch100...Patch999 is for private patches from SUSE which are not intended for upstream:
# Patch100 cups-pam.diff adds conf/pam.suse regarding support for PAM for SUSE: # Patch100 cups-pam.diff adds conf/pam.suse regarding support for PAM for SUSE:
Patch100: cups-pam.diff Patch100: cups-pam.diff
@ -228,7 +230,6 @@ operation.
%package client %package client
Summary: CUPS Client Programs Summary: CUPS Client Programs
Group: Hardware/Printing
# Require the exact matching version-release of the libcups* sub-packages because # Require the exact matching version-release of the libcups* sub-packages because
# non-matching CUPS libraries may let CUPS software crash (e.g. segfault) # non-matching CUPS libraries may let CUPS software crash (e.g. segfault)
# because all CUPS software is provided as one single CUPS source tarball # because all CUPS software is provided as one single CUPS source tarball
@ -238,6 +239,7 @@ Group: Hardware/Printing
# on the same package repository where the cups package is because # on the same package repository where the cups package is because
# all are built simultaneously from the same cups source package # all are built simultaneously from the same cups source package
# and all required packages are provided on the same repository: # and all required packages are provided on the same repository:
Group: Hardware/Printing
Requires: libcups2 = %{version}-%{release} Requires: libcups2 = %{version}-%{release}
Requires: libcupscgi1 = %{version}-%{release} Requires: libcupscgi1 = %{version}-%{release}
Requires: libcupsimage2 = %{version}-%{release} Requires: libcupsimage2 = %{version}-%{release}
@ -259,13 +261,13 @@ System V and Berkeley print systems.
%package devel %package devel
Summary: Development Environment for CUPS Summary: Development Environment for CUPS
Group: Development/Libraries/C and C++
# Do not require the exact matching version-release # Do not require the exact matching version-release
# of the native CUPS libraries (i.e. the libcups* sub-packages) # of the native CUPS libraries (i.e. the libcups* sub-packages)
# but only CUPS libraries with matching version because # but only CUPS libraries with matching version because
# for building third-party software which uses only the CUPS public API # for building third-party software which uses only the CUPS public API
# there are no CUPS-internal dependencies via CUPS private API calls # there are no CUPS-internal dependencies via CUPS private API calls
# (the latter would require the exact matching CUPS libraries version-release): # (the latter would require the exact matching CUPS libraries version-release):
Group: Development/Libraries/C and C++
Requires: glibc-devel Requires: glibc-devel
Requires: libcups2 = %{version} Requires: libcups2 = %{version}
Requires: libcupscgi1 = %{version} Requires: libcupscgi1 = %{version}
@ -314,6 +316,8 @@ printer drivers for CUPS.
%patch11 -b default-webcontent-path.orig %patch11 -b default-webcontent-path.orig
# Patch12 cups-2.1.0-cups-systemd-socket.patch Use systemd socket activation properly: # Patch12 cups-2.1.0-cups-systemd-socket.patch Use systemd socket activation properly:
#patch12 -b cups-systemd-socket.orig #patch12 -b cups-systemd-socket.orig
# Patch42 Let cuspd start after possible network connection (boo#1111351)
%patch42 -p0
# Patch100...Patch999 is for private patches from SUSE which are not intended for upstream: # Patch100...Patch999 is for private patches from SUSE which are not intended for upstream:
# Patch100 cups-pam.diff adds conf/pam.suse regarding support for PAM for SUSE: # Patch100 cups-pam.diff adds conf/pam.suse regarding support for PAM for SUSE:
%patch100 -b cups-pam.orig %patch100 -b cups-pam.orig

View File

@ -0,0 +1,23 @@
From: Werner Fink <werner@ssue.de>
Date: Thu, 18 Oct 2018 05:32:42 +0000
Subject: Let cuspd start after possible network connection
For remote printer and printer servers, let cupsd always
start after a possible network connection. This let cupsd
also stop before a used network connection goes down, hence
the cusp does not lock due waiting on remote printers.
---
scheduler/org.cups.cupsd.service.in | 1 +
1 file changed, 1 insertion(+)
--- scheduler/org.cups.cupsd.service.in
+++ scheduler/org.cups.cupsd.service.in 2018-10-18 05:16:30.867333704 +0000
@@ -1,6 +1,7 @@
[Unit]
Description=CUPS Scheduler
Documentation=man:cupsd(8)
+After=network.target
[Service]
ExecStart=@sbindir@/cupsd -l