X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=ejabberd.spec;h=f82f77b4c6cc32565b7c173b18973fd3b85c6cc9;hb=HEAD;hp=f9dbd45e76d584ac64a8a32e796f81cecc816371;hpb=105db1e0c00542f22c7cc4d2edd13e697a3a19bf;p=packages%2Fejabberd.git

diff --git a/ejabberd.spec b/ejabberd.spec
index f9dbd45..1664769 100644
--- a/ejabberd.spec
+++ b/ejabberd.spec
@@ -3,73 +3,85 @@
 #   (like in fedora)
 # Conditional build:
 %bcond_with	pam		# PAM authentication support
-%bcond_without	logdb		# enable mod_logdb (server-side message logging)
+%bcond_with	logdb		# enable mod_logdb (server-side message logging)
+%bcond_with	new_sql_schema	# build with the new SQL schema
 
 Summary:	Fault-tolerant distributed Jabber/XMPP server
 Summary(pl.UTF-8):	Odporny na awarie rozproszony serwer Jabbera/XMPP
 Name:		ejabberd
-Version:	18.04
+Version:	23.10
 Release:	2
 License:	GPL
 Group:		Applications/Communications
-Source0:	http://www.process-one.net/downloads/ejabberd/%{version}/%{name}-%{version}.tgz
-# Source0-md5:	bd82d63fc4eb0931b7f3da0a2847772e
+# Source0:	https://www.process-one.net/downloads/downloads-action.php?file=/%{version}/%{name}-%{version}.tar.gz
+Source0:	https://github.com/processone/ejabberd/archive/refs/tags/%{version}.tar.gz
+# Source0-md5:	c91ae2f93c4c4cd7b00e9cb30ac6044d
 Source1:	%{name}.init
 Source2:	%{name}.sysconfig
 Source3:	%{name}.service
 Source4:	%{name}.logrotate
-#
+
 # Archives created with the ejabberd-pack_deps.sh script (in this repo)
-Source10:       ejabberd-base64url-20150806.tar.gz
-# Source10-md5:	afa75062e6e007cb756d98d5ca666b42
-Source11:       ejabberd-cache_tab-20180322.tar.gz
-# Source11-md5:	9f14ec8529265206436fed4b4a0ca55c
-Source12:       ejabberd-eimp-20180425.tar.gz
-# Source12-md5:	76860dfd63eec9ecebe19735a1079b23
+Source10:       ejabberd-base64url-20190617.tar.gz
+# Source10-md5: 5a12fd2fb1f992c850aba5115aab3dd4
+Source11:       ejabberd-cache_tab-20220502.tar.gz
+# Source11-md5: 822bec23631e956ce927ecc5ae31e24d
+Source12:       ejabberd-eimp-20220502.tar.gz
+# Source12-md5: 39b7de8ad391da8fb12ff9b76301ced5
 Source13:       ejabberd-elixir-20170515.tar.gz
-# Source13-md5:	7d60cb822a5d7d3ed8f1daefe63e7b5c
-Source14:       ejabberd-ezlib-20180322.tar.gz
-# Source14-md5:	13e8dc5d7256f9081eb30ccb97ddbb53
-Source15:       ejabberd-fast_tls-20180425.tar.gz
-# Source15-md5:	2805e9185d94dc3da231429b68875d9f
-Source16:       ejabberd-fast_xml-20180425.tar.gz
-# Source16-md5:	aad0a6b1fb3fb4f81929c7eb02565c96
-Source17:       ejabberd-fast_yaml-20180425.tar.gz
-# Source17-md5:	39eef0ecd77cf4144277408b8764deaa
-Source18:       ejabberd-goldrush-20160531.tar.gz
-# Source18-md5:	cce5aa7bdd2a25ad1cf642b2a3eedd53
-Source19:       ejabberd-iconv-20180322.tar.gz
-# Source19-md5:	851afe38b6ffdad1e2584d810ae2f5a1
-Source20:       ejabberd-jiffy-20160331.tar.gz
-# Source20-md5:	0e69e8668ff84e16cc98e95eb57a7687
-Source21:       ejabberd-jose-20170518.tar.gz
-# Source21-md5:	523f534504d4fea2dbd052ceaea6dec0
-Source22:       ejabberd-lager-20170426.tar.gz
-# Source22-md5:	3d91b8e70c10987f8ac549d2e595d631
-Source23:       ejabberd-p1_mysql-20170928.tar.gz
-# Source23-md5:	64c6a4b133da0a4b0b3c7f317196397d
-Source24:       ejabberd-p1_oauth2-20180425.tar.gz
-# Source24-md5:	1e53045cf956aba979d3f1324f8768b6
-Source25:       ejabberd-p1_pgsql-20180322.tar.gz
-# Source25-md5:	40ef5abf21f568b9b195ed0cf4b69946
-Source26:       ejabberd-p1_utils-20180322.tar.gz
-# Source26-md5:	322b2d2c8a48570c454af5baed1ac4c0
-Source27:       ejabberd-rebar_elixir_plugin-20160105.tar.gz
-# Source27-md5:	9382b37f25d3727edf657bda1af1cc32
-Source28:       ejabberd-stringprep-20180322.tar.gz
-# Source28-md5:	92c43f65099e812a11f4a9536b4e71ab
-Source29:       ejabberd-xmpp-20180425.tar.gz
-# Source29-md5:	6e43cfd60dc1a899f690bc25f63b172a
+# Source13-md5: 73be42f7d0cda7aeee5c0e6dadc0c451
+Source14:       ejabberd-ezlib-20220502.tar.gz
+# Source14-md5: 32dadbeff189a0fa18c21aa42258fa1a
+Source15:       ejabberd-fast_tls-20221012.tar.gz
+# Source15-md5: 440590e5d8e16009d4ff9b38c25cea01
+Source16:       ejabberd-fast_xml-20220502.tar.gz
+# Source16-md5: 1288d6e5ea055784634367a0991adc3b
+Source17:       ejabberd-fast_yaml-20230117.tar.gz
+# Source17-md5: 13633fe81d32198c216f5e516f3ef9ee
+Source18:       ejabberd-idna-20180830.tar.gz
+# Source18-md5: e34174d5c5e2e91611d3249c690f6d2d
+Source19:       ejabberd-jiffy-20220223.tar.gz
+# Source19-md5: b98489245dadf5a36ac3408be21d835a
+Source20:       ejabberd-jose-20221216.tar.gz
+# Source20-md5: 1240b886ef9d9102e8df1193f2ebcd4e
+Source21:       ejabberd-mqtree-20220502.tar.gz
+# Source21-md5: 1f1b175534eb917780e89e4c7d49c710
+Source22:       ejabberd-p1_acme-20230117.tar.gz
+# Source22-md5: 0a0170413d2cf6cf3c083835f18bd380
+Source23:       ejabberd-p1_mysql-20231016.tar.gz
+# Source23-md5: 304d139651cc2f14769fc2d7f81b3e66
+Source24:       ejabberd-p1_oauth2-20220502.tar.gz
+# Source24-md5: bade7f8e1d18c9f6149b70268c73087b
+Source25:       ejabberd-p1_pgsql-20231016.tar.gz
+# Source25-md5: 6afd5c5763af4a744115d31c3d31eab8
+Source26:       ejabberd-p1_utils-20220502.tar.gz
+# Source26-md5: 0eab972a4a247519e5a898d8da6054c1
+Source27:       ejabberd-pkix-20220502.tar.gz
+# Source27-md5: 88fd008dca6cf2208678fbf50b47a21a
+Source28:       ejabberd-rebar_elixir_plugin-20160105.tar.gz
+# Source28-md5: 6a069a566d71c3daa45fc4736364adf0
+Source29:       ejabberd-sqlite3-20230117.tar.gz
+# Source29-md5: f9457e450712ef06a6157b23e1ebccee
+Source30:       ejabberd-stringprep-20221012.tar.gz
+# Source30-md5: b2931baf14b779c718dcd5c42c87f8d5
+Source31:       ejabberd-stun-20231016.tar.gz
+# Source31-md5: d9520616dd0331efaabb05c901cee249
+Source32:       ejabberd-unicode_util_compat-20170729.tar.gz
+# Source32-md5: 1b348fdf38dba88ebed2f65125ad8590
+Source33:       ejabberd-xmpp-20231016.tar.gz
+# Source33-md5: d2dc96824f02642a02c94fb5712d7f69
+Source34:       ejabberd-yconf-20230117.tar.gz
+# Source34-md5: 6f064bf9d6ad4cbabb44879edd2d1c9e
 
 Patch0:		%{name}-paths.patch
 Patch1:		%{name}-config.patch
 # https://paleg.github.io/mod_logdb/
-# https://github.com/paleg/ejabberd/tree/17.04-mod_logdb
+# https://github.com/paleg/ejabberd/compare/paleg:19.08...paleg:19.08-mod_logdb.patch
 Patch3:		%{name}-mod_logdb.patch
 URL:		http://www.ejabberd.im/
 BuildRequires:	autoconf
 BuildRequires:	automake
-BuildRequires:	erlang >= 1:R16B03
+BuildRequires:	erlang >= 2:22.2
 BuildRequires:	expat-devel >= 1.95
 BuildRequires:	openssl-devel
 %if %{with pam}
@@ -77,6 +89,7 @@ BuildRequires:	pam-devel
 %endif
 BuildRequires:	git-core
 BuildRequires:	rpmbuild(macros) >= 1.671
+BuildRequires:	sqlite3-devel
 BuildRequires:	yaml-devel
 BuildRequires:	zlib-devel
 Requires(post):	/usr/bin/perl
@@ -85,7 +98,7 @@ Requires(post):	sed >= 4.0
 Requires(post):	textutils
 Requires(post,preun):	/sbin/chkconfig
 Requires(post,preun,postun):	systemd-units >= 38
-Requires:	erlang >= 1:R15B01
+Requires:	erlang >= 2:22.2
 Requires:	expat >= 1.95
 Requires:	rc-scripts
 Requires:	systemd-units >= 38
@@ -111,10 +124,9 @@ Requires:	%{name} = %{version}-%{release}
 Server-side logging module.
 
 %prep
-%setup -q -a 10 -a 11 -a 12 -a 13 -a 14 -a 15 -a 16 -a 17 -a 18 -a 19 -a 20 -a 21 -a 22 -a 23 -a 24 -a 25 -a 26 -a 27 -a 28 -a 29
+%setup -q -a 10 -a 11 -a 12 -a 13 -a 14 -a 15 -a 16 -a 17 -a 18 -a 19 -a 20 -a 21 -a 22 -a 23 -a 24 -a 25 -a 26 -a 27 -a 28 -a 29 -a 30 -a 31 -a 32 -a 33 -a 34
 %patch0 -p1
 %patch1 -p1
-#%%patch2 -p1
 %if %{with logdb}
 %patch3 -p1
 %endif
@@ -132,6 +144,8 @@ git add configure.ac
 git commit -a -m "dummy commit"
 git tag "%{version}"
 
+sed -i -e 's,#!.*/usr/bin/env.*elixir,#!/usr/bin/elixir,' deps/elixir/bin/mix deps/elixir/lib/mix/lib/mix/tasks/escript.build.ex
+
 %build
 unset GIT_DIR GIT_WORK_TREE
 %{__aclocal} -I m4
@@ -139,20 +153,18 @@ unset GIT_DIR GIT_WORK_TREE
 %configure \
 	%{?with_pam --enable-pam} \
 	--enable-user=jabber \
+ 	%{__enable_disable new_sql_schema new-sql-schema} \
 	--enable-elixir \
 	--enable-full-xml \
 	--enable-odbc \
 	--enable-mysql \
 	--enable-pgsql \
+	--enable-sqlite --with-sqlite3 \
 	%{?with_pam:--enable-pam} \
-	--enable-zlib \
-	--enable-iconv
+	--enable-zlib
 
 touch deps/.got
 
-cd deps/iconv
-%configure
-cd ../..
 cd deps/stringprep
 %configure
 cd ../..
@@ -243,13 +255,13 @@ fi
 %systemd_reload
 
 %triggerprein -- %{name} < 13.10
-if [ -e /etc/jabber/ejabberd.cfg ] ; then
-	if grep -Eq '^[^%]*access_get' /etc/jabber/ejabberd.cfg ; then
+if [ -e %{_sysconfdir}/jabber/ejabberd.cfg ] ; then
+if grep -Eq '^[^%]*access_get' %{_sysconfdir}/jabber/ejabberd.cfg ; then
 		echo "Your 'ejabberd.cfg' config file seems to use 'access_get' option of mod_vcard" >&2
 		echo "this is not supported by this ejabberd version in PLD" >&2
 		exit 1
 	fi
-	rm -f /etc/jabber/ejabberd.yml.rpmnew 2>/dev/null || :
+rm -f %{_sysconfdir}/jabber/ejabberd.yml.rpmnew 2>/dev/null || :
 fi
 if [ -e /var/lock/subsys/ejabberd ] ; then
 	# old init script won't stop ejabberd correctly
@@ -341,24 +353,39 @@ fi
 %{_libdir}/fast_tls-*
 %{_libdir}/fast_xml-*
 %{_libdir}/fast_yaml-*
-%{_libdir}/goldrush-*
-%{_libdir}/iconv-*
+%{_libdir}/idna-*
 %{_libdir}/jiffy-*
 %{_libdir}/jose-*
-%{_libdir}/lager-*
+%dir %{_libdir}/mqtree-*
+%{_libdir}/mqtree-*/ebin
+%dir %{_libdir}/mqtree-*/priv
+%dir %{_libdir}/mqtree-*/priv/lib
+%attr(755,root,root) %{_libdir}/mqtree-*/priv/lib/mqtree.so
+%{_libdir}/p1_acme-*
 %{_libdir}/p1_mysql-*
 %{_libdir}/p1_oauth2-*
 %{_libdir}/p1_pgsql-*
 %{_libdir}/p1_utils-*
+%dir %{_libdir}/pkix-*
+%{_libdir}/pkix-*/ebin
+%{_libdir}/pkix-*/LICENSE
 %{_libdir}/rebar_elixir_plugin-*
+%{_libdir}/sqlite3-*/ebin
+%dir %{_libdir}/sqlite3-*
+%dir %{_libdir}/sqlite3-*/priv
+%attr(755,root,root) %{_libdir}/sqlite3-*/priv/sqlite3_drv.so
 %{_libdir}/stringprep-*
+%{_libdir}/stun-*
+%{_libdir}/unicode_util_compat-*
 %{_libdir}/xmpp-*
+%{_libdir}/yconf-*
 %dir %attr(770,root,jabber) /var/lib/ejabberd
 %ghost %attr(400,jabber,jabber) %ghost %config(noreplace) %verify(not md5 mtime size) /var/lib/ejabberd/.erlang.cookie
 %attr(754,root,root) /etc/rc.d/init.d/%{name}
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/%{name}
 %{systemdunitdir}/%{name}.service
 /etc/logrotate.d/%{name}
+%{_mandir}/man5/ejabberd.yml.5*
 
 %if %{with logdb}
 %files logdb