ports/183327: [patch] ftp/curl fails to compile with gssapi

[Oleg Sidorkin]

>Number:         183327
>Category:       ports
>Synopsis:       [patch] ftp/curl fails to compile with gssapi
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Sat Oct 26 09:50:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator:     Oleg Sidorkin
>Release:        stable/9
>Organization:
>Environment:
uname -a
FreeBSD oleg84.trtk.ru 9.2-STABLE FreeBSD 9.2-STABLE #0 r257152M: Sat Oct 26 11:29:53 MSK 2013     olsi at oleg84.trtk.ru:/usr/obj/usr/src/sys/QUADKERNEL  amd64

>Description:
when updating curl from 7.32 to 7.33 I've got the following error

In file included from base64.c:31:
urldata.h:449: error: expected specifier-qualifier-list before 'OM_uint32'
*** [libcurl_la-base64.lo] Error code 1
In file included from file.c:53:
urldata.h:449: error: expected specifier-qualifier-list before 'OM_uint32'
*** [libcurl_la-file.lo] Error code 1
In file included from hostip.c:51:
urldata.h:449: error: expected specifier-qualifier-list before 'OM_uint32'
*** [libcurl_la-hostip.lo] Error code 1
In file included from progress.c:26:
urldata.h:449: error: expected specifier-qualifier-list before 'OM_uint32'
*** [libcurl_la-progress.lo] Error code 1

GSSAPI related configure: 
checking if GSSAPI support is requested... yes
checking gss.h usability... no
checking gss.h presence... no
checking for gss.h... no
checking gssapi/gssapi.h usability... yes
checking gssapi/gssapi.h presence... yes
checking for gssapi/gssapi.h... yes
checking for gssapi/gssapi_generic.h... no
checking for gssapi/gssapi_krb5.h... yes
checking gssapi.h usability... yes
checking gssapi.h presence... yes
checking for gssapi.h... yes

configure results:
configure: Configured to build curl/libcurl:

  curl version:     7.33.0
  Host setup:       amd64-portbld-freebsd9.2
  Install prefix:   /usr/local
  Compiler:         cc
  SSL support:      enabled (OpenSSL)
  SSH support:      enabled (libSSH2)
  zlib support:     enabled
  GSSAPI support:   enabled (MIT/Heimdal)
  SPNEGO support:   enabled
  TLS-SRP support:  no      (--enable-tls-srp)
  resolver:         c-ares
  ipv6 support:     enabled
  IDN support:      no      (--with-{libidn,winidn})
  Build libcurl:    Shared=yes, Static=yes
  Built-in manual:  enabled
  --libcurl option: enabled (--disable-libcurl-option)
  Verbose errors:   enabled (--disable-verbose)
  SSPI support:     no      (--enable-sspi)
  ca cert bundle:   /usr/local/share/certs/ca-root-nss.crt
  ca cert path:     no
  LDAP support:     no      (--enable-ldap / --with-ldap-lib / --with-lber-lib)
  LDAPS support:    no      (--enable-ldaps)
  RTSP support:     enabled
  RTMP support:     enabled (librtmp)
  metalink support: no      (--with-libmetalink)
  HTTP2 support:    disabled (--with-nghttp2)
  Protocols:        DICT FILE FTP FTPS GOPHER HTTP HTTPS IMAP IMAPS POP3 POP3S RTMP RTSP SCP SFTP SMTP SMTPS TELNET TFTP


>How-To-Repeat:
cd /usr/ports/ftp/curl && make clean build
>Fix:
see the attached patch

Patch attached with submission follows:

--- lib/urldata.h.orig	2013-10-13 00:24:42.000000000 +0400
+++ lib/urldata.h	2013-10-26 13:23:55.000000000 +0400
@@ -199,6 +199,7 @@
 # else
 #  include <gssapi.h>
 # endif
+#  include <gssapi/gssapi.h>
 #endif
 
 #ifdef HAVE_LIBSSH2_H


>Release-Note:
>Audit-Trail:
>Unformatted: