[ejabberd] Ver. 2.1.9

Peter Lemenkov peter at fedoraproject.org
Tue Nov 22 11:28:08 UTC 2011


commit 339424470c83e0f63192dcd774a7c6c23d8b8e75
Author: Peter Lemenkov <lemenkov at gmail.com>
Date:   Tue Nov 22 15:27:57 2011 +0400

    Ver. 2.1.9
    
    Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>

 .gitignore                                         |    1 +
 ...-service-example-name-to-match-actual-one.patch |    8 +-
 ...02-Add-mod_ctlextra-as-an-ejabberd-module.patch |    8 +-
 ...berd-0003-Fixed-delays-in-s2s-connections.patch |    6 +-
 ejabberd-0004-Introducing-mod_admin_extra.patch    |    8 +-
 ...05-Fedora-specific-changes-to-ejabberdctl.patch |    6 +-
 ...Install-.so-objects-with-0755-permissions.patch |    4 +-
 ...-Use-versioned-directory-for-storing-docs.patch |    4 +-
 ...L-GSSAPI-authentication-thanks-to-Mikael-.patch |   68 +++++++++++++------
 ...09-Added-old-modules-for-Active-Directory.patch |    4 +-
 ...-fix-correct-version-in-configure-and-in-.patch |   43 ------------
 ...t-minute-fix-correct-version-in-configure.patch |   28 ++++++++
 ...11-Disable-INET_DIST_INTERFACE-by-default.patch |    6 +-
 ejabberd.spec                                      |   10 ++-
 sources                                            |    2 +-
 15 files changed, 110 insertions(+), 96 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index f38c163..e03c7f4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ ejabberd-2.1.4.tar.gz
 ejabberd-2.1.5.tar.gz
 /ejabberd-2.1.6.tar.gz
 /ejabberd-2.1.8.tar.gz
+/ejabberd-2.1.9.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 f795a5c..026d780 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,4 +1,4 @@
-From 13ff5cd1fafa2e534ee87362287ef2e2d2596b9b Mon Sep 17 00:00:00 2001
+From 2b62caec55c62db6364d5560372f7addcb8d9eeb 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/11] Fix PAM service example name to match actual one
@@ -9,10 +9,10 @@ Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
  1 files changed, 1 insertions(+), 1 deletions(-)
 
 diff --git a/src/ejabberd.cfg.example b/src/ejabberd.cfg.example
-index 92e78e3..d1d0b00 100644
+index 57eab41..594b273 100644
 --- a/src/ejabberd.cfg.example
 +++ b/src/ejabberd.cfg.example
-@@ -236,7 +236,7 @@
+@@ -240,7 +240,7 @@
  %% Authentication using PAM
  %%
  %%{auth_method, pam}.
@@ -22,5 +22,5 @@ index 92e78e3..d1d0b00 100644
  %%
  %% Authentication using LDAP
 -- 
-1.7.5.4
+1.7.7
 
diff --git a/ejabberd-0002-Add-mod_ctlextra-as-an-ejabberd-module.patch b/ejabberd-0002-Add-mod_ctlextra-as-an-ejabberd-module.patch
index 27888a9..c4ca093 100644
--- a/ejabberd-0002-Add-mod_ctlextra-as-an-ejabberd-module.patch
+++ b/ejabberd-0002-Add-mod_ctlextra-as-an-ejabberd-module.patch
@@ -1,4 +1,4 @@
-From 5ba288791407c7301ef85d80a31dae422ffb6bab Mon Sep 17 00:00:00 2001
+From 68152a5ae78fa3c6a9e11ddf65c29895e5c567e2 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/11] Add mod_ctlextra as an ejabberd module
@@ -19,10 +19,10 @@ Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
  create mode 100644 src/mod_ctlextra.erl
 
 diff --git a/src/ejabberd.app b/src/ejabberd.app
-index 5ab3b53..d390047 100644
+index ea755a7..528f7ff 100644
 --- a/src/ejabberd.app
 +++ b/src/ejabberd.app
-@@ -70,6 +70,7 @@
+@@ -71,6 +71,7 @@
  	     mod_caps,
  	     mod_configure2,
  	     mod_configure,
@@ -932,5 +932,5 @@ index 0000000..bc61024
 +		Ps),
 +	lists:reverse(Grouped_Ps).
 -- 
-1.7.5.4
+1.7.7
 
diff --git a/ejabberd-0003-Fixed-delays-in-s2s-connections.patch b/ejabberd-0003-Fixed-delays-in-s2s-connections.patch
index fee071a..2411246 100644
--- a/ejabberd-0003-Fixed-delays-in-s2s-connections.patch
+++ b/ejabberd-0003-Fixed-delays-in-s2s-connections.patch
@@ -1,4 +1,4 @@
-From 896c955b7ff0e7b01cce88d18858c2eb57609af5 Mon Sep 17 00:00:00 2001
+From bd1255f29c050dacd425aa8df3dd6653fe3083a1 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/11] Fixed delays in s2s connections.
@@ -26,7 +26,7 @@ index 848e58c..af5dc78 100644
  					   {verify, self(),
  					    Key, StateData#state.streamid}),
 diff --git a/src/ejabberd_s2s_out.erl b/src/ejabberd_s2s_out.erl
-index 55f48af..fdc9cf4 100644
+index aa2df3f..7d0e676 100644
 --- a/src/ejabberd_s2s_out.erl
 +++ b/src/ejabberd_s2s_out.erl
 @@ -93,7 +93,7 @@
@@ -49,5 +49,5 @@ index 55f48af..fdc9cf4 100644
      end;
  open_socket(closed, StateData) ->
 -- 
-1.7.5.4
+1.7.7
 
diff --git a/ejabberd-0004-Introducing-mod_admin_extra.patch b/ejabberd-0004-Introducing-mod_admin_extra.patch
index 0d030a5..5eef3fd 100644
--- a/ejabberd-0004-Introducing-mod_admin_extra.patch
+++ b/ejabberd-0004-Introducing-mod_admin_extra.patch
@@ -1,4 +1,4 @@
-From f18e54052525f4970d7fc01cfa3b2cdad5da9742 Mon Sep 17 00:00:00 2001
+From e7c7f50619e5281eb8ea60654740d0630c8f2a9b 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/11] Introducing mod_admin_extra
@@ -17,10 +17,10 @@ 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 d390047..a0154d4 100644
+index 528f7ff..6d068be 100644
 --- a/src/ejabberd.app
 +++ b/src/ejabberd.app
-@@ -105,6 +105,7 @@
+@@ -106,6 +106,7 @@
  	     mod_vcard_ldap,
  	     mod_vcard_odbc,
  	     mod_version,
@@ -1314,5 +1314,5 @@ index 0000000..9f3ca14
 +is_glob_match(String, Glob) ->
 +    is_regexp_match(String, regexp:sh_to_awk(Glob)).
 -- 
-1.7.5.4
+1.7.7
 
diff --git a/ejabberd-0005-Fedora-specific-changes-to-ejabberdctl.patch b/ejabberd-0005-Fedora-specific-changes-to-ejabberdctl.patch
index 3761586..3ac4b93 100644
--- a/ejabberd-0005-Fedora-specific-changes-to-ejabberdctl.patch
+++ b/ejabberd-0005-Fedora-specific-changes-to-ejabberdctl.patch
@@ -1,4 +1,4 @@
-From 28f3915b62cdf70b670daa27fbea567d7f16f994 Mon Sep 17 00:00:00 2001
+From e441520415e1a8d95cad867dffce50c43d1c048e 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/11] Fedora-specific changes to ejabberdctl
@@ -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 d2f20fa..a5459c3 100644
+index 0960f9a..c22478a 100644
 --- a/src/ejabberdctl.template
 +++ b/src/ejabberdctl.template
 @@ -9,10 +9,10 @@ ERL_MAX_ETS_TABLES=1400
@@ -44,5 +44,5 @@ index d2f20fa..a5459c3 100644
  done
  if [ "$ID" -eq "$EJID" ] ; then
 -- 
-1.7.5.4
+1.7.7
 
diff --git a/ejabberd-0006-Install-.so-objects-with-0755-permissions.patch b/ejabberd-0006-Install-.so-objects-with-0755-permissions.patch
index cb42e3e..9ed6c90 100644
--- a/ejabberd-0006-Install-.so-objects-with-0755-permissions.patch
+++ b/ejabberd-0006-Install-.so-objects-with-0755-permissions.patch
@@ -1,4 +1,4 @@
-From 3552a3dfe4dee092a247ef7b102b1cb871e97aaf Mon Sep 17 00:00:00 2001
+From 5f46ed81a2e40c1a6e80a486c4dcce859be6f753 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 06/11] Install *.so objects with 0755 permissions
@@ -22,5 +22,5 @@ index 42af5b2..64ed856 100644
  	# Translated strings
  	install -d $(MSGSDIR)
 -- 
-1.7.5.4
+1.7.7
 
diff --git a/ejabberd-0007-Use-versioned-directory-for-storing-docs.patch b/ejabberd-0007-Use-versioned-directory-for-storing-docs.patch
index 98afa23..dd80857 100644
--- a/ejabberd-0007-Use-versioned-directory-for-storing-docs.patch
+++ b/ejabberd-0007-Use-versioned-directory-for-storing-docs.patch
@@ -1,4 +1,4 @@
-From b030112cc6ddc8e1a36189699db363fde95d46cf Mon Sep 17 00:00:00 2001
+From 9547eac4ddf65cb546c6edcaf39de3abbd66178b 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 07/11] Use versioned directory for storing docs
@@ -31,5 +31,5 @@ index 64ed856..43b5e1f 100644
  DOCDIR = $(DESTDIR)@docdir@
  
 -- 
-1.7.5.4
+1.7.7
 
diff --git a/ejabberd-0008-Support-SASL-GSSAPI-authentication-thanks-to-Mikael-.patch b/ejabberd-0008-Support-SASL-GSSAPI-authentication-thanks-to-Mikael-.patch
index 6f4e9b2..d2c6687 100644
--- a/ejabberd-0008-Support-SASL-GSSAPI-authentication-thanks-to-Mikael-.patch
+++ b/ejabberd-0008-Support-SASL-GSSAPI-authentication-thanks-to-Mikael-.patch
@@ -1,27 +1,28 @@
-From dab76f53723b134222943047703e6b26417e9d97 Mon Sep 17 00:00:00 2001
+From 586fd36d2362729b7a603eefb1866061d42b539b Mon Sep 17 00:00:00 2001
 From: Badlop <badlop at process-one.net>
 Date: Thu, 15 Apr 2010 17:20:16 +0200
 Subject: [PATCH 08/11] Support SASL GSSAPI authentication (thanks to Mikael
  Magnusson)(EJAB-831)
 
 ---
- src/cyrsasl.erl           |   76 +++++++++++++++++----
+ src/cyrsasl.erl           |   71 +++++++++++++++----
  src/cyrsasl.hrl           |   15 ++++
  src/cyrsasl_anonymous.erl |    6 +-
  src/cyrsasl_digest.erl    |    6 +-
  src/cyrsasl_gssapi.erl    |  166 +++++++++++++++++++++++++++++++++++++++++++++
  src/cyrsasl_plain.erl     |    6 +-
+ src/cyrsasl_scram.erl     |    5 +-
  src/ejabberd_c2s.erl      |   12 +++-
  src/ejabberd_socket.erl   |   19 +++++
- 8 files changed, 283 insertions(+), 23 deletions(-)
+ 9 files changed, 281 insertions(+), 25 deletions(-)
  create mode 100644 src/cyrsasl.hrl
  create mode 100644 src/cyrsasl_gssapi.erl
 
 diff --git a/src/cyrsasl.erl b/src/cyrsasl.erl
-index fd54ce4..66d4e42 100644
+index 28098f7..179afdb 100644
 --- a/src/cyrsasl.erl
 +++ b/src/cyrsasl.erl
-@@ -30,19 +30,39 @@
+@@ -30,21 +30,36 @@
  -export([start/0,
  	 register_mechanism/3,
  	 listmech/1,
@@ -31,28 +32,25 @@ index fd54ce4..66d4e42 100644
  	 server_step/2]).
  
 +-include("cyrsasl.hrl").
-+-include("ejabberd.hrl").
-+
+ -include("ejabberd.hrl").
+ 
 +%% @type saslmechanism() = {sasl_mechanism, Mechanism, Module, Require_Plain}
 +%%     Mechanism = string()
 +%%     Module = atom()
 +%%     Require_Plain = bool().
 +%% Registry entry of a supported SASL mechanism.
 +
- -record(sasl_mechanism, {mechanism, module, require_plain_password}).
+ -record(sasl_mechanism, {mechanism, module, password_type}).
 --record(sasl_state, {service, myname, realm,
 -		     get_password, check_password, check_password_digest,
 -		     mech_mod, mech_state}).
 +
-+%% @type saslstate() = {sasl_state, Service, Myname, Realm, GetPassword, CheckPassword, CheckPasswordDigest, Mech_Mod, Mech_State}
++%% @type saslstate() = {sasl_state, Service, Myname, Mech_Mod, Mech_State, Params}
 +%%     Service = string()
 +%%     Myname = string()
-+%%     Realm = string()
-+%%     GetPassword = function()
-+%%     CheckPassword = function()
-+%%     CheckPasswordDigest = any()
 +%%     Mech_Mod = atom()
 +%%     Mech_State = term().
++%%     Params = term().
 +%% State of this process.
 +
 +-record(sasl_state, {service, myname,
@@ -66,9 +64,9 @@ index fd54ce4..66d4e42 100644
  behaviour_info(_Other) ->
      undefined.
  
-@@ -53,8 +73,30 @@ start() ->
-     cyrsasl_plain:start([]),
+@@ -56,8 +71,30 @@ start() ->
      cyrsasl_digest:start([]),
+     cyrsasl_scram:start([]),
      cyrsasl_anonymous:start([]),
 +    maybe_try_start_gssapi(),
      ok.
@@ -94,10 +92,10 @@ index fd54ce4..66d4e42 100644
 +%%     Module = atom()
 +%%     Require_Plain = bool()
 +
- register_mechanism(Mechanism, Module, RequirePlainPassword) ->
+ register_mechanism(Mechanism, Module, PasswordType) ->
      ets:insert(sasl_mechanism,
  	       #sasl_mechanism{mechanism = Mechanism,
-@@ -113,24 +155,28 @@ listmech(Host) ->
+@@ -119,24 +156,28 @@ listmech(Host) ->
      filter_anonymous(Host, Mechs).
  
  server_new(Service, ServerFQDN, UserRealm, _SecFlags,
@@ -158,7 +156,7 @@ index 0000000..b4cc3e3
 +	  check_password_digest,
 +	  socket}).
 diff --git a/src/cyrsasl_anonymous.erl b/src/cyrsasl_anonymous.erl
-index 3af9991..01c8e2b 100644
+index 1a61d91..88f20de 100644
 --- a/src/cyrsasl_anonymous.erl
 +++ b/src/cyrsasl_anonymous.erl
 @@ -27,7 +27,9 @@
@@ -182,7 +180,7 @@ index 3af9991..01c8e2b 100644
  
  mech_step(State, _ClientIn) ->
 diff --git a/src/cyrsasl_digest.erl b/src/cyrsasl_digest.erl
-index 40e7edf..e979127 100644
+index eea64cb..d58e314 100644
 --- a/src/cyrsasl_digest.erl
 +++ b/src/cyrsasl_digest.erl
 @@ -29,10 +29,11 @@
@@ -381,7 +379,7 @@ index 0000000..11d9955
 +    ?DEBUG("GSSAPI authenticated ~p ~p~n", [Authid, Authzid]),
 +    {ok, [{username, Authid}, {authzid, Authzid}]}.
 diff --git a/src/cyrsasl_plain.erl b/src/cyrsasl_plain.erl
-index 1b7108e..9b884eb 100644
+index a8913d3..a952ae7 100644
 --- a/src/cyrsasl_plain.erl
 +++ b/src/cyrsasl_plain.erl
 @@ -27,7 +27,9 @@
@@ -404,8 +402,34 @@ index 1b7108e..9b884eb 100644
      {ok, #state{check_password = CheckPassword}}.
  
  mech_step(State, ClientIn) ->
+diff --git a/src/cyrsasl_scram.erl b/src/cyrsasl_scram.erl
+index 002d6e4..162215c 100644
+--- a/src/cyrsasl_scram.erl
++++ b/src/cyrsasl_scram.erl
+@@ -29,10 +29,11 @@
+ 
+ -export([start/1,
+ 	 stop/0,
+-	 mech_new/4,
++	 mech_new/1,
+ 	 mech_step/2]).
+ 
+ -include("ejabberd.hrl").
++-include("cyrsasl.hrl").
+ 
+ -behaviour(cyrsasl).
+ 
+@@ -48,7 +49,7 @@ start(_Opts) ->
+ stop() ->
+     ok.
+ 
+-mech_new(_Host, GetPassword, _CheckPassword, _CheckPasswordDigest) ->
++mech_new(#sasl_params{get_password=GetPassword}) ->
+     {ok, #state{step = 2, get_password = GetPassword}}.
+ 
+ mech_step(#state{step = 2} = State, ClientIn) ->
 diff --git a/src/ejabberd_c2s.erl b/src/ejabberd_c2s.erl
-index 67fee64..e008ebe 100644
+index b093648..33af9da 100644
 --- a/src/ejabberd_c2s.erl
 +++ b/src/ejabberd_c2s.erl
 @@ -305,9 +305,16 @@ wait_for_stream({xmlstreamstart, _Name, Attrs}, StateData) ->
@@ -477,5 +501,5 @@ index 785ee2f..2edf685 100644
  %% Internal functions
  %%====================================================================
 -- 
-1.7.5.4
+1.7.7
 
diff --git a/ejabberd-0009-Added-old-modules-for-Active-Directory.patch b/ejabberd-0009-Added-old-modules-for-Active-Directory.patch
index e5f4a18..5814bea 100644
--- a/ejabberd-0009-Added-old-modules-for-Active-Directory.patch
+++ b/ejabberd-0009-Added-old-modules-for-Active-Directory.patch
@@ -1,4 +1,4 @@
-From eb9d5f2ed6adc07131a923c3296ce85030b1ddf5 Mon Sep 17 00:00:00 2001
+From 810b21991fd8c74565504ce60de07727ae7a9e85 Mon Sep 17 00:00:00 2001
 From: Peter Lemenkov <lemenkov at gmail.com>
 Date: Tue, 14 Dec 2010 18:28:44 +0300
 Subject: [PATCH 09/11] Added old modules for Active Directory
@@ -1262,5 +1262,5 @@ index 0000000..52ddbec
 +    true.
 +
 -- 
-1.7.5.4
+1.7.7
 
diff --git a/ejabberd-0010-last-minute-fix-correct-version-in-configure.patch b/ejabberd-0010-last-minute-fix-correct-version-in-configure.patch
new file mode 100644
index 0000000..7d4bfaa
--- /dev/null
+++ b/ejabberd-0010-last-minute-fix-correct-version-in-configure.patch
@@ -0,0 +1,28 @@
+From 63e2861d69b44645ebf5fb72145661df6e52f522 Mon Sep 17 00:00:00 2001
+From: Peter Lemenkov <lemenkov at gmail.com>
+Date: Tue, 14 Dec 2010 18:52:04 +0300
+Subject: [PATCH 10/11] last minute fix - correct version in configure
+
+Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
+---
+ src/configure |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/configure b/src/configure
+index 89e32a5..45d5b24 100755
+--- a/src/configure
++++ b/src/configure
+@@ -560,8 +560,8 @@ MAKEFLAGS=
+ # Identity of this package.
+ PACKAGE_NAME='ejabberd'
+ PACKAGE_TARNAME='ejabberd'
+-PACKAGE_VERSION='2.1.x'
+-PACKAGE_STRING='ejabberd 2.1.x'
++PACKAGE_VERSION='2.1.9'
++PACKAGE_STRING='ejabberd 2.1.9'
+ PACKAGE_BUGREPORT='ejabberd at process-one.net'
+ PACKAGE_URL=''
+ 
+-- 
+1.7.7
+
diff --git a/ejabberd-0011-Disable-INET_DIST_INTERFACE-by-default.patch b/ejabberd-0011-Disable-INET_DIST_INTERFACE-by-default.patch
index 61e5e67..9722f8a 100644
--- a/ejabberd-0011-Disable-INET_DIST_INTERFACE-by-default.patch
+++ b/ejabberd-0011-Disable-INET_DIST_INTERFACE-by-default.patch
@@ -1,4 +1,4 @@
-From 874975c5a77363329c10299d5478b66d6aa8041c Mon Sep 17 00:00:00 2001
+From f8483aa49749f84e00f15f46082fd25c2ca9d23b Mon Sep 17 00:00:00 2001
 From: Peter Lemenkov <lemenkov at gmail.com>
 Date: Sat, 18 Jun 2011 23:24:28 +0400
 Subject: [PATCH 11/11] Disable INET_DIST_INTERFACE by default
@@ -9,7 +9,7 @@ Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
  1 files changed, 1 insertions(+), 1 deletions(-)
 
 diff --git a/src/ejabberdctl.cfg.example b/src/ejabberdctl.cfg.example
-index 3f116d1..974533c 100644
+index b72058a..5ee43cf 100644
 --- a/src/ejabberdctl.cfg.example
 +++ b/src/ejabberdctl.cfg.example
 @@ -59,7 +59,7 @@
@@ -22,5 +22,5 @@ index 3f116d1..974533c 100644
  #.
  #' ERL_EPMD_ADDRESS: IP addresses where epmd listens for connections
 -- 
-1.7.5.4
+1.7.7
 
diff --git a/ejabberd.spec b/ejabberd.spec
index 083724e..7450119 100644
--- a/ejabberd.spec
+++ b/ejabberd.spec
@@ -10,8 +10,8 @@
 %endif
 
 Name:           ejabberd
-Version:        2.1.8
-Release:        3%{?dist}
+Version:        2.1.9
+Release:        1%{?dist}
 Summary:        A distributed, fault-tolerant Jabber/XMPP server
 
 Group:          Applications/Internet
@@ -46,7 +46,7 @@ Patch8: ejabberd-0008-Support-SASL-GSSAPI-authentication-thanks-to-Mikael-.patch
 # Introduce old AD stuff
 Patch9: ejabberd-0009-Added-old-modules-for-Active-Directory.patch
 # Correct version in configure (DON'T FORGET TO REMOVE IN THE NEXT VERSION)
-Patch10: ejabberd-0010-last-minute-fix-correct-version-in-configure-and-in-.patch
+Patch10: ejabberd-0010-last-minute-fix-correct-version-in-configure.patch
 # Disable IP restriction for ejabberdctl (seems that it doesn't work well)
 Patch11: ejabberd-0011-Disable-INET_DIST_INTERFACE-by-default.patch
 
@@ -351,6 +351,10 @@ rm -rf %{buildroot}
 %doc %{_docdir}/%{name}-%{version}/*.txt
 
 %changelog
+* Tue Nov 22 2011 Peter Lemenkov <lemenkov at gmail.com> - 2.1.9-1
+- Ver. 2.1.9
+- Fix for CVE-2011-4320
+
 * Mon Jul 11 2011 Peter Lemenkov <lemenkov at gmail.com> - 2.1.8-3
 - Fix for systemd (F15+ only, see rhbz #656581)
 
diff --git a/sources b/sources
index 0d36fba..52a3e5e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e814d9b4ab10b716f2722b26afe4fad7  ejabberd-2.1.8.tar.gz
+29ca14ea62f90736322e4e6720331352  ejabberd-2.1.9.tar.gz


More information about the scm-commits mailing list