[myproxy] Remove myproxy-test-disables-globus-7135.patch since checks now run with a clean CA/grid-security d

[stevetraylen]

commit 0dd76a673be4c9aa3270b92f4e1a0bdbc716d102
Author: Steve Traylen <steve.traylen at cern.ch>
Date:   Mon Feb 28 19:29:51 2011 +0100

    Remove myproxy-test-disables-globus-7135.patch since
    checks now run with a clean CA/grid-security  directory
    and work.

 myproxy-test-disables-globus-7135.patch |  169 -------------------------------
 myproxy.spec                            |   14 ++--
 2 files changed, 7 insertions(+), 176 deletions(-)
---
diff --git a/myproxy.spec b/myproxy.spec
index 283de13..34e755b 100644
--- a/myproxy.spec
+++ b/myproxy.spec
@@ -30,9 +30,6 @@ Patch0:         myproxy-vomsc-vomsapi.patch
 # Run check script non-interactivly.
 Patch1:         myproxy-test-non-inter.patch
 
-# myproxy-test-disables-globus-7135.patch
-Patch2:         myproxy-test-disables-globus-7135.patch
-
 # http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=7135
 Patch3:         myproxy-double-free-globus-7135.patch
 
@@ -187,7 +184,6 @@ Package %{name}-doc contains the MyProxy documentation.
 cp -p myproxy-test myproxy-test-rpm
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 %patch3 -p0
 cp -p %{SOURCE1} .
 cp -p %{SOURCE2} .
@@ -308,8 +304,9 @@ 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)
-cp CA/cacert.pem CA/${HASH}.0
-cat <<EOF > CA/${HASH}.signing_policy
+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  '"/*"'
@@ -322,7 +319,7 @@ 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 PATH=.:$PATH ./myproxy-test-rpm -startserver
+X509_CERT_DIR=$(pwd)/CA/grid-security PATH=.:$PATH ./myproxy-test-rpm -startserver
 %endif
 
 %post libs -p /sbin/ldconfig
@@ -434,6 +431,9 @@ fi
 
 %changelog
 * Mon Feb 28 2011 Steve Traylen <steve.traylen at cern.ch> - 5.3-6
+- Remove myproxy-test-disables-globus-7135.patch since
+  checks now run with a clean CA/grid-security  directory
+  and work.
 - Add myproxy-double-free-globus-7135.patch to
   remove double free in myproxy-creds.ch. globus bug #7135.