[packages/prosody] updated to 0.11.5, use lua53 builds but is untested because the lack of dependencies required at run
bszx
bszx at pld-linux.org
Sat Apr 4 20:34:49 CEST 2020
commit dca41a0246ee8c0c788435884ef424a54dee3213
Author: Bartek Szady <bszx at bszx.eu>
Date: Sat Apr 4 20:10:25 2020 +0200
updated to 0.11.5, use lua53
builds but is untested because the lack of dependencies required at run time
prosody-config.patch | 15 +++++++--------
prosody.service | 2 +-
prosody.spec | 26 ++++++++++++++++----------
prosody.tmpfiles | 2 +-
4 files changed, 25 insertions(+), 20 deletions(-)
---
diff --git a/prosody.spec b/prosody.spec
index 9d6959b..ae73e62 100644
--- a/prosody.spec
+++ b/prosody.spec
@@ -2,19 +2,19 @@
%define sslcert /etc/prosody/certs/localhost.crt
Summary: Flexible communications server for Jabber/XMPP
Name: prosody
-Version: 0.9.2
+Version: 0.11.5
Release: 0.1
License: MIT
Group: Daemons
Source0: http://prosody.im/downloads/source/%{name}-%{version}.tar.gz
-# Source0-md5: bb91f73be0e19d049f1a57951b52c3a2
+# Source0-md5: 224b9b49bd1a568a9548590ade253dd6
Source1: %{name}.init
Source2: %{name}.tmpfiles
Source3: %{name}.service
Patch0: %{name}-config.patch
URL: http://prosody.im/
BuildRequires: libidn-devel
-BuildRequires: lua51-devel
+BuildRequires: lua53-devel
BuildRequires: openssl-devel
BuildRequires: rpmbuild(macros) >= 1.647
BuildRequires: sed >= 4.0
@@ -38,21 +38,24 @@ rapidly develop added functionality, or prototype new protocols.
%prep
%setup -q
%patch0 -p1
-sed -e 's|$(PREFIX)/lib|$(PREFIX)/%{_lib}|' -i Makefile
# fix wrong end of line encoding
%undos doc/stanza.txt doc/session.txt doc/roster_format.txt
%build
./configure \
--prefix=%{_prefix} \
- --with-lua-include=%{_includedir}/lua51 \
- --lua-suffix=51 \
- --runwith=lua51 \
+ --libdir=%{_libdir} \
+ --with-lua-include=%{_includedir}/lua5.3 \
+ --lua-suffix=5.3 \
+ --runwith=lua5.3 \
--c-compiler="%{__cc}" \
--cflags="%{rpmcppflags} %{rpmcflags} -fPIC -Wall -D_GNU_SOURCE" \
--ldflags="%{rpmldflags} -shared"
%{__make}
+sed -i -e '1c #!/usr/bin/lua5.3' prosody.install
+sed -i -e '1c #!/usr/bin/lua5.3' prosodyctl.install
+
%install
rm -rf $RPM_BUILD_ROOT
%{__make} install \
@@ -65,7 +68,7 @@ chmod -x $RPM_BUILD_ROOT%{_libdir}/%{name}/%{name}.version
chmod 0755 $RPM_BUILD_ROOT%{_libdir}/%{name}/util/*.so
# directories for datadir and pids
-install -d $RPM_BUILD_ROOT{%{_sharedstatedir}/%{name},%{_localstatedir}/run/%{name}}
+install -d $RPM_BUILD_ROOT{%{_sharedstatedir}/%{name},/run/%{name}}
# systemd stuff
install -d $RPM_BUILD_ROOT%{systemdunitdir}
@@ -145,7 +148,10 @@ fi
%{_libdir}/%{name}/core
%{_libdir}/%{name}/modules
%{_libdir}/%{name}/net
-%{_libdir}/%{name}/util
+%dir %{_libdir}/%{name}/util
+%{_libdir}/%{name}/util/*.lua
+%attr(755,root,root) %{_libdir}/%{name}/util/*.so
+%{_libdir}/%{name}/util/sasl
%{_libdir}/%{name}/prosody.version
%dir %{_sysconfdir}/%{name}
%dir %{_sysconfdir}/%{name}/certs
@@ -153,4 +159,4 @@ fi
%{systemdtmpfilesdir}/prosody.conf
%{systemdunitdir}/prosody.service
%dir %attr(755,prosody,prosody) %{_sharedstatedir}/prosody
-%dir %attr(710,prosody,prosody) %{_localstatedir}/run/prosody
+%dir %attr(710,prosody,prosody) /run/prosody
diff --git a/prosody-config.patch b/prosody-config.patch
index 37c09df..4e69a7a 100644
--- a/prosody-config.patch
+++ b/prosody-config.patch
@@ -1,9 +1,8 @@
-diff -up prosody-0.8.0/prosody.cfg.lua.dist.patch prosody-0.8.0/prosody.cfg.lua.dist
---- prosody-0.8.0/prosody.cfg.lua.dist.patch 2011-04-08 14:20:24.508974815 +0200
-+++ prosody-0.8.0/prosody.cfg.lua.dist 2011-04-08 14:25:56.159877253 +0200
-@@ -123,11 +123,12 @@ authentication = "internal_plain"
+--- prosody-0.11.5/prosody.cfg.lua.dist.orig 2020-01-19 16:50:32.000000000 +0100
++++ prosody-0.11.5/prosody.cfg.lua.dist 2020-04-04 11:24:01.668047272 +0200
+@@ -153,11 +153,12 @@
-- Logging configuration
- -- For advanced logging see http://prosody.im/doc/logging
+ -- For advanced logging see https://prosody.im/doc/logging
log = {
- info = "prosody.log"; -- Change 'info' to 'debug' for verbose logging
- error = "prosody.err";
@@ -13,7 +12,7 @@ diff -up prosody-0.8.0/prosody.cfg.lua.dist.patch prosody-0.8.0/prosody.cfg.lua.
+ "*syslog"; -- Uncomment this for logging to syslog
-- "*console"; -- Log to the console, useful for debugging with daemonize=false
}
-+pidfile = "/var/run/prosody/prosody.pid";
++pidfile = "/run/prosody/prosody.pid";
- ----------- Virtual hosts -----------
- -- You need to add a VirtualHost entry for each domain you wish Prosody to serve.
+ -- Uncomment to enable statistics
+ -- For more info see https://prosody.im/doc/statistics
diff --git a/prosody.service b/prosody.service
index d8eb11a..9a8c978 100644
--- a/prosody.service
+++ b/prosody.service
@@ -4,7 +4,7 @@ After=network.target
[Service]
Type=forking
-PIDFile=/var/run/prosody/prosody.pid
+PIDFile=/run/prosody/prosody.pid
ExecStart=/usr/bin/prosodyctl start
ExecStop=/usr/bin/prosodyctl stop
diff --git a/prosody.tmpfiles b/prosody.tmpfiles
index 563f04a..2968865 100644
--- a/prosody.tmpfiles
+++ b/prosody.tmpfiles
@@ -1 +1 @@
-d /var/run/prosody 710 prosody prosody
+d /run/prosody 710 prosody prosody
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/prosody.git/commitdiff/dca41a0246ee8c0c788435884ef424a54dee3213
More information about the pld-cvs-commit
mailing list