From beb4398b5182d2296e52282a5c9a606f1dbe8814 Mon Sep 17 00:00:00 2001 From: Luca Matei Pintilie Date: Sat, 24 Feb 2024 22:06:20 +0100 Subject: [PATCH 1/3] New package: lua-unbound-1.0.0 --- srcpkgs/lua51-unbound | 1 + srcpkgs/lua52-unbound | 1 + srcpkgs/lua53-unbound | 1 + srcpkgs/lua54-unbound/template | 81 ++++++++++++++++++++++++++++++++++ 4 files changed, 84 insertions(+) create mode 120000 srcpkgs/lua51-unbound create mode 120000 srcpkgs/lua52-unbound create mode 120000 srcpkgs/lua53-unbound create mode 100644 srcpkgs/lua54-unbound/template diff --git a/srcpkgs/lua51-unbound b/srcpkgs/lua51-unbound new file mode 120000 index 00000000000000..e7bb715780e25b --- /dev/null +++ b/srcpkgs/lua51-unbound @@ -0,0 +1 @@ +lua54-unbound \ No newline at end of file diff --git a/srcpkgs/lua52-unbound b/srcpkgs/lua52-unbound new file mode 120000 index 00000000000000..e7bb715780e25b --- /dev/null +++ b/srcpkgs/lua52-unbound @@ -0,0 +1 @@ +lua54-unbound \ No newline at end of file diff --git a/srcpkgs/lua53-unbound b/srcpkgs/lua53-unbound new file mode 120000 index 00000000000000..e7bb715780e25b --- /dev/null +++ b/srcpkgs/lua53-unbound @@ -0,0 +1 @@ +lua54-unbound \ No newline at end of file diff --git a/srcpkgs/lua54-unbound/template b/srcpkgs/lua54-unbound/template new file mode 100644 index 00000000000000..873fcf05868bab --- /dev/null +++ b/srcpkgs/lua54-unbound/template @@ -0,0 +1,81 @@ +# Template file for 'lua54-unbound' +pkgname=lua54-unbound +version=1.0.0 +revision=1 +_lua_versions="lua5.1 lua5.2 lua5.3 lua5.4" +hostmakedepends="pkg-config" +makedepends="unbound-devel" +for _lua_version in $_lua_versions; do + hostmakedepends+=" ${_lua_version/./}" + makedepends+=" ${_lua_version/./}-devel" +done +depends="lua54" +_desc="Binding to libunbound for Lua" +short_desc="${_desc} (5.4.x)" +maintainer="Luca Matei Pintilie " +license="MIT" +homepage="https://www.zash.se/luaunbound.html" +distfiles="https://code.zash.se/dl/luaunbound/luaunbound-${version}.tar.gz" +checksum=6de45aa64c21cf0ecbccb734b7c1eda8873a6135bbe142fbf353f772a90750d3 + +post_extract() { + mkdir -p lua51 + mv * lua51 || true + cp -a lua51 lua52 + cp -a lua51 lua53 + cp -a lua51 lua54 +} + +do_build() { + for _lua_version in $_lua_versions + do + cd "${wrksrc}/${_lua_version/./}" + make \ + LD="$CC" \ + CC="$CC" \ + LUA_PC="${_lua_version}" \ + ${makejobs} + done +} + +do_install() { + cd ${wrksrc}/lua51 + vinstall lunbound.so 755 usr/lib/lua/5.1/ + + cd ${wrksrc}/lua52 + vinstall lunbound.so 755 usr/lib/lua/5.2/ + + cd ${wrksrc}/lua53 + vinstall lunbound.so 755 usr/lib/lua/5.3/ + + cd ${wrksrc}/lua54 + vinstall lunbound.so 755 usr/lib/lua/5.4/ + vlicense LICENSE +} + +lua51-unbound_package() { + depends="lua51" + short_desc="${_desc} (5.1.x)" + pkg_install() { + vmove usr/lib/lua/5.1 + vlicense ${wrksrc}/lua51/LICENSE + } +} + +lua52-unbound_package() { + depends="lua52" + short_desc="${_desc} (5.2.x)" + pkg_install() { + vmove usr/lib/lua/5.2 + vlicense ${wrksrc}/lua52/LICENSE + } +} + +lua53-unbound_package() { + depends="lua53" + short_desc="${_desc} (5.3.x)" + pkg_install() { + vmove usr/lib/lua/5.3 + vlicense ${wrksrc}/lua53/LICENSE + } +} From 686437ca7a7b78b9ecf8a4866cf8a6fc1b8e39ed Mon Sep 17 00:00:00 2001 From: Luca Matei Pintilie Date: Sat, 24 Feb 2024 23:29:37 +0100 Subject: [PATCH 2/3] lua51-luasocket: update to lua54. --- srcpkgs/lua51-luasocket/template | 82 ++++++++++++++++++++++++++++---- srcpkgs/lua52-luasocket | 1 + srcpkgs/lua53-luasocket | 1 + srcpkgs/lua54-luasocket | 1 + 4 files changed, 77 insertions(+), 8 deletions(-) create mode 120000 srcpkgs/lua52-luasocket create mode 120000 srcpkgs/lua53-luasocket create mode 120000 srcpkgs/lua54-luasocket diff --git a/srcpkgs/lua51-luasocket/template b/srcpkgs/lua51-luasocket/template index 98bf69535d8399..50f691b760ab9c 100644 --- a/srcpkgs/lua51-luasocket/template +++ b/srcpkgs/lua51-luasocket/template @@ -1,26 +1,65 @@ # Template file for 'lua51-luasocket' pkgname=lua51-luasocket version=3.1.0 -revision=1 +revision=2 build_style=gnu-makefile -build_wrksrc=src -makedepends="lua51-devel" +_lua_versions="lua5.1 lua5.2 lua5.3 lua5.4" +for _lua_version in $_lua_versions; do + hostmakedepends+=" ${_lua_version/./}" + makedepends+=" ${_lua_version/./}-devel" +done depends="lua51" -short_desc="Network support for the Lua language" +_desc="Network support for the Lua language" +short_desc="${_desc} (5.1.x)" maintainer="Orphaned " license="MIT" homepage="https://lunarmodules.github.io/luasocket/" distfiles="https://github.com/lunarmodules/luasocket/archive/refs/tags/v3.1.0.tar.gz" checksum=bf033aeb9e62bcaa8d007df68c119c966418e8c9ef7e4f2d7e96bddeca9cca6e +post_extract() { + mkdir -p lua51 + mv * lua51 || true + cp -a lua51 lua52 + cp -a lua51 lua53 + cp -a lua51 lua54 +} + do_build() { - make CC=$CC LD=$CC LUAINC=${XBPS_CROSS_BASE}/usr/include/lua5.1 \ - PLAT=linux LUAVER=5.1 \ - ${makejobs} all-unix + for _lua_version in $_lua_versions + do + cd "${wrksrc}/${_lua_version/./}/src/" + make \ + LD="$CC" \ + CC="$CC" \ + LUAINC="${XBPS_CROSS_BASE}/usr/include/${_lua_version}" \ + LUAVER="${_lua_version#lua}" \ + LUAV="${_lua_version#lua}" \ + PLAT=linux \ + ${makejobs} \ + all-unix + done +} + +do_install() { + for _lua_version in $_lua_versions + do + cd "${wrksrc}/${_lua_version/./}/src/" + make \ + STRIP=true \ + PREFIX=/usr \ + prefix=/usr \ + DESTDIR="${DESTDIR}" \ + LUAVER="${_lua_version#lua}" \ + LUAV="${_lua_version#lua}" \ + LDIR_linux="lib/lua/${_lua_version#lua}" \ + PLAT=linux \ + install + done } post_install() { - vlicense ../LICENSE + vlicense ./lua51/LICENSE } luasocket_package() { @@ -28,3 +67,30 @@ luasocket_package() { short_desc+=" (transitional dummy package)" build_style=meta } + +lua52-luasocket_package() { + depends="lua52" + short_desc="${_desc} (5.2.x)" + pkg_install() { + vmove usr/lib/lua/5.2 + vlicense ${wrksrc}/lua52/LICENSE + } +} + +lua53-luasocket_package() { + depends="lua53" + short_desc="${_desc} (5.3.x)" + pkg_install() { + vmove usr/lib/lua/5.3 + vlicense ${wrksrc}/lua53/LICENSE + } +} + +lua54-luasocket_package() { + depends="lua54" + short_desc="${_desc} (5.4.x)" + pkg_install() { + vmove usr/lib/lua/5.4 + vlicense ${wrksrc}/lua54/LICENSE + } +} diff --git a/srcpkgs/lua52-luasocket b/srcpkgs/lua52-luasocket new file mode 120000 index 00000000000000..d061e632fab71c --- /dev/null +++ b/srcpkgs/lua52-luasocket @@ -0,0 +1 @@ +lua51-luasocket \ No newline at end of file diff --git a/srcpkgs/lua53-luasocket b/srcpkgs/lua53-luasocket new file mode 120000 index 00000000000000..d061e632fab71c --- /dev/null +++ b/srcpkgs/lua53-luasocket @@ -0,0 +1 @@ +lua51-luasocket \ No newline at end of file diff --git a/srcpkgs/lua54-luasocket b/srcpkgs/lua54-luasocket new file mode 120000 index 00000000000000..d061e632fab71c --- /dev/null +++ b/srcpkgs/lua54-luasocket @@ -0,0 +1 @@ +lua51-luasocket \ No newline at end of file From ab91927639ecd9deb98880b46c98365de7db6237 Mon Sep 17 00:00:00 2001 From: Luca Matei Pintilie Date: Sat, 24 Feb 2024 23:29:58 +0100 Subject: [PATCH 3/3] prosody: update to 0.12.4. --- srcpkgs/prosody/files/prosody.cfg.lua | 1 - srcpkgs/prosody/files/prosody/run | 2 +- srcpkgs/prosody/template | 19 +++++++++---------- 3 files changed, 10 insertions(+), 12 deletions(-) diff --git a/srcpkgs/prosody/files/prosody.cfg.lua b/srcpkgs/prosody/files/prosody.cfg.lua index 4f0d2d1ba93a16..f0a961349d3f83 100644 --- a/srcpkgs/prosody/files/prosody.cfg.lua +++ b/srcpkgs/prosody/files/prosody.cfg.lua @@ -13,7 +13,6 @@ ------ Void settings ------ -daemonize = false; pidfile = "/run/prosody/prosody.pid" ---------- Server-wide settings ---------- diff --git a/srcpkgs/prosody/files/prosody/run b/srcpkgs/prosody/files/prosody/run index e302e315d8676e..6425cdbb513fcb 100644 --- a/srcpkgs/prosody/files/prosody/run +++ b/srcpkgs/prosody/files/prosody/run @@ -2,4 +2,4 @@ exec 2>&1 mkdir -p /run/prosody chown prosody:prosody /run/prosody -exec chpst -u prosody:prosody prosody +exec chpst -u prosody:prosody prosody --no-daemonize diff --git a/srcpkgs/prosody/template b/srcpkgs/prosody/template index aa59bebadba329..261ca776c1f36b 100644 --- a/srcpkgs/prosody/template +++ b/srcpkgs/prosody/template @@ -1,17 +1,17 @@ # Template file for 'prosody' pkgname=prosody -version=0.12.1 -revision=4 +version=0.12.4 +revision=1 build_style=configure configure_args=" --ostype=linux --prefix=/usr --no-example-certs - --with-lua-include=${XBPS_CROSS_BASE}/usr/include/lua5.1 + --with-lua-include=${XBPS_CROSS_BASE}/usr/include/lua5.4 --with-lua=${XBPS_CROSS_BASE}/usr - --lua-version=5.1 - --lua-suffix=5.1 - --runwith=lua5.1" + --lua-version=5.4 + --lua-suffix=5.4 + --runwith=lua5.4" conf_files=" /etc/prosody/prosody.cfg.lua /etc/prosody/certs/localhost.cnf @@ -19,16 +19,15 @@ conf_files=" /etc/prosody/certs/makefile /etc/prosody/certs/GNUmakefile" make_dirs="/var/lib/prosody 0755 prosody prosody" -makedepends="lua51-devel openssl-devel libidn-devel icu-devel" -depends="lua51-luasocket lua51-luafilesystem lua51-luaexpat lua51-luasec - lua51-BitOp" +makedepends="lua54-devel openssl-devel libidn-devel icu-devel" +depends="lua54-luasocket lua54-luafilesystem lua54-luaexpat lua54-luasec lua54-unbound" short_desc="Lightweight and extensible Jabber/XMPP server written in Lua" maintainer="Orphaned " license="MIT" homepage="https://prosody.im/" changelog="https://prosody.im/doc/release/${version}" distfiles="https://prosody.im/downloads/source/${pkgname}-${version}.tar.gz" -checksum=a7ecbbe41f01a4251805593ac6d15dbc6cb75d9c7a876c76b456cf74ff4b90e5 +checksum=47d712273c2f29558c412f6cdaec073260bbc26b7dda243db580330183d65856 system_accounts="prosody" prosody_homedir="/var/lib/prosody"