importing files for 1.2.7.1-netsec release

git-svn-id: https://origsvn.digium.com/svn/asterisk/tags/1.2.7.1-netsec@19821 65c4cc65-6c06-0410-ace0-fbb531ad65f3

.version

@@ -1 +1 @@
-1.2.7-netsec
+1.2.7.1-netsec

CREDITS

@@ -87,7 +87,7 @@ Leif Madsen, Jared Smith and Jim van Meggelen - the Asterisk book
 	available under a Creative Commons License at http://www.asteriskdocs.org
 
 === HOLD MUSIC ===
-Music provided by www.opsound.org
+Music provided by www.freeplaymusic.com
 
 === OTHER SOURCE CODE IN ASTERISK ===
 

ChangeLog

@@ -1,3 +1,18 @@
+2006-04-13 Kevin P. Fleming <kpfleming@digium.com>
+
+	* Asterisk 1.2.7.1 released
+
+2006-04-13 17:40 +0000 [r19812]  Kevin P. Fleming <kpfleming@digium.com>
+
+	* apps/app_page.c: oops... let's not set a variable and then
+	  immediately overwrite it while assuming its old value will
+	  magically return
+
+2006-04-13 15:56 +0000 [r19768]  Tilghman Lesher <tilghman@mail.jeffandtilghman.com>
+
+	* pbx.c: Bug 6957 - variable names beginning with CALLERID weren't
+	  substituted correctly
+
 2006-04-12 Kevin P. Fleming <kpfleming@digium.com>
 
 	* Asterisk 1.2.7 released

README.fpm

@@ -0,0 +1,8 @@
+About Hold Music
+================
+Digium has licensed the music included with
+the Asterisk distribution From FreePlayMusic
+for use and distribution with Asterisk.  It
+is licensed ONLY for use as hold music within
+an Asterisk based PBX.
+

README.opsound

@@ -1,22 +0,0 @@
-About Hold Music
-================
-These files were obtained from http://opsound.org, where the authors placed them
-under the Creative Commons Attribution-Share Alike 2.5 license, a copy of which
-may be found at http://creativecommons.org.
-
-Credits
-================
-macroform-cold_day - Paul Shuler (Macroform)
-paulshuler@gmail.com - http://macroform.bandcamp.com/
-
-macroform-robot_dity - Paul Shuler (Macroform)
-paulshuler@gmail.com - http://macroform.bandcamp.com/
-
-macroform-the_simplicity - Paul Shuler (Macroform)
-paulshuler@gmail.com - http://macroform.bandcamp.com/
-
-manolo_camp-morning_coffee - Manolo Camp
-beatbastard@gmx.net - http://ccmixter.org/people/ManoloCamp
-
-reno_project-system - Reno Project
-renoproject@hotmail.com - http://www.jamendo.com/en/album/23661

apps/app_page.c

@@ -171,16 +171,16 @@ static int page_exec(struct ast_channel *chan, void *data)
 		return -1;
 	}
 
+	ast_copy_string(originator, chan->name, sizeof(originator));
+	if ((tmp = strchr(originator, '-')))
+		*tmp = '\0';
+
 	tmp = strsep(&options, "|");
 	if (options)
 		ast_app_parse_options(page_opts, &flags, NULL, options);
 
 	snprintf(meetmeopts, sizeof(meetmeopts), "%ud|%sqxdw", confid, ast_test_flag(&flags, PAGE_DUPLEX) ? "" : "m");
 
-	ast_copy_string(originator, chan->name, sizeof(originator));
-	if ((tmp = strchr(originator, '-')))
-		*tmp = '\0';
-
 	while ((tech = strsep(&tmp, "&"))) {
 		/* don't call the originating device */
 		if (!strcasecmp(tech, originator))

pbx.c

@@ -1023,7 +1023,8 @@ void pbx_retrieve_variable(struct ast_channel *c, const char *var, char **ret, c
 						*ret = workspace;
 					} else
 						*ret = NULL;
-				}
+				} else
+					goto icky;
 			} else if (!strcmp(var + 6, "ANI")) {
 				/* CALLERANI */
 				if (c->cid.cid_ani) {