From a4f9f180f0f629473ef670afc23dea728038c593 Mon Sep 17 00:00:00 2001 From: Marcin Puc Date: Wed, 22 May 2024 10:02:58 +0200 Subject: [PATCH] curl: update to 8.8.0 --- .../patches/install-curl-config-manpage.patch | 26 +++++++++++++++++++ srcpkgs/curl/template | 9 ++++--- 2 files changed, 32 insertions(+), 3 deletions(-) create mode 100644 srcpkgs/curl/patches/install-curl-config-manpage.patch diff --git a/srcpkgs/curl/patches/install-curl-config-manpage.patch b/srcpkgs/curl/patches/install-curl-config-manpage.patch new file mode 100644 index 00000000000000..74b13f0bea2d0c --- /dev/null +++ b/srcpkgs/curl/patches/install-curl-config-manpage.patch @@ -0,0 +1,26 @@ +From 4cc5657247183a0bc3b0969beeaea9acddb09d22 Mon Sep 17 00:00:00 2001 +From: Daniel Stenberg +Date: Wed, 22 May 2024 08:43:43 +0200 +Subject: [PATCH] docs/Makefile.am: make curl-config.1 install + +on "make install" like it should + +Follow-up to 60971d665b9b1df87082 + +Closes #13741 +--- + docs/Makefile.am | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/docs/Makefile.am b/docs/Makefile.am +index 83f5b0c461cc0f..e9ef6284860555 100644 +--- a/docs/Makefile.am ++++ b/docs/Makefile.am +@@ -28,6 +28,7 @@ if BUILD_DOCS + # if we disable man page building, ignore these + MK_CA_DOCS = mk-ca-bundle.1 + CURLCONF_DOCS = curl-config.1 ++man_MANS = curl-config.1 + endif + + CURLPAGES = curl-config.md mk-ca-bundle.md diff --git a/srcpkgs/curl/template b/srcpkgs/curl/template index d2ec8f6b1a5cb2..beb6fd367c7a89 100644 --- a/srcpkgs/curl/template +++ b/srcpkgs/curl/template @@ -1,6 +1,6 @@ # Template file for 'curl' pkgname=curl -version=8.7.1 +version=8.8.0 revision=1 build_style=gnu-configure configure_args="ac_cv_sizeof_off_t=8 --enable-threaded-resolver --enable-ipv6 @@ -15,7 +15,7 @@ configure_args="ac_cv_sizeof_off_t=8 --enable-threaded-resolver --enable-ipv6 make_check_args="TFLAGS=!1477" # Use mdocml instead of groff to generate builtin manual to avoid cyclic # dependencies. -hostmakedepends="perl pkg-config mdocml" +hostmakedepends="perl pkg-config mdocml libtool automake" makedepends="nghttp2-devel zlib-devel $(vopt_if gnutls 'gnutls-devel') $(vopt_if gssapi 'mit-krb5-devel') $(vopt_if ldap 'libldap-devel') $(vopt_if rtmp 'librtmp-devel') $(vopt_if ssh 'libssh2-devel') @@ -30,7 +30,7 @@ license="MIT" homepage="https://curl.se" changelog="https://curl.se/changes.html" distfiles="https://curl.se/download/curl-${version}.tar.gz" -checksum=f91249c87f68ea00cf27c44fdfa5a78423e41e71b7d408e5901a9896d905c495 +checksum=77c0e1cd35ab5b45b659645a93b46d660224d0024f1185e8a95cdb27ae3d787d build_options="gnutls gssapi idn ldap psl rtmp ssh ssl zstd" build_options_default="idn psl ssh ssl zstd" vopt_conflict ssl gnutls @@ -43,6 +43,9 @@ pre_configure() { export CFLAGS="${CFLAGS/-D_FORTIFY_SOURCE=2/}" export CFLAGS="${CFLAGS/-I${XBPS_CROSS_BASE}\/usr\/include/}" export CPPFLAGS="-D_FORTIFY_SOURCE=2" + + # reconfigure for patched changes + autoreconf -fi } pre_check() {