[asterisk-commits] rmudgett: branch rmudgett/cid r266572 - in /team/rmudgett/cid: ./ contrib/ini...

Mon May 31 12:50:56 CDT 2010

Author: rmudgett
Date: Mon May 31 12:50:54 2010
New Revision: 266572

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=266572
Log:
Merged revisions 266385-266386,266438,266522 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
  r266385 | tilghman | 2010-05-28 17:50:06 -0500 (Fri, 28 May 2010) | 8 lines
  
  Setup environment variables for the benefit of child processes and disallow changing them.
  
  (closes issue #14899)
   Reported by: jmls
   Patches: 
         20090916__issue14899.diff.txt uploaded by tilghman (license 14)
   Tested by: jmls
................
  r266386 | twilson | 2010-05-28 17:54:03 -0500 (Fri, 28 May 2010) | 9 lines
  
  Fix ical library handling (again)
  
  Newer versions of libical (which we require) store the header file in a
  libical/ subfolder and include an ical.h file that does a #warning for
  deprecation and then #includes <libical/ical.h>. Since we now test for
  libical/ical.h, we can change the #includes back to <libical/ical.h> and
  remove the test which specifically adds /usr/include/libical as an include
  directory.
................
  r266438 | tilghman | 2010-05-29 23:44:28 -0500 (Sat, 29 May 2010) | 9 lines
  
  Merged revisions 266437 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r266437 | tilghman | 2010-05-29 23:43:28 -0500 (Sat, 29 May 2010) | 2 lines
    
    Reverting patch and reopening issue #16784, as patch breaks color display.
  ........
................
  r266522 | tilghman | 2010-05-30 15:18:03 -0500 (Sun, 30 May 2010) | 2 lines
  
  Needs to be wrapped in <para>
................

Modified:
    team/rmudgett/cid/   (props changed)
    team/rmudgett/cid/UPGRADE.txt
    team/rmudgett/cid/configure
    team/rmudgett/cid/configure.ac
    team/rmudgett/cid/contrib/init.d/rc.debian.asterisk
    team/rmudgett/cid/funcs/func_env.c
    team/rmudgett/cid/main/asterisk.c
    team/rmudgett/cid/res/res_calendar_caldav.c
    team/rmudgett/cid/res/res_calendar_icalendar.c

Propchange: team/rmudgett/cid/
------------------------------------------------------------------------------
    automerge = *

Propchange: team/rmudgett/cid/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Propchange: team/rmudgett/cid/
------------------------------------------------------------------------------

--- cid-integrated (original)
+++ cid-integrated Mon May 31 12:50:54 2010
@@ -1,1 +1,1 @@
-/trunk:1-266366
+/trunk:1-266571

Modified: team/rmudgett/cid/UPGRADE.txt
URL: http://svnview.digium.com/svn/asterisk/team/rmudgett/cid/UPGRADE.txt?view=diff&rev=266572&r1=266571&r2=266572
==============================================================================
--- team/rmudgett/cid/UPGRADE.txt (original)
+++ team/rmudgett/cid/UPGRADE.txt Mon May 31 12:50:54 2010
@@ -84,6 +84,9 @@
 
 * The CALLERPRES() dialplan function is deprecated in favor of
   CALLERID(num-pres) and CALLERID(name-pres).
+
+* Environment variables that start with "AST_" are reserved to the system and
+  may no longer be set from the dialplan.
 
 From 1.6.1 to 1.6.2:
 

Modified: team/rmudgett/cid/configure.ac
URL: http://svnview.digium.com/svn/asterisk/team/rmudgett/cid/configure.ac?view=diff&rev=266572&r1=266571&r2=266572
==============================================================================
--- team/rmudgett/cid/configure.ac (original)
+++ team/rmudgett/cid/configure.ac Mon May 31 12:50:54 2010
@@ -924,9 +924,6 @@
 
 # Some distributions (like RedHat) add a libical subdirectory for the headers
 AST_EXT_LIB_CHECK([ICAL], [ical], [icaltimezone_get_utc_timezone], [libical/ical.h], [${PTHREAD_LIBS}], [${PTHREAD_CFLAGS}])
-if test x"${PBX_ICAL}" = x1; then
-	ICAL_INCLUDE+=" -I/usr/include/libical"
-fi
 
 AST_EXT_LIB_CHECK([ICAL], [ical], [icaltimezone_new], [ical.h], [${PTHREAD_LIBS}], [${PTHREAD_CFLAGS}])
 

Modified: team/rmudgett/cid/contrib/init.d/rc.debian.asterisk
URL: http://svnview.digium.com/svn/asterisk/team/rmudgett/cid/contrib/init.d/rc.debian.asterisk?view=diff&rev=266572&r1=266571&r2=266572
==============================================================================
--- team/rmudgett/cid/contrib/init.d/rc.debian.asterisk (original)
+++ team/rmudgett/cid/contrib/init.d/rc.debian.asterisk Mon May 31 12:50:54 2010
@@ -111,7 +111,7 @@
 	# "start-stop-daemon --oknodo" returns 0 even if Asterisk was already running (as LSB expects):
 	if test "x$COLOR" = "xyes" ; then
 		export TERM=linux
-		start-stop-daemon --start --oknodo --background --exec $DAEMON -- $ASTARGS
+		start-stop-daemon --start --oknodo --background --exec $DAEMON -- $ASTARGS -c
 	else
 		start-stop-daemon --start --oknodo --exec $DAEMON -- $ASTARGS
 	fi

Modified: team/rmudgett/cid/funcs/func_env.c
URL: http://svnview.digium.com/svn/asterisk/team/rmudgett/cid/funcs/func_env.c?view=diff&rev=266572&r1=266571&r2=266572
==============================================================================
--- team/rmudgett/cid/funcs/func_env.c (original)
+++ team/rmudgett/cid/funcs/func_env.c Mon May 31 12:50:54 2010
@@ -44,6 +44,7 @@
 			</parameter>
 		</syntax>
 		<description>
+			<para>Variables starting with <literal>AST_</literal> are reserved to the system and may not be set.</para>
 		</description>
 	</function>
 	<function name="STAT" language="en_US">
@@ -106,7 +107,7 @@
 static int env_write(struct ast_channel *chan, const char *cmd, char *data,
 		     const char *value)
 {
-	if (!ast_strlen_zero(data)) {
+	if (!ast_strlen_zero(data) && strncmp(data, "AST_", 4)) {
 		if (!ast_strlen_zero(value)) {
 			setenv(data, value, 1);
 		} else {

Modified: team/rmudgett/cid/main/asterisk.c
URL: http://svnview.digium.com/svn/asterisk/team/rmudgett/cid/main/asterisk.c?view=diff&rev=266572&r1=266571&r2=266572
==============================================================================
--- team/rmudgett/cid/main/asterisk.c (original)
+++ team/rmudgett/cid/main/asterisk.c Mon May 31 12:50:54 2010
@@ -3128,6 +3128,18 @@
 	ast_config_destroy(cfg);
 }
 
+static void env_init(void)
+{
+	setenv("AST_SYSTEMNAME", ast_config_AST_SYSTEM_NAME, 1);
+	setenv("AST_BUILD_HOST", ast_build_hostname, 1);
+	setenv("AST_BUILD_DATE", ast_build_date, 1);
+	setenv("AST_BUILD_KERNEL", ast_build_kernel, 1);
+	setenv("AST_BUILD_MACHINE", ast_build_machine, 1);
+	setenv("AST_BUILD_OS", ast_build_os, 1);
+	setenv("AST_BUILD_USER", ast_build_user, 1);
+	setenv("AST_VERSION", ast_get_version(), 1);
+}
+
 int main(int argc, char *argv[])
 {
 	int c;
@@ -3314,6 +3326,7 @@
 	}
 
 	ast_readconfig();
+	env_init();
 
 	if (ast_opt_remote && remotesock != NULL)
 		ast_copy_string((char *) cfg_paths.socket_path, remotesock, sizeof(cfg_paths.socket_path));

Modified: team/rmudgett/cid/res/res_calendar_caldav.c
URL: http://svnview.digium.com/svn/asterisk/team/rmudgett/cid/res/res_calendar_caldav.c?view=diff&rev=266572&r1=266571&r2=266572
==============================================================================
--- team/rmudgett/cid/res/res_calendar_caldav.c (original)
+++ team/rmudgett/cid/res/res_calendar_caldav.c Mon May 31 12:50:54 2010
@@ -29,7 +29,7 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <ical.h>
+#include <libical/ical.h>
 #include <ne_session.h>
 #include <ne_uri.h>
 #include <ne_request.h>

Modified: team/rmudgett/cid/res/res_calendar_icalendar.c
URL: http://svnview.digium.com/svn/asterisk/team/rmudgett/cid/res/res_calendar_icalendar.c?view=diff&rev=266572&r1=266571&r2=266572
==============================================================================
--- team/rmudgett/cid/res/res_calendar_icalendar.c (original)
+++ team/rmudgett/cid/res/res_calendar_icalendar.c Mon May 31 12:50:54 2010
@@ -28,7 +28,7 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <ical.h>
+#include <libical/ical.h>
 #include <ne_session.h>
 #include <ne_uri.h>
 #include <ne_request.h>


