X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=ejabberd.spec;h=ab6fcff7d1702a0aa9b0ef2fd9e360c997a1efe7;hb=f0222aaa9917fc73b9494bc8d8dd4594c32a2ee1;hp=1da09ba60bfbe7de00247486f773dbfafc768723;hpb=3f23be8ea2d661e0d674fd2dc60562bda1670ccb;p=packages%2Fejabberd.git

diff --git a/ejabberd.spec b/ejabberd.spec
index 1da09ba..ab6fcff 100644
--- a/ejabberd.spec
+++ b/ejabberd.spec
@@ -4,70 +4,73 @@
 # 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:	17.04
-Release:	1
+Version:	19.02
+Release:	2
 License:	GPL
 Group:		Applications/Communications
 Source0:	http://www.process-one.net/downloads/ejabberd/%{version}/%{name}-%{version}.tgz
-# Source0-md5:	70b761fb8327bc8653b12e2bf20fb0d1
+# 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-cache_tab-20170322.tar.gz
-# Source10-md5:	5a5dcf4b1d557d15cc0c4b666116acf7
-Source11:       ejabberd-elixir-20160606.tar.gz
-# Source11-md5:	23a6672b27b2051f00be16b3ea1b24dd
-Source12:       ejabberd-esip-20170322.tar.gz
-# Source12-md5:	cb4809d69accbee7cc93978ab5860642
-Source13:       ejabberd-ezlib-20170110.tar.gz
-# Source13-md5:	01dcf2e0d42859b24013819cde57eee0
-Source14:       ejabberd-fast_tls-20170320.tar.gz
-# Source14-md5:	9b87963d6a219bc1a88994affadfa3f6
-Source15:       ejabberd-fast_xml-20170214.tar.gz
-# Source15-md5:	da8a6c6b9fbe566bc2445368f098511e
-Source16:       ejabberd-fast_yaml-20170322.tar.gz
-# Source16-md5:	afacf731efffdae424791365752d55a3
-Source17:       ejabberd-goldrush-20151116.tar.gz
-# Source17-md5:	5a94b1dc7a102e30259c5caaa40722c8
-Source18:       ejabberd-iconv-20170322.tar.gz
-# Source18-md5:	093db5827c56fe67f7036902b6a01e4c
+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:	598b3f0bc0db83d9e7e50fedfecb3977
-Source20:       ejabberd-lager-20160610.tar.gz
-# Source20-md5:	90f9a92699ba0a18cadaebf7dde4f81e
-Source21:       ejabberd-luerl-20151210.tar.gz
-# Source21-md5:	ede0306e7b28a0dd99f1948f0f8dde45
-Source22:       ejabberd-p1_mysql-20161125.tar.gz
-# Source22-md5:	803bc540b14afc7579cfb7f2b2a9ca91
-Source23:       ejabberd-p1_oauth2-20160123.tar.gz
-# Source23-md5:	d5671f08c043734138c54c3a33d2033f
-Source24:       ejabberd-p1_pgsql-20170110.tar.gz
-# Source24-md5:	b9f19498dabeaf796a9a0cd3cb782dd0
-Source25:       ejabberd-p1_utils-20170411.tar.gz
-# Source25-md5:	f645c6b1789ba435daa26cb16843855a
-Source26:       ejabberd-rebar_elixir_plugin-20160105.tar.gz
-# Source26-md5:	36b4996aa60cf9a70e3484f4804ebda1
-Source27:       ejabberd-stringprep-20170322.tar.gz
-# Source27-md5:	d7e905548974743c03b5d66f7d9aba33
-Source28:       ejabberd-stun-20170322.tar.gz
-# Source28-md5:	9909596a875824b3ef517ca53d7c5358
-Source29:       ejabberd-xmpp-20170322.tar.gz
-# Source29-md5:	467ec3065ffd7b8d2387505b91b85e2b
-#
+# 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-sqlite3-20180130.tar.gz
+# Source29-md5:	cc8950eb769eb6ceb13723a7b61fe507
+Source30:       ejabberd-stringprep-20190226.tar.gz
+# Source30-md5:	cec9cabb413973fc2ea1e904f5be7ee7
+Source31:       ejabberd-xmpp-20190226.tar.gz
+# Source31-md5:	7bdf3e5c5d3e6acb2837357137cdf27f
+
 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/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
@@ -79,6 +82,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
@@ -113,16 +117,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 -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
 %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
@@ -144,20 +145,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 ../..
@@ -173,9 +172,6 @@ cd ../..
 cd deps/ezlib
 %configure
 cd ../..
-cd deps/esip
-%configure
-cd ../..
 
 # for elixir VM
 LC_ALL=en_US.UTF-8; export LC_ALL
@@ -336,25 +332,41 @@ fi
 %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}/esip-*
 %{_libdir}/ezlib-*
 %{_libdir}/fast_tls-*
 %{_libdir}/fast_xml-*
 %{_libdir}/fast_yaml-*
 %{_libdir}/goldrush-*
-%{_libdir}/iconv-*
 %{_libdir}/jiffy-*
+%{_libdir}/jose-*
 %{_libdir}/lager-*
-%{_libdir}/luerl-*
+%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}/sqlite3-*/ebin
+%dir %{_libdir}/sqlite3-*
+%dir %{_libdir}/sqlite3-*/priv
+%attr(755,root,root) %{_libdir}/sqlite3-*/priv/sqlite3_drv.so
 %{_libdir}/stringprep-*
-%{_libdir}/stun-*
 %{_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