rpms/cups
7
0
Fork 0
Code Issues Pull Requests Releases Activity

fixing typo in cups-cpu-hammering.patch

Browse Source
This commit is contained in:
Zdenek Dohnal 2016-10-04 19:03:57 +02:00
parent 29a9aee6cb
commit 523b1be22f
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cups-cpu-hammering.patch
View File

@ -1,7 +1,6 @@
diff -up cups-2.2.0/CHANGES.txt.cpu-hammering cups-2.2.0/CHANGES.txt
diff -up cups-2.2.0/cups/http-addrlist.c.cpu-hammering cups-2.2.0/cups/http-addrlist.c diff -up cups-2.2.0/cups/http-addrlist.c.cpu-hammering cups-2.2.0/cups/http-addrlist.c
--- cups-2.2.0/cups/http-addrlist.c.cpu-hammering 2016-09-19 19:56:54.074866957 +0200 --- cups-2.2.0/cups/http-addrlist.c.cpu-hammering 2016-10-04 18:54:55.697172885 +0200
+++ cups-2.2.0/cups/http-addrlist.c 2016-09-21 11:45:22.264775409 +0200 +++ cups-2.2.0/cups/http-addrlist.c 2016-10-04 18:56:41.038252500 +0200
@@ -304,6 +304,8 @@ httpAddrConnect2( @@ -304,6 +304,8 @@ httpAddrConnect2(
if (result > 0) if (result > 0)
@ -28,7 +27,7 @@ diff -up cups-2.2.0/cups/http-addrlist.c.cpu-hammering cups-2.2.0/cups/http-addr
+# ifdef HAVE_POLL +# ifdef HAVE_POLL
+ else if (pfds[i].revents & (POLLERR | POLLHUP)) + else if (pfds[i].revents & (POLLERR | POLLHUP))
+# else +# else
+ else if (FD_SET(fds[i], &error)) + else if (FD_ISSET(fds[i], &error))
+# endif /* HAVE_POLL */ +# endif /* HAVE_POLL */
+ { + {
+ /* + /*

5
cups.spec
View File

@ -15,7 +15,7 @@ Summary: CUPS printing system
Name: cups Name: cups
Epoch: 1 Epoch: 1
Version: 2.2.0 Version: 2.2.0
Release: 2%{?dist} Release: 3%{?dist}
License: GPLv2 License: GPLv2
Url: http://www.cups.org/ Url: http://www.cups.org/
Source0: https://github.com/apple/cups/releases/download/v%{VERSION}/cups-%{VERSION}-source.tar.gz Source0: https://github.com/apple/cups/releases/download/v%{VERSION}/cups-%{VERSION}-source.tar.gz
@ -620,6 +620,9 @@ rm -f %{cups_serverbin}/backend/smb
%{_mandir}/man5/ipptoolfile.5.gz %{_mandir}/man5/ipptoolfile.5.gz
%changelog %changelog
* Tue Oct 04 2016 Zdenek Dohnal <zdohnal@redhat.com> - 1:2.2.0-3
- fixing typo in cups-cpu-hammering.patch
* Thu Sep 22 2016 Zdenek Dohnal <zdohnal@redhat.com> - 1:2.2.0-2 * Thu Sep 22 2016 Zdenek Dohnal <zdohnal@redhat.com> - 1:2.2.0-2
- fixing looping in partial failing service (bug #1366775) - fixing looping in partial failing service (bug #1366775)