[ejabberd] Ver. 2.1.10
Peter Lemenkov
peter at fedoraproject.org
Wed Dec 28 19:27:05 UTC 2011
commit 151910107e43e2e400eb13d3a457d60544f91fc3
Author: Peter Lemenkov <lemenkov at gmail.com>
Date: Wed Dec 28 23:26:55 2011 +0400
Ver. 2.1.10
Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
.gitignore | 1 +
...-service-example-name-to-match-actual-one.patch | 6 +-
...02-Add-mod_ctlextra-as-an-ejabberd-module.patch | 8 ++--
...berd-0003-Fixed-delays-in-s2s-connections.patch | 10 ++--
ejabberd-0004-Introducing-mod_admin_extra.patch | 8 ++--
...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 | 8 ++--
...09-Added-old-modules-for-Active-Directory.patch | 6 +-
...10-Disable-INET_DIST_INTERFACE-by-default.patch | 6 +-
...t-minute-fix-correct-version-in-configure.patch | 28 ------------
ejabberd.service | 18 ++++++++
ejabberd.spec | 46 +++++++++++---------
ejabberd.sysconfig | 4 +-
ejabberd.tmpfiles.conf | 1 +
sources | 2 +-
17 files changed, 84 insertions(+), 86 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e03c7f4..a0e7e66 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ ejabberd-2.1.5.tar.gz
/ejabberd-2.1.6.tar.gz
/ejabberd-2.1.8.tar.gz
/ejabberd-2.1.9.tar.gz
+/ejabberd-2.1.10.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 026d780..c2c7aa4 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 2b62caec55c62db6364d5560372f7addcb8d9eeb Mon Sep 17 00:00:00 2001
+From f72eb8171b6116fbf344370bab590db7fb146a7c 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
+Subject: [PATCH 01/10] Fix PAM service example name to match actual one
Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
---
@@ -22,5 +22,5 @@ index 57eab41..594b273 100644
%%
%% Authentication using LDAP
--
-1.7.7
+1.7.7.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 c4ca093..c153bf3 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 68152a5ae78fa3c6a9e11ddf65c29895e5c567e2 Mon Sep 17 00:00:00 2001
+From 33441aa6e6429e9e309f912d82c97aa92341b977 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
+Subject: [PATCH 02/10] Add mod_ctlextra as an ejabberd module
See this link for the details:
http://www.ejabberd.im/mod_ctlextra
@@ -19,7 +19,7 @@ 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 ea755a7..528f7ff 100644
+index 3d4f50f..dc6f910 100644
--- a/src/ejabberd.app
+++ b/src/ejabberd.app
@@ -71,6 +71,7 @@
@@ -932,5 +932,5 @@ index 0000000..bc61024
+ Ps),
+ lists:reverse(Grouped_Ps).
--
-1.7.7
+1.7.7.4
diff --git a/ejabberd-0003-Fixed-delays-in-s2s-connections.patch b/ejabberd-0003-Fixed-delays-in-s2s-connections.patch
index 2411246..672bd5b 100644
--- a/ejabberd-0003-Fixed-delays-in-s2s-connections.patch
+++ b/ejabberd-0003-Fixed-delays-in-s2s-connections.patch
@@ -1,7 +1,7 @@
-From bd1255f29c050dacd425aa8df3dd6653fe3083a1 Mon Sep 17 00:00:00 2001
+From c60d804d55cfe573012a37c4bcef507143564398 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.
+Subject: [PATCH 03/10] 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(+), 3 deletions(-)
diff --git a/src/ejabberd_s2s_in.erl b/src/ejabberd_s2s_in.erl
-index 848e58c..af5dc78 100644
+index af3fd76..dc5d93b 100644
--- a/src/ejabberd_s2s_in.erl
+++ b/src/ejabberd_s2s_in.erl
-@@ -404,7 +404,7 @@ stream_established({xmlstreamelement, El}, StateData) ->
+@@ -414,7 +414,7 @@ stream_established({xmlstreamelement, El}, StateData) ->
case {ejabberd_s2s:allow_host(LTo, LFrom),
lists:member(LTo, ejabberd_router:dirty_get_all_domains())} of
{true, true} ->
@@ -49,5 +49,5 @@ index aa2df3f..7d0e676 100644
end;
open_socket(closed, StateData) ->
--
-1.7.7
+1.7.7.4
diff --git a/ejabberd-0004-Introducing-mod_admin_extra.patch b/ejabberd-0004-Introducing-mod_admin_extra.patch
index 5eef3fd..a56cdca 100644
--- a/ejabberd-0004-Introducing-mod_admin_extra.patch
+++ b/ejabberd-0004-Introducing-mod_admin_extra.patch
@@ -1,7 +1,7 @@
-From e7c7f50619e5281eb8ea60654740d0630c8f2a9b Mon Sep 17 00:00:00 2001
+From 2466a49951d877c66bed61471b0c81e47e38803f 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
+Subject: [PATCH 04/10] 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 528f7ff..6d068be 100644
+index dc6f910..c83aa40 100644
--- a/src/ejabberd.app
+++ b/src/ejabberd.app
@@ -106,6 +106,7 @@
@@ -1314,5 +1314,5 @@ index 0000000..9f3ca14
+is_glob_match(String, Glob) ->
+ is_regexp_match(String, regexp:sh_to_awk(Glob)).
--
-1.7.7
+1.7.7.4
diff --git a/ejabberd-0005-Fedora-specific-changes-to-ejabberdctl.patch b/ejabberd-0005-Fedora-specific-changes-to-ejabberdctl.patch
index 3ac4b93..2104b39 100644
--- a/ejabberd-0005-Fedora-specific-changes-to-ejabberdctl.patch
+++ b/ejabberd-0005-Fedora-specific-changes-to-ejabberdctl.patch
@@ -1,7 +1,7 @@
-From e441520415e1a8d95cad867dffce50c43d1c048e Mon Sep 17 00:00:00 2001
+From 3837b2c4e6a64356e765014720613f677dff76b1 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
+Subject: [PATCH 05/10] Fedora-specific changes to ejabberdctl
Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
---
@@ -44,5 +44,5 @@ index 0960f9a..c22478a 100644
done
if [ "$ID" -eq "$EJID" ] ; then
--
-1.7.7
+1.7.7.4
diff --git a/ejabberd-0006-Install-.so-objects-with-0755-permissions.patch b/ejabberd-0006-Install-.so-objects-with-0755-permissions.patch
index 9ed6c90..2c446f1 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 5f46ed81a2e40c1a6e80a486c4dcce859be6f753 Mon Sep 17 00:00:00 2001
+From a4624e68e0702a129e25b066d47fbdbf2cfb0b70 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
+Subject: [PATCH 06/10] 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.7
+1.7.7.4
diff --git a/ejabberd-0007-Use-versioned-directory-for-storing-docs.patch b/ejabberd-0007-Use-versioned-directory-for-storing-docs.patch
index dd80857..adec1e4 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 9547eac4ddf65cb546c6edcaf39de3abbd66178b Mon Sep 17 00:00:00 2001
+From fd7fdf260276612aa802efba36bb41682cce5147 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
+Subject: [PATCH 07/10] 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.7
+1.7.7.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 d2c6687..e5728f8 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 586fd36d2362729b7a603eefb1866061d42b539b Mon Sep 17 00:00:00 2001
+From 9579c7207af351eef023aea03c994ce06044e9e7 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
+Subject: [PATCH 08/10] Support SASL GSSAPI authentication (thanks to Mikael
Magnusson)(EJAB-831)
---
@@ -429,7 +429,7 @@ index 002d6e4..162215c 100644
mech_step(#state{step = 2} = State, ClientIn) ->
diff --git a/src/ejabberd_c2s.erl b/src/ejabberd_c2s.erl
-index b093648..33af9da 100644
+index 1c08b47..18b866d 100644
--- a/src/ejabberd_c2s.erl
+++ b/src/ejabberd_c2s.erl
@@ -305,9 +305,16 @@ wait_for_stream({xmlstreamstart, _Name, Attrs}, StateData) ->
@@ -501,5 +501,5 @@ index 785ee2f..2edf685 100644
%% Internal functions
%%====================================================================
--
-1.7.7
+1.7.7.4
diff --git a/ejabberd-0009-Added-old-modules-for-Active-Directory.patch b/ejabberd-0009-Added-old-modules-for-Active-Directory.patch
index 5814bea..5036215 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 810b21991fd8c74565504ce60de07727ae7a9e85 Mon Sep 17 00:00:00 2001
+From b4bee268d039517b5961ecf5fff7aac51dea3254 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
+Subject: [PATCH 09/10] 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.7
+1.7.7.4
diff --git a/ejabberd-0011-Disable-INET_DIST_INTERFACE-by-default.patch b/ejabberd-0010-Disable-INET_DIST_INTERFACE-by-default.patch
similarity index 81%
rename from ejabberd-0011-Disable-INET_DIST_INTERFACE-by-default.patch
rename to ejabberd-0010-Disable-INET_DIST_INTERFACE-by-default.patch
index 9722f8a..1fc96d7 100644
--- a/ejabberd-0011-Disable-INET_DIST_INTERFACE-by-default.patch
+++ b/ejabberd-0010-Disable-INET_DIST_INTERFACE-by-default.patch
@@ -1,7 +1,7 @@
-From f8483aa49749f84e00f15f46082fd25c2ca9d23b Mon Sep 17 00:00:00 2001
+From bb0a1007d96ce91baf13b9fc6dc5e39f89859872 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
+Subject: [PATCH 10/10] Disable INET_DIST_INTERFACE by default
Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
---
@@ -22,5 +22,5 @@ index b72058a..5ee43cf 100644
#.
#' ERL_EPMD_ADDRESS: IP addresses where epmd listens for connections
--
-1.7.7
+1.7.7.4
diff --git a/ejabberd.service b/ejabberd.service
new file mode 100644
index 0000000..6a10c1f
--- /dev/null
+++ b/ejabberd.service
@@ -0,0 +1,18 @@
+[Unit]
+Description=A distributed, fault-tolerant Jabber/XMPP server
+After=network.target
+
+[Service]
+Type=oneshot
+User=ejabberd
+Group=ejabberd
+LimitNOFILE=16000
+RestartSec=5
+EnvironmentFile=/etc/sysconfig/ejabberd
+ExecStart=/usr/bin/ejabberdctl \
+ --config $CONFIG_FILE \
+ --ctl-config /etc/ejabberd/ejabberdctl.cfg \
+ --logs "/var/log/ejabberd" \
+ --spool "/var/lib/ejabberd/spool"
+ExecStop=/usr/bin/ejabberdctl stop
+RemainAfterExit=yes
diff --git a/ejabberd.spec b/ejabberd.spec
index cf839a3..022f4ea 100644
--- a/ejabberd.spec
+++ b/ejabberd.spec
@@ -1,6 +1,6 @@
%global uid 27
-# Currently, hevea available only in Fedora and EL-6
+# Currently, hevea available only in Fedora
%if 0%{?fedora}
# No hevea for ppc64
# see https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=250253
@@ -10,8 +10,8 @@
%endif
Name: ejabberd
-Version: 2.1.9
-Release: 2%{?dist}
+Version: 2.1.10
+Release: 1%{?dist}
Summary: A distributed, fault-tolerant Jabber/XMPP server
Group: Applications/Internet
@@ -22,6 +22,10 @@ Source1: ejabberd.init
Source2: ejabberd.logrotate
Source3: ejabberd.sysconfig
+# Support for systemd
+Source4: ejabberd.service
+Source5: ejabberd.tmpfiles.conf
+
# PAM support
Source9: ejabberdctl.pam
Source10: ejabberdctl.apps
@@ -45,10 +49,8 @@ Patch7: ejabberd-0007-Use-versioned-directory-for-storing-docs.patch
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
# Disable IP restriction for ejabberdctl (seems that it doesn't work well)
-Patch11: ejabberd-0011-Disable-INET_DIST_INTERFACE-by-default.patch
+Patch10: ejabberd-0010-Disable-INET_DIST_INTERFACE-by-default.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -113,9 +115,7 @@ Documentation for ejabberd.
%patch7 -p1 -b .versioned_docdir
%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
+%patch10 -p1 -b .disable_ip_restriction_for_ejabberdctl
%build
@@ -155,8 +155,14 @@ install -D -p -m 0644 %{S:9} %{buildroot}%{_sysconfdir}/pam.d/ejabberdctl
install -D -p -m 0644 %{S:10} %{buildroot}%{_sysconfdir}/security/console.apps/ejabberdctl
install -D -p -m 0644 %{S:11} %{buildroot}%{_sysconfdir}/pam.d/ejabberd
+%if 0%{?fc15}%{?fc16}%{?fc17}
+# install systemd entry
+install -D -m 0644 -p %{S:4} $RPM_BUILD_ROOT%{_unitdir}/%{name}.service
+install -D -m 0644 -p %{S:5} $RPM_BUILD_ROOT%{_sysconfdir}/tmpfiles.d/%{name}.conf
+%else
# install init-script
install -D -p -m 0755 %{S:1} %{buildroot}%{_initrddir}/ejabberd
+%endif
# install config for logrotate
install -D -p -m 0644 %{S:2} %{buildroot}%{_sysconfdir}/logrotate.d/ejabberd
@@ -181,12 +187,6 @@ chmod 755 %{buildroot}%{_sbindir}/ejabberdctl
# for this *default* sript, which is not intended to be changed
chmod 755 %{buildroot}%{_libdir}/%{name}/priv/bin/captcha.sh
-%if 0%{?fc15}%{?fc16}
-# create /etc/tmpfiles.d entry
-install -d $RPM_BUILD_ROOT%{_sysconfdir}/tmpfiles.d
-echo "d /var/lock/ejabberdctl 0750 ejabberd ejabberd" > $RPM_BUILD_ROOT%{_sysconfdir}/tmpfiles.d/%{name}.conf
-%endif
-
%pre
%{__fe_groupadd} %{uid} -r %{name} &>/dev/null || :
%{__fe_useradd} %{uid} -r -s /sbin/nologin -d /var/lib/ejabberd -M \
@@ -276,14 +276,16 @@ rm -rf %{buildroot}
%attr(640,ejabberd,ejabberd) %config(noreplace) %{_sysconfdir}/ejabberd/ejabberdctl.cfg
%attr(640,ejabberd,ejabberd) %config(noreplace) %{_sysconfdir}/ejabberd/inetrc
-%if 0%{?fc15}%{?fc16}
+%if 0%{?fc15}%{?fc16}%{?fc17}
+%{_unitdir}/%{name}.service
%{_sysconfdir}/tmpfiles.d/%{name}.conf
+%else
+%{_initrddir}/%{name}
%endif
-%{_initrddir}/ejabberd
-%config(noreplace) %{_sysconfdir}/logrotate.d/ejabberd
-%config(noreplace) %{_sysconfdir}/sysconfig/ejabberd
-%config(noreplace) %{_sysconfdir}/pam.d/ejabberd
+%config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
+%config(noreplace) %{_sysconfdir}/sysconfig/%{name}
+%config(noreplace) %{_sysconfdir}/pam.d/%{name}
%config(noreplace) %{_sysconfdir}/pam.d/ejabberdctl
%config(noreplace) %{_sysconfdir}/security/console.apps/ejabberdctl
%{_bindir}/ejabberdctl
@@ -353,6 +355,10 @@ rm -rf %{buildroot}
%doc %{_docdir}/%{name}-%{version}/*.txt
%changelog
+* Wed Dec 28 2011 Peter Lemenkov <lemenkov at gmail.com> - 2.1.10-1
+- Ver. 2.1.10
+- Works with systemd (closes rhbz #767793)
+
* Sun Dec 18 2011 Dan Horák <dan[at]danny.cz> - 2.1.9-2
- pdf docs require hevea, they are not prebuilt
diff --git a/ejabberd.sysconfig b/ejabberd.sysconfig
index fac25b1..20a8a7a 100644
--- a/ejabberd.sysconfig
+++ b/ejabberd.sysconfig
@@ -2,7 +2,7 @@
## Where should ejabberd find its configuration file?
#
-#CONFIG_FILE=/etc/ejabberd/ejabberd.cfg
+CONFIG_FILE=/etc/ejabberd/ejabberd.cfg
## ULIMIT_MAX_FILES alters the number of files that ejabberd is
## allowed to have open at once. If it is unset the system default
@@ -10,4 +10,4 @@
## open files as it has active connections, so if you have a few
## hundred or more users you will want to set this.
#
-#ULIMIT_MAX_FILES=1024
+ULIMIT_MAX_FILES=1024
diff --git a/ejabberd.tmpfiles.conf b/ejabberd.tmpfiles.conf
new file mode 100644
index 0000000..0ab3101
--- /dev/null
+++ b/ejabberd.tmpfiles.conf
@@ -0,0 +1 @@
+d /var/lock/ejabberdctl 0750 ejabberd ejabberd
diff --git a/sources b/sources
index 52a3e5e..eb54480 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-29ca14ea62f90736322e4e6720331352 ejabberd-2.1.9.tar.gz
+70f0e17983114c62893e43b6ef2e9d0c ejabberd-2.1.10.tar.gz
More information about the scm-commits
mailing list