Hello community, here is the log from the commit of package cups for openSUSE:Factory checked in at 2013-07-09 20:48:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cups (Old) and /work/SRC/openSUSE:Factory/.cups.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "cups" Changes: -------- --- /work/SRC/openSUSE:Factory/cups/cups.changes 2013-07-01 15:53:21.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.cups.new/cups.changes 2013-07-09 20:48:45.000000000 +0200 @@ -1,0 +2,7 @@ +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). + +------------------------------------------------------------------- @@ -6 +13 @@ - patch str4190.patch) + patch str4190.patch). New: ---- cups-polld_avoid_busy_loop.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cups.spec ++++++ --- /var/tmp/diff_new_pack.fpWWyD/_old 2013-07-09 20:48:46.000000000 +0200 +++ /var/tmp/diff_new_pack.fpWWyD/_new 2013-07-09 20:48:46.000000000 +0200 @@ -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 @@ # 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 @@ %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: ++++++ cups-polld_avoid_busy_loop.patch ++++++ --- 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); -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org