From 4f703937fe2c5833c9d208bb58afeb562857da87 Mon Sep 17 00:00:00 2001 From: Mattias Ellert Date: May 27 2022 22:08:11 +0000 Subject: New GCT release v6.2.20220524 Drop patches included in the release --- diff --git a/globus-gsi-proxy-core-sha256.patch b/globus-gsi-proxy-core-sha256.patch deleted file mode 100644 index 0d49fc2..0000000 --- a/globus-gsi-proxy-core-sha256.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/gsi/proxy/proxy_core/source/library/globus_gsi_proxy.c b/gsi/proxy/proxy_core/source/library/globus_gsi_proxy.c -index 5784c9ff8c..0a4878436e 100644 ---- a/gsi/proxy/proxy_core/source/library/globus_gsi_proxy.c -+++ b/gsi/proxy/proxy_core/source/library/globus_gsi_proxy.c -@@ -597,7 +597,7 @@ globus_gsi_proxy_create_req( - if (!X509_REQ_sign(handle->req, handle->proxy_key, - handle->attrs->signing_algorithm - ? handle->attrs->signing_algorithm -- : EVP_sha1())) -+ : EVP_sha256())) - { - GLOBUS_GSI_PROXY_OPENSSL_ERROR_RESULT( - result, diff --git a/globus-gsi-proxy-core-warn.patch b/globus-gsi-proxy-core-warn.patch deleted file mode 100644 index 78ac1c7..0000000 --- a/globus-gsi-proxy-core-warn.patch +++ /dev/null @@ -1,96 +0,0 @@ -diff --git a/gsi/proxy/proxy_core/source/test/proxy-handle-compat-test.c b/gsi/proxy/proxy_core/source/test/proxy-handle-compat-test.c -index 6630233b97..22829bfbdd 100644 ---- a/gsi/proxy/proxy_core/source/test/proxy-handle-compat-test.c -+++ b/gsi/proxy/proxy_core/source/test/proxy-handle-compat-test.c -@@ -29,44 +29,6 @@ struct test_case - static int test_policy_nid; - - #define TEST_CASE_INITIALIZER(c) { #c, c } --#if OPENSSL_VERSION_NUMBER < 0x10000000L --#define GENERAL_NAME_set0_value(gn, t, dns) \ -- do \ -- { \ -- GENERAL_NAME *g = (gn); \ -- g->type = (t); \ -- g->d.dNSName = (dns);\ -- } \ -- while (0) --#endif -- --#define DEFINE_ASN1_CMP_OF(type, i2d) \ -- static int \ -- type##_cmp(type *A, type *B) \ -- { \ -- int res = 1; \ -- int alen = i2d(A, NULL); \ -- int blen = i2d(B, NULL); \ -- if (alen != blen) \ -- { \ -- res = 0; \ -- } \ -- else \ -- { \ -- unsigned char ader[alen]; \ -- unsigned char bder[blen]; \ -- unsigned char *aderptr = ader; \ -- unsigned char *bderptr = bder; \ -- i2d(A, &aderptr); \ -- i2d(B, &bderptr); \ -- res = !memcmp(ader, bder, alen); \ -- } \ -- return res; \ -- } -- --DEFINE_ASN1_CMP_OF(X509_REQ, i2d_X509_REQ) --DEFINE_ASN1_CMP_OF(X509_EXTENSION, i2d_X509_EXTENSION) -- - - static - bool -@@ -74,7 +36,6 @@ proxy_handle_set_proxy_cert_info_compat_null_test(void) - { - bool ok = true; - globus_result_t result = GLOBUS_SUCCESS; -- globus_gsi_proxy_handle_t handle = NULL; - - result = globus_gsi_proxy_handle_set_proxy_cert_info(NULL, NULL); - if (result == GLOBUS_SUCCESS) -diff --git a/gsi/proxy/proxy_core/source/test/proxy-handle-test.c b/gsi/proxy/proxy_core/source/test/proxy-handle-test.c -index c1945ea7b0..de892f0ccd 100644 ---- a/gsi/proxy/proxy_core/source/test/proxy-handle-test.c -+++ b/gsi/proxy/proxy_core/source/test/proxy-handle-test.c -@@ -85,8 +85,6 @@ static - bool - proxy_handle_destroy_null_test(void) - { -- globus_result_t result = GLOBUS_SUCCESS; -- - globus_gsi_proxy_handle_destroy(NULL); - - return true; -@@ -1061,9 +1059,7 @@ bool - proxy_handle_set_pathlen_null_test(void) - { - globus_result_t result = GLOBUS_SUCCESS; -- globus_gsi_proxy_handle_t handle = NULL; - bool ok = true; -- STACK_OF(X509_EXTENSION) *extensions = NULL; - - result = globus_gsi_proxy_handle_set_pathlen(NULL, 0); - if (result == GLOBUS_SUCCESS) -@@ -1240,7 +1236,6 @@ proxy_handle_set_proxy_cert_info_null_test(void) - { - bool ok = true; - globus_result_t result = GLOBUS_SUCCESS; -- globus_gsi_proxy_handle_t handle = NULL; - - result = globus_gsi_proxy_handle_set_proxy_cert_info(NULL, NULL); - if (result == GLOBUS_SUCCESS) -@@ -1489,7 +1484,6 @@ proxy_handle_set_is_limited_null_test(void) - } - - globus_gsi_proxy_handle_destroy(handle); --no_handle: - return ok; - } - diff --git a/globus-gsi-proxy-core.spec b/globus-gsi-proxy-core.spec index 7239a72..303df8a 100644 --- a/globus-gsi-proxy-core.spec +++ b/globus-gsi-proxy-core.spec @@ -1,19 +1,13 @@ Name: globus-gsi-proxy-core %global _name %(tr - _ <<< %{name}) -Version: 9.6 -Release: 4%{?dist} +Version: 9.8 +Release: 1%{?dist} Summary: Grid Community Toolkit - Globus GSI Proxy Core Library License: ASL 2.0 URL: https://github.com/gridcf/gct/ Source: https://repo.gridcf.org/gct6/sources/%{_name}-%{version}.tar.gz Source8: README -# Use sha256 when signing request -# https://github.com/gridcf/gct/pull/178 -Patch0: %{name}-sha256.patch -# Fix some compiler warnings -# https://github.com/gridcf/gct/pull/179 -Patch1: %{name}-warn.patch BuildRequires: make BuildRequires: gcc @@ -67,8 +61,6 @@ Globus GSI Proxy Core Library Documentation Files %prep %setup -q -n %{_name}-%{version} -%patch0 -p5 -%patch1 -p5 %build # Reduce overlinking @@ -121,6 +113,10 @@ rm %{buildroot}%{_pkgdocdir}/GLOBUS_LICENSE %license GLOBUS_LICENSE %changelog +* Wed May 25 2022 Mattias Ellert - 9.8-1 +- New GCT release v6.2.20220524 +- Drop patches included in the release + * Sat Mar 12 2022 Mattias Ellert - 9.6-4 - Use sha256 when signing request - Fix some compiler warnings diff --git a/sources b/sources index de4fa3e..5bbebe9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (globus_gsi_proxy_core-9.6.tar.gz) = 51603588754d9870564469d6a3c20ba622ec8e793e9a8d68b11db095e625d650313e2326b814aab486a43ef01aeb575213629e1178663b39174b57295f0cdb5b +SHA512 (globus_gsi_proxy_core-9.8.tar.gz) = dec323396fd8716059142da314a0629000c8a8b14e10adaffecbe6d491c7669d9e7ce3e4abfcf8abf781ce70d279533c8d7fdc28cdf9bd4475bd08f52cbf56db