panovotn pushed to postgresql (stream-postgresql-12). "Own
%{_libdir}/pgsql in postgresql-server"
by notificationsï¼ fedoraproject.org
Notification time stamped 2019-09-30 23:49:07 UTC
From 592a340fa205ccac552c014b914259d9624dc727 Mon Sep 17 00:00:00 2001
From: Sandro Mani <smani(a)fedoraproject.org>
Date: Sep 30 2019 23:45:50 +0000
Subject: Own %{_libdir}/pgsql in postgresql-server
---
diff --git a/postgresql.spec b/postgresql.spec
index 38bbe5c..a8d2166 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -1097,6 +1097,7 @@ make -C postgresql-setup-%{setup_version} check
%{_datadir}/pgsql/tsearch_data/
%dir %{_datadir}/postgresql-setup
%{_datadir}/postgresql-setup/library.sh
+%dir %{_libdir}/pgsql
%{_libdir}/pgsql/*_and_*.so
%{_libdir}/pgsql/dict_snowball.so
%{_libdir}/pgsql/euc2004_sjis2004.so
https://src.fedoraproject.org/rpms/postgresql/c/592a340fa205ccac552c014b9...
4Â years, 2Â months
pagure pushed to postgresql (master). "Own %{_libdir}/pgsql in
postgresql-server"
by notificationsï¼ fedoraproject.org
Notification time stamped 2019-09-30 23:44:11 UTC
From 95a1777ae4ba705bcef3374b9ca68244367ce44b Mon Sep 17 00:00:00 2001
From: Sandro Mani <smani(a)fedoraproject.org>
Date: Sep 28 2019 10:39:51 +0000
Subject: Own %{_libdir}/pgsql in postgresql-server
---
diff --git a/postgresql.spec b/postgresql.spec
index 1fddb14..9286c6f 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -1099,6 +1099,7 @@ make -C postgresql-setup-%{setup_version} check
%{_datadir}/pgsql/tsearch_data/
%dir %{_datadir}/postgresql-setup
%{_datadir}/postgresql-setup/library.sh
+%dir %{_libdir}/pgsql
%{_libdir}/pgsql/*_and_*.so
%{_libdir}/pgsql/dict_snowball.so
%{_libdir}/pgsql/euc2004_sjis2004.so
https://src.fedoraproject.org/rpms/postgresql/c/95a1777ae4ba705bcef3374b9...
4Â years, 2Â months
mbooth pushed to hibernate (f31). "Build against generic OSGi APIs
instead of Equinox specifically"
by notificationsï¼ fedoraproject.org
Notification time stamped 2019-09-30 23:32:55 UTC
From e22bb8591c93ffb499230a0231e7d49e2d9a13bd Mon Sep 17 00:00:00 2001
From: Mat Booth <mat.booth(a)redhat.com>
Date: Sep 30 2019 23:32:37 +0000
Subject: Build against generic OSGi APIs instead of Equinox specifically
---
diff --git a/hibernate.spec b/hibernate.spec
index 50378f2..e509168 100644
--- a/hibernate.spec
+++ b/hibernate.spec
@@ -12,7 +12,7 @@
Name: hibernate
Version: 5.0.10
-Release: 7%{?dist}
+Release: 8%{?dist}
Summary: Relational persistence and query service
License: LGPLv2+ and ASL 2.0
URL: http://www.hibernate.org/
@@ -57,7 +57,8 @@ BuildRequires: mvn(org.apache.geronimo.specs:geronimo-jta_1.1_spec)
BuildRequires: mvn(org.apache.geronimo.specs:specs-parent:pom:)
BuildRequires: mvn(org.bsc.maven:maven-processor-plugin)
BuildRequires: mvn(org.codehaus.mojo:antlr-maven-plugin)
-BuildRequires: mvn(org.eclipse.osgi:org.eclipse.osgi)
+BuildRequires: mvn(org.osgi:osgi.core)
+BuildRequires: mvn(org.osgi:osgi.cmpn)
%if %{with spatial}
BuildRequires: mvn(org.geolatte:geolatte-geom)
BuildRequires: mvn(postgresql:postgresql)
@@ -360,9 +361,9 @@ popd
# Fix HikariCP aId
%pom_change_dep "com.zaxxer:HikariCP-java6" "com.zaxxer:HikariCP:2.4.0" hibernate-hikaricp
-# Use eclipse apis only
-%pom_change_dep "org.osgi:org.osgi.core" "org.eclipse.osgi:org.eclipse.osgi:3.10.102.v20160416-2200" hibernate-osgi
-%pom_remove_dep "org.osgi:org.osgi.compendium" hibernate-osgi
+# Use OSGi R7 APIs
+%pom_change_dep "org.osgi:org.osgi.core" "org.osgi:osgi.core" hibernate-osgi
+%pom_change_dep "org.osgi:org.osgi.compendium" "org.osgi:osgi.cmpn" hibernate-osgi
# Use narayana instead of old jboss-jts
%pom_change_dep "org.jboss.jbossts:jbossjta" "org.jboss.narayana.jta:jta" hibernate-testing
@@ -457,6 +458,9 @@ done
%license lgpl.txt LICENSE-2.0.txt
%changelog
+* Mon Sep 30 2019 Mat Booth <mat.booth(a)redhat.com> - 5.0.10-8
+- Build against generic OSGi APIs instead of Equinox specifically
+
* Thu Jul 25 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 5.0.10-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
https://src.fedoraproject.org/rpms/hibernate/c/e22bb8591c93ffb499230a0231...
4Â years, 2Â months
rhcontainerbot pushed to podman (master).
"podman-2:1.6.0-0.42.dev.gitd7eba02 (..more)"
by notificationsï¼ fedoraproject.org
Notification time stamped 2019-09-30 23:16:03 UTC
From bcf3165e116d0cce88aab065690e1d9da3cfe7ab Mon Sep 17 00:00:00 2001
From: RH Container Bot <rhcontainerbot(a)fedoraproject.org>
Date: Sep 30 2019 23:15:57 +0000
Subject: podman-2:1.6.0-0.42.dev.gitd7eba02
- autobuilt d7eba02
Signed-off-by: RH Container Bot <rhcontainerbot(a)fedoraproject.org>
---
diff --git a/.gitignore b/.gitignore
index 7fed1c2..4440837 100644
--- a/.gitignore
+++ b/.gitignore
@@ -523,3 +523,4 @@
/libpod-04b3a73.tar.gz
/libpod-b063383.tar.gz
/libpod-5702dd7.tar.gz
+/libpod-d7eba02.tar.gz
diff --git a/podman.spec b/podman.spec
index 4d8ae4f..ae9e59b 100644
--- a/podman.spec
+++ b/podman.spec
@@ -27,7 +27,7 @@
%global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo}
%global import_path %{provider_prefix}
%global git0 https://%{provider}.%{provider_tld}/%{project}/%{repo}
-%global commit0 5702dd7005e55d53db9f707bb3b6de5d70c9ed40
+%global commit0 d7eba026876e4a6a362464dcf08fe6757ebedd1a
%global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
# Used for comparing with latest upstream tag
@@ -41,7 +41,7 @@ Epoch: 2
Version: 1.6.0
# Rawhide almost always ships unreleased builds,
# so release tag should be of the form 0.N.blahblah
-Release: 0.41.dev.git%{shortcommit0}%{?dist}
+Release: 0.42.dev.git%{shortcommit0}%{?dist}
Summary: Manage Pods, Containers and Container Images
License: ASL 2.0
URL: https://%{name}.io/
@@ -585,6 +585,9 @@ exit 0
%endif
%changelog
+* Mon Sep 30 2019 RH Container Bot <rhcontainerbot(a)fedoraproject.org> - 2:1.6.0-0.42.dev.gitd7eba02
+- autobuilt d7eba02
+
* Mon Sep 30 2019 RH Container Bot <rhcontainerbot(a)fedoraproject.org> - 2:1.6.0-0.41.dev.git5702dd7
- autobuilt 5702dd7
diff --git a/sources b/sources
index 75d452c..5b7d29e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (libpod-5702dd7.tar.gz) = 8cfa3b4483904c6806ca40cb0b5b2476e92169609c2ab9c31c113a36723cebdd2985ed5112ca339099fd0a4d44e22a0bb62693a05d98eab41e3ac152f149c338
+SHA512 (libpod-d7eba02.tar.gz) = 1cf1dfc467d9bee5e2eee4c275289d26f2edbc1dccfa38da6a76f828c4244e66b631e49e12bb45e017f6d7b1b3ffd0c29f32a0ba7864ee68b8cbd3ffeb8cd812
https://src.fedoraproject.org/rpms/podman/c/bcf3165e116d0cce88aab065690e1...
4Â years, 2Â months
robert pushed to prosody (el6). "Upgrade to 0.11.3 (#1756953)"
by notificationsï¼ fedoraproject.org
Notification time stamped 2019-09-30 23:11:45 UTC
From cee96b684bf8a2b5cddad897e7824f735b558bc4 Mon Sep 17 00:00:00 2001
From: Robert Scheck <robert(a)fedoraproject.org>
Date: Sep 30 2019 23:08:35 +0000
Subject: Upgrade to 0.11.3 (#1756953)
---
diff --git a/prosody-0.10.0-bitop.patch b/prosody-0.10.0-bitop.patch
deleted file mode 100644
index 287f7c3..0000000
--- a/prosody-0.10.0-bitop.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Hack by Robert Scheck <robert(a)fedoraproject.org> for prosody >= 0.10.0 which removes the
-default warning for missing Lua BitOp. Prosody >= 0.10.0 requires either Lua 5.1 with the
-Lua BitOp extension or Lua 5.2 without Lua BitOp extension, Lua 5.3 is not supported. If
-the Lua BitOp extension is missing, the WebSocket module will throw an error if enabled.
-
---- prosody-0.10.0/util/dependencies.lua 2017-09-27 16:49:58.000000000 +0200
-+++ prosody-0.10.0/util/dependencies.lua.bitop 2017-10-01 23:49:44.000000000 +0200
-@@ -99,16 +99,6 @@
- }, "SSL/TLS support will not be available");
- end
-
-- local bit = _G.bit32 or softreq"bit";
--
-- if not bit then
-- missingdep("lua-bitops", {
-- ["Debian/Ubuntu"] = "sudo apt-get install lua-bitop";
-- ["luarocks"] = "luarocks install luabitop";
-- ["Source"] = "http://bitop.luajit.org/";
-- }, "WebSocket support will not be available");
-- end
--
- local encodings, err = softreq "util.encodings"
- if not encodings then
- if err:match("module '[^']*' not found") then
diff --git a/prosody-0.11.2-lua53.patch b/prosody-0.11.2-lua53.patch
new file mode 100644
index 0000000..4733885
--- /dev/null
+++ b/prosody-0.11.2-lua53.patch
@@ -0,0 +1,57 @@
+https://hg.prosody.im/trunk/log?rev=only%28%22tip%22%2C+%220.11.2%22%29+and+keyword%28%22lua+5.3%22%29
+
+--- prosody-0.11.2/util/dependencies.lua 2019-01-07 16:34:23.000000000 +0100
++++ prosody-0.11.2/util/dependencies.lua.lua53 2019-07-25 22:36:39.000000000 +0200
+@@ -140,7 +140,7 @@
+ end
+
+ local function log_warnings()
+- if _VERSION > "Lua 5.2" then
++ if _VERSION > "Lua 5.3" then
+ prosody.log("warn", "Support for %s is experimental, please report any issues", _VERSION);
+ end
+ local ssl = softreq"ssl";
+--- prosody-0.11.2/spec/util_format_spec.lua 2019-01-07 16:34:23.000000000 +0100
++++ prosody-0.11.2/spec/util_format_spec.lua.lua53 2019-07-25 22:35:02.000000000 +0200
+@@ -9,6 +9,8 @@
+ assert.equal("true", format("%s", true));
+ assert.equal("[true]", format("%d", true));
+ assert.equal("% [true]", format("%%", true));
++ assert.equal("{ }", format("%q", { }));
++ assert.equal("[1.5]", format("%d", 1.5));
+ end);
+ end);
+ end);
+--- prosody-0.11.2/util/format.lua 2019-01-07 16:34:23.000000000 +0100
++++ prosody-0.11.2/util/format.lua.lua53 2019-07-25 22:36:05.000000000 +0200
+@@ -6,6 +6,9 @@
+ local select = select;
+ local unpack = table.unpack or unpack; -- luacheck: ignore 113/unpack
+ local type = type;
++local num_type = math.type;
++
++local expects_integer = num_type and { c = true, d = true, i = true, o = true, u = true, X = true, x = true, } or {};
+
+ local function format(formatstring, ...)
+ local args, args_length = { ... }, select('#', ...);
+@@ -39,6 +42,9 @@
+ elseif type(arg) ~= "number" then -- arg isn't number as expected?
+ args[i] = tostring(arg);
+ spec = "[%s]";
++ elseif expects_integer[option] and num_type(arg) ~= "integer" then
++ args[i] = tostring(arg);
++ spec = "[%s]";
+ end
+ end
+ return spec;
+--- prosody-0.11.2/plugins/mod_admin_telnet.lua 2019-01-07 16:34:23.000000000 +0100
++++ prosody-0.11.2/plugins/mod_admin_telnet.lua.lua53 2019-07-25 22:34:19.000000000 +0200
+@@ -1207,7 +1207,7 @@
+ --do return tostring(value) end
+ if type == "duration" then
+ if ref_value < 0.001 then
+- return ("%d µs"):format(value*1000000);
++ return ("%g µs"):format(value*1000000);
+ elseif ref_value < 0.9 then
+ return ("%0.2f ms"):format(value*1000);
+ end
diff --git a/prosody.spec b/prosody.spec
index bbf9a04..6982cec 100644
--- a/prosody.spec
+++ b/prosody.spec
@@ -1,11 +1,16 @@
+%if 0%{?fedora} > 19 && 0%{?fedora} <= 30
+%global lua_version 5.1
+%else
+%{!?lua_version: %global lua_version %{lua: print(string.sub(_VERSION, 5))}}
+%endif
+
%global sslcert %{_sysconfdir}/pki/%{name}/localhost.crt
%global sslkey %{_sysconfdir}/pki/%{name}/localhost.key
-%global luaver 5.1
Summary: Flexible communications server for Jabber/XMPP
Name: prosody
-Version: 0.11.2
-Release: 3%{?dist}
+Version: 0.11.3
+Release: 1%{?dist}
License: MIT
URL: https://prosody.im/
Source0: https://prosody.im/downloads/source/%{name}-%{version}.tar.gz
@@ -19,7 +24,7 @@ Source7: prosody.tmpfilesd
Source8: prosody-localhost.cfg.lua
Source9: prosody-example.com.cfg.lua
Patch0: prosody-0.11.0-config.patch
-Patch1: prosody-0.10.0-bitop.patch
+Patch1: prosody-0.11.2-lua53.patch
BuildRequires: gcc, libidn-devel, openssl-devel
BuildRequires: gnupg2
Requires: %{_bindir}/openssl
@@ -34,19 +39,20 @@ Requires(post): /sbin/chkconfig, %{_bindir}/openssl
Requires(preun): /sbin/service, /sbin/chkconfig
Requires(postun): /sbin/service
%endif
-%if 0%{?rhel} > 7 || 0%{?fedora} > 19
-# Prosody does not work with lua >= 5.3, so use compat-lua instead of lua
-# on Fedora >= 20; luajit (compatible with 5.1) would be second choice.
-Requires: compat-lua, lua-filesystem-compat, lua-expat-compat
-Requires: lua-socket-compat, lua-sec-compat
+%if 0%{?fedora} > 19 && 0%{?fedora} <= 30
+Requires: compat-lua, lua-filesystem-compat, lua5.1-bitop
+Requires: lua-expat-compat, lua-socket-compat, lua-sec-compat
BuildRequires: compat-lua, compat-lua-devel
%else
%if 0%{?rhel} > 6 || 0%{?fedora} > 15
-Requires: lua(abi) = %{luaver}
+Requires: lua(abi) = %{lua_version}
%else
-Requires: lua >= %{luaver}
+Requires: lua >= %{lua_version}
+%endif
+Requires: lua-filesystem, lua-expat, lua-socket, lua-sec
+%if 0%{?rhel} >= 6 && 0%{?rhel} <= 7
+Requires: lua-bitop
%endif
-Requires: lua-filesystem, lua-bitop, lua-expat, lua-socket, lua-sec
BuildRequires: lua, lua-devel
%endif
@@ -60,17 +66,15 @@ added functionality, or prototype new protocols.
gpgv2 --keyring %{SOURCE2} %{SOURCE1} %{SOURCE0}
%setup -q
%patch0 -p1 -b .config
-%if 0%{?fedora}
-%patch1 -p1 -b .bitop
-%endif
+%patch1 -p1 -b .lua53
%build
./configure \
--prefix=%{_prefix} \
--libdir=%{_libdir} \
-%if 0%{?rhel} > 7 || 0%{?fedora} > 19
- --lua-version=%{luaver} \
- --with-lua-include=%{_includedir}/lua-%{luaver} \
+%if 0%{?fedora} > 19 && 0%{?fedora} <= 30
+ --lua-version=%{lua_version} \
+ --with-lua-include=%{_includedir}/lua-%{lua_version} \
%endif
--add-cflags="$RPM_OPT_FLAGS" \
%if 0%{?rhel} > 6 || 0%{?fedora}
@@ -94,8 +98,8 @@ make -C tools/migration DESTDIR=$RPM_BUILD_ROOT install
# Install ejabberd2prosody
install -p -m 755 tools/ejabberd2prosody.lua $RPM_BUILD_ROOT%{_bindir}/ejabberd2prosody
sed -e 's@;../?.lua(a);%{_libdir}/%{name}/util/?.lua;%{_libdir}/%{name}/?.lua;@' \
-%if 0%{?rhel} > 7 || 0%{?fedora} > 19
- -e '1s@ lua$@ lua-%{luaver}@' \
+%if 0%{?fedora} > 19 && 0%{?fedora} <= 30
+ -e '1s@ lua$@ lua-%{lua_version}@' \
%endif
-i $RPM_BUILD_ROOT%{_bindir}/ejabberd2prosody
touch -c -r tools/ejabberd2prosody.lua $RPM_BUILD_ROOT%{_bindir}/ejabberd2prosody
@@ -210,6 +214,9 @@ fi
%{_mandir}/man1/%{name}*.1*
%changelog
+* Mon Sep 30 2019 Robert Scheck <robert(a)fedoraproject.org> 0.11.3-1
+- Upgrade to 0.11.3 (#1756953)
+
* Fri Jul 26 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.11.2-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
diff --git a/sources b/sources
index 827c478..9875f03 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
SHA512 (gpgkey-32A9EDDE3609931EB98CEAC315907E8E7BDD6BFE.gpg) = daf6d670d3283aac1860cbb77977b0aa17724f41aa517d00e34054ef99a7c571b1d7d33b690824689124dc757dd89fdd43fe5a531b46183fffc22cd4d638a8ae
-SHA512 (prosody-0.11.2.tar.gz) = 22e55a551a40c92f38a1ed1de5fdcad574d699d58c2e27f93c3d465b55487b8e923c2ba088daf93c7140cbafb0d429687e0b662c8bb1c1aba4b79ac1ea271cd1
-SHA512 (prosody-0.11.2.tar.gz.asc) = e5259da9b703d52fbe3bd4a27b89259c4b198ebd0260db272247c4e28be27dd12990a153e30d463ba4a90afe1d0b2bac3268a4afa43c9fcc3798aaa9914d2495
+SHA512 (prosody-0.11.3.tar.gz) = 07239433c7c65184ca24d665c92b787ff9e4a5ee190ab90dede802ffd2cbd97855356d818858871e62284e9923f485b3468ab1baed5d3fb13aac0551a38967eb
+SHA512 (prosody-0.11.3.tar.gz.asc) = 1557ec078f87a305fbe5046b9dae02c8cf23c5f7e173370bede146466dab00196704176868a8a48f4aacf50057d1dcf8979e3eab32699a5fdcdf3ec1909a99a1
https://src.fedoraproject.org/rpms/prosody/c/cee96b684bf8a2b5cddad897e782...
4Â years, 2Â months
robert pushed to prosody (el6). "Merge remote branch 'origin/master'
into el6"
by notificationsï¼ fedoraproject.org
Notification time stamped 2019-09-30 23:11:45 UTC
From 3469dd35e085717fc5ccb8ac19b61e246712f3e5 Mon Sep 17 00:00:00 2001
From: Robert Scheck <robert(a)fedoraproject.org>
Date: Sep 30 2019 23:11:36 +0000
Subject: Merge remote branch 'origin/master' into el6
---
diff --git a/prosody-0.10.0-bitop.patch b/prosody-0.10.0-bitop.patch
deleted file mode 100644
index 287f7c3..0000000
--- a/prosody-0.10.0-bitop.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Hack by Robert Scheck <robert(a)fedoraproject.org> for prosody >= 0.10.0 which removes the
-default warning for missing Lua BitOp. Prosody >= 0.10.0 requires either Lua 5.1 with the
-Lua BitOp extension or Lua 5.2 without Lua BitOp extension, Lua 5.3 is not supported. If
-the Lua BitOp extension is missing, the WebSocket module will throw an error if enabled.
-
---- prosody-0.10.0/util/dependencies.lua 2017-09-27 16:49:58.000000000 +0200
-+++ prosody-0.10.0/util/dependencies.lua.bitop 2017-10-01 23:49:44.000000000 +0200
-@@ -99,16 +99,6 @@
- }, "SSL/TLS support will not be available");
- end
-
-- local bit = _G.bit32 or softreq"bit";
--
-- if not bit then
-- missingdep("lua-bitops", {
-- ["Debian/Ubuntu"] = "sudo apt-get install lua-bitop";
-- ["luarocks"] = "luarocks install luabitop";
-- ["Source"] = "http://bitop.luajit.org/";
-- }, "WebSocket support will not be available");
-- end
--
- local encodings, err = softreq "util.encodings"
- if not encodings then
- if err:match("module '[^']*' not found") then
diff --git a/prosody-0.11.2-lua53.patch b/prosody-0.11.2-lua53.patch
new file mode 100644
index 0000000..4733885
--- /dev/null
+++ b/prosody-0.11.2-lua53.patch
@@ -0,0 +1,57 @@
+https://hg.prosody.im/trunk/log?rev=only%28%22tip%22%2C+%220.11.2%22%29+and+keyword%28%22lua+5.3%22%29
+
+--- prosody-0.11.2/util/dependencies.lua 2019-01-07 16:34:23.000000000 +0100
++++ prosody-0.11.2/util/dependencies.lua.lua53 2019-07-25 22:36:39.000000000 +0200
+@@ -140,7 +140,7 @@
+ end
+
+ local function log_warnings()
+- if _VERSION > "Lua 5.2" then
++ if _VERSION > "Lua 5.3" then
+ prosody.log("warn", "Support for %s is experimental, please report any issues", _VERSION);
+ end
+ local ssl = softreq"ssl";
+--- prosody-0.11.2/spec/util_format_spec.lua 2019-01-07 16:34:23.000000000 +0100
++++ prosody-0.11.2/spec/util_format_spec.lua.lua53 2019-07-25 22:35:02.000000000 +0200
+@@ -9,6 +9,8 @@
+ assert.equal("true", format("%s", true));
+ assert.equal("[true]", format("%d", true));
+ assert.equal("% [true]", format("%%", true));
++ assert.equal("{ }", format("%q", { }));
++ assert.equal("[1.5]", format("%d", 1.5));
+ end);
+ end);
+ end);
+--- prosody-0.11.2/util/format.lua 2019-01-07 16:34:23.000000000 +0100
++++ prosody-0.11.2/util/format.lua.lua53 2019-07-25 22:36:05.000000000 +0200
+@@ -6,6 +6,9 @@
+ local select = select;
+ local unpack = table.unpack or unpack; -- luacheck: ignore 113/unpack
+ local type = type;
++local num_type = math.type;
++
++local expects_integer = num_type and { c = true, d = true, i = true, o = true, u = true, X = true, x = true, } or {};
+
+ local function format(formatstring, ...)
+ local args, args_length = { ... }, select('#', ...);
+@@ -39,6 +42,9 @@
+ elseif type(arg) ~= "number" then -- arg isn't number as expected?
+ args[i] = tostring(arg);
+ spec = "[%s]";
++ elseif expects_integer[option] and num_type(arg) ~= "integer" then
++ args[i] = tostring(arg);
++ spec = "[%s]";
+ end
+ end
+ return spec;
+--- prosody-0.11.2/plugins/mod_admin_telnet.lua 2019-01-07 16:34:23.000000000 +0100
++++ prosody-0.11.2/plugins/mod_admin_telnet.lua.lua53 2019-07-25 22:34:19.000000000 +0200
+@@ -1207,7 +1207,7 @@
+ --do return tostring(value) end
+ if type == "duration" then
+ if ref_value < 0.001 then
+- return ("%d µs"):format(value*1000000);
++ return ("%g µs"):format(value*1000000);
+ elseif ref_value < 0.9 then
+ return ("%0.2f ms"):format(value*1000);
+ end
diff --git a/prosody.spec b/prosody.spec
index cb299d9..6982cec 100644
--- a/prosody.spec
+++ b/prosody.spec
@@ -1,13 +1,17 @@
+%if 0%{?fedora} > 19 && 0%{?fedora} <= 30
+%global lua_version 5.1
+%else
+%{!?lua_version: %global lua_version %{lua: print(string.sub(_VERSION, 5))}}
+%endif
+
%global sslcert %{_sysconfdir}/pki/%{name}/localhost.crt
%global sslkey %{_sysconfdir}/pki/%{name}/localhost.key
-%global luaver 5.1
Summary: Flexible communications server for Jabber/XMPP
Name: prosody
-Version: 0.11.2
+Version: 0.11.3
Release: 1%{?dist}
License: MIT
-Group: System Environment/Daemons
URL: https://prosody.im/
Source0: https://prosody.im/downloads/source/%{name}-%{version}.tar.gz
Source1: https://prosody.im/downloads/source/%{name}-%{version}.tar.gz.asc
@@ -20,7 +24,7 @@ Source7: prosody.tmpfilesd
Source8: prosody-localhost.cfg.lua
Source9: prosody-example.com.cfg.lua
Patch0: prosody-0.11.0-config.patch
-Patch1: prosody-0.10.0-bitop.patch
+Patch1: prosody-0.11.2-lua53.patch
BuildRequires: gcc, libidn-devel, openssl-devel
BuildRequires: gnupg2
Requires: %{_bindir}/openssl
@@ -35,19 +39,20 @@ Requires(post): /sbin/chkconfig, %{_bindir}/openssl
Requires(preun): /sbin/service, /sbin/chkconfig
Requires(postun): /sbin/service
%endif
-%if 0%{?rhel} > 7 || 0%{?fedora} > 19
-# Prosody does not work with lua >= 5.3, so use compat-lua instead of lua
-# on Fedora >= 20; luajit (compatible with 5.1) would be second choice.
-Requires: compat-lua, lua-filesystem-compat, lua-expat-compat
-Requires: lua-socket-compat, lua-sec-compat
+%if 0%{?fedora} > 19 && 0%{?fedora} <= 30
+Requires: compat-lua, lua-filesystem-compat, lua5.1-bitop
+Requires: lua-expat-compat, lua-socket-compat, lua-sec-compat
BuildRequires: compat-lua, compat-lua-devel
%else
%if 0%{?rhel} > 6 || 0%{?fedora} > 15
-Requires: lua(abi) = %{luaver}
+Requires: lua(abi) = %{lua_version}
%else
-Requires: lua >= %{luaver}
+Requires: lua >= %{lua_version}
+%endif
+Requires: lua-filesystem, lua-expat, lua-socket, lua-sec
+%if 0%{?rhel} >= 6 && 0%{?rhel} <= 7
+Requires: lua-bitop
%endif
-Requires: lua-filesystem, lua-bitop, lua-expat, lua-socket, lua-sec
BuildRequires: lua, lua-devel
%endif
@@ -61,17 +66,15 @@ added functionality, or prototype new protocols.
gpgv2 --keyring %{SOURCE2} %{SOURCE1} %{SOURCE0}
%setup -q
%patch0 -p1 -b .config
-%if 0%{?fedora}
-%patch1 -p1 -b .bitop
-%endif
+%patch1 -p1 -b .lua53
%build
./configure \
--prefix=%{_prefix} \
--libdir=%{_libdir} \
-%if 0%{?rhel} > 7 || 0%{?fedora} > 19
- --lua-version=%{luaver} \
- --with-lua-include=%{_includedir}/lua-%{luaver} \
+%if 0%{?fedora} > 19 && 0%{?fedora} <= 30
+ --lua-version=%{lua_version} \
+ --with-lua-include=%{_includedir}/lua-%{lua_version} \
%endif
--add-cflags="$RPM_OPT_FLAGS" \
%if 0%{?rhel} > 6 || 0%{?fedora}
@@ -95,8 +98,8 @@ make -C tools/migration DESTDIR=$RPM_BUILD_ROOT install
# Install ejabberd2prosody
install -p -m 755 tools/ejabberd2prosody.lua $RPM_BUILD_ROOT%{_bindir}/ejabberd2prosody
sed -e 's@;../?.lua(a);%{_libdir}/%{name}/util/?.lua;%{_libdir}/%{name}/?.lua;@' \
-%if 0%{?rhel} > 7 || 0%{?fedora} > 19
- -e '1s@ lua$@ lua-%{luaver}@' \
+%if 0%{?fedora} > 19 && 0%{?fedora} <= 30
+ -e '1s@ lua$@ lua-%{lua_version}@' \
%endif
-i $RPM_BUILD_ROOT%{_bindir}/ejabberd2prosody
touch -c -r tools/ejabberd2prosody.lua $RPM_BUILD_ROOT%{_bindir}/ejabberd2prosody
@@ -211,6 +214,15 @@ fi
%{_mandir}/man1/%{name}*.1*
%changelog
+* Mon Sep 30 2019 Robert Scheck <robert(a)fedoraproject.org> 0.11.3-1
+- Upgrade to 0.11.3 (#1756953)
+
+* Fri Jul 26 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.11.2-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Sat Feb 02 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.11.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
* Fri Jan 18 2019 Robert Scheck <robert(a)fedoraproject.org> 0.11.2-1
- Upgrade to 0.11.2
diff --git a/sources b/sources
index 827c478..9875f03 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
SHA512 (gpgkey-32A9EDDE3609931EB98CEAC315907E8E7BDD6BFE.gpg) = daf6d670d3283aac1860cbb77977b0aa17724f41aa517d00e34054ef99a7c571b1d7d33b690824689124dc757dd89fdd43fe5a531b46183fffc22cd4d638a8ae
-SHA512 (prosody-0.11.2.tar.gz) = 22e55a551a40c92f38a1ed1de5fdcad574d699d58c2e27f93c3d465b55487b8e923c2ba088daf93c7140cbafb0d429687e0b662c8bb1c1aba4b79ac1ea271cd1
-SHA512 (prosody-0.11.2.tar.gz.asc) = e5259da9b703d52fbe3bd4a27b89259c4b198ebd0260db272247c4e28be27dd12990a153e30d463ba4a90afe1d0b2bac3268a4afa43c9fcc3798aaa9914d2495
+SHA512 (prosody-0.11.3.tar.gz) = 07239433c7c65184ca24d665c92b787ff9e4a5ee190ab90dede802ffd2cbd97855356d818858871e62284e9923f485b3468ab1baed5d3fb13aac0551a38967eb
+SHA512 (prosody-0.11.3.tar.gz.asc) = 1557ec078f87a305fbe5046b9dae02c8cf23c5f7e173370bede146466dab00196704176868a8a48f4aacf50057d1dcf8979e3eab32699a5fdcdf3ec1909a99a1
https://src.fedoraproject.org/rpms/prosody/c/3469dd35e085717fc5ccb8ac19b6...
4Â years, 2Â months