Convert all release tags to Opsound music-on-hold.

For more details:
http://blogs.digium.com/2009/08/18/asterisk-music-on-hold-changes/



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

.version

@@ -1 +1 @@
-1.2.26.1
+1.2.26

CREDITS

@@ -95,7 +95,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.freeplaymusic.com
+Music provided by www.opsound.org
 
 === OTHER SOURCE CODE IN ASTERISK ===
 

ChangeLog

@@ -1,15 +1,3 @@
-2007-12-20  Russell Bryant <russell@digium.com>
-
-	* Asterisk 1.2.26.1 released
-
-2007-12-20 20:21 +0000 [r94214-94255]  Russell Bryant <russell@digium.com>
-
-	* channels/chan_iax2.c: Fix another potential seg fault ... (closes
-	  issue #11606) Reported by: dimas
-
-	* channels/chan_iax2.c: Fix a couple of places where it's possible
-	  to dereference a NULL pointer.
-
 2007-12-18  Russell Bryant <russell@digium.com>
 
 	* Asterisk 1.2.26 released

README.fpm

@@ -1,8 +0,0 @@
-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

@@ -0,0 +1,22 @@
+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

channels/chan_iax2.c

@@ -2620,7 +2620,7 @@ static void realtime_update_peer(const char *peername, struct sockaddr_in *sin,
 
 static struct iax2_peer *realtime_peer(const char *peername, struct sockaddr_in *sin)
 {
-	struct ast_variable *var = NULL;
+	struct ast_variable *var;
 	struct ast_variable *tmp;
 	struct iax2_peer *peer=NULL;
 	time_t regseconds, nowtime;
@@ -2629,7 +2629,7 @@ static struct iax2_peer *realtime_peer(const char *peername, struct sockaddr_in
 
 	if (peername) {
 		var = ast_load_realtime("iaxpeers", "name", peername, "host", "dynamic", NULL);
-		if (!var && sin)
+		if (!var)
 			var = ast_load_realtime("iaxpeers", "name", peername, "host", ast_inet_ntoa(iabuf, sizeof(iabuf), sin->sin_addr));
 	} else if (sin) {
 		char porta[25];
@@ -2646,7 +2646,7 @@ static struct iax2_peer *realtime_peer(const char *peername, struct sockaddr_in
 			}
 		}
 	}
-	if (!var && peername) { /* Last ditch effort */
+	if (!var) { /* Last ditch effort */
 		var = ast_load_realtime("iaxpeers", "name", peername, NULL);
 		/*!\note
 		 * If this one loaded something, then we need to ensure that the host
@@ -2654,7 +2654,7 @@ static struct iax2_peer *realtime_peer(const char *peername, struct sockaddr_in
 		 * is because we only have the IP address and the host field might be
 		 * set as a name (and the reverse PTR might not match).
 		 */
-		if (var && sin) {
+		if (var) {
 			for (tmp = var; tmp; tmp = tmp->next) {
 				if (!strcasecmp(tmp->name, "host")) {
 					struct in_addr sin2 = { 0, };

sounds/moh/LICENSE

@@ -1,3 +1,7 @@
-Music Provided By www.freeplaymusic.com. These sound files are provided by
-Digium under license from Freeplay Music Corporation for use in conjunction
-with the Asterisk software only.
+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.
+
+