X-Git-Url: http://git.pld-linux.org/?p=packages%2Fejabberd.git;a=blobdiff_plain;f=ejabberd.spec;h=1da09ba60bfbe7de00247486f773dbfafc768723;hp=7747caaf9087a06ebc06d043362584354eebe18e;hb=HEAD;hpb=818026aeefe0a2e2f39e7d591d808703c73dad5b

diff --git a/ejabberd.spec b/ejabberd.spec
index 7747caa..f82f77b 100644
--- a/ejabberd.spec
+++ b/ejabberd.spec
@@ -1,51 +1,112 @@
-#
+# TODO:
+# - package all deps (tarballs 10-29) into separate spec files
+#   (like in fedora)
 # Conditional build:
 %bcond_with	pam		# PAM authentication support
-%bcond_without	logdb		# enable mod_logdb (server-side message logging)
-#
-
-%define	realname	ejabberd
+%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:		%{realname}
-Version:	2.1.5
+Name:		ejabberd
+Version:	23.10
 Release:	1
 License:	GPL
 Group:		Applications/Communications
-Source0:	http://www.process-one.net/downloads/ejabberd/%{version}/%{realname}-%{version}.tar.gz
-# Source0-md5:	2029ceca45584d704ca821a771d6d928
-Source1:	%{realname}.init
-Source2:	%{realname}.sysconfig
-Source3:	%{realname}.sh
-Source4:	%{realname}ctl.sh
-Source5:	%{realname}-inetrc
-Patch0:		%{realname}-makefile.patch
-Patch1:		%{realname}-config.patch
-Patch2:		%{realname}-mod_muc.patch
-# http://www.dp.uz.gov.ua/o.palij/mod_logdb/patch-src-mod_logdb-2.1.0.diff
-Patch3:		%{realname}-mod_logdb.patch
-Patch4:		%{realname}-vcard-access-get.patch
-URL:		http://ejabberd.jabber.ru/
+# 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-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: 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/compare/paleg:19.08...paleg:19.08-mod_logdb.patch
+Patch3:		%{name}-mod_logdb.patch
+URL:		http://www.ejabberd.im/
 BuildRequires:	autoconf
-BuildRequires:	erlang >= R10B_5
+BuildRequires:	automake
+BuildRequires:	erlang >= 2:22.2
 BuildRequires:	expat-devel >= 1.95
 BuildRequires:	openssl-devel
 %if %{with pam}
 BuildRequires:	pam-devel
 %endif
-BuildRequires:	rpmbuild(macros) >= 1.268
+BuildRequires:	git-core
+BuildRequires:	rpmbuild(macros) >= 1.671
+BuildRequires:	sqlite3-devel
+BuildRequires:	yaml-devel
 BuildRequires:	zlib-devel
 Requires(post):	/usr/bin/perl
 Requires(post):	jabber-common
 Requires(post):	sed >= 4.0
 Requires(post):	textutils
 Requires(post,preun):	/sbin/chkconfig
-Requires:	erlang
+Requires(post,preun,postun):	systemd-units >= 38
+Requires:	erlang >= 2:22.2
 Requires:	expat >= 1.95
 Requires:	rc-scripts
+Requires:	systemd-units >= 38
+Conflicts:	logrotate < 3.8.0
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+%define		_noautoprovfiles	%{_libdir}/%{name}/priv/lib/
+
 %description
 ejabberd is a Free and Open Source fault-tolerant distributed Jabber
 server. It is written mostly in Erlang.
@@ -55,7 +116,7 @@ ejabberd to darmowy, z otwartymi źródłami, odporny na awarie
 rozproszony serwer Jabbera. Jest napisany w większości w Erlangu.
 
 %package logdb
-Summary:        Server-side logging module
+Summary:	Server-side logging module
 Group:		Applications/Communications
 Requires:	%{name} = %{version}-%{release}
 
@@ -63,87 +124,271 @@ Requires:	%{name} = %{version}-%{release}
 Server-side logging module.
 
 %prep
-%setup -q -n %{realname}-%{version}
+%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
-%patch4 -p1
 %if %{with logdb}
-cd src
-%patch3 -p0
+%patch3 -p1
 %endif
 
+# Various parts of the build system use 'git describe'
+# which returns nonsense on manual builds using the builder script
+# and which fails on the PLD builders
+# I was not able to locate all 'git describe' invocation, sot let's
+# fool them with this dummy repository
+unset GIT_DIR GIT_WORK_TREE
+git init
+git config user.email "dummy@example.com"
+git config user.name "Dummy"
+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
-cd src
+unset GIT_DIR GIT_WORK_TREE
+%{__aclocal} -I m4
 %{__autoconf}
 %configure \
 	%{?with_pam --enable-pam} \
-	--with-openssl=%{_prefix} \
-	--enable-odbc
+	--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
+
+touch deps/.got
+
+cd deps/stringprep
+%configure
+cd ../..
+cd deps/fast_tls
+%configure
+cd ../..
+cd deps/fast_xml
+%configure
+cd ../..
+cd deps/fast_yaml
+%configure
+cd ../..
+cd deps/ezlib
+%configure
+cd ../..
+
+# for elixir VM
+LC_ALL=en_US.UTF-8; export LC_ALL
 %{__make} -j1
-cd ..
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{/var/lib/%{realname},/etc/{sysconfig,rc.d/init.d},%{_sbindir}}
+install -d $RPM_BUILD_ROOT{/var/lib/%{name},/etc/{sysconfig,rc.d/init.d}} \
+		$RPM_BUILD_ROOT{%{systemdunitdir},%{_sbindir}} \
+		$RPM_BUILD_ROOT{/etc/logrotate.d,/var/log/archive/%{name}}
 
-%{__make} -C src install -j1 \
+unset GIT_DIR GIT_WORK_TREE
+
+%{__make} install -j1 \
+	CHOWN_COMMAND=true \
+	O_USER="" \
+	G_USER="" \
 	DESTDIR=$RPM_BUILD_ROOT
 
-sed -e's,@libdir@,%{_libdir},g' -e 's,@EJABBERD_DOC_PATH@,%{_docdir}/%{name}-%{version}/doc,g' %{SOURCE1} > $RPM_BUILD_ROOT/etc/rc.d/init.d/%{realname}
-install %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/%{realname}
+sed -e's,@libdir@,%{_libdir},g' -e 's,@EJABBERD_DOC_PATH@,%{_docdir}/%{name}-%{version}/doc,g' %{SOURCE1} > $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}
+cp -p %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/%{name}
+cp -p %{SOURCE3} $RPM_BUILD_ROOT%{systemdunitdir}/%{name}.service
+cp -p %{SOURCE4} $RPM_BUILD_ROOT/etc/logrotate.d/%{name}
+
+chmod u+rw $RPM_BUILD_ROOT%{_sbindir}/%{name}*
+
+chmod 755 $RPM_BUILD_ROOT%{_libdir}/*/priv/lib/*.so
 
-chmod u+rw $RPM_BUILD_ROOT%{_sbindir}/%{realname}*
-sed -e's,@libdir@,%{_libdir},g' %{SOURCE3} > $RPM_BUILD_ROOT%{_sbindir}/%{realname}
-sed -e's,@libdir@,%{_libdir},g' %{SOURCE4} > $RPM_BUILD_ROOT%{_sbindir}/%{realname}ctl
-install %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/jabber
+rm -rf _doc 2>/dev/null || :
+mv $RPM_BUILD_ROOT%{_docdir}/%{name} _doc
 
-chmod 755 $RPM_BUILD_ROOT%{_libdir}/ejabberd/priv/lib/*.so
+touch $RPM_BUILD_ROOT%{_sysconfdir}/jabber/ejabberd.cfg
+touch $RPM_BUILD_ROOT/var/lib/ejabberd/.erlang.cookie
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%pre
+if [ -e /etc/jabber/ejabberd.cfg ] ; then
+	%banner -e %{name} <<'EOF'
+Old-style /etc/jabber/ejabberd.cfg configuration file exists. You should
+consider converting it to the new YAML format. You can do this with the
+'ejabberdctl convert_to_yaml' command (ejabberd must be already running).
+EOF
+fi
+
 %post
 if [ -f %{_sysconfdir}/jabber/secret ] ; then
-	SECRET=`cat %{_sysconfdir}/jabber/secret`
+	SECRET="$(cat %{_sysconfdir}/jabber/secret)"
 	if [ -n "$SECRET" ] ; then
-		echo "Updating component authentication secret in ejabberd config file..."
-		%{__sed} -i -e "s/>secret</>$SECRET</" /etc/jabber/ejabberd.cfg
+		echo -n "Updating component authentication secret in ejabberd config file..." >&2
+		%{__sed} -i -e "s/@service_secret@/$SECRET/" /etc/jabber/ejabberd.yml
+		echo "done" >&2
 	fi
 fi
-
-if [ ! -f %{_sysconfdir}/jabber/cookie ] ; then
-	echo "Generating erl authentication cookie..."
-	umask 066
-	perl -e 'open R,"/dev/urandom"; read R,$r,16;
-		printf "%02x",ord(chop $r) while($r);' > %{_sysconfdir}/jabber/cookie
-fi
-
 /sbin/chkconfig --add ejabberd
-%service ejabberd restart "ejabberd server"
+if [ -e /var/run/%{name}-upgrade-trigger ] ; then
+	# service will be restarted in the postun trigger
+	rm -f /var/run/%{name}-upgrade-trigger || :
+else
+	%service ejabberd restart "ejabberd server"
+	%systemd_post %{name}.service
+fi
 
 %preun
 if [ "$1" = "0" ]; then
 	%service ejabberd stop
 	/sbin/chkconfig --del ejabberd
 fi
+%systemd_preun %{name}.service
+
+%postun
+%systemd_reload
+
+%triggerprein -- %{name} < 13.10
+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 %{_sysconfdir}/jabber/ejabberd.yml.rpmnew 2>/dev/null || :
+fi
+if [ -e /var/lock/subsys/ejabberd ] ; then
+	# old init script won't stop ejabberd correctly
+	# stop it's all processes here
+	# we assume any 'epmd', 'beam', 'beam.smp' or 'heart' process
+	# running with uid of jabber is ejabberd process
+	pids="$(ps -C "epmd beam beam.smp heart" -o pid=,user= | awk '/jabber/ { print $1 }')" || :
+	if [ -n "$pids" ] ; then
+		%banner -e %{name} <<'EOF'
+Killing all 'epmd, beam, beam.smp, heart' processed owned by the 'jabber' user to make sure old ejabberd is down.
+
+EOF
+		kill $pids || :
+	fi
+fi
+touch /var/run/%{name}-upgrade-trigger || :
+
+%triggerpostun -- %{name} < 13.10
+# convert old 'NODENAME' in /etc/sysconfig/ejabberd
+# to 'ERLANG_NODE' in /etc/jabber/ejabberdctl.cfg
+# and move other settings
+NODENAME="$(hostname)"
+if [ -e /etc/sysconfig/ejabberd ] ; then
+	. /etc/sysconfig/ejabberd || :
+fi
+subst="s/^#ERLANG_NODE=.*/ERLANG_NODE=ejabberd@${NODENAME}/"
+if [ "$NODENAME" != "localhost" ] ; then
+	%banner -e %{name} <<'EOF'
+Configured node name (ejabberd@${NODENAME}) is not at 'localhost'.
+– setting INET_DIST_INTERFACE=0.0.0.0 in /etc/jabber/ejabberdctl.cfg.
+You should consider tuning that or your firewall configuration.
+
+EOF
+	subst="$subst;s/^#INET_DIST_INTERFACE=.*/INET_DIST_INTERFACE=0.0.0.0/"
+fi
+if [ -n "$ERL_MAX_PORTS" ] ; then
+	subst="$subst;s/^#ERL_MAX_PORTS=.*/ERL_MAX_PORTS=${ERL_MAX_PORTS}/"
+fi
+sed -i -e"$subst" /etc/jabber/ejabberdctl.cfg || :
+if [ -e /etc/sysconfig/ejabberd ] ; then
+	sed -i.rpmsave \
+		-e'/^[#[:space:]]*NODENAME=/d;/^# Node name/d' \
+		-e'/^[#[:space:]]*ERL_MAX_PORTS=/d;/^# uncomment this to allow more then 1024 connections/d' \
+		-e'/^[#[:space:]]*ERL_FULLSWEEP_AFTER=/d;/^# uncomment this to limit memory usage/d' \
+		/etc/sysconfig/ejabberd || :
+fi
+cp %{_sysconfdir}/jabber/cookie /var/lib/ejabberd/.erlang.cookie || :
+chown jabber:jabber /var/lib/ejabberd/.erlang.cookie || :
+chmod 400 /var/lib/ejabberd/.erlang.cookie || :
+if [ -e /etc/jabber/ejabberd.cfg -a ! -e /etc/jabber/ejabberd.yml.rpmnew ] ; then
+	mv /etc/jabber/ejabberd.yml /etc/jabber/ejabberd.yml.rpmnew
+	echo 'include_config_file: "/etc/jabber/ejabberd.cfg"' > /etc/jabber/ejabberd.yml || :
+fi
+
+# post action postponed here
+%service ejabberd restart "ejabberd server"
+%systemd_post %{name}.service
+
+%systemd_trigger %{name}.service
 
 %files
 %defattr(644,root,root,755)
-%doc doc src/odbc/pg.sql src/odbc/mysql.sql
+%doc sql _doc/*
 %attr(755,root,root) %{_sbindir}/*
-%attr(640,root,jabber) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/jabber/*
-%attr(770,root,jabber) /var/log/ejabberd
+%attr(755,root,root) %{_bindir}/elixir
+%attr(755,root,root) %{_bindir}/iex
+%attr(755,root,root) %{_bindir}/mix
+%attr(640,root,jabber) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/jabber/ejabberd-inetrc
+%attr(640,root,jabber) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/jabber/ejabberd.yml
+%attr(640,root,jabber) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/jabber/ejabberdctl.cfg
+# legacy config may still be there
+%attr(640,root,jabber) %ghost %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/jabber/ejabberd.cfg
+%attr(770,root,jabber) /var/log/%{name}
+%attr(770,root,jabber) /var/log/archive/%{name}
 %if %{with logdb}
-%exclude %{_libdir}/ejabberd/ebin/mod_logdb*
+%exclude %{_libdir}/ejabberd-%{version}/ebin/mod_logdb*
 %endif
-%{_libdir}/ejabberd
+%{_libdir}/ejabberd-%{version}
+%{_libdir}/base64url-*
+%{_libdir}/cache_tab-*
+%dir %{_libdir}/eimp-*
+%dir %{_libdir}/eimp-*/priv
+%dir %{_libdir}/eimp-*/priv/bin
+%attr(755,root,root) %{_libdir}/eimp-*/priv/bin/eimp
+%{_libdir}/eimp-*/ebin
+%{_libdir}/eimp-*/LICENSE.txt
+%{_libdir}/elixir-*
+%{_libdir}/ezlib-*
+%{_libdir}/fast_tls-*
+%{_libdir}/fast_xml-*
+%{_libdir}/fast_yaml-*
+%{_libdir}/idna-*
+%{_libdir}/jiffy-*
+%{_libdir}/jose-*
+%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
-%attr(754,root,root) /etc/rc.d/init.d/%{realname}
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/%{realname}
+%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
 %defattr(644,root,root,755)
-%{_libdir}/ejabberd/ebin/mod_logdb*
+%{_libdir}/ejabberd-%{version}/ebin/mod_logdb*
 %endif