Skip to content

Update 2.8.6 #32

Merged
merged 2 commits into from
May 16, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions build.profile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
BUILD_TAG=2.8.5
BUILD_TAG=2.8.6

. build.local

Expand All @@ -21,9 +21,9 @@ 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

BUILD_paperless=paperless-ngx-2.8.5
BUILD_paperless=paperless-ngx-2.8.6
12 changes: 3 additions & 9 deletions checkversions.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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]*'
Expand Down
6 changes: 3 additions & 3 deletions nginx.build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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%.*.*}/}
Expand Down Expand Up @@ -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}
Expand Down
4 changes: 2 additions & 2 deletions nginx-1.25.3.chicken.patch → nginx.chicken.patch
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down