From 036628635052d09ff983af0f24526e8da800beb6 Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Fri, 3 Dec 2021 19:06:24 +0100 Subject: [PATCH] dev-libs/cyrus-sasl: Clean slate to reapply our changes --- .../cyrus-sasl/cyrus-sasl-2.1.27-r3.ebuild | 2 - ...yrus-sasl-2.1.27-fix-cross-compiling.patch | 40 ------------------- 2 files changed, 42 deletions(-) delete mode 100644 sdk_container/src/third_party/coreos-overlay/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.27-fix-cross-compiling.patch diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/cyrus-sasl/cyrus-sasl-2.1.27-r3.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-libs/cyrus-sasl/cyrus-sasl-2.1.27-r3.ebuild index bcbff9d8ba..d7fb6c3409 100644 --- a/sdk_container/src/third_party/coreos-overlay/dev-libs/cyrus-sasl/cyrus-sasl-2.1.27-r3.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/dev-libs/cyrus-sasl/cyrus-sasl-2.1.27-r3.ebuild @@ -57,8 +57,6 @@ PATCHES=( "${FILESDIR}/${PN}-2.1.27-doc_build_fix.patch" "${FILESDIR}/${PN}-2.1.27-memmem.patch" "${FILESDIR}/${PN}-2.1.27-CVE-2019-19906.patch" - # Flatcar: - "${FILESDIR}/${PN}-2.1.27-fix-cross-compiling.patch" ) pkg_setup() { diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.27-fix-cross-compiling.patch b/sdk_container/src/third_party/coreos-overlay/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.27-fix-cross-compiling.patch deleted file mode 100644 index 86fbcad2e4..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.27-fix-cross-compiling.patch +++ /dev/null @@ -1,40 +0,0 @@ ---- cyrus-sasl-2.1.27/m4/sasl2.m4 -+++ cyrus-sasl-2.1.27/m4/sasl2.m4 -@@ -311,36 +311,7 @@ if test "$gssapi" != no; then - [AC_DEFINE(HAVE_GSS_C_SEC_CONTEXT_SASL_SSF,, - [Define if your GSSAPI implementation defines GSS_C_SEC_CONTEXT_SASL_SSF])]) - fi -- cmu_save_LIBS="$LIBS" -- LIBS="$LIBS $GSSAPIBASE_LIBS" -- -- AC_MSG_CHECKING([for SPNEGO support in GSSAPI libraries]) -- AC_TRY_RUN([ --#ifdef HAVE_GSSAPI_H --#include --#else --#include --#endif -- --int main(void) --{ -- gss_OID_desc spnego_oid = { 6, (void *) "\x2b\x06\x01\x05\x05\x02" }; -- gss_OID_set mech_set; -- OM_uint32 min_stat; -- int have_spnego = 0; -- -- if (gss_indicate_mechs(&min_stat, &mech_set) == GSS_S_COMPLETE) { -- gss_test_oid_set_member(&min_stat, &spnego_oid, mech_set, &have_spnego); -- gss_release_oid_set(&min_stat, &mech_set); -- } -- -- return (!have_spnego); // 0 = success, 1 = failure --} --], -- [ AC_DEFINE(HAVE_GSS_SPNEGO,,[Define if your GSSAPI implementation supports SPNEGO]) -- AC_MSG_RESULT(yes) ], -- AC_MSG_RESULT(no)) -- LIBS="$cmu_save_LIBS" -+ AC_DEFINE(HAVE_GSS_SPNEGO,,[1]) - - else - AC_MSG_RESULT([disabled])