commit a6f102f3091e00bebac43b1cba944eca29889c39
Author: Jan Palus <[email protected]>
Date: Wed Sep 11 13:43:42 2024 +0200
up to 8.10.0 (fixes CVE-2024-8096)
curl-krb5flags.patch | 26 +++++++++++++-------------
curl.spec | 6 +++---
2 files changed, 16 insertions(+), 16 deletions(-)
---
diff --git a/curl.spec b/curl.spec
index 9f6290d..8951bce 100644
--- a/curl.spec
+++ b/curl.spec
@@ -25,12 +25,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: 8.9.1
+Version: 8.10.0
Release: 1
License: MIT-like
Group: Applications/Networking
Source0: https://curl.se/download/%{name}-%{version}.tar.xz
-# Source0-md5: 5882f056460240d98cdb5b7f86a06153
+# Source0-md5: 00e41b4c316108ac4ca66c2a6d0bf18a
Patch0: %{name}-ac.patch
Patch1: %{name}-krb5flags.patch
URL: https://curl.se/
@@ -309,7 +309,7 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(644,root,root,755)
-%doc CHANGES COPYING README
docs/{BUGS.md,FAQ,FEATURES.md,HISTORY.md,KNOWN_BUGS,SSLCERTS.md,THANKS,TODO,TheArtOfHttpScripting.md}
+%doc CHANGES.md COPYING README
docs/{BUGS.md,FAQ,FEATURES.md,HISTORY.md,KNOWN_BUGS,SSLCERTS.md,THANKS,TODO,TheArtOfHttpScripting.md}
%attr(755,root,root) %{_bindir}/curl
%{_mandir}/man1/curl.1*
diff --git a/curl-krb5flags.patch b/curl-krb5flags.patch
index e6faeae..8dd61d7 100644
--- a/curl-krb5flags.patch
+++ b/curl-krb5flags.patch
@@ -3,18 +3,18 @@
@@ -1193,7 +1193,7 @@
fi
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 "$PKGCONFIG" != "no" ; then
- GSSAPI_INCS=`$PKGCONFIG --cflags mit-krb5-gssapi`
- elif test -f "$KRB5CONFIG"; 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 "$PKGCONFIG" != "no"; then
+ GSSAPI_INCS=`$PKGCONFIG --cflags mit-krb5-gssapi`
+ elif test -f "$KRB5CONFIG"; then
@@ -1288,7 +1288,7 @@
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=`$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"
- elif test "$PKGCONFIG" != "no" ; then
- gss_libs=`$PKGCONFIG --libs mit-krb5-gssapi`
+ dnl krb5-config doesn't have --libs-only-L or similar, put
everything
+ dnl into LIBS
+- 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"
+ elif test "$PKGCONFIG" != "no"; then
+ gss_libs=`$PKGCONFIG --libs mit-krb5-gssapi`
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/curl.git/commitdiff/a6f102f3091e00bebac43b1cba944eca29889c39
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
