* [PR PATCH] curl: update to 7.73.0.
@ 2020-10-20 20:41 ericonr
2020-10-20 20:53 ` [PR PATCH] [Updated] " ericonr
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: ericonr @ 2020-10-20 20:41 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 406 bytes --]
There is a new pull request by ericonr against master on the void-packages repository
https://github.com/ericonr/void-packages curl
https://github.com/void-linux/void-packages/pull/25764
curl: update to 7.73.0.
Remove outdated patch, remove libcurl-gnutsl symlink from libcurl, and
add zstd compression support.
A patch file from https://github.com/void-linux/void-packages/pull/25764.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-curl-25764.patch --]
[-- Type: text/x-diff, Size: 4648 bytes --]
From 4a0b94dd918885cff4a9758e6dfce6e288ae518e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Tue, 20 Oct 2020 17:36:42 -0300
Subject: [PATCH] curl: update to 7.73.0.
Remove outdated patch, remove libcurl-gnutsl symlink from libcurl, and
add zstd compression support.
---
srcpkgs/curl/patches/fix-crash-no-proxy.patch | 54 -------------------
srcpkgs/curl/template | 16 +++---
2 files changed, 7 insertions(+), 63 deletions(-)
delete mode 100644 srcpkgs/curl/patches/fix-crash-no-proxy.patch
diff --git a/srcpkgs/curl/patches/fix-crash-no-proxy.patch b/srcpkgs/curl/patches/fix-crash-no-proxy.patch
deleted file mode 100644
index a1b763ce1e0..00000000000
--- a/srcpkgs/curl/patches/fix-crash-no-proxy.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 3eff1c5092e542819ac7e6454a70c94b36ab2a40 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Martin=20Ba=C5=A1ti?= <mbasti@redhat.com>
-Date: Thu, 27 Aug 2020 23:09:56 +0200
-Subject: [PATCH] http_proxy: do not crash with HTTPS_PROXY and NO_PROXY set
-
-... in case NO_PROXY takes an effect
-
-Without this patch, the following command crashes:
-
- $ GIT_CURL_VERBOSE=1 NO_PROXY=github.com HTTPS_PROXY=https://example.com \
- git clone https://github.com/curl/curl.git
-
-Minimal libcurl-based reproducer:
-
- #include <curl/curl.h>
-
- int main() {
- CURL *curl = curl_easy_init();
- if(curl) {
- CURLcode ret;
- curl_easy_setopt(curl, CURLOPT_URL, "https://github.com/");
- curl_easy_setopt(curl, CURLOPT_PROXY, "example.com");
- /* set the proxy type */
- curl_easy_setopt(curl, CURLOPT_PROXYTYPE, CURLPROXY_HTTPS);
- curl_easy_setopt(curl, CURLOPT_NOPROXY, "github.com");
- curl_easy_setopt(curl, CURLOPT_VERBOSE, 1L);
- ret = curl_easy_perform(curl);
- curl_easy_cleanup(curl);
- return ret;
- }
- return -1;
- }
-
-Assisted-by: Kamil Dudka
-Bug: https://bugzilla.redhat.com/1873327
-Closes #5902
----
- lib/url.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/lib/url.c b/lib/url.c
-index d342c4e6986..2f02a0a16a3 100644
---- a/lib/url.c
-+++ b/lib/url.c
-@@ -2556,6 +2556,9 @@ static CURLcode create_conn_helper_init_proxy(struct connectdata *conn)
- conn->bits.socksproxy = FALSE;
- conn->bits.proxy_user_passwd = FALSE;
- conn->bits.tunnel_proxy = FALSE;
-+ /* CURLPROXY_HTTPS does not have its own flag in conn->bits, yet we need
-+ to signal that CURLPROXY_HTTPS is not used for this connection */
-+ conn->http_proxy.proxytype = CURLPROXY_HTTP;
- }
-
- out:
diff --git a/srcpkgs/curl/template b/srcpkgs/curl/template
index 08629c4f93e..56a8b54631b 100644
--- a/srcpkgs/curl/template
+++ b/srcpkgs/curl/template
@@ -1,17 +1,17 @@
# Template file for 'curl'
pkgname=curl
-version=7.72.0
-revision=2
+version=7.73.0
+revision=1
build_style=gnu-configure
configure_args="ac_cv_sizeof_off_t=8 --enable-threaded-resolver --enable-ipv6
$(vopt_with rtmp) $(vopt_with gssapi) $(vopt_enable ldap) $(vopt_with gnutls)
- $(vopt_enable ldap ldaps) $(vopt_with ssh libssh2) $(vopt_with ssl)
+ $(vopt_enable ldap ldaps) $(vopt_with ssh libssh2) $(vopt_with ssl) $(vopt_with zstd)
--with-ca-bundle=/etc/ssl/certs/ca-certificates.crt --without-libidn2"
hostmakedepends="groff perl pkg-config"
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')
- $(vopt_if ssl 'libressl-devel')"
+ $(vopt_if ssl 'libressl-devel') $(vopt_if zstd 'zstd-devel')"
depends="ca-certificates"
# openssh isn't in checkdepends, because test 581 locks up
checkdepends="perl python3 stunnel nghttp2 groff"
@@ -21,10 +21,10 @@ license="MIT"
homepage="https://curl.haxx.se"
changelog="https://curl.haxx.se/changes.html#${version//./_}"
distfiles="${homepage}/download/${pkgname}-${version}.tar.bz2"
-checksum=ad91970864102a59765e20ce16216efc9d6ad381471f7accceceab7d905703ef
+checksum=cf34fe0b07b800f1c01a499a6e8b2af548f6d0e044dca4a29d88a4bee146d131
patch_args="-Np1"
-build_options="gnutls gssapi ldap rtmp ssh ssl"
-build_options_default="ssh ssl"
+build_options="gnutls gssapi ldap rtmp ssh ssl zstd"
+build_options_default="ssh ssl zstd"
vopt_conflict ssl gnutls
pre_configure() {
@@ -46,10 +46,8 @@ post_install() {
libcurl_package() {
short_desc="Multiprotocol file transfer library"
- shlib_provides="libcurl-gnutls.so.4"
pkg_install() {
vmove "usr/lib/*.so.*"
- ln -sf libcurl.so.4.6.0 ${PKGDESTDIR}/usr/lib/libcurl-gnutls.so.4
}
}
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PR PATCH] [Updated] curl: update to 7.73.0.
2020-10-20 20:41 [PR PATCH] curl: update to 7.73.0 ericonr
@ 2020-10-20 20:53 ` ericonr
2020-10-21 16:35 ` ericonr
2020-10-24 6:32 ` [PR PATCH] [Merged]: " ericonr
2 siblings, 0 replies; 4+ messages in thread
From: ericonr @ 2020-10-20 20:53 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 411 bytes --]
There is an updated pull request by ericonr against master on the void-packages repository
https://github.com/ericonr/void-packages curl
https://github.com/void-linux/void-packages/pull/25764
curl: update to 7.73.0.
Remove outdated patch, remove libcurl-gnutsl symlink from libcurl, and
add zstd compression support.
A patch file from https://github.com/void-linux/void-packages/pull/25764.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-curl-25764.patch --]
[-- Type: text/x-diff, Size: 5103 bytes --]
From 8a514b37d1fee8ac50f8404d54f95c5766870052 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Tue, 20 Oct 2020 17:36:42 -0300
Subject: [PATCH] curl: update to 7.73.0.
Remove outdated patch, remove libcurl-gnutsl symlink from libcurl, and
add zstd compression support.
---
common/shlibs | 1 -
srcpkgs/curl/patches/fix-crash-no-proxy.patch | 54 -------------------
srcpkgs/curl/template | 16 +++---
3 files changed, 7 insertions(+), 64 deletions(-)
delete mode 100644 srcpkgs/curl/patches/fix-crash-no-proxy.patch
diff --git a/common/shlibs b/common/shlibs
index 35f08f5f099..cb791e69125 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -370,7 +370,6 @@ libnssdbm3.so nss-3.12.4_1
libnssckbi.so nss-3.12.4_1
libnss3.so nss-3.12.4_1
libcurl.so.4 libcurl-7.19_1
-libcurl-gnutls.so.4 libcurl-7.19_1
libdaemon.so.0 libdaemon-0.14_1
libavahi-common.so.3 avahi-libs-0.6.25_1
libavahi-core.so.7 avahi-libs-0.6.25_1
diff --git a/srcpkgs/curl/patches/fix-crash-no-proxy.patch b/srcpkgs/curl/patches/fix-crash-no-proxy.patch
deleted file mode 100644
index a1b763ce1e0..00000000000
--- a/srcpkgs/curl/patches/fix-crash-no-proxy.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 3eff1c5092e542819ac7e6454a70c94b36ab2a40 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Martin=20Ba=C5=A1ti?= <mbasti@redhat.com>
-Date: Thu, 27 Aug 2020 23:09:56 +0200
-Subject: [PATCH] http_proxy: do not crash with HTTPS_PROXY and NO_PROXY set
-
-... in case NO_PROXY takes an effect
-
-Without this patch, the following command crashes:
-
- $ GIT_CURL_VERBOSE=1 NO_PROXY=github.com HTTPS_PROXY=https://example.com \
- git clone https://github.com/curl/curl.git
-
-Minimal libcurl-based reproducer:
-
- #include <curl/curl.h>
-
- int main() {
- CURL *curl = curl_easy_init();
- if(curl) {
- CURLcode ret;
- curl_easy_setopt(curl, CURLOPT_URL, "https://github.com/");
- curl_easy_setopt(curl, CURLOPT_PROXY, "example.com");
- /* set the proxy type */
- curl_easy_setopt(curl, CURLOPT_PROXYTYPE, CURLPROXY_HTTPS);
- curl_easy_setopt(curl, CURLOPT_NOPROXY, "github.com");
- curl_easy_setopt(curl, CURLOPT_VERBOSE, 1L);
- ret = curl_easy_perform(curl);
- curl_easy_cleanup(curl);
- return ret;
- }
- return -1;
- }
-
-Assisted-by: Kamil Dudka
-Bug: https://bugzilla.redhat.com/1873327
-Closes #5902
----
- lib/url.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/lib/url.c b/lib/url.c
-index d342c4e6986..2f02a0a16a3 100644
---- a/lib/url.c
-+++ b/lib/url.c
-@@ -2556,6 +2556,9 @@ static CURLcode create_conn_helper_init_proxy(struct connectdata *conn)
- conn->bits.socksproxy = FALSE;
- conn->bits.proxy_user_passwd = FALSE;
- conn->bits.tunnel_proxy = FALSE;
-+ /* CURLPROXY_HTTPS does not have its own flag in conn->bits, yet we need
-+ to signal that CURLPROXY_HTTPS is not used for this connection */
-+ conn->http_proxy.proxytype = CURLPROXY_HTTP;
- }
-
- out:
diff --git a/srcpkgs/curl/template b/srcpkgs/curl/template
index 08629c4f93e..56a8b54631b 100644
--- a/srcpkgs/curl/template
+++ b/srcpkgs/curl/template
@@ -1,17 +1,17 @@
# Template file for 'curl'
pkgname=curl
-version=7.72.0
-revision=2
+version=7.73.0
+revision=1
build_style=gnu-configure
configure_args="ac_cv_sizeof_off_t=8 --enable-threaded-resolver --enable-ipv6
$(vopt_with rtmp) $(vopt_with gssapi) $(vopt_enable ldap) $(vopt_with gnutls)
- $(vopt_enable ldap ldaps) $(vopt_with ssh libssh2) $(vopt_with ssl)
+ $(vopt_enable ldap ldaps) $(vopt_with ssh libssh2) $(vopt_with ssl) $(vopt_with zstd)
--with-ca-bundle=/etc/ssl/certs/ca-certificates.crt --without-libidn2"
hostmakedepends="groff perl pkg-config"
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')
- $(vopt_if ssl 'libressl-devel')"
+ $(vopt_if ssl 'libressl-devel') $(vopt_if zstd 'zstd-devel')"
depends="ca-certificates"
# openssh isn't in checkdepends, because test 581 locks up
checkdepends="perl python3 stunnel nghttp2 groff"
@@ -21,10 +21,10 @@ license="MIT"
homepage="https://curl.haxx.se"
changelog="https://curl.haxx.se/changes.html#${version//./_}"
distfiles="${homepage}/download/${pkgname}-${version}.tar.bz2"
-checksum=ad91970864102a59765e20ce16216efc9d6ad381471f7accceceab7d905703ef
+checksum=cf34fe0b07b800f1c01a499a6e8b2af548f6d0e044dca4a29d88a4bee146d131
patch_args="-Np1"
-build_options="gnutls gssapi ldap rtmp ssh ssl"
-build_options_default="ssh ssl"
+build_options="gnutls gssapi ldap rtmp ssh ssl zstd"
+build_options_default="ssh ssl zstd"
vopt_conflict ssl gnutls
pre_configure() {
@@ -46,10 +46,8 @@ post_install() {
libcurl_package() {
short_desc="Multiprotocol file transfer library"
- shlib_provides="libcurl-gnutls.so.4"
pkg_install() {
vmove "usr/lib/*.so.*"
- ln -sf libcurl.so.4.6.0 ${PKGDESTDIR}/usr/lib/libcurl-gnutls.so.4
}
}
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PR PATCH] [Updated] curl: update to 7.73.0.
2020-10-20 20:41 [PR PATCH] curl: update to 7.73.0 ericonr
2020-10-20 20:53 ` [PR PATCH] [Updated] " ericonr
@ 2020-10-21 16:35 ` ericonr
2020-10-24 6:32 ` [PR PATCH] [Merged]: " ericonr
2 siblings, 0 replies; 4+ messages in thread
From: ericonr @ 2020-10-21 16:35 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 411 bytes --]
There is an updated pull request by ericonr against master on the void-packages repository
https://github.com/ericonr/void-packages curl
https://github.com/void-linux/void-packages/pull/25764
curl: update to 7.73.0.
Remove outdated patch, remove libcurl-gnutsl symlink from libcurl, and
add zstd compression support.
A patch file from https://github.com/void-linux/void-packages/pull/25764.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-curl-25764.patch --]
[-- Type: text/x-diff, Size: 5106 bytes --]
From dc3707a0706c3b8e2e10a512be63328d265d931a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Tue, 20 Oct 2020 17:36:42 -0300
Subject: [PATCH] curl: update to 7.73.0.
Remove outdated patch, remove libcurl-gnutsl symlink from libcurl, and
add zstd compression support.
---
common/shlibs | 1 -
srcpkgs/curl/patches/fix-crash-no-proxy.patch | 54 -------------------
srcpkgs/curl/template | 16 +++---
3 files changed, 7 insertions(+), 64 deletions(-)
delete mode 100644 srcpkgs/curl/patches/fix-crash-no-proxy.patch
diff --git a/common/shlibs b/common/shlibs
index 35f08f5f099..cb791e69125 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -370,7 +370,6 @@ libnssdbm3.so nss-3.12.4_1
libnssckbi.so nss-3.12.4_1
libnss3.so nss-3.12.4_1
libcurl.so.4 libcurl-7.19_1
-libcurl-gnutls.so.4 libcurl-7.19_1
libdaemon.so.0 libdaemon-0.14_1
libavahi-common.so.3 avahi-libs-0.6.25_1
libavahi-core.so.7 avahi-libs-0.6.25_1
diff --git a/srcpkgs/curl/patches/fix-crash-no-proxy.patch b/srcpkgs/curl/patches/fix-crash-no-proxy.patch
deleted file mode 100644
index a1b763ce1e0..00000000000
--- a/srcpkgs/curl/patches/fix-crash-no-proxy.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 3eff1c5092e542819ac7e6454a70c94b36ab2a40 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Martin=20Ba=C5=A1ti?= <mbasti@redhat.com>
-Date: Thu, 27 Aug 2020 23:09:56 +0200
-Subject: [PATCH] http_proxy: do not crash with HTTPS_PROXY and NO_PROXY set
-
-... in case NO_PROXY takes an effect
-
-Without this patch, the following command crashes:
-
- $ GIT_CURL_VERBOSE=1 NO_PROXY=github.com HTTPS_PROXY=https://example.com \
- git clone https://github.com/curl/curl.git
-
-Minimal libcurl-based reproducer:
-
- #include <curl/curl.h>
-
- int main() {
- CURL *curl = curl_easy_init();
- if(curl) {
- CURLcode ret;
- curl_easy_setopt(curl, CURLOPT_URL, "https://github.com/");
- curl_easy_setopt(curl, CURLOPT_PROXY, "example.com");
- /* set the proxy type */
- curl_easy_setopt(curl, CURLOPT_PROXYTYPE, CURLPROXY_HTTPS);
- curl_easy_setopt(curl, CURLOPT_NOPROXY, "github.com");
- curl_easy_setopt(curl, CURLOPT_VERBOSE, 1L);
- ret = curl_easy_perform(curl);
- curl_easy_cleanup(curl);
- return ret;
- }
- return -1;
- }
-
-Assisted-by: Kamil Dudka
-Bug: https://bugzilla.redhat.com/1873327
-Closes #5902
----
- lib/url.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/lib/url.c b/lib/url.c
-index d342c4e6986..2f02a0a16a3 100644
---- a/lib/url.c
-+++ b/lib/url.c
-@@ -2556,6 +2556,9 @@ static CURLcode create_conn_helper_init_proxy(struct connectdata *conn)
- conn->bits.socksproxy = FALSE;
- conn->bits.proxy_user_passwd = FALSE;
- conn->bits.tunnel_proxy = FALSE;
-+ /* CURLPROXY_HTTPS does not have its own flag in conn->bits, yet we need
-+ to signal that CURLPROXY_HTTPS is not used for this connection */
-+ conn->http_proxy.proxytype = CURLPROXY_HTTP;
- }
-
- out:
diff --git a/srcpkgs/curl/template b/srcpkgs/curl/template
index 08629c4f93e..1baf5e6de1e 100644
--- a/srcpkgs/curl/template
+++ b/srcpkgs/curl/template
@@ -1,17 +1,17 @@
# Template file for 'curl'
pkgname=curl
-version=7.72.0
-revision=2
+version=7.73.0
+revision=1
build_style=gnu-configure
configure_args="ac_cv_sizeof_off_t=8 --enable-threaded-resolver --enable-ipv6
$(vopt_with rtmp) $(vopt_with gssapi) $(vopt_enable ldap) $(vopt_with gnutls)
- $(vopt_enable ldap ldaps) $(vopt_with ssh libssh2) $(vopt_with ssl)
+ $(vopt_enable ldap ldaps) $(vopt_with ssh libssh2) $(vopt_with ssl) $(vopt_with zstd)
--with-ca-bundle=/etc/ssl/certs/ca-certificates.crt --without-libidn2"
hostmakedepends="groff perl pkg-config"
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')
- $(vopt_if ssl 'libressl-devel')"
+ $(vopt_if ssl 'libressl-devel') $(vopt_if zstd 'libzstd-devel')"
depends="ca-certificates"
# openssh isn't in checkdepends, because test 581 locks up
checkdepends="perl python3 stunnel nghttp2 groff"
@@ -21,10 +21,10 @@ license="MIT"
homepage="https://curl.haxx.se"
changelog="https://curl.haxx.se/changes.html#${version//./_}"
distfiles="${homepage}/download/${pkgname}-${version}.tar.bz2"
-checksum=ad91970864102a59765e20ce16216efc9d6ad381471f7accceceab7d905703ef
+checksum=cf34fe0b07b800f1c01a499a6e8b2af548f6d0e044dca4a29d88a4bee146d131
patch_args="-Np1"
-build_options="gnutls gssapi ldap rtmp ssh ssl"
-build_options_default="ssh ssl"
+build_options="gnutls gssapi ldap rtmp ssh ssl zstd"
+build_options_default="ssh ssl zstd"
vopt_conflict ssl gnutls
pre_configure() {
@@ -46,10 +46,8 @@ post_install() {
libcurl_package() {
short_desc="Multiprotocol file transfer library"
- shlib_provides="libcurl-gnutls.so.4"
pkg_install() {
vmove "usr/lib/*.so.*"
- ln -sf libcurl.so.4.6.0 ${PKGDESTDIR}/usr/lib/libcurl-gnutls.so.4
}
}
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PR PATCH] [Merged]: curl: update to 7.73.0.
2020-10-20 20:41 [PR PATCH] curl: update to 7.73.0 ericonr
2020-10-20 20:53 ` [PR PATCH] [Updated] " ericonr
2020-10-21 16:35 ` ericonr
@ 2020-10-24 6:32 ` ericonr
2 siblings, 0 replies; 4+ messages in thread
From: ericonr @ 2020-10-24 6:32 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 258 bytes --]
There's a merged pull request on the void-packages repository
curl: update to 7.73.0.
https://github.com/void-linux/void-packages/pull/25764
Description:
Remove outdated patch, remove libcurl-gnutsl symlink from libcurl, and
add zstd compression support.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-10-24 6:32 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-10-20 20:41 [PR PATCH] curl: update to 7.73.0 ericonr
2020-10-20 20:53 ` [PR PATCH] [Updated] " ericonr
2020-10-21 16:35 ` ericonr
2020-10-24 6:32 ` [PR PATCH] [Merged]: " ericonr
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).