public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/globus-gridmap-eppn-callout] rawhide: Compile with OpenSSL 4
@ 2026-06-14 8:48 Mattias Ellert
0 siblings, 0 replies; only message in thread
From: Mattias Ellert @ 2026-06-14 8:48 UTC (permalink / raw)
To: git-commits
A new commit has been pushed.
Repo : rpms/globus-gridmap-eppn-callout
Branch : rawhide
Commit : 0817c70b98b44f638ee6e7475b8e74ce4f52cac6
Author : Mattias Ellert <mattias.ellert@physics.uu.se>
Date : 2026-06-14T10:39:13+02:00
Stats : +56/-1 in 2 file(s)
URL : https://src.fedoraproject.org/rpms/globus-gridmap-eppn-callout/c/0817c70b98b44f638ee6e7475b8e74ce4f52cac6?branch=rawhide
Log:
Compile with OpenSSL 4
---
diff --git a/0001-Build-with-OpenSSL-4.patch b/0001-Build-with-OpenSSL-4.patch
new file mode 100644
index 0000000..5de1017
--- /dev/null
+++ b/0001-Build-with-OpenSSL-4.patch
@@ -0,0 +1,50 @@
+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] Build with OpenSSL 4
+
+---
+ gsi/gridmap_eppn_callout/globus_gridmap_eppn.c | 14 +++++++++-----
+ 1 file changed, 9 insertions(+), 5 deletions(-)
+
+diff --git a/gsi/gridmap_eppn_callout/globus_gridmap_eppn.c b/gsi/gridmap_eppn_callout/globus_gridmap_eppn.c
+index deff089c8..65e9dc171 100644
+--- a/gsi/gridmap_eppn_callout/globus_gridmap_eppn.c
++++ b/gsi/gridmap_eppn_callout/globus_gridmap_eppn.c
+@@ -294,9 +294,13 @@ ggvm_get_eppn(
+ {
+ ASN1_OBJECT * eppn_obj;
+ int extpos;
++#if OPENSSL_VERSION_NUMBER < 0x40000000L
+ X509_EXTENSION * eppn_ext;
+- ASN1_STRING * eppn_str;
+- unsigned char * eppn_data;
++#else
++ const X509_EXTENSION * eppn_ext;
++#endif
++ const ASN1_STRING * eppn_str;
++ const unsigned char * eppn_data;
+ int tag;
+ int xclass;
+
+@@ -312,14 +316,14 @@ ggvm_get_eppn(
+ if (!(eppn_str = X509_EXTENSION_get_data(eppn_ext)))
+ return GLOBUS_FAILURE;
+
+- eppn_data = eppn_str->data;
++ eppn_data = ASN1_STRING_get0_data(eppn_str);
+
+ if (ASN1_get_object(GT_ASN1_GET_OBJECT_CAST &eppn_data,
+- length, &tag, &xclass, eppn_str->length) == 0x80)
++ length, &tag, &xclass, ASN1_STRING_length(eppn_str)) == 0x80)
+ return GLOBUS_FAILURE;
+
+ *data = (char *) eppn_data;
+- *length = eppn_str->length;
++ *length = ASN1_STRING_length(eppn_str);
+
+ return GLOBUS_SUCCESS;
+ }
+--
+2.54.0
+
diff --git a/globus-gridmap-eppn-callout.spec b/globus-gridmap-eppn-callout.spec
index 1c86844..3a40dde 100644
--- a/globus-gridmap-eppn-callout.spec
+++ b/globus-gridmap-eppn-callout.spec
@@ -1,13 +1,14 @@
Name: globus-gridmap-eppn-callout
%global _name %(tr - _ <<< %{name})
Version: 2.2
-Release: 18%{?dist}
+Release: 19%{?dist}
Summary: Grid Community Toolkit - Globus gridmap ePPN callout
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-Build-with-OpenSSL-4.patch
BuildRequires: make
BuildRequires: gcc
@@ -34,6 +35,7 @@ Globus gridmap eduPersonPrincipalName (ePPN) callout
%prep
%setup -q -n %{_name}-%{version}
+%patch -P0 -p3
%build
# Reduce overlinking
@@ -72,6 +74,9 @@ rm %{buildroot}%{_pkgdocdir}/GLOBUS_LICENSE
%license GLOBUS_LICENSE
%changelog
+* Sun Jun 14 2026 Mattias Ellert <mattias.ellert@physics.uu.se> - 2.2-19
+- Compile with OpenSSL 4
+
* Fri Jan 16 2026 Fedora Release Engineering <releng@fedoraproject.org> - 2.2-18
- 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:48 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:48 [rpms/globus-gridmap-eppn-callout] 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