rpms/cups/F-11 cups-str3272.patch,NONE,1.1 cups.spec,1.492,1.493

[Tim Waugh]

Author: twaugh

Update of /cvs/pkgs/rpms/cups/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19465

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/F-11/cups.spec,v
retrieving revision 1.492
retrieving revision 1.493
diff -u -p -r1.492 -r1.493
--- cups.spec	28 Jul 2009 21:38:08 -0000	1.492
+++ cups.spec	29 Jul 2009 12:58:22 -0000	1.493
@@ -60,7 +60,8 @@ Patch33: cups-str3266.patch
 Patch34: cups-str3262.patch
 Patch35: cups-socket-snmp.patch
 Patch36: cups-cups-get-classes.patch
-Patch37: cups-avahi.patch
+Patch37: cups-str3272.patch
+Patch38: cups-avahi.patch
 Patch100: cups-lspp.patch
 Epoch: 1
 Url: http://www.cups.org/
@@ -218,7 +219,8 @@ module. 
 %patch34 -p1 -b .str3262
 %patch35 -p1 -b .socket-snmp
 %patch36 -p1 -b .cups-get-classes
-#%patch37 -p1 -b .avahi
+%patch37 -p1 -b .str3272
+#%patch38 -p1 -b .avahi
 
 %if %lspp
 %patch100 -p1 -b .lspp
@@ -511,7 +513,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).