public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/globus-gss-assist] rawhide: Fix compiler and doxygen warnings
@ 2026-06-14 8:54 Mattias Ellert
0 siblings, 0 replies; only message in thread
From: Mattias Ellert @ 2026-06-14 8:54 UTC (permalink / raw)
To: git-commits
A new commit has been pushed.
Repo : rpms/globus-gss-assist
Branch : rawhide
Commit : 5f955ec3b32f550c892dbc251c7e185004872f34
Author : Mattias Ellert <mattias.ellert@physics.uu.se>
Date : 2026-06-14T10:39:13+02:00
Stats : +388/-1 in 3 file(s)
URL : https://src.fedoraproject.org/rpms/globus-gss-assist/c/5f955ec3b32f550c892dbc251c7e185004872f34?branch=rawhide
Log:
Fix compiler and doxygen warnings
---
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..d59d2bc
--- /dev/null
+++ b/0001-Untabify-and-remove-trailing-white-space.patch
@@ -0,0 +1,325 @@
+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
+
+---
+ gsi/gss_assist/source/hostname.c | 54 +++++++++++------------
+ gsi/gss_assist/source/test/gridmap_test.c | 12 ++---
+ gsi/gss_assist/source/wrap.c | 30 ++++++-------
+ 3 files changed, 48 insertions(+), 48 deletions(-)
+
+diff --git a/gsi/gss_assist/source/hostname.c b/gsi/gss_assist/source/hostname.c
+index 4a80b298d..7e116165d 100644
+--- a/gsi/gss_assist/source/hostname.c
++++ b/gsi/gss_assist/source/hostname.c
+@@ -25,7 +25,7 @@
+
+ #ifndef GLOBUS_DONT_DOCUMENT_INTERNAL
+ #define BUFFER_SIZE 8192
+-#ifndef NI_MAXHOST
++#ifndef NI_MAXHOST
+ #define NI_MAXHOST 255
+ #endif
+ #endif
+@@ -36,11 +36,11 @@
+ * resolve the given host name string to the canonical DNS name for the host.
+ *
+ * @param hostname
+- * The host name or numerical address to be resolved and transform
++ * The host name or numerical address to be resolved and transform
+ * into a GSS Name
+ * @param authorization_hostname
+ * The resulting GSS Name
+- *
++ *
+ * @return GLOBUS_SUCCESS on successful completion, a error object otherwise
+ */
+ globus_result_t
+@@ -55,7 +55,7 @@ globus_gss_assist_authorization_host_name(
+ OM_uint32 major_status;
+ OM_uint32 minor_status;
+ globus_result_t result = GLOBUS_SUCCESS;
+- int i;
++ int i;
+ globus_addrinfo_t hints;
+ globus_addrinfo_t * addrinfo;
+
+@@ -65,13 +65,13 @@ globus_gss_assist_authorization_host_name(
+ hints.ai_protocol = 0;
+
+ /* If hostname is an ip address, do a non-canonname getaddrinfo to get
+- * the sockaddr, then getnameinfo to get the hostname from that addr */
++ * the sockaddr, then getnameinfo to get the hostname from that addr */
+
+ hints.ai_flags = GLOBUS_AI_NUMERICHOST;
+ result = globus_libc_getaddrinfo(hostname, NULL, &hints, &addrinfo);
+ /* if this succeeds then the hostname must be numeric */
+ if(result == GLOBUS_SUCCESS)
+- {
++ {
+ if(addrinfo == NULL || addrinfo->ai_addr == NULL)
+ {
+ GLOBUS_GSI_GSS_ASSIST_ERROR_CHAIN_RESULT(
+@@ -79,12 +79,12 @@ globus_gss_assist_authorization_host_name(
+ GLOBUS_GSI_GSS_ASSIST_ERROR_CANONICALIZING_HOSTNAME);
+ goto error_exit;
+ }
+-
+- /*
++
++ /*
+ * For connections to localhost, check for certificate
+ * matching our real hostname, not "localhost"
+ */
+-
++
+ if(globus_libc_addr_is_loopback(
+ (const globus_sockaddr_t *) addrinfo->ai_addr) == GLOBUS_TRUE)
+ {
+@@ -93,8 +93,8 @@ globus_gss_assist_authorization_host_name(
+ }
+ else
+ {
+- /* use GLOBUS_NI_NAMEREQD to fail if address can't be looked up?
+- * if not, realhostname will just be the same ip address
++ /* use GLOBUS_NI_NAMEREQD to fail if address can't be looked up?
++ * if not, realhostname will just be the same ip address
+ * we pass in */
+ result = globus_libc_getnameinfo(
+ (const globus_sockaddr_t *) addrinfo->ai_addr,
+@@ -112,16 +112,16 @@ globus_gss_assist_authorization_host_name(
+ goto error_exit;
+ }
+ }
+-
++
+ globus_libc_freeaddrinfo(addrinfo);
+- }
+-
+- /* else just do a getaddrinfo lookup of the hostname */
++ }
++
++ /* else just do a getaddrinfo lookup of the hostname */
+ else
+ {
+ hints.ai_flags = GLOBUS_AI_CANONNAME;
+ result = globus_libc_getaddrinfo(hostname, NULL, &hints, &addrinfo);
+-
++
+ if(result != GLOBUS_SUCCESS ||
+ addrinfo == NULL ||
+ addrinfo->ai_canonname == NULL)
+@@ -130,13 +130,13 @@ globus_gss_assist_authorization_host_name(
+ result,
+ GLOBUS_GSI_GSS_ASSIST_ERROR_CANONICALIZING_HOSTNAME);
+ goto error_exit;
+- }
++ }
+
+- /*
++ /*
+ * For connections to localhost, check for certificate
+ * matching our real hostname, not "localhost"
+ */
+-
++
+ if(globus_libc_addr_is_loopback(
+ (const globus_sockaddr_t *) addrinfo->ai_addr) == GLOBUS_TRUE)
+ {
+@@ -145,30 +145,30 @@ globus_gss_assist_authorization_host_name(
+ }
+ else
+ {
+- strncpy(&realhostname[5], addrinfo->ai_canonname,
++ strncpy(&realhostname[5], addrinfo->ai_canonname,
+ sizeof(realhostname) - 5);
+ realhostname[sizeof(realhostname) - 1] = '\0';
+ }
+-
++
+ globus_libc_freeaddrinfo(addrinfo);
+ }
+-
++
+ /*
+ * To work around the GSI GSSAPI library being case sensitive
+ * convert the hostname to lower case as no one seems to
+ * request uppercase name certificates.
+ */
+-
++
+ for (i = 5; realhostname[i] && (i < sizeof(realhostname)); i++)
+ {
+ realhostname[i] = tolower(realhostname[i]);
+ }
+-
++
+ name_tok.value = realhostname;
+ name_tok.length = strlen(realhostname) + 1;
+- major_status = gss_import_name(&minor_status,
+- &name_tok,
+- GSS_C_NT_HOSTBASED_SERVICE,
++ major_status = gss_import_name(&minor_status,
++ &name_tok,
++ GSS_C_NT_HOSTBASED_SERVICE,
+ authorization_hostname);
+
+ if(GSS_ERROR(major_status))
+diff --git a/gsi/gss_assist/source/test/gridmap_test.c b/gsi/gss_assist/source/test/gridmap_test.c
+index 782f93c7c..dcbaa50a7 100644
+--- a/gsi/gss_assist/source/test/gridmap_test.c
++++ b/gsi/gss_assist/source/test/gridmap_test.c
+@@ -153,7 +153,7 @@ int gridmap_bad_params_test(void)
+ char * userid = "userid";
+ int rc;
+ char * gridmap;
+-
++
+ gridmap = create_file_path(gridmap_dir, "grid-mapfile");
+
+ rc = globus_libc_setenv("GRIDMAP", gridmap, 1);
+@@ -194,7 +194,7 @@ userok_bad_params_test(void)
+ char * userid = "userid";
+ int rc;
+ char * gridmap;
+-
++
+ gridmap = create_file_path(gridmap_dir, "grid-mapfile");
+
+ rc = globus_libc_setenv("GRIDMAP", gridmap, 1);
+@@ -235,7 +235,7 @@ map_local_user_bad_params_test(void)
+ char * userid = "joe";
+ int rc;
+ char * gridmap;
+-
++
+ gridmap = create_file_path(gridmap_dir, "grid-mapfile");
+
+ rc = globus_libc_setenv("GRIDMAP", gridmap, 1);
+@@ -277,7 +277,7 @@ lookup_all_globusid_bad_params_test(void)
+ int dn_count;
+ int rc;
+ char * gridmap;
+-
++
+ gridmap = create_file_path(gridmap_dir, "grid-mapfile");
+
+ rc = globus_libc_setenv("GRIDMAP", gridmap, 1);
+@@ -328,7 +328,7 @@ map_and_authorize_bad_params_test(void)
+ char * identity_buffer = "id";
+ unsigned int identity_buffer_length = 2;
+ char * gridmap;
+-
++
+ gridmap = create_file_path(gridmap_dir, "grid-mapfile");
+
+
+@@ -388,7 +388,7 @@ gridmap_test(void)
+ int failed;
+ int rc;
+ char * gridmap;
+-
++
+
+ for (i = 0, failed = 0; i < SIZEOF_ARRAY(tests); i++)
+ {
+diff --git a/gsi/gss_assist/source/wrap.c b/gsi/gss_assist/source/wrap.c
+index 61df54f8b..e2ae4f607 100644
+--- a/gsi/gss_assist/source/wrap.c
++++ b/gsi/gss_assist/source/wrap.c
+@@ -32,21 +32,21 @@
+ * @ingroup globus_gsi_gss_assist
+ *
+ * @param minor_status
+- * GSSAPI return code. If the call was successful, the minor
++ * GSSAPI return code. If the call was successful, the minor
+ * status is equal to GLOBUS_SUCCESS. Otherwise, it is an
+- * error object ID for which
++ * error object ID for which
+ * globus_error_get() and globus_object_free()
+ * can be used to get and destroy it.
+ * @param context_handle
+- * the context.
++ * the context.
+ * @param data
+ * pointer to application data to wrap and send
+ * @param length
+ * length of the @a data array
+ * @param token_status
+- * assist routine get/send token status
++ * assist routine get/send token status
+ * @param gss_assist_send_token
+- * a send_token routine
++ * a send_token routine
+ * @param gss_assist_send_context
+ * first arg for the send_token
+ * @param fperr
+@@ -54,7 +54,7 @@
+ *
+ * @return
+ * GSS_S_COMPLETE on success
+- * Other GSSAPI errors on failure.
++ * Other GSSAPI errors on failure.
+ *
+ * @see gss_wrap()
+ */
+@@ -62,9 +62,9 @@ OM_uint32
+ globus_gss_assist_wrap_send(
+ OM_uint32 * minor_status,
+ const gss_ctx_id_t context_handle,
+- char * data,
+- size_t length,
+- int * token_status,
++ char * data,
++ size_t length,
++ int * token_status,
+ int (*gss_assist_send_token)(void *, void *, size_t),
+ void * gss_assist_send_context,
+ FILE * fperr)
+@@ -91,12 +91,12 @@ globus_gss_assist_wrap_send(
+ input_token,
+ NULL,
+ output_token);
+-
++
+ GLOBUS_I_GSI_GSS_ASSIST_DEBUG_FPRINTF(
+ 3, (globus_i_gsi_gss_assist_debug_fstream,
+ _GASL("Wrap_send:maj:%8.8x min:%8.8x inlen:%u outlen:%u\n"),
+- (unsigned int) major_status,
+- (unsigned int) *minor_status,
++ (unsigned int) major_status,
++ (unsigned int) *minor_status,
+ input_token->length = length,
+ output_token->length));
+
+@@ -118,7 +118,7 @@ globus_gss_assist_wrap_send(
+ local_minor_status,
+ *token_status);
+ }
+-
++
+ local_result = globus_error_put(error_copy);
+ GLOBUS_GSI_GSS_ASSIST_ERROR_CHAIN_RESULT(
+ local_result,
+@@ -135,7 +135,7 @@ globus_gss_assist_wrap_send(
+ GLOBUS_GSI_GSS_ASSIST_ERROR_RESULT(
+ local_result,
+ GLOBUS_GSI_GSS_ASSIST_ERROR_WITH_WRAP,
+- (_GASL("Error sending output token. token status: %d\n"),
++ (_GASL("Error sending output token. token status: %d\n"),
+ *token_status));
+ *minor_status = (OM_uint32) local_result;
+ major_status = GSS_S_FAILURE;
+@@ -160,7 +160,7 @@ globus_gss_assist_wrap_send(
+ output_token);
+
+ exit:
+-
++
+ GLOBUS_I_GSI_GSS_ASSIST_DEBUG_EXIT;
+ return major_status;
+ }
+--
+2.54.0
+
diff --git a/0002-Fix-compiler-and-doxygen-warnings.patch b/0002-Fix-compiler-and-doxygen-warnings.patch
new file mode 100644
index 0000000..0a840b7
--- /dev/null
+++ b/0002-Fix-compiler-and-doxygen-warnings.patch
@@ -0,0 +1,55 @@
+From 4ee08d13e2963309e2063dc45dedd067337d3b76 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] Fix compiler and doxygen warnings
+
+---
+ gsi/gss_assist/source/hostname.c | 2 +-
+ gsi/gss_assist/source/test/gridmap_test.c | 4 ++++
+ gsi/gss_assist/source/wrap.c | 2 +-
+ 3 files changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/gsi/gss_assist/source/hostname.c b/gsi/gss_assist/source/hostname.c
+index 7e116165d..47e955b16 100644
+--- a/gsi/gss_assist/source/hostname.c
++++ b/gsi/gss_assist/source/hostname.c
+@@ -31,7 +31,7 @@
+ #endif
+
+ /**
+- * @ingroup globus_gss_assist_name
++ * @ingroup globus_gss_assist
+ * Create a GSS Name structure from the given hostname. This function tries to
+ * resolve the given host name string to the canonical DNS name for the host.
+ *
+diff --git a/gsi/gss_assist/source/test/gridmap_test.c b/gsi/gss_assist/source/test/gridmap_test.c
+index dcbaa50a7..11dbd9242 100644
+--- a/gsi/gss_assist/source/test/gridmap_test.c
++++ b/gsi/gss_assist/source/test/gridmap_test.c
+@@ -129,6 +129,10 @@ create_contexts(void)
+ NULL,
+ NULL);
+ }
++ else
++ {
++ maj_stat = 0;
++ }
+
+ if (GSS_ERROR(maj_stat))
+ {
+diff --git a/gsi/gss_assist/source/wrap.c b/gsi/gss_assist/source/wrap.c
+index e2ae4f607..dffb3857a 100644
+--- a/gsi/gss_assist/source/wrap.c
++++ b/gsi/gss_assist/source/wrap.c
+@@ -29,7 +29,7 @@
+
+ /**
+ * @brief Wrap
+- * @ingroup globus_gsi_gss_assist
++ * @ingroup globus_gss_assist
+ *
+ * @param minor_status
+ * GSSAPI return code. If the call was successful, the minor
+--
+2.54.0
+
diff --git a/globus-gss-assist.spec b/globus-gss-assist.spec
index 7f8f7d6..5990a38 100644
--- a/globus-gss-assist.spec
+++ b/globus-gss-assist.spec
@@ -1,13 +1,15 @@
Name: globus-gss-assist
%global _name %(tr - _ <<< %{name})
Version: 12.7
-Release: 10%{?dist}
+Release: 11%{?dist}
Summary: Grid Community Toolkit - GSSAPI Assist 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-Fix-compiler-and-doxygen-warnings.patch
BuildRequires: make
BuildRequires: gcc
@@ -92,6 +94,8 @@ GSSAPI Assist library Documentation Files
%prep
%setup -q -n %{_name}-%{version}
+%patch -P0 -p4
+%patch -P1 -p4
%build
# Reduce overlinking
@@ -152,6 +156,9 @@ rm %{buildroot}%{_pkgdocdir}/GLOBUS_LICENSE
%license GLOBUS_LICENSE
%changelog
+* Sun Jun 14 2026 Mattias Ellert <mattias.ellert@physics.uu.se> - 12.7-11
+- Fix compiler and doxygen warnings
+
* Fri Jan 16 2026 Fedora Release Engineering <releng@fedoraproject.org> - 12.7-10
- 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:54 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:54 [rpms/globus-gss-assist] rawhide: Fix compiler and doxygen warnings Mattias Ellert
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox