[asterisk-commits] bebuild: tag 11.2.1 r379889 - in /tags/11.2.1: ./ contrib/init.d/ contrib/scr...
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Tue Jan 22 12:57:12 CST 2013
Author: bebuild
Date: Tue Jan 22 12:57:06 2013
New Revision: 379889
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=379889
Log:
Merge 378984,379513,379790 for 11.2.1
Removed:
tags/11.2.1/asterisk-11.2.0-summary.html
tags/11.2.1/asterisk-11.2.0-summary.txt
Modified:
tags/11.2.1/ (props changed)
tags/11.2.1/.version
tags/11.2.1/ChangeLog
tags/11.2.1/UPGRADE.txt
tags/11.2.1/contrib/init.d/rc.archlinux.asterisk
tags/11.2.1/contrib/init.d/rc.debian.asterisk
tags/11.2.1/contrib/init.d/rc.gentoo.asterisk
tags/11.2.1/contrib/init.d/rc.mandriva.asterisk
tags/11.2.1/contrib/init.d/rc.redhat.asterisk
tags/11.2.1/contrib/init.d/rc.slackware.asterisk
tags/11.2.1/contrib/init.d/rc.suse.asterisk
tags/11.2.1/contrib/scripts/safe_asterisk
tags/11.2.1/main/asterisk.c
tags/11.2.1/res/res_rtp_asterisk.c
Propchange: tags/11.2.1/
------------------------------------------------------------------------------
branch-1.8-blocked = /branches/1.8:379091
Propchange: tags/11.2.1/
------------------------------------------------------------------------------
--- branch-1.8-merged (original)
+++ branch-1.8-merged Tue Jan 22 12:57:06 2013
@@ -1,1 +1,1 @@
-/branches/1.8:1-378147,378164,378356,378375,378427,378455-378456,378486,378514,378554,378591
+/branches/1.8:1-378147,378164,378356,378375,378427,378455-378456,378486,378514,378554,378591,378733,378776,378933,378967,379001,379145,379178,379226,379276,379310,379342,379392,379547,379608,379718
Propchange: tags/11.2.1/
------------------------------------------------------------------------------
Binary property 'branch-10-merged' - no diff available.
Propchange: tags/11.2.1/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 22 12:57:06 2013
@@ -1,1 +1,1 @@
-/branches/11:378038,378287,378321,378409-378411,378582,378687,378690
+/branches/11:378038,378287,378321,378409-378411,378582,378687,378690,378984,379513,379790
Modified: tags/11.2.1/.version
URL: http://svnview.digium.com/svn/asterisk/tags/11.2.1/.version?view=diff&rev=379889&r1=379888&r2=379889
==============================================================================
--- tags/11.2.1/.version (original)
+++ tags/11.2.1/.version Tue Jan 22 12:57:06 2013
@@ -1,1 +1,1 @@
-11.2.0
+11.2.1
Modified: tags/11.2.1/ChangeLog
URL: http://svnview.digium.com/svn/asterisk/tags/11.2.1/ChangeLog?view=diff&rev=379889&r1=379888&r2=379889
==============================================================================
--- tags/11.2.1/ChangeLog (original)
+++ tags/11.2.1/ChangeLog Tue Jan 22 12:57:06 2013
@@ -1,3 +1,70 @@
+2013-01-22 Asterisk Development Team <asteriskteam at digium.com>
+
+ * Asterisk 11.2.1 Released.
+
+ * Fix astcanary startup problem due to wrong pid value from before daemon
+ call
+
+ When Asterisk forks itself into the background via a call to daemon, it must
+ re-set the pid value of the new process. Otherwise, astcanary gets the pid
+ value of the process before the fork, which prevents it from running.
+ Asterisk eventually starts lowering its priority, as it can no longer
+ communicate with the proverbial canary in the coal mine.
+
+ This patch ensures that the correct process identifier is used by astcanary.
+
+ (closes issue ASTERISK-20947)
+ Reported by: Jakob Hirsch
+ Tested by: mjordan
+ patches:
+ asterisk-10.12.0.astcanary_ppid.diff uploaded by Jakob Hirsch (license 6113)
+
+ * Update init.d scripts to handle stderr; readd splash screen for remote
+ consoles
+
+ When r376428 was commited to re-order start up sequences to be more tolerant
+ of forking with thread primitives, a few items were changed that caused
+ changes in behavior on some distros. This includes:
+
+ * Not displaying the splash screen on a remote console.
+ * Displaying an error message on stderr when a remote console cannot
+ connect to a running instance of Asterisk.
+
+ In the first case, the splash screen was re-added (thanks to Michael L.
+ Young).
+ In the second case, the various init.d scripts were modified to pipe
+ stderr to /dev/null, as the error message is useful - if you execute a
+ remote console or a remote console command execution and it fail, it
+ should tell you. Note that the error message was always present, it just
+ failed to be printed prior to r376428.
+
+ Much thanks to the folks who quickly reported this problem, provided
+ solutions, and promptly tested the various init.d scripts on a variety of
+ distros.
+
+ (closes issue ASTERISK-20945)
+ Reported by: Warren Selby
+ Tested by: Michael L. Young, Jamuel Starkey, kaldemar, Danny Nicholas, mjordan
+ patches:
+ asterisk-20945-remote-intro-msg.diff uploaded by elguero (license 5026)
+ ASTERISK-20945-1.8-mjordan.diff uploaded by mjordan (license 6283)
+
+
+ * Reset RTP timestamp; sequence number on SSRC change
+
+ In r370252 for ASTERISK-18404, Asterisk's handling of RTP was
+ modified to better account for out of order RTP packets. This was
+ accomplished by using the RTP timestamp and sequence number to check
+ for out of order packets. However, when a SSRC change occurs, the
+ timestamp and sequence number will no longer have any relation to the
+ previously received packets. The variables tracking the timestamp and
+ sequence number therefore have to be reset.
+
+ (closes issue ASTERISK-20906)
+ Reported by: Eelco Brolman
+ patches:
+ dtmf_on_hold.patch uploaded by Eelco Brolman (license #6442)
+
2013-01-14 Asterisk Development Team <asteriskteam at digium.com>
* Asterisk 11.2.0 Released.
Modified: tags/11.2.1/UPGRADE.txt
URL: http://svnview.digium.com/svn/asterisk/tags/11.2.1/UPGRADE.txt?view=diff&rev=379889&r1=379888&r2=379889
==============================================================================
--- tags/11.2.1/UPGRADE.txt (original)
+++ tags/11.2.1/UPGRADE.txt Tue Jan 22 12:57:06 2013
@@ -19,6 +19,16 @@
=== UPGRADE-10.txt -- Upgrade info for 1.8 to 10
===
===========================================================
+
+From 11.2.0 to 11.2.1:
+
+* Asterisk would previously not output certain error messages when a remote
+ console attempted to connect to Asterisk and no instance of Asterisk was
+ running. This error message is displayed on stderr; as a result, some
+ initialization scripts that used remote consoles to test for the presence
+ of a running Asterisk instance started to display erroneous error messages.
+ The init.d scripts and the safe_asterisk have been updated in the contrib
+ folder to account for this.
From 11.1 to 11.2:
Modified: tags/11.2.1/contrib/init.d/rc.archlinux.asterisk
URL: http://svnview.digium.com/svn/asterisk/tags/11.2.1/contrib/init.d/rc.archlinux.asterisk?view=diff&rev=379889&r1=379888&r2=379889
==============================================================================
--- tags/11.2.1/contrib/init.d/rc.archlinux.asterisk (original)
+++ tags/11.2.1/contrib/init.d/rc.archlinux.asterisk Tue Jan 22 12:57:06 2013
@@ -33,7 +33,7 @@
if [ -x $DAEMON ]; then
# Check if Asterisk is already running. If it is, then bug out, because
# starting safe_asterisk when Asterisk is running is very bad.
- VERSION=`${DAEMON} -rx 'core show version'`
+ VERSION=`${DAEMON} -rx 'core show version' 2>/dev/null`
if [ "`echo $VERSION | cut -c 1-8`" = "Asterisk" ]; then
echo "Asterisk is already running. $0 will exit now."
exit 1
Modified: tags/11.2.1/contrib/init.d/rc.debian.asterisk
URL: http://svnview.digium.com/svn/asterisk/tags/11.2.1/contrib/init.d/rc.debian.asterisk?view=diff&rev=379889&r1=379888&r2=379889
==============================================================================
--- tags/11.2.1/contrib/init.d/rc.debian.asterisk (original)
+++ tags/11.2.1/contrib/init.d/rc.debian.asterisk Tue Jan 22 12:57:06 2013
@@ -66,7 +66,7 @@
start)
# Check if Asterisk is already running. If it is, then bug out, because
# starting up Asterisk when Asterisk is already running is very bad.
- VERSION=`${DAEMON} -rx 'core show version' || ${TRUE}`
+ VERSION=`${DAEMON} -rx 'core show version' 2>/dev/null || ${TRUE}`
if [ "`echo $VERSION | cut -c 1-8`" = "Asterisk" ]; then
echo "Asterisk is already running. $0 will exit now."
exit 0
Modified: tags/11.2.1/contrib/init.d/rc.gentoo.asterisk
URL: http://svnview.digium.com/svn/asterisk/tags/11.2.1/contrib/init.d/rc.gentoo.asterisk?view=diff&rev=379889&r1=379888&r2=379889
==============================================================================
--- tags/11.2.1/contrib/init.d/rc.gentoo.asterisk (original)
+++ tags/11.2.1/contrib/init.d/rc.gentoo.asterisk Tue Jan 22 12:57:06 2013
@@ -20,7 +20,7 @@
start() {
# Check if Asterisk is already running. If it is, then bug out, because
# starting safe_asterisk when Asterisk is running is very bad.
- VERSION=`${ASTSBINDIR}/asterisk -rx 'core show version'`
+ VERSION=`${ASTSBINDIR}/asterisk -rx 'core show version' 2>/dev/null`
if [ "`echo $VERSION | cut -c 1-8`" = "Asterisk" ]; then
echo "Asterisk is already running. $0 will exit now."
exit 1
Modified: tags/11.2.1/contrib/init.d/rc.mandriva.asterisk
URL: http://svnview.digium.com/svn/asterisk/tags/11.2.1/contrib/init.d/rc.mandriva.asterisk?view=diff&rev=379889&r1=379888&r2=379889
==============================================================================
--- tags/11.2.1/contrib/init.d/rc.mandriva.asterisk (original)
+++ tags/11.2.1/contrib/init.d/rc.mandriva.asterisk Tue Jan 22 12:57:06 2013
@@ -135,7 +135,7 @@
start)
# Check if Asterisk is already running. If it is, then bug out, because
# starting Asterisk when Asterisk is already running is very bad.
- VERSION=`${ASTSBINDIR}/asterisk -rx 'core show version'`
+ VERSION=`${ASTSBINDIR}/asterisk -rx 'core show version' 2>/dev/null`
if [ "`echo $VERSION | cut -c 1-8`" = "Asterisk" ]; then
echo "Asterisk is already running. $0 will exit now."
exit 1
Modified: tags/11.2.1/contrib/init.d/rc.redhat.asterisk
URL: http://svnview.digium.com/svn/asterisk/tags/11.2.1/contrib/init.d/rc.redhat.asterisk?view=diff&rev=379889&r1=379888&r2=379889
==============================================================================
--- tags/11.2.1/contrib/init.d/rc.redhat.asterisk (original)
+++ tags/11.2.1/contrib/init.d/rc.redhat.asterisk Tue Jan 22 12:57:06 2013
@@ -71,7 +71,7 @@
start() {
# Check if Asterisk is already running. If it is, then bug out, because
# starting safe_asterisk when Asterisk is running is very bad.
- VERSION=`${AST_SBIN}/asterisk -rx 'core show version'`
+ VERSION=`${AST_SBIN}/asterisk -rx 'core show version' 2>/dev/null`
if [ "`echo $VERSION | cut -c 1-8`" = "Asterisk" ]; then
echo "Asterisk is already running."
exit 0
Modified: tags/11.2.1/contrib/init.d/rc.slackware.asterisk
URL: http://svnview.digium.com/svn/asterisk/tags/11.2.1/contrib/init.d/rc.slackware.asterisk?view=diff&rev=379889&r1=379888&r2=379889
==============================================================================
--- tags/11.2.1/contrib/init.d/rc.slackware.asterisk (original)
+++ tags/11.2.1/contrib/init.d/rc.slackware.asterisk Tue Jan 22 12:57:06 2013
@@ -24,7 +24,7 @@
if [ -x /usr/sbin/asterisk ]; then
# Check if Asterisk is already running. If it is, then bug out, because
# starting safe_asterisk when Asterisk is running is very bad.
- VERSION=`/usr/sbin/asterisk -rx 'core show version'`
+ VERSION=`/usr/sbin/asterisk -rx 'core show version' 2>/dev/null`
if [ "`echo $VERSION | cut -c 1-8`" = "Asterisk" ]; then
echo "Asterisk is already running. $0 will exit now."
exit 1
Modified: tags/11.2.1/contrib/init.d/rc.suse.asterisk
URL: http://svnview.digium.com/svn/asterisk/tags/11.2.1/contrib/init.d/rc.suse.asterisk?view=diff&rev=379889&r1=379888&r2=379889
==============================================================================
--- tags/11.2.1/contrib/init.d/rc.suse.asterisk (original)
+++ tags/11.2.1/contrib/init.d/rc.suse.asterisk Tue Jan 22 12:57:06 2013
@@ -78,7 +78,7 @@
# Check if Asterisk is already running. If it is, then bug out, because
# starting Asterisk when Asterisk is already running is very bad.
- VERSION=`/usr/sbin/asterisk -rx 'core show version'`
+ VERSION=`/usr/sbin/asterisk -rx 'core show version' 2>/dev/null`
if [ "`echo $VERSION | cut -c 1-8`" = "Asterisk" ]; then
echo "Asterisk is already running. $0 will exit now."
exit 1
Modified: tags/11.2.1/contrib/scripts/safe_asterisk
URL: http://svnview.digium.com/svn/asterisk/tags/11.2.1/contrib/scripts/safe_asterisk?view=diff&rev=379889&r1=379888&r2=379889
==============================================================================
--- tags/11.2.1/contrib/scripts/safe_asterisk (original)
+++ tags/11.2.1/contrib/scripts/safe_asterisk Tue Jan 22 12:57:06 2013
@@ -49,7 +49,7 @@
# Check if Asterisk is already running. If it is, then bug out, because
# starting safe_asterisk when Asterisk is running is very bad.
-VERSION=`${ASTSBINDIR}/asterisk -nrx 'core show version'`
+VERSION=`${ASTSBINDIR}/asterisk -nrx 'core show version' 2>/dev/null`
if test "`echo $VERSION | cut -c 1-8`" = "Asterisk" ; then
message "Asterisk is already running. $0 will exit now."
exit 1
Modified: tags/11.2.1/main/asterisk.c
URL: http://svnview.digium.com/svn/asterisk/tags/11.2.1/main/asterisk.c?view=diff&rev=379889&r1=379888&r2=379889
==============================================================================
--- tags/11.2.1/main/asterisk.c (original)
+++ tags/11.2.1/main/asterisk.c Tue Jan 22 12:57:06 2013
@@ -3472,7 +3472,7 @@
static void print_intro_message(const char *runuser, const char *rungroup)
{
- if (ast_opt_console || option_verbose) {
+ if (ast_opt_console || option_verbose || (ast_opt_remote && !ast_opt_exec)) {
if (ast_register_verbose(console_verboser)) {
fprintf(stderr, "Unable to register console verboser?\n");
return;
@@ -3893,6 +3893,8 @@
#ifndef HAVE_SBIN_LAUNCHD
if (daemon(1, 0) < 0) {
fprintf(stderr, "daemon() failed: %s\n", strerror(errno));
+ } else {
+ ast_mainpid = getpid();
}
#else
fprintf(stderr, "Mac OS X detected. Use 'launchctl load /Library/LaunchDaemon/org.asterisk.asterisk.plist'.\n");
@@ -3944,11 +3946,10 @@
}
/* Blindly write the PID file. */
- ast_mainpid = getpid();
unlink(ast_config_AST_PID);
f = fopen(ast_config_AST_PID, "w");
if (f) {
- fprintf(f, "%ld\n", (long)getpid());
+ fprintf(f, "%ld\n", (long)ast_mainpid);
fclose(f);
} else {
fprintf(stderr, "Unable to open pid file '%s': %s\n", ast_config_AST_PID, strerror(errno));
Modified: tags/11.2.1/res/res_rtp_asterisk.c
URL: http://svnview.digium.com/svn/asterisk/tags/11.2.1/res/res_rtp_asterisk.c?view=diff&rev=379889&r1=379888&r2=379889
==============================================================================
--- tags/11.2.1/res/res_rtp_asterisk.c (original)
+++ tags/11.2.1/res/res_rtp_asterisk.c Tue Jan 22 12:57:06 2013
@@ -3584,6 +3584,9 @@
f = ast_frisolate(&srcupdate);
AST_LIST_INSERT_TAIL(&frames, f, frame_list);
+
+ rtp->last_seqno = 0;
+ rtp->last_end_timestamp = 0;
}
rtp->rxssrc = ssrc;
More information about the asterisk-commits
mailing list