From 27a0bbc9bdb3816841b68768d4b31fa379debe9d Mon Sep 17 00:00:00 2001 From: Peter Marquardt Date: Thu, 16 May 2024 13:40:06 +0200 Subject: [PATCH 1/2] nginx: update 1.25.3 to 1.26.0 - chicken version 1.26.1 --- build.profile | 2 +- nginx.build.sh | 6 +++--- nginx-1.25.3.chicken.patch => nginx.chicken.patch | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) rename nginx-1.25.3.chicken.patch => nginx.chicken.patch (98%) diff --git a/build.profile b/build.profile index f1f2beb..cde6180 100644 --- a/build.profile +++ b/build.profile @@ -21,7 +21,7 @@ BUILD_zbar=zbar-0.23.93 BUILD_leptonica=leptonica-1.84.1 BUILD_tesseract=tesseract-5.3.4 BUILD_tessdata=tessdata_best-4.1.0 -BUILD_nginx=nginx-1.25.3 +BUILD_nginx=nginx-1.26.0 BUILD_jbig2enc=jbig2enc-0.28-17-gea05019 BUILD_jbig2dec=jbig2dec-0.20 BUILD_libfontttf=liberation-fonts-ttf-2.1.5 diff --git a/nginx.build.sh b/nginx.build.sh index b959f4a..80c95af 100755 --- a/nginx.build.sh +++ b/nginx.build.sh @@ -12,8 +12,8 @@ set -u function B_NGINX { -# SRCURL[0]="https://nginx.org/download/nginx-1.25.3.tar.gz" -SRCURL[0]="https://beehive.molgen.mpg.de/92f07d33918ca0a09612665337d67f2b/nginx-1.25.3.tar.gz" +# SRCURL[0]="https://nginx.org/download/nginx-1.26.0.tar.gz" +SRCURL[0]="https://beehive.molgen.mpg.de/bb1b92cf7d72efcc0da343b057f23516/nginx-1.26.0.tar.gz" BUILD_PKG=${BUILD_nginx} BUILD_EXT=${SRCURL/${SRCURL%.*.*}/} @@ -42,7 +42,7 @@ pushd ${BUILD_PKG} # What you see here is the representation of the string "nginx" compressed with HPACK's Huffman encoding. # ~/go/src/github.com/wwwutz/hpack -patch -p1 --silent --backup --forward --input=../nginx-1.25.3.chicken.patch || true +patch -p1 --silent --backup --forward --input=../nginx.chicken.patch || true local _conf=( --prefix=${PREFIX} diff --git a/nginx-1.25.3.chicken.patch b/nginx.chicken.patch similarity index 98% rename from nginx-1.25.3.chicken.patch rename to nginx.chicken.patch index 47fd38f..27e50cd 100644 --- a/nginx-1.25.3.chicken.patch +++ b/nginx.chicken.patch @@ -59,9 +59,9 @@ index 088aa1e..0e1632f 100644 #define nginx_version 1025003 --#define NGINX_VERSION "1.25.3" +-#define NGINX_VERSION "1.26.0" -#define NGINX_VER "nginx/" NGINX_VERSION -+#define NGINX_VERSION "1.25.4" ++#define NGINX_VERSION "1.26.1" +#define NGINX_VER "chicken/" NGINX_VERSION #ifdef NGX_BUILD From 3c7abc86a743214c5806195c8bbcf8b77d29dc40 Mon Sep 17 00:00:00 2001 From: Peter Marquardt Date: Thu, 16 May 2024 13:41:37 +0200 Subject: [PATCH 2/2] paperless-ngx: update from 2.8.5 to 2.8.6 - update - fixed checkversions --- build.profile | 4 ++-- checkversions.sh | 12 +++--------- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/build.profile b/build.profile index cde6180..c9323cc 100644 --- a/build.profile +++ b/build.profile @@ -1,4 +1,4 @@ -BUILD_TAG=2.8.5 +BUILD_TAG=2.8.6 . build.local @@ -26,4 +26,4 @@ BUILD_jbig2enc=jbig2enc-0.28-17-gea05019 BUILD_jbig2dec=jbig2dec-0.20 BUILD_libfontttf=liberation-fonts-ttf-2.1.5 -BUILD_paperless=paperless-ngx-2.8.5 +BUILD_paperless=paperless-ngx-2.8.6 diff --git a/checkversions.sh b/checkversions.sh index 045e303..7fb7715 100755 --- a/checkversions.sh +++ b/checkversions.sh @@ -23,7 +23,7 @@ function parsefile() { B=$1 U=$2 P=$3 - curl -s -L "${U}" | grep --max-count=1 -oP "${P}" + curl -s -L "${U}" | grep --max-count=1 -oP -e "${P}" } # git_describe_remote @@ -56,26 +56,20 @@ function parse() { } # https://api.github.com/repos/paperless-ngx/paperless-ngx/releases/latest& -gdrem "${BUILD_paperless}" paperless-ngx/paperless-ngx 'refs/tags/v*' -parse "${BUILD_node}" 'https://github.com/nodejs/node/releases' '(?<=Version )\S+' +gdrem "${BUILD_paperless}" paperless-ngx/paperless-ngx 'refs/tags/v*' +parse "${BUILD_node}" 'https://github.com/nodejs/node/releases' '(?<=Version ).*?(?= ).*LTS\)' parse "${BUILD_python}" 'https://raw.githubusercontent.com/python/peps/main/peps/pep-0664.rst' '(?<=^- ).*(?=:.*final)' parse "${BUILD_redis}" 'http://download.redis.io/redis-stable/00-RELEASENOTES' '(?<=Redis\s).*(?=\s+Released)' parse "${BUILD_sqlite}" 'https://sqlite.org/index.html' '(?<=Version ).*(?=<)' - parse "${BUILD_nginx}" 'https://nginx.org/' '(?<=nginx-).*?(?=<)' - gdrem "${BUILD_tesseract}" tesseract-ocr/tesseract 'refs/tags/[0-9]*' gdrem "${BUILD_tessdata}" tesseract-ocr/tessdata_best 'refs/tags/[0-9]*' gdrem "${BUILD_jbig2dec}" ArtifexSoftware/jbig2dec 'refs/tags/[0-9]*' gdrem "${BUILD_jbig2enc}" agl/jbig2enc 'refs/tags/[0-9]*' - gdrem "${BUILD_leptonica}" DanBloomberg/leptonica 'refs/tags/[0-9]*' - parse "${BUILD_ffmpeg}" 'https://git.videolan.org/?p=ffmpeg.git;a=blob_plain;f=Changelog' '(?<=^version )\d.*(?=:)' gdrem "${BUILD_pngquant}" kornelski/pngquant 'refs/tags/*' - - gdrem "${BUILD_zbar}" mchehab/zbar 'refs/tags/[0-9]*' gdrem "${BUILD_unpaper}" unpaper/unpaper 'refs/tags/unpaper-*' '(?<= )[0-9]+(?= commits)' gdrem "${BUILD_libfontttf}" liberationfonts/liberation-fonts 'refs/tags/[0-9]*'