From b94bce4f857927be4a957b52764ae162e24c4d06 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Sat, 5 Aug 2023 17:02:30 +0200 Subject: [PATCH 1/2] Fix bookworm --- manifest.json | 2 +- scripts/_common.sh | 8 +++++++- scripts/install | 2 +- scripts/upgrade | 2 +- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/manifest.json b/manifest.json index 24211c6..93b913a 100644 --- a/manifest.json +++ b/manifest.json @@ -5,7 +5,7 @@ "description": { "en": "a modern XMPP communication server" }, - "version": "0.12.3~ynh1", + "version": "0.12.3~ynh2", "url": "https://prosody.im/", "upstream": { "license": "MIT", diff --git a/scripts/_common.sh b/scripts/_common.sh index ae5edbe..b602811 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -4,8 +4,14 @@ # COMMON VARIABLES #================================================= +if [[ $(lsb_release --codename --short) == "bookworm" ]]; then + luaversion="5.4" +else + luaversion="5.2" +fi + # dependencies used by the app -pkg_dependencies="gawk icu-devtools libicu-dev libidn11-dev|libidn-dev liblua5.4-dev libncurses-dev libpkgconf3 libreadline-dev libsigsegv2 libssl-dev libyaml-dev lua-busted lua-cliargs lua-dkjson lua-expat lua-inifile lua-luassert lua-mediator lua-penlight lua-say lua-system lua-term lua-yaml lua5.4 pkg-config|pkgconf-bin txt2man" +pkg_dependencies="libicu-dev libidn11-dev|libidn-dev liblua${luaversion}-dev libssl-dev lua-busted lua${luaversion} lua${luaversion}-expat lua${luaversion}-socket openssl txt2man lua${luaversion}-sec lua${luaversion}-unbound" #================================================= # PERSONAL HELPERS diff --git a/scripts/install b/scripts/install index 4513adb..b06f36e 100755 --- a/scripts/install +++ b/scripts/install @@ -103,7 +103,7 @@ ynh_setup_source --dest_dir="$builddir" #================================================= ynh_script_progression --message="Building Prosody..." -update-alternatives --set lua-interpreter /usr/bin/lua5.4 +update-alternatives --set lua-interpreter /usr/bin/lua${luaversion} pushd "$builddir" ./configure --prefix=/usr diff --git a/scripts/upgrade b/scripts/upgrade index d9dc619..2444952 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -103,7 +103,7 @@ if [ "$upgrade_type" == "UPGRADE_APP" ] then ynh_script_progression --message="Building Prosody..." - update-alternatives --set lua-interpreter /usr/bin/lua5.4 + update-alternatives --set lua-interpreter /usr/bin/lua${luaversion} pushd "$builddir" ./configure --prefix=/usr From abb149ecb80a6faa8f7d936056a305be2d634bf3 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sat, 5 Aug 2023 15:02:36 +0000 Subject: [PATCH 2/2] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index f5a1228..098a5f8 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in Prosody is a modern XMPP communication server. It aims to be easy to set up and configure, and efficient with system resources. Additionally, for developers it aims to be easy to extend and give a flexible system on which to rapidly develop added functionality, or prototype new protocols. -**Shipped version:** 0.12.3~ynh1 +**Shipped version:** 0.12.3~ynh2 ## Disclaimers / important information * Prosody will not replace the XMPP service Metronome integrated in YunoHost, it has been implemented for some specific apps that require Prosody diff --git a/README_fr.md b/README_fr.md index bb8a74d..52b645a 100644 --- a/README_fr.md +++ b/README_fr.md @@ -19,7 +19,7 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po Prosody is a modern XMPP communication server. It aims to be easy to set up and configure, and efficient with system resources. Additionally, for developers it aims to be easy to extend and give a flexible system on which to rapidly develop added functionality, or prototype new protocols. -**Version incluse :** 0.12.3~ynh1 +**Version incluse :** 0.12.3~ynh2 ## Avertissements / informations importantes * Prosody will not replace the XMPP service Metronome integrated in YunoHost, it has been implemented for some specific apps that require Prosody