prosody: bump to version 0.10.0
PATCH 1/1 prosody: bump to version 0.10.0
this version is not restricted to Lua 5.1
the configure step is refactored with the variable PROSODY_CONF_OPTS
--- package/prosody/Config.in | 4 +- package/prosody/prosody.cfg.lua | 128 ++++++++++++++++++++++++---------------- package/prosody/prosody.hash | 8 +-- package/prosody/prosody.mk | 29 +++++---- 4 files changed, 96 insertions(+), 73 deletions(-)
package/prosody/Config.in +2 -2
@@ -1,6 +1,6 @@ config BR2_PACKAGE_PROSODY bool "prosody" - depends on BR2_PACKAGE_LUA_5_1 || BR2_PACKAGE_LUAJIT + depends on BR2_PACKAGE_HAS_LUAINTERPRETER select BR2_PACKAGE_LUAEXPAT # runtime select BR2_PACKAGE_LUASEC # runtime select BR2_PACKAGE_LUASOCKET # runtime
@@ -15,4 +15,4 @@ config BR2_PACKAGE_PROSODY https://prosody.im comment "prosody needs the lua interpreter" - depends on !BR2_PACKAGE_LUA_5_1 && !BR2_PACKAGE_LUAJIT + depends on !BR2_PACKAGE_HAS_LUAINTERPRETER
package/prosody/prosody.cfg.lua +76 -52
241 lines not on this page · raw message
package/prosody/prosody.hash +4 -4
@@ -1,5 +1,5 @@ # Hashes from: https://prosody.im/downloads/source/{MD5,SHA1,SHA256,SHA512}SUMS -md5 d743adea6cfbaacc3a24cc0c3928bb1b prosody-0.9.12.tar.gz -sha1 1ee224263a5b3d67960e12edbbe6b2f16b95d147 prosody-0.9.12.tar.gz -sha256 1a59a322b71928a21985522aa00d0eab3552208d7bf9ecb318542a1b2fee3e8d prosody-0.9.12.tar.gz -sha512 e87b5f3b3e327722cec9d8d0470684e2ec2788a1c5ae623c4f505a00572ef21f65afe84cd5b7de47d6a65fe8872506fe34e5e8886e20979ff84710669857ca76 prosody-0.9.12.tar.gz +md5 0eebf7a18ce1fc7dd9954c94ebd85f54 prosody-0.10.0.tar.gz +sha1 57c1c5a665e6453bdde06727ef398cd69accd9d7 prosody-0.10.0.tar.gz +sha256 7414e447256c60b2645578c4a5913113cd74b419ca5a032b54db90d98a978498 prosody-0.10.0.tar.gz +sha512 ee66e240afba6a8cb286623da48d9b535798153fb65e32070cec93aafe360e91f7087eeb49dec0f7d145e24f04339ed0878e50835b52f682130b204e22990ce9 prosody-0.10.0.tar.gz
package/prosody/prosody.mk +14 -15
@@ -4,30 +4,29 @@ # ################################################################################ -PROSODY_VERSION = 0.9.12 +PROSODY_VERSION = 0.10.0 PROSODY_SITE = https://prosody.im/downloads/source PROSODY_LICENSE = MIT PROSODY_LICENSE_FILES = COPYING -PROSODY_DEPENDENCIES = openssl libidn +PROSODY_DEPENDENCIES = host-luainterpreter luainterpreter libidn openssl -ifeq ($(BR2_PACKAGE_LUA_5_1),y) -PROSODY_DEPENDENCIES += lua -endif +PROSODY_CONF_OPTS = \ + --with-lua-bin="$(HOST_DIR)/usr/bin" \ + --with-lua="$(STAGING_DIR)/usr" \ + --lua-version=$(LUAINTERPRETER_ABIVER) \ + --c-compiler=$(TARGET_CC) \ + --cflags="$(TARGET_CFLAGS)" \ + --linker=$(TARGET_CC) \ + --ldflags="$(TARGET_LDFLAGS) -shared" \ + --sysconfdir=/etc/prosody \ + --prefix="/usr" ifeq ($(BR2_PACKAGE_LUAJIT),y) -PROSODY_DEPENDENCIES += luajit +PROSODY_CONF_OPTS += --runwith=luajit endif define PROSODY_CONFIGURE_CMDS - cd $(@D) && \ - $(TARGET_CONFIGURE_OPTS) \ - ./configure --prefix=/usr \ - --c-compiler=$(TARGET_CC) \ - --cflags="$(TARGET_CFLAGS)" \ - --linker=$(TARGET_CC) \ - --ldflags="$(TARGET_LDFLAGS) -shared" \ - --sysconfdir=/etc/prosody \ - --with-lua=$(STAGING_DIR)/usr + cd $(@D) && ./configure $(PROSODY_CONF_OPTS) endef define PROSODY_BUILD_CMDS
Signature · 1 line
2.11.0
PATCH 1/1 prosody: bump to version 0.10.0
Hi Francois,
I'm listed as the maintainer for Prosody simply by virtue of the fact that I first added the Prosody package. I'm not a Prosody dev, so these are more questions than comments...
package/prosody/prosody.cfg.lua modules_enabled = { · line 52
Quoted 6 lines
package/prosody/prosody.cfg.lua +3
-0-- Not essential, but recommended + "carbons"; -- Keep multiple clients in sync + "pep"; -- Enables users to publish their mood, activity, playing music and more "private"; -- Private XML storage (for room bookmarks, etc.) + "blocklist"; -- Allow users to block communications with other users "vcard"; -- Allow users to set vCards
I had a brief look at the release notes, and they state that the new modules that you added are 'native', does that mean that the required libraries are automatically included in the install?
package/prosody/prosody.cfg.lua modules_enabled = { · line 66
Quoted 2 lines
package/prosody/prosody.cfg.lua +0
-1-- Other specific functionality - "posix"; -- POSIX functionality, sends server to background, enables syslog, etc.
Did you mean to comment this out?
package/prosody/prosody.cfg.lua modules_disabled = { · line 92
Quoted 6 lines
--- These are the SSL/TLS-related settings. If you don't want --- to use SSL/TLS, you may comment or remove this
package/prosody/prosody.cfg.lua +0
-4-ssl = { - key = "certs/localhost.key"; - certificate = "certs/localhost.crt"; -}
Does Prosody start without any certificates? The config I provided was just enough to allow Prosody to start and accessible (albeit the user needs to make adjustments to suite that site).
package/prosody/prosody.cfg.lua s2s_secure_auth = false · line 135
Quoted 2 lines
package/prosody/prosody.cfg.lua +1
-1-authentication = "internal_plain" +authentication = "internal_hashed"
That's a good idea.
package/prosody/prosody.cfg.lua authentication = "internal_plain" · line 165
Quoted 6 lines
log = {
package/prosody/prosody.cfg.lua +2
-3- -- info = "prosody.log"; -- Change 'info' to 'debug' for verbose logging - -- error = "prosody.err"; - "*syslog"; -- Logging to syslog + info = "prosody.log"; -- Change 'info' to 'debug' for verbose logging + error = "prosody.err";
Where are these files created? In root I believe. My preferance is to just use syslog. I think the posix module needs to be enabled for syslog to work though.
Quoted 1 line
-pidfile = "
/var/run/prosody/prosody.pid"
Is this intentional? I used the pidfile to allow the startup script to terminate the service. Can you still terminate the service without this?
As I said earlier, I'm not a Prosody dev, so your changes may be perfectly valid. If so, explaining those changes in the commit message would be useful. I've CCd the dev mailing list in case they have additional comments.
Thanks,
Dushara
PATCH 1/1 prosody: bump to version 0.10.0
In reply to Francois PerradHello,
Quoted 4 lines · Francois Perrad
this version is not restricted to Lua 5.1
the configure step is refactored with the variablePROSODY_CONF_OPTSSigned-off-by Francois Perrad <[email protected]>
Thanks for this bump. One question below though.
package/prosody/prosody.mk line 11
Quoted 7 lines
package/prosody/prosody.mk +2
-2-PROSODY_VERSION = 0.9.12 +PROSODY_VERSION = 0.10.0 PROSODY_SITE = https://prosody.im/downloads/source PROSODY_LICENSE = MIT PROSODY_LICENSE_FILES = COPYING -PROSODY_DEPENDENCIES = openssl libidn +PROSODY_DEPENDENCIES = host-luainterpreter luainterpreter libidn openssl
Why do we need host-luainterpreter? There wasn't such a dependency in the previous version.
Quoted 20 lines
package/prosody/prosody.mk +11
-4-ifeq ($(BR2_PACKAGE_LUA_5_1),y) -PROSODY_DEPENDENCIES += lua -endif +PROSODY_CONF_OPTS = \ + --with-lua-bin="$(HOST_DIR)/usr/bin" \ + --with-lua="$(STAGING_DIR)/usr" \ + --lua-version=$(LUAINTERPRETER_ABIVER) \ + --c-compiler=$(TARGET_CC) \ + --cflags="$(TARGET_CFLAGS)" \ + --linker=$(TARGET_CC) \ + --ldflags="$(TARGET_LDFLAGS) -shared" \ + --sysconfdir=/etc/prosody \ + --prefix="/usr" ifeq ($(BR2_PACKAGE_LUAJIT),y) -PROSODY_DEPENDENCIES += luajit +PROSODY_CONF_OPTS += --runwith=luajit endif define PROSODY_CONFIGURE_CMDS
package/prosody/prosody.mk line 29
Quoted 10 lines
package/prosody/prosody.mk +1
-9- cd $(@D) && \ - $(TARGET_CONFIGURE_OPTS) \ - ./configure --prefix=/usr \ - --c-compiler=$(TARGET_CC) \ - --cflags="$(TARGET_CFLAGS)" \ - --linker=$(TARGET_CC) \ - --ldflags="$(TARGET_LDFLAGS) -shared" \ - --sysconfdir=/etc/prosody \ - --with-lua=$(STAGING_DIR)/usr + cd $(@D) && ./configure $(PROSODY_CONF_OPTS)
Even though the refactoring of CONF_OPTS is related to the bump, it would have been nice to have it as a separate patch, prior to the bump.
Thanks,
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux and Kernel engineering http://free-electrons.com