diff --git a/.travis.yml b/.travis.yml index 5ca9f1d..41b6981 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,22 +23,21 @@ env: - OPENSSL_PREFIX=/opt/ssl - OPENSSL_LIB=$OPENSSL_PREFIX/lib - OPENSSL_INC=$OPENSSL_PREFIX/include - - PCRE_VER=8.45 - - PCRE_PREFIX=/opt/pcre - - PCRE_LIB=$PCRE_PREFIX/lib - - PCRE_INC=$PCRE_PREFIX/include + - PCRE2_VER=10.46 + - PCRE2_PREFIX=/opt/pcre + - PCRE2_LIB=$PCRE_PREFIX/lib + - PCRE2_INC=$PCRE_PREFIX/include - JOBS=3 - NGX_BUILD_JOBS=$JOBS matrix: - - NGINX_VERSION=1.21.4 OPENSSL_VER=1.1.1l - - NGINX_VERSION=1.29.2 OPENSSL_VER=1.1.1u NGX_EXTRA_OPT=--without-pcre2 + - NGINX_VERSION=1.29.2 OPENSSL_VER=3.5.4 before_install: - sudo apt-get install -qq -y axel cpanminus libtest-base-perl libtext-diff-perl liburi-perl libwww-perl libtest-longstring-perl liblist-moreutils-perl ca-certificates > build.log 2>&1 || (cat build.log && exit 1) install: - - if [ ! -f download-cache/pcre-$PCRE_VER.tar.gz ]; then wget -P download-cache http://ftp.cs.stanford.edu/pub/exim/pcre/pcre-$PCRE_VER.tar.gz; fi - - if [ ! -f download-cache/openssl-$OPENSSL_VER.tar.gz ]; then wget -P download-cache https://www.openssl.org/source/openssl-$OPENSSL_VER.tar.gz; fi + - if [ -n "$PCRE2_VER" ] && [ ! -f download-cache/pcre2-$PCRE2_VER.tar.gz ]; then wget -P download-cache https://github.com/PCRE2Project/pcre2/releases/download/pcre2-${PCRE2_VER}/pcre2-${PCRE2_VER}.tar.gz; fi + - if [ -n "$OPENSSL_VER" ] && [ ! -f download-cache/openssl-$OPENSSL_VER.tar.gz ]; then wget -P download-cache https://github.com/openssl/openssl/releases/download/openssl-$OPENSSL_VER/openssl-$OPENSSL_VER.tar.gz || wget -P download-cache https://www.openssl.org/source/openssl-$OPENSSL_VER.tar.gz || wget -P download-cache https://www.openssl.org/source/old/${OPENSSL_VER//[a-z]/}/openssl-$OPENSSL_VER.tar.gz; fi - git clone https://github.com/openresty/openresty-devel-utils.git - git clone https://github.com/openresty/openresty.git ../openresty - git clone https://github.com/openresty/lua-resty-core.git ../lua-resty-core @@ -56,9 +55,9 @@ script: - make -j$JOBS CCDEBUG=-g Q= PREFIX=$LUAJIT_PREFIX CC=$CC XCFLAGS='-DLUA_USE_APICHECK -DLUA_USE_ASSERT' > build.log 2>&1 || (cat build.log && exit 1) - sudo make install PREFIX=$LUAJIT_PREFIX > build.log 2>&1 || (cat build.log && exit 1) - cd .. - - tar zxf download-cache/pcre-$PCRE_VER.tar.gz - - cd pcre-$PCRE_VER/ - - ./configure --prefix=$PCRE_PREFIX --enable-jit --enable-utf --enable-unicode-properties > build.log 2>&1 || (cat build.log && exit 1) + - tar zxf download-cache/pcre2-$PCRE2_VER.tar.gz + - cd pcre2-$PCRE2_VER/ + - ./configure --prefix=$PCRE2_PREFIX --enable-jit --enable-utf --enable-unicode-properties > build.log 2>&1 || (cat build.log && exit 1) - make -j$JOBS > build.log 2>&1 || (cat build.log && exit 1) - sudo PATH=$PATH make install > build.log 2>&1 || (cat build.log && exit 1) - cd .. diff --git a/util/build.sh b/util/build.sh index 67a775d..8a6bc87 100755 --- a/util/build.sh +++ b/util/build.sh @@ -12,8 +12,8 @@ force=$2 ngx-build $force $version \ $NGX_EXTRA_OPT \ --with-http_ssl_module \ - --with-cc-opt="-I$OPENSSL_INC -I$PCRE_INC" \ - --with-ld-opt="-L$OPENSSL_LIB -L$PCRE_LIB -Wl,-rpath,$OPENSSL_LIB:$PCRE_LIB:$LIBDRIZZLE_LIB" \ + --with-cc-opt="-I$OPENSSL_INC -I$PCRE2_INC" \ + --with-ld-opt="-L$OPENSSL_LIB -L$PCRE2_LIB -Wl,-rpath,$OPENSSL_LIB:$PCRE2_LIB:$LIBDRIZZLE_LIB" \ --without-mail_pop3_module \ --without-mail_imap_module \ --without-mail_smtp_module \