diff mbox series

[meta-security,2/5] libgssglue: upgrade 0.8 -> 0.9

Message ID 20250327132327.3477926-2-yi.zhao@windriver.com
State New
Headers show
Series [meta-security,1/5] samhain: upgrade 4.4.10 -> 4.5.2 | expand

Commit Message

Yi Zhao March 27, 2025, 1:23 p.m. UTC
* Drop useless patch libgssglue-canon-name.patch

Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
---
 .../files/libgssglue-canon-name.patch         | 60 -------------------
 .../{libgssglue_0.8.bb => libgssglue_0.9.bb}  |  6 +-
 2 files changed, 2 insertions(+), 64 deletions(-)
 delete mode 100644 recipes-security/libgssglue/files/libgssglue-canon-name.patch
 rename recipes-security/libgssglue/{libgssglue_0.8.bb => libgssglue_0.9.bb} (94%)
diff mbox series

Patch

diff --git a/recipes-security/libgssglue/files/libgssglue-canon-name.patch b/recipes-security/libgssglue/files/libgssglue-canon-name.patch
deleted file mode 100644
index cb7c47b..0000000
--- a/recipes-security/libgssglue/files/libgssglue-canon-name.patch
+++ /dev/null
@@ -1,60 +0,0 @@ 
-fix the bug:
-g_canon_name.c:125:5: warning: passing argument 2 of '__gss_copy_namebuf' from incompatible pointer type [enabled by default]
-
-the 2nd argument of __gss_copy_namebuf should be address of *gss_buffer_t, \
-but a *gss_buffer_t is assigned.
-
-what __gss_copy_namebuf does is to alloc memory for a gss_buffer_desc and \
-copy from src and return its address.
-
-if following code failed, gss_release_name will free \
-union_canon_name->external_name.value if it is not NULL.
-
-OM_uint32 __gss_copy_namebuf(src, dest)
-    gss_buffer_t   src;
-    gss_buffer_t   *dest;
-
-typedef struct gss_union_name_t {
-	gss_mechanism		gss_mech;
-	gss_OID			name_type;
-	gss_buffer_desc		external_name;
-	/*
-	 * These last two fields are only filled in for mechanism
-	 * names.
-	 */
-	gss_OID			mech_type;
-	gss_name_t		mech_name;
-} gss_union_name_desc, *gss_union_name_t;
-
-typedef struct gss_buffer_desc_struct {
-      size_t length;
-      void FAR *value;
-} gss_buffer_desc, FAR *gss_buffer_t;
-
-Upstream-Status: Pending
-Signed-off-by: Yao Zhao <yao.zhao@windriver.com>
-
---- a/src/g_canon_name.c
-+++ b/src/g_canon_name.c
-@@ -121,11 +121,17 @@ gss_canonicalize_name (OM_uint32 *minor_
- 
-     union_canon_name->mech_name = mech_name;
- 
--    status = __gss_copy_namebuf(&union_input_name->external_name,
--				&union_canon_name->external_name);
--    if (status != GSS_S_COMPLETE)
--	goto failure;
-+    union_canon_name->external_name.value = (void*) malloc(
-+                      union_input_name->external_name.length + 1);
-+    if (!union_canon_name->external_name.value)
-+        goto failure;
- 
-+    memcpy(union_canon_name->external_name.value, 
-+           union_input_name->external_name.value, 
-+           union_input_name->external_name.length);
-+    union_canon_name->external_name.length = 
-+                      union_input_name->external_name.length; 
-+   
-     if (union_input_name->name_type != GSS_C_NO_OID) {
- 	status = generic_gss_copy_oid(minor_status,
- 				      union_input_name->name_type,
diff --git a/recipes-security/libgssglue/libgssglue_0.8.bb b/recipes-security/libgssglue/libgssglue_0.9.bb
similarity index 94%
rename from recipes-security/libgssglue/libgssglue_0.8.bb
rename to recipes-security/libgssglue/libgssglue_0.9.bb
index e534615..7e24450 100644
--- a/recipes-security/libgssglue/libgssglue_0.8.bb
+++ b/recipes-security/libgssglue/libgssglue_0.9.bb
@@ -21,10 +21,8 @@  LIC_FILES_CHKSUM = "file://COPYING;md5=56871e72a5c475289c0d5e4ba3f2ee3a \
                     file://src/oid_ops.c;beginline=378;endline=398;md5=72457a5cdc0354cb5c25c8b150326364\
 "
 
-SRC_URI = "git://gitlab.com/gsasl/libgssglue.git;protocol=https;branch=master \
-           file://libgssglue-canon-name.patch  \
-"
-SRCREV = "c8b4b2936b854a7d4f7ef12e30d6f519b30dec87"
+SRC_URI = "git://gitlab.com/gsasl/libgssglue.git;protocol=https;branch=master"
+SRCREV = "ada76bdaec665f70505f0b3aefe871b873e7c4b6"
 
 S = "${WORKDIR}/git"