public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/ejabberd] f45: Ver. 2.1.13
@ 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 : cec2678fc75ad5a6dd8e74a8fe0d63f11dd8d0b0
Author : Peter Lemenkov <lemenkov@gmail.com>
Date : 2013-06-29T00:56:30+04:00
Stats : +32/-27 in 12 file(s)
URL : https://src.fedoraproject.org/rpms/ejabberd/c/cec2678fc75ad5a6dd8e74a8fe0d63f11dd8d0b0?branch=f45
Log:
Ver. 2.1.13
Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
---
diff --git a/.gitignore b/.gitignore
index f504d51..107c82d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@ ejabberd-2.1.5.tar.gz
/ejabberd-2.1.10.tar.gz
/ejabberd-2.1.11.tgz
/processone-ejabberd-v2.1.12-0-gc058687.tar.gz
+/processone-ejabberd-v2.1.13-0-g5feeacf.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 ad54acc..16c21c9 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 3ee03a76e4b07c782236c8cb5be53ab39d990f03 Mon Sep 17 00:00:00 2001
+From b3a61330f7328507e1608e437a152e806ef520d1 Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov@gmail.com>
Date: Tue, 16 Feb 2010 16:03:38 +0300
Subject: [PATCH 1/8] Fix PAM service example name to match actual one
@@ -22,5 +22,5 @@ index a4068ad..9b24a4a 100644
%%
%% Authentication using LDAP
--
-1.8.1.2
+1.8.2.1
diff --git a/ejabberd-0002-Fixed-delays-in-s2s-connections.patch b/ejabberd-0002-Fixed-delays-in-s2s-connections.patch
index 69e840a..33787e7 100644
--- a/ejabberd-0002-Fixed-delays-in-s2s-connections.patch
+++ b/ejabberd-0002-Fixed-delays-in-s2s-connections.patch
@@ -1,4 +1,4 @@
-From 143c1d60d594f30c1b411bdc5101f17208e6fe68 Mon Sep 17 00:00:00 2001
+From ec26218c6f2374f4e39e50c194150065cc5da275 Mon Sep 17 00:00:00 2001
From: Sergei Golovan <sgolovan@nes.ru>
Date: Tue, 16 Feb 2010 16:07:37 +0300
Subject: [PATCH 2/8] Fixed delays in s2s connections.
@@ -49,5 +49,5 @@ index 0dedb4c..9376d16 100644
end;
open_socket(closed, StateData) ->
--
-1.8.1.2
+1.8.2.1
diff --git a/ejabberd-0003-Introducing-mod_admin_extra.patch b/ejabberd-0003-Introducing-mod_admin_extra.patch
index d557bc0..a5f63f6 100644
--- a/ejabberd-0003-Introducing-mod_admin_extra.patch
+++ b/ejabberd-0003-Introducing-mod_admin_extra.patch
@@ -1,4 +1,4 @@
-From ebbdab726ecd36daa21e44f6bb2b61692d1b573b Mon Sep 17 00:00:00 2001
+From 363bfab713d9267e3186126d2df4162f24969d8c Mon Sep 17 00:00:00 2001
From: Badlop <badlop@process-one.net>
Date: Tue, 16 Feb 2010 16:12:17 +0300
Subject: [PATCH 3/8] Introducing mod_admin_extra
@@ -17,7 +17,7 @@ svn export -r 1125 https://svn.process-one.net/ejabberd-modules/mod_admin_extra/
create mode 100644 src/mod_admin_extra.erl
diff --git a/src/ejabberd.app b/src/ejabberd.app
-index 7202783..93d0e5c 100644
+index 1320597..4efc68d 100644
--- a/src/ejabberd.app
+++ b/src/ejabberd.app
@@ -99,6 +99,7 @@
@@ -1603,5 +1603,5 @@ index 0000000..1cef25a
+is_glob_match(String, Glob) ->
+ is_regexp_match(String, ejabberd_regexp:sh_to_awk(Glob)).
--
-1.8.1.2
+1.8.2.1
diff --git a/ejabberd-0004-Fedora-specific-changes-to-ejabberdctl.patch b/ejabberd-0004-Fedora-specific-changes-to-ejabberdctl.patch
index 520e6a0..590b843 100644
--- a/ejabberd-0004-Fedora-specific-changes-to-ejabberdctl.patch
+++ b/ejabberd-0004-Fedora-specific-changes-to-ejabberdctl.patch
@@ -1,4 +1,4 @@
-From 9ce8d01601dde950e3627d6be0cc606e562f0f3c Mon Sep 17 00:00:00 2001
+From 2e72b2ac86fcbc5902555621422db36684d42385 Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov@gmail.com>
Date: Tue, 16 Feb 2010 16:30:05 +0300
Subject: [PATCH 4/8] Fedora-specific changes to ejabberdctl
@@ -44,5 +44,5 @@ index 461ec1a..b298e01 100644
done
if [ "$ID" -eq "$EJID" ] ; then
--
-1.8.1.2
+1.8.2.1
diff --git a/ejabberd-0005-Install-.so-objects-with-0755-permissions.patch b/ejabberd-0005-Install-.so-objects-with-0755-permissions.patch
index 06125ae..a26b721 100644
--- a/ejabberd-0005-Install-.so-objects-with-0755-permissions.patch
+++ b/ejabberd-0005-Install-.so-objects-with-0755-permissions.patch
@@ -1,4 +1,4 @@
-From 441140e0df7fc04365e180260a7bafa61c21bef9 Mon Sep 17 00:00:00 2001
+From 75f9fdbe72c77c1521edc7402c0d27883dadf46c Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov@gmail.com>
Date: Sat, 12 Jun 2010 14:14:52 +0400
Subject: [PATCH 5/8] Install *.so objects with 0755 permissions
@@ -22,5 +22,5 @@ index 42af5b2..64ed856 100644
# Translated strings
install -d $(MSGSDIR)
--
-1.8.1.2
+1.8.2.1
diff --git a/ejabberd-0006-Use-versioned-directory-for-storing-docs.patch b/ejabberd-0006-Use-versioned-directory-for-storing-docs.patch
index d97ee67..0ef4a30 100644
--- a/ejabberd-0006-Use-versioned-directory-for-storing-docs.patch
+++ b/ejabberd-0006-Use-versioned-directory-for-storing-docs.patch
@@ -1,4 +1,4 @@
-From a6e85638dcf57b4332762aa0097882aa42926021 Mon Sep 17 00:00:00 2001
+From ba733c94f5f1238dc73e624a842ebc47ecc1c605 Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov@gmail.com>
Date: Sat, 12 Jun 2010 16:12:11 +0400
Subject: [PATCH 6/8] Use versioned directory for storing docs
@@ -31,5 +31,5 @@ index 64ed856..43b5e1f 100644
DOCDIR = $(DESTDIR)@docdir@
--
-1.8.1.2
+1.8.2.1
diff --git a/ejabberd-0007-Support-SASL-GSSAPI-authentication-thanks-to-Mikael-.patch b/ejabberd-0007-Support-SASL-GSSAPI-authentication-thanks-to-Mikael-.patch
index 017a568..d7132a5 100644
--- a/ejabberd-0007-Support-SASL-GSSAPI-authentication-thanks-to-Mikael-.patch
+++ b/ejabberd-0007-Support-SASL-GSSAPI-authentication-thanks-to-Mikael-.patch
@@ -1,4 +1,4 @@
-From 3b7e1cbea3991a0353967b6e71f5827e8456ff4a Mon Sep 17 00:00:00 2001
+From c00d31b20735b9a9d2bde1be7c4a70463bd1762e Mon Sep 17 00:00:00 2001
From: Badlop <badlop@process-one.net>
Date: Thu, 15 Apr 2010 17:20:16 +0200
Subject: [PATCH 7/8] Support SASL GSSAPI authentication (thanks to Mikael
@@ -501,5 +501,5 @@ index 836e7d9..59e4034 100644
%% Internal functions
%%====================================================================
--
-1.8.1.2
+1.8.2.1
diff --git a/ejabberd-0008-Disable-INET_DIST_INTERFACE-by-default.patch b/ejabberd-0008-Disable-INET_DIST_INTERFACE-by-default.patch
index 1474084..8138522 100644
--- a/ejabberd-0008-Disable-INET_DIST_INTERFACE-by-default.patch
+++ b/ejabberd-0008-Disable-INET_DIST_INTERFACE-by-default.patch
@@ -1,4 +1,4 @@
-From fd4edcd89a43fc88daccb58ad156155c6c94d429 Mon Sep 17 00:00:00 2001
+From e17a26e31d6ddd1b9ab5bc0b00665f94cbdfa5b0 Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov@gmail.com>
Date: Sat, 18 Jun 2011 23:24:28 +0400
Subject: [PATCH 8/8] Disable INET_DIST_INTERFACE by default
@@ -22,5 +22,5 @@ index b72058a..5ee43cf 100644
#.
#' ERL_EPMD_ADDRESS: IP addresses where epmd listens for connections
--
-1.8.1.2
+1.8.2.1
diff --git a/ejabberd.service b/ejabberd.service
index 8cb6fc9..3bd025b 100644
--- a/ejabberd.service
+++ b/ejabberd.service
@@ -8,9 +8,8 @@ User=ejabberd
Group=ejabberd
LimitNOFILE=16000
RestartSec=5
-EnvironmentFile=/etc/sysconfig/ejabberd
ExecStart=/usr/sbin/ejabberdctl \
- --config $CONFIG_FILE \
+ --config /etc/ejabberd/ejabberd.cfg \
--ctl-config /etc/ejabberd/ejabberdctl.cfg \
--logs "/var/log/ejabberd" \
--spool "/var/lib/ejabberd/spool" start
diff --git a/ejabberd.spec b/ejabberd.spec
index a76f42e..6c0489e 100644
--- a/ejabberd.spec
+++ b/ejabberd.spec
@@ -1,10 +1,11 @@
%global realname ejabberd
%global upstream processone
-%global git_tag c058687
+%global git_tag 5feeacf
%global patchnumber 0
%global uid 27
+%global _hardened_build 1
# Currently, hevea available only in Fedora
@@ -20,14 +21,14 @@
Name: ejabberd
-Version: 2.1.12
+Version: 2.1.13
Release: 1%{?dist}
Summary: A distributed, fault-tolerant Jabber/XMPP server
Group: Applications/Internet
License: GPLv2+
URL: http://www.ejabberd.im/
-# wget --content-disposition https://github.com/processone/ejabberd/tarball/v2.1.12
+# wget --content-disposition https://github.com/processone/ejabberd/tarball/v2.1.13
Source0: %{upstream}-%{realname}-v%{version}-%{patchnumber}-g%{git_tag}.tar.gz
Source1: ejabberd.init
Source2: ejabberd.logrotate
@@ -209,14 +210,13 @@ install -D -m 0644 -p %{S:5} $RPM_BUILD_ROOT%{_sysconfdir}/tmpfiles.d/%{name}.co
%else
# install init-script
install -D -p -m 0755 %{S:1} %{buildroot}%{_initrddir}/ejabberd
+# install sysconfig file
+install -D -p -m 0644 %{S:3} %{buildroot}%{_sysconfdir}/sysconfig/ejabberd
%endif
# install config for logrotate
install -D -p -m 0644 %{S:2} %{buildroot}%{_sysconfdir}/logrotate.d/ejabberd
-# install sysconfig file
-install -D -p -m 0644 %{S:3} %{buildroot}%{_sysconfdir}/sysconfig/ejabberd
-
# create room for necessary data
install -d %{buildroot}%{_datadir}/%{name}
# install sql-scripts for creating db schemes for various RDBMS
@@ -353,11 +353,11 @@ rm -rf %{buildroot}
%{_unitdir}/%{name}.service
%{_sysconfdir}/tmpfiles.d/%{name}.conf
%else
+%config(noreplace) %{_sysconfdir}/sysconfig/%{name}
%{_initrddir}/%{name}
%endif
%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
@@ -428,6 +428,11 @@ rm -rf %{buildroot}
%changelog
+* Sat Jun 29 2013 Peter Lemenkov <lemenkov@gmail.com> - 2.1.13-1
+- Ver. 2.1.13
+- Don't install or use /etc/sysconfig/ejabberd on systemd-enabled systems
+- Build with PIE (if available)
+
* Fri Mar 15 2013 Peter Lemenkov <lemenkov@gmail.com> - 2.1.12-1
- Ver. 2.1.12
diff --git a/sources b/sources
index fcc0b0e..763209d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2188f2c858d8e96fadef7c04373ebd92 processone-ejabberd-v2.1.12-0-gc058687.tar.gz
+ed78ba6f50d3e2695234ace534e4a932 processone-ejabberd-v2.1.13-0-g5feeacf.tar.gz
^ 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.13 Peter Lemenkov
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox