diff options
| author | richard <richard@pkgsrc.org> | 2013-10-12 04:31:48 +0000 |
|---|---|---|
| committer | richard <richard@pkgsrc.org> | 2013-10-12 04:31:48 +0000 |
| commit | c1a11b10f4ab80d22d80c3b47261246c5a7a70ee (patch) | |
| tree | c4b3326c2d5a47014caa948bb77f68845e943458 /www/curl | |
| parent | 9f3967888a0ffa4f866741aec67981d97ad044f7 (diff) | |
| download | pkgsrc-c1a11b10f4ab80d22d80c3b47261246c5a7a70ee.tar.gz | |
update builtin solaris gssapi/mit-krb5 support for curl
Diffstat (limited to 'www/curl')
| -rw-r--r-- | www/curl/distinfo | 4 | ||||
| -rw-r--r-- | www/curl/patches/patch-aa | 37 |
2 files changed, 34 insertions, 7 deletions
diff --git a/www/curl/distinfo b/www/curl/distinfo index 8cf89ee1102..a9098183518 100644 --- a/www/curl/distinfo +++ b/www/curl/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.88 2013/08/13 17:07:32 adam Exp $ +$NetBSD: distinfo,v 1.89 2013/10/12 04:31:48 richard Exp $ SHA1 (curl-7.32.0.tar.bz2) = f6989fca0dac0c35628523436fc17869972d4251 RMD160 (curl-7.32.0.tar.bz2) = 897c8eb19375774ac101f64251cc60712f37cbb2 Size (curl-7.32.0.tar.bz2) = 2727587 bytes -SHA1 (patch-aa) = 349ce5314d05a35d3af36f424234937f5ef8fcfb +SHA1 (patch-aa) = 162b312c8f319d792e735344a8a0a5b04b61da50 SHA1 (patch-curl-config.in) = 0dd49de806865c19fbf766ad208f8f2495824442 diff --git a/www/curl/patches/patch-aa b/www/curl/patches/patch-aa index e1000f1c15c..424c07bdeec 100644 --- a/www/curl/patches/patch-aa +++ b/www/curl/patches/patch-aa @@ -1,6 +1,9 @@ -$NetBSD: patch-aa,v 1.22 2013/06/29 19:24:57 spz Exp $ +$NetBSD: patch-aa,v 1.23 2013/10/12 04:31:48 richard Exp $ ---- configure.orig 2013-06-21 22:29:35.000000000 +0000 +builtin krb5-config in platforms such as solaris do not support +the gssapi option, and need an explicit -lgss + +--- configure.orig 2013-08-05 11:28:53.000000000 +0000 +++ configure @@ -3646,6 +3646,7 @@ $as_echo "$as_me: $xc_bad_var_msg librar ;; @@ -10,7 +13,7 @@ $NetBSD: patch-aa,v 1.22 2013/06/29 19:24:57 spz Exp $ if test $xc_bad_var_cflags = yes; then { $as_echo "$as_me:${as_lineno-$LINENO}: using CFLAGS: $CFLAGS" >&5 $as_echo "$as_me: using CFLAGS: $CFLAGS" >&6;} -@@ -16634,7 +16635,7 @@ squeeze() { +@@ -16644,7 +16645,7 @@ squeeze() { # @@ -19,7 +22,31 @@ $NetBSD: patch-aa,v 1.22 2013/06/29 19:24:57 spz Exp $ # if test "$compiler_id" = "GNU_C" || test "$compiler_id" = "CLANG"; then -@@ -21496,15 +21497,15 @@ $as_echo "#define HAVE_GSSAPI 1" >>confd +@@ -21360,7 +21361,12 @@ $as_echo "yes" >&6; } + + if test -z "$GSSAPI_INCS"; then + if test -f "$GSSAPI_ROOT/bin/krb5-config"; then +- GSSAPI_INCS=`$GSSAPI_ROOT/bin/krb5-config --cflags gssapi` ++ if $GSSAPI_ROOT/bin/krb5-config --cflags gssapi 2>&1 | \ ++ grep "Unknown option" > /dev/null ; then ++ GSSAPI_INCS=`$GSSAPI_ROOT/bin/krb5-config --cflags` ++ else ++ GSSAPI_INCS=`$GSSAPI_ROOT/bin/krb5-config --cflags gssapi` ++ fi + elif test "$GSSAPI_ROOT" != "yes"; then + GSSAPI_INCS="-I$GSSAPI_ROOT/include" + fi +@@ -21502,19 +21508,24 @@ $as_echo "#define HAVE_GSSAPI 1" >>confd + ;; + *) + if test -f "$GSSAPI_ROOT/bin/krb5-config"; then +- gss_libs=`$GSSAPI_ROOT/bin/krb5-config --libs gssapi` ++ if $GSSAPI_ROOT/bin/krb5-config --libs gssapi 2>&1 | \ ++ grep "Unknown option" > /dev/null ; then ++ gss_libs="`$GSSAPI_ROOT/bin/krb5-config --libs` -lgss" ++ else ++ gss_libs=`$GSSAPI_ROOT/bin/krb5-config --libs gssapi` ++ fi LIBS="$gss_libs $LIBS" elif test "$GSSAPI_ROOT" != "yes"; then LDFLAGS="$LDFLAGS -L$GSSAPI_ROOT/lib$libsuff" @@ -38,7 +65,7 @@ $NetBSD: patch-aa,v 1.22 2013/06/29 19:24:57 spz Exp $ fi else CPPFLAGS="$save_CPPFLAGS" -@@ -25070,19 +25071,19 @@ $as_echo "$as_me: WARNING: You need an l +@@ -25080,19 +25091,19 @@ $as_echo "$as_me: WARNING: You need an l $as_echo "yes" >&6; } if test "x$OPENSSL_ENABLED" = "x1"; then versioned_symbols_flavour="OPENSSL_" |