From 277ca5900854354d7b26c5dce32b8c6f221fff81 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Fri, 16 Nov 2018 17:11:57 -0800 Subject: [PATCH] nail: Remove GSSAPI dependency Buildbots are currently failing because of this. Signed-off-by: Rosen Penev --- mail/nail/Makefile | 2 +- mail/nail/patches/010-remove-gssapi.patch | 52 +++++++++++++++++++++++ 2 files changed, 53 insertions(+), 1 deletion(-) create mode 100644 mail/nail/patches/010-remove-gssapi.patch diff --git a/mail/nail/Makefile b/mail/nail/Makefile index 20c1275136..2990084d2b 100644 --- a/mail/nail/Makefile +++ b/mail/nail/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=nail PKG_VERSION:=12.5 -PKG_RELEASE:=3 +PKG_RELEASE:=4 PKG_LICENSE:=BSD-2-Clause PKG_SOURCE:=heirloom-mailx_$(PKG_VERSION).orig.tar.gz diff --git a/mail/nail/patches/010-remove-gssapi.patch b/mail/nail/patches/010-remove-gssapi.patch new file mode 100644 index 0000000000..e88d356288 --- /dev/null +++ b/mail/nail/patches/010-remove-gssapi.patch @@ -0,0 +1,52 @@ +diff --git a/makeconfig b/makeconfig +index 0ab36b8..ee1e3a1 100644 +--- a/makeconfig ++++ b/makeconfig +@@ -413,47 +413,6 @@ int main(void) + ! + fi + +-cat >$tmp2.c <<\! +-#include +- +-int main(void) +-{ +- gss_import_name(0, 0, GSS_C_NT_HOSTBASED_SERVICE, 0); +- gss_init_sec_context(0,0,0,0,0,0,0,0,0,0,0,0,0); +- return 0; +-} +-! +- +-<$tmp2.c link_check gssapi 'for GSSAPI in libgss' \ +- '#define USE_GSSAPI' '-lgss' || +- <$tmp2.c link_check gssapi 'for GSSAPI in libgssapi_krb5' \ +- '#define USE_GSSAPI' '-lgssapi_krb5' || +- link_check gssapi 'for GSSAPI in libgssapi_krb5, old-style' \ +- '#define USE_GSSAPI +-#define GSSAPI_OLD_STYLE' '-lgssapi_krb5' <<\! || \ +- link_check gssapi 'for GSSAPI in libgssapi' \ +- '#define USE_GSSAPI +-#define GSSAPI_REG_INCLUDE' '-lgssapi' <<\% +-#include +-#include +- +-int main(void) +-{ +- gss_import_name(0, 0, gss_nt_service_name, 0); +- gss_init_sec_context(0,0,0,0,0,0,0,0,0,0,0,0,0); +- return 0; +-} +-! +-#include +- +-int main(void) +-{ +- gss_import_name(0, 0, GSS_C_NT_HOSTBASED_SERVICE, 0); +- gss_init_sec_context(0,0,0,0,0,0,0,0,0,0,0,0,0); +- return 0; +-} +-% +- + cat >$tmp2.c <<\! + #include "config.h" + #ifdef HAVE_NL_LANGINFO -- 2.30.2