From b29ce7d47d8024151177113221bf87dbd07b9c41 Mon Sep 17 00:00:00 2001 From: Armin Kuster Date: Sun, 25 Sep 2022 13:27:39 -0400 Subject: libgssglue: update to 0.7 LIC_FILE_CHKSUM changes to to indentations changes. use bootstrap to setup config properly. Drop libgssglue-fix-CVE-2011-2709.patch, libgssglue-g-initialize.patch now included in update. and ibgssglue-mglueP.patch now included in update. Drop libgssglue-gss-inq-cred.patch still pending after 5 yrs. Signed-off-by: Armin Kuster --- .../files/libgssglue-fix-CVE-2011-2709.patch | 43 ------------------ .../libgssglue/files/libgssglue-g-initialize.patch | 21 --------- .../libgssglue/files/libgssglue-gss-inq-cred.patch | 27 ------------ .../libgssglue/files/libgssglue-mglueP.patch | 21 --------- recipes-security/libgssglue/libgssglue_0.4.bb | 51 ---------------------- recipes-security/libgssglue/libgssglue_0.7.bb | 51 ++++++++++++++++++++++ 6 files changed, 51 insertions(+), 163 deletions(-) delete mode 100644 recipes-security/libgssglue/files/libgssglue-fix-CVE-2011-2709.patch delete mode 100644 recipes-security/libgssglue/files/libgssglue-g-initialize.patch delete mode 100644 recipes-security/libgssglue/files/libgssglue-gss-inq-cred.patch delete mode 100644 recipes-security/libgssglue/files/libgssglue-mglueP.patch delete mode 100644 recipes-security/libgssglue/libgssglue_0.4.bb create mode 100644 recipes-security/libgssglue/libgssglue_0.7.bb (limited to 'recipes-security') diff --git a/recipes-security/libgssglue/files/libgssglue-fix-CVE-2011-2709.patch b/recipes-security/libgssglue/files/libgssglue-fix-CVE-2011-2709.patch deleted file mode 100644 index 6aa1a65..0000000 --- a/recipes-security/libgssglue/files/libgssglue-fix-CVE-2011-2709.patch +++ /dev/null @@ -1,43 +0,0 @@ -Use secure_getenv instead of getenv for setuid programs - -(bnc#694598 CVE-2011-2709 bnc#831805) - -import from: -https://build.opensuse.org/package/view_file/openSUSE:Factory/libgssglue/secure-getenv.patch - -Upstream-Status: Pending - -Signed-off-by: Jackie Huang - -diff --git a/src/g_initialize.c b/src/g_initialize.c -index 200f173..935a9fa 100644 ---- a/src/g_initialize.c -+++ b/src/g_initialize.c -@@ -26,6 +26,7 @@ - * This function will initialize the gssapi mechglue library - */ - -+#define _GNU_SOURCE - #include "mglueP.h" - #include - -@@ -197,8 +198,7 @@ static void solaris_initialize () - void *dl; - gss_mechanism (*sym)(void), mech; - -- if ((getuid() != geteuid()) || -- ((filename = getenv("GSSAPI_MECH_CONF")) == NULL)) -+ if ((filename = secure_getenv("GSSAPI_MECH_CONF")) == NULL) - filename = MECH_CONF; - - if ((conffile = fopen(filename, "r")) == NULL) { -@@ -274,8 +274,7 @@ static void linux_initialize () - void *dl; - gss_mechanism (*sym)(void), mech; - -- if ((getuid() != geteuid()) || -- ((filename = getenv("GSSAPI_MECH_CONF")) == NULL)) -+ if ((filename = secure_getenv("GSSAPI_MECH_CONF")) == NULL) - filename = MECH_CONF; - - if ((conffile = fopen(filename, "r")) == NULL) { diff --git a/recipes-security/libgssglue/files/libgssglue-g-initialize.patch b/recipes-security/libgssglue/files/libgssglue-g-initialize.patch deleted file mode 100644 index 4a9ba33..0000000 --- a/recipes-security/libgssglue/files/libgssglue-g-initialize.patch +++ /dev/null @@ -1,21 +0,0 @@ -Fix the warning for getuid, geteuid -g_initialize.c: In function 'linux_initialize': -g_initialize.c:275:5: warning: implicit declaration of function 'getuid' [-Wimplicit-function-declaration] -g_initialize.c:275:5: warning: implicit declaration of function 'geteuid' [-Wimplicit-function-declaration] - -Upstream-Status: Pending -Signed-off-by: Yao Zhao - -diff --git a/src/g_initialize.c b/src1/g_initialize.c -index 82fcce1..200f173 100644 ---- a/src/g_initialize.c -+++ b/src/g_initialize.c -@@ -29,6 +29,8 @@ - #include "mglueP.h" - #include - -+#include /*getuid, geteuid */ -+#include - #include - #include - #include diff --git a/recipes-security/libgssglue/files/libgssglue-gss-inq-cred.patch b/recipes-security/libgssglue/files/libgssglue-gss-inq-cred.patch deleted file mode 100644 index 6dce3e7..0000000 --- a/recipes-security/libgssglue/files/libgssglue-gss-inq-cred.patch +++ /dev/null @@ -1,27 +0,0 @@ -1) add free if malloc failed for (*mechanisms)->elements -2) g_inq_cred.c: In function 'gss_inquire_cred': -g_inq_cred.c:161:8: warning: passing argument 3 of 'generic_gss_copy_oid' from incompatible pointer type [enabled by default] - -Upstream-Status: Pending -Signed-off-by: Yao Zhao - ---- a/src/g_inq_cred.c -+++ b/src/g_inq_cred.c -@@ -152,13 +152,15 @@ gss_OID_set * mechanisms; - union_cred->count); - if ((*mechanisms)->elements == NULL) { - *minor_status = ENOMEM; -+ free(*mechanisms); -+ *mechanisms = GSS_C_NO_OID_SET; - return (GSS_S_FAILURE); - } - - for (i=0; i < union_cred->count; i++) { -- status = generic_gss_copy_oid(minor_status, -+ status = generic_gss_add_oid_set_member(minor_status, - &union_cred->mechs_array[i], -- &((*mechanisms)->elements[i])); -+ mechanisms); - if (status != GSS_S_COMPLETE) - break; - } diff --git a/recipes-security/libgssglue/files/libgssglue-mglueP.patch b/recipes-security/libgssglue/files/libgssglue-mglueP.patch deleted file mode 100644 index 6c9ebf0..0000000 --- a/recipes-security/libgssglue/files/libgssglue-mglueP.patch +++ /dev/null @@ -1,21 +0,0 @@ -fix the warning: -warning: implicit declaration of function 'generic_gss_copy_oid_set' [-Wimplicit-function-declaration] - -Upstream-Status: Pending -Signed-off-by: Yao Zhao - ---- a/src/mglueP.h -+++ b/src/mglueP.h -@@ -447,6 +447,12 @@ OM_uint32 generic_gss_copy_oid - gss_OID * /* new_oid */ - ); - -+OM_uint32 generic_gss_copy_oid_set -+ (OM_uint32 *minor_status, /* minor_status */ -+ const gss_OID_set_desc * const oidset, /* oid */ -+ gss_OID_set *new_oidset /* new_oid */ -+ ); -+ - OM_uint32 generic_gss_create_empty_oid_set - (OM_uint32 *, /* minor_status */ - gss_OID_set * /* oid_set */ diff --git a/recipes-security/libgssglue/libgssglue_0.4.bb b/recipes-security/libgssglue/libgssglue_0.4.bb deleted file mode 100644 index 3085ee6..0000000 --- a/recipes-security/libgssglue/libgssglue_0.4.bb +++ /dev/null @@ -1,51 +0,0 @@ -SUMMARY = "Exports a gssapi interface which calls other gssapi libraries" -DESCRIPTION = "\ -This library exports a gssapi interface, but does not implement any gssapi \ -mechanisms itself; instead it calls gssapi routines in other libraries, \ -depending on the mechanism. \ -" - -HOMEPAGE = "http://www.citi.umich.edu/projects/nfsv4/linux/" -SECTION = "libs" - -LICENSE = "BSD-3-Clause | HPND" - -#Copyright (c) 1996, by Sun Microsystems, Inc. HPND -#Copyright (c) 2007 The Regents of the University of Michigan. BSD-3-Clause -#Copyright 1995 by the Massachusetts Institute of Technology. HPND without Disclaimer -#Copyright 1993 by OpenVision Technologies, Inc. HPND -LIC_FILES_CHKSUM = "file://COPYING;md5=56871e72a5c475289c0d5e4ba3f2ee3a \ - file://src/g_accept_sec_context.c;beginline=3;endline=23;md5=8a7f4017cb7f4be49f8981cb8c472690 \ - file://src/g_ccache_name.c;beginline=1;endline=32;md5=208d4de05d5c8273963a8332f084faa7 \ - file://src/oid_ops.c;beginline=1;endline=26;md5=1f194d148b396972da26759a8ec399f0 \ - file://src/oid_ops.c;beginline=378;endline=398;md5=e02c165cb8383e950214baca2fbd664b \ -" - -SRC_URI = "${DEBIAN_MIRROR}/main/libg/${BPN}/${BPN}_${PV}.orig.tar.bz2 \ - file://libgssglue-canon-name.patch \ - file://libgssglue-gss-inq-cred.patch \ - file://libgssglue-mglueP.patch \ - file://libgssglue-g-initialize.patch \ - file://libgssglue-fix-CVE-2011-2709.patch \ -" - -SRC_URI[md5sum] = "5ce81940965fa68c7635c42dcafcddfe" -SRC_URI[sha256sum] = "bb47b2de78409f461811d0db8595c66e6631a9879c3621a35e4434b104ee52f5" - -# gssglue can use krb5, spkm3... as gssapi library, configurable -RRECOMMENDS:${PN} += "krb5" - -inherit autotools - -do_install:append() { - # install some docs - install -d -m 0755 ${D}${docdir}/${BPN} - install -m 0644 ${S}/AUTHORS ${S}/ChangeLog ${S}/NEWS ${S}/README ${D}${docdir}/${BPN} - - # install the gssapi_mech.conf - install -d -m 0755 ${D}${sysconfdir} - install -m 0644 ${S}/doc/gssapi_mech.conf ${D}${sysconfdir} - - # change the libgssapi_krb5.so path and name(it is .so.2) - sed -i -e "s:/usr/lib/libgssapi_krb5.so:libgssapi_krb5.so.2:" ${D}${sysconfdir}/gssapi_mech.conf -} diff --git a/recipes-security/libgssglue/libgssglue_0.7.bb b/recipes-security/libgssglue/libgssglue_0.7.bb new file mode 100644 index 0000000..26bd2f3 --- /dev/null +++ b/recipes-security/libgssglue/libgssglue_0.7.bb @@ -0,0 +1,51 @@ +SUMMARY = "Exports a gssapi interface which calls other gssapi libraries" +DESCRIPTION = "\ +This library exports a gssapi interface, but does not implement any gssapi \ +mechanisms itself; instead it calls gssapi routines in other libraries, \ +depending on the mechanism. \ +" + +HOMEPAGE = "http://www.citi.umich.edu/projects/nfsv4/linux/" +SECTION = "libs" + +LICENSE = "BSD-3-Clause | HPND" + +#Copyright (c) 1996, by Sun Microsystems, Inc. HPND +#Copyright (c) 2007 The Regents of the University of Michigan. BSD-3-Clause +#Copyright 1995 by the Massachusetts Institute of Technology. HPND without Disclaimer +#Copyright 1993 by OpenVision Technologies, Inc. HPND +LIC_FILES_CHKSUM = "file://COPYING;md5=56871e72a5c475289c0d5e4ba3f2ee3a \ + file://src/g_accept_sec_context.c;beginline=3;endline=23;md5=da8ca7a37bd26e576c23874d453751d2\ + file://src/g_ccache_name.c;beginline=1;endline=32;md5=208d4de05d5c8273963a8332f084faa7 \ + file://src/oid_ops.c;beginline=1;endline=26;md5=1f194d148b396972da26759a8ec399f0\ + file://src/oid_ops.c;beginline=378;endline=398;md5=d77a5c03e91908fac453c08bbeaddce1\ +" + +SRC_URI = "${DEBIAN_MIRROR}/main/libg/${BPN}/${BPN}_${PV}.orig.tar.gz \ + file://libgssglue-canon-name.patch \ +" + +SRC_URI[sha256sum] = "bcd618ae0bc69f12815d77295658a760e7edc20706b9a731a81da8993f5c970a" + +inherit autotools-brokensep + +do_configure:prepend() { + cd ${S} + ./bootstrap +} + +do_install:append() { + # install some docs + install -d -m 0755 ${D}${docdir}/${BPN} + install -m 0644 ${S}/AUTHORS ${S}/ChangeLog ${S}/NEWS ${S}/README ${D}${docdir}/${BPN} + + # install the gssapi_mech.conf + install -d -m 0755 ${D}${sysconfdir} + install -m 0644 ${S}/doc/gssapi_mech.conf ${D}${sysconfdir} + + # change the libgssapi_krb5.so path and name(it is .so.2) + sed -i -e "s:/usr/lib/libgssapi_krb5.so:libgssapi_krb5.so.2:" ${D}${sysconfdir}/gssapi_mech.conf +} + +# gssglue can use krb5, spkm3... as gssapi library, configurable +RRECOMMENDS:${PN} += "krb5" -- cgit v1.2.3-54-g00ecf