[myproxy] Update to 5.8, source tar ball name change, drop myproxy-ssl1-tls.patch and myproxy-ssl1-2048bits.pa

[stevetraylen]

commit b8e5cd5ccefc9c533c6f8835fb204bd0f828cf0d
Author: Steve Traylen <steve.traylen at cern.ch>
Date:   Thu Jun 21 21:58:56 2012 +0200

    Update to 5.8, source tar ball name change, drop
    myproxy-ssl1-tls.patch and myproxy-ssl1-2048bits.patch
    since upstream now.

 .gitignore                  |    1 +
 myproxy-ssl1-2048bits.patch |  118 -------------------------------------------
 myproxy-ssl1-tls.patch      |   31 -----------
 myproxy.spec                |   29 +++++------
 sources                     |    2 +-
 5 files changed, 16 insertions(+), 165 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 1c4b2e9..21af008 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ myproxy-5.2.tar.gz
 /myproxy-5.4.tar.gz
 /myproxy-5.5.tar.gz
 /myproxy-5.6.tar.gz
+/myproxy-5.8-gt5.2.tar.gz
diff --git a/myproxy.spec b/myproxy.spec
index b0e7352..0364892 100644
--- a/myproxy.spec
+++ b/myproxy.spec
@@ -15,24 +15,14 @@
 %global with_checks 1
 
 Name:           myproxy
-Version:        5.6
-Release:        4%{?dist}
+Version:        5.8
+Release:        1%{?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
-
-#Two patches (0 and 1) for openssl1.0.1 support
-# http://lists.globus.org/pipermail/myproxy-commit/2012-May/000678.html
-# add support for TLS 1.1 and TLS 1.2 in OpenSSL 1.0.1
-Patch0: myproxy-ssl1-tls.patch
-# http://lists.globus.org/pipermail/myproxy-commit/2012-May/000679.html
-# force grid-proxy-init to create 2048 bit keys in myproxy-test
-Patch1: myproxy-ssl1-2048bits.patch
-
-
+Source0:        http://downloads.sourceforge.net/cilogon/myproxy-%{version}-gt5.2.tar.gz
 Source1:        myproxy.init
 Source2:        myproxy.sysconfig
 Source4:        myproxy-server-tmpfiles.d.conf
@@ -189,8 +179,6 @@ Package %{name}-doc contains the MyProxy documentation.
 
 %prep
 %setup -q
-%%patch0
-%%patch1
 %if 0%{?with_sysv}
 cp -p %{SOURCE1} .   #myproxy.init
 cp -p %{SOURCE2} .   #myproxy.sysconfig
@@ -296,6 +284,12 @@ mkdir -p %{buildroot}%{_var}/lib/myproxy
 # Create a directory to hold myproxy owned host certificates.
 mkdir -p %{buildroot}%{_sysconfdir}/grid-security/myproxy
 
+# Upstream now includes systemd files, good. Delete them for
+# now and migrate to them shortly.
+rm %{buildroot}%{_prefix}/share/myproxy/myproxy-server.conf
+rm %{buildroot}%{_prefix}/share/myproxy/myproxy-server.service
+
+
 %clean
 rm -rf %{buildroot}
 
@@ -443,6 +437,11 @@ fi
 %{_libdir}/pkgconfig/myproxy.pc
 
 %changelog
+* Thu Jun 21 2012 Steve Traylen <steve.traylen at cern.ch> - 5.8-1
+- Update to 5.8, source tar ball name change, drop 
+  myproxy-ssl1-tls.patch and myproxy-ssl1-2048bits.patch
+  since upstream now.
+
 * Tue May 15 2012 Steve Traylen <steve.traylen at cern.ch> - 5.6-4
 - Add myproxy-ssl1-tls.patch and myproxy-ssl1-2048bits.patch.
 
diff --git a/sources b/sources
index f038471..5333b19 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-68741ad4e886becfd20e662563f68e8e  myproxy-5.6.tar.gz
+82e1f7a706584baacd15b75cd9ff9d4e  myproxy-5.8-gt5.2.tar.gz