[myproxy] Add myproxy-globus-7129-PartII.patch patch and myproxy-globus-7129-PartIII.patch patch.
stevetraylen
stevetraylen at fedoraproject.org
Thu Sep 1 13:26:45 UTC 2011
commit 151c9101dd07b0bc4387aeb45c140f5cc8a2ecdd
Author: Steve Traylen <steve.traylen at cern.ch>
Date: Thu Sep 1 15:11:33 2011 +0200
Add myproxy-globus-7129-PartII.patch patch and
myproxy-globus-7129-PartIII.patch patch.
myproxy-globus-7129-ptII.patch | 30 ++++++++++++++++++++
myproxy-globus-7129-ptIII.patch | 57 +++++++++++++++++++++++++++++++++++++++
myproxy.spec | 11 +++++++-
3 files changed, 97 insertions(+), 1 deletions(-)
---
diff --git a/myproxy-globus-7129-ptII.patch b/myproxy-globus-7129-ptII.patch
new file mode 100644
index 0000000..b6d0265
--- /dev/null
+++ b/myproxy-globus-7129-ptII.patch
@@ -0,0 +1,30 @@
+Update of /cvsroot/cilogon/myproxy
+In directory vz-cvs-4.sog:/tmp/cvs-serv11386
+
+Modified Files:
+ myproxy_creds.c
+Log Message:
+log if myproxy_creds_retrieve() fails when it shouldn't
+
+
+Index: myproxy_creds.c
+===================================================================
+RCS file: /cvsroot/cilogon/myproxy/myproxy_creds.c,v
+retrieving revision 1.112
+retrieving revision 1.113
+diff -C2 -d -r1.112 -r1.113
+*** myproxy_creds.c 30 Aug 2011 21:06:58 -0000 1.112
+--- myproxy_creds.c 30 Aug 2011 23:15:17 -0000 1.113
+***************
+*** 1157,1160 ****
+--- 1157,1165 ----
+ numcreds++;
+ }
++ } else {
++ verror_put_string("failed to retrieve credentials for "
++ "username \"%s\"", new_cred->username);
++ myproxy_log_verror(); /* internal error; should not happen */
++ verror_clear();
+ }
+ }
+
diff --git a/myproxy-globus-7129-ptIII.patch b/myproxy-globus-7129-ptIII.patch
new file mode 100644
index 0000000..ef70b44
--- /dev/null
+++ b/myproxy-globus-7129-ptIII.patch
@@ -0,0 +1,57 @@
+
+http://lists.globus.org/pipermail/myproxy-commit/2011-August/000619.html
+
+Update of /cvsroot/cilogon/myproxy
+In directory vz-cvs-4.sog:/tmp/cvs-serv30047
+
+Modified Files:
+ myproxy_creds.c
+Log Message:
+fix failure handling for myproxy_creds_retrieve() calls in
+myproxy_creds_retrieve_all_ex():
+1) when trying to load default credential, it's not an error if we
+ don't find one - this is a fix to my last commit
+2) when scanning directory, if we fail to load a credential that
+ should be there, don't rely on creds structure that may be cleared,
+ but instead use stashed values when logging error
+
+
+Index: myproxy_creds.c
+===================================================================
+RCS file: /cvsroot/cilogon/myproxy/myproxy_creds.c,v
+retrieving revision 1.113
+retrieving revision 1.114
+diff -C2 -d -r1.113 -r1.114
+*** myproxy_creds.c 30 Aug 2011 23:15:17 -0000 1.113
+--- myproxy_creds.c 31 Aug 2011 18:25:32 -0000 1.114
+***************
+*** 1158,1165 ****
+ }
+ } else {
+! verror_put_string("failed to retrieve credentials for "
+! "username \"%s\"", new_cred->username);
+! myproxy_log_verror(); /* internal error; should not happen */
+! verror_clear();
+ }
+ }
+--- 1158,1162 ----
+ }
+ } else {
+! verror_clear(); /* OK if we don't find creds w/o credname */
+ }
+ }
+***************
+*** 1215,1220 ****
+ verror_put_string("failed to retrieve credentials for "
+ "username \"%s\", credname \"%s\"",
+! new_cred->username,
+! new_cred->credname ? new_cred->credname : "");
+ myproxy_log_verror(); /* internal error; should not happen */
+ verror_clear();
+--- 1212,1216 ----
+ verror_put_string("failed to retrieve credentials for "
+ "username \"%s\", credname \"%s\"",
+! de->d_name, cname ? cname : "");
+ myproxy_log_verror(); /* internal error; should not happen */
+ verror_clear();
+
diff --git a/myproxy.spec b/myproxy.spec
index f74cd1f..d4f8cdd 100644
--- a/myproxy.spec
+++ b/myproxy.spec
@@ -10,7 +10,7 @@
Name: myproxy
Version: 5.4
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Manage X.509 Public Key Infrastructure (PKI) security credentials
Group: System Environment/Daemons
@@ -24,6 +24,9 @@ Source3: README.Fedora
#http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=7209
Patch0: myproxy-globus-7129.patch
+#http://lists.globus.org/pipermail/myproxy-commit/2011-August/000619.html
+Patch1: myproxy-globus-7129-ptII.patch
+Patch2: myproxy-globus-7129-ptIII.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: globus-gss-assist-devel%{?_isa} > 3
@@ -173,6 +176,8 @@ cp -p %{SOURCE1} .
cp -p %{SOURCE2} .
cp -p %{SOURCE3} .
%patch0 -p0
+%patch1 -p0
+%patch2 -p0
%build
rm -f doxygen/Doxyfile*
@@ -391,6 +396,10 @@ fi
%{_libdir}/pkgconfig/myproxy.pc
%changelog
+* Thu Sep 1 2011 Steve Traylen <steve.traylen at cern.ch> - 5.4-4
+- Add myproxy-globus-7129-PartII.patch patch and
+ myproxy-globus-7129-PartIII.patch patch.
+
* Wed Aug 31 2011 Steve Traylen <steve.traylen at cern.ch> - 5.4-3
- Add myproxy-globus-7129.patch patch.
More information about the scm-commits
mailing list