[ejabberd/el5/master] Ver. 2.1.5 (bugfix release)
Peter Lemenkov
peter at fedoraproject.org
Wed Aug 4 09:23:45 UTC 2010
commit f8232234202708325f24caae6a488e436e767ea1
Author: Peter Lemenkov <lemenkov at gmail.com>
Date: Wed Aug 4 13:08:25 2010 +0400
Ver. 2.1.5 (bugfix release)
.gitignore | 1 +
...-service-example-name-to-match-actual-one.patch | 6 +-
...ention-mod_ctlextra-as-an-ejabberd-module.patch | 8 +-
...berd-0003-Fixed-delays-in-s2s-connections.patch | 14 +-
ejabberd-0004-Introducing-mod_admin_extra.patch | 8 +-
...05-Fedora-specific-changes-to-ejabberdctl.patch | 8 +-
...pport-to-authenticate-against-SASL-GSSAPI.patch | 8 +-
...-Change-directory-to-readable-by-everyone.patch | 10 +-
...Install-.so-objects-with-0755-permissions.patch | 10 +-
...e-docs-by-default-also-install-.html-and-.patch | 36 ----
...-Use-versioned-directory-for-storing-docs.patch | 10 +-
...nstall-COPYING-file-along-with-other-docs.patch | 27 ---
...d-0011-Pass-correct-version-to-autoreconf.patch | 37 ----
...OTP-R14-use-public_key-library-instead-of.patch | 177 --------------------
ejabberd.spec | 32 ++--
sources | 2 +-
16 files changed, 56 insertions(+), 338 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 0fbdd0f..0308b93 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
ejabberd-2.1.4.tar.gz
+ejabberd-2.1.5.tar.gz
diff --git a/ejabberd-0001-Fix-PAM-service-example-name-to-match-actual-one.patch b/ejabberd-0001-Fix-PAM-service-example-name-to-match-actual-one.patch
index f7c44da..0718a03 100644
--- a/ejabberd-0001-Fix-PAM-service-example-name-to-match-actual-one.patch
+++ b/ejabberd-0001-Fix-PAM-service-example-name-to-match-actual-one.patch
@@ -1,7 +1,7 @@
-From 32b2458e39fa13190f575aafd2f410b2041ca78b Mon Sep 17 00:00:00 2001
+From 5fdb6557be8b5758856a91e8172acfddc9d04382 Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov at gmail.com>
Date: Tue, 16 Feb 2010 16:03:38 +0300
-Subject: [PATCH 01/13] Fix PAM service example name to match actual one
+Subject: [PATCH 1/9] Fix PAM service example name to match actual one
Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
---
@@ -22,5 +22,5 @@ index 4087947..b351cfc 100644
%%
%% Authentication using LDAP
--
-1.7.1.1
+1.7.2
diff --git a/ejabberd-0002-Mention-mod_ctlextra-as-an-ejabberd-module.patch b/ejabberd-0002-Mention-mod_ctlextra-as-an-ejabberd-module.patch
index b4b0957..3751b73 100644
--- a/ejabberd-0002-Mention-mod_ctlextra-as-an-ejabberd-module.patch
+++ b/ejabberd-0002-Mention-mod_ctlextra-as-an-ejabberd-module.patch
@@ -1,7 +1,7 @@
-From ce99acea0e154c8d5f9c6348c8770512325851fb Mon Sep 17 00:00:00 2001
+From ca74de7045b7393b09b53dd02e548e76cab9c849 Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov at gmail.com>
Date: Tue, 16 Feb 2010 16:05:53 +0300
-Subject: [PATCH 02/13] Mention mod_ctlextra as an ejabberd module
+Subject: [PATCH 2/9] Mention mod_ctlextra as an ejabberd module
Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
---
@@ -9,7 +9,7 @@ Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/src/ejabberd.app b/src/ejabberd.app
-index 3d65f82..d780de4 100644
+index 0ebb1aa..3a8d604 100644
--- a/src/ejabberd.app
+++ b/src/ejabberd.app
@@ -70,6 +70,7 @@
@@ -21,5 +21,5 @@ index 3d65f82..d780de4 100644
mod_echo,
mod_http_bind,
--
-1.7.1.1
+1.7.2
diff --git a/ejabberd-0003-Fixed-delays-in-s2s-connections.patch b/ejabberd-0003-Fixed-delays-in-s2s-connections.patch
index be44484..f5f0ec8 100644
--- a/ejabberd-0003-Fixed-delays-in-s2s-connections.patch
+++ b/ejabberd-0003-Fixed-delays-in-s2s-connections.patch
@@ -1,7 +1,7 @@
-From 24b6dfa0c8194435f51de87c40001f81f4b514c2 Mon Sep 17 00:00:00 2001
+From 9c8d1d47cf8e8ab98e8063161b04c8beabfc9ce5 Mon Sep 17 00:00:00 2001
From: Sergei Golovan <sgolovan at nes.ru>
Date: Tue, 16 Feb 2010 16:07:37 +0300
-Subject: [PATCH 03/13] Fixed delays in s2s connections.
+Subject: [PATCH 3/9] Fixed delays in s2s connections.
Patch by Sergei Golovan increases timeouts in S2S and removes horrible 5-minute
delay between remote server connection attempts after a falure (in case of
@@ -13,10 +13,10 @@ network split when the delay is inadmissible).
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/ejabberd_s2s_in.erl b/src/ejabberd_s2s_in.erl
-index 9b37833..cc217ef 100644
+index 56086c9..9ab58a7 100644
--- a/src/ejabberd_s2s_in.erl
+++ b/src/ejabberd_s2s_in.erl
-@@ -361,7 +361,7 @@ stream_established({xmlstreamelement, El}, StateData) ->
+@@ -367,7 +367,7 @@ stream_established({xmlstreamelement, El}, StateData) ->
case {ejabberd_s2s:allow_host(To, From),
lists:member(LTo, ejabberd_router:dirty_get_all_domains())} of
{true, true} ->
@@ -26,7 +26,7 @@ index 9b37833..cc217ef 100644
{verify, self(),
Key, StateData#state.streamid}),
diff --git a/src/ejabberd_s2s_out.erl b/src/ejabberd_s2s_out.erl
-index 69cbfdd..4661241 100644
+index a1c6412..b8393cb 100644
--- a/src/ejabberd_s2s_out.erl
+++ b/src/ejabberd_s2s_out.erl
@@ -91,7 +91,7 @@
@@ -38,7 +38,7 @@ index 69cbfdd..4661241 100644
%% We do not block on send anymore.
-define(TCP_SEND_TIMEOUT, 15000).
-@@ -227,8 +227,8 @@ open_socket(init, StateData) ->
+@@ -228,8 +228,8 @@ open_socket(init, StateData) ->
{error, _Reason} ->
?INFO_MSG("s2s connection: ~s -> ~s (remote server not found)",
[StateData#state.myname, StateData#state.server]),
@@ -50,5 +50,5 @@ index 69cbfdd..4661241 100644
open_socket(stop, StateData) ->
?INFO_MSG("s2s connection: ~s -> ~s (stopped in open socket)",
--
-1.7.1.1
+1.7.2
diff --git a/ejabberd-0004-Introducing-mod_admin_extra.patch b/ejabberd-0004-Introducing-mod_admin_extra.patch
index 210dca7..d3c320e 100644
--- a/ejabberd-0004-Introducing-mod_admin_extra.patch
+++ b/ejabberd-0004-Introducing-mod_admin_extra.patch
@@ -1,7 +1,7 @@
-From 843ce577199c20241ad2f89a23d13240d0a52c7e Mon Sep 17 00:00:00 2001
+From a0769ced87381fa07c6845d5fda18b5e584d4ed5 Mon Sep 17 00:00:00 2001
From: Badlop <badlop at process-one.net>
Date: Tue, 16 Feb 2010 16:12:17 +0300
-Subject: [PATCH 04/13] Introducing mod_admin_extra
+Subject: [PATCH 4/9] Introducing mod_admin_extra
Adds the mod_admin_extra module to ejabberd.
This module extends the functionality provided by ejabberdctl
@@ -17,7 +17,7 @@ https://forge.process-one.net/browse/ejabberd-modules/mod_admin_extra
create mode 100644 src/mod_admin_extra.erl
diff --git a/src/ejabberd.app b/src/ejabberd.app
-index d780de4..91d50d6 100644
+index 3a8d604..de47a0d 100644
--- a/src/ejabberd.app
+++ b/src/ejabberd.app
@@ -105,6 +105,7 @@
@@ -1314,5 +1314,5 @@ index 0000000..9f3ca14
+is_glob_match(String, Glob) ->
+ is_regexp_match(String, regexp:sh_to_awk(Glob)).
--
-1.7.1.1
+1.7.2
diff --git a/ejabberd-0005-Fedora-specific-changes-to-ejabberdctl.patch b/ejabberd-0005-Fedora-specific-changes-to-ejabberdctl.patch
index 01f5ecb..3cec2cc 100644
--- a/ejabberd-0005-Fedora-specific-changes-to-ejabberdctl.patch
+++ b/ejabberd-0005-Fedora-specific-changes-to-ejabberdctl.patch
@@ -1,7 +1,7 @@
-From f4c26373ef2c0c1c58726c6d3c8de0416c23bd9a Mon Sep 17 00:00:00 2001
+From 52209eb6efd83b91d5ad49623d99c53a27ffcbe9 Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov at gmail.com>
Date: Tue, 16 Feb 2010 16:30:05 +0300
-Subject: [PATCH 05/13] Fedora-specific changes to ejabberdctl
+Subject: [PATCH 5/9] Fedora-specific changes to ejabberdctl
Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
---
@@ -9,7 +9,7 @@ Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/ejabberdctl.template b/src/ejabberdctl.template
-index 9ede77d..69c74d6 100644
+index fecdecc..bceec28 100644
--- a/src/ejabberdctl.template
+++ b/src/ejabberdctl.template
@@ -9,10 +9,10 @@ ERL_MAX_ETS_TABLES=1400
@@ -44,5 +44,5 @@ index 9ede77d..69c74d6 100644
done
if [ "$ID" -eq "$EJID" ] ; then
--
-1.7.1.1
+1.7.2
diff --git a/ejabberd-0006-Support-to-authenticate-against-SASL-GSSAPI.patch b/ejabberd-0006-Support-to-authenticate-against-SASL-GSSAPI.patch
index 0a65e52..839a3dd 100644
--- a/ejabberd-0006-Support-to-authenticate-against-SASL-GSSAPI.patch
+++ b/ejabberd-0006-Support-to-authenticate-against-SASL-GSSAPI.patch
@@ -1,7 +1,7 @@
-From 12008cf7b4072fd50273c94fc47db91280908491 Mon Sep 17 00:00:00 2001
+From 6819e946b2cfd7cc31ae182225ecd5ed47b2f057 Mon Sep 17 00:00:00 2001
From: Badlop <badlop at process-one.net>
Date: Tue, 29 Sep 2009 15:10:15 +0200
-Subject: [PATCH 06/13] Support to authenticate against SASL GSSAPI.
+Subject: [PATCH 6/9] Support to authenticate against SASL GSSAPI.
http://www.ejabberd.im/cyrsasl_gssapi
---
@@ -333,7 +333,7 @@ index e1f0cfd..39a41d5 100644
+ check_password_digest,
+ fqdn}).
diff --git a/src/ejabberd_c2s.erl b/src/ejabberd_c2s.erl
-index 6238cda..abaee5f 100644
+index d4b6809..fe016d9 100644
--- a/src/ejabberd_c2s.erl
+++ b/src/ejabberd_c2s.erl
@@ -71,6 +71,7 @@
@@ -424,5 +424,5 @@ index 0000000..b6943e1
+ F -> {ok, F}
+ end.
--
-1.7.1.1
+1.7.2
diff --git a/ejabberd-0007-Change-directory-to-readable-by-everyone.patch b/ejabberd-0007-Change-directory-to-readable-by-everyone.patch
index b52bbf4..8cb54ae 100644
--- a/ejabberd-0007-Change-directory-to-readable-by-everyone.patch
+++ b/ejabberd-0007-Change-directory-to-readable-by-everyone.patch
@@ -1,7 +1,7 @@
-From b85f4f18bc6ed36d380796c969f24ccad4968fa8 Mon Sep 17 00:00:00 2001
+From 5e33cd01bfce37dd0dffde1cb372a9b485439796 Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov at gmail.com>
Date: Thu, 18 Mar 2010 14:57:21 +0300
-Subject: [PATCH 07/13] Change directory to readable by everyone
+Subject: [PATCH 7/9] Change directory to readable by everyone
This requires to suppress error messages like
"File operation error: eacces". See rhbz #564686:
@@ -14,10 +14,10 @@ Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/src/ejabberdctl.template b/src/ejabberdctl.template
-index 69c74d6..11bcac8 100644
+index bceec28..ee74650 100644
--- a/src/ejabberdctl.template
+++ b/src/ejabberdctl.template
-@@ -351,6 +351,10 @@ wait_for_status()
+@@ -355,6 +355,10 @@ wait_for_status()
return $status
}
@@ -29,5 +29,5 @@ index 69c74d6..11bcac8 100644
' start') start;;
' debug') debug;;
--
-1.7.1.1
+1.7.2
diff --git a/ejabberd-0008-Install-.so-objects-with-0755-permissions.patch b/ejabberd-0008-Install-.so-objects-with-0755-permissions.patch
index 89f41a2..edd53f6 100644
--- a/ejabberd-0008-Install-.so-objects-with-0755-permissions.patch
+++ b/ejabberd-0008-Install-.so-objects-with-0755-permissions.patch
@@ -1,7 +1,7 @@
-From 7a8468ca59258efa192cea0f7d6e6a33b269a841 Mon Sep 17 00:00:00 2001
+From 875c6c223a7ec6e807bf1629f02c4d9a0f1dc70c Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov at gmail.com>
Date: Sat, 12 Jun 2010 14:14:52 +0400
-Subject: [PATCH 08/13] Install *.so objects with 0755 permissions
+Subject: [PATCH 8/9] Install *.so objects with 0755 permissions
Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
---
@@ -9,10 +9,10 @@ Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/Makefile.in b/src/Makefile.in
-index dd728ce..9a371a9 100644
+index cf600c3..c9492f3 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
-@@ -226,7 +226,7 @@ install: all
+@@ -230,7 +230,7 @@ install: all
#
# Binary system libraries
install -d $(SODIR)
@@ -22,5 +22,5 @@ index dd728ce..9a371a9 100644
# Translated strings
install -d $(MSGSDIR)
--
-1.7.1.1
+1.7.2
diff --git a/ejabberd-0012-Use-versioned-directory-for-storing-docs.patch b/ejabberd-0009-Use-versioned-directory-for-storing-docs.patch
similarity index 81%
rename from ejabberd-0012-Use-versioned-directory-for-storing-docs.patch
rename to ejabberd-0009-Use-versioned-directory-for-storing-docs.patch
index 746b133..5d71b47 100644
--- a/ejabberd-0012-Use-versioned-directory-for-storing-docs.patch
+++ b/ejabberd-0009-Use-versioned-directory-for-storing-docs.patch
@@ -1,7 +1,7 @@
-From 26699cf99164646db4d4460029656d327ea4d63c Mon Sep 17 00:00:00 2001
+From 9fd1fc4302b10e2b064cfb92484a29c75493cc91 Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov at gmail.com>
Date: Sat, 12 Jun 2010 16:12:11 +0400
-Subject: [PATCH 12/13] Use versioned directory for storing docs
+Subject: [PATCH 9/9] Use versioned directory for storing docs
It's also a good idea to store doc-files under the versioned directory.
This may greatly simplify parallel installation of different versions of
@@ -18,10 +18,10 @@ Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/Makefile.in b/src/Makefile.in
-index 151328d..c9e8689 100644
+index c9492f3..7b585d0 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
-@@ -88,7 +88,7 @@ SBINDIR = $(DESTDIR)@sbindir@
+@@ -92,7 +92,7 @@ SBINDIR = $(DESTDIR)@sbindir@
EJABBERDDIR = $(DESTDIR)@libdir@/ejabberd
# /share/doc/ejabberd
@@ -31,5 +31,5 @@ index 151328d..c9e8689 100644
DOCDIR = $(DESTDIR)@docdir@
--
-1.7.1.1
+1.7.2
diff --git a/ejabberd.spec b/ejabberd.spec
index 069eb7c..db5c8e8 100644
--- a/ejabberd.spec
+++ b/ejabberd.spec
@@ -10,8 +10,8 @@
%endif
Name: ejabberd
-Version: 2.1.4
-Release: 3%{?dist}
+Version: 2.1.5
+Release: 1%{?dist}
Summary: A distributed, fault-tolerant Jabber/XMPP server
Group: Applications/Internet
@@ -54,27 +54,18 @@ Patch6: ejabberd-0006-Support-to-authenticate-against-SASL-GSSAPI.patch
Patch7: ejabberd-0007-Change-directory-to-readable-by-everyone.patch
# Fix so-lib permissions while installing (fedora/epel-specific)
Patch8: ejabberd-0008-Install-.so-objects-with-0755-permissions.patch
-# Applied upstream
-Patch9: ejabberd-0009-Install-more-docs-by-default-also-install-.html-and-.patch
-# Applied upstream
-Patch10: ejabberd-0010-Install-COPYING-file-along-with-other-docs.patch
-# Applied upstream
-Patch11: ejabberd-0011-Pass-correct-version-to-autoreconf.patch
# Will be proposed for incusion into upstream
-Patch12: ejabberd-0012-Use-versioned-directory-for-storing-docs.patch
-# Backported from upstream
-Patch13: ejabberd-0013-When-using-OTP-R14-use-public_key-library-instead-of.patch
+Patch9: ejabberd-0009-Use-versioned-directory-for-storing-docs.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: expat-devel
-BuildRequires: openssl-devel
+BuildRequires: openssl-devel >= 0.9.8
BuildRequires: pam-devel
BuildRequires: erlang
BuildRequires: dos2unix
BuildRequires: fedora-usermgmt-devel
-BuildRequires: autoconf
%if 0%{?with_hevea}
BuildRequires: hevea
%endif
@@ -130,11 +121,7 @@ Documentation for ejabberd.
%patch6 -p1 -b .gssapi
%patch7 -p1 -b .fix_access
%patch8 -p1 -b .fix_perms
-%patch9 -p1 -b .install_docs
-%patch10 -p1 -b .install_copying
-%patch11 -p1 -b .pass_ver
-%patch12 -p1 -b .versioned_docdir
-%patch13 -p1 -b .R14A
+%patch9 -p1 -b .versioned_docdir
cp %{S:4} src
cp %{S:5} src
@@ -144,7 +131,6 @@ cp %{S:7} src
%build
pushd src
-autoreconf -ivf
%configure --enable-odbc --enable-pam
# doesn't builds on SMP currently
make
@@ -341,6 +327,7 @@ rm -rf %{buildroot}
%{_libdir}/%{name}/priv/lib/ejabberd_zlib_drv.so
%{_libdir}/%{name}/priv/lib/expat_erl.so
%{_libdir}/%{name}/priv/lib/iconv_erl.so
+%{_libdir}/%{name}/priv/lib/sha_drv.so
%{_libdir}/%{name}/priv/lib/stringprep_drv.so
%{_libdir}/%{name}/priv/lib/tls_drv.so
%{_libdir}/%{name}/priv/msgs/*.msg
@@ -364,6 +351,13 @@ rm -rf %{buildroot}
%doc %{_docdir}/%{name}-%{version}/*.txt
%changelog
+* Wed Aug 4 2010 Peter Lemenkov <lemenkov at gmail.com> 2.1.5-1
+- Ver. 2.1.5
+- OpenSSL >= 0.9.8
+- Doc-file features.* dropped (just a part of guide.*)
+- Dropped upstreamed patches
+- Don't use autoreconf
+
* Fri Jul 16 2010 Peter Lemenkov <lemenkov at gmail.com> 2.1.4-3
- Fix for Erlang/OTP R14A
- Added BR: autoconf
diff --git a/sources b/sources
index 58476f8..ef0833a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a73f2ae7c5c9ceccc295e6cbc6a70132 ejabberd-2.1.4.tar.gz
+2029ceca45584d704ca821a771d6d928 ejabberd-2.1.5.tar.gz
More information about the scm-commits
mailing list