[myproxy] Update to 5.4

[stevetraylen]

commit 1819b602d87885de6d87e02d30ba6a6c4ecd11da
Author: Steve Traylen <steve.traylen at cern.ch>
Date:   Mon Apr 25 05:27:04 2011 +0200

    Update to 5.4

 .gitignore                            |    1 +
 myproxy-double-free-globus-7135.patch |   38 ---------------------
 myproxy-test-home2tmp.patch           |   12 ------
 myproxy-test-non-inter.patch          |   22 ------------
 myproxy-vomsc-vomsapi.patch           |   12 ------
 myproxy.spec                          |   60 +++++---------------------------
 sources                               |    2 +-
 7 files changed, 12 insertions(+), 135 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 05d273a..6776360 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 myproxy-5.2.tar.gz
 /myproxy-5.3.tar.gz
+/myproxy-5.4.tar.gz
diff --git a/myproxy.spec b/myproxy.spec
index 01313c5..39db4b4 100644
--- a/myproxy.spec
+++ b/myproxy.spec
@@ -9,8 +9,8 @@
 %global with_checks 1
 
 Name:           myproxy
-Version:        5.3
-Release:        7%{?dist}
+Version:        5.4
+Release:        1%{?dist}
 Summary:        Manage X.509 Public Key Infrastructure (PKI) security credentials
 
 Group:          System Environment/Daemons
@@ -22,22 +22,6 @@ Source1:        myproxy.init
 Source2:        myproxy.sysconfig
 Source3:        README.Fedora
 
-#VOMS has two alternate APIs which are the "same". vomsapi is the
-#newer though not that new. myproxy is the last software in
-#EPEL using the old vomsc.
-#Patch to go upstream myproxy though they are aware.
-Patch0:         myproxy-vomsc-vomsapi.patch
-# Run check script non-interactivly.
-Patch1:         myproxy-test-non-inter.patch
-
-# http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=7135
-Patch3:         myproxy-double-free-globus-7135.patch
-
-# Don't create files in home during check.
-# Part of
-# http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=7139
-Patch4:         myproxy-test-home2tmp.patch
-
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  globus-gss-assist-devel%{?_isa} > 3
@@ -183,14 +167,6 @@ Package %{name}-doc contains the MyProxy documentation.
 
 %prep
 %setup -q
-# Make a copy of the test script that we then patch for running
-# in the .spec file. They don't need to be patched outside
-# checking in an RPM.
-cp -p myproxy-test myproxy-test-rpm
-%patch0 -p1
-%patch1 -p1
-%patch3 -p0
-%patch4 -p1
 cp -p %{SOURCE1} .
 cp -p %{SOURCE2} .
 cp -p %{SOURCE3} .
@@ -300,32 +276,9 @@ mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/grid-security/myproxy
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-
 %check 
 %if 0%{?with_checks}
-# Set Up CA.
-mkdir -p CA/private CA/newcerts CA/public
-sed 's|/etc/pki/||'  /etc/pki/tls/openssl.cnf > CA/openssl.cnf
-touch CA/index.txt
-echo '01' > CA/serial
-openssl req -batch -subj '/cn=test ca' -config CA/openssl.cnf -new -x509 -extensions v3_ca -nodes -keyout CA/private/cakey.pem -out CA/cacert.pem -days 30
-HASH=$(openssl x509 -in CA/cacert.pem -hash -noout)
-mkdir CA/grid-security
-cp CA/cacert.pem CA/grid-security/${HASH}.0
-cat <<EOF > CA/grid-security/${HASH}.signing_policy
-access_id_CA            X509    ''
-pos_rights              globus  CA:sign
-cond_subjects           globus  '"/*"'
-EOF
-# Create a User Certificate.
-openssl req -batch -subj '/CN=test user'  -config CA/openssl.cnf -new -nodes -keyout CA/userkey.pem -out CA/usercert.csr -days 365
-openssl ca -batch -config CA/openssl.cnf -policy policy_anything -out CA/usercert.pem -infiles CA/usercert.csr
-chmod 600 CA/user*.pem
-
-# Create a GSI proxy.
-X509_USER_CERT=CA/usercert.pem X509_USER_KEY=CA/userkey.pem grid-proxy-init -debug
-# Do the tests... at last.
-X509_CERT_DIR=$(pwd)/CA/grid-security PATH=.:$PATH ./myproxy-test-rpm -startserver
+PATH=.:$PATH ./myproxy-test -startserver -generatecerts
 %endif
 
 %post libs -p /sbin/ldconfig
@@ -436,6 +389,13 @@ fi
 %{_libdir}/pkgconfig/myproxy.pc
 
 %changelog
+* Sun Apr 24 2011 Steve Traylen <steve.traylen at cern.ch> - 5.4-1
+- Drop myproxy-vomsc-vomsapi.patch since upstream.
+- Drop myproxy-test-non-inter.patch since not needed.
+- Drop myproxy-double-free-globus-7135.patch since upstream.
+- Drop myproxy-test-home2tmp.patch since upstream.
+- Update to 5.4
+
 * Tue Mar 1 2011 Steve Traylen <steve.traylen at cern.ch> - 5.3-7
 - Add myproxy-test-home2tmp.patch to avoid %%script
   writing in home.
diff --git a/sources b/sources
index a805a71..be70caa 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-fe3ac7f8992878e633351a0fafadf09c  myproxy-5.3.tar.gz
+ab190cdcea594ae9d76b518441e6e614  myproxy-5.4.tar.gz