diff options
Diffstat (limited to 'system/curl')
| -rw-r--r-- | system/curl/APKBUILD | 56 | ||||
| -rw-r--r-- | system/curl/errorcodes.pl | 99 |
2 files changed, 143 insertions, 12 deletions
diff --git a/system/curl/APKBUILD b/system/curl/APKBUILD index 5e767bcc8..1fdcc991f 100644 --- a/system/curl/APKBUILD +++ b/system/curl/APKBUILD @@ -1,22 +1,45 @@ -# Contributor: Sergei Lukin <sergej.lukin@gmail.com> +# Contributor: Sergey Lukin <sergej.lukin@gmail.com> # Contributor: Valery Kartel <valery.kartel@gmail.com> # Contributor: Łukasz Jendrysik <scadu@yandex.com> -# Maintainer: +# Maintainer: Zach van Rijn <me@zv.io> pkgname=curl -pkgver=7.66.0 +pkgver=8.11.0 pkgrel=0 -pkgdesc="An URL retrival utility and library" +pkgdesc="A URL retrival utility and library" url="https://curl.haxx.se" arch="all" license="MIT" depends="ca-certificates" -makedepends_build="groff perl" -makedepends_host="zlib-dev openssl-dev libssh2-dev" +makedepends_build="perl" +makedepends_host="libssh2-dev nghttp2-dev openssl-dev zlib-dev zstd-dev" makedepends="$makedepends_build $makedepends_host" -source="https://curl.haxx.se/download/$pkgname-$pkgver.tar.xz" +source="https://curl.haxx.se/download/$pkgname-$pkgver.tar.xz + errorcodes.pl + " subpackages="$pkgname-dbg $pkgname-doc $pkgname-dev libcurl" # secfixes: +# 8.0.1-r0: +# - CVE-2023-27538 +# - CVE-2023-27536 +# - CVE-2023-27535 +# - CVE-2023-27534 +# - CVE-2023-27533 +# - CVE-2023-23916 +# - CVE-2023-23915 +# - CVE-2023-23914 +# 7.79.1-r0: +# - CVE-2021-22947 +# - CVE-2021-22946 +# - CVE-2021-22945 +# 7.78.0-r0: +# - CVE-2021-22925 +# - CVE-2021-22924 +# - CVE-2021-22923 +# - CVE-2021-22922 +# - CVE-2021-22898 +# - CVE-2021-22890 +# - CVE-2021-22876 # 7.66.0-r0: # - CVE-2019-5481 # - CVE-2019-5482 @@ -79,6 +102,12 @@ subpackages="$pkgname-dbg $pkgname-doc $pkgname-dev libcurl" # - CVE-2014-0138 # - CVE-2014-0139 +prepare() { + default_prepare + + cp "$srcdir"/errorcodes.pl "$builddir"/tests/errorcodes.pl +} + build() { ./configure \ --build=$CBUILD \ @@ -87,17 +116,19 @@ build() { --enable-ipv6 \ --enable-unix-sockets \ --with-libssh2 \ - --without-libidn \ --without-libidn2 \ --disable-ldap \ - --with-pic + --with-pic \ + --with-openssl \ + --with-nghttp2 \ + --without-libpsl make } check() { # -p: print log contents on test failure - # !1592: requires DNS access - make check TFLAGS='-p !1592' + # ignore: 557: fails under valgrind only + make check TFLAGS='-p ~557' } package() { @@ -110,4 +141,5 @@ libcurl() { mv "$pkgdir"/usr/lib "$subpkgdir"/usr } -sha512sums="81170e7e4fa9d99ee2038d96d7f2ab10dcf52435331c818c7565c1a733891720f845a08029915e52ba532c6a344c346e1678474624aac1cc333aea6d1eacde35 curl-7.66.0.tar.xz" +sha512sums="3a642d421e0a5c09ecb681bea18498f2c6124e9af4d8afdc074dfb85a9b0211d8972ade9cf00ab44b5dfed9303262cd83551dd3b5e0976d11fc19da3c4a0987e curl-8.11.0.tar.xz +7848b1271e0bfe3be40221fb0582712d4af3ce1e1bdf16b5f0cac731d81bda145efc039f945a311af70caff279a44435a8ead6bb6e1db7570a4bd22df0a77fdb errorcodes.pl" diff --git a/system/curl/errorcodes.pl b/system/curl/errorcodes.pl new file mode 100644 index 000000000..9c8f9e882 --- /dev/null +++ b/system/curl/errorcodes.pl @@ -0,0 +1,99 @@ +#!/usr/bin/env perl +#*************************************************************************** +# _ _ ____ _ +# Project ___| | | | _ \| | +# / __| | | | |_) | | +# | (__| |_| | _ <| |___ +# \___|\___/|_| \_\_____| +# +# Copyright (C) Daniel Stenberg, <daniel@haxx.se>, et al. +# +# This software is licensed as described in the file COPYING, which +# you should have received as part of this distribution. The terms +# are also available at https://curl.se/docs/copyright.html. +# +# You may opt to use, copy, modify, merge, publish, distribute and/or sell +# copies of the Software, and permit persons to whom the Software is +# furnished to do so, under the terms of the COPYING file. +# +# This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY +# KIND, either express or implied. +# +# SPDX-License-Identifier: curl +# +########################################################################### + +# Check that libcurl-errors.3 and the public header files have the same set of +# error codes. + +use strict; +use warnings; + +# we may get the dir roots pointed out +my $root=$ARGV[0] || "."; +my $manpge = "$root/docs/libcurl/libcurl-errors.3"; +my $curlh = "$root/include/curl"; +my $errors=0; + +my @hnames; +my %wherefrom; +my @mnames; +my %manfrom; + +sub scanheader { + my ($file)=@_; + open H, "<$file"; + my $line = 0; + while(<H>) { + $line++; + if($_ =~ /^ (CURL(E|UE|SHE|HE|M)_[A-Z0-9_]*)/) { + my ($name)=($1); + if(($name !~ /OBSOLETE/) && ($name !~ /_LAST\z/)) { + push @hnames, $name; + if($wherefrom{$name}) { + print STDERR "double: $name\n"; + } + $wherefrom{$name}="$file:$line"; + } + } + } + close(H); +} + +sub scanmanpage { + my ($file)=@_; + open H, "<$file"; + my $line = 0; + while(<H>) { + $line++; + if($_ =~ /^\.IP \"(CURL(E|UE|SHE|HE|M)_[A-Z0-9_]*)/) { + my ($name)=($1); + push @mnames, $name; + $manfrom{$name}="$file:$line"; + } + } + close(H); +} + + +opendir(my $dh, $curlh) || die "Can't opendir $curlh: $!"; +my @hfiles = grep { /\.h$/ } readdir($dh); +closedir $dh; + +for(sort @hfiles) { + scanheader("$curlh/$_"); +} +scanmanpage($manpge); + +print "Result\n"; +for my $h (sort @hnames) { + if(!$manfrom{$h}) { + printf "$h from %s, not in man page\n", $wherefrom{$h}; + } +} + +for my $m (sort @mnames) { + if(!$wherefrom{$m}) { + printf "$m from %s, not in any header\n", $manfrom{$m}; + } +} |