rpms/myproxy/devel blocked-signals-with-pthr.patch, NONE, 1.1 myproxy.init, 1.1, 1.2 myproxy.spec, 1.11, 1.12
stevetraylen
stevetraylen at fedoraproject.org
Sat Jun 12 22:55:38 UTC 2010
Author: stevetraylen
Update of /cvs/pkgs/rpms/myproxy/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv30501/devel
Modified Files:
myproxy.init myproxy.spec
Added Files:
blocked-signals-with-pthr.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/devel/myproxy.init,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- myproxy.init 11 Oct 2009 06:06:21 -0000 1.1
+++ myproxy.init 12 Jun 2010 22:55:38 -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/devel/myproxy.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- myproxy.spec 15 May 2010 18:40:06 -0000 1.11
+++ myproxy.spec 12 Jun 2010 22:55:38 -0000 1.12
@@ -8,13 +8,18 @@
Name: myproxy
Version: 5.1
-Release: 2%{?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
@@ -123,6 +128,7 @@ Package %{name}-server contains the MyPr
%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
@@ -157,6 +163,7 @@ Package %{name}-doc contains the MyProxy
%prep
%setup -q
+%patch0
cp -p %{SOURCE1} .
cp -p %{SOURCE2} .
cp -p %{SOURCE3} .
@@ -394,6 +401,10 @@ 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
More information about the scm-commits
mailing list