Browse Source

Merge pull request #19381 from stangri/openwrt-22.03-curl

[22.03] curl: update to 7.85.0
lilik-openwrt-22.03
Stan Grishin 2 years ago
committed by GitHub
parent
commit
4fb657737d
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 15 deletions
  1. +4
    -3
      net/curl/Makefile
  2. +0
    -10
      net/curl/patches/100-wolfssl.patch
  3. +2
    -2
      net/curl/patches/200-no_docs_tests.patch

+ 4
- 3
net/curl/Makefile View File

@ -8,14 +8,15 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=curl
PKG_VERSION:=7.83.1
PKG_VERSION:=7.85.0
PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=https://dl.uxnr.de/mirror/curl/ \
PKG_SOURCE_URL:=https://github.com/curl/curl/releases/download/curl-$(PKG_VERSION:.=_)/ \
https://dl.uxnr.de/mirror/curl/ \
https://curl.askapache.com/download/ \
https://curl.se/download/
PKG_HASH:=2cb9c2356e7263a1272fd1435ef7cdebf2cd21400ec287b068396deb705c22c4
PKG_HASH:=88b54a6d4b9a48cb4d873c7056dcba997ddd5b7be5a2d537a4acb55c20b04be6
PKG_LICENSE:=MIT
PKG_LICENSE_FILES:=COPYING


+ 0
- 10
net/curl/patches/100-wolfssl.patch View File

@ -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();

+ 2
- 2
net/curl/patches/200-no_docs_tests.patch View File

@ -1,6 +1,6 @@
--- a/Makefile.am
+++ b/Makefile.am
@@ -155,7 +155,7 @@ CLEANFILES = $(VC10_LIBVCXPROJ) $(VC10_S
@@ -158,7 +158,7 @@ CLEANFILES = $(VC10_LIBVCXPROJ) $(VC10_S
bin_SCRIPTS = curl-config
SUBDIRS = lib src
@ -9,7 +9,7 @@
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = libcurl.pc
@@ -269,8 +269,6 @@ cygwinbin:
@@ -272,8 +272,6 @@ cygwinbin:
# We extend the standard install with a custom hook:
install-data-hook:
(cd include && $(MAKE) install)


Loading…
Cancel
Save