- up to 16.08; huge TODO added

diff --git a/ejabberd-no_sslv3_or_3des.patch b/ejabberd-no_sslv3_or_3des.patch
index 21173641d2957bfa5e75d55826a23b841e0aec18..d9151b8d856631517ba6d60bd63f7e7e946b8213 100644 (file)
--- a/ejabberd-no_sslv3_or_3des.patch
+++ b/ejabberd-no_sslv3_or_3des.patch
@@ -1,15 +1,15 @@
---- ejabberd-13.12/deps/p1_tls/c_src/p1_tls_drv.c.orig 2013-12-23 22:55:13.000000000 +0100
-+++ ejabberd-13.12/deps/p1_tls/c_src/p1_tls_drv.c      2014-03-13 14:21:50.000000000 +0100
-@@ -47,7 +47,7 @@
+--- a/deps/fast_tls/c_src/fast_tls_drv.c~      2016-07-08 11:19:35.000000000 +0200
++++ b/deps/fast_tls/c_src/fast_tls_drv.c       2016-08-04 16:52:34.323491442 +0200
+@@ -56,7 +56,7 @@ typedef unsigned __int32 uint32_t;
  #define SSL_OP_NO_TICKET 0
  #endif
  
 -#define CIPHERS "DEFAULT:!EXPORT:!LOW:!RC4:!SSLv2"
 +#define CIPHERS "DEFAULT:!EXPORT:!LOW:!RC4:!SSLv2:!3DES"
  
- /*
-  * R15B changed several driver callbacks to use ErlDrvSizeT and
-@@ -548,13 +548,13 @@ static ErlDrvSSizeT tls_drv_control(ErlD
+ /* Wrappers around driver_alloc() that check  */
+ /* for OOM.                                   */
+@@ -711,13 +711,13 @@ static ErlDrvSSizeT tls_drv_control(ErlD
         SSL_set_bio(d->ssl, d->bio_read, d->bio_write);
  
         if (command == SET_CERTIFICATE_FILE_ACCEPT) {

diff --git a/ejabberd.spec b/ejabberd.spec
index cb504dd23719bcae2d2ff215368835782c4d6d4d..166cc6556d4c2b4791d1ac7aea4a4fb08ca2fb4f 100644 (file)
--- a/ejabberd.spec
+++ b/ejabberd.spec
@@ -1,4 +1,6 @@
-
+# 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)
@@ -7,56 +9,58 @@
 Summary:       Fault-tolerant distributed Jabber/XMPP server
 Summary(pl.UTF-8):     Odporny na awarie rozproszony serwer Jabbera/XMPP
 Name:          ejabberd
-Version:       15.09
-Release:       4
+Version:       16.08
+Release:       1
 License:       GPL
 Group:         Applications/Communications
 Source0:       http://www.process-one.net/downloads/ejabberd/%{version}/%{name}-%{version}.tgz
-# Source0-md5: 616a2fa06064e53ef0130260116dbb68
+# Source0-md5: a225e99c50e91464cf8f78bd8d129664
 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-cache_tab-20160630.tar.gz
+# Source10-md5:        28c7b761c5bdc70bbfa3c1d85fff9825
+Source11: ejabberd-elixir-20150928.tar.gz
+# Source11-md5:        1a0cba08de1687affe590e5abbc993cc
+Source12: ejabberd-esip-20160708.tar.gz
+# Source12-md5:        759e70d30fc1c5adbae3976e28c8c659
+Source13: ejabberd-ezlib-20160122.tar.gz
+# Source13-md5:        41907afdd7195014b1e4cf4764564a37
+Source14: ejabberd-fast_tls-20160708.tar.gz
+# Source14-md5:        e4f56b9dce6fc68f9eb58417554fe24a
+Source15: ejabberd-fast_xml-20160708.tar.gz
+# Source15-md5:        f26c98665fe7370262412084d802a310
+Source16: ejabberd-fast_yaml-20160708.tar.gz
+# Source16-md5:        815111ff387608a9c0a41898d8fe0ad6
+Source17: ejabberd-goldrush-20151116.tar.gz
+# Source17-md5:        61324bdee5d304a7189c305a6b4fe39e
+Source18: ejabberd-iconv-20160708.tar.gz
+# Source18-md5:        5b8ad7ada3f46b766e4be985322225f9
+Source19: ejabberd-jiffy-20160106.tar.gz
+# Source19-md5:        50a03a4289ab5c37c3263e73c15873ef
+Source20: ejabberd-lager-20160610.tar.gz
+# Source20-md5:        395b1fd4d056684c8b92d50d9916b7ed
+Source21: ejabberd-luerl-20151210.tar.gz
+# Source21-md5:        180f8ff3f24d00cbdabbf28c7e415f85
+Source22: ejabberd-p1_mysql-20160122.tar.gz
+# Source22-md5:        40b984a50b7d3a7bd00dd15aafd7a44a
+Source23: ejabberd-p1_oauth2-20160123.tar.gz
+# Source23-md5:        8dda6e87a6551724b0bc7d21b7a59357
+Source24: ejabberd-p1_pgsql-20160223.tar.gz
+# Source24-md5:        739c03ac9089f7f86d55cea3ee5bee25
+Source25: ejabberd-p1_utils-20160701.tar.gz
+# Source25-md5:        8a8734d8dd773ec0cf808e1a8bbdbde3
+Source26: ejabberd-p1_xmlrpc-20160123.tar.gz
+# Source26-md5:        8ec9db8add5754738f2272d690adb75c
+Source27: ejabberd-rebar_elixir_plugin-20160105.tar.gz
+# Source27-md5:        40f41b936c8c774174c953895f132f98
+Source28: ejabberd-stringprep-20160708.tar.gz
+# Source28-md5:        e9432b08b37602e54e8716c2b9e2edab
+Source29: ejabberd-stun-20160708.tar.gz
+# Source29-md5:        fea7f6b75606d51478a468ae664f0d64
 #
 Patch0:                %{name}-paths.patch
 Patch1:                %{name}-config.patch
@@ -110,7 +114,7 @@ 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
 %patch0 -p1
 %patch1 -p1
 #%%patch2 -p1
@@ -143,42 +147,39 @@ unset GIT_DIR GIT_WORK_TREE
        --enable-user=jabber \
        --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 deps/fast_xml
+%configure
 cd ../..
-cd deps/p1_yaml
+cd deps/fast_yaml
 %configure
 cd ../..
-cd deps/p1_zlib
+cd deps/ezlib
 %configure
 cd ../..
 cd deps/esip
 %configure
 cd ../..
 
+# for elixir VM
+LC_ALL=en_US.UTF-8; export LC_ALL
 %{__make} -j1
 
 %install
@@ -202,7 +203,7 @@ install %{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
@@ -330,9 +331,29 @@ 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}/cache_tab-*
+%{_libdir}/elixir-*
+%{_libdir}/esip-*
+%{_libdir}/ezlib-*
+%{_libdir}/fast_tls-*
+%{_libdir}/fast_xml-*
+%{_libdir}/fast_yaml-*
+%{_libdir}/goldrush-*
+%{_libdir}/iconv-*
+%{_libdir}/jiffy-*
+%{_libdir}/lager-*
+%{_libdir}/luerl-*
+%{_libdir}/p1_mysql-*
+%{_libdir}/p1_oauth2-*
+%{_libdir}/p1_pgsql-*
+%{_libdir}/p1_utils-*
+%{_libdir}/p1_xmlrpc-*
+%{_libdir}/rebar_elixir_plugin-*
+%{_libdir}/stringprep-*
+%{_libdir}/stun-*
 %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 +364,5 @@ fi
 %if %{with logdb}
 %files logdb
 %defattr(644,root,root,755)
-%{_libdir}/ejabberd/ebin/mod_logdb*
+%{_libdir}/ejabberd-%{version}/ebin/mod_logdb*
 %endif