mirror of
https://github.com/flatcar/scripts.git
synced 2025-12-08 02:41:55 +01:00
dev-libs/cyrus-sasl: Clean slate to reapply our changes
This commit is contained in:
parent
13bb7c3bf3
commit
0366286350
@ -57,8 +57,6 @@ PATCHES=(
|
|||||||
"${FILESDIR}/${PN}-2.1.27-doc_build_fix.patch"
|
"${FILESDIR}/${PN}-2.1.27-doc_build_fix.patch"
|
||||||
"${FILESDIR}/${PN}-2.1.27-memmem.patch"
|
"${FILESDIR}/${PN}-2.1.27-memmem.patch"
|
||||||
"${FILESDIR}/${PN}-2.1.27-CVE-2019-19906.patch"
|
"${FILESDIR}/${PN}-2.1.27-CVE-2019-19906.patch"
|
||||||
# Flatcar:
|
|
||||||
"${FILESDIR}/${PN}-2.1.27-fix-cross-compiling.patch"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
pkg_setup() {
|
pkg_setup() {
|
||||||
|
|||||||
@ -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 <gssapi.h>
|
|
||||||
-#else
|
|
||||||
-#include <gssapi/gssapi.h>
|
|
||||||
-#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])
|
|
||||||
Loading…
x
Reference in New Issue
Block a user