X-Git-Url: http://git.pld-linux.org/?p=packages%2Fejabberd.git;a=blobdiff_plain;f=ejabberd.spec;h=7fc7928e84c086758d2188bfe7186316fd01085b;hp=ac91088bc64bdd63adad5dda9dfdb257cb495d55;hb=f55bab4;hpb=e9ba38633ec7a2d9284469c24f96be6da8a89ef4

diff --git a/ejabberd.spec b/ejabberd.spec
index ac91088..7fc7928 100644
--- a/ejabberd.spec
+++ b/ejabberd.spec
@@ -1,70 +1,74 @@
-
+# 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)
-%bcond_with	weaker_crypto	# enable SSLv3
+%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:	15.09
+Version:	18.12
 Release:	1
 License:	GPL
 Group:		Applications/Communications
 Source0:	http://www.process-one.net/downloads/ejabberd/%{version}/%{name}-%{version}.tgz
-# Source0-md5:	616a2fa06064e53ef0130260116dbb68
+# Source0-md5:	8b3a8a8338b1171129a0b2ede009e5ae
 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-elixir-20150712.tar.gz
-# Source10-md5:	d5d6770c1d4d8e79dc9e9a0e9109bfc8
-Source11: ejabberd-esip-20150722.tar.gz
-# Source11-md5:	9d41942a114e13af343992f2b70b9102
-Source12: ejabberd-goldrush-20150530.tar.gz
-# Source12-md5:	d0da4c67a1926e68f6e5ba83fa000dbd
-Source13: ejabberd-jiffy-20150831.tar.gz
-# Source13-md5:	2175f4219f97b627466fff70d3b7c9e2
-Source14: ejabberd-lager-20150812.tar.gz
-# Source14-md5:	b054a6a00e18800f60e8a84e9b2d0178
-Source15: ejabberd-oauth2-20150928.tar.gz
-# Source15-md5:	4f784ea8fc242b980ebd88591b63787d
-Source16: ejabberd-p1_cache_tab-20150628.tar.gz
-# Source16-md5:	f247d0482084724c72007303606325ec
-Source17: ejabberd-p1_iconv-20150624.tar.gz
-# Source17-md5:	c1b155bd12750b68eb3b5e1cd30633c0
-Source18: ejabberd-p1_mysql-20150929.tar.gz
-# Source18-md5:	008681215bfac2ef6e564022fc59d5ea
-Source19: ejabberd-p1_pgsql-20150428.tar.gz
-# Source19-md5:	276801e6dc862fdd87c2bf75c43022eb
-Source20: ejabberd-p1_stringprep-20150204.tar.gz
-# Source20-md5:	7bee6c6e233656699d8185739fe4cc42
-Source21: ejabberd-p1_stun-20150916.tar.gz
-# Source21-md5:	f191e45df97de294cdc854caa9183c1b
-Source22: ejabberd-p1_tls-20150803.tar.gz
-# Source22-md5:	25f045ce6c07380fb7d1572eecd2ec4f
-Source23: ejabberd-p1_utils-20150204.tar.gz
-# Source23-md5:	02f75bb69077a30da3ec4337cc00ec02
-Source24: ejabberd-p1_xml-20150924.tar.gz
-# Source24-md5:	7104125f840d7e20723339a6a4b88ee4
-Source25: ejabberd-p1_yaml-20150925.tar.gz
-# Source25-md5:	38c6c36acf0ddf7a5d960ab7aa3f7661
-Source26: ejabberd-p1_zlib-20150223.tar.gz
-# Source26-md5:	38c5ed4af6cde4d2cf21dfc3ba73028d
-Source27: ejabberd-rebar_elixir_plugin-20150420.tar.gz
-# Source27-md5:	aa115c4fffc7e25fb782da595e0c6fa6
-Source28: ejabberd-xmlrpc-20150506.tar.gz
-# Source28-md5:	852876d8cc812747c3d8af992491a9f7
-#
+Source10:	ejabberd-base64url-20150806.tar.gz
+# Source10-md5:	0d0a6421ccb91adb004d9c930da2c43c
+Source11:	ejabberd-cache_tab-20181204.tar.gz
+# Source11-md5:	3debe5111c93aeff9779354691c56881
+Source12:	ejabberd-eimp-20180925.tar.gz
+# Source12-md5:	74ca7119a2bbe4c1c3c05b8acf30649b
+Source13:	ejabberd-elixir-20170515.tar.gz
+# Source13-md5:	64443fc99538c09e32a052bae8f30d50
+Source14:	ejabberd-ezlib-20180322.tar.gz
+# Source14-md5:	dfbb568ae96c5b33ced5a31f3bf1d53a
+Source15:	ejabberd-fast_tls-20181129.tar.gz
+# Source15-md5:	785607922ce506a858be01f17c7d37de
+Source16:	ejabberd-fast_xml-20180924.tar.gz
+# Source16-md5:	d5779e69cd2fc5e498f2e316a6e0f2e2
+Source17:	ejabberd-fast_yaml-20180924.tar.gz
+# Source17-md5:	d9d300d96d95eda586f0fd9ce2834432
+Source18:	ejabberd-goldrush-20160531.tar.gz
+# Source18-md5:	dfe99336f279d58f3603142450c5f6a6
+Source19:	ejabberd-iconv-20180924.tar.gz
+# Source19-md5:	edad4b97b8b4a94465885adc8106822f
+Source20:	ejabberd-jiffy-20160331.tar.gz
+# Source20-md5:	b12c5bc8d79e3ef741ed46f375010764
+Source21:	ejabberd-jose-20170518.tar.gz
+# Source21-md5:	db5cca1f0cd25e1972c3f5745de92b52
+Source22:	ejabberd-lager-20181014.tar.gz
+# Source22-md5:	819a7871ec9c837aa05609eaded0d508
+Source23:	ejabberd-p1_mysql-20180723.tar.gz
+# Source23-md5:	e3bdb82e3aaf99c0e6f4ab70a71848d4
+Source24:	ejabberd-p1_oauth2-20180425.tar.gz
+# Source24-md5:	cdc232ea44c381c6cb06615f83ca4005
+Source25:	ejabberd-p1_pgsql-20180628.tar.gz
+# Source25-md5:	d12826dec9231d41c92474b126e824c6
+Source26:	ejabberd-p1_utils-20180924.tar.gz
+# Source26-md5:	93b3c4140d0c84971728c080d4a8722f
+Source27:	ejabberd-pkix-20181205.tar.gz
+# Source27-md5:	4a3b369cedd1feecd87101fe795f10dc
+Source28:	ejabberd-rebar_elixir_plugin-20160105.tar.gz
+# Source28-md5:	20a974e75677eb0e17f303370ccca6f6
+Source29:	ejabberd-stringprep-20180924.tar.gz
+# Source29-md5:	1b0da80d5a66341192cbb0eeb52ad1c5
+Source30:	ejabberd-xmpp-20181204.tar.gz
+# Source30-md5:	ba424280ce158bf58a8542d75744a9b0
+
 Patch0:		%{name}-paths.patch
 Patch1:		%{name}-config.patch
-# not available for 13.10
-#Patch2:		%{name}-vcard-access-get.patch
-# http://www.dp.uz.gov.ua/o.palij/mod_logdb/patch-mod_logdb-13.12.diff
+# https://paleg.github.io/mod_logdb/
+# https://github.com/paleg/ejabberd/tree/18.06-mod_logdb
 Patch3:		%{name}-mod_logdb.patch
-Patch4:		%{name}-no_sslv3_or_3des.patch
 URL:		http://www.ejabberd.im/
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -74,10 +78,10 @@ BuildRequires:	openssl-devel
 %if %{with pam}
 BuildRequires:	pam-devel
 %endif
+BuildRequires:	git-core
 BuildRequires:	rpmbuild(macros) >= 1.671
 BuildRequires:	yaml-devel
 BuildRequires:	zlib-devel
-BuildRequires:	git-core
 Requires(post):	/usr/bin/perl
 Requires(post):	jabber-common
 Requires(post):	sed >= 4.0
@@ -110,16 +114,13 @@ 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
+%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
 %patch0 -p1
 %patch1 -p1
 #%%patch2 -p1
 %if %{with logdb}
 %patch3 -p1
 %endif
-%if %{without weaker_crypto}
-%patch4 -p1
-%endif
 
 # Various parts of the build system use 'git describe'
 # which returns nonsense on manual builds using the builder script
@@ -141,44 +142,39 @@ 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-nif \
 	--enable-odbc \
 	--enable-mysql \
 	--enable-pgsql \
 	%{?with_pam:--enable-pam} \
 	--enable-zlib \
-	--enable-json \
-	--enable-iconv \
-	--enable-lager
+	--enable-iconv
 
 touch deps/.got
 
-cd deps/p1_iconv
+cd deps/iconv
 %configure
 cd ../..
-cd deps/p1_stringprep
+cd deps/stringprep
 %configure
 cd ../..
-cd deps/p1_tls
+cd deps/fast_tls
 %configure
 cd ../..
-cd deps/p1_xml
-%configure \
-	--enable-nif \
-	--enable-full-xml
-cd ../..
-cd deps/p1_yaml
+cd deps/fast_xml
 %configure
 cd ../..
-cd deps/p1_zlib
+cd deps/fast_yaml
 %configure
 cd ../..
-cd deps/esip
+cd deps/ezlib
 %configure
 cd ../..
 
+# for elixir VM
+LC_ALL=en_US.UTF-8; export LC_ALL
 %{__make} -j1
 
 %install
@@ -196,13 +192,13 @@ unset GIT_DIR GIT_WORK_TREE
 	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/%{name}
-install %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/%{name}
-install %{SOURCE3} $RPM_BUILD_ROOT%{systemdunitdir}/%{name}.service
-install %{SOURCE4} $RPM_BUILD_ROOT/etc/logrotate.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}/ejabberd/priv/lib/*.so
+chmod 755 $RPM_BUILD_ROOT%{_libdir}/*/priv/lib/*.so
 
 rm -rf _doc 2>/dev/null || :
 mv $RPM_BUILD_ROOT%{_docdir}/%{name} _doc
@@ -322,6 +318,9 @@ fi
 %defattr(644,root,root,755)
 %doc sql _doc/*
 %attr(755,root,root) %{_sbindir}/*
+%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
@@ -330,9 +329,36 @@ fi
 %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}/goldrush-*
+%{_libdir}/iconv-*
+%{_libdir}/jiffy-*
+%{_libdir}/jose-*
+%{_libdir}/lager-*
+%{_libdir}/p1_mysql-*
+%{_libdir}/p1_oauth2-*
+%{_libdir}/p1_pgsql-*
+%{_libdir}/p1_utils-*
+%{_libdir}/pkix-*/ebin
+%{_libdir}/pkix-*/LICENSE
+%{_libdir}/rebar_elixir_plugin-*
+%{_libdir}/stringprep-*
+%{_libdir}/xmpp-*
 %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}
@@ -343,5 +369,5 @@ fi
 %if %{with logdb}
 %files logdb
 %defattr(644,root,root,755)
-%{_libdir}/ejabberd/ebin/mod_logdb*
+%{_libdir}/ejabberd-%{version}/ebin/mod_logdb*
 %endif