Skip to content

Commit

Permalink
curl: update to 7.73.0.
Browse files Browse the repository at this point in the history
Remove outdated patch, remove libcurl-gnutsl symlink from libcurl, and
add zstd compression support.
  • Loading branch information
ericonr committed Oct 24, 2020
1 parent fa46cf5 commit 2105b09
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 64 deletions.
1 change: 0 additions & 1 deletion common/shlibs
Expand Up @@ -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
Expand Down
54 changes: 0 additions & 54 deletions srcpkgs/curl/patches/fix-crash-no-proxy.patch

This file was deleted.

16 changes: 7 additions & 9 deletions 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"
Expand All @@ -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() {
Expand All @@ -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
}
}

Expand Down

0 comments on commit 2105b09

Please sign in to comment.