[myproxy] Add myproxy-test-home2tmp.patch to avoid %script writing in home.

stevetraylen stevetraylen at fedoraproject.org
Tue Mar 1 09:41:04 UTC 2011


commit 38fbd909ed25aea303f33d52bd7f8c9cb66bfbc4
Author: Steve Traylen <steve.traylen at cern.ch>
Date:   Tue Mar 1 10:38:07 2011 +0100

    Add myproxy-test-home2tmp.patch to avoid %script
    writing in home.

 myproxy-test-home2tmp.patch |   12 ++++++++++++
 myproxy.spec                |   12 +++++++++++-
 2 files changed, 23 insertions(+), 1 deletions(-)
---
diff --git a/myproxy-test-home2tmp.patch b/myproxy-test-home2tmp.patch
new file mode 100644
index 0000000..1cf68fe
--- /dev/null
+++ b/myproxy-test-home2tmp.patch
@@ -0,0 +1,12 @@
+diff -uNr myproxy-5.3.ORIG/myproxy-test-rpm myproxy-5.3/myproxy-test-rpm
+--- myproxy-5.3.ORIG/myproxy-test-rpm	2011-03-01 10:29:57.918321388 +0100
++++ myproxy-5.3/myproxy-test-rpm	2011-03-01 10:30:22.346649816 +0100
+@@ -138,7 +138,7 @@
+ 
+ srand(time||$$);
+ $passphrase = sprintf "%010.d", int(rand(0x7fffffff));
+-$trustrootdir = "$ENV{HOME}/.globus/certificates.test.$$";
++$trustrootdir = "$tmpdir/.globus/certificates.test.$$";
+ $origtrustrootdir = $ENV{'X509_CERT_DIR'} if defined($ENV{'X509_CERT_DIR'});
+ 
+ &opensslsanitycheck();
diff --git a/myproxy.spec b/myproxy.spec
index 34e755b..01313c5 100644
--- a/myproxy.spec
+++ b/myproxy.spec
@@ -10,7 +10,7 @@
 
 Name:           myproxy
 Version:        5.3
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Manage X.509 Public Key Infrastructure (PKI) security credentials
 
 Group:          System Environment/Daemons
@@ -33,6 +33,11 @@ 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
@@ -185,6 +190,7 @@ cp -p myproxy-test myproxy-test-rpm
 %patch0 -p1
 %patch1 -p1
 %patch3 -p0
+%patch4 -p1
 cp -p %{SOURCE1} .
 cp -p %{SOURCE2} .
 cp -p %{SOURCE3} .
@@ -430,6 +436,10 @@ fi
 %{_libdir}/pkgconfig/myproxy.pc
 
 %changelog
+* 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.
+
 * 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


More information about the scm-commits mailing list