diff --git a/globus-gssapi-gsi-allow-tls-1.0-1.1.patch b/globus-gssapi-gsi-allow-tls-1.0-1.1.patch deleted file mode 100644 index 85e0ff6..0000000 --- a/globus-gssapi-gsi-allow-tls-1.0-1.1.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 7bf3ea351971a4a95e95889fa997d2da945ebbcc Mon Sep 17 00:00:00 2001 -From: Mattias Ellert -Date: Fri, 21 Sep 2018 21:37:45 +0200 -Subject: [PATCH] Allow TLS 1.0/1.1 - ---- - library/gsi.conf | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/library/gsi.conf b/library/gsi.conf -index c438b8dd0c..8851e76387 100644 ---- a/library/gsi.conf -+++ b/library/gsi.conf -@@ -2,7 +2,7 @@ - # Minimum TLS protocol version. One of TLS1_2_VERSION, TLS1_VERSION_DEPRECATED, - # TLS1_1_VERSION_DEPRECATED, or 0 for the default. Invalid values will use - # the default. SSLv3 and below are disabled. --MIN_TLS_PROTOCOL=0 -+MIN_TLS_PROTOCOL=TLS1_VERSION_DEPRECATED - # Maximum TLS protocol version. One of TLS1_2_VERSION, TLS1_VERSION_DEPRECATED, - # TLS1_1_VERSION_DEPRECATED, or 0 for the highest supported version. Invalid - # values will use the highest supported version. SSLv3 and below are disabled. --- -2.17.1 - diff --git a/globus-gssapi-gsi.spec b/globus-gssapi-gsi.spec index d392a00..bf97f3f 100644 --- a/globus-gssapi-gsi.spec +++ b/globus-gssapi-gsi.spec @@ -1,16 +1,13 @@ Name: globus-gssapi-gsi %global _name %(tr - _ <<< %{name}) -Version: 14.7 -Release: 2%{?dist} +Version: 14.9 +Release: 1%{?dist} Summary: Grid Community Toolkit - GSSAPI library License: ASL 2.0 URL: https://github.com/gridcf/gct/ Source: https://repo.gridcf.org/gct6/sources/%{_name}-%{version}.tar.gz Source8: README -# Allow TLS 1.0 and 1.1 -# https://github.com/gridcf/gct/pull/55 -Patch0: %{name}-allow-tls-1.0-1.1.patch BuildRequires: gcc BuildRequires: globus-common-devel >= 15 @@ -73,7 +70,6 @@ GSSAPI library Documentation Files %prep %setup -q -n %{_name}-%{version} -%patch0 -p1 %build # Reduce overlinking @@ -128,6 +124,11 @@ make %{?_smp_mflags} check VERBOSE=1 %{?_licensedir: %license GLOBUS_LICENSE} %changelog +* Fri Nov 16 2018 Mattias Ellert - 14.9-1 +- Allow TLS 1.0/1.1 +- Fix leaks +- Drop patch globus-gssapi-gsi-allow-tls-1.0-1.1.patch accepted upstream + * Sat Sep 22 2018 Mattias Ellert - 14.7-2 - Allow TLS 1.0 and 1.1 - Require openssl-libs >= 1.0.2 on EPEL 7 (for SSL_set_alpn_protos) diff --git a/sources b/sources index 3fd8e60..d409e02 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (globus_gssapi_gsi-14.7.tar.gz) = 1ce6e171782cef43278dd0943135a120dc7b399eb93644c41ddf3cfa8b3486646458be9d092a11eba43292179319e7c1cb0797287b5aa8bc245648ee4cf9dd50 +SHA512 (globus_gssapi_gsi-14.9.tar.gz) = b9a96512fc2839473e6c16b5d940230ad385d0cee4d08a5ffdefdfdaa1461f6cc4492d68c099b9ef049d083d177315685fa4099dca136b82c69f6237f4290743