X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=ejabberd.spec;h=efe9d481a5b37efc155c710e89ea70fb00ad2b5b;hb=e0a49cefea777816b9d92cfbedc73dec18def286;hp=7755cfd5acefedbd5e90e071c2404f82cb481e31;hpb=12b4100be38d2845ecffbefa5f0d2bedd87b90d3;p=packages%2Fejabberd.git

diff --git a/ejabberd.spec b/ejabberd.spec
index 7755cfd..efe9d48 100644
--- a/ejabberd.spec
+++ b/ejabberd.spec
@@ -1,63 +1,100 @@
-#
 # TODO:
-#	- drop or update logdb bcond (the patch doesn't apply to 2.0.0)
-#
+# - package all deps (tarballs 10-29) into separate spec files
+#   (like in fedora)
 # Conditional build:
 %bcond_with	pam		# PAM authentication support
-%bcond_with	logdb		# enable mod_logdb (server-side message logging)
-#
-%define	_alt_name	%{nil}
-%if %{with logdb}
-%define	_alt_name	-logdb
-%endif
-
-%define	realname	ejabberd
+%bcond_without	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}%{_alt_name}
-Version:	2.0.1
+Name:		ejabberd
+Version:	18.04
 Release:	2
 License:	GPL
 Group:		Applications/Communications
-Source0:	http://www.process-one.net/en/projects/ejabberd/download/%{version}/%{realname}-%{version}_2.tar.gz
-# Source0-md5:	9c9417ab8dc334094ec7a611016c726e
-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
-Patch3:		%{realname}-mod_logdb.patch
-Patch4:		%{realname}-webadmin.patch
-URL:		http://ejabberd.jabber.ru/
+Source0:	http://www.process-one.net/downloads/ejabberd/%{version}/%{name}-%{version}.tgz
+# Source0-md5:	bd82d63fc4eb0931b7f3da0a2847772e
+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
+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
+
+Patch0:		%{name}-paths.patch
+Patch1:		%{name}-config.patch
+# https://paleg.github.io/mod_logdb/
+# https://github.com/paleg/ejabberd/tree/17.04-mod_logdb
+Patch3:		%{name}-mod_logdb.patch
+URL:		http://www.ejabberd.im/
 BuildRequires:	autoconf
-BuildRequires:	erlang >= R10B_5
+BuildRequires:	automake
+BuildRequires:	erlang >= 1:R16B03
 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:	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 >= 1:R15B01
+Requires:	expat >= 1.95
 Requires:	rc-scripts
-%if %{with logdb}
-Obsoletes:	ejabberd
-Conflicts:	ejabberd
-%else
-Obsoletes:	ejabberd-logdb
-Conflicts:	ejabberd-logdb
-%endif
+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.
@@ -66,73 +103,267 @@ server. It is written mostly in Erlang.
 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
+Group:		Applications/Communications
+Requires:	%{name} = %{version}-%{release}
+
+%description logdb
+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
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
+#%%patch2 -p1
 %if %{with logdb}
-%patch3 -p0
+%patch3 -p1
 %endif
-%patch4 -p0
+
+# 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}"
 
 %build
-cd src
+unset GIT_DIR GIT_WORK_TREE
+%{__aclocal} -I m4
 %{__autoconf}
 %configure \
-	--enable-odbc %{?with_pam --enable-pam}
-%{__make}
-cd ..
+	%{?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 \
+	%{?with_pam:--enable-pam} \
+	--enable-zlib \
+	--enable-iconv
+
+touch deps/.got
+
+cd deps/iconv
+%configure
+cd ../..
+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
 
 %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}}
+
+unset GIT_DIR GIT_WORK_TREE
 
-%{__make} -C src install \
+%{__make} install -j1 \
+	CHOWN_COMMAND=true \
+	O_USER="" \
+	G_USER="" \
 	DESTDIR=$RPM_BUILD_ROOT
 
-sed -e's,@libdir@,%{_libdir},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}*
 
-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
+chmod 755 $RPM_BUILD_ROOT%{_libdir}/*/priv/lib/*.so
+
+rm -rf _doc 2>/dev/null || :
+mv $RPM_BUILD_ROOT%{_docdir}/%{name} _doc
+
+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 /etc/jabber/ejabberd.cfg ] ; then
+	if grep -Eq '^[^%]*access_get' /etc/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 || :
+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 ChangeLog doc src/odbc/pg.sql src/odbc/mysql.sql src/odbc/mssql.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
-%{_libdir}/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-%{version}/ebin/mod_logdb*
+%endif
+%{_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}/goldrush-*
+%{_libdir}/iconv-*
+%{_libdir}/jiffy-*
+%{_libdir}/jose-*
+%{_libdir}/lager-*
+%{_libdir}/p1_mysql-*
+%{_libdir}/p1_oauth2-*
+%{_libdir}/p1_pgsql-*
+%{_libdir}/p1_utils-*
+%{_libdir}/rebar_elixir_plugin-*
+%{_libdir}/stringprep-*
+%{_libdir}/xmpp-*
 %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}
+
+%if %{with logdb}
+%files logdb
+%defattr(644,root,root,755)
+%{_libdir}/ejabberd-%{version}/ebin/mod_logdb*
+%endif