From 568c7a4342f9e6e1f0357823c5e2e686c6d42d74 Mon Sep 17 00:00:00 2001
From: thomas <thomas@lgy.fr>
Date: Tue, 11 Jul 2023 23:00:08 +0200
Subject: [PATCH] commit of the day

---
 lib/exec_in_chroot.sh                 | 33 ++++++++++++---------------
 ressources/adguardhome/debmaker       |  4 ++--
 ressources/babybuddy/debmaker         |  2 +-
 ressources/bitwarden-desktop/debmaker |  2 +-
 ressources/cloudbeaver/debmaker       |  4 ++--
 ressources/element-web/debmaker       |  4 ++--
 ressources/forgejo/debmaker           |  2 +-
 ressources/glpi/debmaker              | 14 ++++++++----
 ressources/gotify/debmaker            | 14 ++++++++----
 ressources/joplin-desktop/debmaker    |  6 ++---
 ressources/joplin-server/debmaker     | 15 +++++-------
 ressources/kimai2/debmaker            |  2 +-
 ressources/mautrix-whatsapp/debmaker  |  2 +-
 ressources/metabase/debmaker          |  9 +++-----
 ressources/mysqlfdw/debmaker          |  2 +-
 ressources/roundcubemail/debmaker     |  4 ++--
 ressources/vaultwarden/debmaker       |  2 +-
 ressources/wallabag/debmaker          |  4 ++--
 ressources/zigbee2mqtt/debmaker       |  6 ++++-
 19 files changed, 67 insertions(+), 64 deletions(-)

diff --git a/lib/exec_in_chroot.sh b/lib/exec_in_chroot.sh
index e6e7e09..fcfd43d 100755
--- a/lib/exec_in_chroot.sh
+++ b/lib/exec_in_chroot.sh
@@ -29,16 +29,11 @@ configure_depot_nodejs() {
         NODE_VERSION=16
         [ ! "$1" == "" ] && NODE_VERSION=$1
         XNODE_VERSION=${NODE_VERSION}.x
-	if  [ -e /etc/apt/sources.list.d/nodesource.list ]
-	then
-		grep -q ${XNODE_VERSION} /etc/apt/sources.list.d/nodesource.list
-	        if [ $? -ne 0 ]
-		then
-        		wget -qO - https://deb.nodesource.com/setup_${XNODE_VERSION} | bash
-		fi
-	else
-		wget -qO - https://deb.nodesource.com/setup_${XNODE_VERSION} | bash
-	fi
+        grep -q ${XNODE_VERSION} /etc/apt/sources.list.d/nodesource.list
+        if [ $? -ne 0 ] 
+        then
+                wget -qO - https://deb.nodesource.com/setup_${XNODE_VERSION} | bash
+        fi
         echo -e "Package: nodejs\\nPin: version ${NODE_VERSION}.*\\nPin-Priority: 1000" > /etc/apt/preferences.d/nodejs
 }
 
@@ -46,14 +41,11 @@ install_go() {
         GO_VERSION=1.20.5
         [ ! "$1" == "" ] && GO_VERSION=$1
         PATH=$PATH:/usr/local/go/bin
-	if [ "$(whereis go | cut -d ":" -f 2)" == "" ]
-	then
-	        if [ ! "$(go version)" == "go version go${GO_VERSION} linux/amd64" ] ;
-        	then
-			rm -rvf /usr/local/go
-		        wget -qO - https://go.dev/dl/go${GO_VERSION}.linux-amd64.tar.gz | tar -C /usr/local -xz
-        	fi
-	fi
+        if [ ! "$(go version)" == "go version go${GO_VERSION} linux/amd64" ] ;
+        then
+                rm -rvf /usr/local/go/
+                wget -qO - https://go.dev/dl/go${GO_VERSION}.linux-amd64.tar.gz | tar -C /usr/local -xz
+        fi
 }
 
 install_rust() {
@@ -65,6 +57,11 @@ install_clojure() {
 	wget -qO - https://download.clojure.org/install/linux-install-1.11.1.1155.sh | bash
 }
 
+
+minimum_package() {
+	base_package_upgrade
+}
+
 default_prebuild(){
 	get_git_source
 }
diff --git a/ressources/adguardhome/debmaker b/ressources/adguardhome/debmaker
index 2ee09fe..686275c 100755
--- a/ressources/adguardhome/debmaker
+++ b/ressources/adguardhome/debmaker
@@ -1,12 +1,12 @@
 #!/bin/bash
 
-VERSION=0.108.0-b.39
+VERSION=0.108.0-b.35
 APP=adguardhome
 DEPOT=https://github.com/AdguardTeam/AdGuardHome.git
 GIT_VERSION=v${VERSION}
 GIT_VERSION=v0.108.0-b.30
 DEB_VERSION=${VERSION}-$(date +%Y%m%d%H%M)
-DEBIAN_VERSION_CODENAME=bookworm
+DEBIAN_VERSION_CODENAME=bullseye
 IMAGE_SIZE=4
 PACKAGE_DEPENDENCY="build-essential nodejs yarn"
 
diff --git a/ressources/babybuddy/debmaker b/ressources/babybuddy/debmaker
index 267210d..a37d89c 100755
--- a/ressources/babybuddy/debmaker
+++ b/ressources/babybuddy/debmaker
@@ -5,7 +5,7 @@ APP=babybuddy
 DEPOT=https://github.com/babybuddy/babybuddy.git
 GIT_VERSION=v${VERSION}
 DEB_VERSION=${VERSION}-$(date +%Y%m%d%H%M)
-DEBIAN_VERSION_CODENAME=bookworm
+DEBIAN_VERSION_CODENAME=bullseye
 IMAGE_SIZE=6
 PACKAGE_DEPENDENCY=""
 
diff --git a/ressources/bitwarden-desktop/debmaker b/ressources/bitwarden-desktop/debmaker
index 9c10acd..b16480c 100755
--- a/ressources/bitwarden-desktop/debmaker
+++ b/ressources/bitwarden-desktop/debmaker
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-VERSION=2023.5.1
+VERSION=2023.5.0
 APP=bitwarden-desktop
 DEPOT=https://github.com/bitwarden/clients.git
 GIT_VERSION=desktop-v${VERSION}
diff --git a/ressources/cloudbeaver/debmaker b/ressources/cloudbeaver/debmaker
index 2f5959a..f6b11e9 100755
--- a/ressources/cloudbeaver/debmaker
+++ b/ressources/cloudbeaver/debmaker
@@ -1,11 +1,11 @@
 #!/bin/bash
 
-VERSION=22.2.1
+VERSION=23.1.0
 APP=cloudbeaver
 DEPOT=https://github.com/dbeaver/cloudbeaver.git
 GIT_VERSION=last
 DEB_VERSION=${VERSION}-$(date +%Y%m%d%H%M)
-DEBIAN_VERSION_CODENAME=bullseye
+DEBIAN_VERSION_CODENAME=bookworm
 IMAGE_SIZE=5
 PACKAGE_DEPENDENCY="nodejs yarn maven openjdk-11-jdk"
 
diff --git a/ressources/element-web/debmaker b/ressources/element-web/debmaker
index 52f3fe0..e24663f 100755
--- a/ressources/element-web/debmaker
+++ b/ressources/element-web/debmaker
@@ -1,11 +1,11 @@
 #!/bin/bash
 
-VERSION=1.11.35
+VERSION=1.11.33
 APP=element-web
 DEPOT=https://github.com/vector-im/element-web.git
 GIT_VERSION=v${VERSION}
 DEB_VERSION=${VERSION}-$(date +%Y%m%d%H%M)
-DEBIAN_VERSION_CODENAME=bookworm
+DEBIAN_VERSION_CODENAME=bullseye
 IMAGE_SIZE=5
 PACKAGE_DEPENDENCY="yarn nodejs"
 
diff --git a/ressources/forgejo/debmaker b/ressources/forgejo/debmaker
index 8163986..96af513 100755
--- a/ressources/forgejo/debmaker
+++ b/ressources/forgejo/debmaker
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-VERSION=1.19.4-0
+VERSION=1.19.3-0
 APP=forgejo
 DEPOT=https://codeberg.org/forgejo/forgejo
 GIT_VERSION=v${VERSION}
diff --git a/ressources/glpi/debmaker b/ressources/glpi/debmaker
index c0d73ac..83516de 100755
--- a/ressources/glpi/debmaker
+++ b/ressources/glpi/debmaker
@@ -1,13 +1,17 @@
 #!/bin/bash
 
-VERSION=10.0.8
+<<<<<<< HEAD
+VERSION=10.0.9
+=======
+VERSION=10.0.7
+>>>>>>> parent of 0925d5a (Suivi de version)
 APP=glpi
 DEPOT=https://github.com/glpi-project/glpi.git
 GIT_VERSION=${VERSION}
 DEB_VERSION=${VERSION}-$(date +%Y%m%d%H%M)
-DEBIAN_VERSION_CODENAME=bookworm
+DEBIAN_VERSION_CODENAME=bullseye
 IMAGE_SIZE=4
-PACKAGE_DEPENDENCY="patch composer php-json php-xml php-curl php-gd php-intl php-ldap php-zip php-mysql gettext nodejs unzip"
+PACKAGE_DEPENDENCY="patch composer php-json php-xml php-curl php-gd php-intl php-ldap php-zip php-mysql gettext nodejs"
 
 main() {
 	base_package_upgrade
@@ -29,7 +33,7 @@ makedeb(){
 
 	mkdir -p ${PATH_DEB}/usr/share/doc/glpi/
 	mkdir -p ${PATH_DEB}/var/lib/glpi/
-	mkdir -p ${PATH_DEB}/etc/cron.d
+	mkdir -p ${PATH_DEB}/etc/
 
 	tar -zxvf /tmp/${APP}-${VERSION}.tgz -C ${PATH_DEB}/usr/share/
 
@@ -47,7 +51,7 @@ makedeb(){
 	mv ${PATH_DEB}/downstream.php ${PATH_DEB}/usr/share/glpi/inc/
 	mv ${PATH_DEB}/local_define.php ${PATH_DEB}/etc/glpi
 	mv ${PATH_DEB}/apache2-glpi.conf ${PATH_DEB}/usr/share/doc/glpi/
-	mv ${PATH_DEB}/glpi.cron ${PATH_DEB}/etc/cron.d/glpi
+	mv ${PATH_DEB}glpi.cron ${PATH_DEB}/etc/cron.d/glpi
 
 	sed -i "s/%VERSION%/$DEB_VERSION/" ${PATH_DEB}/DEBIAN/control
 	fakeroot dpkg-deb -Z gzip --build ${PATH_DEB} /tmp/dist
diff --git a/ressources/gotify/debmaker b/ressources/gotify/debmaker
index 5dbead4..ed993a6 100755
--- a/ressources/gotify/debmaker
+++ b/ressources/gotify/debmaker
@@ -1,23 +1,27 @@
 #!/bin/bash
 
 APP=gotify
-VERSION=2.2.5
+VERSION=2.2.4
 GIT_VERSION=v$VERSION
 DEB_VERSION=$VERSION-$(date +%Y%m%d%H%M)
-DEBIAN_VERSION_CODENAME=bookworm
+DEBIAN_VERSION_CODENAME=bullseye
 IMAGE_SIZE=6
 DEPOT=https://github.com/gotify/server.git
 PACKAGE_DEPENDENCY="build-essential nodejs yarn"
 
 main(){
 	base_package_upgrade
+	envinit
+	get_git_source
+	build
+	makedeb
+}
+
+envinit() {
 	configure_depot_yarn
 	configure_depot_nodejs
 	install_package_dependency
 	install_go
-	get_git_source
-	build
-	makedeb
 }
 
 build() {
diff --git a/ressources/joplin-desktop/debmaker b/ressources/joplin-desktop/debmaker
index d8cafb7..ba02689 100755
--- a/ressources/joplin-desktop/debmaker
+++ b/ressources/joplin-desktop/debmaker
@@ -1,13 +1,13 @@
 #!/bin/bash
 
-VERSION=2.11.11
+VERSION=2.11.9
 APP=joplin-desktop
 GIT_VERSION=v${VERSION}
 DEB_VERSION=$VERSION-$(date +%Y%m%d%H%M)
 DEPOT=https://github.com/laurent22/joplin.git
-DEBIAN_VERSION_CODENAME=bookworm
+DEBIAN_VERSION_CODENAME=bullseye
 IMAGE_SIZE=10
-PACKAGE_DEPENDENCY="build-essential python3 nodejs rsync yarn nodejs"
+PACKAGE_DEPENDENCY="build-essential python nodejs rsync yarn"
 
 main(){
 	base_package_upgrade
diff --git a/ressources/joplin-server/debmaker b/ressources/joplin-server/debmaker
index 92060ab..c7c2cd5 100755
--- a/ressources/joplin-server/debmaker
+++ b/ressources/joplin-server/debmaker
@@ -1,22 +1,19 @@
 #!/bin/bash
 
-VERSION=2.11.2
+VERSION=2.11.1
 APP=joplin-server
 GIT_VERSION=server-v${VERSION}
 DEB_VERSION=$VERSION-$(date +%Y%m%d%H%M)
 DEPOT=https://github.com/laurent22/joplin.git
-DEBIAN_VERSION_CODENAME=bookworm
-PACKAGE_DEPENDENCY="build-essential python-is-python3 nodejs rsync yarn"
+DEBIAN_VERSION_CODENAME=bullseye
 IMAGE_SIZE=12
 
-main(){
-	base_package_upgrade
+STEP="base_package_upgrade envinit default_prebuild build makedeb"
+
+envinit() {
 	configure_depot_yarn
 	configure_depot_nodejs
-	install_package_dependency
-	get_git_source
-        build
-        makedeb
+	apt install -y --no-install-recommends build-essential python nodejs rsync yarn
 }
 
 build() {
diff --git a/ressources/kimai2/debmaker b/ressources/kimai2/debmaker
index 5ca1b59..7876193 100755
--- a/ressources/kimai2/debmaker
+++ b/ressources/kimai2/debmaker
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-VERSION=2.0.27
+VERSION=2.0.25
 APP=kimai2
 DEPOT=https://github.com/kevinpapst/kimai2.git
 GIT_VERSION=${VERSION}
diff --git a/ressources/mautrix-whatsapp/debmaker b/ressources/mautrix-whatsapp/debmaker
index 824ca44..7c50a4f 100755
--- a/ressources/mautrix-whatsapp/debmaker
+++ b/ressources/mautrix-whatsapp/debmaker
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-VERSION=0.8.6
+VERSION=0.8.4
 APP=mautrix-whatsapp
 DEPOT=https://github.com/mautrix/whatsapp.git
 GIT_VERSION=v${VERSION}
diff --git a/ressources/metabase/debmaker b/ressources/metabase/debmaker
index 8310019..a7a8624 100755
--- a/ressources/metabase/debmaker
+++ b/ressources/metabase/debmaker
@@ -1,18 +1,18 @@
 #!/bin/bash
 
-VERSION=0.46.6
+VERSION=0.46.4
 APP=metabase
 DEPOT=https://github.com/metabase/metabase.git
 GIT_VERSION=v$VERSION
 DEB_VERSION=${VERSION}-$(date +%Y%m%d%H%M)
-DEBIAN_VERSION_CODENAME=bookworm
+DEBIAN_VERSION_CODENAME=bullseye
 IMAGE_SIZE=10
 PACKAGE_DEPENDENCY="build-essential default-jdk curl nodejs yarn"
 
 main(){
 	base_package_upgrade
 	configure_depot_yarn
-	configure_depot_nodejs 18
+	configure_depot_nodejs
 	install_package_dependency
 	install_clojure
 	get_git_source
@@ -23,9 +23,6 @@ main(){
 build() {
 	cd /tmp/${APP}/
 	PATH=$PATH:/usr/local/bin
-#	export NODE_OPTIONS=--max-old-space-size=2048
-#	export JVM_MAX_HEAP_SIZE=12
-	npx browserslist@latest --update-db
 	./bin/build.sh
 }
 
diff --git a/ressources/mysqlfdw/debmaker b/ressources/mysqlfdw/debmaker
index 369c6fc..1ab1c7f 100755
--- a/ressources/mysqlfdw/debmaker
+++ b/ressources/mysqlfdw/debmaker
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 VERSION=2_9_0
-APP=mysqlfdw
+APP=mysql_fdw
 DEPOT=https://github.com/EnterpriseDB/mysql_fdw.git
 GIT_VERSION=REL-${VERSION}
 DEB_VERSION=$(echo ${VERSION} | sed 's/_/./g' )-$(date +%Y%m%d%H%M)
diff --git a/ressources/roundcubemail/debmaker b/ressources/roundcubemail/debmaker
index 4f0d9eb..f6046e5 100755
--- a/ressources/roundcubemail/debmaker
+++ b/ressources/roundcubemail/debmaker
@@ -1,11 +1,11 @@
 #!/bin/bash
 
-VERSION=1.6.2
+VERSION=1.6.1
 APP=roundcubemail
 DEPOT=https://github.com/roundcube/roundcubemail.git
 GIT_VERSION=${VERSION}
 DEB_VERSION=${VERSION}-$(date +%Y%m%d%H%M)
-DEBIAN_VERSION_CODENAME=bookworm
+DEBIAN_VERSION_CODENAME=bullseye
 IMAGE_SIZE=4
 PACKAGE_DEPENDENCY="make curl npm nodejs jq php-xml php-pear php-mbstring unzip"
 
diff --git a/ressources/vaultwarden/debmaker b/ressources/vaultwarden/debmaker
index f337fce..f71e3e3 100755
--- a/ressources/vaultwarden/debmaker
+++ b/ressources/vaultwarden/debmaker
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-VERSION=1.28.1
+VERSION=1.29.0
 APP=vaultwarden
 GIT_VERSION=$VERSION
 DEB_VERSION=$VERSION-$(date +%Y%m%d%H%M)
diff --git a/ressources/wallabag/debmaker b/ressources/wallabag/debmaker
index bb639cc..d8dd155 100755
--- a/ressources/wallabag/debmaker
+++ b/ressources/wallabag/debmaker
@@ -1,10 +1,10 @@
 #!/bin/bash
 
-VERSION=2.6.1
+VERSION=2.5.4
 APP=wallabag
 GIT_VERSION=$VERSION
 DEB_VERSION=${VERSION}-$(date +%Y%m%d%H%M)
-DEBIAN_VERSION_CODENAME=bookworm
+DEBIAN_VERSION_CODENAME=bullseye
 IMAGE_SIZE=4
 DEPOT=https://github.com/wallabag/wallabag.git
 
diff --git a/ressources/zigbee2mqtt/debmaker b/ressources/zigbee2mqtt/debmaker
index 1279d34..c9cac0a 100755
--- a/ressources/zigbee2mqtt/debmaker
+++ b/ressources/zigbee2mqtt/debmaker
@@ -1,6 +1,10 @@
 #!/bin/bash
 
-VERSION=1.32.0
+<<<<<<< HEAD
+VERSION=1.32.1
+=======
+VERSION=1.31.2
+>>>>>>> parent of 0925d5a (Suivi de version)
 APP=zigbee2mqtt
 DEPOT=https://github.com/Koenkk/zigbee2mqtt.git
 GIT_VERSION=${VERSION}