Merge tag 'curl-7_62_0'

7.62.0

Signed-off-by: Nils Gillmann <ng0@n0.is>

23 files changed, 44 insertions, 136 deletions

diff --git a/packages/AIX/RPM/Makefile.am b/packages/AIX/RPM/Makefile.am
index d1e7bf9d9..71e854ff8 100644
--- a/packages/AIX/RPM/Makefile.am
+++ b/packages/AIX/RPM/Makefile.am
@@ -1,2 +1 @@
 EXTRA_DIST = README curl.spec.in
-
diff --git a/packages/AIX/RPM/README b/packages/AIX/RPM/README
index 51615ad4c..c2c31bd83 100644
--- a/packages/AIX/RPM/README
+++ b/packages/AIX/RPM/README
@@ -14,7 +14,7 @@ The AIX Toolbox setup (installs into /opt/freeware, with symlinks in
 /usr/bin,/usr/lib,/usr/include) are based on IBM's aixtoolbox spec
 file written by David Clissold <cliss@austin.ibm.com>, see
 
-ftp://ftp.software.ibm.com/aixtoolbox/SPECS/curl-7.9.3-2.spec
+https://public.dhe.ibm.com/aix/freeSoftware/aixtoolbox/SPECS/curl-7.61.0-1.spec
 
 This spec file is designed to be a drop-in replacement for the
 old spec file found at the above link. Thus, like the old spec file
@@ -30,4 +30,3 @@ Lastly, the spec file expects the Curl source distribution file to be
 in .tar.bz2 format.
 
 The nifty curl header of this README is a ripoff of the vms/readme file.
-
diff --git a/packages/Android/Android.mk b/packages/Android/Android.mk
index b20bd31c0..2b95dddff 100644
--- a/packages/Android/Android.mk
+++ b/packages/Android/Android.mk
@@ -59,14 +59,14 @@ common_CFLAGS := -Wpointer-arith -Wwrite-strings -Wunused -Winline -Wnested-exte
 include $(CLEAR_VARS)
 include $(LOCAL_PATH)/lib/Makefile.inc
 CURL_HEADERS := \
-	curl.h \
-	system.h \
-	curlver.h \
-	easy.h \
-	mprintf.h \
-	multi.h \
-	stdcheaders.h \
-	typecheck-gcc.h
+  curl.h \
+  system.h \
+  curlver.h \
+  easy.h \
+  mprintf.h \
+  multi.h \
+  stdcheaders.h \
+  typecheck-gcc.h
 
 LOCAL_SRC_FILES := $(addprefix lib/,$(CSOURCES))
 LOCAL_C_INCLUDES += $(LOCAL_PATH)/include/
@@ -108,4 +108,3 @@ LOCAL_C_INCLUDES += $(LOCAL_PATH)/include $(LOCAL_PATH)/lib
 LOCAL_CFLAGS += $(common_CFLAGS)
 
 include $(BUILD_EXECUTABLE)
-
diff --git a/packages/EPM/.gitignore b/packages/EPM/.gitignore
deleted file mode 100644
index 505a4fdfd..000000000
--- a/packages/EPM/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-curl.list
diff --git a/packages/EPM/Makefile.am b/packages/EPM/Makefile.am
deleted file mode 100644
index b010a4b03..000000000
--- a/packages/EPM/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-AUTOMAKE_OPTIONS = foreign
-
-EXTRA_DIST = README curl.list.in
diff --git a/packages/EPM/README b/packages/EPM/README
deleted file mode 100644
index 0b031e84f..000000000
--- a/packages/EPM/README
+++ /dev/null
@@ -1,12 +0,0 @@
-EPM is a free Unix software/file packaging program that generates distribution
-archives from a list of files. EPM Can:
-
- * Generate portable script-based distribution packages complete with
-   installation and removal scripts.
- * Generate vendor distributions in AIX, BSD, Compaq Tru64, Debian, HP-UX,
-   IRIX, Red Hat, and Solaris formats.
- * Provide a complete, cross-platform software distribution solution for your
-   applications.
-
-http://www.easysw.com/epm/
-
diff --git a/packages/EPM/curl.list.in b/packages/EPM/curl.list.in
deleted file mode 100644
index 0311bc726..000000000
--- a/packages/EPM/curl.list.in
+++ /dev/null
@@ -1,60 +0,0 @@
-# Directories...
-$prefix=@prefix@
-$exec_prefix=@exec_prefix@
-$bindir=@bindir@
-$confdir=@sysconfdir@
-$docdir=@prefix@/doc
-$mandir=@mandir@
-$libdir=@libdir@
-$srcdir=@top_srcdir@
-$includedir=@includedir@
-$datarootdir=@datarootdir@
-
-# Product information
-%product curl
-%copyright 1998-2002 by Daniel Stenberg
-%vendor Daniel Stenberg, <daniel@haxx.se>
-%license ${srcdir}/MITX.txt
-%readme ${srcdir}/README
-%description Curl is a command line tool for transferring data specified
-%description with URL syntax
-%version @VERSION@
-%packager Giuseppe "Cowo" Corbelli <cowo@lugbs.linux.it>
-
-f 0644 cowo pppusers ${mandir}/man1/curl.1 ./docs/curl.1
-f 0644 cowo pppusers ${mandir}/man1/curl-config.1 ./docs/curl-config.1
-f 0644 cowo pppusers ${mandir}/man1/mk-ca-bundle.1 ./docs/mk-ca-bundle.1
-f 0644 cowo pppusers ${mandir}/man3/curl_easy_cleanup.3 ./docs/curl_easy_cleanup.3
-f 0644 cowo pppusers ${mandir}/man3/curl_easy_getinfo.3 ./docs/curl_easy_getinfo.3
-f 0644 cowo pppusers ${mandir}/man3/curl_easy_init.3 ./docs/curl_easy_init.3
-f 0644 cowo pppusers ${mandir}/man3/curl_easy_perform.3 ./docs/curl_easy_perform.3
-f 0644 cowo pppusers ${mandir}/man3/curl_easy_setopt.3 ./docs/curl_easy_setopt.3
-f 0644 cowo pppusers ${mandir}/man3/curl_easy_duphandle.3 ./docs/curl_easy_duphandle.3
-f 0644 cowo pppusers ${mandir}/man3/curl_formparse.3 ./docs/curl_formparse.3
-f 0644 cowo pppusers ${mandir}/man3/curl_formadd.3 ./docs/curl_formadd.3
-f 0644 cowo pppusers ${mandir}/man3/curl_formfree.3 ./docs/curl_formfree.3
-f 0644 cowo pppusers ${mandir}/man3/curl_getdate.3 ./docs/curl_getdate.3
-f 0644 cowo pppusers ${mandir}/man3/curl_getenv.3 ./docs/curl_getenv.3
-f 0644 cowo pppusers ${mandir}/man3/curl_slist_append.3 ./docs/curl_slist_append.3
-f 0644 cowo pppusers ${mandir}/man3/curl_slist_free_all.3 ./docs/curl_slist_free_all.3
-f 0644 cowo pppusers ${mandir}/man3/curl_version.3 ./docs/curl_version.3
-f 0644 cowo pppusers ${mandir}/man3/curl_escape.3 ./docs/curl_escape.3
-f 0644 cowo pppusers ${mandir}/man3/curl_unescape.3 ./docs/curl_unescape.3
-f 0644 cowo pppusers ${mandir}/man3/curl_strequal.3 ./docs/curl_strequal.3
-f 0644 cowo pppusers ${mandir}/man3/curl_strnequal.3 ./docs/curl_strnequal.3
-f 0644 cowo pppusers ${mandir}/man3/curl_mprintf.3 ./docs/curl_mprintf.3
-f 0644 cowo pppusers ${mandir}/man3/curl_global_init.3 ./docs/curl_global_init.3
-f 0644 cowo pppusers ${mandir}/man3/curl_global_cleanup.3 ./docs/curl_global_cleanup.3
-f 0644 cowo pppusers ${mandir}/man3/libcurl.3 ./docs/libcurl.3
-f 0755 cowo pppusers ${libdir}/libcurl.so.2.0.2 ./lib/.libs/libcurl.so.2.0.2
-f 0755 cowo pppusers ${libdir}/libcurl.la ./lib/libcurl.la
-f 0755 cowo pppusers ${libdir}/libcurl.la ./lib/.libs/libcurl.la
-f 0644 cowo pppusers ${libdir}/libcurl.a ./lib/.libs/libcurl.a
-f 0755 cowo pppusers ${bindir}/curl ./src/curl
-f 0755 cowo pppusers ${bindir}/curl ./src/.libs/curl
-f 0644 cowo pppusers ${includedir}/gnurl/curl.h ./include/gnurl/curl.h
-f 0644 cowo pppusers ${includedir}/gnurl/easy.h ./include/gnurl/easy.h
-f 0644 cowo pppusers ${includedir}/gnurl/mprintf.h ./include/gnurl/mprintf.h
-f 0644 cowo pppusers ${includedir}/gnurl/stdcheaders.h ./include/gnurl/stdcheaders.h
-f 0644 cowo pppusers ${includedir}/gnurl/types.h ./include/gnurl/types.h
-f 0755 cowo pppusers ${bindir}/curl-config ./curl-config
diff --git a/packages/Linux/RPM/Makefile.am b/packages/Linux/RPM/Makefile.am
index 5d46d87c6..89f43d5e8 100644
--- a/packages/Linux/RPM/Makefile.am
+++ b/packages/Linux/RPM/Makefile.am
@@ -1,2 +1 @@
 EXTRA_DIST = README curl-ssl.spec.in curl.spec.in make_curl_rpm
-
diff --git a/packages/Linux/RPM/README b/packages/Linux/RPM/README
index a48ece043..a6936ba56 100644
--- a/packages/Linux/RPM/README
+++ b/packages/Linux/RPM/README
@@ -2,4 +2,3 @@ Author: Daniel (I'm not trustworthy, replace this!)
 
 Paul Marquis's 'make_curl_rpm' script is a fine example on how to automate the
 jobs. You need to fill in your own name and email at least.
-
diff --git a/packages/Linux/RPM/curl.spec.in b/packages/Linux/RPM/curl.spec.in
index 59577b04f..7d0b91800 100644
--- a/packages/Linux/RPM/curl.spec.in
+++ b/packages/Linux/RPM/curl.spec.in
@@ -81,4 +81,3 @@ rm -rf %{builddir}
 
         - use _mandir instead of prefix to locate man pages because
 	  _mandir is not always prefix/man/man?.
-
diff --git a/packages/Makefile.am b/packages/Makefile.am
index bef04f3c2..b2e7228c9 100644
--- a/packages/Makefile.am
+++ b/packages/Makefile.am
@@ -1,33 +1,33 @@
-SUBDIRS = Win32 Linux Solaris EPM AIX vms
+SUBDIRS = Win32 Linux Solaris AIX vms
 
-EXTRA_DIST = README 			\
-	DOS/README 			\
-	DOS/common.dj 			\
-	NetWare/get_ver.awk 		\
-	NetWare/get_exp.awk 		\
-	OS400/README.OS400 		\
-	OS400/ccsidcurl.c 		\
-	OS400/ccsidcurl.h 		\
-	OS400/curl.inc.in 		\
-	OS400/initscript.sh 		\
-	OS400/make-include.sh 		\
-	OS400/make-lib.sh 		\
-	OS400/make-src.sh 		\
-	OS400/make-tests.sh 		\
-	OS400/makefile.sh 		\
-	OS400/os400sys.c 		\
-	OS400/os400sys.h 		\
-	Symbian/bwins/libcurlu.def 	\
-	Symbian/eabi/libcurlu.def 	\
-	Symbian/group/bld.inf 		\
-	Symbian/group/curl.iby 		\
-	Symbian/group/curl.mmp 		\
-	Symbian/group/curl.pkg 		\
-	Symbian/group/libcurl.iby 	\
-	Symbian/group/libcurl.mmp 	\
-	Symbian/group/libcurl.pkg 	\
-	Symbian/readme.txt 		\
-	TPF/curl.mak 			\
-	TPF/maketpf.env_curl 		\
-	TPF/maketpf.env_curllib         \
-	Android/Android.mk
+EXTRA_DIST = README \
+  DOS/README \
+  DOS/common.dj \
+  NetWare/get_ver.awk \
+  NetWare/get_exp.awk \
+  OS400/README.OS400 \
+  OS400/ccsidcurl.c \
+  OS400/ccsidcurl.h \
+  OS400/curl.inc.in \
+  OS400/initscript.sh \
+  OS400/make-include.sh \
+  OS400/make-lib.sh \
+  OS400/make-src.sh \
+  OS400/make-tests.sh \
+  OS400/makefile.sh \
+  OS400/os400sys.c \
+  OS400/os400sys.h \
+  Symbian/bwins/libcurlu.def \
+  Symbian/eabi/libcurlu.def \
+  Symbian/group/bld.inf \
+  Symbian/group/curl.iby \
+  Symbian/group/curl.mmp \
+  Symbian/group/curl.pkg \
+  Symbian/group/libcurl.iby \
+  Symbian/group/libcurl.mmp \
+  Symbian/group/libcurl.pkg \
+  Symbian/readme.txt \
+  TPF/curl.mak \
+  TPF/maketpf.env_curl \
+  TPF/maketpf.env_curllib \
+  Android/Android.mk
diff --git a/packages/NetWare/get_exp.awk b/packages/NetWare/get_exp.awk
index 566e891e0..9bbb012ac 100644
--- a/packages/NetWare/get_exp.awk
+++ b/packages/NetWare/get_exp.awk
@@ -69,4 +69,3 @@ END {
   }
   printf(" %s\n", exports[++x])
 }
-
diff --git a/packages/NetWare/get_ver.awk b/packages/NetWare/get_ver.awk
index 03ee5ec62..2db2be98f 100644
--- a/packages/NetWare/get_ver.awk
+++ b/packages/NetWare/get_ver.awk
@@ -41,4 +41,3 @@ BEGIN {
   print "LIBCURL_VERSION_STR = " version_string
   print "LIBCURL_COPYRIGHT_STR = " copyright_string
 }
-
diff --git a/packages/OS400/curl.inc.in b/packages/OS400/curl.inc.in
index 8b150ed88..2cf7899bd 100644
--- a/packages/OS400/curl.inc.in
+++ b/packages/OS400/curl.inc.in
@@ -1598,6 +1598,8 @@
      d                 c                   10
      d  CURLSSLBACKEND_MBEDTLS...
      d                 c                   11
+     d  CURLSSLBACKEND_MESALINK...
+     d                 c                   12
       * Aliases for clones.
      d  CURLSSLBACKEND_LIBRESSL...
      d                 c                   1
diff --git a/packages/Symbian/bwins/libcurlu.def b/packages/Symbian/bwins/libcurlu.def
index 035df1352..7f30b7feb 100644
--- a/packages/Symbian/bwins/libcurlu.def
+++ b/packages/Symbian/bwins/libcurlu.def
@@ -58,4 +58,3 @@ EXPORTS
 	curl_easy_recv @ 57 NONAME
 	curl_easy_send @ 58 NONAME
 	curl_multi_wait @ 59 NONAME
-
diff --git a/packages/Symbian/eabi/libcurlu.def b/packages/Symbian/eabi/libcurlu.def
index 035df1352..7f30b7feb 100644
--- a/packages/Symbian/eabi/libcurlu.def
+++ b/packages/Symbian/eabi/libcurlu.def
@@ -58,4 +58,3 @@ EXPORTS
 	curl_easy_recv @ 57 NONAME
 	curl_easy_send @ 58 NONAME
 	curl_multi_wait @ 59 NONAME
-
diff --git a/packages/Symbian/group/curl.mmp b/packages/Symbian/group/curl.mmp
index d52e4c06b..e802205b4 100644
--- a/packages/Symbian/group/curl.mmp
+++ b/packages/Symbian/group/curl.mmp
@@ -61,4 +61,3 @@ STATICLIBRARY libcrt0.lib
 CAPABILITY NetworkServices
 
 EPOCSTACKSIZE 0x8000
-
diff --git a/packages/TPF/curl.mak b/packages/TPF/curl.mak
index 5ef2ae16d..176abec24 100644
--- a/packages/TPF/curl.mak
+++ b/packages/TPF/curl.mak
@@ -57,4 +57,3 @@ CFLAGS_CURL += -DCURL_DISABLE_TFTP
 #######################################################################
 
 include maketpf.rules
-
diff --git a/packages/TPF/maketpf.env_curl b/packages/TPF/maketpf.env_curl
index 161bf2fdb..de3da637b 100644
--- a/packages/TPF/maketpf.env_curl
+++ b/packages/TPF/maketpf.env_curl
@@ -22,4 +22,3 @@ ROOTINCDIRS += $(foreach d,$(TPF_ROOT_LM),$d/opensource/curl/include/gnurl)
 ################################################################################
 
 CFLAGS_$(APP) += -D TPF
-
diff --git a/packages/TPF/maketpf.env_curllib b/packages/TPF/maketpf.env_curllib
index 95fbb7f1f..2810738c8 100644
--- a/packages/TPF/maketpf.env_curllib
+++ b/packages/TPF/maketpf.env_curllib
@@ -54,4 +54,3 @@ ROOTCDIRS := $(foreach d,$(TPF_ROOT_LM),$d/opensource/curl/lib)
 ################################################################################
 
 CFLAGS_$(APP) += -D TPF
-
diff --git a/packages/Win32/README b/packages/Win32/README
index b37b57532..f21967431 100644
--- a/packages/Win32/README
+++ b/packages/Win32/README
@@ -1,4 +1,4 @@
-Author: Jörn Hartroth
+Author: Jörn Hartroth
 
 DESCRIPTION
 
diff --git a/packages/vms/clean_gnv_curl.com b/packages/vms/clean_gnv_curl.com
index 67b9d9db6..4e58356b1 100644
--- a/packages/vms/clean_gnv_curl.com
+++ b/packages/vms/clean_gnv_curl.com
@@ -220,9 +220,6 @@ $!
 $ file = "lcl_root:[...]gnv*.opt"
 $ if f$search(file) .nes. "" then delete 'file';*
 $!
-$ file = "lcl_root:[.packages.EPM]curl.list"
-$ if f$search(file) .nes. "" then delete 'file';*
-$!
 $ file = "lcl_root:[.packages.vms]macro32_exactcase.exe"
 $ if f$search(file) .nes. "" then delete 'file';*
 $!
diff --git a/packages/vms/gnv_conftest.c_first b/packages/vms/gnv_conftest.c_first
index 8645b0e37..f47469c5b 100644
--- a/packages/vms/gnv_conftest.c_first
+++ b/packages/vms/gnv_conftest.c_first
@@ -58,4 +58,3 @@ char ENGINE_load_builtin_engines (void) {return 0;}
  * it turns out that VMS does not have the CRYPTO_LOCK symbol in the
  * transfer vector, even though it is in the header file.
  */
-