From 93f5bccf5735aaf1f25663f4a84baf208094931c Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Dec 29 2010 14:22:45 +0000 Subject: Bugfixes for ver. 1.3.1 Signed-off-by: Peter Lemenkov --- 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 7712396..f6a8162 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 de3c54f85f893e4ee985b1da93cc014b00456fa8 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Wed, 31 Mar 2010 11:52:52 +0400 -Subject: [PATCH 1/6] Force to use system-wide GSM includes +Subject: [PATCH 1/9] Force to use system-wide GSM includes Signed-off-by: Peter Lemenkov --- 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 fd75dcc..f372092 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 26929b6a7a62299b71bf7c99f17f75670a2040e2 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Wed, 31 Mar 2010 11:53:48 +0400 -Subject: [PATCH 2/6] Allow rewrite of custom makefiles by CMake +Subject: [PATCH 2/9] Allow rewrite of custom makefiles by CMake Signed-off-by: Peter Lemenkov --- 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 f6f04b4..9ec0ebd 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 e322f2e00e48b639b5d87ed06738aa24d99396bf Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Wed, 31 Mar 2010 18:56:39 +0400 -Subject: [PATCH 3/6] Set CFG_PREFIX to empty string by default +Subject: [PATCH 3/9] Set CFG_PREFIX to empty string by default Signed-off-by: Peter Lemenkov --- 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 86e42fc..e6bd449 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 4a2b5ca2644db000dbace63c8bdd278109f6d356 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Fri, 25 Jun 2010 12:16:45 +0400 -Subject: [PATCH 4/6] Disable mysql++ in conference and early_announce modules +Subject: [PATCH 4/9] Disable mysql++ in conference and early_announce modules Unfortunately, this breaks existing configurations, which is a no-go situation for EPEL repository. We'll enable it later. 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 4c1165d..d1a9719 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 2f0556c126f2cae0edec32b0fd269d496dd068f6 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Mon, 27 Sep 2010 14:13:00 +0400 -Subject: [PATCH 5/6] Add sw_prepaid_sip plugin to default exclude list (due to missing cc_acc) +Subject: [PATCH 5/9] Add sw_prepaid_sip plugin to default exclude list (due to missing cc_acc) Signed-off-by: Peter Lemenkov --- diff --git a/sems-0006-last-minute-fix-proper-version.patch b/sems-0006-last-minute-fix-proper-version.patch index 4846bb7..12bdd34 100644 --- a/sems-0006-last-minute-fix-proper-version.patch +++ b/sems-0006-last-minute-fix-proper-version.patch @@ -1,7 +1,7 @@ From 708b02d96f4a4acb7c4ede0387a84d2f5948e0db Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Mon, 27 Dec 2010 17:18:46 +0300 -Subject: [PATCH 6/6] last-minute fix - proper version +Subject: [PATCH 6/9] last-minute fix - proper version Signed-off-by: Peter Lemenkov --- diff --git a/sems-0007-Fix-gateway-module-s-version-passing-in-CMake.patch b/sems-0007-Fix-gateway-module-s-version-passing-in-CMake.patch new file mode 100644 index 0000000..2e9dee5 --- /dev/null +++ b/sems-0007-Fix-gateway-module-s-version-passing-in-CMake.patch @@ -0,0 +1,26 @@ +From 7f2c45fc1e9c2c1900244709abfa125c9b7e5755 Mon Sep 17 00:00:00 2001 +From: Peter Lemenkov +Date: Wed, 29 Dec 2010 16:02:44 +0300 +Subject: [PATCH 7/9] Fix gateway module's version passing in CMake + +Signed-off-by: Peter Lemenkov +--- + apps/gateway/CMakeLists.txt | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/apps/gateway/CMakeLists.txt b/apps/gateway/CMakeLists.txt +index e18389a..ef0acde 100644 +--- a/apps/gateway/CMakeLists.txt ++++ b/apps/gateway/CMakeLists.txt +@@ -6,7 +6,7 @@ mISDNNames.cpp + mISDNStack.cpp + ) + +-ADD_DEFINITIONS(-DGW_VERSION="0.1") ++ADD_DEFINITIONS(-DGW_VERSION=\\\"0.1\\\") + INCLUDE_DIRECTORIES(${MISDN_INCLUDE_DIR}/mISDNuser) + + SET(sems_module_name gateway) +-- +1.7.3.4 + diff --git a/sems-0008-Install-email-template.patch b/sems-0008-Install-email-template.patch new file mode 100644 index 0000000..a5570a5 --- /dev/null +++ b/sems-0008-Install-email-template.patch @@ -0,0 +1,25 @@ +From 57e8f6ccdf5335207f7017414487db6bf81a64f3 Mon Sep 17 00:00:00 2001 +From: Peter Lemenkov +Date: Wed, 29 Dec 2010 16:55:50 +0300 +Subject: [PATCH 8/9] Install email template + +Signed-off-by: Peter Lemenkov +--- + apps/voicemail/CMakeLists.txt | 4 ++++ + 1 files changed, 4 insertions(+), 0 deletions(-) + +diff --git a/apps/voicemail/CMakeLists.txt b/apps/voicemail/CMakeLists.txt +index b82736f..38778bc 100644 +--- a/apps/voicemail/CMakeLists.txt ++++ b/apps/voicemail/CMakeLists.txt +@@ -25,3 +25,7 @@ SET(sems_module_name voicemail) + INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) + INCLUDE(${CMAKE_SOURCE_DIR}/cmake/audio.rules.txt) + INCLUDE(${CMAKE_SOURCE_DIR}/cmake/config.rules.txt) ++ ++INSTALL( ++ FILES ./default.template DESTINATION ${SEMS_CFG_PREFIX}/etc/sems/ ++) +-- +1.7.3.4 + diff --git a/sems-0009-Don-t-start-py_sems-by-default.patch b/sems-0009-Don-t-start-py_sems-by-default.patch new file mode 100644 index 0000000..5a8cd15 --- /dev/null +++ b/sems-0009-Don-t-start-py_sems-by-default.patch @@ -0,0 +1,26 @@ +From 8712daf57f4ec10caadd215dc969b1f261a949b5 Mon Sep 17 00:00:00 2001 +From: Peter Lemenkov +Date: Wed, 29 Dec 2010 17:02:49 +0300 +Subject: [PATCH 9/9] Don't start py_sems by default + +Signed-off-by: Peter Lemenkov +--- + core/etc/sems.conf.cmake | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/core/etc/sems.conf.cmake b/core/etc/sems.conf.cmake +index eeeeb67..0e0ca62 100644 +--- a/core/etc/sems.conf.cmake ++++ b/core/etc/sems.conf.cmake +@@ -140,7 +140,7 @@ plugin_path=${SEMS_EXEC_PREFIX}/${SEMS_LIBDIR}/sems/plug-in/ + # + # o binrpcctrl and unixsockctrl: excluded as sipctrl is default ctrl + # o precoded_announce: no precoded sample files present +-exclude_plugins=binrpcctrl;unixsockctrl;precoded_announce;sw_prepaid_sip ++exclude_plugins=binrpcctrl;unixsockctrl;precoded_announce;sw_prepaid_sip;py_sems + + # optional parameter: application + # +-- +1.7.3.4 + diff --git a/sems.spec b/sems.spec index e7ccc67..07aa8f3 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.3.1 -Release: 1%{?dist} +Release: 2%{?dist} URL: http://www.iptel.org/sems ## wget http://ftp.iptel.org/pub/sems/sems-1.3.1.tar.gz ## tar zx --exclude iLBC_rfc3951 -f sems-1.3.1.tar.gz @@ -20,7 +20,14 @@ Patch3: sems-0003-Set-CFG_PREFIX-to-empty-string-by-default.patch Patch4: sems-0004-Disable-mysql-in-conference-and-early_announce-modul.patch # Fedora-specific Patch5: sems-0005-Add-sw_prepaid_sip-plugin-to-default-exclude-list-du.patch +# Fedora-specific (will be dropped in the next version) Patch6: sems-0006-last-minute-fix-proper-version.patch +# Backported +Patch7: sems-0007-Fix-gateway-module-s-version-passing-in-CMake.patch +# Backported +Patch8: sems-0008-Install-email-template.patch +# Fedora-specific +Patch9: sems-0009-Don-t-start-py_sems-by-default.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: python >= 2.3 @@ -192,6 +199,9 @@ rm -rf core/plug-in/gsm/gsm-1.0-pl10/ %patch4 -p1 -b .disable_mysqlpp_in_conf_and_ea %patch5 -p1 -b .exclude_sw_prepaid_sip %patch6 -p1 -b .correct_ver +%patch7 -p1 -b .gw_ver +%patch8 -p1 -b .install_email_template +%patch9 -p1 -b .dont_start_py_sems iconv -f iso8859-1 -t UTF-8 doc/Readme.diameter_client.txt > doc/Readme.diameter_client.utf8 && mv doc/Readme.diameter_client.{utf8,txt} @@ -236,9 +246,6 @@ mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}/audio/ann_b2b mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}/audio/announcement mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}/audio/announce_transfer -# install template file for voicemail -install -D -p -m 644 apps/voicemail/default.template $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/default.template - %clean rm -rf $RPM_BUILD_ROOT @@ -594,6 +601,11 @@ fi %{_libdir}/%{name}/plug-in/xmlrpc2di.so %changelog +* Wed Dec 29 2010 Peter Lemenkov 1.3.1-2 +- Fixed segfault in gateway module +- Properly install email template for voicemail module +- Don't start py_sems by default (causes issues with python2.7) + * Mon Dec 27 2010 Peter Lemenkov 1.3.1-1 - Ver. 1.3.1 (Bugfix release)