Thu Jan 8 19:23:53 2015 UTC ()
Fix build with GSSAPI on NetBSD. Enable gssapi again.


(wiz)
diff -r1.100 -r1.101 pkgsrc/www/curl/distinfo
diff -r1.11 -r1.12 pkgsrc/www/curl/options.mk
diff -r0 -r1.1 pkgsrc/www/curl/patches/patch-lib_curl__sasl__gssapi.c
cvs diff -r1.100 -r1.101 pkgsrc/www/curl/distinfo (expand / switch to unified diff)

--- pkgsrc/www/curl/distinfo 2015/01/08 17:23:07 1.100
+++ pkgsrc/www/curl/distinfo 2015/01/08 19:23:53 1.101
@@ -1,8 +1,9 @@ @@ -1,8 +1,9 @@
1$NetBSD: distinfo,v 1.100 2015/01/08 17:23:07 wiz Exp $ 1$NetBSD: distinfo,v 1.101 2015/01/08 19:23:53 wiz Exp $
2 2
3SHA1 (curl-7.40.0.tar.bz2) = 1446603f4df89b6d1cafc4d6a8617c892651b3ff 3SHA1 (curl-7.40.0.tar.bz2) = 1446603f4df89b6d1cafc4d6a8617c892651b3ff
4RMD160 (curl-7.40.0.tar.bz2) = 5ca0220dc5e866271e3757b21eee14477690e259 4RMD160 (curl-7.40.0.tar.bz2) = 5ca0220dc5e866271e3757b21eee14477690e259
5Size (curl-7.40.0.tar.bz2) = 3266944 bytes 5Size (curl-7.40.0.tar.bz2) = 3266944 bytes
6SHA1 (patch-aa) = 54c9f5b1a22743e2714883ae5a2b20366b839e7e 6SHA1 (patch-aa) = 54c9f5b1a22743e2714883ae5a2b20366b839e7e
7SHA1 (patch-curl-config.in) = fd87c97b601a6b9269f67fbc066604ee7e22570e 7SHA1 (patch-curl-config.in) = fd87c97b601a6b9269f67fbc066604ee7e22570e
 8SHA1 (patch-lib_curl__sasl__gssapi.c) = 63ef03938a2a15ccae86722df776d40fd9bd2c7a
8SHA1 (patch-lib_hostcheck.c) = 9faf94f44703c7d37377fd3af319ca5c27df34c2 9SHA1 (patch-lib_hostcheck.c) = 9faf94f44703c7d37377fd3af319ca5c27df34c2
cvs diff -r1.11 -r1.12 pkgsrc/www/curl/options.mk (expand / switch to unified diff)

--- pkgsrc/www/curl/options.mk 2015/01/08 17:23:07 1.11
+++ pkgsrc/www/curl/options.mk 2015/01/08 19:23:53 1.12
@@ -1,29 +1,23 @@ @@ -1,29 +1,23 @@
1# $NetBSD: options.mk,v 1.11 2015/01/08 17:23:07 wiz Exp $ 1# $NetBSD: options.mk,v 1.12 2015/01/08 19:23:53 wiz Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.curl 3PKG_OPTIONS_VAR= PKG_OPTIONS.curl
4PKG_SUPPORTED_OPTIONS= inet6 libssh2 gssapi ldap rtmp libidn 4PKG_SUPPORTED_OPTIONS= inet6 libssh2 gssapi ldap rtmp libidn
5PKG_SUGGESTED_OPTIONS= inet6 libidn 5PKG_SUGGESTED_OPTIONS= inet6 libidn
6 6
7.include "../../mk/bsd.prefs.mk" 7.include "../../mk/bsd.prefs.mk"
8.if ${OPSYS} == NetBSD 8.if ${OPSYS} == NetBSD
9# Kerberos is built in - no additional dependency 9# Kerberos is built in - no additional dependency
10# broken in 1.40.0 10PKG_SUGGESTED_OPTIONS+= gssapi
11# https://sourceforge.net/p/curl/bugs/1469/ 
12#curl_sasl_gssapi.c:129:40: error: 'gss_nt_service_name' undeclared (first use in this function) 
13# gss_nt_service_name, &krb5->spn); 
14# ^ 
15#curl_sasl_gssapi.c:129:40: note: each undeclared identifier is reported only once for each function it appears in 
16#PKG_SUGGESTED_OPTIONS+= gssapi 
17.endif 11.endif
18 12
19.include "../../mk/bsd.options.mk" 13.include "../../mk/bsd.options.mk"
20 14
21.if !empty(PKG_OPTIONS:Minet6) 15.if !empty(PKG_OPTIONS:Minet6)
22CONFIGURE_ARGS+= --enable-ipv6 16CONFIGURE_ARGS+= --enable-ipv6
23.else 17.else
24CONFIGURE_ARGS+= --disable-ipv6 18CONFIGURE_ARGS+= --disable-ipv6
25.endif 19.endif
26 20
27.if !empty(PKG_OPTIONS:Mlibssh2) 21.if !empty(PKG_OPTIONS:Mlibssh2)
28CONFIGURE_ARGS+= --with-libssh2=${BUILDLINK_PREFIX.libssh2} 22CONFIGURE_ARGS+= --with-libssh2=${BUILDLINK_PREFIX.libssh2}
29. include "../../security/libssh2/buildlink3.mk" 23. include "../../security/libssh2/buildlink3.mk"
File Added: pkgsrc/www/curl/patches/Attic/patch-lib_curl__sasl__gssapi.c
$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: ");