- release 2 (by relup.sh)

[packages/curl.git] / curl-krb5flags.patch

diff --git a/curl-krb5flags.patch b/curl-krb5flags.patch
index 0d3afd625060333a1652108d844c47b4c49ec555..484954e75b02e04700f1d3747f1e5b27b554e0f4 100644 (file)
--- a/curl-krb5flags.patch
+++ b/curl-krb5flags.patch
@@ -1,20 +1,23 @@
---- curl-7.29.0/configure.ac.orig      2013-02-15 15:38:22.912332897 +0100
-+++ curl-7.29.0/configure.ac   2013-02-15 15:47:10.498977423 +0100
-@@ -1336,7 +1336,7 @@
+--- curl-7.43.0/configure.ac.orig      2015-06-24 21:11:53.330168712 +0200
++++ curl-7.43.0/configure.ac   2015-06-24 21:19:26.686816353 +0200
+@@ -1193,9 +1193,9 @@
  
    if test -z "$GSSAPI_INCS"; then
-      if test -f "$GSSAPI_ROOT/bin/krb5-config"; then
--        GSSAPI_INCS=`$GSSAPI_ROOT/bin/krb5-config --cflags gssapi`
-+        GSSAPI_INCS=`CFLAGS= $GSSAPI_ROOT/bin/krb5-config --cflags gssapi`
+      if test -n "$host_alias" -a -f "$GSSAPI_ROOT/bin/$host_alias-krb5-config"; then
+-        GSSAPI_INCS=`$GSSAPI_ROOT/bin/$host_alias-krb5-config --cflags gssapi`
++        GSSAPI_INCS=`CFLAGS= $GSSAPI_ROOT/bin/$host_alias-krb5-config --cflags gssapi`
+      elif test -f "$KRB5CONFIG"; then
+-        GSSAPI_INCS=`$KRB5CONFIG --cflags gssapi`
++        GSSAPI_INCS=`CFLAGS= $KRB5CONFIG --cflags gssapi`
       elif test "$GSSAPI_ROOT" != "yes"; then
          GSSAPI_INCS="-I$GSSAPI_ROOT/include"
       fi
-@@ -1424,7 +1424,7 @@
-         if test -f "$GSSAPI_ROOT/bin/krb5-config"; then
+@@ -1288,7 +1288,7 @@
+         elif test -f "$KRB5CONFIG"; then
             dnl krb5-config doesn't have --libs-only-L or similar, put everything
             dnl into LIBS
--           gss_libs=`$GSSAPI_ROOT/bin/krb5-config --libs gssapi`
-+           gss_libs=`CFLAGS= $GSSAPI_ROOT/bin/krb5-config --libs gssapi`
+-           gss_libs=`$KRB5CONFIG --libs gssapi`
++           gss_libs=`CFLAGS= $KRB5CONFIG --libs gssapi`
             LIBS="$gss_libs $LIBS"
-         elif test "$GSSAPI_ROOT" != "yes"; then
-            LDFLAGS="$LDFLAGS -L$GSSAPI_ROOT/lib$libsuff"
+         else
+            case $host in