Merge pull request #21 from mariux64/update-2.6.3

Update 2.6.3
mariux64 · Mar 28, 2024 · bc4a133 · bc4a133
2 parents 43adcc7 + a1b2f58
commit bc4a133
Show file tree

Hide file tree

Showing 24 changed files with 352 additions and 277 deletions.
diff --git a/.gitignore b/.gitignore
@@ -10,6 +10,7 @@
 /paperless-ngx-*
 /pngquant-*
 /Python-*
+/redis-*
 /sqlite-*
 /tessconfigs
 /tessdata

diff --git a/Python.build.sh b/Python.build.sh
@@ -2,34 +2,34 @@
 {
 set -x
 set -e
+set -u
 
 . build.profile
 
 . "${PREFIX}/${BUILD_sqlite}/profile"
 
-
 function B_PYTHON {
 
-[[ -d "$PREFIX" ]] || { echo "PREFIX unset or not a directory";exit; }
-
 # apt install libbz2-dev
 # wget "https://www.python.org/ftp/python/3.11.8/Python-3.11.8.tgz"
 SRCURL="https://beehive.molgen.mpg.de/7fb0bfaa2f6aae4aadcdb51abe957825/Python-3.11.8.tgz"
 
-PREFIX="${PREFIX}/${BUILD_python}"
+BUILD_PKG=${BUILD_python}
+
+PREFIX="${PREFIX}/${BUILD_PKG}"
 
 mkdir -p "${PREFIX}"
 
 cat >"${PREFIX}"/profile <<-EOF
-PATH="${PREFIX}"/bin:\$PATH
+PATH="${PREFIX}"/bin:\${PATH}
 EOF
 
-test -e "${BUILD_python}.tar.gz" || wget -nv "${SRCURL}" -O "${BUILD_python}.tar.gz"
-test -d "${BUILD_python}" || mkdir -pv "${BUILD_python}" && tar -xf "${BUILD_python}.tar.gz" --strip-components=1 -C "${BUILD_python}"
+test -e "${BUILD_PKG}.tar.gz" || wget -nv "${SRCURL}" -O "${BUILD_PKG}.tar.gz"
+test -d "${BUILD_PKG}" || mkdir -pv "${BUILD_PKG}" && tar -xf "${BUILD_PKG}.tar.gz" --strip-components=1 -C "${BUILD_PKG}"
 
 . "${PREFIX}/profile"
 
-cd "${BUILD_python}"
+cd "${BUILD_PKG}"
 
 local _conf=(
     --prefix "${PREFIX}"

diff --git a/README.todo b/README.todo
@@ -7,6 +7,15 @@ bug:
    ☐ https://github.com/paperless-ngx/paperless-ngx/discussions/3090
      Calling OCRmyPDF with args: {'input_file': PosixPath('/scratch/local/plprj/2024-02-19/paperless-ngx34bhqotl/c913a207C78B05A-B130-45F8-9EC4-281AD914ABFA}.PDF'), 'output_file': PosixPath('/scratch/local/plprj/2024-02-19/paperless-0ee3414u/archive.pdf'), 'use_threads': True, 'jobs': 32, 'language': 'deu+eng', 'output_type': 'pdfa', 'progress_bar': False, 'color_conversion_strategy': 'RGB', 'force_ocr': True, 'clean_final': True, 'deskew': True, 'rotate_pages': True, 'rotate_pages_threshold': 12.0, 'sidecar': PosixPath('/scratch/local/plprj/2024-02-19/paperless-0ee3414u/sidecar.txt')}
 
+   ☐ /node_modules/.bin/ng build --configuration production
+Locale data for 'ar-AR' cannot be found. Using locale data for 'ar'.
+WARNING [src/locale/messages.ar_AR.xlf]: File target locale ('ar') does not match configured locale ('ar-AR')
+Locale data for 'af-ZA' cannot be found. Using locale data for 'af'.
+WARNING [src/locale/messages.af_ZA.xlf]: File target locale ('af') does not match configured locale ('af-ZA')
+Locale data for 'bg-BG' cannot be found. Using locale data for 'bg'.
+WARNING [src/locale/messages.bg_BG.xlf]: File target locale ('bg') does not match configured locale ('bg-BG')
+
+
 upgrade:
     ssl-certs in conf umziehen
 

diff --git a/build.profile b/build.profile
@@ -1,17 +1,17 @@
-BUILD_TAG=2.6.1
+BUILD_TAG=2.6.3
 
 . build.local
 
-PAPERLESS_LOGGING_DIR=${PROJECT}/log
-
 DEVSHM=/dev/shm/${USER}/${BUILD_TAG}
 
 PATH=$HOME/bin:/bin:/sbin:/usr/bin:/usr/sbin
 NPROC=$(nproc)
 XDG_CACHE_HOME=${PREFIX}/cache
 TMPDIR=${TMPDIR:-/tmp/${USER}/${BUILD_TAG}}
+LOGDIR=${PROJECT}/log
 
 BUILD_sqlite=sqlite-3.45.1
+BUILD_redis=redis-7.2.4
 BUILD_python=Python-3.11.8
 BUILD_node=node-20.11.0
 BUILD_ffmpeg=ffmpeg-6.1.1
@@ -25,4 +25,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.6.2
+BUILD_paperless=paperless-ngx-2.6.3
diff --git a/buildall.sh b/buildall.sh
@@ -58,8 +58,9 @@ ln -fs "${logfile}" "${LOGS}/build.log"
 
 {
 ./profile.build.sh
-./startstop-paperless.build.sh
+./startstop.build.sh
 [ -d "${BUILD_sqlite}" ] || ./sqlite.build.sh
+[ -d "${BUILD_redis}" ] || ./redis.build.sh
 [ -d "${BUILD_python}" ] || ./Python.build.sh
 [ -d "${BUILD_node}" ] || ./node.build.sh
 [ -d "${BUILD_ffmpeg}" ] || ./ffmpeg.build.sh

diff --git a/cleanall.sh b/cleanall.sh
@@ -18,6 +18,7 @@ RMRF=(
   "${BUILD_paperless}"
   "${BUILD_pngquant}"
   "${BUILD_python}"
+  "${BUILD_redis}"
   "${BUILD_sqlite}"
   "${BUILD_tesseract}"
   "${BUILD_unpaper}"

diff --git a/ffmpeg.build.sh b/ffmpeg.build.sh
@@ -2,30 +2,31 @@
 {
 set -x
 set -e
+set -u
 
 . build.profile
 
 function B_FFMPEG {
 
-[ -d "$PREFIX" ] || { echo "PREFIX unset or not a directory";exit; }
+BUILD_PKG=${BUILD_ffmpeg}
 
 # SRCURL[0]="https://ffmpeg.org//releases/${BUILD_ffmpeg}.tar.gz"
 SRCURL[0]="https://beehive.molgen.mpg.de/cce359cad7ed0d4f0079f7864080ad36/ffmpeg-6.1.1.tar.gz"
 
-PREFIX=${PREFIX}/${BUILD_ffmpeg}
+PREFIX=${PREFIX}/${BUILD_PKG}
 
-mkdir -p $PREFIX
+mkdir -p ${PREFIX}
 
-cat >$PREFIX/profile <<-EOF
-PATH=$PREFIX/bin:\$PATH
-PKG_CONFIG_PATH=${PROJECT}/${BUILD_ffmpeg}/lib/pkgconfig${PKG_CONFIG_PATH:+:}$PKG_CONFIG_PATH
+cat >${PREFIX}/profile <<-EOF
+PATH=${PREFIX}/bin:\$PATH
+PKG_CONFIG_PATH=${PROJECT}/${BUILD_PKG}/lib/pkgconfig\${PKG_CONFIG_PATH:+:}\${PKG_CONFIG_PATH:-}
 EOF
 
 
-test -e ${BUILD_ffmpeg}.tar.gz || wget -nv ${SRCURL} -O ${BUILD_ffmpeg}.tar.gz
-test -d ${BUILD_ffmpeg} || mkdir -pv ${BUILD_ffmpeg} && tar -xf ${BUILD_ffmpeg}.tar.gz --strip-components=1 -C ${BUILD_ffmpeg}
+test -e ${BUILD_PKG}.tar.gz || wget -nv ${SRCURL} -O ${BUILD_PKG}.tar.gz
+test -d ${BUILD_PKG} || mkdir -pv ${BUILD_PKG} && tar -xf ${BUILD_PKG}.tar.gz --strip-components=1 -C ${BUILD_PKG}
 
-cd ${BUILD_ffmpeg}
+cd ${BUILD_PKG}
 
 local _conf=(
     --prefix=${PREFIX}
@@ -38,8 +39,7 @@ local _conf=(
 
 ./configure "${_conf[@]}"
 
-make -j $NPROC
-make install
+make -j $NPROC install
 
 }
 

diff --git a/jbig2dec.build.sh b/jbig2dec.build.sh
@@ -2,24 +2,24 @@
 {
 set -x
 set -e
+set -u
 
 . build.profile
 
 . "${PREFIX}/${BUILD_python}/profile"
 
 function B_JBIG2DEC {
 
-[ -d "$PREFIX" ] || { echo "PREFIX unset or not a directory";exit; }
+BUILD_PKG="${BUILD_jbig2dec}"
 
-PREFIX="${PREFIX}/${BUILD_jbig2dec}"
+PREFIX="${PREFIX}/${BUILD_PKG}"
 
 mkdir -p "${PREFIX}"
 
-BUILD_PKG="${BUILD_jbig2dec}"
 
 cat >"$PREFIX/profile" <<-EOF
 PATH="${PREFIX}/bin":\$PATH
-PKG_CONFIG_PATH=${PROJECT}/${BUILD_PKG}/lib/pkgconfig\${PKG_CONFIG_PATH:+:}\$PKG_CONFIG_PATH
+PKG_CONFIG_PATH=${PROJECT}/${BUILD_PKG}/lib/pkgconfig\${PKG_CONFIG_PATH:+:}\${PKG_CONFIG_PATH:-}
 EOF
 
 
@@ -40,8 +40,7 @@ local _conf=(
 
 ./autogen.sh "${_conf[@]}"
 
-make -j "${NPROC}"
-make install
+make -j "${NPROC}" install
 
 popd
 }

diff --git a/jbig2enc.build.sh b/jbig2enc.build.sh
@@ -2,6 +2,7 @@
 {
 set -x
 set -e
+set -u
 
 . build.profile
 
@@ -10,9 +11,10 @@ set -e
 
 function B_JBIG2ENC {
 
-[ -d "${PREFIX}" ] || { echo "PREFIX unset or not a directory";exit; }
+BUILD_PKG=${BUILD_jbig2enc}
+
+PREFIX="${PREFIX}/${BUILD_PKG}"
 
-PREFIX="${PREFIX}/${BUILD_jbig2enc}"
 
 mkdir -p "${PREFIX}"
 
@@ -21,17 +23,16 @@ PATH=${PREFIX}/bin:\$PATH
 EOF
 
 
-if [ ! -d "${BUILD_jbig2enc}" ]; then
-    if [ ! -e ${BUILD_jbig2enc}.tar ]; then
-      git clone https://github.com/agl/jbig2enc.git ${BUILD_jbig2enc}
-      tar cf ${BUILD_jbig2enc}.tar ${BUILD_jbig2enc}
+if [ ! -d "${BUILD_PKG}" ]; then
+    if [ ! -e ${BUILD_PKG}.tar ]; then
+      git clone https://github.com/agl/jbig2enc.git ${BUILD_PKG}
+      tar cf ${BUILD_PKG}.tar ${BUILD_PKG}
     else
-      tar -xf ${BUILD_jbig2enc}.tar
+      tar -xf ${BUILD_PKG}.tar
     fi
 fi
 
-pushd ${BUILD_jbig2enc}
-
+pushd ${BUILD_PKG}
 
 local _conf=(
     --prefix ${PREFIX}
@@ -46,8 +47,7 @@ export CPPFLAGS
 
 ./configure "${_conf[@]}"
 
-make -j $NPROC
-make install
+make -j ${NPROC} install
 
 popd
 }

diff --git a/leptonica.build.sh b/leptonica.build.sh
@@ -2,39 +2,38 @@
 {
 set -x
 set -e
+set -u
 
 . build.profile
 
 function B_LEPTONICA {
 
-[ -d "$PREFIX" ] || { echo "PREFIX unset or not a directory";exit; }
-
 # SRCURL[0]="https://github.com/DanBloomberg/leptonica/releases/download/1.84.1/leptonica-1.84.1.tar.gz"
-SRCURL[0]="https://beehive.molgen.mpg.de/01e6de7af2ba93b8350cdc3f7aeb0fbf/leptonica-1.84.1.tar.gz"
+SRCURL="https://beehive.molgen.mpg.de/01e6de7af2ba93b8350cdc3f7aeb0fbf/leptonica-1.84.1.tar.gz"
+
+BUILD_PKG=${BUILD_leptonica}
 
-PREFIX=${PREFIX}/${BUILD_leptonica}
+PREFIX=${PREFIX}/${BUILD_PKG}
 
 mkdir -p $PREFIX
 
 cat >$PREFIX/profile <<-EOF
-PATH=$PREFIX/bin:\$PATH
-PKG_CONFIG_PATH=${PROJECT}/${BUILD_leptonica}/lib/pkgconfig${PKG_CONFIG_PATH:+:}$PKG_CONFIG_PATH
+PATH=${PREFIX}/bin:\$PATH
+PKG_CONFIG_PATH=${PROJECT}/${BUILD_PKG}/lib/pkgconfig\${PKG_CONFIG_PATH:+:}\${PKG_CONFIG_PATH:-}
 EOF
 
+test -e ${BUILD_PKG}.tar.gz || wget -nv ${SRCURL} -O ${BUILD_PKG}.tar.gz
+test -d ${BUILD_PKG} || mkdir -pv ${BUILD_PKG} && tar -xf ${BUILD_PKG}.tar.gz --strip-components=1 -C ${BUILD_PKG}
 
-test -e ${BUILD_leptonica}.tar.gz || wget -nv ${SRCURL} -O ${BUILD_leptonica}.tar.gz
-test -d ${BUILD_leptonica} || mkdir -pv ${BUILD_leptonica} && tar -xf ${BUILD_leptonica}.tar.gz --strip-components=1 -C ${BUILD_leptonica}
-
-cd ${BUILD_leptonica}
+cd ${BUILD_PKG}
 
 local _conf=(
     --prefix ${PREFIX}
 )
 
 ./configure "${_conf[@]}"
 
-make -j $NPROC
-make install
+make -j ${NPROC} install
 
 }
 

diff --git a/liberation-fonts-ttf.build.sh b/liberation-fonts-ttf.build.sh
@@ -2,20 +2,20 @@
 {
 set -x
 set -e
+set -u
 
 . build.profile
 
 function B_LIBFONTTTF {
 
-[ -d "${PREFIX}" ] || { echo "PREFIX unset or not a directory";exit; }
-
 # SRCURL="https://github.com/liberationfonts/liberation-fonts/files/7261482/liberation-fonts-ttf-2.1.5.tar.gz"
 SRCURL="https://beehive.molgen.mpg.de/31b453e0b77bacde410a34a725b34f8a/liberation-fonts-ttf-2.1.5.tar.gz"
 
-PREFIX="${PREFIX}/${BUILD_libfontttf}"
-
 BUILD_PKG="${BUILD_libfontttf}"
 
+PREFIX="${PREFIX}/${BUILD_PKG}"
+
+
 mkdir -p "${PREFIX}"
 
 test -e "${BUILD_PKG}.tar.gz" || wget -nv "${SRCURL}" -O "${BUILD_PKG}.tar.gz"

diff --git a/nginx.build.sh b/nginx.build.sh
@@ -2,10 +2,10 @@
 {
 set -x
 set -e
+set -u
 
 . build.profile
 
-[ -d "$PREFIX" ] || { echo "PREFIX unset or not a directory";exit; }
 
 . ${PREFIX}/${BUILD_sqlite}/profile
 . ${PREFIX}/${BUILD_python}/profile
@@ -20,19 +20,17 @@ BUILD_EXT=${SRCURL/${SRCURL%.*.*}/}
 
 PREFIX=${PREFIX}/${BUILD_PKG}
 
-mkdir -p $PREFIX
+mkdir -p ${PREFIX}
 
-cat >$PREFIX/profile <<-EOF
-PATH=$PREFIX/sbin:\$PATH
+cat >${PREFIX}/profile <<-EOF
+PATH=${PREFIX}/sbin:\${PATH}
 EOF
 
-. $PREFIX/profile
-
-# erst mal in conf, dauert stuuuunden...
-mkdir -p ${PROJECT}/conf
-DHPARAM=${PROJECT}/conf/dhparam.pem
-test -e ${DHPARAM} || openssl dhparam -dsaparam -out ${DHPARAM} 4096
+. ${PREFIX}/profile
 
+mkdir -p ${PREFIX}/conf
+DHPARAM=${PREFIX}/conf/dhparam.pem
+test -e ${DHPARAM} || openssl dhparam -dsaparam -out ${DHPARAM} 2048
 
 
 test -e ${BUILD_PKG}${BUILD_EXT} || wget -nv ${SRCURL} -O ${BUILD_PKG}${BUILD_EXT}
@@ -54,7 +52,8 @@ local _conf=(
     --without-http_scgi_module
     --without-http_grpc_module
     --without-http_memcached_module
-    --error-log-path=${PROJECT}/log/nginx-error.log
+    --error-log-path=${LOGDIR}/nginx-error.log
+    --http-log-path=${LOGDIR}/nginx-access.log
     --http-client-body-temp-path=${DEVSHM}/client-body-temp
     --http-proxy-temp-path=${DEVSHM}/proxy-temp
     --http-fastcgi-temp-path=${DEVSHM}/fastcgi-temp \
@@ -67,15 +66,7 @@ local _conf=(
 CFLAGS='-O2 -fPIC' \
 ./configure "${_conf[@]}"
 
-make -j $NPROC
-
-make install
-
-rm -fv ${PREFIX}/conf/nginx.conf
-ln -vfs ${PROJECT}/conf/nginx.conf ${PREFIX}/conf/
-ln -vfs ${PROJECT}/conf/fullchain.pem ${PREFIX}/conf/
-ln -vfs ${PROJECT}/conf/privkey.pem ${PREFIX}/conf/
-ln -vfs ${DHPARAM} ${PREFIX}/conf/
+make -j ${NPROC} install
 
 popd