curl: bump to 7.58.0, fix TEST, mark as tested. (#2157)

* tests/data/test116 is failing on all architectures.
* tests/data/test1061 is failing on x86_64 only.
* tests/data/test{31,46,61,1415} call runtimes which crash on x86_64
  only, but these tests do not fail.
This commit is contained in:
fbrosson
2018-01-26 13:26:56 +00:00
committed by GitHub
parent 7c5e78e9f8
commit 65646fad14
2 changed files with 22 additions and 11 deletions

View File

@@ -7,20 +7,24 @@ based upload, proxies, cookies, user+password authentication (Basic, Digest, \
NTLM, Negotiate, kerberos...), file transfer resume, proxy tunneling and a \
busload of other useful tricks."
HOMEPAGE="https://curl.haxx.se/"
COPYRIGHT="1996-2016 Daniel Stenberg"
COPYRIGHT="1996-2018 Daniel Stenberg"
LICENSE="Curl"
REVISION="1"
SOURCE_URI="https://curl.haxx.se/download/curl-$portVersion.tar.bz2"
CHECKSUM_SHA256="c92fe31a348eae079121b73884065e600c533493eb50f1f6cee9c48a3f454826"
CHECKSUM_SHA256="1cb081f97807c01e3ed747b6e1c9fee7a01cb10048f1cd0b5f56cfe0209de731"
ADDITIONAL_FILES="curl.rdef"
ARCHITECTURES="?x86_gcc2 ?x86 x86_64 ?arm"
SECONDARY_ARCHITECTURES="?x86_gcc2 ?x86"
ARCHITECTURES="x86_gcc2 ?x86 x86_64 ?arm"
SECONDARY_ARCHITECTURES="x86"
libVersion="4.5.0"
libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
portVersionCompat="$portVersion compat >= 7.16"
PROVIDES="
curl$secondaryArchSuffix = $portVersion
lib:libcurl$secondaryArchSuffix = 4.5.0 compat >= 4
cmd:curl$secondaryArchSuffix = $portVersion compat >= 7.16
lib:libcurl$secondaryArchSuffix = $libVersionCompat
cmd:curl$secondaryArchSuffix = $portVersionCompat
"
REQUIRES="
haiku$secondaryArchSuffix
@@ -31,8 +35,8 @@ REQUIRES="
PROVIDES_devel="
curl${secondaryArchSuffix}_devel = $portVersion
cmd:curl_config$secondaryArchSuffix = $portVersion compat >= 7.16
devel:libcurl$secondaryArchSuffix = 4.5.0 compat >= 4
cmd:curl_config$secondaryArchSuffix = $portVersionCompat
devel:libcurl$secondaryArchSuffix = $libVersionCompat
"
REQUIRES_devel="
curl$secondaryArchSuffix == $portVersion base
@@ -60,10 +64,16 @@ BUILD_PREREQUIRES="
cmd:pkg_config$secondaryArchSuffix
cmd:sed
"
if [ "$recipeAction" = TEST ]; then
BUILD_PREREQUIRES="$BUILD_PREREQUIRES
cmd:id
cmd:sshd
"
fi
defineDebugInfoPackage curl$secondaryArchSuffix \
$binDir/curl \
$libDir/libcurl.so.4.5.0
$libDir/libcurl.so.$libVersion
BUILD()
{
@@ -131,5 +141,5 @@ INSTALL()
TEST()
{
make check
USER="`id -n -u`" make check
}

View File

@@ -1,6 +1,7 @@
COPYRIGHT AND PERMISSION NOTICE
Copyright (c) 1996 - 2009, Daniel Stenberg, <daniel@haxx.se>.
Copyright (c) 1996 - 2018, Daniel Stenberg, <daniel@haxx.se>, and many
contributors, see the THANKS file.
All rights reserved.