From be68e12bcf899281ac052b682b5b41de596dd5a3 Mon Sep 17 00:00:00 2001 From: Mattias Ellert Date: Mar 12 2022 19:47:24 +0000 Subject: Use sha256 hash when generating test certificates Fix some doxygen warnings --- diff --git a/globus-gram-client-sha256.patch b/globus-gram-client-sha256.patch new file mode 100644 index 0000000..63d4dd4 --- /dev/null +++ b/globus-gram-client-sha256.patch @@ -0,0 +1,13 @@ +diff --git a/gram/client/source/test/testcred.cnf.in b/gram/client/source/test/testcred.cnf.in +index ef12fd8e93..e878b0151a 100644 +--- a/gram/client/source/test/testcred.cnf.in ++++ b/gram/client/source/test/testcred.cnf.in +@@ -44,7 +44,7 @@ commonName = supplied + #################################################################### + [ req ] + default_bits = 2048 +-default_md = sha1 ++default_md = sha256 + default_keyfile = privkey.pem + distinguished_name = req_distinguished_name + attributes = req_attributes diff --git a/globus-gram-client-warn.patch b/globus-gram-client-warn.patch new file mode 100644 index 0000000..21deaa0 --- /dev/null +++ b/globus-gram-client-warn.patch @@ -0,0 +1,13 @@ +diff --git a/gram/client/source/globus_gram_client.c b/gram/client/source/globus_gram_client.c +index 78081bfbef..6f85f9b23a 100644 +--- a/gram/client/source/globus_gram_client.c ++++ b/gram/client/source/globus_gram_client.c +@@ -339,8 +339,6 @@ globus_i_gram_client_deactivate(void) + * of the information printed by this debugging system is related to errors + * that occur during GRAM Client API functions. The messages printed to + * standard output are not structured in any way. +- * +- * @return void + */ + void + globus_gram_client_debug(void) diff --git a/globus-gram-client.spec b/globus-gram-client.spec index 67953b0..bc220b9 100644 --- a/globus-gram-client.spec +++ b/globus-gram-client.spec @@ -1,13 +1,19 @@ Name: globus-gram-client %global _name %(tr - _ <<< %{name}) Version: 14.4 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Grid Community Toolkit - GRAM Client 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 hash when generating test certificates +# https://github.com/gridcf/gct/pull/178 +Patch0: %{name}-sha256.patch +# Fix some doxygen warnings +# https://github.com/gridcf/gct/pull/179 +Patch1: %{name}-warn.patch BuildRequires: make BuildRequires: gcc @@ -60,6 +66,8 @@ GRAM Client Library Documentation Files %prep %setup -q -n %{_name}-%{version} +%patch0 -p4 +%patch1 -p4 %build # Reduce overlinking @@ -111,6 +119,10 @@ GLOBUS_HOSTNAME=localhost %make_build check %license GLOBUS_LICENSE %changelog +* Sat Mar 12 2022 Mattias Ellert - 14.4-5 +- Use sha256 hash when generating test certificates +- Fix some doxygen warnings + * Thu Jan 20 2022 Fedora Release Engineering - 14.4-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild