Skip to content

Commit 028edb8

Browse files
oetikeroetiker
authored
Merge pull request #412 from citrus-it/curlbloody
curl: update to 7.57.0
2 parents 00e3508 + ba93636 commit 028edb8

File tree

5 files changed

+66
-10
lines changed

5 files changed

+66
-10
lines changed

‎build/curl/build.sh

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/bash
22
#
3-
# CDDL HEADER START
3+
# {{{ CDDL HEADER START
44
#
55
# The contents of this file are subject to the terms of the
66
# Common Development and Distribution License, Version 1.0 only
@@ -18,18 +18,18 @@
1818
# fields enclosed by brackets "[]" replaced with your own identifying
1919
# information: Portions Copyright [yyyy] [name of copyright owner]
2020
#
21-
# CDDL HEADER END
22-
#
21+
# CDDL HEADER END }}}
2322
#
2423
# Copyright 2017 OmniTI Computer Consulting, Inc. All rights reserved.
24+
# Copyright 2017 OmniOS Community Edition (OmniOSce) Association.
2525
# Use is subject to license terms.
2626
#
2727
# Load support functions
2828
. ../../lib/functions.sh
2929

30-
PROG=curl # App name
31-
VER=7.56.1 # App version
32-
PKG=web/curl # Package name (without prefix)
30+
PROG=curl
31+
VER=7.57.0
32+
PKG=web/curl
3333
SUMMARY="$PROG - command line tool for transferring data with URL syntax"
3434
DESC="$SUMMARY"
3535

@@ -39,6 +39,15 @@ CONFIGURE_OPTS="--enable-thread --with-ca-bundle=/etc/ssl/cacert.pem"
3939
# curl actually has arch-dependent headers. Boo.
4040
CONFIGURE_OPTS_64="$CONFIGURE_OPTS_64 --includedir=$PREFIX/include/amd64"
4141

42+
# Build backwards so that the 32-bit version is available for the test-suite.
43+
# Otherwise there are test failures because some tests preload a library
44+
# to override the hostname. If the library is 64-bit then the test aborts
45+
# when runtests.pl calls a 32-bit shell to spawn a sub-process.
46+
build() {
47+
[[ $BUILDARCH =~ ^(64|both)$ ]] && build64
48+
[[ $BUILDARCH =~ ^(32|both)$ ]] && build32
49+
}
50+
4251
LIBTOOL_NOSTDLIB=libtool
4352
TESTSUITE_FILTER="^TEST[A-Z]"
4453

@@ -51,3 +60,6 @@ run_testsuite
5160
make_isa_stub
5261
make_package
5362
clean_up
63+
64+
# Vim hints
65+
# vim:ts=4:sw=4:et:fdm=marker

‎build/curl/patches/series

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
tests.patch

‎build/curl/patches/tests.patch

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
2+
Curl's tests run from perl which invokes curl commands via system().
3+
Perls's system() uses /bin/sh which on OmniOS is a link to the 32-bit
4+
version of ksh93
5+
ksh ends up removing the empty parameter to --[no]proxy without this patch.
6+
7+
Only in curl-7.57.0.patch/tests/data: Makefile
8+
diff -ru curl-7.57.0/tests/data/test1004 curl-7.57.0.patch/tests/data/test1004
9+
--- curl-7.57.0/tests/data/test1004 2017-11-09 22:40:31.000000000 +0000
10+
+++ curl-7.57.0.patch/tests/data/test1004 2017-11-29 15:07:54.375245273 +0000
11+
@@ -36,7 +36,7 @@
12+
HTTP GET with empty proxy
13+
</name>
14+
<command>
15+
-http://%HOSTIP:%HTTPPORT/1004 --proxy ""
16+
+http://%HOSTIP:%HTTPPORT/1004 --proxy "''"
17+
</command>
18+
</client>
19+
20+
diff -ru curl-7.57.0/tests/data/test1254 curl-7.57.0.patch/tests/data/test1254
21+
--- curl-7.57.0/tests/data/test1254 2017-11-09 22:40:36.000000000 +0000
22+
+++ curl-7.57.0.patch/tests/data/test1254 2017-11-29 15:07:34.738745881 +0000
23+
@@ -33,7 +33,7 @@
24+
NO_PROXY=example.com
25+
</setenv>
26+
<command>
27+
-http://somewhere.example.com/1254 --proxy http://%HOSTIP:%HTTPPORT --noproxy ""
28+
+http://somewhere.example.com/1254 --proxy http://%HOSTIP:%HTTPPORT --noproxy "''"
29+
</command>
30+
</client>
31+
32+
diff -ru curl-7.57.0/tests/data/test1257 curl-7.57.0.patch/tests/data/test1257
33+
--- curl-7.57.0/tests/data/test1257 2017-11-09 22:40:36.000000000 +0000
34+
+++ curl-7.57.0.patch/tests/data/test1257 2017-11-29 15:06:40.559644485 +0000
35+
@@ -34,7 +34,7 @@
36+
NO_PROXY=example.com
37+
</setenv>
38+
<command>
39+
-http://somewhere.example.com/1257 --noproxy ""
40+
+http://somewhere.example.com/1257 --noproxy "''"
41+
</command>
42+
</client>
43+

‎build/curl/testsuite.log

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
TESTDONE: 864 tests out of 867 reported OK: 99%
2-
TESTFAIL: These test cases failed: 1004 1254 1257
3-
TESTDONE: 1138 tests were considered during 308 seconds.
1+
TESTDONE: 906 tests out of 907 reported OK: 99%
2+
TESTFAIL: These test cases failed: 1004
3+
TESTDONE: 1164 tests were considered during 308 seconds.

‎doc/packages.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@
8282
| text/gnu-sed | 4.4 | http://git.savannah.gnu.org/cgit/sed.git/refs/tags
8383
| text/groff | 1.22.3 | https://ftp.gnu.org/gnu/groff/
8484
| text/less | 487 | https://ftp.gnu.org/gnu/less/
85-
| web/curl | 7.56.1 | https://curl.haxx.se/download.html
85+
| web/curl | 7.57.0 | https://curl.haxx.se/download.html
8686
| web/wget | 1.19.2 | https://git.savannah.gnu.org/cgit/wget.git/refs/tags
8787
| library/glib2 | 2.54.2 | https://download.gnome.org/sources/glib/cache.json | 2.55.0 is an unstable/dev version.
8888
| developer/gnu-binutils | 2.25 | https://ftp.gnu.org/gnu/binutils | On hold pending illumos fix https://www.illumos.org/issues/6653

0 commit comments

Comments
 (0)