* [Buildroot] [V2 2/3] prosody: bump to version 0.10.0
2017-10-18 16:46 [Buildroot] [V2 1/3] prosody: refactor with PROSODY_CONF_OPTS variable Francois Perrad
@ 2017-10-18 16:46 ` Francois Perrad
2017-10-21 10:39 ` Thomas Petazzoni
2017-10-18 16:46 ` [Buildroot] [V2 3/3] prosody: remove tweaked configuration Francois Perrad
` (2 subsequent siblings)
3 siblings, 1 reply; 8+ messages in thread
From: Francois Perrad @ 2017-10-18 16:46 UTC (permalink / raw)
To: buildroot
This version is not restricted to Lua 5.1.
The configure script try to run lua, so it needs a host lua.
Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
---
package/prosody/Config.in | 4 ++--
package/prosody/prosody.hash | 8 ++++----
package/prosody/prosody.mk | 18 ++++++++----------
3 files changed, 14 insertions(+), 16 deletions(-)
diff --git a/package/prosody/Config.in b/package/prosody/Config.in
index 77eeb85ab..1bc79b7f2 100644
--- a/package/prosody/Config.in
+++ b/package/prosody/Config.in
@@ -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
diff --git a/package/prosody/prosody.hash b/package/prosody/prosody.hash
index 38942ea7f..d56099456 100644
--- a/package/prosody/prosody.hash
+++ b/package/prosody/prosody.hash
@@ -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
diff --git a/package/prosody/prosody.mk b/package/prosody/prosody.mk
index 5669f7707..d0adcc862 100644
--- a/package/prosody/prosody.mk
+++ b/package/prosody/prosody.mk
@@ -4,22 +4,16 @@
#
################################################################################
-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
-
-ifeq ($(BR2_PACKAGE_LUA_5_1),y)
-PROSODY_DEPENDENCIES += lua
-endif
-
-ifeq ($(BR2_PACKAGE_LUAJIT),y)
-PROSODY_DEPENDENCIES += luajit
-endif
+PROSODY_DEPENDENCIES = host-luainterpreter luainterpreter libidn openssl
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) \
@@ -27,6 +21,10 @@ 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) && ./configure $(PROSODY_CONF_OPTS)
endef
--
2.11.0
^ permalink raw reply related [flat|nested] 8+ messages in thread* [Buildroot] [V2 3/3] prosody: remove tweaked configuration
2017-10-18 16:46 [Buildroot] [V2 1/3] prosody: refactor with PROSODY_CONF_OPTS variable Francois Perrad
2017-10-18 16:46 ` [Buildroot] [V2 2/3] prosody: bump to version 0.10.0 Francois Perrad
@ 2017-10-18 16:46 ` Francois Perrad
2017-10-18 20:31 ` Thomas Petazzoni
2017-10-18 20:30 ` [Buildroot] [V2 1/3] prosody: refactor with PROSODY_CONF_OPTS variable Thomas Petazzoni
2017-10-21 9:47 ` Thomas Petazzoni
3 siblings, 1 reply; 8+ messages in thread
From: Francois Perrad @ 2017-10-18 16:46 UTC (permalink / raw)
To: buildroot
Upgrading a tweaked configuration is painful,
so stay with the upstream configuration which is already installed.
Everybody could make its own configuration in its rootfs_overlay.
Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
---
package/prosody/prosody.cfg.lua | 184 ----------------------------------------
package/prosody/prosody.mk | 11 ---
2 files changed, 195 deletions(-)
delete mode 100644 package/prosody/prosody.cfg.lua
diff --git a/package/prosody/prosody.cfg.lua b/package/prosody/prosody.cfg.lua
deleted file mode 100644
index 8329c0ad4..000000000
--- a/package/prosody/prosody.cfg.lua
+++ /dev/null
@@ -1,184 +0,0 @@
--- Prosody Example Configuration File
---
--- Information on configuring Prosody can be found on our
--- website at http://prosody.im/doc/configure
---
--- Tip: You can check that the syntax of this file is correct
--- when you have finished by running: luac -p prosody.cfg.lua
--- If there are any errors, it will let you know what and where
--- they are, otherwise it will keep quiet.
---
--- The only thing left to do is rename this file to remove the .dist ending, and fill in the
--- blanks. Good luck, and happy Jabbering!
-
-
----------- Server-wide settings ----------
--- Settings in this section apply to the whole server and are the default settings
--- for any virtual hosts
-
--- This is a (by default, empty) list of accounts that are admins
--- for the server. Note that you must create the accounts separately
--- (see http://prosody.im/doc/creating_accounts for info)
--- Example: admins = { "user1 at example.com", "user2 at example.net" }
-admins = { }
-
--- Enable use of libevent for better performance under high load
--- For more information see: http://prosody.im/doc/libevent
---use_libevent = true;
-
--- This is the list of modules Prosody will load on startup.
--- It looks for mod_modulename.lua in the plugins folder, so make sure that exists too.
--- Documentation on modules can be found at: http://prosody.im/doc/modules
-modules_enabled = {
-
- -- Generally required
- "roster"; -- Allow users to have a roster. Recommended ;)
- "saslauth"; -- Authentication for clients and servers. Recommended if you want to log in.
- "tls"; -- Add support for secure TLS on c2s/s2s connections
- "dialback"; -- s2s dialback support
- "disco"; -- Service discovery
-
- -- Not essential, but recommended
- "private"; -- Private XML storage (for room bookmarks, etc.)
- "vcard"; -- Allow users to set vCards
-
- -- These are commented by default as they have a performance impact
- --"privacy"; -- Support privacy lists
- --"compression"; -- Stream compression
-
- -- Nice to have
- "version"; -- Replies to server version requests
- "uptime"; -- Report how long server has been running
- "time"; -- Let others know the time here on this server
- "ping"; -- Replies to XMPP pings with pongs
- "pep"; -- Enables users to publish their mood, activity, playing music and more
- "register"; -- Allow users to register on this server using a client and change passwords
-
- -- Admin interfaces
- "admin_adhoc"; -- Allows administration via an XMPP client that supports ad-hoc commands
- --"admin_telnet"; -- Opens telnet console interface on localhost port 5582
-
- -- HTTP modules
- --"bosh"; -- Enable BOSH clients, aka "Jabber over HTTP"
- --"http_files"; -- Serve static files from a directory over HTTP
-
- -- Other specific functionality
- "posix"; -- POSIX functionality, sends server to background, enables syslog, etc.
- --"groups"; -- Shared roster support
- --"announce"; -- Send announcement to all online users
- --"welcome"; -- Welcome users who register accounts
- --"watchregistrations"; -- Alert admins of registrations
- --"motd"; -- Send a message to users when they log in
- --"legacyauth"; -- Legacy authentication. Only used by some old clients and bots.
-};
-
--- These modules are auto-loaded, but should you want
--- to disable them then uncomment them here:
-modules_disabled = {
- -- "offline"; -- Store offline messages
- -- "c2s"; -- Handle client connections
- -- "s2s"; -- Handle server-to-server connections
-};
-
--- Disable account creation by default, for security
--- For more information see http://prosody.im/doc/creating_accounts
-allow_registration = false;
-
--- These are the SSL/TLS-related settings. If you don't want
--- to use SSL/TLS, you may comment or remove this
-ssl = {
- key = "certs/localhost.key";
- certificate = "certs/localhost.crt";
-}
-
--- Force clients to use encrypted connections? This option will
--- prevent clients from authenticating unless they are using encryption.
-
-c2s_require_encryption = false
-
--- Force certificate authentication for server-to-server connections?
--- This provides ideal security, but requires servers you communicate
--- with to support encryption AND present valid, trusted certificates.
--- NOTE: Your version of LuaSec must support certificate verification!
--- For more information see http://prosody.im/doc/s2s#security
-
-s2s_secure_auth = false
-
--- Many servers don't support encryption or have invalid or self-signed
--- certificates. You can list domains here that will not be required to
--- authenticate using certificates. They will be authenticated using DNS.
-
---s2s_insecure_domains = { "gmail.com" }
-
--- Even if you leave s2s_secure_auth disabled, you can still require valid
--- certificates for some domains by specifying a list here.
-
---s2s_secure_domains = { "jabber.org" }
-
--- Select the authentication backend to use. The 'internal' providers
--- use Prosody's configured data storage to store the authentication data.
--- To allow Prosody to offer secure authentication mechanisms to clients, the
--- default provider stores passwords in plaintext. If you do not trust your
--- server please see http://prosody.im/doc/modules/mod_auth_internal_hashed
--- for information about using the hashed backend.
-
-authentication = "internal_plain"
-
--- Select the storage backend to use. By default Prosody uses flat files
--- in its configured data directory, but it also supports more backends
--- through modules. An "sql" backend is included by default, but requires
--- additional dependencies. See http://prosody.im/doc/storage for more info.
-
---storage = "sql" -- Default is "internal"
-
--- For the "sql" backend, you can uncomment *one* of the below to configure:
---sql = { driver = "SQLite3", database = "prosody.sqlite" } -- Default. 'database' is the filename.
---sql = { driver = "MySQL", database = "prosody", username = "prosody", password = "secret", host = "localhost" }
---sql = { driver = "PostgreSQL", database = "prosody", username = "prosody", password = "secret", host = "localhost" }
-
--- Logging configuration
--- For advanced logging see http://prosody.im/doc/logging
-log = {
- -- info = "prosody.log"; -- Change 'info' to 'debug' for verbose logging
- -- error = "prosody.err";
- "*syslog"; -- Logging to syslog
- -- "*console"; -- Log to the console, useful for debugging with daemonize=false
-}
-
-pidfile = "/var/run/prosody/prosody.pid"
-
------------ Virtual hosts -----------
--- You need to add a VirtualHost entry for each domain you wish Prosody to serve.
--- Settings under each VirtualHost entry apply *only* to that host.
-
-VirtualHost "localhost"
-
-VirtualHost "example.com"
- -- Assign this host a certificate for TLS, otherwise it would use the one
- -- set in the global section (if any).
- -- Note that old-style SSL on port 5223 only supports one certificate, and will always
- -- use the global one.
- ssl = {
- key = "certs/example.com.key";
- certificate = "certs/example.com.crt";
- }
-
------- Components ------
--- You can specify components to add hosts that provide special services,
--- like multi-user conferences, and transports.
--- For more information on components, see http://prosody.im/doc/components
-
----Set up a MUC (multi-user chat) room server on conference.example.com:
---Component "conference.example.com" "muc"
-
--- Set up a SOCKS5 bytestream proxy for server-proxied file transfers:
---Component "proxy.example.com" "proxy65"
-
----Set up an external component (default component port is 5347)
---
--- External components allow adding various services, such as gateways/
--- transports to other networks like ICQ, MSN and Yahoo. For more info
--- see: http://prosody.im/doc/components#adding_an_external_component
---
---Component "gateway.example.com"
--- component_secret = "password"
diff --git a/package/prosody/prosody.mk b/package/prosody/prosody.mk
index d0adcc862..8d90fe071 100644
--- a/package/prosody/prosody.mk
+++ b/package/prosody/prosody.mk
@@ -54,15 +54,4 @@ endef
PROSODY_POST_INSTALL_TARGET_HOOKS += PROSODY_REMOVE_CERT_GENERATOR
-# 1. Enable posix functionality
-# 2. Log to syslog
-# 3. Specify pid file write location
-# 4. Enable virtual host example.com
-define PROSODY_TWEAK_DEFAULT_CONF
- $(INSTALL) -D package/prosody/prosody.cfg.lua \
- $(TARGET_DIR)/etc/prosody/prosody.cfg.lua
-endef
-
-PROSODY_POST_INSTALL_TARGET_HOOKS += PROSODY_TWEAK_DEFAULT_CONF
-
$(eval $(generic-package))
--
2.11.0
^ permalink raw reply related [flat|nested] 8+ messages in thread* [Buildroot] [V2 1/3] prosody: refactor with PROSODY_CONF_OPTS variable
2017-10-18 16:46 [Buildroot] [V2 1/3] prosody: refactor with PROSODY_CONF_OPTS variable Francois Perrad
2017-10-18 16:46 ` [Buildroot] [V2 2/3] prosody: bump to version 0.10.0 Francois Perrad
2017-10-18 16:46 ` [Buildroot] [V2 3/3] prosody: remove tweaked configuration Francois Perrad
@ 2017-10-18 20:30 ` Thomas Petazzoni
2017-10-21 9:47 ` Thomas Petazzoni
3 siblings, 0 replies; 8+ messages in thread
From: Thomas Petazzoni @ 2017-10-18 20:30 UTC (permalink / raw)
To: buildroot
Hello,
On Wed, 18 Oct 2017 18:46:48 +0200, Francois Perrad wrote:
> Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
> ---
> package/prosody/prosody.mk | 19 ++++++++++---------
> 1 file changed, 10 insertions(+), 9 deletions(-)
>
> diff --git a/package/prosody/prosody.mk b/package/prosody/prosody.mk
> index f7a325b46..5669f7707 100644
> --- a/package/prosody/prosody.mk
> +++ b/package/prosody/prosody.mk
> @@ -18,16 +18,17 @@ ifeq ($(BR2_PACKAGE_LUAJIT),y)
> PROSODY_DEPENDENCIES += luajit
> endif
>
> +PROSODY_CONF_OPTS = \
> + --with-lua=$(STAGING_DIR)/usr \
> + --c-compiler=$(TARGET_CC) \
> + --cflags="$(TARGET_CFLAGS)" \
> + --linker=$(TARGET_CC) \
> + --ldflags="$(TARGET_LDFLAGS) -shared" \
> + --sysconfdir=/etc/prosody \
> + --prefix=/usr
> +
> 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)
This has a pretty strong side-effect: $(TARGET_CONFIGURE_OPTS) is no
longer passed in the environment. It is unrelated to the refactoring,
and not explained anywhere in the commit log.
Best regards,
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 8+ messages in thread