rpms/myproxy/EL-6 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/EL-6
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv30501/EL-6

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/EL-6/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:36 -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/EL-6/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:36 -0000	1.9
@@ -8,13 +8,18 @@
 
 Name:           myproxy
 Version:        5.1
-Release:        1%{?dist}
+Release:        3%{?dist}
 Summary:        Manage X.509 Public Key Infrastructure (PKI) security credentials
 
 Group:          System Environment/Daemons
 License:        NCSA and BSD and ASL 2.0
 URL:            http://grid.ncsa.illinois.edu/myproxy/
 Source0:        http://downloads.sourceforge.net/cilogon/myproxy-%{version}.tar.gz
+
+# 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
+
 Source1:        myproxy.init
 Source2:        myproxy.sysconfig
 Source3:        README.Fedora
@@ -47,6 +52,12 @@ BuildRequires:  tetex-latex
 %endif
 %endif
 
+Requires:      myproxy-libs = %{version}-%{release}
+Requires:      globus-proxy-utils
+Requires:      voms-clients
+
+Obsoletes:     myproxy-client < 5.1-3
+Provides:      myproxy-client = %{version}-%{release}
 
 %description
 MyProxy is open source software for managing X.509 Public Key Infrastructure 
@@ -56,14 +67,12 @@ authority to allow users to securely obt
 Users run myproxy-logon to authenticate and obtain credentials, including 
 trusted CA certificates and Certificate Revocation Lists (CRLs). 
 
-%package client
-Requires:      myproxy = %{version}-%{release}
-Requires:      globus-proxy-utils
-Requires:      voms-clients
+%package libs
 Summary:       Manage X.509 Public Key Infrastructure (PKI) security credentials 
 Group:         System Environment/Daemons
+Obsoletes:     myproxy < 5.1-3
 
-%description client
+%description libs
 MyProxy is open source software for managing X.509 Public Key Infrastructure 
 (PKI) security credentials (certificates and private keys). MyProxy 
 combines an online credential repository with an online certificate 
@@ -71,10 +80,10 @@ authority to allow users to securely obt
 Users run myproxy-logon to authenticate and obtain credentials, including 
 trusted CA certificates and Certificate Revocation Lists (CRLs). 
 
-Package %{name}-client contains client utilities for MyProxy.
+Package %{name}-libs contains runtime libs for MyProxy.
 
 %package devel
-Requires:      myproxy = %{version}-%{release}
+Requires:      myproxy-libs = %{version}-%{release}
 # in .el5 and 4 this dependency is not picked up
 # automatically via pkgconfig
 %if  0%{?el4}%{?el5}
@@ -99,7 +108,7 @@ Requires(post):   chkconfig
 Requires(preun):  chkconfig
 Requires(preun):  initscripts
 Requires(postun): initscripts
-Requires:         myproxy = %{version}-%{release}
+Requires:         myproxy-libs = %{version}-%{release}
 Summary:          Server for X.509 Public Key Infrastructure (PKI) security credentials 
 Group:            System Environment/Daemons
 
@@ -118,6 +127,8 @@ Package %{name}-server contains the MyPr
 # a load of perl dependencies.
 %package       admin
 Requires:      myproxy-server = %{version}-%{release}
+Requires:      myproxy-libs   = %{version}-%{release}
+Requires:      myproxy = %{version}-%{release}
 Requires:      globus-gsi-cert-utils-progs
 Summary:       Server for X.509 Public Key Infrastructure (PKI) security credentials 
 Group:         System Environment/Daemons
@@ -152,6 +163,7 @@ Package %{name}-doc contains the MyProxy
 
 %prep
 %setup -q
+%patch0 
 cp -p %{SOURCE1} .
 cp -p %{SOURCE2} .
 cp -p %{SOURCE3} .
@@ -281,8 +293,8 @@ done
 
 
 
-%post -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
+%post libs -p /sbin/ldconfig
+%postun libs -p /sbin/ldconfig
 
 %pre server
 getent group myproxy >/dev/null || groupadd -r myproxy
@@ -305,17 +317,8 @@ if [ "$1" -ge "1" ] ; then
     /sbin/service myproxy-server condrestart >/dev/null 2>&1 || :
 fi
 
-
 %files
 %defattr(-,root,root,-)
-%{_datadir}/globus/packages/%{name}
-
-%doc %{_defaultdocdir}/%{name}-%{version}
-
-%{_libdir}/libmyproxy.so.*
-
-%files client
-%defattr(-,root,root,-)
 %{_bindir}/myproxy-change-pass-phrase
 %{_bindir}/myproxy-destroy
 %{_bindir}/myproxy-get-delegation
@@ -334,6 +337,12 @@ fi
 %{_mandir}/man1/myproxy-logon.1.gz
 %{_mandir}/man1/myproxy-retrieve.1.gz
 %{_mandir}/man1/myproxy-store.1.gz
+%doc %{_defaultdocdir}/%{name}-%{version}
+
+%files libs
+%defattr(-,root,root,-)
+%{_datadir}/globus/packages/%{name}
+%{_libdir}/libmyproxy.so.*
 
 %files server
 %defattr(-,root,root,-)
@@ -392,6 +401,15 @@ fi
 %{_libdir}/pkgconfig/myproxy.pc
 
 %changelog
+* Sat Jun 12 2010 Steve Traylen <steve.traylen at cern.ch> - 5.1-3
+- Add blocked-signals-with-pthr.patch patch, rhbz#602594
+- Updated init.d script rhbz#603157
+- Add myproxy as requires to myproxy-admin to install clients.
+* Sat May 15 2010 Steve Traylen <steve.traylen at cern.ch> - 5.1-2
+- rhbz#585189 rearrange packaging.
+  clients moved from now obsoleted -client package 
+  to main package.
+  libs moved from main package to new libs package.
 * 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 ---