rpms/cups/devel cups-str3272.patch,NONE,1.1 cups.spec,1.489,1.490
Tim Waugh
twaugh at fedoraproject.org
Wed Jul 29 13:00:27 UTC 2009
Author: twaugh
Update of /cvs/pkgs/rpms/cups/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19918
Modified Files:
cups.spec
Added Files:
cups-str3272.patch
Log Message:
* Wed Jul 29 2009 Tim Waugh <twaugh at redhat.com> 1:1.4-0.rc1.12
- Fixed incorrect arguments to sigaction() in dnssd backend (STR #3272).
cups-str3272.patch:
dnssd.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- NEW FILE cups-str3272.patch ---
diff -up cups-1.4rc1/backend/dnssd.c.str3272 cups-1.4rc1/backend/dnssd.c
--- cups-1.4rc1/backend/dnssd.c.str3272 2009-04-14 19:14:02.000000000 +0100
+++ cups-1.4rc1/backend/dnssd.c 2009-07-29 13:56:55.643396809 +0100
@@ -153,8 +153,8 @@ main(int argc, /* I - Number of comm
memset(&action, 0, sizeof(action));
sigemptyset(&action.sa_mask);
- action.sa_handler = SIG_IGN;
- sigaction(SIGTERM, &action, sigterm_handler);
+ action.sa_handler = sigterm_handler;
+ sigaction(SIGTERM, &action, NULL);
#else
signal(SIGTERM, sigterm_handler);
#endif /* HAVE_SIGSET */
Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/devel/cups.spec,v
retrieving revision 1.489
retrieving revision 1.490
diff -u -p -r1.489 -r1.490
--- cups.spec 28 Jul 2009 21:39:42 -0000 1.489
+++ cups.spec 29 Jul 2009 13:00:27 -0000 1.490
@@ -59,7 +59,8 @@ Patch32: cups-str3253.patch
Patch33: cups-str3266.patch
Patch34: cups-str3262.patch
Patch35: cups-cups-get-classes.patch
-Patch36: cups-avahi.patch
+Patch36: cups-str3272.patch
+Patch37: cups-avahi.patch
Patch100: cups-lspp.patch
Epoch: 1
Url: http://www.cups.org/
@@ -216,7 +217,8 @@ module.
%patch33 -p1 -b .str3266
%patch34 -p1 -b .str3262
%patch35 -p1 -b .cups-get-classes
-#%patch36 -p1 -b .avahi
+%patch36 -p1 -b .str3272
+#%patch37 -p1 -b .avahi
%if %lspp
%patch100 -p1 -b .lspp
@@ -509,7 +511,8 @@ rm -rf $RPM_BUILD_ROOT
%{php_extdir}/phpcups.so
%changelog
-* Tue Jul 28 2009 Tim Waugh <twaugh at redhat.com> 1:1.4-0.rc1.12
+* Wed Jul 29 2009 Tim Waugh <twaugh at redhat.com> 1:1.4-0.rc1.12
+- Fixed incorrect arguments to sigaction() in dnssd backend (STR #3272).
- Cheaply restore compatibility with 1.1.x by having cups_get_sdests()
perform a CUPS_GET_CLASSES request if it is not sure it is talking
to CUPS 1.2 or later (bug #512866).
More information about the fedora-extras-commits
mailing list