Skip to content

Commit

Permalink
curl: update to 7.86.0
Browse files Browse the repository at this point in the history 
* update to 7.86.0: https://curl.se/changes.html#7_86_0
* remove 300-curl-wolfssl.m4-error-out-if-wolfSSL-is-not-usable.patch as
  it was fixed upstream: curl/curl#9682
* update configure options for OpenSSL as --without-ssl is breaking build
* remove --without-libidn configure arg as it's no longer recognized

Signed-off-by: Stan Grishin <stangri@melmac.ca>
  • Loading branch information
@stangri
stangri committed Oct 30, 2022
1 parent 637f3e5 commit 88009b2
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 62 deletions.
9 changes: 4 additions & 5 deletions net/curl/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,15 @@
include $(TOPDIR)/rules.mk

PKG_NAME:=curl
PKG_VERSION:=7.85.0
PKG_RELEASE:=$(AUTORELEASE).1
PKG_VERSION:=7.86.0
PKG_RELEASE:=$(AUTORELEASE)

PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=https://github.com/curl/curl/releases/download/curl-$(subst .,_,$(PKG_VERSION))/ \
https://dl.uxnr.de/mirror/curl/ \
https://curl.askapache.com/download/ \
https://curl.se/download/
PKG_HASH:=88b54a6d4b9a48cb4d873c7056dcba997ddd5b7be5a2d537a4acb55c20b04be6
PKG_HASH:=2d61116e5f485581f6d59865377df4463f2e788677ac43222b496d4e49fb627b

PKG_LICENSE:=MIT
PKG_LICENSE_FILES:=COPYING
Expand Down Expand Up @@ -116,7 +116,6 @@ CONFIGURE_ARGS += \
--disable-manual \
--without-nss \
--without-librtmp \
--without-libidn \
--without-ca-path \
--without-libpsl \
--without-zstd \
Expand All @@ -126,7 +125,7 @@ CONFIGURE_ARGS += \
\
$(if $(CONFIG_LIBCURL_WOLFSSL),--with-wolfssl="$(STAGING_DIR)/usr",--without-wolfssl) \
$(if $(CONFIG_LIBCURL_GNUTLS),--with-gnutls="$(STAGING_DIR)/usr",--without-gnutls) \
$(if $(CONFIG_LIBCURL_OPENSSL),--with-ssl="$(STAGING_DIR)/usr",--without-ssl) \
$(if $(CONFIG_LIBCURL_OPENSSL),--with-openssl="$(STAGING_DIR)/usr",--without-openssl) \

This comment has been minimized.

Sign in to view

Copy link
@rodsmar

rodsmar Nov 1, 2022

This commit breaks build system if this package (curl) is selected.

(...)
checking dependency style of mipsel-openwrt-linux-musl-gcc... gcc3
checking curl version... 7.86.0
configure: error: select TLS backend(s) or disable TLS with --without-ssl.

Select from these:

--with-amissl
--with-bearssl
--with-gnutls
--with-mbedtls
--with-nss
--with-openssl (also works for BoringSSL and libressl)
--with-rustls
--with-schannel
--with-secure-transport
--with-wolfssl

make[2]: *** [Makefile:187: /home/rodrigo/openwrt-snapshot/build_dir/target-mipsel_24kc_musl/curl-7.86.0/.configured_477282291d05badcb8a9e0f74832373d] Error 1
make[2]: Leaving directory '/home/rodrigo/openwrt-snapshot/feeds/packages/net/curl'
time: package/feeds/packages/curl/compile#31.65#1.38#33.27
ERROR: package/feeds/packages/curl failed to build.
make[1]: *** [package/Makefile:116: package/feeds/packages/curl/compile] Error 1
make[1]: Leaving directory '/home/rodrigo/openwrt-snapshot'
make: *** [/home/rodrigo/openwrt-snapshot/include/toplevel.mk:231: package/feeds/packages/curl/compile] Error 2

if I reverse that point, the build proceeds normally.

This comment has been minimized.

Sign in to view

Copy link
@ptpt52

ptpt52 Nov 1, 2022

Contributor

@stangri
same issue comes to me.

This comment has been minimized.

Sign in to view

Copy link
@stangri

stangri Nov 1, 2022

Author Member

Can either of you provide detailed log please?

This comment has been minimized.

Sign in to view

Copy link
@ptpt52

ptpt52 Nov 1, 2022

Contributor

make.log

@stangri I upload the make log

This comment has been minimized.

Sign in to view

Copy link
@rodsmar

rodsmar Nov 1, 2022

Maybe --without-openssl is an invalid option (i don't understand the curl build process)

Should be:

$(if $(CONFIG_LIBCURL_OPENSSL),--with-openssl="$(STAGING_DIR)/usr",--without-ssl) \

This comment has been minimized.

Sign in to view

Copy link
@stangri

stangri Nov 1, 2022

Author Member

@rodsmar the tail of that log file is:

Makefile:47: recipe for target '/home/runner/work/build-release/build-release/x-wrt/build_dir/target-mips_24kc_musl/minicom-2.8/.configured_a17fb5ef857664f03cd0ce37cc5ea591' failed
make[3]: *** [/home/runner/work/build-release/build-release/x-wrt/build_dir/target-mips_24kc_musl/minicom-2.8/.configured_a17fb5ef857664f03cd0ce37cc5ea591] Error 2
make[3]: Leaving directory '/home/runner/work/build-release/build-release/x-wrt/feeds/packages/utils/minicom'
time: package/feeds/packages/minicom/compile#3.60#0.48#5.89
    ERROR: package/feeds/packages/minicom failed to build.
package/Makefile:114: recipe for target 'package/feeds/packages/minicom/compile' failed
make[2]: *** [package/feeds/packages/minicom/compile] Error 1
make[2]: Leaving directory '/home/runner/work/build-release/build-release/x-wrt'
package/Makefile:110: recipe for target '/home/runner/work/build-release/build-release/x-wrt/staging_dir/target-mips_24kc_musl/stamp/.package_compile' failed
make[1]: *** [/home/runner/work/build-release/build-release/x-wrt/staging_dir/target-mips_24kc_musl/stamp/.package_compile] Error 2
make[1]: Leaving directory '/home/runner/work/build-release/build-release/x-wrt'
/home/runner/work/build-release/build-release/x-wrt/include/toplevel.mk:228: recipe for target 'world' failed
make: *** [world] Error 2

@ptpt52 @rodsmar -- do the errors occur on default (mbedtls) curl build or openssl build? I'll try to find the time to look into it today.

This comment has been minimized.

Sign in to view

Copy link
@ptpt52

ptpt52 Nov 1, 2022

Contributor 
# CONFIG_PACKAGE_lua-curl-v3 is not set
# CONFIG_PACKAGE_python3-curl is not set
# CONFIG_PACKAGE_libelektra-curlget is not set
# CONFIG_PACKAGE_libcurl is not set
# CONFIG_PACKAGE_curl is not set

I have nothing config on curl but why the build would run on it?
HOST build?
this ping @jow-

This comment has been minimized.

Sign in to view

Copy link
@rodsmar

rodsmar Nov 1, 2022

@ptpt52 the errors occur in default build. I've not tested with OpenSSL.

This comment has been minimized.

Sign in to view

Copy link
@stangri

stangri Nov 2, 2022

Author Member

I can't test if the curl breaks things, with me on latest snapshot I get errors on another package:

/usr/include/linux/types.h:5:10: fatal error: 'asm/types.h' file not found
#include <asm/types.h>
         ^~~~~~~~~~~~~
1 error generated.
make[6]: *** [Makefile:139: xdp-dispatcher.o] Error 1
make[5]: *** [Makefile:20: libxdp] Error 2
make[4]: *** [Makefile:25: lib] Error 2
make[4]: Leaving directory '/home/stangri/development/Builder/SDK_x86-64_snapshot/build_dir/target-x86_64_musl/xdp-tools-1.2.8'
make[3]: *** [Makefile:139: /home/stangri/development/Builder/SDK_x86-64_snapshot/build_dir/target-x86_64_musl/xdp-tools-1.2.8/.built] Error 2
make[3]: Leaving directory '/home/stangri/development/Builder/SDK_x86-64_snapshot/feeds/base/package/network/utils/xdp-tools'
time: package/feeds/base/xdp-tools/compile#1.52#0.35#2.46
    ERROR: package/feeds/base/xdp-tools failed to build.
make[2]: *** [package/Makefile:116: package/feeds/base/xdp-tools/compile] Error 1
make[2]: Leaving directory '/home/stangri/development/Builder/SDK_x86-64_snapshot'
make[1]: *** [package/Makefile:110: /home/stangri/development/Builder/SDK_x86-64_snapshot/staging_dir/target-x86_64_musl/stamp/.package_compile] Error 2
make[1]: Leaving directory '/home/stangri/development/Builder/SDK_x86-64_snapshot'
make: *** [/home/stangri/development/Builder/SDK_x86-64_snapshot/include/toplevel.mk:224: world] Error 2

So far, I've seen no logs proving the build breaks because of curl.
$(if $(CONFIG_LIBCURL_MBEDTLS),--with-mbedtls="$(STAGING_DIR)/usr",--without-mbedtls) \
\
$(if $(CONFIG_LIBCURL_LIBIDN2),--with-libidn2="$(STAGING_DIR)/usr",--without-libidn2) \
Expand Down
57 changes: 0 additions & 57 deletions net/curl/patches/300-curl-wolfssl.m4-error-out-if-wolfSSL-is-not-usable.patch
View file

This file was deleted.

7 comments on commit 88009b2

@stangri
Copy link
Member Author

@stangri stangri commented on 88009b2 Nov 2, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ptpt52 @rodsmar please reply here, so the commit comments are more visible!

@ptpt52
Copy link
Contributor

@ptpt52 ptpt52 commented on 88009b2 Nov 2, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@stangri You could reproduce the issue by:

# CONFIG_PACKAGE_libcurl is not set
# CONFIG_PACKAGE_curl is not set

and make

@ptpt52
Copy link
Contributor

@ptpt52 ptpt52 commented on 88009b2 Nov 2, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

issue fixed by:

diff --git a/net/curl/Makefile b/net/curl/Makefile
index 6b96d739b..e1dfe8334 100644
--- a/net/curl/Makefile
+++ b/net/curl/Makefile
@@ -126,7 +126,7 @@ CONFIGURE_ARGS += \
        \
        $(if $(CONFIG_LIBCURL_WOLFSSL),--with-wolfssl="$(STAGING_DIR)/usr",--without-wolfssl) \
        $(if $(CONFIG_LIBCURL_GNUTLS),--with-gnutls="$(STAGING_DIR)/usr",--without-gnutls) \
-       $(if $(CONFIG_LIBCURL_OPENSSL),--with-openssl="$(STAGING_DIR)/usr",--without-openssl) \
+       $(if $(CONFIG_LIBCURL_OPENSSL),--with-openssl="$(STAGING_DIR)/usr",--without-ssl) \
        $(if $(CONFIG_LIBCURL_MBEDTLS),--with-mbedtls="$(STAGING_DIR)/usr",--without-mbedtls) \
        \
        $(if $(CONFIG_LIBCURL_LIBIDN2),--with-libidn2="$(STAGING_DIR)/usr",--without-libidn2) \

@ptpt52
Copy link
Contributor

@ptpt52 ptpt52 commented on 88009b2 Nov 2, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

update:
fixed by:

diff --git a/net/curl/Makefile b/net/curl/Makefile
index 6b96d739b..1b19a0318 100644
--- a/net/curl/Makefile
+++ b/net/curl/Makefile
@@ -124,6 +124,7 @@ CONFIGURE_ARGS += \
        \
        $(call autoconf_bool,CONFIG_IPV6,ipv6) \
        \
+       $(if $(CONFIG_LIBCURL_WOLFSSL)$(CONFIG_LIBCURL_GNUTLS)$(CONFIG_LIBCURL_OPENSSL)$(CONFIG_LIBCURL_MBEDTLS),,--without-ssl) \
        $(if $(CONFIG_LIBCURL_WOLFSSL),--with-wolfssl="$(STAGING_DIR)/usr",--without-wolfssl) \
        $(if $(CONFIG_LIBCURL_GNUTLS),--with-gnutls="$(STAGING_DIR)/usr",--without-gnutls) \
        $(if $(CONFIG_LIBCURL_OPENSSL),--with-openssl="$(STAGING_DIR)/usr",--without-openssl) \

@stangri
Copy link
Member Author

@stangri stangri commented on 88009b2 Nov 2, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ptpt52 do you want to send a PR or do you want me to do it?

@ptpt52
Copy link
Contributor

@ptpt52 ptpt52 commented on 88009b2 Nov 2, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ptpt52 do you want to send a PR or do you want me to do it?

it is kindly and convenient for you to do that.

@stangri
Copy link
Member Author

@stangri stangri commented on 88009b2 Nov 2, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ptpt52 Thank you for looking into this and providing a patch, the PR is here: #19770

Please sign in to comment.