buildroot.buildroot.org archive mirror
 help / color / mirror / Atom feed
* [Buildroot] [PATCH 1/2] package/luaunbound: new package
@ 2026-10-05 13:40 Francois Perrad
  2026-10-05 13:40 ` [Buildroot] [PATCH 2/2] package/prosody: bump to version 0.12.6 Francois Perrad
  0 siblings, 1 reply; 3+ messages in thread
From: Francois Perrad @ 2026-10-05 13:40 UTC (permalink / raw)
  To: buildroot; +Cc: Francois Perrad

a dependency for prosody

Signed-off-by: Francois Perrad <francois.perrad.86@gmail.com>
---
 package/Config.in                             |  1 +
 package/luaunbound/Config.in                  |  7 ++++++
 package/luaunbound/luaunbound.hash            |  3 +++
 package/luaunbound/luaunbound.mk              | 12 +++++++++
 .../testing/tests/package/test_luaunbound.py  | 25 +++++++++++++++++++
 5 files changed, 48 insertions(+)
 create mode 100644 package/luaunbound/Config.in
 create mode 100644 package/luaunbound/luaunbound.hash
 create mode 100644 package/luaunbound/luaunbound.mk
 create mode 100644 support/testing/tests/package/test_luaunbound.py

diff --git a/package/Config.in b/package/Config.in
index 433955169..be0e4b8ec 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -788,6 +788,7 @@ menu "Lua libraries/modules"
 	source "package/luasocket/Config.in"
 	source "package/luasql-sqlite3/Config.in"
 	source "package/luasyslog/Config.in"
+	source "package/luaunbound/Config.in"
 	source "package/lutok/Config.in"
 	source "package/luv/Config.in"
 	source "package/luvi/Config.in"
diff --git a/package/luaunbound/Config.in b/package/luaunbound/Config.in
new file mode 100644
index 000000000..cc4e06818
--- /dev/null
+++ b/package/luaunbound/Config.in
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_LUAUNBOUND
+	bool "luaunbound"
+	select BR2_PACKAGE_UNBOUND
+	help
+	  A binding to libunbound.
+
+	  https://www.zash.se/luaunbound.html
diff --git a/package/luaunbound/luaunbound.hash b/package/luaunbound/luaunbound.hash
new file mode 100644
index 000000000..dbf1c602e
--- /dev/null
+++ b/package/luaunbound/luaunbound.hash
@@ -0,0 +1,3 @@
+# computed by luarocks/buildroot
+sha256  99f4fb8695327f06d37013bfe09cad5103158d803941bbc3caed9328ecafd5bf  luaunbound-1.1.0-1.src.rock
+sha256  b02daf9bb40ed6504df2bcc7b51d78abea4cc3fe7a9819bcdc01d122dd3ac5f0  luaunbound-1.1.0/LICENSE
diff --git a/package/luaunbound/luaunbound.mk b/package/luaunbound/luaunbound.mk
new file mode 100644
index 000000000..d1523699e
--- /dev/null
+++ b/package/luaunbound/luaunbound.mk
@@ -0,0 +1,12 @@
+################################################################################
+#
+# luaunbound
+#
+################################################################################
+
+LUAUNBOUND_VERSION = 1.1.0-1
+LUAUNBOUND_LICENSE = MIT
+LUAUNBOUND_LICENSE_FILES = $(LUAUNBOUND_SUBDIR)/LICENSE
+LUAUNBOUND_DEPENDENCIES = unbound
+
+$(eval $(luarocks-package))
diff --git a/support/testing/tests/package/test_luaunbound.py b/support/testing/tests/package/test_luaunbound.py
new file mode 100644
index 000000000..9446f946c
--- /dev/null
+++ b/support/testing/tests/package/test_luaunbound.py
@@ -0,0 +1,25 @@
+from tests.package.test_lua import TestLuaBase
+
+
+class TestLuaLuaunbound(TestLuaBase):
+    config = TestLuaBase.config + \
+        """
+        BR2_PACKAGE_LUA=y
+        BR2_PACKAGE_LUAUNBOUND=y
+        """
+
+    def test_run(self):
+        self.login()
+        self.module_test("lunbound")
+
+
+class TestLuajitLuaunbound(TestLuaBase):
+    config = TestLuaBase.config + \
+        """
+        BR2_PACKAGE_LUAJIT=y
+        BR2_PACKAGE_LUAUNBOUND=y
+        """
+
+    def test_run(self):
+        self.login()
+        self.module_test("lunbound")
-- 
2.43.0

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply related	[flat|nested] 3+ messages in thread
* [Buildroot] [PATCH 2/2] package/prosody: bump to version 0.12.6
  2026-10-05 13:40 [Buildroot] [PATCH 1/2] package/luaunbound: new package Francois Perrad
@ 2026-10-05 13:40 ` Francois Perrad
  2026-10-10  8:33   ` Thomas Petazzoni via buildroot
  0 siblings, 1 reply; 3+ messages in thread
From: Francois Perrad @ 2026-10-05 13:40 UTC (permalink / raw)
  To: buildroot; +Cc: Francois Perrad

Lua 5.4 is recommended for this branch,
Lua 5.1 (& LuaJIT) is deprecated.
see https://prosody.im/doc/release/0.12.0#lua-version-support

Signed-off-by: Francois Perrad <francois.perrad.86@gmail.com>
---
 package/prosody/0001-enable-syslog.patch      |  4 +-
 package/prosody/0002-add-pidfile.patch        |  6 +--
 package/prosody/Config.in                     |  8 +--
 package/prosody/S50prosody                    |  3 +-
 package/prosody/prosody.hash                  | 11 ++--
 package/prosody/prosody.mk                    | 12 ++---
 support/testing/tests/package/test_prosody.py | 51 ++++++++-----------
 .../rootfs-overlay/etc/resolv.conf            |  0
 8 files changed, 41 insertions(+), 54 deletions(-)
 create mode 100644 support/testing/tests/package/test_prosody/rootfs-overlay/etc/resolv.conf

diff --git a/package/prosody/0001-enable-syslog.patch b/package/prosody/0001-enable-syslog.patch
index 5f09fa903..2ef969381 100644
--- a/package/prosody/0001-enable-syslog.patch
+++ b/package/prosody/0001-enable-syslog.patch
@@ -11,13 +11,13 @@ diff --git a/prosody.cfg.lua.dist b/prosody.cfg.lua.dist
 index a0fc6c9e..af3cc0e4 100644
 --- a/prosody.cfg.lua.dist
 +++ b/prosody.cfg.lua.dist
-@@ -166,7 +166,7 @@ archive_expires_after = "1w" -- Remove archived messages after 1 week
+@@ -185,7 +185,7 @@ archive_expires_after = "1w" -- Remove archived messages after 1 week
  log = {
  	info = "prosody.log"; -- Change 'info' to 'debug' for verbose logging
  	error = "prosody.err";
 -	-- "*syslog"; -- Uncomment this for logging to syslog
 +	"*syslog"; -- Uncomment this for logging to syslog
- 	-- "*console"; -- Log to the console, useful for debugging with daemonize=false
+ 	-- "*console"; -- Log to the console, useful for debugging when running in the foreground
  }
  
 -- 
diff --git a/package/prosody/0002-add-pidfile.patch b/package/prosody/0002-add-pidfile.patch
index 0653ed723..691985ad5 100644
--- a/package/prosody/0002-add-pidfile.patch
+++ b/package/prosody/0002-add-pidfile.patch
@@ -11,9 +11,9 @@ diff --git a/prosody.cfg.lua.dist b/prosody.cfg.lua.dist
 index af3cc0e4..675db12f 100644
 --- a/prosody.cfg.lua.dist
 +++ b/prosody.cfg.lua.dist
-@@ -187,6 +187,9 @@ log = {
- -- HTTPS currently only supports a single certificate, specify it here:
- --https_certificate = "certs/localhost.crt"
+@@ -205,6 +205,9 @@ log = {
+ -- Location of directory to find certificates in (relative to main config file):
+ certificates = "certs"
  
 +-- This must match the PIDFILE used in S50prosody
 +pidfile = "/var/run/prosody/prosody.pid"
diff --git a/package/prosody/Config.in b/package/prosody/Config.in
index d93350702..63f459b26 100644
--- a/package/prosody/Config.in
+++ b/package/prosody/Config.in
@@ -2,15 +2,15 @@ config BR2_PACKAGE_PROSODY
 	bool "prosody"
 	depends on BR2_USE_MMU # fork
 	depends on BR2_PACKAGE_HAS_LUAINTERPRETER
-	depends on !BR2_PACKAGE_LUA_5_4
+	depends on BR2_PACKAGE_LUA_5_4
 	depends on !BR2_STATIC_LIBS # luaexpat, luasec, luasocket, luafilesystem
-	select BR2_PACKAGE_LUABITOP if BR2_PACKAGE_LUA_5_1 # runtime
 	select BR2_PACKAGE_LUAEXPAT # runtime
 	select BR2_PACKAGE_LUASEC # runtime
 	select BR2_PACKAGE_LUASOCKET # runtime
 	select BR2_PACKAGE_OPENSSL
 	select BR2_PACKAGE_LIBIDN
 	select BR2_PACKAGE_LUAFILESYSTEM # runtime
+	select BR2_PACKAGE_LUAUNBOUND # runtime
 	help
 	  Prosody is a modern XMPP communication server. It aims to be
 	  easy to set up and configure, and efficient with system
@@ -22,5 +22,5 @@ comment "prosody needs the lua interpreter, dynamic library"
 	depends on !BR2_PACKAGE_HAS_LUAINTERPRETER || BR2_STATIC_LIBS
 	depends on BR2_USE_MMU
 
-comment "prosody needs a Lua <= 5.3"
-	depends on BR2_PACKAGE_LUA_5_4
+comment "prosody needs a Lua 5.4"
+	depends on !BR2_PACKAGE_LUA_5_4
diff --git a/package/prosody/S50prosody b/package/prosody/S50prosody
index 6fd33671f..c0beb06c2 100644
--- a/package/prosody/S50prosody
+++ b/package/prosody/S50prosody
@@ -13,7 +13,8 @@ case "$1" in
     printf "Starting $NAME: "
     mkdir -p $PIDDIR
     chown $NAME:$NAME $PIDDIR
-    start-stop-daemon -S -q -o -x /usr/bin/prosody -c $NAME
+    chown $NAME:$NAME /var/lib/$NAME
+    start-stop-daemon -S -b -q -o -x /usr/bin/prosody -c $NAME
     [ $? = 0 ] && echo "OK" || echo "FAIL"
     ;;
   stop)
diff --git a/package/prosody/prosody.hash b/package/prosody/prosody.hash
index 1fd1abafe..b7551eddc 100644
--- a/package/prosody/prosody.hash
+++ b/package/prosody/prosody.hash
@@ -1,8 +1,7 @@
-# Locally computed:
-md5  93665d86c47e99c9c525610ac53400fb  prosody-0.11.14.tar.gz
-sha1  abbd0ad42e2b30051f4d3f198c54a52b4e9f39d0  prosody-0.11.14.tar.gz
-sha256  ec0c7447ec07ed336b6912d06a2f533439cb16d60d8d3bffa8ce46269ee52c87  prosody-0.11.14.tar.gz
-sha512  128e12427ae0b5080fd3cc2380974c04570b16f0f79de7b39ef85cec6e8f579bee2d1150ce70ca731222c487dba646cbcd48bdb4a102a14395644eb5f19f1c88  prosody-0.11.14.tar.gz
+# Locally calculated after checking pgp signature
+# https://prosody.im/downloads/source/prosody-0.12.6.tar.gz.asc
+# using key 32A9EDDE3609931EB98CEAC315907E8E7BDD6BFE
+sha256  e06db3cfa8811d0b9fa7713a3b430189f62a1f90e6a4940771b1e16ce64e8e44  prosody-0.12.6.tar.gz
 
 # Hash for license file:
-sha256  bbbdc1c5426e5944cf869fc0faeaf19d88a220cd2b39ea98b7b8e86b0e88a2ef  COPYING
+sha256  abf5e6a32ab542ccba5861eaaf7aed9a86b8306abfe2c329646d54e43176dc0c  COPYING
diff --git a/package/prosody/prosody.mk b/package/prosody/prosody.mk
index b5d89ebba..a01e0f997 100644
--- a/package/prosody/prosody.mk
+++ b/package/prosody/prosody.mk
@@ -4,12 +4,12 @@
 #
 ################################################################################
 
-PROSODY_VERSION = 0.11.14
+PROSODY_VERSION = 0.12.6
 PROSODY_SITE = https://prosody.im/downloads/source
 PROSODY_LICENSE = MIT
 PROSODY_LICENSE_FILES = COPYING
 PROSODY_CPE_ID_VENDOR = prosody
-PROSODY_DEPENDENCIES = host-luainterpreter luainterpreter libidn openssl
+PROSODY_DEPENDENCIES = host-lua lua libidn openssl
 
 PROSODY_CFLAGS = $(TARGET_CFLAGS) -fPIC -std=c99 \
 	$(if BR2_TOOLCHAIN_USES_MUSL,-DWITHOUT_MALLINFO)
@@ -18,6 +18,7 @@ PROSODY_CONF_OPTS = \
 	--with-lua-bin=$(HOST_DIR)/bin \
 	--with-lua=$(STAGING_DIR)/usr \
 	--lua-version=$(LUAINTERPRETER_ABIVER) \
+	--idn-library=idn \
 	--c-compiler=$(TARGET_CC) \
 	--cflags="$(PROSODY_CFLAGS)" \
 	--linker=$(TARGET_CC) \
@@ -25,10 +26,6 @@ PROSODY_CONF_OPTS = \
 	--sysconfdir=/etc/prosody \
 	--prefix=/usr
 
-ifeq ($(BR2_PACKAGE_LUAJIT),y)
-PROSODY_CONF_OPTS += --runwith=luajit
-endif
-
 define PROSODY_CONFIGURE_CMDS
 	cd $(@D) && \
 		$(TARGET_CONFIGURE_OPTS) \
@@ -54,7 +51,8 @@ endef
 
 # make install installs a Makefile and meta data to generate certs
 define PROSODY_REMOVE_CERT_GENERATOR
-	rm -f $(TARGET_DIR)/etc/prosody/certs/Makefile
+	rm -f $(TARGET_DIR)/etc/prosody/certs/GNUmakefile
+	rm -f $(TARGET_DIR)/etc/prosody/certs/makefile
 	rm -f $(TARGET_DIR)/etc/prosody/certs/*.cnf
 endef
 
diff --git a/support/testing/tests/package/test_prosody.py b/support/testing/tests/package/test_prosody.py
index 8ef8ff95f..65ada66d2 100644
--- a/support/testing/tests/package/test_prosody.py
+++ b/support/testing/tests/package/test_prosody.py
@@ -1,13 +1,24 @@
+import infra.basetest
 from tests.package.test_lua import TestLuaBase
 
 
 class TestProsody(TestLuaBase):
+    rootfs_overlay = \
+        infra.filepath("tests/package/test_prosody/rootfs-overlay")
+    config = TestLuaBase.config + \
+        f"""
+        BR2_PACKAGE_LUA=y
+        BR2_PACKAGE_LUA_5_4=y
+        BR2_PACKAGE_PROSODY=y
+        BR2_ROOTFS_OVERLAY="{rootfs_overlay}"
+        """
+
     def lua_dependencies_test(self):
-        self.module_test('bit')     # luabitop
-        self.module_test('lfs')     # luafilesystem
-        self.module_test('lxp')     # luaexpat
-        self.module_test('socket')  # luasocket
-        self.module_test('ssl')     # luasec
+        self.module_test('lfs')         # luafilesystem
+        self.module_test('lunbound')    # luaunbound
+        self.module_test('lxp')         # luaexpat
+        self.module_test('socket')      # luasocket
+        self.module_test('ssl')         # luasec
 
     def prosody_test(self):
         # prosody was launched as service
@@ -15,34 +26,12 @@ class TestProsody(TestLuaBase):
         output, exit_code = self.emulator.run(cmd)
         self.assertEqual(exit_code, 0)
         self.assertIn("Prosody is running", output[0])
-
-
-class TestProsodyLua51(TestProsody):
-    config = TestLuaBase.config + \
-        """
-        BR2_PACKAGE_LUA=y
-        BR2_PACKAGE_LUA_5_1=y
-        BR2_PACKAGE_PROSODY=y
-        """
-
-    def test_run(self):
-        self.login()
-        self.version_test('Lua 5.1')
-        self.g_version_test('Lua 5.1')
-        self.lua_dependencies_test()
-        self.prosody_test()
-
-
-class TestProsodyLuajit(TestProsody):
-    config = TestLuaBase.config + \
-        """
-        BR2_PACKAGE_LUAJIT=y
-        BR2_PACKAGE_PROSODY=y
-        """
+        cmd = "prosodyctl about"
+        self.assertRunOk(cmd)
 
     def test_run(self):
         self.login()
-        self.version_test('LuaJIT 2')
-        self.g_version_test('Lua 5.1')
+        self.version_test('Lua 5.4')
+        self.g_version_test('Lua 5.4')
         self.lua_dependencies_test()
         self.prosody_test()
diff --git a/support/testing/tests/package/test_prosody/rootfs-overlay/etc/resolv.conf b/support/testing/tests/package/test_prosody/rootfs-overlay/etc/resolv.conf
new file mode 100644
index 000000000..e69de29bb
-- 
2.43.0

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply related	[flat|nested] 3+ messages in thread
* Re: [Buildroot] [PATCH 2/2] package/prosody: bump to version 0.12.6
  2026-10-05 13:40 ` [Buildroot] [PATCH 2/2] package/prosody: bump to version 0.12.6 Francois Perrad
@ 2026-10-10  8:33   ` Thomas Petazzoni via buildroot
  0 siblings, 0 replies; 3+ messages in thread
From: Thomas Petazzoni via buildroot @ 2026-10-10  8:33 UTC (permalink / raw)
  To: Francois Perrad; +Cc: buildroot

Hello,

On Mon, Oct 05, 2026 at 03:40:56PM +0200, Francois Perrad wrote:
> Lua 5.4 is recommended for this branch,
> Lua 5.1 (& LuaJIT) is deprecated.
> see https://prosody.im/doc/release/0.12.0#lua-version-support
> 
> Signed-off-by: Francois Perrad <francois.perrad.86@gmail.com>
> ---
>  package/prosody/0001-enable-syslog.patch      |  4 +-
>  package/prosody/0002-add-pidfile.patch        |  6 +--
>  package/prosody/Config.in                     |  8 +--
>  package/prosody/S50prosody                    |  3 +-
>  package/prosody/prosody.hash                  | 11 ++--
>  package/prosody/prosody.mk                    | 12 ++---
>  support/testing/tests/package/test_prosody.py | 51 ++++++++-----------
>  .../rootfs-overlay/etc/resolv.conf            |  0

Could you comment on why you need this empty /etc/resolv.conf in the
rootfs overlay for the test?

Thanks a lot!

Thomas
-- 
Thomas Petazzoni, co-owner and CEO, Bootlin
Embedded Linux and Kernel engineering and training
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply	[flat|nested] 3+ messages in thread
end of thread, other threads:[~2026-10-10  8:33 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-10-05 13:40 [Buildroot] [PATCH 1/2] package/luaunbound: new package Francois Perrad
2026-10-05 13:40 ` [Buildroot] [PATCH 2/2] package/prosody: bump to version 0.12.6 Francois Perrad
2026-10-10  8:33   ` Thomas Petazzoni via buildroot

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).