From 1a0ffb53058452255733c2483613884a86c6922b Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: May 05 2012 09:10:39 +0000 Subject: Ver. 1.4.3 (bugfix release in 1.4.x branch) Signed-off-by: Peter Lemenkov --- diff --git a/.gitignore b/.gitignore index 1d33445..06aa84b 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ sems-1.2.1.w_o_ilbc_sources.tar.gz /sems-1.3.1.w_o_ilbc_sources.tar.gz /sems-1.4.2.w_o_ilbc_sources.tar.gz /sems-1.4.2.tar.gz +/sems-1.4.3.tar.gz 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 b61a654..9661276 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 6d521cb639807a7e93954d05c8440724a289a38f Mon Sep 17 00:00:00 2001 +From 79c3f4ac561f69d4a3db07b539f45d1a8d912853 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Wed, 31 Mar 2010 11:52:52 +0400 -Subject: [PATCH 01/14] Force to use system-wide GSM includes +Subject: [PATCH 01/10] 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 ca49438..c07e8c8 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 456f9912196a27bed7418b43ecaf1ac69768dbd5 Mon Sep 17 00:00:00 2001 +From 9148b9c37b3ced81683ebc691c090f84ddb97b2b Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Wed, 31 Mar 2010 11:53:48 +0400 -Subject: [PATCH 02/14] Allow rewrite of custom makefiles by CMake +Subject: [PATCH 02/10] Allow rewrite of custom makefiles by CMake Signed-off-by: Peter Lemenkov --- @@ -9,7 +9,7 @@ Signed-off-by: Peter Lemenkov 1 file changed, 9 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index 7998e33..f143af5 100644 +index 8f83c5d..68b0c26 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -27,15 +27,6 @@ ENDIF(EXISTS ${CMAKE_SOURCE_DIR}/.git) 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 c1fa55b..c1a553a 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 fb8a5f575cceba39e3a73561b50d565797fb5d37 Mon Sep 17 00:00:00 2001 +From 42c18a0fd5f78ec154ae7e6f442fc083dd84e339 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Wed, 31 Mar 2010 18:56:39 +0400 -Subject: [PATCH 03/14] Set CFG_PREFIX to empty string by default +Subject: [PATCH 03/10] Set CFG_PREFIX to empty string by default Signed-off-by: Peter Lemenkov --- @@ -9,7 +9,7 @@ Signed-off-by: Peter Lemenkov 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index f143af5..d1a0fca 100644 +index 68b0c26..a3264e3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -49,7 +49,7 @@ ENDIF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} STREQUAL "2.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 c0f4fbe..06c5ca1 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 29cc8539cfa4030f40b0e92527893e34acbee009 Mon Sep 17 00:00:00 2001 +From 536fcc248c8d8fda4c2523bf4c9a1fc5a3362d01 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Fri, 25 Jun 2010 12:16:45 +0400 -Subject: [PATCH 04/14] Disable mysql++ in conference and early_announce +Subject: [PATCH 04/10] Disable mysql++ in conference and early_announce modules Unfortunately, this breaks existing configurations, which is a 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 c97001f..8d0add8 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 6f4fa250de15cf99e6dc21b308f9ee24c0a79086 Mon Sep 17 00:00:00 2001 +From b3609436f25f48e6eab749e86487dae780e79870 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Mon, 27 Sep 2010 14:13:00 +0400 -Subject: [PATCH 05/14] Add sw_prepaid_sip plugin to default exclude list (due +Subject: [PATCH 05/10] Add sw_prepaid_sip plugin to default exclude list (due to missing cc_acc) Signed-off-by: Peter Lemenkov @@ -10,7 +10,7 @@ Signed-off-by: Peter Lemenkov 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/etc/sems.conf.cmake b/core/etc/sems.conf.cmake -index c4f900f..d29c1a5 100644 +index c4f900f..f36cb69 100644 --- a/core/etc/sems.conf.cmake +++ b/core/etc/sems.conf.cmake @@ -162,7 +162,7 @@ plugin_path=${SEMS_EXEC_PREFIX}/${SEMS_LIBDIR}/sems/plug-in/ @@ -18,7 +18,7 @@ index c4f900f..d29c1a5 100644 # # o precoded_announce: no precoded sample files present -exclude_plugins=precoded_announce -+exclude_plugins=binrpcctrl;unixsockctrl;precoded_announce;sw_prepaid_sip ++exclude_plugins=precoded_announce;sw_prepaid_sip # optional parameter: application # 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 573f2f3..812d64f 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 c1e9a77bfbafbdabd3afc0fcf64e635a0a83d030 Mon Sep 17 00:00:00 2001 +From adff391d26ffe2bb5fcc5b3f0611b146925d9580 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Wed, 29 Dec 2010 17:02:49 +0300 -Subject: [PATCH 06/14] Don't start py_sems by default +Subject: [PATCH 06/10] Don't start py_sems by default Signed-off-by: Peter Lemenkov --- @@ -9,15 +9,15 @@ Signed-off-by: Peter Lemenkov 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/etc/sems.conf.cmake b/core/etc/sems.conf.cmake -index d29c1a5..d4da40e 100644 +index f36cb69..7276602 100644 --- a/core/etc/sems.conf.cmake +++ b/core/etc/sems.conf.cmake @@ -162,7 +162,7 @@ plugin_path=${SEMS_EXEC_PREFIX}/${SEMS_LIBDIR}/sems/plug-in/ # This has only effect it load_plugins is not set. # # 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 +-exclude_plugins=precoded_announce;sw_prepaid_sip ++exclude_plugins=precoded_announce;sw_prepaid_sip;py_sems # optional parameter: application # diff --git a/sems-0007-Change-default-msg_storage-path.patch b/sems-0007-Change-default-msg_storage-path.patch new file mode 100644 index 0000000..8af8431 --- /dev/null +++ b/sems-0007-Change-default-msg_storage-path.patch @@ -0,0 +1,23 @@ +From 0c64018f8dd8462affb397cc9c8cf3640fecd7c6 Mon Sep 17 00:00:00 2001 +From: Peter Lemenkov +Date: Thu, 24 Nov 2011 19:57:05 +0400 +Subject: [PATCH 07/10] Change default msg_storage path + +Signed-off-by: Peter Lemenkov +--- + apps/msg_storage/etc/msg_storage.conf.cmake | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/apps/msg_storage/etc/msg_storage.conf.cmake b/apps/msg_storage/etc/msg_storage.conf.cmake +index efab27f..dadf5d8 100644 +--- a/apps/msg_storage/etc/msg_storage.conf.cmake ++++ b/apps/msg_storage/etc/msg_storage.conf.cmake +@@ -5,4 +5,4 @@ + # + # default: /var/spool/voicebox/ + # +-#storage_dir=/var/spool/voicebox/ ++storage_dir=/var/spool/sems/voicebox/ +-- +1.7.10 + diff --git a/sems-0007-Fix-unresolved-symbol-in-sbc-module-when-compiled-wi.patch b/sems-0007-Fix-unresolved-symbol-in-sbc-module-when-compiled-wi.patch deleted file mode 100644 index 4a22163..0000000 --- a/sems-0007-Fix-unresolved-symbol-in-sbc-module-when-compiled-wi.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 92da5b357c2245615e918938e69fad8bb7cad48c Mon Sep 17 00:00:00 2001 -From: Peter Lemenkov -Date: Thu, 24 Nov 2011 00:11:14 +0400 -Subject: [PATCH 07/14] Fix unresolved symbol in sbc module when compiled with - cmake - -Signed-off-by: Peter Lemenkov ---- - apps/sbc/CMakeLists.txt | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/apps/sbc/CMakeLists.txt b/apps/sbc/CMakeLists.txt -index f9083b8..7201894 100644 ---- a/apps/sbc/CMakeLists.txt -+++ b/apps/sbc/CMakeLists.txt -@@ -1,6 +1,7 @@ - set (sbc_SRCS - HeaderFilter.cpp - ParamReplacer.cpp -+RTPParameters.cpp - RegexMapper.cpp - SBC.cpp - SBCCallProfile.cpp --- -1.7.10 - diff --git a/sems-0008-Change-default-msg_storage-path.patch b/sems-0008-Change-default-msg_storage-path.patch deleted file mode 100644 index 7d938c5..0000000 --- a/sems-0008-Change-default-msg_storage-path.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 94f6eefb1406c69943d18616a9933ae8685056d4 Mon Sep 17 00:00:00 2001 -From: Peter Lemenkov -Date: Thu, 24 Nov 2011 19:57:05 +0400 -Subject: [PATCH 08/14] Change default msg_storage path - -Signed-off-by: Peter Lemenkov ---- - apps/msg_storage/etc/msg_storage.conf.cmake | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/apps/msg_storage/etc/msg_storage.conf.cmake b/apps/msg_storage/etc/msg_storage.conf.cmake -index efab27f..dadf5d8 100644 ---- a/apps/msg_storage/etc/msg_storage.conf.cmake -+++ b/apps/msg_storage/etc/msg_storage.conf.cmake -@@ -5,4 +5,4 @@ - # - # default: /var/spool/voicebox/ - # --#storage_dir=/var/spool/voicebox/ -+storage_dir=/var/spool/sems/voicebox/ --- -1.7.10 - diff --git a/sems-0008-Fix-building-with-IPv6-support.patch b/sems-0008-Fix-building-with-IPv6-support.patch new file mode 100644 index 0000000..2d05113 --- /dev/null +++ b/sems-0008-Fix-building-with-IPv6-support.patch @@ -0,0 +1,26 @@ +From ad89c8cc396a6d1461a0fc6adb06585aafa3bc7f Mon Sep 17 00:00:00 2001 +From: Peter Lemenkov +Date: Thu, 19 Apr 2012 16:43:45 +0400 +Subject: [PATCH 08/10] Fix building with IPv6 support + +Signed-off-by: Peter Lemenkov +--- + core/AmRtpStream.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/core/AmRtpStream.cpp b/core/AmRtpStream.cpp +index bb2b0a4..be2ac9b 100644 +--- a/core/AmRtpStream.cpp ++++ b/core/AmRtpStream.cpp +@@ -159,7 +159,7 @@ void AmRtpStream::setLocalPort() + + l_port = port; + AmRtpReceiver::instance()->addStream(l_sd,this); +- DBG("added to RTP receiver (%s:%i)\n",get_addr_str(l_saddr.sin_addr).c_str(),l_port); ++ DBG("added to RTP receiver (%s:%i)\n",get_addr_str( ((struct sockaddr_in*)&l_saddr)->sin_addr ).c_str(),l_port); + } + + int AmRtpStream::ping() +-- +1.7.10 + diff --git a/sems-0009-Correct-version-number-in-CMake-files.patch b/sems-0009-Correct-version-number-in-CMake-files.patch new file mode 100644 index 0000000..a5b501b --- /dev/null +++ b/sems-0009-Correct-version-number-in-CMake-files.patch @@ -0,0 +1,26 @@ +From aec12cf6735e0731496f783a48ac94290f2cb71b Mon Sep 17 00:00:00 2001 +From: Peter Lemenkov +Date: Sat, 5 May 2012 12:36:51 +0400 +Subject: [PATCH 09/10] Correct version number in CMake-files + +Signed-off-by: Peter Lemenkov +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index a3264e3..1302857 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -14,7 +14,7 @@ PROJECT (SEMS) + + SET(SEMS_MAJOR_VERSION 1) + SET(SEMS_MINOR_VERSION 4) +-SET(SEMS_BUILD_VERSION 2) ++SET(SEMS_BUILD_VERSION 3) + SET(SEMS_EXTRA_VERSION dev) + + IF(EXISTS ${CMAKE_SOURCE_DIR}/.git) +-- +1.7.10 + diff --git a/sems-0009-Drop-privileges-for-SEMS-process.patch b/sems-0009-Drop-privileges-for-SEMS-process.patch deleted file mode 100644 index 8727ccc..0000000 --- a/sems-0009-Drop-privileges-for-SEMS-process.patch +++ /dev/null @@ -1,26 +0,0 @@ -From a5c352a314db3ccd9d93e5e84d331a180e90d7a7 Mon Sep 17 00:00:00 2001 -From: Peter Lemenkov -Date: Thu, 24 Nov 2011 23:51:59 +0400 -Subject: [PATCH 09/14] Drop privileges for SEMS process - -Signed-off-by: Peter Lemenkov ---- - 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 9e6080f..15e9847 100755 ---- a/pkg/rpm/sems.init -+++ b/pkg/rpm/sems.init -@@ -53,7 +53,7 @@ start() { - return 0 - fi - -- daemon $sems -P $pidfile -f $conffile $OPTIONS -+ daemon $sems -P $pidfile -u sems -g sems -f $conffile $OPTIONS - RETVAL=$? - echo - [ $RETVAL = 0 ] && touch $lockfile --- -1.7.10 - 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 new file mode 100644 index 0000000..916de11 --- /dev/null +++ b/sems-0010-Added-missing-etc-sysconfig-sems-file-to-the-pkg-rpm.patch @@ -0,0 +1,21 @@ +From e8a9f3e78f3310c42bb4e56de28ff9c91c79a1f0 Mon Sep 17 00:00:00 2001 +From: Peter Lemenkov +Date: Sat, 5 May 2012 12:50:33 +0400 +Subject: [PATCH 10/10] Added missing /etc/sysconfig/sems file to the pkg/rpm + +Signed-off-by: Peter Lemenkov +--- + pkg/rpm/sems.sysconfig | 1 + + 1 file changed, 1 insertion(+) + create mode 100644 pkg/rpm/sems.sysconfig + +diff --git a/pkg/rpm/sems.sysconfig b/pkg/rpm/sems.sysconfig +new file mode 100644 +index 0000000..9186ef7 +--- /dev/null ++++ b/pkg/rpm/sems.sysconfig +@@ -0,0 +1 @@ ++OPTIONS="" +-- +1.7.10 + diff --git a/sems-0010-Missing-include-for-close-FILE.patch b/sems-0010-Missing-include-for-close-FILE.patch deleted file mode 100644 index d3f7d1f..0000000 --- a/sems-0010-Missing-include-for-close-FILE.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 219a33b20daf2d3a76264be17551475f25e46509 Mon Sep 17 00:00:00 2001 -From: Peter Lemenkov -Date: Thu, 5 Apr 2012 15:11:18 +0400 -Subject: [PATCH 10/14] Missing include for close(FILE *) - -This will affects only gcc 4.7.0+ users. Others won't see any difference. - -Signed-off-by: Peter Lemenkov ---- - core/plug-in/stats/query_stats.cxx | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/core/plug-in/stats/query_stats.cxx b/core/plug-in/stats/query_stats.cxx -index 674f16c..10c498a 100644 ---- a/core/plug-in/stats/query_stats.cxx -+++ b/core/plug-in/stats/query_stats.cxx -@@ -7,6 +7,7 @@ - #include - #include - #include -+#include - - #include - #include --- -1.7.10 - diff --git a/sems-0011-Fix-c-p-typo-in-cmake-files.patch b/sems-0011-Fix-c-p-typo-in-cmake-files.patch deleted file mode 100644 index 7198788..0000000 --- a/sems-0011-Fix-c-p-typo-in-cmake-files.patch +++ /dev/null @@ -1,34 +0,0 @@ -From ea2971ca52ab14fe6c6564c7c342728a64b592ed Mon Sep 17 00:00:00 2001 -From: Peter Lemenkov -Date: Thu, 5 Apr 2012 16:58:28 +0400 -Subject: [PATCH 11/14] Fix c/p typo in cmake-files - -Signed-off-by: Peter Lemenkov ---- - cmake/FindLibev.cmake | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/cmake/FindLibev.cmake b/cmake/FindLibev.cmake -index fd90af6..5bf3504 100644 ---- a/cmake/FindLibev.cmake -+++ b/cmake/FindLibev.cmake -@@ -6,12 +6,12 @@ IF(LIBEV_INCLUDE_DIR AND LIBEV_LIBRARIES) - ENDIF(LIBEV_INCLUDE_DIR AND LIBEV_LIBRARIES) - - IF(LIBEV_FOUND) -- IF (NOT Speex_FIND_QUIETLY) -+ IF (NOT Libev_FIND_QUIETLY) - MESSAGE(STATUS "Found libev includes: ${LIBEV_INCLUDE_DIR}/libev/ev.h") - MESSAGE(STATUS "Found libev library: ${LIBEV_LIBRARIES}") -- ENDIF (NOT Speex_FIND_QUIETLY) -+ ENDIF (NOT Libev_FIND_QUIETLY) - ELSE(LIBEV_FOUND) -- IF (Speex_FIND_REQUIRED) -+ IF (Libev_FIND_REQUIRED) - MESSAGE(FATAL_ERROR "Could NOT find libev development files") -- ENDIF (Speex_FIND_REQUIRED) -+ ENDIF (Libev_FIND_REQUIRED) - ENDIF(LIBEV_FOUND) --- -1.7.10 - diff --git a/sems-0012-Add-systemd-related-files-to-the-pkg-rpm-dir.patch b/sems-0012-Add-systemd-related-files-to-the-pkg-rpm-dir.patch deleted file mode 100644 index 0df05ac..0000000 --- a/sems-0012-Add-systemd-related-files-to-the-pkg-rpm-dir.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 17daf3faecfcd9961311b6c5a79a4750a71ca090 Mon Sep 17 00:00:00 2001 -From: Peter Lemenkov -Date: Wed, 18 Apr 2012 21:51:48 +0400 -Subject: [PATCH 12/14] Add systemd-related files to the pkg/rpm dir - -Signed-off-by: Peter Lemenkov ---- - pkg/rpm/sems.systemd.service | 11 +++++++++++ - pkg/rpm/sems.systemd.tmpfiles.d.conf | 1 + - 2 files changed, 12 insertions(+) - create mode 100644 pkg/rpm/sems.systemd.service - create mode 100644 pkg/rpm/sems.systemd.tmpfiles.d.conf - -diff --git a/pkg/rpm/sems.systemd.service b/pkg/rpm/sems.systemd.service -new file mode 100644 -index 0000000..ffe2a60 ---- /dev/null -+++ b/pkg/rpm/sems.systemd.service -@@ -0,0 +1,11 @@ -+[Unit] -+Description=SIP Media Server -+After=network.target -+ -+[Service] -+Type=simple -+User=sems -+Group=sems -+EnvironmentFile=-/etc/sysconfig/sems -+PIDFile=/var/run/sems/sems.pid -+ExecStart=/usr/sbin/sems -E -u sems -g sems -P /var/run/sems/sems.pid $OPTIONS -diff --git a/pkg/rpm/sems.systemd.tmpfiles.d.conf b/pkg/rpm/sems.systemd.tmpfiles.d.conf -new file mode 100644 -index 0000000..d1428ea ---- /dev/null -+++ b/pkg/rpm/sems.systemd.tmpfiles.d.conf -@@ -0,0 +1 @@ -+d /var/run/sems 0755 sems sems --- -1.7.10 - diff --git a/sems-0013-Fix-building-with-IPv6-support.patch b/sems-0013-Fix-building-with-IPv6-support.patch deleted file mode 100644 index 632031f..0000000 --- a/sems-0013-Fix-building-with-IPv6-support.patch +++ /dev/null @@ -1,26 +0,0 @@ -From b2220e1acf15ed4af828473de29b4f0cd89ab497 Mon Sep 17 00:00:00 2001 -From: Peter Lemenkov -Date: Thu, 19 Apr 2012 16:43:45 +0400 -Subject: [PATCH 13/14] Fix building with IPv6 support - -Signed-off-by: Peter Lemenkov ---- - core/AmRtpStream.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/core/AmRtpStream.cpp b/core/AmRtpStream.cpp -index 651d19f..8a3aa1f 100644 ---- a/core/AmRtpStream.cpp -+++ b/core/AmRtpStream.cpp -@@ -159,7 +159,7 @@ void AmRtpStream::setLocalPort() - - l_port = port; - AmRtpReceiver::instance()->addStream(l_sd,this); -- DBG("added to RTP receiver (%s:%i)\n",get_addr_str(l_saddr.sin_addr).c_str(),l_port); -+ DBG("added to RTP receiver (%s:%i)\n",get_addr_str( ((struct sockaddr_in*)&l_saddr)->sin_addr ).c_str(),l_port); - } - - int AmRtpStream::ping() --- -1.7.10 - diff --git a/sems-0014-Add-Install-directive-for-systemd.patch b/sems-0014-Add-Install-directive-for-systemd.patch deleted file mode 100644 index 17bb604..0000000 --- a/sems-0014-Add-Install-directive-for-systemd.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 9920ee5c0062e306e6026a1af7d00853fb162b05 Mon Sep 17 00:00:00 2001 -From: Peter Lemenkov -Date: Fri, 27 Apr 2012 15:19:09 +0400 -Subject: [PATCH 14/14] Add [Install] directive for systemd - -Signed-off-by: Peter Lemenkov ---- - 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 ffe2a60..7d66886 100644 ---- a/pkg/rpm/sems.systemd.service -+++ b/pkg/rpm/sems.systemd.service -@@ -9,3 +9,6 @@ Group=sems - EnvironmentFile=-/etc/sysconfig/sems - PIDFile=/var/run/sems/sems.pid - ExecStart=/usr/sbin/sems -E -u sems -g sems -P /var/run/sems/sems.pid $OPTIONS -+ -+[Install] -+WantedBy=multi-user.target --- -1.7.10 - diff --git a/sems.spec b/sems.spec index 03b6078..b53b8e2 100644 --- a/sems.spec +++ b/sems.spec @@ -1,10 +1,9 @@ Summary: SIP Express Media Server, an extensible SIP media server Name: sems -Version: 1.4.2 -Release: 6%{?dist} +Version: 1.4.3 +Release: 1%{?dist} URL: http://www.iptel.org/sems Source0: http://ftp.iptel.org/pub/%{name}/%{name}-%{version}.tar.gz -Source1: %{name}.sysconfig %if 0%{?fedora} > 14 BuildRequires: systemd-units %endif @@ -23,22 +22,14 @@ Patch4: sems-0004-Disable-mysql-in-conference-and-early_announce-modul.patch Patch5: sems-0005-Add-sw_prepaid_sip-plugin-to-default-exclude-list-du.patch # Fedora-specific Patch6: sems-0006-Don-t-start-py_sems-by-default.patch -# Applied upstream -Patch7: sems-0007-Fix-unresolved-symbol-in-sbc-module-when-compiled-wi.patch # Will be proposed for inclusion in upstream -Patch8: sems-0008-Change-default-msg_storage-path.patch -# Applied upstream -Patch9: sems-0009-Drop-privileges-for-SEMS-process.patch -# Applied upstream -Patch10: sems-0010-Missing-include-for-close-FILE.patch -# Applied upstream -Patch11: sems-0011-Fix-c-p-typo-in-cmake-files.patch -# Applied upstream -Patch12: sems-0012-Add-systemd-related-files-to-the-pkg-rpm-dir.patch +Patch7: sems-0007-Change-default-msg_storage-path.patch # Already fixed upstream in 1.5.x -Patch13: sems-0013-Fix-building-with-IPv6-support.patch -# Applied upstream -Patch14: sems-0014-Add-Install-directive-for-systemd.patch +Patch8: sems-0008-Fix-building-with-IPv6-support.patch +# Will be proposed for inclusion in upstream +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 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: python >= 2.3 @@ -229,14 +220,10 @@ 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 .dont_start_py_sems -%patch7 -p1 -b .add_missing_symbol -%patch8 -p1 -b .fix_defauls_msg_storage_path -%patch9 -p1 -b .drop_privileges -%patch10 -p1 -b .missing_include -%patch11 -p1 -b .typo -%patch12 -p1 -b .systemd_files -%patch13 -p1 -b .ipv6 -%patch14 -p1 -b .fix_systemd_install +%patch7 -p1 -b .fix_defauls_msg_storage_path +%patch8 -p1 -b .ipv6 +%patch9 -p1 -b .ver_typo +%patch10 -p1 -b .sysconfig iconv -f iso8859-1 -t UTF-8 doc/Readme.diameter_client.txt > doc/Readme.diameter_client.utf8 && mv doc/Readme.diameter_client.{utf8,txt} @@ -266,7 +253,7 @@ make %{?_smp_mflags} rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT -install -D -m 0644 -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/%{name} +install -D -m 0644 -p pkg/rpm/sems.sysconfig $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/%{name} %if 0%{?fedora} > 14 # install systemd files @@ -691,6 +678,10 @@ fi %{_libdir}/%{name}/plug-in/xmlrpc2di.so %changelog +* Sat May 05 2012 Peter Lemenkov - 1.4.3-1 +- Ver. 1.4.3 (bugfix release in 1.4.x branch) +- Dropped upstreamed patches + * Fri Apr 27 2012 Peter Lemenkov - 1.4.2-6 - Fixed systemd installation - Enabled IPv6 (see rhbz #814229) diff --git a/sems.sysconfig b/sems.sysconfig deleted file mode 100644 index 9186ef7..0000000 --- a/sems.sysconfig +++ /dev/null @@ -1 +0,0 @@ -OPTIONS="" diff --git a/sources b/sources index 2b52531..be7be7e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6c3fb1330df6690404565220f5115d61 sems-1.4.2.tar.gz +1f193eacc9ca6685fc69938d62b85d72 sems-1.4.3.tar.gz