From 7874622b0491ba2083caadf8c4ecf77622fc413a Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Sat, 10 Sep 2022 20:54:48 -0400 Subject: [PATCH 1/4] feat: upgrade pcre to pcre2 --- bin/compile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bin/compile b/bin/compile index b48afa4..f272058 100755 --- a/bin/compile +++ b/bin/compile @@ -5,8 +5,8 @@ set -eo pipefail NGINX_VERSION="1.23.1" NGINX_TARBALL="nginx-${NGINX_VERSION}.tar.gz" -PCRE_VERSION="8.45" -PCRE_TARBALL="pcre-${PCRE_VERSION}.tar.gz" +PCRE_VERSION="10.40" +PCRE_TARBALL="pcre2-${PCRE_VERSION}.tar.gz" SIGIL_VERSION="0.9.0" SIGIL_TARBALL="gliderlabs-sigil_${SIGIL_VERSION}_linux_amd64.tgz" ZLIB_VERSION="1.2.12" @@ -57,7 +57,7 @@ fi if [[ ! -d "${PCRE_TARBALL%.tar.gz}" ]]; then echo "-----> Download and unzip pcre ${PCRE_VERSION} via http" - curl -sSL "https://downloads.sourceforge.net/project/pcre/pcre/${PCRE_VERSION}/${PCRE_TARBALL}" -o "${PCRE_TARBALL}" + curl -sSL "https://github.com/PCRE2Project/pcre2/releases/download/pcre2-${PCRE_VERSION}/${PCRE_TARBALL}" -o "${PCRE_TARBALL}" tar xzf "${PCRE_TARBALL}" && rm -f "${PCRE_TARBALL}" fi From 6381244e26d044b42143204827ed4a1d3741b6d7 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Sat, 10 Sep 2022 20:57:21 -0400 Subject: [PATCH 2/4] debug: where is the pcre2 output --- bin/compile | 1 + 1 file changed, 1 insertion(+) diff --git a/bin/compile b/bin/compile index f272058..5fb4cc4 100755 --- a/bin/compile +++ b/bin/compile @@ -59,6 +59,7 @@ if [[ ! -d "${PCRE_TARBALL%.tar.gz}" ]]; then echo "-----> Download and unzip pcre ${PCRE_VERSION} via http" curl -sSL "https://github.com/PCRE2Project/pcre2/releases/download/pcre2-${PCRE_VERSION}/${PCRE_TARBALL}" -o "${PCRE_TARBALL}" tar xzf "${PCRE_TARBALL}" && rm -f "${PCRE_TARBALL}" + ls -lah fi if [[ ! -d "${ZLIB_TARBALL%.tar.gz}" ]]; then From 25fb7889a511b64103dd1e0d3cc1d574cb85a889 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Sat, 10 Sep 2022 21:02:04 -0400 Subject: [PATCH 3/4] fix: build against the correct directory --- bin/compile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/compile b/bin/compile index 5fb4cc4..af2549d 100755 --- a/bin/compile +++ b/bin/compile @@ -84,7 +84,7 @@ if [[ ! -f "${CACHE_DIR}/bin/nginx" ]]; then suppress ./configure \ --with-cpu-opt=generic \ --prefix="$BUILD_DIR/nginx" \ - --with-pcre=../pcre-${PCRE_VERSION} \ + --with-pcre=../pcre2-${PCRE_VERSION} \ --sbin-path=. \ --pid-path=./nginx.pid \ --conf-path=./nginx.conf \ From 7fe92f4821f9fc38d8983cff51540ecb1538656b Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Sat, 10 Sep 2022 21:05:23 -0400 Subject: [PATCH 4/4] chore: remove extra debug statement --- bin/compile | 1 - 1 file changed, 1 deletion(-) diff --git a/bin/compile b/bin/compile index af2549d..111f694 100755 --- a/bin/compile +++ b/bin/compile @@ -59,7 +59,6 @@ if [[ ! -d "${PCRE_TARBALL%.tar.gz}" ]]; then echo "-----> Download and unzip pcre ${PCRE_VERSION} via http" curl -sSL "https://github.com/PCRE2Project/pcre2/releases/download/pcre2-${PCRE_VERSION}/${PCRE_TARBALL}" -o "${PCRE_TARBALL}" tar xzf "${PCRE_TARBALL}" && rm -f "${PCRE_TARBALL}" - ls -lah fi if [[ ! -d "${ZLIB_TARBALL%.tar.gz}" ]]; then