rpms/myproxy/F-12 blocked-signals-with-pthr.patch, NONE, 1.1 myproxy.init, 1.1, 1.2 myproxy.spec, 1.8, 1.9 myproxy-globus-usage-location.patch, 1.1, NONE

[stevetraylen]

Author: stevetraylen

Update of /cvs/pkgs/rpms/myproxy/F-12
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv30501/F-12

Modified Files:
	myproxy.init myproxy.spec 
Added Files:
	blocked-signals-with-pthr.patch 
Removed Files:
	myproxy-globus-usage-location.patch 
Log Message:
rhbz#602594 and rhbz#603157.


blocked-signals-with-pthr.patch:
 myproxy_server.c |   11 +++++++++++
 1 file changed, 11 insertions(+)

--- NEW FILE blocked-signals-with-pthr.patch ---
Update of /cvsroot/cilogon/myproxy
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv22471

Modified Files:
	VERSION myproxy_server.c 
Log Message:
work-around for Globus libraries blocking signals (SIGTERM,
SIGCHLD, SIGHUP, etc.) when building myproxy-server with pthr
flavor (http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=7048)


Index: myproxy_server.c
===================================================================
RCS file: /cvsroot/cilogon/myproxy/myproxy_server.c,v
retrieving revision 1.203
retrieving revision 1.204
diff -C2 -d -r1.203 -r1.204
*** myproxy_server.c	5 Mar 2010 18:04:32 -0000	1.203
--- myproxy_server.c	10 Jun 2010 22:31:46 -0000	1.204
***************
*** 177,180 ****
--- 177,181 ----
      struct sockaddr_in client_addr;
      socklen_t client_addr_len = sizeof(client_addr);
+     sigset_t mysigset;
  
      myproxy_socket_attrs_t         *socket_attrs;
***************
*** 195,198 ****
--- 196,201 ----
      memset(server_context, 0, sizeof(*server_context));
  
+     sigemptyset(&mysigset);
+ 
      /* Set context defaults */
      server_context->run_as_daemon = 1;
***************
*** 242,246 ****
--- 245,251 ----
      /* If process is killed or Ctrl-C */
      my_signal(SIGTERM, sig_exit); 
+     sigaddset(&mysigset, SIGTERM);
      my_signal(SIGINT,  sig_exit); 
+     sigaddset(&mysigset, SIGINT);
  
      /* Read my configuration */
***************
*** 288,297 ****
--- 293,308 ----
         /* Set up signal handling to deal with zombie processes left over  */
         my_signal(SIGCHLD, sig_chld);
+        sigaddset(&mysigset, SIGCHLD);
  
         /* Re-read configuration file on SIGHUP */
         my_signal(SIGHUP, sig_hup);
+        sigaddset(&mysigset, SIGHUP);
  
         /* Set up concurrent server */
         while (1) {
+ 
+ 	  /* make sure Globus hasn't blocked signals we care about */
+ 	  sigprocmask(SIG_UNBLOCK, &mysigset, NULL);
+ 
  	  socket_attrs->socket_fd = accept(listenfd,
  					   (struct sockaddr *) &client_addr,




Index: myproxy.init
===================================================================
RCS file: /cvs/pkgs/rpms/myproxy/F-12/myproxy.init,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- myproxy.init	11 Oct 2009 06:15:55 -0000	1.1
+++ myproxy.init	12 Jun 2010 22:55:37 -0000	1.2
@@ -40,6 +40,7 @@ lockfile=/var/lock/subsys/$prog
 
 
 start() {
+    status $prog > /dev/null && echo -n $"$prog already running: " && success  && echo && exit 0
     echo -n $"Starting $prog: "
     daemon --user $MYPROXY_USER X509_USER_CERT=$X509_USER_CERT X509_USER_KEY=$X509_USER_KEY $exec $MYPROXY_OPTIONS
     retval=$?


Index: myproxy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/myproxy/F-12/myproxy.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- myproxy.spec	9 Mar 2010 19:25:38 -0000	1.8
+++ myproxy.spec	12 Jun 2010 22:55:37 -0000	1.9
@@ -8,7 +8,7 @@
 
 Name:           myproxy
 Version:        5.1
-Release:        1%{?dist}
+Release:        1%{?dist}.1
 Summary:        Manage X.509 Public Key Infrastructure (PKI) security credentials
 
 Group:          System Environment/Daemons
@@ -19,6 +19,11 @@ Source1:        myproxy.init
 Source2:        myproxy.sysconfig
 Source3:        README.Fedora
 
+# Fedora bug:   https://bugzilla.redhat.com/show_bug.cgi?id=602594
+# Upstream bug: http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=7048
+Patch0:         blocked-signals-with-pthr.patch
+
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  globus-gss-assist-devel > 3
@@ -152,6 +157,7 @@ Package %{name}-doc contains the MyProxy
 
 %prep
 %setup -q
+%patch0
 cp -p %{SOURCE1} .
 cp -p %{SOURCE2} .
 cp -p %{SOURCE3} .
@@ -392,6 +398,9 @@ fi
 %{_libdir}/pkgconfig/myproxy.pc
 
 %changelog
+* Sat Jun 12 2010 Steve Traylen <steve.traylen at cern.ch> - 5.1-1 1
+- Add blocked-signals-with-pthr.patch patch, rhbz#602594
+- Updated init.d script rhbz#603157
 * Tue Mar 9 2010 Steve Traylen <steve.traylen at cern.ch> - 5.1-1
 - New upstream 5.1
 - Remove globus-globus-usage-location.patch, now incoperated


--- myproxy-globus-usage-location.patch DELETED ---