From fa73127a8bc0209524a25026dba323f68a74d0a0 Mon Sep 17 00:00:00 2001 From: "Ralf S. Engelschall" Date: Wed, 22 Sep 2021 20:08:10 +0200 Subject: [PATCH] upgrading package: curl 7.78.0 -> 7.79.1 --- curl/curl.patch | 50 ++++++++++++++++++++++++------------------------- curl/curl.spec | 4 ++-- 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/curl/curl.patch b/curl/curl.patch index ca26ff5056..8beebcf9b2 100644 --- a/curl/curl.patch +++ b/curl/curl.patch @@ -1,49 +1,49 @@ Index: configure ---- configure.orig 2017-08-13 18:22:16.000000000 +0200 -+++ configure 2017-09-01 23:12:52.113607000 +0200 -@@ -5400,10 +5400,7 @@ - if $ac_preproc_ok; then : +--- configure.orig 2021-09-13 16:46:32.000000000 +0200 ++++ configure 2021-09-22 20:06:32.477430000 +0200 +@@ -5568,10 +5568,7 @@ + then : - else -- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 --$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} + else $as_nop +- { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +-printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "C preprocessor \"$CPP\" fails sanity check -See \`config.log' for more details" "$LINENO" 5; } + : fi ac_ext=c -@@ -21853,7 +21850,7 @@ - $as_echo_n "(cached) " >&6 - else +@@ -23911,7 +23908,7 @@ + printf %s "(cached) " >&6 + else $as_nop ac_check_lib_save_LIBS=$LIBS -LIBS="-l"$LDAPLIBNAME" $LIBS" +LIBS="-l$LDAPLIBNAME $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -@@ -21886,7 +21883,7 @@ - #define `$as_echo "HAVE_LIB"$LDAPLIBNAME"" | $as_tr_cpp` 1 +@@ -23946,7 +23943,7 @@ + #define `printf "%s\n" "HAVE_LIB"$LDAPLIBNAME"" | $as_tr_cpp` 1 _ACEOF - LIBS="-l"$LDAPLIBNAME" $LIBS" + LIBS="-l$LDAPLIBNAME $LIBS" - else + else $as_nop -@@ -40661,7 +40658,7 @@ - - case "$OPT_THRES" in +@@ -45099,7 +45096,7 @@ + want_thres="no" + ;; *) - want_thres="yes" + want_thres="$OPT_THRES" ;; - no) - want_thres="no" + esac + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $want_thres" >&5 Index: curl-config.in ---- curl-config.in.orig 2017-08-08 00:42:29.000000000 +0200 -+++ curl-config.in 2017-09-01 23:10:11.461019000 +0200 -@@ -137,7 +137,7 @@ +--- curl-config.in.orig 2021-08-23 00:23:06.000000000 +0200 ++++ curl-config.in 2021-09-22 20:04:36.091973000 +0200 +@@ -150,7 +150,7 @@ if test "X@includedir@" = "X/usr/include"; then echo "$CPPFLAG_CURL_STATICLIB" else @@ -53,10 +53,10 @@ Index: curl-config.in ;; Index: lib/vtls/openssl.c ---- lib/vtls/openssl.c.orig 2017-08-13 18:10:42.000000000 +0200 -+++ lib/vtls/openssl.c 2017-09-01 23:10:11.461438000 +0200 -@@ -87,6 +87,9 @@ - #if defined(HAVE_OPENSSL_ENGINE_H) +--- lib/vtls/openssl.c.orig 2021-09-11 23:46:15.000000000 +0200 ++++ lib/vtls/openssl.c 2021-09-22 20:04:36.092462000 +0200 +@@ -111,6 +111,9 @@ + #ifdef USE_OPENSSL_ENGINE #include #endif +#if defined(HAVE_ENGINE_LOAD_BUILTIN_ENGINES) diff --git a/curl/curl.spec b/curl/curl.spec index da2b1978c0..97a5451795 100644 --- a/curl/curl.spec +++ b/curl/curl.spec @@ -31,8 +31,8 @@ Distribution: OpenPKG Community Class: BASE Group: Web License: MIT-style -Version: 7.78.0 -Release: 20210722 +Version: 7.79.1 +Release: 20210922 # package options %option with_ssl yes