curl: update to 7.60.0

Alexander Pyhalov

2018-05-18 ef64c24e2a36cdbf739b8637d8f30770aec5e685

curl: update to 7.60.0

 components/web/curl/Makefile

@@ -23,13 +23,12 @@
include ../../../make-rules/shared-macros.mk

COMPONENT_NAME =        curl
COMPONENT_VERSION=      7.54.1
COMPONENT_REVISION=    5
COMPONENT_VERSION=      7.60.0
COMPONENT_SRC=          $(COMPONENT_NAME)-$(COMPONENT_VERSION)
COMPONENT_PROJECT_URL=  http://curl.haxx.se/
COMPONENT_ARCHIVE=      $(COMPONENT_SRC).tar.gz
COMPONENT_ARCHIVE_HASH= \
    sha256:cd404b808b253512dafec4fed0fb2cc98370d818a7991826c3021984fc27f9d0
    sha256:e9c37986337743f37fd14fe8737f246e97aec94b39d1b71e8a5973f72a9fc4f5
COMPONENT_ARCHIVE_URL=  $(COMPONENT_PROJECT_URL)download/$(COMPONENT_ARCHIVE)
COMPONENT_SIG_URL=      $(COMPONENT_PROJECT_URL)download/$(COMPONENT_ARCHIVE).asc
COMPONENT_BUGDB=    library/curl
@@ -38,14 +37,16 @@
include $(WS_TOP)/make-rules/configure.mk
include $(WS_TOP)/make-rules/ips.mk

PATCH_LEVEL = 0
# Community code uses different defs
$(BUILD_DIR_32)/.configured:   CPPFLAGS += -D__ILP32=32
$(BUILD_DIR_64)/.configured:   CPPFLAGS += -D__LP64=64

GSSAPI_LIBDIR_32 = /usr/lib
GSSAPI_LIBDIR_64 = /usr/lib/$(MACH64)

CFLAGS += $(CPP_LARGEFILES)
CFLAGS += `pkg-config --cflags libidn`
CPPFLAGS += `pkg-config --cflags libidn`
#CFLAGS += `pkg-config --cflags libidn`
#CPPFLAGS += `pkg-config --cflags libidn`

CONFIGURE_ENV += CPPFLAGS="$(CPPFLAGS) -I/usr/include/openldap"

@@ -62,7 +63,7 @@
CONFIGURE_OPTIONS += --enable-cookies --disable-hidden-symbols
CONFIGURE_OPTIONS += --disable-soname-bump
CONFIGURE_OPTIONS += --enable-ldap --with-random=/dev/urandom
CONFIGURE_OPTIONS += --with-ssl --with-ldap-lib=ldap_r-2.4
CONFIGURE_OPTIONS += --with-ssl=/usr --with-ldap-lib=ldap_r-2.4
CONFIGURE_OPTIONS += --with-lber-lib=lber-2.4
CONFIGURE_OPTIONS += --with-gssapi-includes=/usr/include/gssapi
CONFIGURE_OPTIONS += --with-gssapi-libs=$(GSSAPI_LIBDIR_$(BITS))
@@ -76,10 +77,15 @@

LINT_FLAGS += -I$(SOURCE_DIR)/include

ASLR_MODE = $(ASLR_ENABLE)
# Generate configuration scripts form .am-files
COMPONENT_PREP_ACTION = (cd $(@D) ; $(SHELL) buildconf )

ENV = /usr/bin/env -i
COMPONENT_TEST_ENV += CC="$(CC)"
COMPONENT_TEST_ENV += USER=`id -un`
COMPONENT_TEST_ENV += PATH="$(GCC_ROOT)/bin:$(GNUBIN):$(PATH)"
COMPONENT_TEST_ENV += CFLAGS="$(CFLAGS)"
COMPONENT_TEST_ARGS+= -k -i

build: $(BUILD_32_and_64)

@@ -89,6 +95,7 @@

# Auto-generated dependencies
REQUIRED_PACKAGES += SUNWcs
REQUIRED_PACKAGES += library/brotli
REQUIRED_PACKAGES += library/libidn2
REQUIRED_PACKAGES += library/libssh2
REQUIRED_PACKAGES += library/nghttp2

 components/web/curl/curl.license

File was deleted

 components/web/curl/curl.p5m

@@ -43,8 +43,6 @@
file path=usr/bin/curl
file path=usr/bin/curl-config
file path=usr/include/curl/curl.h
file path=usr/include/curl/curlbuild.h
file path=usr/include/curl/curlrules.h
file path=usr/include/curl/curlver.h
file path=usr/include/curl/easy.h
file path=usr/include/curl/mprintf.h
@@ -52,15 +50,13 @@
file path=usr/include/curl/stdcheaders.h
file path=usr/include/curl/system.h
file path=usr/include/curl/typecheck-gcc.h
link path=usr/lib/$(MACH64)/libcurl.so target=libcurl.so.4.4.0
link path=usr/lib/$(MACH64)/libcurl.so.3 target=libcurl.so.4.4.0
link path=usr/lib/$(MACH64)/libcurl.so.4 target=libcurl.so.4.4.0
file path=usr/lib/$(MACH64)/libcurl.so.4.4.0
link path=usr/lib/$(MACH64)/libcurl.so target=libcurl.so.4.5.0
link path=usr/lib/$(MACH64)/libcurl.so.4 target=libcurl.so.4.5.0
file path=usr/lib/$(MACH64)/libcurl.so.4.5.0
file path=usr/lib/$(MACH64)/pkgconfig/libcurl.pc
link path=usr/lib/libcurl.so target=libcurl.so.4.4.0
link path=usr/lib/libcurl.so.3 target=libcurl.so.4.4.0
link path=usr/lib/libcurl.so.4 target=libcurl.so.4.4.0
file path=usr/lib/libcurl.so.4.4.0
link path=usr/lib/libcurl.so target=libcurl.so.4.5.0
link path=usr/lib/libcurl.so.4 target=libcurl.so.4.5.0
file path=usr/lib/libcurl.so.4.5.0
file path=usr/lib/pkgconfig/libcurl.pc
file path=usr/share/aclocal/libcurl.m4
file path=usr/share/man/man1/curl-config.1
@@ -71,11 +67,14 @@
file path=usr/share/man/man3/CURLINFO_CONDITION_UNMET.3
file path=usr/share/man/man3/CURLINFO_CONNECT_TIME.3
file path=usr/share/man/man3/CURLINFO_CONTENT_LENGTH_DOWNLOAD.3
file path=usr/share/man/man3/CURLINFO_CONTENT_LENGTH_DOWNLOAD_T.3
file path=usr/share/man/man3/CURLINFO_CONTENT_LENGTH_UPLOAD.3
file path=usr/share/man/man3/CURLINFO_CONTENT_LENGTH_UPLOAD_T.3
file path=usr/share/man/man3/CURLINFO_CONTENT_TYPE.3
file path=usr/share/man/man3/CURLINFO_COOKIELIST.3
file path=usr/share/man/man3/CURLINFO_EFFECTIVE_URL.3
file path=usr/share/man/man3/CURLINFO_FILETIME.3
file path=usr/share/man/man3/CURLINFO_FILETIME_T.3
file path=usr/share/man/man3/CURLINFO_FTP_ENTRY_PATH.3
file path=usr/share/man/man3/CURLINFO_HEADER_SIZE.3
file path=usr/share/man/man3/CURLINFO_HTTPAUTH_AVAIL.3
@@ -105,9 +104,13 @@
file path=usr/share/man/man3/CURLINFO_RTSP_SESSION_ID.3
file path=usr/share/man/man3/CURLINFO_SCHEME.3
file path=usr/share/man/man3/CURLINFO_SIZE_DOWNLOAD.3
file path=usr/share/man/man3/CURLINFO_SIZE_DOWNLOAD_T.3
file path=usr/share/man/man3/CURLINFO_SIZE_UPLOAD.3
file path=usr/share/man/man3/CURLINFO_SIZE_UPLOAD_T.3
file path=usr/share/man/man3/CURLINFO_SPEED_DOWNLOAD.3
file path=usr/share/man/man3/CURLINFO_SPEED_DOWNLOAD_T.3
file path=usr/share/man/man3/CURLINFO_SPEED_UPLOAD.3
file path=usr/share/man/man3/CURLINFO_SPEED_UPLOAD_T.3
file path=usr/share/man/man3/CURLINFO_SSL_ENGINES.3
file path=usr/share/man/man3/CURLINFO_SSL_VERIFYRESULT.3
file path=usr/share/man/man3/CURLINFO_STARTTRANSFER_TIME.3
@@ -169,6 +172,7 @@
file path=usr/share/man/man3/CURLOPT_DNS_LOCAL_IP4.3
file path=usr/share/man/man3/CURLOPT_DNS_LOCAL_IP6.3
file path=usr/share/man/man3/CURLOPT_DNS_SERVERS.3
file path=usr/share/man/man3/CURLOPT_DNS_SHUFFLE_ADDRESSES.3
file path=usr/share/man/man3/CURLOPT_DNS_USE_GLOBAL_CACHE.3
file path=usr/share/man/man3/CURLOPT_EGDSOCKET.3
file path=usr/share/man/man3/CURLOPT_ERRORBUFFER.3
@@ -193,6 +197,8 @@
file path=usr/share/man/man3/CURLOPT_FTP_USE_EPSV.3
file path=usr/share/man/man3/CURLOPT_FTP_USE_PRET.3
file path=usr/share/man/man3/CURLOPT_GSSAPI_DELEGATION.3
file path=usr/share/man/man3/CURLOPT_HAPPY_EYEBALLS_TIMEOUT_MS.3
file path=usr/share/man/man3/CURLOPT_HAPROXYPROTOCOL.3
file path=usr/share/man/man3/CURLOPT_HEADER.3
file path=usr/share/man/man3/CURLOPT_HEADERDATA.3
file path=usr/share/man/man3/CURLOPT_HEADERFUNCTION.3
@@ -233,6 +239,7 @@
file path=usr/share/man/man3/CURLOPT_MAXREDIRS.3
file path=usr/share/man/man3/CURLOPT_MAX_RECV_SPEED_LARGE.3
file path=usr/share/man/man3/CURLOPT_MAX_SEND_SPEED_LARGE.3
file path=usr/share/man/man3/CURLOPT_MIMEPOST.3
file path=usr/share/man/man3/CURLOPT_NETRC.3
file path=usr/share/man/man3/CURLOPT_NETRC_FILE.3
file path=usr/share/man/man3/CURLOPT_NEW_DIRECTORY_PERMS.3
@@ -295,7 +302,10 @@
file path=usr/share/man/man3/CURLOPT_READFUNCTION.3
file path=usr/share/man/man3/CURLOPT_REDIR_PROTOCOLS.3
file path=usr/share/man/man3/CURLOPT_REFERER.3
file path=usr/share/man/man3/CURLOPT_REQUEST_TARGET.3
file path=usr/share/man/man3/CURLOPT_RESOLVE.3
file path=usr/share/man/man3/CURLOPT_RESOLVER_START_DATA.3
file path=usr/share/man/man3/CURLOPT_RESOLVER_START_FUNCTION.3
file path=usr/share/man/man3/CURLOPT_RESUME_FROM.3
file path=usr/share/man/man3/CURLOPT_RESUME_FROM_LARGE.3
file path=usr/share/man/man3/CURLOPT_RTSP_CLIENT_CSEQ.3
@@ -311,9 +321,11 @@
file path=usr/share/man/man3/CURLOPT_SHARE.3
file path=usr/share/man/man3/CURLOPT_SOCKOPTDATA.3
file path=usr/share/man/man3/CURLOPT_SOCKOPTFUNCTION.3
file path=usr/share/man/man3/CURLOPT_SOCKS5_AUTH.3
file path=usr/share/man/man3/CURLOPT_SOCKS5_GSSAPI_NEC.3
file path=usr/share/man/man3/CURLOPT_SOCKS5_GSSAPI_SERVICE.3
file path=usr/share/man/man3/CURLOPT_SSH_AUTH_TYPES.3
file path=usr/share/man/man3/CURLOPT_SSH_COMPRESSION.3
file path=usr/share/man/man3/CURLOPT_SSH_HOST_PUBLIC_KEY_MD5.3
file path=usr/share/man/man3/CURLOPT_SSH_KEYDATA.3
file path=usr/share/man/man3/CURLOPT_SSH_KEYFUNCTION.3
@@ -355,6 +367,7 @@
file path=usr/share/man/man3/CURLOPT_TIMEOUT.3
file path=usr/share/man/man3/CURLOPT_TIMEOUT_MS.3
file path=usr/share/man/man3/CURLOPT_TIMEVALUE.3
file path=usr/share/man/man3/CURLOPT_TIMEVALUE_LARGE.3
file path=usr/share/man/man3/CURLOPT_TLSAUTH_PASSWORD.3
file path=usr/share/man/man3/CURLOPT_TLSAUTH_TYPE.3
file path=usr/share/man/man3/CURLOPT_TLSAUTH_USERNAME.3
@@ -398,6 +411,19 @@
file path=usr/share/man/man3/curl_global_cleanup.3
file path=usr/share/man/man3/curl_global_init.3
file path=usr/share/man/man3/curl_global_init_mem.3
file path=usr/share/man/man3/curl_global_sslset.3
file path=usr/share/man/man3/curl_mime_addpart.3
file path=usr/share/man/man3/curl_mime_data.3
file path=usr/share/man/man3/curl_mime_data_cb.3
file path=usr/share/man/man3/curl_mime_encoder.3
file path=usr/share/man/man3/curl_mime_filedata.3
file path=usr/share/man/man3/curl_mime_filename.3
file path=usr/share/man/man3/curl_mime_free.3
file path=usr/share/man/man3/curl_mime_headers.3
file path=usr/share/man/man3/curl_mime_init.3
file path=usr/share/man/man3/curl_mime_name.3
file path=usr/share/man/man3/curl_mime_subparts.3
file path=usr/share/man/man3/curl_mime_type.3
file path=usr/share/man/man3/curl_mprintf.3
file path=usr/share/man/man3/curl_multi_add_handle.3
file path=usr/share/man/man3/curl_multi_assign.3
@@ -421,15 +447,18 @@
file path=usr/share/man/man3/curl_slist_append.3
file path=usr/share/man/man3/curl_slist_free_all.3
file path=usr/share/man/man3/curl_strequal.3
file path=usr/share/man/man3/curl_strnequal.3
file path=usr/share/man/man3/curl_unescape.3
file path=usr/share/man/man3/curl_version.3
file path=usr/share/man/man3/curl_version_info.3
file path=usr/share/man/man3/libcurl-easy.3
file path=usr/share/man/man3/libcurl-env.3
file path=usr/share/man/man3/libcurl-errors.3
file path=usr/share/man/man3/libcurl-multi.3
file path=usr/share/man/man3/libcurl-security.3
file path=usr/share/man/man3/libcurl-share.3
file path=usr/share/man/man3/libcurl-symbols.3
file path=usr/share/man/man3/libcurl-thread.3
file path=usr/share/man/man3/libcurl-tutorial.3
file path=usr/share/man/man3/libcurl.3
license curl.license license=CURL
license COPYING license=CURL

 components/web/curl/manifests/sample-manifest.p5m

@@ -10,7 +10,7 @@
#

#
# Copyright 2016 <contributor>
# Copyright 2017 <contributor>
#

set name=pkg.fmri value=pkg:/$(COMPONENT_FMRI)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
@@ -27,8 +27,6 @@
file path=usr/bin/curl
file path=usr/bin/curl-config
file path=usr/include/curl/curl.h
file path=usr/include/curl/curlbuild.h
file path=usr/include/curl/curlrules.h
file path=usr/include/curl/curlver.h
file path=usr/include/curl/easy.h
file path=usr/include/curl/mprintf.h
@@ -36,13 +34,13 @@
file path=usr/include/curl/stdcheaders.h
file path=usr/include/curl/system.h
file path=usr/include/curl/typecheck-gcc.h
link path=usr/lib/$(MACH64)/libcurl.so target=libcurl.so.4.4.0
link path=usr/lib/$(MACH64)/libcurl.so.4 target=libcurl.so.4.4.0
file path=usr/lib/$(MACH64)/libcurl.so.4.4.0
link path=usr/lib/$(MACH64)/libcurl.so target=libcurl.so.4.5.0
link path=usr/lib/$(MACH64)/libcurl.so.4 target=libcurl.so.4.5.0
file path=usr/lib/$(MACH64)/libcurl.so.4.5.0
file path=usr/lib/$(MACH64)/pkgconfig/libcurl.pc
link path=usr/lib/libcurl.so target=libcurl.so.4.4.0
link path=usr/lib/libcurl.so.4 target=libcurl.so.4.4.0
file path=usr/lib/libcurl.so.4.4.0
link path=usr/lib/libcurl.so target=libcurl.so.4.5.0
link path=usr/lib/libcurl.so.4 target=libcurl.so.4.5.0
file path=usr/lib/libcurl.so.4.5.0
file path=usr/lib/pkgconfig/libcurl.pc
file path=usr/share/aclocal/libcurl.m4
file path=usr/share/man/man1/curl-config.1
@@ -53,11 +51,14 @@
file path=usr/share/man/man3/CURLINFO_CONDITION_UNMET.3
file path=usr/share/man/man3/CURLINFO_CONNECT_TIME.3
file path=usr/share/man/man3/CURLINFO_CONTENT_LENGTH_DOWNLOAD.3
file path=usr/share/man/man3/CURLINFO_CONTENT_LENGTH_DOWNLOAD_T.3
file path=usr/share/man/man3/CURLINFO_CONTENT_LENGTH_UPLOAD.3
file path=usr/share/man/man3/CURLINFO_CONTENT_LENGTH_UPLOAD_T.3
file path=usr/share/man/man3/CURLINFO_CONTENT_TYPE.3
file path=usr/share/man/man3/CURLINFO_COOKIELIST.3
file path=usr/share/man/man3/CURLINFO_EFFECTIVE_URL.3
file path=usr/share/man/man3/CURLINFO_FILETIME.3
file path=usr/share/man/man3/CURLINFO_FILETIME_T.3
file path=usr/share/man/man3/CURLINFO_FTP_ENTRY_PATH.3
file path=usr/share/man/man3/CURLINFO_HEADER_SIZE.3
file path=usr/share/man/man3/CURLINFO_HTTPAUTH_AVAIL.3
@@ -87,9 +88,13 @@
file path=usr/share/man/man3/CURLINFO_RTSP_SESSION_ID.3
file path=usr/share/man/man3/CURLINFO_SCHEME.3
file path=usr/share/man/man3/CURLINFO_SIZE_DOWNLOAD.3
file path=usr/share/man/man3/CURLINFO_SIZE_DOWNLOAD_T.3
file path=usr/share/man/man3/CURLINFO_SIZE_UPLOAD.3
file path=usr/share/man/man3/CURLINFO_SIZE_UPLOAD_T.3
file path=usr/share/man/man3/CURLINFO_SPEED_DOWNLOAD.3
file path=usr/share/man/man3/CURLINFO_SPEED_DOWNLOAD_T.3
file path=usr/share/man/man3/CURLINFO_SPEED_UPLOAD.3
file path=usr/share/man/man3/CURLINFO_SPEED_UPLOAD_T.3
file path=usr/share/man/man3/CURLINFO_SSL_ENGINES.3
file path=usr/share/man/man3/CURLINFO_SSL_VERIFYRESULT.3
file path=usr/share/man/man3/CURLINFO_STARTTRANSFER_TIME.3
@@ -151,6 +156,7 @@
file path=usr/share/man/man3/CURLOPT_DNS_LOCAL_IP4.3
file path=usr/share/man/man3/CURLOPT_DNS_LOCAL_IP6.3
file path=usr/share/man/man3/CURLOPT_DNS_SERVERS.3
file path=usr/share/man/man3/CURLOPT_DNS_SHUFFLE_ADDRESSES.3
file path=usr/share/man/man3/CURLOPT_DNS_USE_GLOBAL_CACHE.3
file path=usr/share/man/man3/CURLOPT_EGDSOCKET.3
file path=usr/share/man/man3/CURLOPT_ERRORBUFFER.3
@@ -175,6 +181,8 @@
file path=usr/share/man/man3/CURLOPT_FTP_USE_EPSV.3
file path=usr/share/man/man3/CURLOPT_FTP_USE_PRET.3
file path=usr/share/man/man3/CURLOPT_GSSAPI_DELEGATION.3
file path=usr/share/man/man3/CURLOPT_HAPPY_EYEBALLS_TIMEOUT_MS.3
file path=usr/share/man/man3/CURLOPT_HAPROXYPROTOCOL.3
file path=usr/share/man/man3/CURLOPT_HEADER.3
file path=usr/share/man/man3/CURLOPT_HEADERDATA.3
file path=usr/share/man/man3/CURLOPT_HEADERFUNCTION.3
@@ -215,6 +223,7 @@
file path=usr/share/man/man3/CURLOPT_MAXREDIRS.3
file path=usr/share/man/man3/CURLOPT_MAX_RECV_SPEED_LARGE.3
file path=usr/share/man/man3/CURLOPT_MAX_SEND_SPEED_LARGE.3
file path=usr/share/man/man3/CURLOPT_MIMEPOST.3
file path=usr/share/man/man3/CURLOPT_NETRC.3
file path=usr/share/man/man3/CURLOPT_NETRC_FILE.3
file path=usr/share/man/man3/CURLOPT_NEW_DIRECTORY_PERMS.3
@@ -277,7 +286,10 @@
file path=usr/share/man/man3/CURLOPT_READFUNCTION.3
file path=usr/share/man/man3/CURLOPT_REDIR_PROTOCOLS.3
file path=usr/share/man/man3/CURLOPT_REFERER.3
file path=usr/share/man/man3/CURLOPT_REQUEST_TARGET.3
file path=usr/share/man/man3/CURLOPT_RESOLVE.3
file path=usr/share/man/man3/CURLOPT_RESOLVER_START_DATA.3
file path=usr/share/man/man3/CURLOPT_RESOLVER_START_FUNCTION.3
file path=usr/share/man/man3/CURLOPT_RESUME_FROM.3
file path=usr/share/man/man3/CURLOPT_RESUME_FROM_LARGE.3
file path=usr/share/man/man3/CURLOPT_RTSP_CLIENT_CSEQ.3
@@ -293,9 +305,11 @@
file path=usr/share/man/man3/CURLOPT_SHARE.3
file path=usr/share/man/man3/CURLOPT_SOCKOPTDATA.3
file path=usr/share/man/man3/CURLOPT_SOCKOPTFUNCTION.3
file path=usr/share/man/man3/CURLOPT_SOCKS5_AUTH.3
file path=usr/share/man/man3/CURLOPT_SOCKS5_GSSAPI_NEC.3
file path=usr/share/man/man3/CURLOPT_SOCKS5_GSSAPI_SERVICE.3
file path=usr/share/man/man3/CURLOPT_SSH_AUTH_TYPES.3
file path=usr/share/man/man3/CURLOPT_SSH_COMPRESSION.3
file path=usr/share/man/man3/CURLOPT_SSH_HOST_PUBLIC_KEY_MD5.3
file path=usr/share/man/man3/CURLOPT_SSH_KEYDATA.3
file path=usr/share/man/man3/CURLOPT_SSH_KEYFUNCTION.3
@@ -337,6 +351,7 @@
file path=usr/share/man/man3/CURLOPT_TIMEOUT.3
file path=usr/share/man/man3/CURLOPT_TIMEOUT_MS.3
file path=usr/share/man/man3/CURLOPT_TIMEVALUE.3
file path=usr/share/man/man3/CURLOPT_TIMEVALUE_LARGE.3
file path=usr/share/man/man3/CURLOPT_TLSAUTH_PASSWORD.3
file path=usr/share/man/man3/CURLOPT_TLSAUTH_TYPE.3
file path=usr/share/man/man3/CURLOPT_TLSAUTH_USERNAME.3
@@ -380,6 +395,19 @@
file path=usr/share/man/man3/curl_global_cleanup.3
file path=usr/share/man/man3/curl_global_init.3
file path=usr/share/man/man3/curl_global_init_mem.3
file path=usr/share/man/man3/curl_global_sslset.3
file path=usr/share/man/man3/curl_mime_addpart.3
file path=usr/share/man/man3/curl_mime_data.3
file path=usr/share/man/man3/curl_mime_data_cb.3
file path=usr/share/man/man3/curl_mime_encoder.3
file path=usr/share/man/man3/curl_mime_filedata.3
file path=usr/share/man/man3/curl_mime_filename.3
file path=usr/share/man/man3/curl_mime_free.3
file path=usr/share/man/man3/curl_mime_headers.3
file path=usr/share/man/man3/curl_mime_init.3
file path=usr/share/man/man3/curl_mime_name.3
file path=usr/share/man/man3/curl_mime_subparts.3
file path=usr/share/man/man3/curl_mime_type.3
file path=usr/share/man/man3/curl_mprintf.3
file path=usr/share/man/man3/curl_multi_add_handle.3
file path=usr/share/man/man3/curl_multi_assign.3
@@ -403,12 +431,15 @@
file path=usr/share/man/man3/curl_slist_append.3
file path=usr/share/man/man3/curl_slist_free_all.3
file path=usr/share/man/man3/curl_strequal.3
file path=usr/share/man/man3/curl_strnequal.3
file path=usr/share/man/man3/curl_unescape.3
file path=usr/share/man/man3/curl_version.3
file path=usr/share/man/man3/curl_version_info.3
file path=usr/share/man/man3/libcurl-easy.3
file path=usr/share/man/man3/libcurl-env.3
file path=usr/share/man/man3/libcurl-errors.3
file path=usr/share/man/man3/libcurl-multi.3
file path=usr/share/man/man3/libcurl-security.3
file path=usr/share/man/man3/libcurl-share.3
file path=usr/share/man/man3/libcurl-symbols.3
file path=usr/share/man/man3/libcurl-thread.3

 components/web/curl/patches/000-configure.ac.patch

New file
@@ -0,0 +1,21 @@
--- curl-7.60.0/configure.ac.1    2018-05-17 19:52:38.637214847 +0000
+++ curl-7.60.0/configure.ac    2018-05-17 19:56:10.531967993 +0000
@@ -1401,6 +1401,9 @@
            *-hp-hpux*)
               gss_libname="gss"
               ;;
+           *sunos*)
+              gss_libname="gss"
+              ;;
            *)
               gss_libname="gssapi"
               ;;
@@ -1422,7 +1425,7 @@
         LIBS="-lgss $LIBS"
         ;;
      *)
-        LIBS="-lgssapi $LIBS"
+        LIBS="-lgss $LIBS"
         ;;
      esac
   fi

 components/web/curl/patches/000-configure.patch

File was deleted

 components/web/curl/patches/001-culbuild.h.patch

File was deleted

 components/web/curl/patches/002-system.h.patch

File was deleted

 components/web/curl/patches/003-Makefile.in.patch

File was deleted

 components/web/curl/patches/004-Makefile.in.patch

File was deleted

 components/web/curl/patches/005-libcurl.pc.in.patch

@@ -1,16 +1,16 @@
Provide the correct Solaris curl include directory.

This patch should be send upstream, but needs to be reworked into something
that they will accept.
This patch will not be send upstream because pkf-config (.pc) files
are not able to supress of emit of -L -R -I options for standard
paths by an efficient way also for MACH64 .

--- libcurl.pc.in.orig    2014-09-10 12:23:52.455848654 -0700
+++ libcurl.pc.in    2014-09-10 12:24:13.252589181 -0700
@@ -26,7 +26,7 @@
 prefix=@prefix@
 exec_prefix=@exec_prefix@
 libdir=@libdir@
-includedir=@includedir@
+includedir=@includedir@/curl
 supported_protocols="@SUPPORT_PROTOCOLS@"
 supported_features="@SUPPORT_FEATURES@"
 
--- a/libcurl.pc.in    2017-10-22 22:51:20.000000000 +0000
+++ b/libcurl.pc.in    2017-10-28 07:20:28.247666668 +0000
@@ -34,6 +34,6 @@
 URL: https://curl.haxx.se/
 Description: Library to transfer files with ftp, http, etc.
 Version: @CURLVERSION@
-Libs: -L${libdir} -lcurl
+Libs: -lcurl
 Libs.private: @LIBCURL_LIBS@
-Cflags: -I${includedir} @CPPFLAG_CURL_STATICLIB@
+Cflags: @CPPFLAG_CURL_STATICLIB@

 components/web/curl/patches/009-runtests.pl.patch

@@ -4,12 +4,16 @@

This patch adjusts LD_PRELOAD to be LD_PRELOAD_32 or LD_PRELOAD_64
depending upong whether we are running the 32 or 64 bit tests.
This is required because during testing are the compiled binaries
executed via shell wrapper. The shell in shebang line is #!/bin/sh which
is 64bit binary and fails when you try to preload 32bit binary via
LD_PRELOAD.

As this is Solaris specific, this patch will not be pushed upstream.

--- tests/runtests.pl.orig    2014-09-10 12:26:52.624143266 -0700
+++ tests/runtests.pl    2014-09-10 16:51:13.663390869 -0700
@@ -3060,6 +3060,12 @@
--- a/tests/runtests.pl    2017-10-04 05:47:09.000000000 +0000
+++ b/tests/runtests.pl    2017-10-20 05:20:40.459651061 +0000
@@ -3657,6 +3657,12 @@
                             # print "Skipping LD_PRELOAD due to no release shared build\n";
                             next;
                         }

 components/web/curl/patches/010-fix-tests.patch

File was deleted

 components/web/curl/patches/011-CVE-2017-1000099.patch

File was deleted

 components/web/curl/patches/012-CVE-2017-1000100.patch

File was deleted

 components/web/curl/patches/013-CVE-2017-1000101.patch

File was deleted

 components/web/curl/patches/014-CVE-2017-1000254.patch

File was deleted

 components/web/curl/patches/015-CVE-2017-1000257.patch

File was deleted

 components/web/curl/patches/016-CVE-2017-8816.patch

File was deleted

 components/web/curl/patches/017-CVE-2017-8817.patch

File was deleted

 components/web/curl/patches/018-CVE-2018-1000005.patch

File was deleted

 components/web/curl/patches/019-CVE-2018-1000007.patch

File was deleted

 components/web/curl/patches/020-fix-tests.patch

File was deleted

 components/web/curl/patches/021-CVE-2018-1000120-pre.patch

File was deleted

 components/web/curl/patches/022-CVE-2018-1000120.patch

File was deleted

 components/web/curl/patches/023-CVE-2018-1000121.patch

File was deleted

 components/web/curl/patches/024-CVE-2018-1000122.patch

File was deleted