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

Accepting request 311253 from home:jsmeix:branches:Printing

Browse Source 
CUPS version upgrade to 2.0.3 that fixes in particular CERT VU #810572 CVE-2015-1158 CVE-2015-1159 (bsc#924208)

OBS-URL: https://build.opensuse.org/request/show/311253
OBS-URL: https://build.opensuse.org/package/show/Printing/cups?expand=0&rev=299
This commit is contained in:
Johannes Meixner 2015-06-09 09:10:04 +00:00 committed by Git OBS Bridge
parent f1b1e22e12
commit 8c43ac6bd5
5 changed files with 390 additions and 267 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cups-2.0.2-source.tar.bz2
View File

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

3
cups-2.0.3-source.tar.bz2 Normal file
View File

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

34
cups-busy-loop.patch
View File

@ -1,34 +0,0 @@
diff -up cups-2.0.2/scheduler/client.c.busy-loop cups-2.0.2/scheduler/client.c
--- cups-2.0.2/scheduler/client.c.busy-loop 2014-08-28 16:37:22.000000000 +0100
+++ cups-2.0.2/scheduler/client.c 2015-03-16 17:24:32.506232983 +0000
@@ -585,6 +585,17 @@ cupsdReadClient(cupsd_client_t *con) /*
* connection and we need to shut it down...
*/
+ if (!httpGetReady(con->http) && recv(httpGetFd(con->http), buf, 1, MSG_PEEK) < 1)
+ {
+ /*
+ * Connection closed...
+ */
+
+ cupsdLogClient(con, CUPSD_LOG_DEBUG, "Closing on EOF.");
+ cupsdCloseClient(con);
+ return;
+ }
+
cupsdLogClient(con, CUPSD_LOG_DEBUG, "Closing on unexpected HTTP read state %s.",
httpStateString(httpGetState(con->http)));
cupsdCloseClient(con);
@@ -1979,12 +1990,6 @@ cupsdReadClient(cupsd_client_t *con) /*
if (httpGetState(con->http) == HTTP_STATE_POST_SEND)
{
- /*
- * Don't listen for activity until we decide to do something with this...
- */
-
- cupsdAddSelect(httpGetFd(con->http), NULL, NULL, con);
-
if (con->file >= 0)
{
fstat(con->file, &filestats);

606
cups.changes
View File

File diff suppressed because it is too large Load Diff

11
cups.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package cups # spec file for package cups
# #
# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2015 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
@ -19,12 +19,13 @@
# _tmpfilesdir is not defined in systemd macros up to openSUSE 13.2 # _tmpfilesdir is not defined in systemd macros up to openSUSE 13.2
%{!?_tmpfilesdir: %global _tmpfilesdir %{_libexecdir}/tmpfiles.d } %{!?_tmpfilesdir: %global _tmpfilesdir %{_libexecdir}/tmpfiles.d }
Name: cups Name: cups
Version: 2.0.2 Version: 2.0.3
Release: 0 Release: 0
Summary: The Common UNIX Printing System Summary: The Common UNIX Printing System
License: GPL-2.0 and LGPL-2.1 License: GPL-2.0 and LGPL-2.1
Group: Hardware/Printing Group: Hardware/Printing
Url: http://www.cups.org/ Url: http://www.cups.org/
# MD5sum for Source0 on http://www.cups.org/software.php is 8d98b85edbdab7ab03739c9622f570e8
Source0: http://www.cups.org/software/%{version}/cups-%{version}-source.tar.bz2 Source0: http://www.cups.org/software/%{version}/cups-%{version}-source.tar.bz2
Source102: Postscript.ppd.gz Source102: Postscript.ppd.gz
Source105: Postscript-level1.ppd.gz Source105: Postscript-level1.ppd.gz
@ -41,10 +42,8 @@ Patch10: cups-1.2rc1-template.patch
# because the files of the CUPS web content are no documentation, see CUPS STR #3578 # because the files of the CUPS web content are no documentation, see CUPS STR #3578
# and http://bugzilla.novell.com/show_bug.cgi?id=546023#c6 and subsequent comments: # and http://bugzilla.novell.com/show_bug.cgi?id=546023#c6 and subsequent comments:
Patch11: cups-1.4.3-default-webcontent-path.patch Patch11: cups-1.4.3-default-webcontent-path.patch
# Patch12 cups-systemd-socket.patch Use systemd socket activation properly # Patch12 cups-systemd-socket.patch Use systemd socket activation properly:
Patch12: cups-systemd-socket.patch Patch12: cups-systemd-socket.patch
# Patch13 cups-busy-loop.patch fixes rh#1179596 cups#4605
Patch13: cups-busy-loop.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
@ -252,8 +251,8 @@ browsing". This is now handled by cups-browsed service.
# because the files of the CUPS web content are no documentation, see CUPS STR #3578 # because the files of the CUPS web content are no documentation, see CUPS STR #3578
# and http://bugzilla.novell.com/show_bug.cgi?id=546023#c6 and subsequent comments: # and http://bugzilla.novell.com/show_bug.cgi?id=546023#c6 and subsequent comments:
%patch11 %patch11
# Patch12 cups-systemd-socket.patch Use systemd socket activation properly:
%patch12 -p1 %patch12 -p1
%patch13 -p1
# 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 %patch100