Update PCRE2 to 10.39 (#1379)

Also updates download link from the dead ftp.pcre.org to github.
Fixes #1355.

CHANGES.188.md

@@ -25,7 +25,7 @@ Minor changes
 
 * Sqlite updated to 3.36.0. [SW]
 * cJSON updated to 1.7.13 [SW]
-* PCRE updated to 10.35 [SW]
+* PCRE updated to 10.39 [SW]
 * New `--version` option to the netmush binary to display the version and exit. [SW]
 
 Fixes

Makefile.in

@@ -1,4 +1,4 @@
-# Makefile for PennMUSH 
+# Makefile for PennMUSH
 
 # - System configuration - #
 
@@ -21,7 +21,7 @@ SQL_CFLAGS=@MYSQL_CFLAGS@ @POSTGRESQL_CPPFLAGS@
 SQL_LDFLAGS=@MYSQL_LDFLAGS@ @POSTGRESQL_LDFLAGS@
 
 CCFLAGS=@CFLAGS@ -I.. -I../hdrs -include ../config.h -include ../confmagic.h -include ../options.h @PTHREAD_CFLAGS@ @CPPFLAGS@ @ICU_CPPFLAGS@ @OPENSSL_INCLUDES@ @CURL_CFLAGS@
-LDFLAGS=@LDFLAGS@  @OPENSSL_LDFLAGS@ 
+LDFLAGS=@LDFLAGS@  @OPENSSL_LDFLAGS@
 CLIBS=@PTHREAD_LIBS@ @LIBS@ @ICU_LIBS@ @OPENSSL_LIBS@ @POSTGRESQL_LIBS@ @CURL_LIBS@
 INSTALL=@INSTALL@
 INSTALLDIR=$installdir
@@ -34,7 +34,7 @@ SHELL=/bin/sh
 # Where to install with 'make globalinstall'
 GLOBAL_INSTALL=@libexecdir@
 
-PCRE2_DIR=pcre2-10.35
+PCRE2_DIR=pcre2-10.39
 
 
 all: config.h autogen game/mush.cnf
@@ -80,14 +80,14 @@ hdrs/gitinfo.h: $(wildcard .git/HEAD .git/index)
 	@echo "/* Built at `date +%Y%m%d%H%M%S` */" >> hdrs/gitinfo.h
 
 install: localized all
-	@if [ -f game/netmush ]; then rm -f game/netmush; fi	
-	@if [ -f game/info_slave ]; then rm -f game/info_slave; fi	
-	@if [ -f game/ssl_slave ]; then rm -f game/ssl_slave; fi	
+	@if [ -f game/netmush ]; then rm -f game/netmush; fi
+	@if [ -f game/info_slave ]; then rm -f game/info_slave; fi
+	@if [ -f game/ssl_slave ]; then rm -f game/ssl_slave; fi
 	-(cd game; $(INSTALL_LINKS))
 	(cd game/txt; @MAKE@)
 	@echo "If you plan to run multiple MUSHes, consider running 'make customize'"
 
-netmud: 
+netmud:
 	(cd src; @MAKE@ netmud "CC=$(CC)" "CCFLAGS=$(CCFLAGS)" \
 	"SQL_CFLAGS=$(SQL_CFLAGS)" "SQL_LDFLAGS=$(SQL_LDFLAGS)" \
 	"LDFLAGS=$(LDFLAGS)" "CLIBS=$(CLIBS)" )
@@ -182,20 +182,20 @@ clean:
 	(cd src; @MAKE@ clean)
 	(cd game; rm -f netmush info_slave)
 
-distclean: 
+distclean:
 	(cd hdrs; rm -f *.orig *~ \#* *.rej *.bak funs.h cmds.h gitinfo.h buildinf.h)
 	(cd utils; rm -f *.orig *~ \#* *.rej *.bak mkcmds.sh *.o)
 	(cd game; rm -rf *.log netmush info_slave *.orig *.rej *~ *.bak mush.cnf restart)
 	(cd src; @MAKE@ distclean; rm -f Makefile)
 	(cd game/txt; @MAKE@ clean)
 	(rm -rf .config Makefile config.h config.sh)
 
-totallyclean: distclean 
+totallyclean: distclean
 	(cd hdrs; rm -rf *.rej)
 	(cd src; rm -rf *.rej)
 	-rm -f Makefile
 
-etags: 
+etags:
 	(cd src; @MAKE@ etags)
 
 ctags:
@@ -222,5 +222,3 @@ globalinstall: install
 
 htmldoc:
 	cd htmldoc && make
-
-

configure

@@ -11263,9 +11263,9 @@ else
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: Configuring PCRE2" >&5
 $as_echo "$as_me: Configuring PCRE2" >&6;}
-PCRE2_VERSION="pcre2-10.35"
+PCRE2_VERSION="pcre2-10.39"
 PCRE2_TARBALL="${PCRE2_VERSION}.tar.gz"
-PCRE2_URL="http://ftp.pcre.org/pub/pcre/${PCRE2_TARBALL}"
+PCRE2_URL="https://github.com/PhilipHazel/pcre2/releases/download/${PCRE2_VERSION}/${PCRE2_TARBALL}"
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${PCRE2_VERSION}" >&5
 $as_echo_n "checking for ${PCRE2_VERSION}... " >&6; }
 if test -d ${PCRE2_VERSION} ; then
@@ -11285,8 +11285,7 @@ $as_echo "found" >&6; }
 $as_echo "not found" >&6; }
       { $as_echo "$as_me:${as_lineno-$LINENO}: Trying to download from ${PCRE2_URL}" >&5
 $as_echo "$as_me: Trying to download from ${PCRE2_URL}" >&6;}
-      perl -MFile::Fetch -e "File::Fetch->new(uri => '${PCRE2_URL}')->fetch() or exit 1" && (gzip -dc "${PCRE2_TARBALL}" | tar xf -)
-      if test $? -ne 0 ; then
+      if ! (curl -LO "${PCRE2_URL}" && (gzip -dc "${PCRE2_TARBALL}" | tar xf -)); then
          as_fn_error $? "Unable to automatically fetch file. Download it manually and try again." "$LINENO" 5
       fi
    fi

configure.in

@@ -1,6 +1,6 @@
 ### autoconf file for PennMUSH
 ### This file uses tests from the Autoconf Macro Archive.
-### It is available at http://autoconf-archive.cryp.to/ 
+### It is available at http://autoconf-archive.cryp.to/
 ### The actual tests used are in ./aclocal.m4. DO NOT AUTO-GENERATE
 ### that file with aclocal.
 
@@ -55,7 +55,7 @@ fi
 AC_PATH_PROG(GPERF, gperf)
 
 # Detects OS
-case "${build_os}" in 
+case "${build_os}" in
   *freebsd*)
     USING_FREEBSD=yes
     ;;
@@ -248,7 +248,7 @@ int main(void) {
  return !isnormal(1.0);
 }
 ])
-], 
+],
 [AC_MSG_RESULT(yes)]
 [AC_DEFINE(HAVE_ISNORMAL)],
 AC_MSG_RESULT(no))
@@ -270,7 +270,7 @@ AX_FUNC_POSIX_MEMALIGN
 
 # Some linux OSes (Old redhat, others?) will see these functions
 # through an AC_CHECK_FUNCS but not when it comes time to actually use
-# them in source. 
+# them in source.
 AC_MSG_CHECKING([for posix_fallocate])
 AC_LINK_IFELSE([
 AC_LANG_SOURCE([
@@ -414,9 +414,9 @@ else
  fi
 fi
 AC_MSG_NOTICE([Configuring PCRE2])
-PCRE2_VERSION="pcre2-10.35"
+PCRE2_VERSION="pcre2-10.39"
 PCRE2_TARBALL="${PCRE2_VERSION}.tar.gz"
-PCRE2_URL="http://ftp.pcre.org/pub/pcre/${PCRE2_TARBALL}"
+PCRE2_URL="https://github.com/PhilipHazel/pcre2/releases/download/${PCRE2_VERSION}/${PCRE2_TARBALL}"
 AC_MSG_CHECKING([for ${PCRE2_VERSION}])
 if test -d ${PCRE2_VERSION} ; then
    AC_MSG_RESULT([found])
@@ -429,8 +429,7 @@ else
    else
       AC_MSG_RESULT([not found])
       AC_MSG_NOTICE([Trying to download from ${PCRE2_URL}])
-      perl -MFile::Fetch -e "File::Fetch->new(uri => '${PCRE2_URL}')->fetch() or exit 1" && (gzip -dc "${PCRE2_TARBALL}" | tar xf -)
-      if test $? -ne 0 ; then
+      if ! (curl -LO "${PCRE2_URL}" && (gzip -dc "${PCRE2_TARBALL}" | tar xf -)); then
          AC_MSG_ERROR([Unable to automatically fetch file. Download it manually and try again.])
       fi
    fi
@@ -485,7 +484,7 @@ AC_ARG_ENABLE(ssl_slave, AS_HELP_STRING([--disable-ssl_slave],
 			 enable_ssl_slave=$enableval, enable_ssl_slave=${default_enable_slaves})
 if test "$enable_ssl_slave" = yes; then
    if test "$ac_cv_lib_event_openssl_bufferevent_openssl_socket_new" = yes; then
-      AC_SUBST(SSL_SLAVE_TARGET, ssl_slave)						       
+      AC_SUBST(SSL_SLAVE_TARGET, ssl_slave)
       AC_DEFINE(SSL_SLAVE)
    else
       AC_MSG_WARN([ssl_slave requested but OpenSSL and/or libevent2 weren't found.])