Skip to content
Snippets Groups Projects
Verified Commit 67e4a439 authored by Michal Hrusecky's avatar Michal Hrusecky :mouse:
Browse files

patches/packages/curl: Drop no longer needed patch

We don't need backported curl update patch as this OpenWrt version
contains up to date version of curl.
parent c75e97cb
No related branches found
No related tags found
No related merge requests found
Pipeline #118132 failed
From 4211e368dbcebca0eaa408461d9434b035342944 Mon Sep 17 00:00:00 2001
From: Tomas Zak <tomas.zak@turris.com>
Date: Thu, 14 Sep 2023 16:04:10 +0200
Subject: [PATCH] Packages/Curl: Updating curl to the latest fix security:
In older version of curl 8.2.1 were several security issues. Upgrade to the
latest version 8.4.0 for fix this security issues. In makefile changed fix
numbering of releases to autorelease. Remove old wolfssl patches, follow
openwrt upstream.
---
net/curl/Makefile | 6 +++---
net/curl/patches/100-wolfssl.patch | 10 ----
...4-error-out-if-wolfSSL-is-not-usable.patch | 57 -------------------
3 file changed, 3 insertions(+), 69 deletions(-)
delete mode 100644 net/curl/patches/100-wolfssl.patch
delete mode 100644 net/curl/patches/300-curl-wolfssl.m4-error-out-if-wolfSSL-is-not-usable.patch
diff --git a/net/curl/Makefile b/net/curl/Makefile
index 71f483520..c1d7abe2f 100644
--- a/net/curl/Makefile
+++ b/net/curl/Makefile
@@ -10,13 +10,13 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=curl
-PKG_VERSION:=7.83.1
-PKG_RELEASE:=$(AUTORELEASE).1
+PKG_VERSION:=8.4.0
+PKG_RELEASE:=$(AUTORELEASE)
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=https://dl.uxnr.de/mirror/curl/ \
https://curl.askapache.com/download/ \
https://curl.se/download/
-PKG_HASH:=2cb9c2356e7263a1272fd1435ef7cdebf2cd21400ec287b068396deb705c22c4
+PKG_HASH:=e5250581a9c032b1b6ed3cf2f9c114c811fc41881069e9892d115cc73f9e88c6
PKG_LICENSE:=MIT
PKG_LICENSE_FILES:=COPYING
diff --git a/net/curl/patches/100-wolfssl.patch b/net/curl/patches/100-wolfssl.patch
deleted file mode 100644
index d395a07c4..000000000
--- a/net/curl/patches/100-wolfssl.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/m4/curl-wolfssl.m4
-+++ b/m4/curl-wolfssl.m4
-@@ -93,6 +93,7 @@ if test "x$OPT_WOLFSSL" != xno; then
- They are set up properly later if it is detected. */
- #undef SIZEOF_LONG
- #undef SIZEOF_LONG_LONG
-+#include <wolfssl/options.h>
- #include <wolfssl/ssl.h>
- ]],[[
- return wolfSSL_Init();
diff --git a/net/curl/patches/300-curl-wolfssl.m4-error-out-if-wolfSSL-is-not-usable.patch b/net/curl/patches/300-curl-wolfssl.m4-error-out-if-wolfSSL-is-not-usable.patch
deleted file mode 100644
index 490e4dee1..000000000
--- a/net/curl/patches/300-curl-wolfssl.m4-error-out-if-wolfSSL-is-not-usable.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 5c91ff8853cbe08fb30462f99d3261383de9b98e Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Petr=20=C5=A0tetiar?= <ynezz@true.cz>
-Date: Mon, 10 Oct 2022 07:36:56 +0200
-Subject: [PATCH] curl-wolfssl.m4: error out if wolfSSL is not usable
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-When I explicitly declare, that I would like to have curl built with
-wolfSSL support using `--with-wolfssl` configure option, then I would
-expect, that either I endup with curl having that support, for example
-in form of https support or it wouldn't be available at all.
-
-Downstream projects like for example OpenWrt build curl wolfSSL variant
-with `--with-wolfssl` already, but in certain corner cases it does fail:
-
- configure:25299: checking for wolfSSL_Init in -lwolfssl
- configure:25321: x86_64-openwrt-linux-musl-gcc -o conftest [snip]
- In file included from target-x86_64_musl/usr/include/wolfssl/wolfcrypt/dsa.h:33,
- from target-x86_64_musl/usr/include/wolfssl/wolfcrypt/asn_public.h:35,
- from target-x86_64_musl/usr/include/wolfssl/ssl.h:35,
- from conftest.c:47:
- target-x86_64_musl/usr/include/wolfssl/wolfcrypt/integer.h:37:14: fatal error: wolfssl/wolfcrypt/sp_int.h: No such file or directory
- #include <wolfssl/wolfcrypt/sp_int.h>
- ^~~~~~~~~~~~~~~~~~~~~~~~~~~~
- compilation terminated.
-
-and in the end thus produces curl without https support:
-
- curl: (1) Protocol "https" not supported or disabled in libcurl
-
-So fix it, by making the working wolfSSL mandatory and error out in
-configure step when that's not the case:
-
- checking for wolfSSL_Init in -lwolfssl... no
- configure: error: --with-wolfssl but wolfSSL was not found or doesn't work
-
-References: https://github.com/openwrt/packages/issues/19005
-References: https://github.com/openwrt/packages/issues/19547
-Upstream-Status: Accepted [https://github.com/curl/curl/pull/9682]
-Signed-off-by: Petr Štetiar <ynezz@true.cz>
----
- m4/curl-wolfssl.m4 | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
---- a/m4/curl-wolfssl.m4
-+++ b/m4/curl-wolfssl.m4
-@@ -165,7 +165,8 @@ if test "x$OPT_WOLFSSL" != xno; then
- AC_MSG_NOTICE([Added $wolfssllibpath to CURL_LIBRARY_PATH])
- fi
- fi
--
-+ else
-+ AC_MSG_ERROR([--with-wolfssl but wolfSSL was not found or doesn't work])
- fi
-
- fi dnl wolfSSL not disabled
--
2.42.0
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment