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

Accepting request 182308 from home:jsmeix:branches:Printing

Browse Source 
cups-polld_avoid_busy_loop.patch fixes bnc#828228

OBS-URL: https://build.opensuse.org/request/show/182308
OBS-URL: https://build.opensuse.org/package/show/Printing/cups?expand=0&rev=265
This commit is contained in:
Johannes Meixner 2013-07-05 13:00:43 +00:00 committed by Git OBS Bridge
parent 7d61be94c0
commit 0a15197641
3 changed files with 33 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
cups-polld_avoid_busy_loop.patch Normal file
View File

@ -0,0 +1,18 @@
--- scheduler/cups-polld.c.orig 2012-03-02 19:26:30.000000000 +0100
+++ scheduler/cups-polld.c 2013-07-05 14:33:08.000000000 +0200
@@ -169,10 +169,15 @@ main(int argc, /* I - Number of comm
/*
* Sleep for any remaining time...
+ * but in case of unusual issues (if remain <= 0 or if restart_polling)
+ * sleep interval seconds to avoid any possible busy-loop
+ * see for example https://bugzilla.novell.com/show_bug.cgi?id=828228
*/
if (remain > 0 && !restart_polling)
sleep(remain);
+ else
+ sleep(interval);
}
return (1);

9
cups.changes
View File

@ -1,9 +1,16 @@
-------------------------------------------------------------------
Fri Jul 5 14:33:53 CEST 2013 - jsmeix@suse.de
- cups-polld_avoid_busy_loop.patch avoids any possible busy loop
in cups-polld in case of unusual issues by sleeping interval
seconds (bnc#828228).
-------------------------------------------------------------------
Fri Jun 28 20:16:52 UTC 2013 - stefan.bruens@rwth-aachen.de
- Fix endless loop if IPP server does not accect job (bnc#827418)
see also https://www.cups.org/str.php?L4190 (STR#4190,
patch str4190.patch)
patch str4190.patch).
-------------------------------------------------------------------
Wed Jun 26 15:30:45 CEST 2013 - jsmeix@suse.de

9
cups.spec
View File

@ -15,7 +15,6 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
Name: cups
BuildRequires: dbus-1-devel
BuildRequires: fdupes
@ -175,8 +174,12 @@ Patch107: cups-provides-cupsd-service.patch
# and yes upstream should do the same. Please also check:
# http://lists.opensuse.org/opensuse-factory/2013-01/msg00578.html
Patch108: cups-move-everything-to-run.patch
# STR #4190: Send-Document failure ignored (also applies to client-error-not-authorized)
# Patch109 fixes STR #4190: Send-Document failure ignored
#(also applies to client-error-not-authorized)
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
# Install into this non-root directory (required when norootforbuild is used):
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@ -321,6 +324,8 @@ printer drivers for CUPS.
%endif
# Patch109: STR #4190
%patch109
# Patch110 avoids any possible busy loop in cups-polld
%patch110
%build
# Disable SILENT run of make so that make runs verbose as usual: