URL and mailmap updates, remove an obsolete directory [ci skip]

Closes https://github.com/curl/curl/pull/3031

17 files changed, 21 insertions, 101 deletions

diff --git a/.mailmap b/.mailmap
index 8acbf4901..cc86d0032 100644
--- a/.mailmap
+++ b/.mailmap
@@ -5,7 +5,8 @@ Alessandro Ghedini <alessandro@ghedini.me> <alessandro@cloudflare.com>
 Alessandro Ghedini <alessandro@ghedini.me> <al3xbio@gmail.com>
 Björn Stenberg <bjorn@haxx.se>
 Björn Stenberg <bjorn@haxx.se> <bjst@bjorn>
-Viktor Szakats <vszakats@users.noreply.github.com>
+Viktor Szakats <commit@vszakats.net>
+Viktor Szakats <commit@vszakats.net> <vszakats@users.noreply.github.com>
 Daniel Gustafsson <daniel@yesql.se> <dgustafsson@pivotal.io>
 Daniel Gustafsson <daniel@yesql.se> <daniel@hobbit.se>
 Linus Nielsen <linus@haxx.se>
@@ -19,7 +20,7 @@ Patrick Monnerat <patrick@monnerat.net> <Patrick.Monnerat@datasphere.ch>
 Patrick Monnerat <patrick@monnerat.net> <patrick.monnerat@dh.com>
 Patrick Monnerat <patrick@monnerat.net> <pm@datasphere.ch>
 Patrick Monnerat <patrick@monnerat.net> <monnerat@users.noreply.github.com>
-Nick Zitzmann <nickzman@gmail.com><nick@chronosnet.com>
+Nick Zitzmann <nickzman@gmail.com> <nick@chronosnet.com>
 Peter Wu <peter@lekensteyn.nl> <peter_at_lekensteyn.nl>
 David Woodhouse <David.Woodhouse@intel.com> <dwmw2@infradead.org>
 Marcel Raad <Marcel.Raad@teamviewer.com> <raad@teamviewer.com>
diff --git a/configure.ac b/configure.ac
index 85b8b1465..6dae9b61b 100755
--- a/configure.ac
+++ b/configure.ac
@@ -4349,8 +4349,6 @@ AC_CONFIG_FILES([Makefile \
            packages/Linux/RPM/curl.spec \
            packages/Linux/RPM/curl-ssl.spec \
            packages/Solaris/Makefile \
-           packages/EPM/curl.list \
-           packages/EPM/Makefile \
            packages/vms/Makefile \
            packages/AIX/Makefile \
            packages/AIX/RPM/Makefile \
diff --git a/docs/BINDINGS.md b/docs/BINDINGS.md
index 024f169e3..b3624b1cb 100644
--- a/docs/BINDINGS.md
+++ b/docs/BINDINGS.md
@@ -10,7 +10,7 @@ libcurl bindings
  The bindings listed below are not part of the curl/libcurl distribution
  archives, but must be downloaded and installed separately.
 
-[Ada95](http://www.almroth.com/adacurl/index.html)  Written by Andreas Almroth
+[Ada95](https://web.archive.org/web/20070403105909/www.almroth.com/adacurl/index.html) Written by Andreas Almroth
 
 [Basic](http://scriptbasic.com/) ScriptBasic bindings written by Peter Verhas
 
@@ -31,15 +31,15 @@ Cocoa: [BBHTTP](https://github.com/brunodecarvalho/BBHTTP) written by Bruno de C
 
 [Eiffel](https://room.eiffel.com/library/curl) Written by Eiffel Software
 
-[Euphoria](http://rays-web.com/eulibcurl.htm) Written by Ray Smith
+[Euphoria](https://web.archive.org/web/20050204080544/rays-web.com/eulibcurl.htm) Written by Ray Smith
 
 [Falcon](http://www.falconpl.org/index.ftd?page_id=prjs&prj_id=curl)
 
-[Ferite](http://www.ferite.org/) Written by Paul Querna
+[Ferite](https://web.archive.org/web/20150102192018/ferite.org/) Written by Paul Querna
 
 [Gambas](https://gambas.sourceforge.io/)
 
-[glib/GTK+](http://atterer.net/glibcurl/) Written by Richard Atterer
+[glib/GTK+](https://web.archive.org/web/20100526203452/atterer.net/glibcurl) Written by Richard Atterer
 
 Go: [go-curl](https://github.com/andelf/go-curl) by ShuYu Wang
 
@@ -63,11 +63,11 @@ Lua: [luacurl](http://luacurl.luaforge.net/) by Alexander Marinov, [Lua-cURL](ht
 
 [node.js](https://github.com/JCMais/node-libcurl) node-libcurl by Jonathan Cardoso Machado
 
-[Object-Pascal](http://www.tekool.com/opcurl) Free Pascal, Delphi and Kylix binding written by Christophe Espern.
+[Object-Pascal](https://web.archive.org/web/20020610214926/www.tekool.com/opcurl) Free Pascal, Delphi and Kylix binding written by Christophe Espern.
 
 [OCaml](https://opam.ocaml.org/packages/ocurl/) Written by Lars Nilsson and ygrek
 
-[Pascal](http://houston.quik.com/jkp/curlpas/) Free Pascal, Delphi and Kylix binding written by Jeffrey Pohlmeyer.
+[Pascal](https://web.archive.org/web/20030804091414/houston.quik.com/jkp/curlpas/) Free Pascal, Delphi and Kylix binding written by Jeffrey Pohlmeyer.
 
 Perl: [WWW--Curl](https://github.com/szbalint/WWW--Curl) Maintained by Cris
 Bailiff and Bálint Szilakszi,
@@ -103,16 +103,16 @@ Ruby: [curb](https://github.com/taf2/curb) written by Ross Bamford
 
 [SPL](http://www.clifford.at/spl/) Written by Clifford Wolf
 
-[Tcl](http://mirror.yellow5.com/tclcurl/) Tclcurl by Andrés García
+[Tcl](https://web.archive.org/web/20160826011806/mirror.yellow5.com/tclcurl/) Tclcurl by Andrés García
 
 [Visual Basic](https://sourceforge.net/projects/libcurl-vb/) libcurl-vb by Jeffrey Phillips
 
-[Visual Foxpro](http://www.ctl32.com.ar/libcurl.asp) by Carlos Alloatti
+[Visual Foxpro](https://web.archive.org/web/20130730181523/www.ctl32.com.ar/libcurl.asp) by Carlos Alloatti
 
 [Q](https://q-lang.sourceforge.io/) The libcurl module is part of the default install
 
 [wxWidgets](https://wxcode.sourceforge.io/components/wxcurl/) Written by Casey O'Donnell
 
-[XBLite](http://perso.wanadoo.fr/xblite/libraries.html) Written by David Szafranski
+[XBLite](https://web.archive.org/web/20060426150418/perso.wanadoo.fr/xblite/libraries.html) Written by David Szafranski
 
 [Xojo](https://github.com/charonn0/RB-libcURL) Written by Andrew Lambert
diff --git a/docs/FAQ b/docs/FAQ
index cb28c2a53..e352c719e 100644
--- a/docs/FAQ
+++ b/docs/FAQ
@@ -370,7 +370,7 @@ FAQ
   https://www.bis.doc.gov/licensing/do_i_needaneccn.html
 
   An incomprehensible description of the two numbers above is here
-  http://www.access.gpo.gov/bis/ear/pdf/ccl5-pt2.pdf
+  https://www.bis.doc.gov/index.php/documents/new-encryption/1653-ccl5-pt2-3
 
   1.14 How do I submit my patch?
 
diff --git a/docs/TODO b/docs/TODO
index 3607f162d..4275b8826 100644
--- a/docs/TODO
+++ b/docs/TODO
@@ -533,7 +533,7 @@
 
  Some FTP servers allow STAT for listing directories instead of using LIST,
  and the response is then sent over the control connection instead of as the
- otherwise usedw data connection: http://www.nsftools.com/tips/RawFTP.htm#STAT
+ otherwise usedw data connection: https://www.nsftools.com/tips/RawFTP.htm#STAT
 
  This is not detailed in any FTP specification.
 
diff --git a/lib/Makefile.netware b/lib/Makefile.netware
index 2b392f3f4..a2032a1e2 100644
--- a/lib/Makefile.netware
+++ b/lib/Makefile.netware
@@ -5,7 +5,7 @@
 #                            | (__| |_| |  _ <| |___
 #                             \___|\___/|_| \_\_____|
 #
-# Copyright (C) 2004 - 2015, Guenter Knauf, <http://www.gknw.net/phpbb>.
+# Copyright (C) 2004 - 2015, Guenter Knauf
 # Copyright (C) 2001 - 2017, Daniel Stenberg, <daniel@haxx.se>, et al.
 #
 # This software is licensed as described in the file COPYING, which
diff --git a/lib/socks.c b/lib/socks.c
index 81f3eda28..0d4d856aa 100644
--- a/lib/socks.c
+++ b/lib/socks.c
@@ -98,7 +98,7 @@ int Curl_blockread_all(struct connectdata *conn, /* connection data */
 * destination server.
 *
 * Reference :
-*   http://socks.permeo.com/protocol/socks4.protocol
+*   https://www.openssh.com/txt/socks4.protocol
 *
 * Note :
 *   Set protocol4a=true for  "SOCKS 4A (Simple Extension to SOCKS 4 Protocol)"
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 3a2028b80..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}/curl/curl.h ./include/curl/curl.h
-f 0644 cowo pppusers ${includedir}/curl/easy.h ./include/curl/easy.h
-f 0644 cowo pppusers ${includedir}/curl/mprintf.h ./include/curl/mprintf.h
-f 0644 cowo pppusers ${includedir}/curl/stdcheaders.h ./include/curl/stdcheaders.h
-f 0644 cowo pppusers ${includedir}/curl/types.h ./include/curl/types.h
-f 0755 cowo pppusers ${bindir}/curl-config ./curl-config
diff --git a/packages/Makefile.am b/packages/Makefile.am
index bef04f3c2..98fcc1d77 100644
--- a/packages/Makefile.am
+++ b/packages/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = Win32 Linux Solaris EPM AIX vms
+SUBDIRS = Win32 Linux Solaris AIX vms
 
 EXTRA_DIST = README 			\
 	DOS/README 			\
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/projects/wolfssl_options.h b/projects/wolfssl_options.h
index 1ca618f10..04ac8da64 100644
--- a/projects/wolfssl_options.h
+++ b/projects/wolfssl_options.h
@@ -47,7 +47,7 @@ create the thread local storage and that could be a problem for LoadLibrary.
 Regarding the options that were added via C_EXTRA_FLAGS:
 
 FP_MAX_BITS=16384
-https://web.archive.org/web/20150218183550/www.yassl.com/forums/topic423-cacertorgs-ca-cert-verify-failed-but-withdisablefastmath-it-works.html
+https://www.yassl.com/forums/topic423-cacertorgs-ca-cert-verify-failed-but-withdisablefastmath-it-works.html
 "Since root.crt uses a 4096-bit RSA key, you'll need to increase the fastmath
 buffer size.  You can do this using the define:
 FP_MAX_BITS and setting it to 8192."
diff --git a/src/Makefile.netware b/src/Makefile.netware
index 53d803b2b..9d28c8f60 100644
--- a/src/Makefile.netware
+++ b/src/Makefile.netware
@@ -5,7 +5,7 @@
 #                            | (__| |_| |  _ <| |___
 #                             \___|\___/|_| \_\_____|
 #
-# Copyright (C) 2004 - 2014, Guenter Knauf, <http://www.gknw.net/phpbb>.
+# Copyright (C) 2004 - 2014, Guenter Knauf
 # Copyright (C) 2001 - 2015, Daniel Stenberg, <daniel@haxx.se>, et al.
 #
 # This software is licensed as described in the file COPYING, which
diff --git a/winbuild/BUILD.WINDOWS.txt b/winbuild/BUILD.WINDOWS.txt
index 33252f8e5..c75b15c4e 100644
--- a/winbuild/BUILD.WINDOWS.txt
+++ b/winbuild/BUILD.WINDOWS.txt
@@ -78,7 +78,7 @@ where <options> is one or many of:
   VC=<6,7,8,9,10,11,12,14,15>    - VC versions

   WITH_DEVEL=<path>              - Paths for the development files (SSL, zlib, etc.)

                                    Defaults to sibbling directory deps: ../deps

-                                   Libraries can be fetched at http://windows.php.net/downloads/php-sdk/deps/

+                                   Libraries can be fetched at https://windows.php.net/downloads/php-sdk/deps/

                                    Uncompress them into the deps folder.

   WITH_SSL=<dll or static>       - Enable OpenSSL support, DLL or static

   WITH_NGHTTP2=<dll or static>   - Enable HTTP/2 support, DLL or static

diff --git a/winbuild/Makefile.vc b/winbuild/Makefile.vc
index 7b42e1bdb..94ce8db36 100644
--- a/winbuild/Makefile.vc
+++ b/winbuild/Makefile.vc
@@ -40,7 +40,7 @@ CFGSET=true
 !MESSAGE   VC=<6,7,8,9,10,11,12,14,15>    - VC versions
 !MESSAGE   WITH_DEVEL=<path>              - Paths for the development files (SSL, zlib, etc.)
 !MESSAGE                                    Defaults to sibbling directory deps: ../deps
-!MESSAGE                                    Libraries can be fetched at http://pecl2.php.net/downloads/php-windows-builds/
+!MESSAGE                                    Libraries can be fetched at https://windows.php.net/downloads/php-sdk/deps/
 !MESSAGE                                    Uncompress them into the deps folder.
 !MESSAGE   WITH_SSL=<dll or static>       - Enable OpenSSL support, DLL or static
 !MESSAGE   WITH_NGHTTP2=<dll or static>   - Enable HTTP/2 support, DLL or static