rpms/cups/FC-5 cups-try_connect.patch, 1.1, 1.2 cups.spec, 1.201, 1.202

[fedora-cvs-commits at redhat.com]

Author: twaugh

Update of /cvs/dist/rpms/cups/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv16185

Modified Files:
	cups-try_connect.patch cups.spec 
Log Message:
* Wed Aug  2 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.2-1.4
- Use sigaction, not signal, to set the alarm handler in the snmp backend
  (bug #200205).


cups-try_connect.patch:
 snmp.c |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

Index: cups-try_connect.patch
===================================================================
RCS file: /cvs/dist/rpms/cups/FC-5/cups-try_connect.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cups-try_connect.patch	1 Aug 2006 12:46:24 -0000	1.1
+++ cups-try_connect.patch	2 Aug 2006 15:59:58 -0000	1.2
@@ -1,5 +1,5 @@
---- cups-1.2.2/backend/snmp.c.try_connect	2006-08-01 13:20:56.000000000 +0100
-+++ cups-1.2.2/backend/snmp.c	2006-08-01 13:22:30.000000000 +0100
+--- cups-1.2.2/backend/snmp.c.try_connect	2006-08-01 13:24:43.000000000 +0100
++++ cups-1.2.2/backend/snmp.c	2006-08-02 16:58:56.000000000 +0100
 @@ -1692,7 +1692,8 @@
  
    debug_printf("DEBUG: %.3f Probing %s...\n", run_time(), device->addrname);
@@ -10,3 +10,23 @@
    {
     /*
      * IPP is supported...
+@@ -2320,6 +2321,7 @@
+ {
+   int	fd;				/* Socket */
+   int	status;				/* Connection status */
++  struct sigaction act;
+ 
+ 
+   debug_printf("DEBUG: %.3f Trying %s://%s:%d...\n", run_time(),
+@@ -2333,7 +2335,10 @@
+ 
+   addr->ipv4.sin_port = htons(port);
+ 
+-  signal(SIGALRM, alarm_handler);
++  act.sa_handler = alarm_handler;
++  sigemptyset(&act.sa_mask);
++  act.sa_flags = 0;
++  sigaction(SIGALRM, &act, NULL);
+   alarm(1);
+ 
+   status = connect(fd, (void *)addr, httpAddrLength(addr));


Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/FC-5/cups.spec,v
retrieving revision 1.201
retrieving revision 1.202
diff -u -r1.201 -r1.202
--- cups.spec	1 Aug 2006 12:46:24 -0000	1.201
+++ cups.spec	2 Aug 2006 15:59:58 -0000	1.202
@@ -5,7 +5,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.2.2
-Release: 1.3
+Release: 1.4
 License: GPL
 Group: System Environment/Daemons
 Source: ftp://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@@ -402,6 +402,10 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
+* Wed Aug  2 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.2-1.4
+- Use sigaction, not signal, to set the alarm handler in the snmp backend
+  (bug #200205).
+
 * Tue Aug  1 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.2-1.3
 - Use try_connect() before httpConnect() in snmp backend (bug #200205).