From f7730928e4670252bb2f1f042177422c96587973 Mon Sep 17 00:00:00 2001
From: thomas <thomas@lgy.fr>
Date: Sat, 11 Jun 2022 22:16:17 +0200
Subject: [PATCH] new version adguardhome element-web glpi grocy
 mautrix-whatsapp metabase rss-bridge tt-rss wallabag zigbee2mqtt add
 rustdesk-server

---
 ressources/adguardhome/debmaker               |  2 +-
 ressources/element-web/debmaker               |  2 +-
 ressources/glpi/debmaker                      |  2 +-
 ressources/grocy/debmaker                     |  2 +-
 ressources/mautrix-whatsapp/debian/README     |  6 ++
 ressources/mautrix-whatsapp/debian/changelog  | 11 ++++
 ressources/mautrix-whatsapp/debian/conffiles  |  1 +
 ressources/mautrix-whatsapp/debian/control    | 13 +++++
 ressources/mautrix-whatsapp/debian/copyright  | 29 ++++++++++
 .../debian/mautrix-whatsapp.install           |  2 +
 .../debian/mautrix-whatsapp.service           | 35 ++++++++++++
 ressources/mautrix-whatsapp/debian/postinst   |  4 ++
 ressources/mautrix-whatsapp/debian/rules      | 28 ++++++++++
 .../mautrix-whatsapp/debian/source/format     |  1 +
 ressources/metabase/debmaker                  |  2 +-
 ressources/rss-bridge/debmaker                | 23 ++++----
 ressources/rustdesk-server/debmaker           | 55 +++++++++++++++++++
 .../rustdesk-server-hbbr/DEBIAN/changelog     |  0
 .../rustdesk-server-hbbr/DEBIAN/control       |  7 +++
 .../rustdesk-server-hbbr/DEBIAN/postinst      |  4 ++
 .../usr/lib/systemd/system/hbbr.service       | 18 ++++++
 .../rustdesk-server-hbbs/DEBIAN/changelog     |  0
 .../rustdesk-server-hbbs/DEBIAN/control       |  7 +++
 .../rustdesk-server-hbbs/DEBIAN/postinst      |  4 ++
 .../usr/lib/systemd/system/hbbs.service       | 18 ++++++
 ressources/slimbookbattery/debmaker           | 35 ------------
 ressources/tt-rss/debmaker                    | 11 ++--
 ressources/wallabag/debmaker                  |  7 ++-
 ressources/zigbee2mqtt/debmaker               |  2 +-
 29 files changed, 272 insertions(+), 59 deletions(-)
 create mode 100644 ressources/mautrix-whatsapp/debian/README
 create mode 100644 ressources/mautrix-whatsapp/debian/changelog
 create mode 100644 ressources/mautrix-whatsapp/debian/conffiles
 create mode 100644 ressources/mautrix-whatsapp/debian/control
 create mode 100644 ressources/mautrix-whatsapp/debian/copyright
 create mode 100644 ressources/mautrix-whatsapp/debian/mautrix-whatsapp.install
 create mode 100644 ressources/mautrix-whatsapp/debian/mautrix-whatsapp.service
 create mode 100755 ressources/mautrix-whatsapp/debian/postinst
 create mode 100755 ressources/mautrix-whatsapp/debian/rules
 create mode 100644 ressources/mautrix-whatsapp/debian/source/format
 create mode 100755 ressources/rustdesk-server/debmaker
 create mode 100644 ressources/rustdesk-server/rustdesk-server-hbbr/DEBIAN/changelog
 create mode 100644 ressources/rustdesk-server/rustdesk-server-hbbr/DEBIAN/control
 create mode 100755 ressources/rustdesk-server/rustdesk-server-hbbr/DEBIAN/postinst
 create mode 100644 ressources/rustdesk-server/rustdesk-server-hbbr/usr/lib/systemd/system/hbbr.service
 create mode 100644 ressources/rustdesk-server/rustdesk-server-hbbs/DEBIAN/changelog
 create mode 100644 ressources/rustdesk-server/rustdesk-server-hbbs/DEBIAN/control
 create mode 100755 ressources/rustdesk-server/rustdesk-server-hbbs/DEBIAN/postinst
 create mode 100644 ressources/rustdesk-server/rustdesk-server-hbbs/usr/lib/systemd/system/hbbs.service
 delete mode 100755 ressources/slimbookbattery/debmaker

diff --git a/ressources/adguardhome/debmaker b/ressources/adguardhome/debmaker
index 4c1aa58..6273fab 100755
--- a/ressources/adguardhome/debmaker
+++ b/ressources/adguardhome/debmaker
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-VERSION=0.108.0-b.8
+VERSION=0.108.0-b.9
 
 [ -e ./lib/function.sh ] && source ./lib/function.sh
 
diff --git a/ressources/element-web/debmaker b/ressources/element-web/debmaker
index 1435c41..caf2daa 100755
--- a/ressources/element-web/debmaker
+++ b/ressources/element-web/debmaker
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-VERSION=1.10.13
+VERSION=1.10.14
 
 [ -e ./lib/function.sh ] && source ./lib/function.sh
 
diff --git a/ressources/glpi/debmaker b/ressources/glpi/debmaker
index 8de11c2..d8f2b55 100755
--- a/ressources/glpi/debmaker
+++ b/ressources/glpi/debmaker
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-VERSION=10.0.0
+VERSION=10.0.1
 
 [ -e ./lib/function.sh ] && source ./lib/function.sh
 
diff --git a/ressources/grocy/debmaker b/ressources/grocy/debmaker
index 76c5844..0fb0e40 100755
--- a/ressources/grocy/debmaker
+++ b/ressources/grocy/debmaker
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-VERSION=3.3.0
+VERSION=3.3.1
 
 [ -e ./lib/function.sh ] && source ./lib/function.sh
 
diff --git a/ressources/mautrix-whatsapp/debian/README b/ressources/mautrix-whatsapp/debian/README
new file mode 100644
index 0000000..05ef0e4
--- /dev/null
+++ b/ressources/mautrix-whatsapp/debian/README
@@ -0,0 +1,6 @@
+The Debian Package vnctv
+----------------------------
+
+Comments regarding the Package
+
+ -- Thomas Leagy <thomas@lgy.fr>  Sun, 03 Apr 2022 12:36:14 +0200
diff --git a/ressources/mautrix-whatsapp/debian/changelog b/ressources/mautrix-whatsapp/debian/changelog
new file mode 100644
index 0000000..0aced69
--- /dev/null
+++ b/ressources/mautrix-whatsapp/debian/changelog
@@ -0,0 +1,11 @@
+mautrix-whatsapp (0.4.0) UNRELEASED; urgency=medium
+
+  * First deb version
+
+ -- Thomas Legay <thomas@lgy.fr>  Mon, 17 May 2022 21:08:37 +0200
+ 
+mautrix-whatsapp (0.3.1) UNRELEASED; urgency=medium
+
+  * First deb version
+
+ -- Thomas Legay <thomas@lgy.fr>  Mon, 18 Apr 2022 00:26:37 +0200
diff --git a/ressources/mautrix-whatsapp/debian/conffiles b/ressources/mautrix-whatsapp/debian/conffiles
new file mode 100644
index 0000000..6dd2818
--- /dev/null
+++ b/ressources/mautrix-whatsapp/debian/conffiles
@@ -0,0 +1 @@
+/etc/mautrix-whatsapp/config.yaml
diff --git a/ressources/mautrix-whatsapp/debian/control b/ressources/mautrix-whatsapp/debian/control
new file mode 100644
index 0000000..f54130f
--- /dev/null
+++ b/ressources/mautrix-whatsapp/debian/control
@@ -0,0 +1,13 @@
+Source: mautrix-whatsapp
+Section: base
+Priority: optional
+Maintainer: Thomas Legay <thomas@lgy.fr>
+Build-Depends: debhelper-compat (= 13), golang (>= 16)
+Standards-Version: 3.9.8
+Homepage: http://www.gnu.org/software/gawk/
+https://github.com/mautrix/whatsapp/archive/refs/tags/v0.4.0.tar.gz
+
+Package: mautrix-whatsapp
+Architecture: all
+Depends: libolm3
+Description: mautrix-whatsapp bridge
diff --git a/ressources/mautrix-whatsapp/debian/copyright b/ressources/mautrix-whatsapp/debian/copyright
new file mode 100644
index 0000000..3a3b409
--- /dev/null
+++ b/ressources/mautrix-whatsapp/debian/copyright
@@ -0,0 +1,29 @@
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: mautrix-whatsapp
+Upstream-Contact: <preferred name and address to reach the upstream project>
+Source: <url://example.com>
+
+Files: *
+Copyright: 2022 tulir
+License: GPL-3.0+
+
+Files: debian/*
+Copyright: 2022 Thomas Legay <thomas@lgy.fr>
+License: GPL-3.0+
+
+License: GPL-3.0+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+ .
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <https://www.gnu.org/licenses/>.
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License version 3 can be found in "/usr/share/common-licenses/GPL-3".
diff --git a/ressources/mautrix-whatsapp/debian/mautrix-whatsapp.install b/ressources/mautrix-whatsapp/debian/mautrix-whatsapp.install
new file mode 100644
index 0000000..6ccbe91
--- /dev/null
+++ b/ressources/mautrix-whatsapp/debian/mautrix-whatsapp.install
@@ -0,0 +1,2 @@
+mautrix-whatsapp usr/lib/mautrix-whatsapp/
+config.yaml etc/mautrix-whatsapp/
diff --git a/ressources/mautrix-whatsapp/debian/mautrix-whatsapp.service b/ressources/mautrix-whatsapp/debian/mautrix-whatsapp.service
new file mode 100644
index 0000000..2f1c8ed
--- /dev/null
+++ b/ressources/mautrix-whatsapp/debian/mautrix-whatsapp.service
@@ -0,0 +1,35 @@
+[Unit]
+Description=mautrix-whatsapp bridge
+
+[Service]
+Type=exec
+User=mautrix-whatsapp
+WorkingDirectory=/var/lib/mautrix-whatsapp
+ExecStart=/usr/lib/mautrix-whatsapp/mautrix-whatsapp -c /etc/mautrix-whatsapp/config.yaml
+Restart=on-failure
+RestartSec=30s
+
+# Optional hardening to improve security
+ReadWritePaths=/var/lib/mautrix-whatsapp /etc/mautrix-whatsapp
+NoNewPrivileges=yes
+MemoryDenyWriteExecute=true
+PrivateDevices=yes
+PrivateTmp=yes
+ProtectHome=yes
+ProtectSystem=strict
+ProtectControlGroups=true
+RestrictSUIDSGID=true
+RestrictRealtime=true
+LockPersonality=true
+ProtectKernelLogs=true
+ProtectKernelTunables=true
+ProtectHostname=true
+ProtectKernelModules=true
+PrivateUsers=true
+ProtectClock=true
+SystemCallArchitectures=native
+SystemCallErrorNumber=EPERM
+SystemCallFilter=@system-service
+
+[Install]
+WantedBy=multi-user.target
diff --git a/ressources/mautrix-whatsapp/debian/postinst b/ressources/mautrix-whatsapp/debian/postinst
new file mode 100755
index 0000000..9aa9e5b
--- /dev/null
+++ b/ressources/mautrix-whatsapp/debian/postinst
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+id mautrix-whatsapp &> /dev/null || useradd mautrix-whatsapp -r -s /bin/false -md /var/lib/mautrix-whatsapp
+chown mautrix-whatsapp:mautrix-whatsapp /etc/mautrix-whatsapp/
diff --git a/ressources/mautrix-whatsapp/debian/rules b/ressources/mautrix-whatsapp/debian/rules
new file mode 100755
index 0000000..f8114e7
--- /dev/null
+++ b/ressources/mautrix-whatsapp/debian/rules
@@ -0,0 +1,28 @@
+#!/usr/bin/make -f
+# See debhelper(7) (uncomment to enable)
+# output every command that modifies files on the build system.
+#export DH_VERBOSE = 1
+
+
+# see FEATURE AREAS in dpkg-buildflags(1)
+#export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+
+# see ENVIRONMENT in dpkg-buildflags(1)
+# package maintainers to append CFLAGS
+#export DEB_CFLAGS_MAINT_APPEND  = -Wall -pedantic
+# package maintainers to append LDFLAGS
+#export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
+
+
+%:
+	dh $@
+
+# dh_make generated override targets
+# This is example for Cmake (See https://bugs.debian.org/641051 )
+#override_dh_auto_configure:
+#	dh_auto_configure -- \
+#	-DCMAKE_LIBRARY_PATH=$(DEB_HOST_MULTIARCH)
+
+override_dh_auto_build:
+	./build.sh 
+	cp example-config.yaml config.yaml
diff --git a/ressources/mautrix-whatsapp/debian/source/format b/ressources/mautrix-whatsapp/debian/source/format
new file mode 100644
index 0000000..89ae9db
--- /dev/null
+++ b/ressources/mautrix-whatsapp/debian/source/format
@@ -0,0 +1 @@
+3.0 (native)
diff --git a/ressources/metabase/debmaker b/ressources/metabase/debmaker
index 70c5c0a..9e515a8 100755
--- a/ressources/metabase/debmaker
+++ b/ressources/metabase/debmaker
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-VERSION=0.43.1
+VERSION=0.43.2
 
 [ -e ./lib/function.sh ] && source ./lib/function.sh
 
diff --git a/ressources/rss-bridge/debmaker b/ressources/rss-bridge/debmaker
index bdfe90c..ffebc32 100755
--- a/ressources/rss-bridge/debmaker
+++ b/ressources/rss-bridge/debmaker
@@ -1,28 +1,31 @@
 #!/bin/bash
 
+VERSION=2022-06-10
+
 [ -e ./lib/function.sh ] && source ./lib/function.sh
 
 APP=rss-bridge
-VERSION=2022-01-20
+DEPOT=https://github.com/RSS-Bridge/rss-bridge.git
 GIT_VERSION=$VERSION
-DEB_VERSION=$VERSION-3
+DEB_VERSION=$VERSION-$(date +%Y%m%d%H%M)
 DEBIAN_VERSION_CODENAME=bullseye
 IMAGE_SIZE=1
 
 STEP="envinit prebuild makedeb"
 
 envinit() {
-	apt install -y --no-install-recommends git fakeroot dpkg
+	apt-get update
+	apt-get dist-upgrade -y
+	apt install -y --no-install-recommends git fakeroot dpkg git
 }
 
 prebuild(){
-	GIT_VERSION=$1
-	git clone --depth 1 -b ${GIT_VERSION} https://github.com/RSS-Bridge/rss-bridge.git /tmp/rss-bridge
+	[ -e /tmp/${APP} ] && rm -fr /tmp/${APP}
+	git clone --depth 1 -b ${GIT_VERSION} ${DEPOT} /tmp/${APP}
+	
 }
 
 makedeb(){
-	GIT_VERSION=$1
-	DEB_VERSION=$2
 	PATH_DEB=/tmp/src/rootfs
 
 	cp -fr /tmp/rss-bridge ${PATH_DEB}/usr/share/
@@ -30,11 +33,11 @@ makedeb(){
 	cp ${PATH_DEB}/usr/share/rss-bridge/config.default.ini.php ${PATH_DEB}/etc/rss-bridge/config.ini.php 
 	cp ${PATH_DEB}/usr/share/rss-bridge/whitelist.default.txt ${PATH_DEB}/etc/rss-bridge/whitelist.txt
 
-	ln -s /etc/rss-bridge/config.ini.php ${PATH_DEB}/usr/share/rss-bridge/config.ini.php
-	ln -s /etc/rss-bridge/whitelist.txt ${PATH_DEB}/usr/share/rss-bridge/whitelist.txt
+	ln -s /etc/${APP}/config.ini.php ${PATH_DEB}/usr/share/rss-bridge/config.ini.php
+	ln -s /etc/${APP}/whitelist.txt ${PATH_DEB}/usr/share/rss-bridge/whitelist.txt
 
 	mkdir -p ${PATH_DEB}/var/cache/rss-bridge/cache/
-	rm ${PATH_DEB}/usr/share/rss-bridge/cache
+	rm -r ${PATH_DEB}/usr/share/rss-bridge/cache
 	ln -s /var/cache/rss-bridge/cache/ ${PATH_DEB}/usr/share/rss-bridge/cache
 	sed -i "s/%VERSION%/$DEB_VERSION/" ${PATH_DEB}/DEBIAN/control
 	fakeroot dpkg-deb -Z gzip --build ${PATH_DEB} /tmp/dist
diff --git a/ressources/rustdesk-server/debmaker b/ressources/rustdesk-server/debmaker
new file mode 100755
index 0000000..c41e310
--- /dev/null
+++ b/ressources/rustdesk-server/debmaker
@@ -0,0 +1,55 @@
+#!/bin/bash
+
+[ -e ./lib/function.sh ] && source ./lib/function.sh
+
+APP=rustdesk-server
+VERSION=1.1.5
+GIT_VERSION=$VERSION
+DEB_VERSION=$VERSION-$(date +%Y%m%d%H%M)
+DEBIAN_VERSION_CODENAME=bullseye
+IMAGE_SIZE=5
+DEPOT=https://github.com/rustdesk/rustdesk-server.git
+
+STEP="envinit prebuild build makedeb"
+
+envinit() {
+	apt-get update
+	apt-get dist-upgrade -y
+	apt install -y --no-install-recommends wget fakeroot dpkg ca-certificates build-essential git
+	apt clean
+}
+
+STEP="envinit prebuild build makedeb"
+
+envinit() {
+        apt-get update
+        apt-get dist-upgrade -y
+        apt install -y --no-install-recommends build-essential git wget fakeroot dpkg ca-certificates
+        cd /tmp
+        wget -qO - https://sh.rustup.rs > rustup
+        bash rustup -qy
+        apt clean
+}
+
+prebuild(){
+        [ -e /tmp/${APP} ] && rm -fr /tmp/${APP}
+        git clone --depth 1 ${DEPOT} /tmp/${APP}
+}
+
+build() {
+        cd /tmp/${APP}
+        source ~/.cargo/env
+        cargo build --release
+}
+
+makedeb(){
+        PATH_DEB=/tmp/src/rustdesk-server-hbbs
+        cp -fr //tmp/rustdesk-server/target/release/hbbs ${PATH_DEB}/usr/bin/
+        sed -i "s/%VERSION%/$DEB_VERSION/" ${PATH_DEB}/DEBIAN/control
+        fakeroot dpkg-deb -Z gzip --build ${PATH_DEB} /tmp/dist
+        
+         PATH_DEB=/tmp/src/rustdesk-server-hbbr
+        cp -fr //tmp/rustdesk-server/target/release/hbbr ${PATH_DEB}/usr/bin/
+        sed -i "s/%VERSION%/$DEB_VERSION/" ${PATH_DEB}/DEBIAN/control
+        fakeroot dpkg-deb -Z gzip --build ${PATH_DEB} /tmp/dist
+}
diff --git a/ressources/rustdesk-server/rustdesk-server-hbbr/DEBIAN/changelog b/ressources/rustdesk-server/rustdesk-server-hbbr/DEBIAN/changelog
new file mode 100644
index 0000000..e69de29
diff --git a/ressources/rustdesk-server/rustdesk-server-hbbr/DEBIAN/control b/ressources/rustdesk-server/rustdesk-server-hbbr/DEBIAN/control
new file mode 100644
index 0000000..227abc5
--- /dev/null
+++ b/ressources/rustdesk-server/rustdesk-server-hbbr/DEBIAN/control
@@ -0,0 +1,7 @@
+Package: rustdesk-server-hbbr
+Version: %VERSION%
+Section: base
+Priority: optional
+Architecture: all
+Maintainer: Thomas Legay <thomas@syngate.fr>
+Description: rustdesk-server-hbbr
diff --git a/ressources/rustdesk-server/rustdesk-server-hbbr/DEBIAN/postinst b/ressources/rustdesk-server/rustdesk-server-hbbr/DEBIAN/postinst
new file mode 100755
index 0000000..c73a6ac
--- /dev/null
+++ b/ressources/rustdesk-server/rustdesk-server-hbbr/DEBIAN/postinst
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+id hbbr &> /dev/null || useradd hbbr -r -s /bin/false -md /var/lib/hbbr
+chown hbbr:hbbr /var/lib/hbbr
diff --git a/ressources/rustdesk-server/rustdesk-server-hbbr/usr/lib/systemd/system/hbbr.service b/ressources/rustdesk-server/rustdesk-server-hbbr/usr/lib/systemd/system/hbbr.service
new file mode 100644
index 0000000..f692964
--- /dev/null
+++ b/ressources/rustdesk-server/rustdesk-server-hbbr/usr/lib/systemd/system/hbbr.service
@@ -0,0 +1,18 @@
+[Unit]
+Description=rustdesk-server-hbbs
+
+After=network.target
+
+[Service]
+User=hbbr
+Group=hbbr
+ExecStart=/usr/bin/hbbr
+PrivateTmp=true
+PrivateDevices=true
+ProtectHome=true
+ProtectSystem=strict
+WorkingDirectory=/var/lib//hbbr/
+ReadWriteDirectories=/var/lib/hbbr/
+
+[Install]
+WantedBy=multi-user.target
diff --git a/ressources/rustdesk-server/rustdesk-server-hbbs/DEBIAN/changelog b/ressources/rustdesk-server/rustdesk-server-hbbs/DEBIAN/changelog
new file mode 100644
index 0000000..e69de29
diff --git a/ressources/rustdesk-server/rustdesk-server-hbbs/DEBIAN/control b/ressources/rustdesk-server/rustdesk-server-hbbs/DEBIAN/control
new file mode 100644
index 0000000..f9f8937
--- /dev/null
+++ b/ressources/rustdesk-server/rustdesk-server-hbbs/DEBIAN/control
@@ -0,0 +1,7 @@
+Package: rustdesk-server-hbbs
+Version: %VERSION%
+Section: base
+Priority: optional
+Architecture: all
+Maintainer: Thomas Legay <thomas@syngate.fr>
+Description: rustdesk-server-hbbs
diff --git a/ressources/rustdesk-server/rustdesk-server-hbbs/DEBIAN/postinst b/ressources/rustdesk-server/rustdesk-server-hbbs/DEBIAN/postinst
new file mode 100755
index 0000000..5e33810
--- /dev/null
+++ b/ressources/rustdesk-server/rustdesk-server-hbbs/DEBIAN/postinst
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+id hbbs &> /dev/null || useradd hbbs -r -s /bin/false -md /var/lib/hbbs
+chown hbbs:hbbs /var/lib/hbbs
diff --git a/ressources/rustdesk-server/rustdesk-server-hbbs/usr/lib/systemd/system/hbbs.service b/ressources/rustdesk-server/rustdesk-server-hbbs/usr/lib/systemd/system/hbbs.service
new file mode 100644
index 0000000..fe145dc
--- /dev/null
+++ b/ressources/rustdesk-server/rustdesk-server-hbbs/usr/lib/systemd/system/hbbs.service
@@ -0,0 +1,18 @@
+[Unit]
+Description=rustdesk-server-hbbs
+
+After=network.target
+
+[Service]
+User=hbbs
+Group=hbbs
+ExecStart=/usr/bin/hbbs
+PrivateTmp=true
+PrivateDevices=true
+ProtectHome=true
+ProtectSystem=strict
+WorkingDirectory=/var/lib//hbbs/
+ReadWriteDirectories=/var/lib/hbbs/
+
+[Install]
+WantedBy=multi-user.target
diff --git a/ressources/slimbookbattery/debmaker b/ressources/slimbookbattery/debmaker
deleted file mode 100755
index 623c4d6..0000000
--- a/ressources/slimbookbattery/debmaker
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/bash
-
-VERSION=4.0.4
-
-[ -e ./lib/function.sh ] && source ./lib/function.sh
-
-APP=slimbookbattery
-DEPOT=https://launchpad.net/~slimbook/+archive/ubuntu/slimbook/+sourcefiles/slimbookbattery/${VERSION}/slimbookbattery_${VERSION}.tar.gz
-DEBIAN_VERSION_CODENAME=bullseye
-IMAGE_SIZE=1
-
-STEP="envinit prebuild build makedeb"
-
-envinit() {
-	apt-get update
-	if [ $(dpkg -l | grep -e 'ii  debhelper ' | wc -l) -eq 1 ];
-	then 
-		apt-get dist-upgrade -y
-	else
-		apt install -y --no-install-recommends wget ca-certificates debhelper build-essential 
-	fi
-}
-
-prebuild(){
-	wget -qO -  ${DEPOT} | tar -zx -C /tmp/
-}
-
-build() {
-	cd /tmp/slimbookbattery-${VERSION}
-	dpkg-buildpackage --no-sign
-}
-
-makedeb(){
-	mv  /tmp/slimbookbattery_${VERSION}_all.deb /tmp/dist
-}
diff --git a/ressources/tt-rss/debmaker b/ressources/tt-rss/debmaker
index e8e8cab..05b37a3 100755
--- a/ressources/tt-rss/debmaker
+++ b/ressources/tt-rss/debmaker
@@ -13,21 +13,22 @@ STEP="envinit prebuild makedeb"
 # build 
 
 envinit() {
+	apt-get update
+	apt-get dist-upgrade -y
 	apt-get install -y --no-install-recommends wget ca-certificates fakeroot dpkg git
+	apt clean
 }
 
 prebuild(){
-	rm -fr /tmp/tt-rss
-	git clone --depth 1 https://git.tt-rss.org/fox/tt-rss.git /tmp/tt-rss
+	[ -e /tmp/${APP} ] && rm -fr /tmp/${APP}
+	git clone --depth 1 https://git.tt-rss.org/fox/tt-rss.git /tmp/${APP}
 }
 
 build() {
-	cd  /tmp/tt-rss
+	cd /tmp/${APP}
 }
 
 makedeb(){
-	GIT_VERSION=$1
-	DEB_VERSION=$2
 	PATH_DEB=/tmp/src/rootfs
 
 	cp -fr /tmp/tt-rss/* ${PATH_DEB}/usr/share/tt-rss/
diff --git a/ressources/wallabag/debmaker b/ressources/wallabag/debmaker
index aeef42b..3ac5b1b 100755
--- a/ressources/wallabag/debmaker
+++ b/ressources/wallabag/debmaker
@@ -3,7 +3,7 @@
 [ -e ./lib/function.sh ] && source ./lib/function.sh
 
 APP=wallabag
-VERSION=2.5.0
+VERSION=2.5.1
 GIT_VERSION=$VERSION
 DEB_VERSION=${VERSION}-$(date +%Y%m%d%H%M)
 DEBIAN_VERSION_CODENAME=bullseye
@@ -16,10 +16,11 @@ envinit() {
 	apt-get update
 	apt-get dist-upgrade -y
 	apt-get install -y --no-install-recommends wget ca-certificates git php-common php-xml php-json php-gd php-mbstring php-xml php-tidy php-curl  php-tokenizer php-bcmath php-intl php-fpm unzip fakeroot dpkg gpg make
+	wget -qO - https://deb.nodesource.com/setup_16.x | bash
+	wget -qO - https://dl.yarnpkg.com/debian/pubkey.gpg | gpg --dearmor  > /usr/share/keyrings/yarnkey.gpg
 	echo "deb [signed-by=/usr/share/keyrings/yarnkey.gpg] https://dl.yarnpkg.com/debian stable main" > /etc/apt/sources.list.d/yarn.list
-	wget https://dl.yarnpkg.com/debian/pubkey.gpg -O - | gpg --dearmor  > /usr/share/keyrings/yarnkey.gpg
 	apt-get update
-	apt-get install yarn -y
+	apt-get install -y yarn nodejs
 }
 
 prebuild(){
diff --git a/ressources/zigbee2mqtt/debmaker b/ressources/zigbee2mqtt/debmaker
index 79319be..ff57a40 100755
--- a/ressources/zigbee2mqtt/debmaker
+++ b/ressources/zigbee2mqtt/debmaker
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-VERSION=1.25.1
+VERSION=1.25.2
 
 [ -e ./lib/function.sh ] && source ./lib/function.sh