commit d472c855c90a9077b0489d7fd076dab04076b7ba
Author: Jan Palus <[email protected]>
Date: Fri Nov 12 01:17:37 2021 +0100
up to 7.80.0
curl-krb5flags.patch | 21 +++++++++------------
curl.spec | 6 +++---
2 files changed, 12 insertions(+), 15 deletions(-)
---
diff --git a/curl.spec b/curl.spec
index 49522a3..eadf5a3 100644
--- a/curl.spec
+++ b/curl.spec
@@ -23,12 +23,12 @@ Summary(pt_BR.UTF-8): Busca URL (suporta FTP, TELNET,
LDAP, GOPHER, DICT, HTTP e
Summary(ru.UTF-8): Утилита для получения файлов с серверов FTP, HTTP и
других
Summary(uk.UTF-8): Утиліта для отримання файлів з серверів FTP, HTTP та
інших
Name: curl
-Version: 7.79.1
-Release: 3
+Version: 7.80.0
+Release: 1
License: MIT-like
Group: Applications/Networking
Source0: https://curl.haxx.se/download/%{name}-%{version}.tar.xz
-# Source0-md5: 74d3c4ca8aaa6c0619806d6e246e65fb
+# Source0-md5: cf9f8553762150ef0ebcd5ee412737f5
Patch0: %{name}-ac.patch
Patch1: %{name}-krb5flags.patch
URL: http://curl.haxx.se/
diff --git a/curl-krb5flags.patch b/curl-krb5flags.patch
index 484954e..f399d15 100644
--- a/curl-krb5flags.patch
+++ b/curl-krb5flags.patch
@@ -1,23 +1,20 @@
--- 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 @@
-
+@@ -1193,7 +1193,7 @@
+ CURL_CHECK_PKGCONFIG(mit-krb5-gssapi)
if test -z "$GSSAPI_INCS"; then
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 "$PKGCONFIG" != "no" ; then
+ GSSAPI_INCS=`$PKGCONFIG --cflags mit-krb5-gssapi`
elif test "$GSSAPI_ROOT" != "yes"; then
- GSSAPI_INCS="-I$GSSAPI_ROOT/include"
- fi
@@ -1288,7 +1288,7 @@
- elif test -f "$KRB5CONFIG"; then
+ if test -n "$host_alias" -a -f
"$GSSAPI_ROOT/bin/$host_alias-krb5-config"; then
dnl krb5-config doesn't have --libs-only-L or similar, put
everything
dnl into LIBS
-- gss_libs=`$KRB5CONFIG --libs gssapi`
-+ gss_libs=`CFLAGS= $KRB5CONFIG --libs gssapi`
+- gss_libs=`$GSSAPI_ROOT/bin/$host_alias-krb5-config --libs gssapi`
++ gss_libs=`CFLAGS= $GSSAPI_ROOT/bin/$host_alias-krb5-config --libs
gssapi`
LIBS="$gss_libs $LIBS"
- else
- case $host in
+ elif test "$PKGCONFIG" != "no" ; then
+ gss_libs=`$PKGCONFIG --libs mit-krb5-gssapi`
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/curl.git/commitdiff/d472c855c90a9077b0489d7fd076dab04076b7ba
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
