[sems] Fixed init-script
Peter Lemenkov
peter at fedoraproject.org
Thu Jul 19 11:36:52 UTC 2012
commit 11db2975f31a0c80c1d30ee21733acdca8406ed0
Author: Peter Lemenkov <lemenkov at gmail.com>
Date: Thu Jul 19 15:36:25 2012 +0400
Fixed init-script
Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
...001-Force-to-use-system-wide-GSM-includes.patch | 4 +-
...llow-rewrite-of-custom-makefiles-by-CMake.patch | 4 +-
...Set-CFG_PREFIX-to-empty-string-by-default.patch | 4 +-
...ql-in-conference-and-early_announce-modul.patch | 4 +-
...aid_sip-plugin-to-default-exclude-list-du.patch | 4 +-
sems-0006-Don-t-start-py_sems-by-default.patch | 4 +-
sems-0007-Change-default-msg_storage-path.patch | 4 +-
sems-0008-Fix-building-with-IPv6-support.patch | 4 +-
...009-Correct-version-number-in-CMake-files.patch | 4 +-
...ng-etc-sysconfig-sems-file-to-the-pkg-rpm.patch | 4 +-
...11-init-script-Fix-diractory-for-Pid-file.patch | 26 ++++++++++++++++
sems-0012-systemd-Restart-in-case-of-failure.patch | 27 ++++++++++++++++
sems.spec | 32 +++++++------------
13 files changed, 85 insertions(+), 40 deletions(-)
---
diff --git a/sems-0001-Force-to-use-system-wide-GSM-includes.patch b/sems-0001-Force-to-use-system-wide-GSM-includes.patch
index 9661276..c1ed2b6 100644
--- a/sems-0001-Force-to-use-system-wide-GSM-includes.patch
+++ b/sems-0001-Force-to-use-system-wide-GSM-includes.patch
@@ -1,7 +1,7 @@
From 79c3f4ac561f69d4a3db07b539f45d1a8d912853 Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov at gmail.com>
Date: Wed, 31 Mar 2010 11:52:52 +0400
-Subject: [PATCH 01/10] Force to use system-wide GSM includes
+Subject: [PATCH 01/12] Force to use system-wide GSM includes
Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
---
@@ -22,5 +22,5 @@ index 286a989..3517e59 100644
#include <stdlib.h>
--
-1.7.10
+1.7.10.4
diff --git a/sems-0002-Allow-rewrite-of-custom-makefiles-by-CMake.patch b/sems-0002-Allow-rewrite-of-custom-makefiles-by-CMake.patch
index c07e8c8..fb859f3 100644
--- a/sems-0002-Allow-rewrite-of-custom-makefiles-by-CMake.patch
+++ b/sems-0002-Allow-rewrite-of-custom-makefiles-by-CMake.patch
@@ -1,7 +1,7 @@
From 9148b9c37b3ced81683ebc691c090f84ddb97b2b Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov at gmail.com>
Date: Wed, 31 Mar 2010 11:53:48 +0400
-Subject: [PATCH 02/10] Allow rewrite of custom makefiles by CMake
+Subject: [PATCH 02/12] Allow rewrite of custom makefiles by CMake
Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
---
@@ -29,5 +29,5 @@ index 8f83c5d..68b0c26 100644
OPTION(SEMS_USE_LIBSAMPLERATE "Build with libsamplerate" OFF)
OPTION(SEMS_USE_ZRTP "Build with ZRTP" OFF)
--
-1.7.10
+1.7.10.4
diff --git a/sems-0003-Set-CFG_PREFIX-to-empty-string-by-default.patch b/sems-0003-Set-CFG_PREFIX-to-empty-string-by-default.patch
index c1a553a..b30deb1 100644
--- a/sems-0003-Set-CFG_PREFIX-to-empty-string-by-default.patch
+++ b/sems-0003-Set-CFG_PREFIX-to-empty-string-by-default.patch
@@ -1,7 +1,7 @@
From 42c18a0fd5f78ec154ae7e6f442fc083dd84e339 Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov at gmail.com>
Date: Wed, 31 Mar 2010 18:56:39 +0400
-Subject: [PATCH 03/10] Set CFG_PREFIX to empty string by default
+Subject: [PATCH 03/12] Set CFG_PREFIX to empty string by default
Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
---
@@ -22,5 +22,5 @@ index 68b0c26..a3264e3 100644
MESSAGE(STATUS "SEMS cfg prefix was set to: ${SEMS_CFG_PREFIX}")
--
-1.7.10
+1.7.10.4
diff --git a/sems-0004-Disable-mysql-in-conference-and-early_announce-modul.patch b/sems-0004-Disable-mysql-in-conference-and-early_announce-modul.patch
index 06c5ca1..be1f21d 100644
--- a/sems-0004-Disable-mysql-in-conference-and-early_announce-modul.patch
+++ b/sems-0004-Disable-mysql-in-conference-and-early_announce-modul.patch
@@ -1,7 +1,7 @@
From 536fcc248c8d8fda4c2523bf4c9a1fc5a3362d01 Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov at gmail.com>
Date: Fri, 25 Jun 2010 12:16:45 +0400
-Subject: [PATCH 04/10] Disable mysql++ in conference and early_announce
+Subject: [PATCH 04/12] Disable mysql++ in conference and early_announce
modules
Unfortunately, this breaks existing configurations, which is a
@@ -60,5 +60,5 @@ index 43c374e..03a1532 100644
SET(sems_module_name early_announce)
INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt)
--
-1.7.10
+1.7.10.4
diff --git a/sems-0005-Add-sw_prepaid_sip-plugin-to-default-exclude-list-du.patch b/sems-0005-Add-sw_prepaid_sip-plugin-to-default-exclude-list-du.patch
index 8d0add8..689e5c9 100644
--- a/sems-0005-Add-sw_prepaid_sip-plugin-to-default-exclude-list-du.patch
+++ b/sems-0005-Add-sw_prepaid_sip-plugin-to-default-exclude-list-du.patch
@@ -1,7 +1,7 @@
From b3609436f25f48e6eab749e86487dae780e79870 Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov at gmail.com>
Date: Mon, 27 Sep 2010 14:13:00 +0400
-Subject: [PATCH 05/10] Add sw_prepaid_sip plugin to default exclude list (due
+Subject: [PATCH 05/12] Add sw_prepaid_sip plugin to default exclude list (due
to missing cc_acc)
Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
@@ -23,5 +23,5 @@ index c4f900f..f36cb69 100644
# optional parameter: application
#
--
-1.7.10
+1.7.10.4
diff --git a/sems-0006-Don-t-start-py_sems-by-default.patch b/sems-0006-Don-t-start-py_sems-by-default.patch
index 812d64f..5d18dce 100644
--- a/sems-0006-Don-t-start-py_sems-by-default.patch
+++ b/sems-0006-Don-t-start-py_sems-by-default.patch
@@ -1,7 +1,7 @@
From adff391d26ffe2bb5fcc5b3f0611b146925d9580 Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov at gmail.com>
Date: Wed, 29 Dec 2010 17:02:49 +0300
-Subject: [PATCH 06/10] Don't start py_sems by default
+Subject: [PATCH 06/12] Don't start py_sems by default
Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
---
@@ -22,5 +22,5 @@ index f36cb69..7276602 100644
# optional parameter: application
#
--
-1.7.10
+1.7.10.4
diff --git a/sems-0007-Change-default-msg_storage-path.patch b/sems-0007-Change-default-msg_storage-path.patch
index 8af8431..b96c8fe 100644
--- a/sems-0007-Change-default-msg_storage-path.patch
+++ b/sems-0007-Change-default-msg_storage-path.patch
@@ -1,7 +1,7 @@
From 0c64018f8dd8462affb397cc9c8cf3640fecd7c6 Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov at gmail.com>
Date: Thu, 24 Nov 2011 19:57:05 +0400
-Subject: [PATCH 07/10] Change default msg_storage path
+Subject: [PATCH 07/12] Change default msg_storage path
Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
---
@@ -19,5 +19,5 @@ index efab27f..dadf5d8 100644
-#storage_dir=/var/spool/voicebox/
+storage_dir=/var/spool/sems/voicebox/
--
-1.7.10
+1.7.10.4
diff --git a/sems-0008-Fix-building-with-IPv6-support.patch b/sems-0008-Fix-building-with-IPv6-support.patch
index 2d05113..00afb07 100644
--- a/sems-0008-Fix-building-with-IPv6-support.patch
+++ b/sems-0008-Fix-building-with-IPv6-support.patch
@@ -1,7 +1,7 @@
From ad89c8cc396a6d1461a0fc6adb06585aafa3bc7f Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov at gmail.com>
Date: Thu, 19 Apr 2012 16:43:45 +0400
-Subject: [PATCH 08/10] Fix building with IPv6 support
+Subject: [PATCH 08/12] Fix building with IPv6 support
Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
---
@@ -22,5 +22,5 @@ index bb2b0a4..be2ac9b 100644
int AmRtpStream::ping()
--
-1.7.10
+1.7.10.4
diff --git a/sems-0009-Correct-version-number-in-CMake-files.patch b/sems-0009-Correct-version-number-in-CMake-files.patch
index a5b501b..dc7ec03 100644
--- a/sems-0009-Correct-version-number-in-CMake-files.patch
+++ b/sems-0009-Correct-version-number-in-CMake-files.patch
@@ -1,7 +1,7 @@
From aec12cf6735e0731496f783a48ac94290f2cb71b Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov at gmail.com>
Date: Sat, 5 May 2012 12:36:51 +0400
-Subject: [PATCH 09/10] Correct version number in CMake-files
+Subject: [PATCH 09/12] Correct version number in CMake-files
Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
---
@@ -22,5 +22,5 @@ index a3264e3..1302857 100644
IF(EXISTS ${CMAKE_SOURCE_DIR}/.git)
--
-1.7.10
+1.7.10.4
diff --git a/sems-0010-Added-missing-etc-sysconfig-sems-file-to-the-pkg-rpm.patch b/sems-0010-Added-missing-etc-sysconfig-sems-file-to-the-pkg-rpm.patch
index 916de11..a3a2914 100644
--- a/sems-0010-Added-missing-etc-sysconfig-sems-file-to-the-pkg-rpm.patch
+++ b/sems-0010-Added-missing-etc-sysconfig-sems-file-to-the-pkg-rpm.patch
@@ -1,7 +1,7 @@
From e8a9f3e78f3310c42bb4e56de28ff9c91c79a1f0 Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov at gmail.com>
Date: Sat, 5 May 2012 12:50:33 +0400
-Subject: [PATCH 10/10] Added missing /etc/sysconfig/sems file to the pkg/rpm
+Subject: [PATCH 10/12] Added missing /etc/sysconfig/sems file to the pkg/rpm
Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
---
@@ -17,5 +17,5 @@ index 0000000..9186ef7
@@ -0,0 +1 @@
+OPTIONS=""
--
-1.7.10
+1.7.10.4
diff --git a/sems-0011-init-script-Fix-diractory-for-Pid-file.patch b/sems-0011-init-script-Fix-diractory-for-Pid-file.patch
new file mode 100644
index 0000000..40805d8
--- /dev/null
+++ b/sems-0011-init-script-Fix-diractory-for-Pid-file.patch
@@ -0,0 +1,26 @@
+From 2fbfdae6dc3f2a938b0e7bbdba70c76826ef22dd Mon Sep 17 00:00:00 2001
+From: Peter Lemenkov <lemenkov at gmail.com>
+Date: Thu, 19 Jul 2012 14:41:01 +0400
+Subject: [PATCH 11/12] [init-script] Fix diractory for Pid-file
+
+Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
+---
+ pkg/rpm/sems.init | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/pkg/rpm/sems.init b/pkg/rpm/sems.init
+index 15e9847..c39a721 100755
+--- a/pkg/rpm/sems.init
++++ b/pkg/rpm/sems.init
+@@ -24,7 +24,7 @@
+ prog=sems
+ sems=/usr/sbin/$prog
+
+-pidfile=/var/run/$prog.pid
++pidfile=/var/run/$prog/$prog.pid
+ lockfile=/var/lock/subsys/$prog
+ conffile=/etc/$prog/$prog.conf
+
+--
+1.7.10.4
+
diff --git a/sems-0012-systemd-Restart-in-case-of-failure.patch b/sems-0012-systemd-Restart-in-case-of-failure.patch
new file mode 100644
index 0000000..abce897
--- /dev/null
+++ b/sems-0012-systemd-Restart-in-case-of-failure.patch
@@ -0,0 +1,27 @@
+From 0c624ff65e9790942ce8c4df2aada70d19030a1c Mon Sep 17 00:00:00 2001
+From: Peter Lemenkov <lemenkov at gmail.com>
+Date: Thu, 19 Jul 2012 14:42:01 +0400
+Subject: [PATCH 12/12] [systemd] Restart in case of failure
+
+Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
+---
+ pkg/rpm/sems.systemd.service | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/pkg/rpm/sems.systemd.service b/pkg/rpm/sems.systemd.service
+index 7d66886..43996a5 100644
+--- a/pkg/rpm/sems.systemd.service
++++ b/pkg/rpm/sems.systemd.service
+@@ -8,6 +8,9 @@ User=sems
+ Group=sems
+ EnvironmentFile=-/etc/sysconfig/sems
+ PIDFile=/var/run/sems/sems.pid
++Restart=always
++StartLimitInterval=10
++StartLimitBurst=5
+ ExecStart=/usr/sbin/sems -E -u sems -g sems -P /var/run/sems/sems.pid $OPTIONS
+
+ [Install]
+--
+1.7.10.4
+
diff --git a/sems.spec b/sems.spec
index b53b8e2..f893b95 100644
--- a/sems.spec
+++ b/sems.spec
@@ -1,7 +1,7 @@
Summary: SIP Express Media Server, an extensible SIP media server
Name: sems
Version: 1.4.3
-Release: 1%{?dist}
+Release: 2%{?dist}
URL: http://www.iptel.org/sems
Source0: http://ftp.iptel.org/pub/%{name}/%{name}-%{version}.tar.gz
%if 0%{?fedora} > 14
@@ -30,6 +30,10 @@ Patch8: sems-0008-Fix-building-with-IPv6-support.patch
Patch9: sems-0009-Correct-version-number-in-CMake-files.patch
# Will be proposed for inclusion in upstream
Patch10: sems-0010-Added-missing-etc-sysconfig-sems-file-to-the-pkg-rpm.patch
+# Will be proposed for inclusion in upstream
+Patch11: sems-0011-init-script-Fix-diractory-for-Pid-file.patch
+# Will be proposed for inclusion in upstream
+Patch12: sems-0012-systemd-Restart-in-case-of-failure.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: python >= 2.3
@@ -224,6 +228,8 @@ rm -rf core/plug-in/gsm/gsm-1.0-pl10/
%patch8 -p1 -b .ipv6
%patch9 -p1 -b .ver_typo
%patch10 -p1 -b .sysconfig
+%patch11 -p1 -b .fix_init
+%patch12 -p1 -b .systemd_restart
iconv -f iso8859-1 -t UTF-8 doc/Readme.diameter_client.txt > doc/Readme.diameter_client.utf8 && mv doc/Readme.diameter_client.{utf8,txt}
@@ -259,11 +265,11 @@ install -D -m 0644 -p pkg/rpm/sems.sysconfig $RPM_BUILD_ROOT%{_sysconfdir}/sysco
# install systemd files
install -D -m 0644 -p pkg/rpm/sems.systemd.service $RPM_BUILD_ROOT%{_unitdir}/%{name}.service
install -D -m 0644 -p pkg/rpm/sems.systemd.tmpfiles.d.conf $RPM_BUILD_ROOT%{_sysconfdir}/tmpfiles.d/%{name}.conf
-mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/run/%{name}
%else
# install init-script
install -D -p -m755 pkg/rpm/sems.init $RPM_BUILD_ROOT%{_initrddir}/%{name}
%endif
+mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/run/%{name}
mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/spool/%{name}/voicebox
# Remove installed docs
@@ -317,8 +323,6 @@ fi
%files
-%defattr(-,root,root)
-
%dir %{_sysconfdir}/%{name}
%dir %{_sysconfdir}/%{name}/etc
%dir %{_libdir}/%{name}
@@ -341,10 +345,10 @@ fi
%if 0%{?fedora} > 14
%{_unitdir}/%{name}.service
%{_sysconfdir}/tmpfiles.d/%{name}.conf
-%dir %attr(0755, %{name}, %{name}) %{_localstatedir}/run/%{name}
%else
%{_initrddir}/%{name}
%endif
+%dir %attr(0755, %{name}, %{name}) %{_localstatedir}/run/%{name}
%config(noreplace) %{_sysconfdir}/%{name}/default.template
%config(noreplace) %{_sysconfdir}/%{name}/%{name}.conf
@@ -534,7 +538,6 @@ fi
%{_libdir}/%{name}/plug-in/webconference.so
%files conf_auth
-%defattr(-,root,root)
# currently empty
#%config(noreplace) %{_sysconfdir}/%{name}/etc/conf_auth.conf
%doc doc/Readme.conf_auth.txt
@@ -543,7 +546,6 @@ fi
%{_libdir}/%{name}/ivr/conf_auth.pyo
%files conference
-%defattr(-,root,root)
%config(noreplace) %{_sysconfdir}/%{name}/etc/conference.conf
%doc doc/Readme.conference.txt
%dir %{_datadir}/%{name}/audio/conference
@@ -552,12 +554,10 @@ fi
%{_datadir}/%{name}/audio/conference/first_participant.wav
%files diameter_client
-%defattr(-,root,root)
%doc doc/Readme.diameter_client.txt
%{_libdir}/%{name}/plug-in/diameter_client.so
%files dsm
-%defattr(-,root,root)
%config(noreplace) %{_sysconfdir}/%{name}/etc/dsm.conf
%config(noreplace) %{_sysconfdir}/%{name}/etc/dsm_in_prompts.conf
%config(noreplace) %{_sysconfdir}/%{name}/etc/dsm_out_prompts.conf
@@ -577,32 +577,26 @@ fi
%files early_announce
-%defattr(-,root,root)
%config(noreplace) %{_sysconfdir}/%{name}/etc/early_announce.conf
%doc doc/Readme.early_announce.txt
%{_libdir}/%{name}/plug-in/early_announce.so
%files g722
-%defattr(-,root,root)
%doc core/plug-in/g722/Readme.g722codec
%{_libdir}/%{name}/plug-in/g722.so
#%files gateway
-#%defattr(-,root,root)
#%config(noreplace) %{_sysconfdir}/%{name}/etc/gateway.conf
#%{_libdir}/%{name}/plug-in/gateway.so
%files gsm
-%defattr(-,root,root)
%{_libdir}/%{name}/plug-in/gsm.so
%files ilbc
-%defattr(-,root,root)
%doc doc/Readme.iLBC.txt
%{_libdir}/%{name}/plug-in/ilbc.so
%files ivr
-%defattr(-,root,root)
%config(noreplace) %{_sysconfdir}/%{name}/etc/ivr.conf
%doc doc/Readme.ivr.txt
%dir %{_libdir}/%{name}/ivr
@@ -612,7 +606,6 @@ fi
%{_libdir}/%{name}/ivr/log.pyo
%files mailbox
-%defattr(-,root,root)
%config(noreplace) %{_sysconfdir}/%{name}/etc/mailbox.conf
%config(noreplace) %{_sysconfdir}/%{name}/etc/mailbox_query.conf
%doc doc/Readme.mailbox.txt
@@ -648,7 +641,6 @@ fi
%{_libdir}/%{name}/ivr/imap_mailbox/imap4ext.pyo
%files pin_collect
-%defattr(-,root,root)
%config(noreplace) %{_sysconfdir}/%{name}/etc/pin_collect.conf
%doc doc/Readme.pin_collect.txt
%dir %{_datadir}/%{name}/audio/pin_collect
@@ -659,7 +651,6 @@ fi
%{_libdir}/%{name}/ivr/pin_collect.pyo
%files python
-%defattr(-,root,root)
%config(noreplace) %{_sysconfdir}/%{name}/etc/py_sems.conf
%doc doc/Readme.py_sems.txt
%{_libdir}/%{name}/plug-in/py_sems.so
@@ -668,16 +659,17 @@ fi
%{_libdir}/%{name}/plug-in/py_sems_log.pyo
%files speex
-%defattr(-,root,root)
%{_libdir}/%{name}/plug-in/speex.so
%files xmlrpc2di
-%defattr(-,root,root)
%config(noreplace) %{_sysconfdir}/%{name}/etc/xmlrpc2di.conf
%doc doc/Readme.xmlrpc2di.txt
%{_libdir}/%{name}/plug-in/xmlrpc2di.so
%changelog
+* Thu Jul 19 2012 Peter Lemenkov <lemenkov at gmail.com> - 1.4.3-2
+- Fixed init-script
+
* Sat May 05 2012 Peter Lemenkov <lemenkov at gmail.com> - 1.4.3-1
- Ver. 1.4.3 (bugfix release in 1.4.x branch)
- Dropped upstreamed patches
More information about the scm-commits
mailing list