[ejabberd] Fix ejabberdctl
Peter Lemenkov
peter at fedoraproject.org
Sat Jun 18 19:34:13 UTC 2011
commit 97c9c99296e6ee95dbc1035bb2fd0fa46e27e74d
Author: Peter Lemenkov <lemenkov at gmail.com>
Date: Sat Jun 18 23:33:27 2011 +0400
Fix ejabberdctl
Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
...-service-example-name-to-match-actual-one.patch | 6 +-
...02-Add-mod_ctlextra-as-an-ejabberd-module.patch | 6 +-
...berd-0003-Fixed-delays-in-s2s-connections.patch | 6 +-
ejabberd-0004-Introducing-mod_admin_extra.patch | 6 +-
...05-Fedora-specific-changes-to-ejabberdctl.patch | 6 +-
...Install-.so-objects-with-0755-permissions.patch | 6 +-
...-Use-versioned-directory-for-storing-docs.patch | 6 +-
...L-GSSAPI-authentication-thanks-to-Mikael-.patch | 6 +-
...09-Added-old-modules-for-Active-Directory.patch | 6 +-
...-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 | 26 ++++++++++++
ejabberd.spec | 10 ++++-
13 files changed, 104 insertions(+), 57 deletions(-)
---
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 a6d356d..f795a5c 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 f9092944be760c1af2dabd68b6f2e50663da9a13 Mon Sep 17 00:00:00 2001
+From 13ff5cd1fafa2e534ee87362287ef2e2d2596b9b 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/10] Fix PAM service example name to match actual one
+Subject: [PATCH 01/11] Fix PAM service example name to match actual one
Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
---
@@ -22,5 +22,5 @@ index 92e78e3..d1d0b00 100644
%%
%% Authentication using LDAP
--
-1.7.5.2
+1.7.5.4
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 b4a8edd..27888a9 100644
--- a/ejabberd-0002-Add-mod_ctlextra-as-an-ejabberd-module.patch
+++ b/ejabberd-0002-Add-mod_ctlextra-as-an-ejabberd-module.patch
@@ -1,7 +1,7 @@
-From df3f20bb62d4ec3f7b08e3763c7c710d8f8d120d Mon Sep 17 00:00:00 2001
+From 5ba288791407c7301ef85d80a31dae422ffb6bab 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/10] Add mod_ctlextra as an ejabberd module
+Subject: [PATCH 02/11] Add mod_ctlextra as an ejabberd module
See this link for the details:
http://www.ejabberd.im/mod_ctlextra
@@ -932,5 +932,5 @@ index 0000000..bc61024
+ Ps),
+ lists:reverse(Grouped_Ps).
--
-1.7.5.2
+1.7.5.4
diff --git a/ejabberd-0003-Fixed-delays-in-s2s-connections.patch b/ejabberd-0003-Fixed-delays-in-s2s-connections.patch
index be49252..fee071a 100644
--- a/ejabberd-0003-Fixed-delays-in-s2s-connections.patch
+++ b/ejabberd-0003-Fixed-delays-in-s2s-connections.patch
@@ -1,7 +1,7 @@
-From bf4c641645e7a491eeca12e6dd635c6b3f8a1ae5 Mon Sep 17 00:00:00 2001
+From 896c955b7ff0e7b01cce88d18858c2eb57609af5 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/10] Fixed delays in s2s connections.
+Subject: [PATCH 03/11] 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
@@ -49,5 +49,5 @@ index 55f48af..fdc9cf4 100644
end;
open_socket(closed, StateData) ->
--
-1.7.5.2
+1.7.5.4
diff --git a/ejabberd-0004-Introducing-mod_admin_extra.patch b/ejabberd-0004-Introducing-mod_admin_extra.patch
index 2e7029e..0d030a5 100644
--- a/ejabberd-0004-Introducing-mod_admin_extra.patch
+++ b/ejabberd-0004-Introducing-mod_admin_extra.patch
@@ -1,7 +1,7 @@
-From 58aaef301edcb3e9f0ee5914d3e2c0777c7cd3ee Mon Sep 17 00:00:00 2001
+From f18e54052525f4970d7fc01cfa3b2cdad5da9742 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/10] Introducing mod_admin_extra
+Subject: [PATCH 04/11] Introducing mod_admin_extra
Adds the mod_admin_extra module to ejabberd.
This module extends the functionality provided by ejabberdctl
@@ -1314,5 +1314,5 @@ index 0000000..9f3ca14
+is_glob_match(String, Glob) ->
+ is_regexp_match(String, regexp:sh_to_awk(Glob)).
--
-1.7.5.2
+1.7.5.4
diff --git a/ejabberd-0005-Fedora-specific-changes-to-ejabberdctl.patch b/ejabberd-0005-Fedora-specific-changes-to-ejabberdctl.patch
index f4fb340..3761586 100644
--- a/ejabberd-0005-Fedora-specific-changes-to-ejabberdctl.patch
+++ b/ejabberd-0005-Fedora-specific-changes-to-ejabberdctl.patch
@@ -1,7 +1,7 @@
-From 4f33ceced08741491f7f792562322c00daf82c99 Mon Sep 17 00:00:00 2001
+From 28f3915b62cdf70b670daa27fbea567d7f16f994 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/10] Fedora-specific changes to ejabberdctl
+Subject: [PATCH 05/11] Fedora-specific changes to ejabberdctl
Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
---
@@ -44,5 +44,5 @@ index d2f20fa..a5459c3 100644
done
if [ "$ID" -eq "$EJID" ] ; then
--
-1.7.5.2
+1.7.5.4
diff --git a/ejabberd-0006-Install-.so-objects-with-0755-permissions.patch b/ejabberd-0006-Install-.so-objects-with-0755-permissions.patch
index 560cbc1..cb42e3e 100644
--- a/ejabberd-0006-Install-.so-objects-with-0755-permissions.patch
+++ b/ejabberd-0006-Install-.so-objects-with-0755-permissions.patch
@@ -1,7 +1,7 @@
-From a859041a1c5a4edf53c907b34e771a5bfe56ec4c Mon Sep 17 00:00:00 2001
+From 3552a3dfe4dee092a247ef7b102b1cb871e97aaf 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/10] Install *.so objects with 0755 permissions
+Subject: [PATCH 06/11] Install *.so objects with 0755 permissions
Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
---
@@ -22,5 +22,5 @@ index 42af5b2..64ed856 100644
# Translated strings
install -d $(MSGSDIR)
--
-1.7.5.2
+1.7.5.4
diff --git a/ejabberd-0007-Use-versioned-directory-for-storing-docs.patch b/ejabberd-0007-Use-versioned-directory-for-storing-docs.patch
index f5a3998..98afa23 100644
--- a/ejabberd-0007-Use-versioned-directory-for-storing-docs.patch
+++ b/ejabberd-0007-Use-versioned-directory-for-storing-docs.patch
@@ -1,7 +1,7 @@
-From d4358b8cc6984242c4246b9378b84b1b4ae40bb0 Mon Sep 17 00:00:00 2001
+From b030112cc6ddc8e1a36189699db363fde95d46cf 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/10] Use versioned directory for storing docs
+Subject: [PATCH 07/11] 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
@@ -31,5 +31,5 @@ index 64ed856..43b5e1f 100644
DOCDIR = $(DESTDIR)@docdir@
--
-1.7.5.2
+1.7.5.4
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 120417e..6f4e9b2 100644
--- a/ejabberd-0008-Support-SASL-GSSAPI-authentication-thanks-to-Mikael-.patch
+++ b/ejabberd-0008-Support-SASL-GSSAPI-authentication-thanks-to-Mikael-.patch
@@ -1,7 +1,7 @@
-From 84e497dd8b6f3f6d4dc0c831a759d109c554b37c Mon Sep 17 00:00:00 2001
+From dab76f53723b134222943047703e6b26417e9d97 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/10] Support SASL GSSAPI authentication (thanks to Mikael
+Subject: [PATCH 08/11] Support SASL GSSAPI authentication (thanks to Mikael
Magnusson)(EJAB-831)
---
@@ -477,5 +477,5 @@ index 785ee2f..2edf685 100644
%% Internal functions
%%====================================================================
--
-1.7.5.2
+1.7.5.4
diff --git a/ejabberd-0009-Added-old-modules-for-Active-Directory.patch b/ejabberd-0009-Added-old-modules-for-Active-Directory.patch
index d145f75..e5f4a18 100644
--- a/ejabberd-0009-Added-old-modules-for-Active-Directory.patch
+++ b/ejabberd-0009-Added-old-modules-for-Active-Directory.patch
@@ -1,7 +1,7 @@
-From 6e83f4370eb5c6051b3e3f8c1fc52c849fcaaf69 Mon Sep 17 00:00:00 2001
+From eb9d5f2ed6adc07131a923c3296ce85030b1ddf5 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/10] Added old modules for Active Directory
+Subject: [PATCH 09/11] Added old modules for Active Directory
These modules were extracted from a patch found on
http://realloc.spb.ru/share/ejabberdad.html
@@ -1262,5 +1262,5 @@ index 0000000..52ddbec
+ true.
+
--
-1.7.5.2
+1.7.5.4
diff --git a/ejabberd-0010-last-minute-fix-correct-version-in-configure-and-in-.patch b/ejabberd-0010-last-minute-fix-correct-version-in-configure-and-in-.patch
new file mode 100644
index 0000000..cd64eae
--- /dev/null
+++ b/ejabberd-0010-last-minute-fix-correct-version-in-configure-and-in-.patch
@@ -0,0 +1,43 @@
+From 534d23df2e6108e762a294e91280afdab1412a1e 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 and in
+ *.app file
+
+Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
+---
+ src/configure | 4 ++--
+ src/ejabberd.app | 2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/configure b/src/configure
+index 89e32a5..f377732 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.8'
++PACKAGE_STRING='ejabberd 2.1.8'
+ PACKAGE_BUGREPORT='ejabberd at process-one.net'
+ PACKAGE_URL=''
+
+diff --git a/src/ejabberd.app b/src/ejabberd.app
+index a0154d4..3e54603 100644
+--- a/src/ejabberd.app
++++ b/src/ejabberd.app
+@@ -2,7 +2,7 @@
+
+ {application, ejabberd,
+ [{description, "ejabberd"},
+- {vsn, "2.1.7"},
++ {vsn, "2.1.8"},
+ {modules, [acl,
+ adhoc,
+ configure,
+--
+1.7.5.4
+
diff --git a/ejabberd-0011-Disable-INET_DIST_INTERFACE-by-default.patch b/ejabberd-0011-Disable-INET_DIST_INTERFACE-by-default.patch
new file mode 100644
index 0000000..61e5e67
--- /dev/null
+++ b/ejabberd-0011-Disable-INET_DIST_INTERFACE-by-default.patch
@@ -0,0 +1,26 @@
+From 874975c5a77363329c10299d5478b66d6aa8041c 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
+
+Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
+---
+ src/ejabberdctl.cfg.example | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/ejabberdctl.cfg.example b/src/ejabberdctl.cfg.example
+index 3f116d1..974533c 100644
+--- a/src/ejabberdctl.cfg.example
++++ b/src/ejabberdctl.cfg.example
+@@ -59,7 +59,7 @@
+ #
+ # Default: {127,0,0,1}
+ #
+-INET_DIST_INTERFACE={127,0,0,1}
++#INET_DIST_INTERFACE={127,0,0,1}
+
+ #.
+ #' ERL_EPMD_ADDRESS: IP addresses where epmd listens for connections
+--
+1.7.5.4
+
diff --git a/ejabberd.spec b/ejabberd.spec
index b12b3ef..fd1254b 100644
--- a/ejabberd.spec
+++ b/ejabberd.spec
@@ -11,7 +11,7 @@
Name: ejabberd
Version: 2.1.8
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: A distributed, fault-tolerant Jabber/XMPP server
Group: Applications/Internet
@@ -46,7 +46,9 @@ 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.patch
+Patch10: ejabberd-0010-last-minute-fix-correct-version-in-configure-and-in-.patch
+# Disable IP restriction for ejabberdctl (seems that it doesn't work well)
+Patch11: ejabberd-0011-Disable-INET_DIST_INTERFACE-by-default.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -112,6 +114,7 @@ Documentation for ejabberd.
%patch8 -p1 -b .gssapi
%patch9 -p1 -b .ad_stuff
%patch10 -p1 -b .fix_version
+%patch11 -p1 -b .disable_ip_restriction_for_ejabberdctl
touch -r src/configure.fix_version src/configure
@@ -338,6 +341,9 @@ rm -rf %{buildroot}
%doc %{_docdir}/%{name}-%{version}/*.txt
%changelog
+* Sat Jun 18 2011 Peter Lemenkov <lemenkov at gmail.com> - 2.1.8-2
+- Fix ejabberdctl again
+
* Fri Jun 03 2011 Peter Lemenkov <lemenkov at gmail.com> - 2.1.8-1
- Ver. 2.1.8 (very urgent bugfix for 2.1.7)
More information about the scm-commits
mailing list