From: AnInternetTroll <AnInternetTroll@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] prosody: update to 0.12.3.
Date: Sun, 25 Feb 2024 21:50:01 +0100 [thread overview]
Message-ID: <20240225205001.F072625625@inbox.vuxu.org> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-48919@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 1853 bytes --]
There is an updated pull request by AnInternetTroll against master on the void-packages repository
https://github.com/AnInternetTroll/void-packages user/luca/lua-unbound
https://github.com/void-linux/void-packages/pull/48919
prosody: update to 0.12.3.
- **New package: lua-unbound-1.0.0**
- **prosody: add lua51-unbound as a dependency**
#### Testing the changes
- I tested the changes in this PR: **YES**
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**
#### Local build testing
- I built this PR locally for my native architecture, (x86\_64-glibc)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
Crossbuilt from x86\_64-glibc and tested on aarch64-musl
Fixes the following warning that shows up when using prosodyctl (any
command):
```
**************************
Prosody was unable to find lua-unbound
This package can be obtained in the following ways:
Debian/Ubuntu | sudo apt install lua-unbound
luarocks | luarocks install luaunbound
Source | https://www.zash.se/luaunbound.html
Old DNS resolver library will be used
More help can be found on our website, at https://prosody.im/doc/depends
**************************
```
Fixes the following deprecation as well:
| Option | Default | Notes |
|-----------|---------|------------------------------------------------------------------------------------------------------|
| daemonize | true | Whether to daemonize Prosody or not. DEPRECATED since 0.12, use command line flags -D or -F instead. |
A patch file from https://github.com/void-linux/void-packages/pull/48919.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-user/luca/lua-unbound-48919.patch --]
[-- Type: text/x-diff, Size: 10048 bytes --]
From 031d4411aeb5a594c2b2aa53cb89c8a730d86ae4 Mon Sep 17 00:00:00 2001
From: Luca Matei Pintilie <luca@lucamatei.com>
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 | 83 ++++++++++++++++++++++++++++++++++
4 files changed, 86 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..4b6749be7307d1
--- /dev/null
+++ b/srcpkgs/lua54-unbound/template
@@ -0,0 +1,83 @@
+# 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 <luca@lucamatei.com>"
+license="MIT"
+homepage="https://www.zash.se/luaunbound.html"
+#changelog=""
+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 b6be6fb83d73e77196f02682f05a9e8d3ae07825 Mon Sep 17 00:00:00 2001
From: Luca Matei Pintilie <luca@lucamatei.com>
Date: Sat, 24 Feb 2024 23:29:37 +0100
Subject: [PATCH 2/3] lua51-luasocket: update to lua54.
---
srcpkgs/lua51-luasocket/template | 83 +++++++++++++++++++++++++++++---
srcpkgs/lua52-luasocket | 1 +
srcpkgs/lua53-luasocket | 1 +
srcpkgs/lua54-luasocket | 1 +
4 files changed, 78 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..2c1f03b9ba28ed 100644
--- a/srcpkgs/lua51-luasocket/template
+++ b/srcpkgs/lua51-luasocket/template
@@ -1,26 +1,66 @@
# 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 <orphan@voidlinux.org>"
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#???}" \
+ LUAV="${_lua_version#???}" \
+ 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#???}" \
+ LUAV="${_lua_version#???}" \
+ LDIR_linux="lib/lua/${_lua_version#???}" \
+ PLAT=linux \
+ install
+ done
}
post_install() {
- vlicense ../LICENSE
+ vlicense ./lua51/LICENSE
}
luasocket_package() {
@@ -28,3 +68,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 927a0bb2b6462d05e8e7d411ebaa71fec70e4edb Mon Sep 17 00:00:00 2001
From: Luca Matei Pintilie <luca@lucamatei.com>
Date: Sat, 24 Feb 2024 23:29:58 +0100
Subject: [PATCH 3/3] prosody: update to 0.12.3.
---
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..080ea5ed1121ee 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.3
+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 <orphan@voidlinux.org>"
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=35da0d031ff46040a2d638e004d4255e249b6323fe6212db9ddd76b401db2101
system_accounts="prosody"
prosody_homedir="/var/lib/prosody"
next prev parent reply other threads:[~2024-02-25 20:50 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-24 21:12 [PR PATCH] prosody: add lua51-unbound as a dependency AnInternetTroll
2024-02-25 20:35 ` [PR PATCH] [Updated] " AnInternetTroll
2024-02-25 20:50 ` AnInternetTroll [this message]
2024-02-26 17:30 ` [PR PATCH] [Updated] prosody: update to 0.12.3 AnInternetTroll
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240225205001.F072625625@inbox.vuxu.org \
--to=aninternettroll@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).