From 976a7c707834698d069d35dd332f226ece31f68a Mon Sep 17 00:00:00 2001 From: thomas Date: Mon, 6 Feb 2023 13:57:24 +0100 Subject: [PATCH] update --- ressources/adguardhome/debmaker | 2 +- ressources/budibase/debmaker | 2 +- ressources/element-web/debmaker | 2 +- ressources/phpbb-language-fr/debmaker | 2 +- ressources/phpbb/debmaker | 4 +-- ressources/postfixadmin/debmaker | 3 ++- ressources/tt-rss-plugin-readability/debmaker | 23 +++++++++++++++++ .../rootfs/DEBIAN/changelog | 0 .../rootfs/DEBIAN/control | 8 ++++++ ressources/wallabag/debmaker | 25 +++++++++++-------- ressources/zigbee2mqtt/debmaker | 2 +- 11 files changed, 54 insertions(+), 19 deletions(-) create mode 100755 ressources/tt-rss-plugin-readability/debmaker create mode 100644 ressources/tt-rss-plugin-readability/rootfs/DEBIAN/changelog create mode 100644 ressources/tt-rss-plugin-readability/rootfs/DEBIAN/control diff --git a/ressources/adguardhome/debmaker b/ressources/adguardhome/debmaker index 9ac231e..d616115 100755 --- a/ressources/adguardhome/debmaker +++ b/ressources/adguardhome/debmaker @@ -1,6 +1,6 @@ #!/bin/bash -VERSION=0.108.0-b.25 +VERSION=0.108.0-b.26 APP=adguardhome DEPOT=https://github.com/AdguardTeam/AdGuardHome.git GIT_VERSION=v${VERSION} diff --git a/ressources/budibase/debmaker b/ressources/budibase/debmaker index eaa387e..ff46866 100755 --- a/ressources/budibase/debmaker +++ b/ressources/budibase/debmaker @@ -1,6 +1,6 @@ #!/bin/bash -VERSION=2.2.22 +VERSION=2.3.0 APP=budibase DEPOT=https://github.com/Budibase/budibase.git GIT_VERSION=v${VERSION} diff --git a/ressources/element-web/debmaker b/ressources/element-web/debmaker index 7996913..5e6b5e9 100755 --- a/ressources/element-web/debmaker +++ b/ressources/element-web/debmaker @@ -1,6 +1,6 @@ #!/bin/bash -VERSION=1.11.20 +VERSION=1.11.22 APP=element-web DEPOT=https://github.com/vector-im/element-web.git GIT_VERSION=v${VERSION} diff --git a/ressources/phpbb-language-fr/debmaker b/ressources/phpbb-language-fr/debmaker index 1d192fa..4932e7a 100755 --- a/ressources/phpbb-language-fr/debmaker +++ b/ressources/phpbb-language-fr/debmaker @@ -1,6 +1,6 @@ #!/bin/bash -VERSION=4.9.0 +VERSION=4.10.0 APP=phpbb-language-fr DEPOT=https://github.com/qiaeru/phpbb-language-fr.git GIT_VERSION=v$VERSION diff --git a/ressources/phpbb/debmaker b/ressources/phpbb/debmaker index 4e2e992..5dfd166 100755 --- a/ressources/phpbb/debmaker +++ b/ressources/phpbb/debmaker @@ -1,13 +1,13 @@ #!/bin/bash -VERSION=3.3.9 +VERSION=3.3.10 APP=phpbb DEPOT=https://github.com/phpbb/phpbb.git GIT_VERSION=release-$VERSION DEB_VERSION=$VERSION-$(date +%Y%m%d%H%M) DEBIAN_VERSION_CODENAME=bullseye IMAGE_SIZE=2 -PACKAGE_DEPENDENCY="php-simplexml php-curl php-zip" +PACKAGE_DEPENDENCY="php-simplexml php-curl php-zip php-cli" main(){ base_package_upgrade diff --git a/ressources/postfixadmin/debmaker b/ressources/postfixadmin/debmaker index d45a972..d1ffe8d 100755 --- a/ressources/postfixadmin/debmaker +++ b/ressources/postfixadmin/debmaker @@ -7,7 +7,7 @@ GIT_VERSION=postfixadmin-${VERSION} DEB_VERSION=${VERSION}-$(date +%Y%m%d%H%M) DEBIAN_VERSION_CODENAME=bullseye IMAGE_SIZE=4 -PACKAGE_DEPENDENCY="debhelper-compat build-essential:native dh-apache2 composer php-sqlite3 php-mysql php-xml" +PACKAGE_DEPENDENCY="debhelper-compat build-essential:native dh-apache2 composer php-sqlite3 php-mysql php-xml php-zip" main(){ base_package_upgrade @@ -26,6 +26,7 @@ build(){ makedeb(){ cd /tmp/${APP}/ + rm /tmp/*.deb make -f debian/rules binary-indep cp /tmp/*.deb /tmp/dist } diff --git a/ressources/tt-rss-plugin-readability/debmaker b/ressources/tt-rss-plugin-readability/debmaker new file mode 100755 index 0000000..9bdfc5a --- /dev/null +++ b/ressources/tt-rss-plugin-readability/debmaker @@ -0,0 +1,23 @@ +#!/bin/bash + +APP=tt-rss-plugin-readability +GIT_VERSION=last +DEB_VERSION=$(date +%Y%m%d%H%M) +DEBIAN_VERSION_CODENAME=bullseye +IMAGE_SIZE=1 +DEPOT=https://dev.tt-rss.org/tt-rss/ttrss-af-readability.git + +main(){ + base_package_upgrade + get_git_source + makedeb +} + +makedeb(){ + PATH_DEB=/tmp/src/rootfs + mkdir -p ${PATH_DEB}/usr/share/tt-rss/plugins/ + cp -fr /tmp/${APP} ${PATH_DEB}/usr/share/tt-rss/plugins/af_readability + + sed -i "s/%VERSION%/$DEB_VERSION/" ${PATH_DEB}/DEBIAN/control + fakeroot dpkg-deb -Z gzip --build ${PATH_DEB} /tmp/dist +} diff --git a/ressources/tt-rss-plugin-readability/rootfs/DEBIAN/changelog b/ressources/tt-rss-plugin-readability/rootfs/DEBIAN/changelog new file mode 100644 index 0000000..e69de29 diff --git a/ressources/tt-rss-plugin-readability/rootfs/DEBIAN/control b/ressources/tt-rss-plugin-readability/rootfs/DEBIAN/control new file mode 100644 index 0000000..475782f --- /dev/null +++ b/ressources/tt-rss-plugin-readability/rootfs/DEBIAN/control @@ -0,0 +1,8 @@ +Package: tt-rss-plugin-readability +Version: %VERSION% +Section: contrib +Priority: optional +Architecture: all +Depends: tt-rss, php-curl +Maintainer: Thomas Legay +Description: tt-rss-plugin-readability diff --git a/ressources/wallabag/debmaker b/ressources/wallabag/debmaker index b984d19..ca291b2 100755 --- a/ressources/wallabag/debmaker +++ b/ressources/wallabag/debmaker @@ -1,6 +1,6 @@ #!/bin/bash -VERSION=2.5.2 +VERSION=2.5.3 APP=wallabag GIT_VERSION=$VERSION DEB_VERSION=${VERSION}-$(date +%Y%m%d%H%M) @@ -8,24 +8,27 @@ DEBIAN_VERSION_CODENAME=bullseye IMAGE_SIZE=4 DEPOT=https://github.com/wallabag/wallabag.git -STEP="base_package_upgrade envinit prebuild build makedeb" +PACKAGE_DEPENDENCY="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 make yarn nodejs" + +main(){ + base_package_upgrade + envinit + get_git_source + build + makedeb +} envinit() { configure_depot_yarn configure_depot_nodejs - apt-get install -y --no-install-recommends 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 make yarn nodejs -} - -prebuild(){ - [ -e /tmp/${APP} ] && rm -fr /tmp/${APP} - git clone --depth 1 -b ${GIT_VERSION} ${DEPOT} /tmp/${APP} - cd /tmp/${APP} - wget https://getcomposer.org/download/2.2.13/composer.phar + install_package_dependency + cd /opt/ + wget https://getcomposer.org/download/2.2.13/composer.phar -O /opt/composer.phar } build() { cd /tmp/${APP} - SYMFONY_ENV=prod php composer.phar install --no-dev -o --prefer-dist -n --no-scripts + COMPOSER_ALLOW_SUPERUSER=1 SYMFONY_ENV=prod php /opt/composer.phar install --no-dev -o --prefer-dist -n --no-scripts ENV=PROD make build } diff --git a/ressources/zigbee2mqtt/debmaker b/ressources/zigbee2mqtt/debmaker index 9c5e638..8550492 100755 --- a/ressources/zigbee2mqtt/debmaker +++ b/ressources/zigbee2mqtt/debmaker @@ -1,6 +1,6 @@ #!/bin/bash -VERSION=1.29.2 +VERSION=1.30.0 APP=zigbee2mqtt DEPOT=https://github.com/Koenkk/zigbee2mqtt.git GIT_VERSION=${VERSION}