X-Git-Url: http://git.pld-linux.org/?p=packages%2Fejabberd.git;a=blobdiff_plain;f=ejabberd.spec;h=b0dff49113021a0057a06f6b6c747cd2c96402d8;hp=51acbeeb556f8e8ff294f5521c81837513808130;hb=9682d4d;hpb=78cfe19645deb972f96b6acc52ae29234eb5ca18

diff --git a/ejabberd.spec b/ejabberd.spec
index 51acbee..b0dff49 100644
--- a/ejabberd.spec
+++ b/ejabberd.spec
@@ -1,79 +1,87 @@
-
+# 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:	14.07
+Version:	19.02
 Release:	1
 License:	GPL
 Group:		Applications/Communications
 Source0:	http://www.process-one.net/downloads/ejabberd/%{version}/%{name}-%{version}.tgz
-# Source0-md5:	bb52a686c0895362822a81df5b25edc3
+# Source0-md5:	0ad4ca190161b18cf9d923f6abb3c44a
 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-goldrush-20140123.tar.gz
-# Source10-md5:	04404b38f30ced010557ca568369b92a
-Source11:	ejabberd-lager-20140722.tar.gz
-# Source11-md5:	3f78dc4741a78b2e81d0fd5ec7e6827d
-Source12:	ejabberd-p1_cache_tab-20140717.tar.gz
-# Source12-md5:	4b23cc1e1dc5e4482a3b412ac07ccc14
-Source13:	ejabberd-p1_iconv-20140430.tar.gz
-# Source13-md5:	690346781d7294c005dcc631fcb7d2aa
-Source14:	ejabberd-p1_stringprep-20131209.tar.gz
-# Source14-md5:	4631268d34a193f8e2055e47a5141950
-Source15:	ejabberd-p1_tls-20140710.tar.gz
-# Source15-md5:	0f4540812fe540ed31d5499736aa93bd
-Source16:	ejabberd-p1_xml-20140724.tar.gz
-# Source16-md5:	2437645a9abaecde290c8b8a5ec0e63c
-Source17:	ejabberd-p1_yaml-20140611.tar.gz
-# Source17-md5:	edbce7c9437317411c3763651d96b850
-Source18:	ejabberd-p1_zlib-20140507.tar.gz
-# Source18-md5:	c31a49be996d21cae7a293ef21c35b17
-Source19:	ejabberd-xmlrpc-20140317.tar.gz
-# Source19-md5:	a17ba12ff474fd6e0a15c1348694fcf5
-Source20:	ejabberd-jiffy-20140823.tar.gz
-# Source20-md5:	a1ccd298ab9b95141e0e26273125e201
-Source21:	ejabberd-p1_mysql-20140404.tar.gz
-# Source21-md5:	6d133ae5371ce2eb102faa0c71f6f0ba
-Source22:	ejabberd-p1_pam-20130515.tar.gz
-# Source22-md5:	0ca31094d93dfb047f05c7539136433a
-Source23:	ejabberd-p1_pgsql-20140405.tar.gz
-# Source23-md5:	4100906c9f643c39c94e97e37449b800
-Source24:	ejabberd-p1_stun-20140821.tar.gz
-# Source24-md5:	babf832ccbf92d2f93baaac89b11111b
-Source25:	ejabberd-p1_utils-20140825.tar.gz
-# Source25-md5:	c371a3c647fead52c7f3bb6c18f32f43
-Source26:	ejabberd-esip-20140717.tar.gz
-# Source26-md5:	69d1d4994170713da507fe1572cabd04
-#
+Source10:       ejabberd-base64url-20150806.tar.gz
+# Source10-md5:	380365a24cbd8cff33115fd7ae696db4
+Source11:       ejabberd-cache_tab-20190226.tar.gz
+# Source11-md5:	601a809bea3037253412abb5e9497236
+Source12:       ejabberd-eimp-20190226.tar.gz
+# Source12-md5:	a490c92b9ff8505a69cb591dd5a8faa3
+Source13:       ejabberd-elixir-20170515.tar.gz
+# Source13-md5:	73be42f7d0cda7aeee5c0e6dadc0c451
+Source14:       ejabberd-ezlib-20190226.tar.gz
+# Source14-md5:	ef779ed1f0e56746ff81a42397f66168
+Source15:       ejabberd-fast_tls-20190226.tar.gz
+# Source15-md5:	75aabc6f73cacaeea627424b7e3b8177
+Source16:       ejabberd-fast_xml-20190226.tar.gz
+# Source16-md5:	22ff10a6d53075becd59c57fe845844a
+Source17:       ejabberd-fast_yaml-20190226.tar.gz
+# Source17-md5:	7de2c0c783ef7f7a47d53caa10c559e1
+Source18:       ejabberd-goldrush-20160531.tar.gz
+# Source18-md5:	acac73f0fc85d23671f0c49c68f8df8a
+Source19:       ejabberd-jiffy-20160331.tar.gz
+# Source19-md5:	78f31a7dea7538ef3e63f77351f4d0b7
+Source20:       ejabberd-jose-20170518.tar.gz
+# Source20-md5:	b1675bfc57c1b3b7e154270e2bcd4559
+Source21:       ejabberd-lager-20181014.tar.gz
+# Source21-md5:	ebe0b027d39ade9b99dbc77740b2c7fe
+Source22:       ejabberd-mqtree-20190226.tar.gz
+# Source22-md5:	1d3c328f1c008e5b62e6657951665cf6
+Source23:       ejabberd-p1_mysql-20180723.tar.gz
+# Source23-md5:	801894f56f9118a077bb6c4d4f10701d
+Source24:       ejabberd-p1_oauth2-20190226.tar.gz
+# Source24-md5:	19d4659a50b2b728dc9a1fd40f047758
+Source25:       ejabberd-p1_pgsql-20190226.tar.gz
+# Source25-md5:	4889ca18dd619168a65c7bfb8ba97977
+Source26:       ejabberd-p1_utils-20190226.tar.gz
+# Source26-md5:	83a273540bd0e4482c4a4d702ab2d2a9
+Source27:       ejabberd-pkix-20190226.tar.gz
+# Source27-md5:	23dbf61b04f415a5ae880b1e209cc498
+Source28:       ejabberd-rebar_elixir_plugin-20160105.tar.gz
+# Source28-md5:	6a069a566d71c3daa45fc4736364adf0
+Source29:       ejabberd-stringprep-20190226.tar.gz
+# Source29-md5:	cec9cabb413973fc2ea1e904f5be7ee7
+Source30:       ejabberd-xmpp-20190226.tar.gz
+# Source30-md5:	7bdf3e5c5d3e6acb2837357137cdf27f
+
 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
-BuildRequires:	erlang >= 1:R15B01
+BuildRequires:	erlang >= 1:R16B03
 BuildRequires:	expat-devel >= 1.95
 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
@@ -106,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
+%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
@@ -137,43 +142,35 @@ 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-zlib
 
 touch deps/.got
 
-cd deps/p1_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
@@ -191,13 +188,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
@@ -317,6 +314,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
@@ -325,9 +325,41 @@ 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}/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_mysql-*
+%{_libdir}/p1_oauth2-*
+%{_libdir}/p1_pgsql-*
+%{_libdir}/p1_utils-*
+%dir %{_libdir}/pkix-*
+%{_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}
@@ -338,5 +370,5 @@ fi
 %if %{with logdb}
 %files logdb
 %defattr(644,root,root,755)
-%{_libdir}/ejabberd/ebin/mod_logdb*
+%{_libdir}/ejabberd-%{version}/ebin/mod_logdb*
 %endif