public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/globus-gsi-proxy-ssl] rawhide: Compile with OpenSSL 4
@ 2026-06-14 8:53 Mattias Ellert
0 siblings, 0 replies; only message in thread
From: Mattias Ellert @ 2026-06-14 8:53 UTC (permalink / raw)
To: git-commits
A new commit has been pushed.
Repo : rpms/globus-gsi-proxy-ssl
Branch : rawhide
Commit : 2f8bef5b34a02e380939a46c3fbb0d0a97827087
Author : Mattias Ellert <mattias.ellert@physics.uu.se>
Date : 2026-06-14T10:39:13+02:00
Stats : +187/-1 in 3 file(s)
URL : https://src.fedoraproject.org/rpms/globus-gsi-proxy-ssl/c/2f8bef5b34a02e380939a46c3fbb0d0a97827087?branch=rawhide
Log:
Compile with OpenSSL 4
---
diff --git a/0001-Untabify-and-remove-trailing-white-space.patch b/0001-Untabify-and-remove-trailing-white-space.patch
new file mode 100644
index 0000000..989a77c
--- /dev/null
+++ b/0001-Untabify-and-remove-trailing-white-space.patch
@@ -0,0 +1,148 @@
+From 3ccdaa0236230bbcbcbf339e7dfdfaf23c10bd6f Mon Sep 17 00:00:00 2001
+From: Mattias Ellert <mattias.ellert@physics.uu.se>
+Date: Wed, 20 May 2026 00:15:37 +0200
+Subject: [PATCH 1/2] Untabify and remove trailing white-space
+
+---
+ .../proxy_ssl/source/library/proxypolicy.c | 40 +++++++++----------
+ 1 file changed, 20 insertions(+), 20 deletions(-)
+
+diff --git a/gsi/proxy/proxy_ssl/source/library/proxypolicy.c b/gsi/proxy/proxy_ssl/source/library/proxypolicy.c
+index 09c00a4ae..26e1a0319 100644
+--- a/gsi/proxy/proxy_ssl/source/library/proxypolicy.c
++++ b/gsi/proxy/proxy_ssl/source/library/proxypolicy.c
+@@ -34,7 +34,7 @@ IMPLEMENT_ASN1_DUP_FUNCTION(PROXYPOLICY)
+ #if OPENSSL_VERSION_NUMBER < 0x10000000L
+ /**
+ * @ingroup proxypolicy
+- *
++ *
+ * Creates an ASN1_METHOD structure, which contains
+ * pointers to routines that convert any PROXYPOLICY
+ * structure to its associated ASN.1 DER encoded form
+@@ -70,7 +70,7 @@ int PROXYPOLICY_cmp(
+ const PROXYPOLICY * a,
+ const PROXYPOLICY * b)
+ {
+-
++
+ if((OBJ_obj2nid(a->policy_language) != OBJ_obj2nid(b->policy_language)) ||
+ ASN1_STRING_cmp((ASN1_STRING *)a->policy, (ASN1_STRING *)b->policy))
+ {
+@@ -99,9 +99,9 @@ int PROXYPOLICY_print(
+ values = i2v_PROXYPOLICY(PROXYPOLICY_x509v3_ext_meth(),
+ policy,
+ values);
+-
++
+ X509V3_EXT_val_prn(bp, values, 0, 1);
+-
++
+ sk_CONF_VALUE_pop_free(values, X509V3_conf_free);
+ return 1;
+ }
+@@ -123,7 +123,7 @@ int PROXYPOLICY_print_fp(
+ {
+ int ret;
+
+- BIO * bp = BIO_new(BIO_s_file());
++ BIO * bp = BIO_new(BIO_s_file());
+ BIO_set_fp(bp, fp, BIO_NOCLOSE);
+ ret = PROXYPOLICY_print(bp, policy);
+ BIO_free(bp);
+@@ -146,7 +146,7 @@ int PROXYPOLICY_set_policy_language(
+ PROXYPOLICY * policy,
+ ASN1_OBJECT * policy_language)
+ {
+- if(policy_language != NULL)
++ if(policy_language != NULL)
+ {
+ ASN1_OBJECT_free(policy->policy_language);
+ policy->policy_language = OBJ_dup(policy_language);
+@@ -157,14 +157,14 @@ int PROXYPOLICY_set_policy_language(
+
+ /**
+ * @ingroup proxypolicy
+- *
++ *
+ * Gets the policy language of the PROXYPOLICY
+ *
+ * @param policy the proxy policy to get the policy language
+ * of
+- *
++ *
+ * @return the policy language as an ASN1_OBJECT
+- */
++ */
+ ASN1_OBJECT * PROXYPOLICY_get_policy_language(
+ PROXYPOLICY * policy)
+ {
+@@ -196,7 +196,7 @@ int PROXYPOLICY_set_policy(
+ {
+ proxypolicy->policy = ASN1_OCTET_STRING_new();
+ }
+-
++
+ ASN1_OCTET_STRING_set(proxypolicy->policy, copy, length);
+
+ }
+@@ -228,7 +228,7 @@ unsigned char * PROXYPOLICY_get_policy(
+ int * length)
+ {
+ if(policy->policy)
+- {
++ {
+ (*length) = policy->policy->length;
+ if(*length > 0 && policy->policy->data)
+ {
+@@ -237,7 +237,7 @@ unsigned char * PROXYPOLICY_get_policy(
+ return copy;
+ }
+ }
+-
++
+ return NULL;
+ }
+
+@@ -289,13 +289,13 @@ STACK_OF(CONF_VALUE) * i2v_PROXYPOLICY(
+ 127,
+ PROXYPOLICY_get_policy_language(ext));
+ }
+-
+- X509V3_add_value(" Policy Language",
++
++ X509V3_add_value(" Policy Language",
+ policy_lang,
+ &extlist);
+-
++
+ policy = PROXYPOLICY_get_policy(ext, &policy_length);
+-
++
+ if(!policy)
+ {
+ X509V3_add_value(" Policy", " EMPTY", &extlist);
+@@ -332,16 +332,16 @@ STACK_OF(CONF_VALUE) * i2v_PROXYPOLICY(
+ {
+ *(index++) = '\0';
+ policy_line_length = index - tmp_string;
+-
++
+ X509V3_add_value(NULL, (char *) tmp_string, &extlist);
+-
++
+ tmp_string = index;
+ }
+ policy_length -= policy_line_length;
+ }
+-
++
+ free(policy);
+ }
+-
++
+ return extlist;
+ }
+--
+2.54.0
+
diff --git a/0002-Build-with-OpenSSL-4.patch b/0002-Build-with-OpenSSL-4.patch
new file mode 100644
index 0000000..8716b74
--- /dev/null
+++ b/0002-Build-with-OpenSSL-4.patch
@@ -0,0 +1,31 @@
+From 24375b8503d2a4373600b14d03700b697415737b Mon Sep 17 00:00:00 2001
+From: Mattias Ellert <mattias.ellert@physics.uu.se>
+Date: Wed, 20 May 2026 00:15:37 +0200
+Subject: [PATCH 2/2] Build with OpenSSL 4
+
+---
+ gsi/proxy/proxy_ssl/source/library/proxypolicy.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/gsi/proxy/proxy_ssl/source/library/proxypolicy.c b/gsi/proxy/proxy_ssl/source/library/proxypolicy.c
+index 26e1a0319..1c9bd1dbb 100644
+--- a/gsi/proxy/proxy_ssl/source/library/proxypolicy.c
++++ b/gsi/proxy/proxy_ssl/source/library/proxypolicy.c
+@@ -229,11 +229,11 @@ unsigned char * PROXYPOLICY_get_policy(
+ {
+ if(policy->policy)
+ {
+- (*length) = policy->policy->length;
+- if(*length > 0 && policy->policy->data)
++ (*length) = ASN1_STRING_length(policy->policy);
++ if(*length > 0 && ASN1_STRING_get0_data(policy->policy))
+ {
+ unsigned char * copy = malloc(*length);
+- memcpy(copy, policy->policy->data, *length);
++ memcpy(copy, ASN1_STRING_get0_data(policy->policy), *length);
+ return copy;
+ }
+ }
+--
+2.54.0
+
diff --git a/globus-gsi-proxy-ssl.spec b/globus-gsi-proxy-ssl.spec
index 97fa8c1..a96840d 100644
--- a/globus-gsi-proxy-ssl.spec
+++ b/globus-gsi-proxy-ssl.spec
@@ -1,13 +1,15 @@
Name: globus-gsi-proxy-ssl
%global _name %(tr - _ <<< %{name})
Version: 6.6
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Grid Community Toolkit - Globus GSI Proxy SSL Library
License: Apache-2.0
URL: https://github.com/gridcf/gct/
Source: https://repo.gridcf.org/gct6/sources/%{_name}-%{version}.tar.gz
Source8: README
+Patch0: 0001-Untabify-and-remove-trailing-white-space.patch
+Patch1: 0002-Build-with-OpenSSL-4.patch
BuildRequires: make
BuildRequires: gcc
@@ -60,6 +62,8 @@ Globus GSI Proxy SSL Library Documentation Files
%prep
%setup -q -n %{_name}-%{version}
+%patch -P0 -p5
+%patch -P1 -p5
%build
# Reduce overlinking
@@ -112,6 +116,9 @@ rm %{buildroot}%{_pkgdocdir}/GLOBUS_LICENSE
%license GLOBUS_LICENSE
%changelog
+* Sat Jun 13 2026 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.6-3
+- Compile with OpenSSL 4
+
* Fri Jan 16 2026 Fedora Release Engineering <releng@fedoraproject.org> - 6.6-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2026-06-14 8:53 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-06-14 8:53 [rpms/globus-gsi-proxy-ssl] rawhide: Compile with OpenSSL 4 Mattias Ellert
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox