public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/ejabberd] f45: Ver. 2.1.11
@ 2026-09-23 19:07 Peter Lemenkov
0 siblings, 0 replies; only message in thread
From: Peter Lemenkov @ 2026-09-23 19:07 UTC (permalink / raw)
To: git-commits
A new commit has been pushed.
Repo : rpms/ejabberd
Branch : f45
Commit : a1bb46c88733d60596c258b621ae3b321b1c067e
Author : Peter Lemenkov <lemenkov@gmail.com>
Date : 2012-05-06T16:37:35+04:00
Stats : +105/-56 in 14 file(s)
URL : https://src.fedoraproject.org/rpms/ejabberd/c/a1bb46c88733d60596c258b621ae3b321b1c067e?branch=f45
Log:
Ver. 2.1.11
Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
---
diff --git a/.gitignore b/.gitignore
index a0e7e66..98e9716 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ ejabberd-2.1.5.tar.gz
/ejabberd-2.1.8.tar.gz
/ejabberd-2.1.9.tar.gz
/ejabberd-2.1.10.tar.gz
+/ejabberd-2.1.11.tgz
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 c2c7aa4..bdffb3f 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 f72eb8171b6116fbf344370bab590db7fb146a7c Mon Sep 17 00:00:00 2001
+From 72718b8fcbb19b34e348efcb874fa480e83d7a02 Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov@gmail.com>
Date: Tue, 16 Feb 2010 16:03:38 +0300
Subject: [PATCH 01/10] Fix PAM service example name to match actual one
@@ -6,13 +6,13 @@ Subject: [PATCH 01/10] Fix PAM service example name to match actual one
Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
---
src/ejabberd.cfg.example | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/ejabberd.cfg.example b/src/ejabberd.cfg.example
-index 57eab41..594b273 100644
+index a4068ad..9b24a4a 100644
--- a/src/ejabberd.cfg.example
+++ b/src/ejabberd.cfg.example
-@@ -240,7 +240,7 @@
+@@ -243,7 +243,7 @@
%% Authentication using PAM
%%
%%{auth_method, pam}.
@@ -22,5 +22,5 @@ index 57eab41..594b273 100644
%%
%% Authentication using LDAP
--
-1.7.7.4
+1.7.10.1
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 c153bf3..a03d3bb 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 33441aa6e6429e9e309f912d82c97aa92341b977 Mon Sep 17 00:00:00 2001
+From 6bed76f77b83a859798d39a51969987739e4f4fe Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov@gmail.com>
Date: Tue, 16 Feb 2010 16:05:53 +0300
Subject: [PATCH 02/10] Add mod_ctlextra as an ejabberd module
@@ -15,11 +15,11 @@ Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
---
src/ejabberd.app | 1 +
src/mod_ctlextra.erl | 895 ++++++++++++++++++++++++++++++++++++++++++++++++++
- 2 files changed, 896 insertions(+), 0 deletions(-)
+ 2 files changed, 896 insertions(+)
create mode 100644 src/mod_ctlextra.erl
diff --git a/src/ejabberd.app b/src/ejabberd.app
-index 3d4f50f..dc6f910 100644
+index 2f08601..067b928 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.4
+1.7.10.1
diff --git a/ejabberd-0003-Fixed-delays-in-s2s-connections.patch b/ejabberd-0003-Fixed-delays-in-s2s-connections.patch
index 672bd5b..78ff318 100644
--- a/ejabberd-0003-Fixed-delays-in-s2s-connections.patch
+++ b/ejabberd-0003-Fixed-delays-in-s2s-connections.patch
@@ -1,4 +1,4 @@
-From c60d804d55cfe573012a37c4bcef507143564398 Mon Sep 17 00:00:00 2001
+From 95f2c9bb7654ea321f052bb29c905a71471d85c0 Mon Sep 17 00:00:00 2001
From: Sergei Golovan <sgolovan@nes.ru>
Date: Tue, 16 Feb 2010 16:07:37 +0300
Subject: [PATCH 03/10] Fixed delays in s2s connections.
@@ -13,7 +13,7 @@ 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 af3fd76..dc5d93b 100644
+index 1597ec7..7d411cd 100644
--- a/src/ejabberd_s2s_in.erl
+++ b/src/ejabberd_s2s_in.erl
@@ -414,7 +414,7 @@ stream_established({xmlstreamelement, El}, StateData) ->
@@ -26,7 +26,7 @@ index af3fd76..dc5d93b 100644
{verify, self(),
Key, StateData#state.streamid}),
diff --git a/src/ejabberd_s2s_out.erl b/src/ejabberd_s2s_out.erl
-index aa2df3f..7d0e676 100644
+index 65711fa..cab413f 100644
--- a/src/ejabberd_s2s_out.erl
+++ b/src/ejabberd_s2s_out.erl
@@ -93,7 +93,7 @@
@@ -49,5 +49,5 @@ index aa2df3f..7d0e676 100644
end;
open_socket(closed, StateData) ->
--
-1.7.7.4
+1.7.10.1
diff --git a/ejabberd-0004-Introducing-mod_admin_extra.patch b/ejabberd-0004-Introducing-mod_admin_extra.patch
index a56cdca..bdc6eea 100644
--- a/ejabberd-0004-Introducing-mod_admin_extra.patch
+++ b/ejabberd-0004-Introducing-mod_admin_extra.patch
@@ -1,4 +1,4 @@
-From 2466a49951d877c66bed61471b0c81e47e38803f Mon Sep 17 00:00:00 2001
+From 35170f86c033624284a8ab85346a6fc0bfc8ed43 Mon Sep 17 00:00:00 2001
From: Badlop <badlop@process-one.net>
Date: Tue, 16 Feb 2010 16:12:17 +0300
Subject: [PATCH 04/10] Introducing mod_admin_extra
@@ -13,11 +13,11 @@ https://forge.process-one.net/browse/ejabberd-modules/mod_admin_extra
---
src/ejabberd.app | 1 +
src/mod_admin_extra.erl | 1279 +++++++++++++++++++++++++++++++++++++++++++++++
- 2 files changed, 1280 insertions(+), 0 deletions(-)
+ 2 files changed, 1280 insertions(+)
create mode 100644 src/mod_admin_extra.erl
diff --git a/src/ejabberd.app b/src/ejabberd.app
-index dc6f910..c83aa40 100644
+index 067b928..81edc09 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.4
+1.7.10.1
diff --git a/ejabberd-0005-Fedora-specific-changes-to-ejabberdctl.patch b/ejabberd-0005-Fedora-specific-changes-to-ejabberdctl.patch
index 2104b39..1f59760 100644
--- a/ejabberd-0005-Fedora-specific-changes-to-ejabberdctl.patch
+++ b/ejabberd-0005-Fedora-specific-changes-to-ejabberdctl.patch
@@ -1,4 +1,4 @@
-From 3837b2c4e6a64356e765014720613f677dff76b1 Mon Sep 17 00:00:00 2001
+From 0012d3c968c2aef3cd658d84936bd51bee8e33ce Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov@gmail.com>
Date: Tue, 16 Feb 2010 16:30:05 +0300
Subject: [PATCH 05/10] Fedora-specific changes to ejabberdctl
@@ -6,7 +6,7 @@ Subject: [PATCH 05/10] Fedora-specific changes to ejabberdctl
Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
---
src/ejabberdctl.template | 8 ++++----
- 1 files changed, 4 insertions(+), 4 deletions(-)
+ 1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/ejabberdctl.template b/src/ejabberdctl.template
index 0960f9a..c22478a 100644
@@ -44,5 +44,5 @@ index 0960f9a..c22478a 100644
done
if [ "$ID" -eq "$EJID" ] ; then
--
-1.7.7.4
+1.7.10.1
diff --git a/ejabberd-0006-Install-.so-objects-with-0755-permissions.patch b/ejabberd-0006-Install-.so-objects-with-0755-permissions.patch
index 2c446f1..ac1deb7 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 a4624e68e0702a129e25b066d47fbdbf2cfb0b70 Mon Sep 17 00:00:00 2001
+From 8254e46cf2710edfc3c45f9da227e4613e342796 Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov@gmail.com>
Date: Sat, 12 Jun 2010 14:14:52 +0400
Subject: [PATCH 06/10] Install *.so objects with 0755 permissions
@@ -6,7 +6,7 @@ Subject: [PATCH 06/10] Install *.so objects with 0755 permissions
Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
---
src/Makefile.in | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/Makefile.in b/src/Makefile.in
index 42af5b2..64ed856 100644
@@ -22,5 +22,5 @@ index 42af5b2..64ed856 100644
# Translated strings
install -d $(MSGSDIR)
--
-1.7.7.4
+1.7.10.1
diff --git a/ejabberd-0007-Use-versioned-directory-for-storing-docs.patch b/ejabberd-0007-Use-versioned-directory-for-storing-docs.patch
index adec1e4..c6a4284 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 fd7fdf260276612aa802efba36bb41682cce5147 Mon Sep 17 00:00:00 2001
+From ff5baa27c9bb0175e4bc4ae3862d8e639234a701 Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov@gmail.com>
Date: Sat, 12 Jun 2010 16:12:11 +0400
Subject: [PATCH 07/10] Use versioned directory for storing docs
@@ -15,7 +15,7 @@ http://www.gnu.org/software/autoconf/manual/html_node/Initializing-configure.htm
Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
---
src/Makefile.in | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/Makefile.in b/src/Makefile.in
index 64ed856..43b5e1f 100644
@@ -31,5 +31,5 @@ index 64ed856..43b5e1f 100644
DOCDIR = $(DESTDIR)@docdir@
--
-1.7.7.4
+1.7.10.1
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 e5728f8..67b0717 100644
--- a/ejabberd-0008-Support-SASL-GSSAPI-authentication-thanks-to-Mikael-.patch
+++ b/ejabberd-0008-Support-SASL-GSSAPI-authentication-thanks-to-Mikael-.patch
@@ -1,4 +1,4 @@
-From 9579c7207af351eef023aea03c994ce06044e9e7 Mon Sep 17 00:00:00 2001
+From b1dbc5224d000b62d405f4e82b6dd646f54997a1 Mon Sep 17 00:00:00 2001
From: Badlop <badlop@process-one.net>
Date: Thu, 15 Apr 2010 17:20:16 +0200
Subject: [PATCH 08/10] Support SASL GSSAPI authentication (thanks to Mikael
@@ -13,13 +13,13 @@ Subject: [PATCH 08/10] Support SASL GSSAPI authentication (thanks to Mikael
src/cyrsasl_plain.erl | 6 +-
src/cyrsasl_scram.erl | 5 +-
src/ejabberd_c2s.erl | 12 +++-
- src/ejabberd_socket.erl | 19 +++++
+ src/ejabberd_socket.erl | 19 ++++++
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 28098f7..179afdb 100644
+index 23f1721..5ff0916 100644
--- a/src/cyrsasl.erl
+++ b/src/cyrsasl.erl
@@ -30,21 +30,36 @@
@@ -156,7 +156,7 @@ index 0000000..b4cc3e3
+ check_password_digest,
+ socket}).
diff --git a/src/cyrsasl_anonymous.erl b/src/cyrsasl_anonymous.erl
-index 1a61d91..88f20de 100644
+index 25fcd66..aeb09ea 100644
--- a/src/cyrsasl_anonymous.erl
+++ b/src/cyrsasl_anonymous.erl
@@ -27,7 +27,9 @@
@@ -180,7 +180,7 @@ index 1a61d91..88f20de 100644
mech_step(State, _ClientIn) ->
diff --git a/src/cyrsasl_digest.erl b/src/cyrsasl_digest.erl
-index eea64cb..d58e314 100644
+index 134a86d..d904801 100644
--- a/src/cyrsasl_digest.erl
+++ b/src/cyrsasl_digest.erl
@@ -29,10 +29,11 @@
@@ -196,7 +196,7 @@ index eea64cb..d58e314 100644
-behaviour(cyrsasl).
-@@ -45,7 +46,8 @@ start(_Opts) ->
+@@ -47,7 +48,8 @@ start(_Opts) ->
stop() ->
ok.
@@ -379,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 a8913d3..a952ae7 100644
+index a0804fd..14b3c19 100644
--- a/src/cyrsasl_plain.erl
+++ b/src/cyrsasl_plain.erl
@@ -27,7 +27,9 @@
@@ -403,7 +403,7 @@ index a8913d3..a952ae7 100644
mech_step(State, ClientIn) ->
diff --git a/src/cyrsasl_scram.erl b/src/cyrsasl_scram.erl
-index 002d6e4..162215c 100644
+index 74977bd..c3bf5c6 100644
--- a/src/cyrsasl_scram.erl
+++ b/src/cyrsasl_scram.erl
@@ -29,10 +29,11 @@
@@ -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 1c08b47..18b866d 100644
+index 552aa6d..038d3c5 100644
--- a/src/ejabberd_c2s.erl
+++ b/src/ejabberd_c2s.erl
@@ -305,9 +305,16 @@ wait_for_stream({xmlstreamstart, _Name, Attrs}, StateData) ->
@@ -461,7 +461,7 @@ index 1c08b47..18b866d 100644
fun(S) ->
{xmlelement, "mechanism", [],
diff --git a/src/ejabberd_socket.erl b/src/ejabberd_socket.erl
-index 785ee2f..2edf685 100644
+index 254751b..3509018 100644
--- a/src/ejabberd_socket.erl
+++ b/src/ejabberd_socket.erl
@@ -44,9 +44,11 @@
@@ -501,5 +501,5 @@ index 785ee2f..2edf685 100644
%% Internal functions
%%====================================================================
--
-1.7.7.4
+1.7.10.1
diff --git a/ejabberd-0009-Added-old-modules-for-Active-Directory.patch b/ejabberd-0009-Added-old-modules-for-Active-Directory.patch
index 5036215..ab3516b 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 b4bee268d039517b5961ecf5fff7aac51dea3254 Mon Sep 17 00:00:00 2001
+From d5880591ff8c318584df55cbb22d91eb42aa80dd Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov@gmail.com>
Date: Tue, 14 Dec 2010 18:28:44 +0300
Subject: [PATCH 09/10] Added old modules for Active Directory
@@ -12,7 +12,7 @@ soon (users should use *_ldap.erl instead).
src/ejabberd_auth_ad.erl | 167 +++++++++++
src/mod_shared_roster_ad.erl | 428 ++++++++++++++++++++++++++++
src/mod_vcard_ad.erl | 631 ++++++++++++++++++++++++++++++++++++++++++
- 3 files changed, 1226 insertions(+), 0 deletions(-)
+ 3 files changed, 1226 insertions(+)
create mode 100644 src/ejabberd_auth_ad.erl
create mode 100644 src/mod_shared_roster_ad.erl
create mode 100644 src/mod_vcard_ad.erl
@@ -1262,5 +1262,5 @@ index 0000000..52ddbec
+ true.
+
--
-1.7.7.4
+1.7.10.1
diff --git a/ejabberd-0010-Disable-INET_DIST_INTERFACE-by-default.patch b/ejabberd-0010-Disable-INET_DIST_INTERFACE-by-default.patch
index 1fc96d7..10be6cc 100644
--- a/ejabberd-0010-Disable-INET_DIST_INTERFACE-by-default.patch
+++ b/ejabberd-0010-Disable-INET_DIST_INTERFACE-by-default.patch
@@ -1,4 +1,4 @@
-From bb0a1007d96ce91baf13b9fc6dc5e39f89859872 Mon Sep 17 00:00:00 2001
+From a5e1042ca338c81a5c75ef2c8d2fb4cab8b935e3 Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov@gmail.com>
Date: Sat, 18 Jun 2011 23:24:28 +0400
Subject: [PATCH 10/10] Disable INET_DIST_INTERFACE by default
@@ -6,7 +6,7 @@ Subject: [PATCH 10/10] Disable INET_DIST_INTERFACE by default
Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
---
src/ejabberdctl.cfg.example | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/ejabberdctl.cfg.example b/src/ejabberdctl.cfg.example
index b72058a..5ee43cf 100644
@@ -22,5 +22,5 @@ index b72058a..5ee43cf 100644
#.
#' ERL_EPMD_ADDRESS: IP addresses where epmd listens for connections
--
-1.7.7.4
+1.7.10.1
diff --git a/ejabberd.service b/ejabberd.service
index 4d9a6eb..8cb6fc9 100644
--- a/ejabberd.service
+++ b/ejabberd.service
@@ -16,3 +16,6 @@ ExecStart=/usr/sbin/ejabberdctl \
--spool "/var/lib/ejabberd/spool" start
ExecStop=/usr/sbin/ejabberdctl stop
RemainAfterExit=yes
+
+[Install]
+WantedBy=multi-user.target
diff --git a/ejabberd.spec b/ejabberd.spec
index 1d5354c..df00937 100644
--- a/ejabberd.spec
+++ b/ejabberd.spec
@@ -10,14 +10,14 @@
%endif
Name: ejabberd
-Version: 2.1.10
-Release: 3%{?dist}
+Version: 2.1.11
+Release: 1%{?dist}
Summary: A distributed, fault-tolerant Jabber/XMPP server
Group: Applications/Internet
License: GPLv2+
URL: http://www.ejabberd.im/
-Source0: http://www.process-one.net/downloads/%{name}/%{version}/%{name}-%{version}.tar.gz
+Source0: http://www.process-one.net/downloads/%{name}/%{version}/%{name}-%{version}.tgz
Source1: ejabberd.init
Source2: ejabberd.logrotate
Source3: ejabberd.sysconfig
@@ -54,6 +54,9 @@ Patch10: ejabberd-0010-Disable-INET_DIST_INTERFACE-by-default.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+%if 0%{?fedora} > 14
+BuildRequires: systemd-units
+%endif
BuildRequires: expat-devel
BuildRequires: openssl-devel >= 0.9.8
BuildRequires: pam-devel
@@ -64,11 +67,17 @@ BuildRequires: hevea
%endif
%{?FE_USERADD_REQ}
-Requires(post): /sbin/chkconfig
Requires(post): /usr/bin/openssl
+%if 0%{?fedora} > 14
+Requires(post): systemd-units
+Requires(preun): systemd-units
+Requires(postun): systemd-units
+%else
+Requires(post): /sbin/chkconfig
Requires(preun): /sbin/chkconfig
Requires(preun): /sbin/service
Requires(postun): /sbin/service
+%endif
Provides: user(%{name}) = %{uid}
Provides: group(%{name}) = %{uid}
@@ -117,6 +126,10 @@ Documentation for ejabberd.
%patch9 -p1 -b .ad_stuff
%patch10 -p1 -b .disable_ip_restriction_for_ejabberdctl
+# FIXME last-minute fix for 2.1.11 only
+sed -i -e "s,2.1.x,2.1.11,g" src/configure
+touch -r src/configure.ac src/configure
+
%build
pushd src
@@ -155,7 +168,7 @@ 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}
+%if 0%{?fedora} > 14
# 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
@@ -224,7 +237,17 @@ fi
%post
-/sbin/chkconfig --add %{name}
+%if 0%{?fedora} > 14
+if [ $1 -eq 1 ] ; then
+ # Initial installation
+ /bin/systemctl daemon-reload >/dev/null 2>&1 || :
+fi
+%else
+if [ $1 -eq 1 ]; then
+ # Initial installation
+ /sbin/chkconfig --add %{name} || :
+fi
+%endif
# Create SSL certificate with default values if it doesn't exist
(cd /etc/ejabberd
@@ -249,16 +272,34 @@ fi)
%preun
-if [ $1 = 0 ]; then
- /sbin/service %{name} stop >/dev/null 2>&1
- /sbin/chkconfig --del %{name}
+%if 0%{?fedora} > 14
+if [ $1 -eq 0 ] ; then
+ # Package removal, not upgrade
+ /bin/systemctl --no-reload disable %{name}.service > /dev/null 2>&1 || :
+ /bin/systemctl stop %{name}.service > /dev/null 2>&1 || :
+fi
+%else
+if [ $1 -eq 0 ]; then
+ # Package removal, not upgrade
+ /sbin/service %{name} stop >/dev/null 2>&1 || :
+ /sbin/chkconfig --del %{name} || :
fi
+%endif
%postun
-if [ "$1" -ge "1" ]; then
- /sbin/service %{name} condrestart >/dev/null 2>&1
+%if 0%{?fedora} > 14
+/bin/systemctl daemon-reload >/dev/null 2>&1 || :
+if [ $1 -ge 1 ] ; then
+ # Package upgrade, not uninstall
+ /bin/systemctl condrestart %{name}.service >/dev/null 2>&1 || :
fi
+%else
+if [ $1 -ge 1 ]; then
+ # Package upgrade, not uninstall
+ /sbin/service %{name} condrestart >/dev/null 2>&1
+fi
+%endif
%clean
@@ -276,7 +317,7 @@ 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}%{?fc17}
+%if 0%{?fedora} > 14
%{_unitdir}/%{name}.service
%{_sysconfdir}/tmpfiles.d/%{name}.conf
%else
@@ -355,6 +396,10 @@ rm -rf %{buildroot}
%doc %{_docdir}/%{name}-%{version}/*.txt
%changelog
+* Sun May 06 2012 Peter Lemenkov <lemenkov@gmail.com> - 2.1.11-1
+- Ver. 2.1.11
+- Fixed systemd installation
+
* Sun Jan 15 2012 Peter Lemenkov <lemenkov@gmail.com> - 2.1.10-3
- Fixed systemd unit file
diff --git a/sources b/sources
index eb54480..7b914cc 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-70f0e17983114c62893e43b6ef2e9d0c ejabberd-2.1.10.tar.gz
+a70b040c4e7602f47718c8afe8780d50 ejabberd-2.1.11.tgz
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2026-09-23 19:07 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-09-23 19:07 [rpms/ejabberd] f45: Ver. 2.1.11 Peter Lemenkov
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox