diff options
| author | wiz <wiz@pkgsrc.org> | 2015-01-08 19:23:53 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2015-01-08 19:23:53 +0000 |
| commit | 9c0b322a45c1a100ebb03e2af28f01cc5fe1b450 (patch) | |
| tree | c9ed9980aa0b1d003d7d08bf0ca40a1108cbffd4 /www/curl | |
| parent | 72315ab722cfd99f20bfea058624cb573e1890f3 (diff) | |
| download | pkgsrc-9c0b322a45c1a100ebb03e2af28f01cc5fe1b450.tar.gz | |
Fix build with GSSAPI on NetBSD. Enable gssapi again.
Diffstat (limited to 'www/curl')
| -rw-r--r-- | www/curl/distinfo | 3 | ||||
| -rw-r--r-- | www/curl/options.mk | 10 | ||||
| -rw-r--r-- | www/curl/patches/patch-lib_curl__sasl__gssapi.c | 15 |
3 files changed, 19 insertions, 9 deletions
diff --git a/www/curl/distinfo b/www/curl/distinfo index 6da7c205655..5fa29b94a40 100644 --- a/www/curl/distinfo +++ b/www/curl/distinfo @@ -1,8 +1,9 @@ -$NetBSD: distinfo,v 1.100 2015/01/08 17:23:07 wiz Exp $ +$NetBSD: distinfo,v 1.101 2015/01/08 19:23:53 wiz Exp $ SHA1 (curl-7.40.0.tar.bz2) = 1446603f4df89b6d1cafc4d6a8617c892651b3ff RMD160 (curl-7.40.0.tar.bz2) = 5ca0220dc5e866271e3757b21eee14477690e259 Size (curl-7.40.0.tar.bz2) = 3266944 bytes SHA1 (patch-aa) = 54c9f5b1a22743e2714883ae5a2b20366b839e7e SHA1 (patch-curl-config.in) = fd87c97b601a6b9269f67fbc066604ee7e22570e +SHA1 (patch-lib_curl__sasl__gssapi.c) = 63ef03938a2a15ccae86722df776d40fd9bd2c7a SHA1 (patch-lib_hostcheck.c) = 9faf94f44703c7d37377fd3af319ca5c27df34c2 diff --git a/www/curl/options.mk b/www/curl/options.mk index 921ef5fca24..0197ff773cd 100644 --- a/www/curl/options.mk +++ b/www/curl/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.11 2015/01/08 17:23:07 wiz Exp $ +# $NetBSD: options.mk,v 1.12 2015/01/08 19:23:53 wiz Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.curl PKG_SUPPORTED_OPTIONS= inet6 libssh2 gssapi ldap rtmp libidn @@ -7,13 +7,7 @@ PKG_SUGGESTED_OPTIONS= inet6 libidn .include "../../mk/bsd.prefs.mk" .if ${OPSYS} == NetBSD # Kerberos is built in - no additional dependency -# broken in 1.40.0 -# https://sourceforge.net/p/curl/bugs/1469/ -#curl_sasl_gssapi.c:129:40: error: 'gss_nt_service_name' undeclared (first use in this function) -# gss_nt_service_name, &krb5->spn); -# ^ -#curl_sasl_gssapi.c:129:40: note: each undeclared identifier is reported only once for each function it appears in -#PKG_SUGGESTED_OPTIONS+= gssapi +PKG_SUGGESTED_OPTIONS+= gssapi .endif .include "../../mk/bsd.options.mk" diff --git a/www/curl/patches/patch-lib_curl__sasl__gssapi.c b/www/curl/patches/patch-lib_curl__sasl__gssapi.c new file mode 100644 index 00000000000..142507fbf5e --- /dev/null +++ b/www/curl/patches/patch-lib_curl__sasl__gssapi.c @@ -0,0 +1,15 @@ +$NetBSD: patch-lib_curl__sasl__gssapi.c,v 1.1 2015/01/08 19:23:53 wiz Exp $ + +Fix build on NetBSD with gssapi. + +--- lib/curl_sasl_gssapi.c.orig 2015-01-07 21:53:57.000000000 +0000 ++++ lib/curl_sasl_gssapi.c +@@ -126,7 +126,7 @@ CURLcode Curl_sasl_create_gssapi_user_me + + /* Import the SPN */ + gss_major_status = gss_import_name(&gss_minor_status, &spn_token, +- gss_nt_service_name, &krb5->spn); ++ GSS_C_NT_HOSTBASED_SERVICE, &krb5->spn); + if(GSS_ERROR(gss_major_status)) { + Curl_gss_log_error(data, gss_minor_status, "gss_import_name() failed: "); + |