From 810be4a5b9d596225a0b1a5ce15c853fd63511ca Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Tue, 22 Mar 2022 21:43:56 +0000 Subject: [PATCH] samba: qualify required gssapi.h Inconsistent builds with samba 4.16 with the wrong gssapi.h being picked up. This is a workaround, and being raised upstream. [1800/2511] Compiling source3/lib/smbd_shim.c In file included from ../../third_party/heimdal/lib/gssapi/gssapi/gssapi_krb5.h:40, from ../../lib/replace/system/gssapi.h:43, from ../../lib/krb5_wrap/gss_samba.h:27, from ../../auth/kerberos/pac_utils.h:27, from ../../auth/kerberos/gssapi_pac.c:28: ../../third_party/heimdal/lib/gssapi/gssapi/gssapi_oid.h:9:8: error: unknown type name 'GSSAPI_LIB_VARIABLE' 9 | extern GSSAPI_LIB_VARIABLE gss_OID_desc __gss_krb5_copy_ccache_x_oid_desc; | ^~~~~~~~~~~~~~~~~~~ --- .../samba/patches/samba-210-4.16-gssapi-h.patch | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 packages/network/samba/patches/samba-210-4.16-gssapi-h.patch diff --git a/packages/network/samba/patches/samba-210-4.16-gssapi-h.patch b/packages/network/samba/patches/samba-210-4.16-gssapi-h.patch new file mode 100644 index 0000000000..d7796a2647 --- /dev/null +++ b/packages/network/samba/patches/samba-210-4.16-gssapi-h.patch @@ -0,0 +1,11 @@ +--- a/third_party/heimdal/lib/gssapi/gssapi/gssapi_krb5.h 2022-03-08 14:53:05.742089500 +0000 ++++ b/third_party/heimdal/lib/gssapi/gssapi/gssapi_krb5.h 2022-03-08 14:53:05.742089500 +0000 +@@ -36,7 +36,7 @@ + #ifndef GSSAPI_KRB5_H_ + #define GSSAPI_KRB5_H_ + +-#include ++#include + #include + + GSSAPI_CPP_START