upgrading package: asterisk 1.6.0.5 -> 1.6.0.6

17 years ago · cd0d47a481
2 changed files with 38 additions and 38 deletions
--- a/asterisk/asterisk.patch
+++ b/asterisk/asterisk.patch
@ -1,6 +1,6 @@
 Index: Makefile
 --- Makefile.orig	2008-12-03 01:53:56 +0100
-+++ Makefile	2009-01-08 08:25:58 +0100
+++ Makefile	2009-02-23 22:08:08 +0100
@@ -122,42 +122,20 @@
 
 # Define standard directories for various platforms
@ -72,13 +72,13 @@ Index: Makefile
 	mkdir -p $(DESTDIR)$(ASTDATADIR)/firmware
 	mkdir -p $(DESTDIR)$(ASTDATADIR)/firmware/iax
 Index: apps/app_backticks.c
--- /dev/null	2009-01-08 20:47:46 +0100
-+++ apps/app_backticks.c	2009-01-08 08:25:58 +0100
+--- /dev/null	2009-02-23 22:11:56 +0100
+++ apps/app_backticks.c	2009-02-23 22:08:08 +0100
@@ -0,0 +1,129 @@
 +
 +#include "asterisk.h"
 +
-+ASTERISK_FILE_VERSION(__FILE__, "$Revision: 1.44 $")
+ASTERISK_FILE_VERSION(__FILE__, "$Revision: 1.45 $")
 +
 +#include <stdio.h> 
 +#include <asterisk/file.h>
@ -205,17 +205,17 @@ Index: apps/app_backticks.c
 +AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "BACKTICKS() dialplan function");
 +
 Index: apps/app_meetme.c
--- apps/app_meetme.c.orig	2008-12-03 00:10:07 +0100
-+++ apps/app_meetme.c	2009-01-08 08:25:58 +0100
-@@ -161,6 +161,7 @@
- 	CONFFLAG_KICK_CONTINUE = (1 << 28),
- 	CONFFLAG_DURATION_STOP = (1 << 29),
+--- apps/app_meetme.c.orig	2009-01-22 17:53:12 +0100
+++ apps/app_meetme.c	2009-02-23 22:11:46 +0100
+@@ -163,6 +163,7 @@
 	CONFFLAG_DURATION_LIMIT = (1 << 30),
+ 	/*! Do not write any audio to this channel until the state is up. */
+ 	CONFFLAG_NO_AUDIO_UNTIL_UP = (1 << 31),
 +	CONFFLAG_USERNAME = (1 << 31),
 };
 
 enum {
-@@ -170,6 +171,7 @@
+@@ -172,6 +173,7 @@
 	OPT_ARG_DURATION_LIMIT = 3,
 	OPT_ARG_MOH_CLASS = 4,
 	OPT_ARG_ARRAY_SIZE = 5,
@ -223,7 +223,7 @@ Index: apps/app_meetme.c
 };
 
 AST_APP_OPTIONS(meetme_opts, BEGIN_OPTIONS
-@@ -201,6 +203,7 @@
+@@ -203,6 +205,7 @@
 	AST_APP_OPTION('1', CONFFLAG_NOONLYPERSON ),
  	AST_APP_OPTION_ARG('S', CONFFLAG_DURATION_STOP, OPT_ARG_DURATION_STOP),
 	AST_APP_OPTION_ARG('L', CONFFLAG_DURATION_LIMIT, OPT_ARG_DURATION_LIMIT),
@ -231,7 +231,7 @@ Index: apps/app_meetme.c
 END_OPTIONS );
 
 static const char *app = "MeetMe";
-@@ -1817,6 +1820,12 @@
+@@ -1830,6 +1833,12 @@
 	if (!(confflags & CONFFLAG_QUIET) && ((confflags & CONFFLAG_INTROUSER) || (confflags & CONFFLAG_INTROUSERNOREVIEW))) {
 		char destdir[PATH_MAX];
 
@ -244,7 +244,7 @@ Index: apps/app_meetme.c
 		snprintf(destdir, sizeof(destdir), "%s/meetme", ast_config_AST_SPOOL_DIR);
 
 		if (ast_mkdir(destdir, 0777) != 0) {
-@@ -1833,6 +1842,7 @@
+@@ -1846,6 +1855,7 @@
 			res = ast_record_review(chan, "vm-rec-name", user->namerecloc, 10, "sln", &duration, NULL);
 		if (res == -1)
 			goto outrun;
@ -254,7 +254,7 @@ Index: apps/app_meetme.c
 	ast_mutex_lock(&conf->playlock);
 Index: build_tools/make_defaults_h
 --- build_tools/make_defaults_h.orig	2008-01-24 23:58:10 +0100
-+++ build_tools/make_defaults_h	2009-01-08 08:25:58 +0100
+++ build_tools/make_defaults_h	2009-02-23 22:08:08 +0100
@@ -17,7 +17,7 @@
 #define DEFAULT_PID        "${INSTALL_PATH}${ASTVARRUNDIR}/asterisk.pid"
 
@ -266,7 +266,7 @@ Index: build_tools/make_defaults_h
 #define DEFAULT_KEY_DIR    "${INSTALL_PATH}${ASTDATADIR}/keys"
 Index: cdr/cdr_custom.c
 --- cdr/cdr_custom.c.orig	2008-03-25 23:52:24 +0100
-+++ cdr/cdr_custom.c	2009-01-08 08:25:58 +0100
+++ cdr/cdr_custom.c	2009-02-23 22:08:08 +0100
@@ -78,7 +78,7 @@
 					ast_log(LOG_WARNING, "Format string too long, will be truncated, at line %d\n", var->lineno);
 				ast_copy_string(format, var->value, sizeof(format) - 1);
@ -278,7 +278,7 @@ Index: cdr/cdr_custom.c
 					break;
 Index: cdr/cdr_sqlite3_custom.c
 --- cdr/cdr_sqlite3_custom.c.orig	2008-08-14 20:48:39 +0200
-+++ cdr/cdr_sqlite3_custom.c	2009-01-08 08:25:58 +0100
+++ cdr/cdr_sqlite3_custom.c	2009-02-23 22:08:08 +0100
@@ -317,7 +317,7 @@
 		return AST_MODULE_LOAD_DECLINE;
 
@ -290,7 +290,7 @@ Index: cdr/cdr_sqlite3_custom.c
 		ast_log(LOG_ERROR, "Could not open database %s.\n", filename);
 Index: channels/console_video.h
 --- channels/console_video.h.orig	2008-01-09 19:03:40 +0100
-+++ channels/console_video.h	2009-01-08 08:25:58 +0100
+++ channels/console_video.h	2009-02-23 22:08:08 +0100
@@ -28,10 +28,7 @@
 		"console {device}"
 #else
@ -304,9 +304,9 @@ Index: channels/console_video.h
 #define CONSOLE_VIDEO_CMDS			\
 	"console {videodevice|videocodec"	\
 Index: configure
--- configure.orig	2008-12-01 22:45:00 +0100
-+++ configure	2009-01-08 08:25:58 +0100
-@@ -4039,12 +4039,6 @@
+--- configure.orig	2009-01-30 00:47:00 +0100
+++ configure	2009-02-23 22:08:08 +0100
+@@ -4040,12 +4040,6 @@
 	# note- does not work on FreeBSD
 
 case "${host_os}" in
@ -321,7 +321,7 @@ Index: configure
      if test ${prefix} = '/usr' || test ${prefix} = 'NONE'; then
 Index: include/asterisk/module.h
 --- include/asterisk/module.h.orig	2008-11-29 19:37:55 +0100
-+++ include/asterisk/module.h	2009-01-08 08:25:58 +0100
+++ include/asterisk/module.h	2009-02-23 22:08:08 +0100
@@ -271,7 +271,7 @@
 /* forward declare this pointer in modules, so that macro/function
    calls that need it can get it, since it will actually be declared
@ -333,7 +333,7 @@ Index: include/asterisk/module.h
 #define __MODULE_INFO_SECTION
 Index: main/Makefile
 --- main/Makefile.orig	2008-11-29 19:37:55 +0100
-+++ main/Makefile	2009-01-08 08:25:58 +0100
+++ main/Makefile	2009-02-23 22:08:08 +0100
@@ -81,10 +81,7 @@
 endif
 
@ -347,9 +347,9 @@ Index: main/Makefile
 
 ifneq ($(findstring $(OSARCH), mingw32 cygwin ),)
 Index: main/file.c
--- main/file.c.orig	2008-11-03 01:39:04 +0100
-+++ main/file.c	2009-01-08 08:25:58 +0100
-@@ -246,7 +246,7 @@
+--- main/file.c.orig	2009-02-04 16:30:54 +0100
+++ main/file.c	2009-02-23 22:08:08 +0100
+@@ -247,7 +247,7 @@
 	char *fn = NULL;
 
 	if (!strcmp(ext, "wav49"))
@ -359,8 +359,8 @@ Index: main/file.c
 	if (filename[0] == '/') {
 		if (asprintf(&fn, "%s.%s", filename, ext) < 0) {
 Index: main/http.c
--- main/http.c.orig	2008-11-03 01:39:04 +0100
-+++ main/http.c	2009-01-08 08:25:58 +0100
+--- main/http.c.orig	2009-01-14 00:11:19 +0100
+++ main/http.c	2009-02-23 22:08:08 +0100
@@ -435,14 +435,8 @@
 		ast_log(LOG_WARNING, "Got unexpected GMIME_IS_MESSAGE_PARTIAL\n");
 		return;
@ -378,8 +378,8 @@ Index: main/http.c
 		const char *filename;
 
 Index: main/tcptls.c
--- main/tcptls.c.orig	2008-06-18 22:08:45 +0200
-+++ main/tcptls.c	2009-01-08 08:25:58 +0100
+--- main/tcptls.c.orig	2009-02-04 19:55:32 +0100
+++ main/tcptls.c	2009-02-23 22:08:08 +0100
@@ -210,6 +210,7 @@
 	if (!ast_strlen_zero(cfg->cafile) || !ast_strlen_zero(cfg->capath)) {
 		if (SSL_CTX_load_verify_locations(cfg->ssl_ctx, S_OR(cfg->cafile, NULL), S_OR(cfg->capath,NULL)) == 0)
@ -389,9 +389,9 @@ Index: main/tcptls.c
 
 	ast_verb(0, "SSL certificate ok\n");
 Index: menuselect-tree
--- menuselect-tree.orig	2009-01-06 22:54:50 +0100
-+++ menuselect-tree	2009-01-08 08:25:58 +0100
-@@ -149,6 +149,8 @@
+--- menuselect-tree.orig	2009-02-23 18:32:38 +0100
+++ menuselect-tree	2009-02-23 22:08:08 +0100
+@@ -155,6 +155,8 @@
 </member>
 <member name="app_system" displayname="Generic System() application" remove_on_change="apps/app_system.o apps/app_system.so">
 </member>
@ -400,7 +400,7 @@ Index: menuselect-tree
 <member name="app_talkdetect" displayname="Playback with Talk Detection" remove_on_change="apps/app_talkdetect.o apps/app_talkdetect.so">
 </member>
 <member name="app_test" displayname="Interface Test Application" remove_on_change="apps/app_test.o apps/app_test.so">
-@@ -608,9 +610,9 @@
+@@ -617,9 +619,9 @@
 		<member name="CORE-SOUNDS-EN-ULAW" displayname="English, mu-Law format">
 		</member>
 		<member name="CORE-SOUNDS-EN-ALAW" displayname="English, a-Law format">
@ -411,7 +411,7 @@ Index: menuselect-tree
 		</member>
 		<member name="CORE-SOUNDS-EN-G729" displayname="English, G.729 format">
 		</member>
-@@ -668,6 +670,7 @@
+@@ -677,6 +679,7 @@
 		<member name="EXTRA-SOUNDS-EN-ULAW" displayname="English, mu-Law format">
 		</member>
 		<member name="EXTRA-SOUNDS-EN-ALAW" displayname="English, a-Law format">
@ -421,7 +421,7 @@ Index: menuselect-tree
 		</member>
 Index: sounds/sounds.xml
 --- sounds/sounds.xml.orig	2008-03-06 05:46:17 +0100
-+++ sounds/sounds.xml	2009-01-08 08:25:58 +0100
+++ sounds/sounds.xml	2009-02-23 22:08:08 +0100
@@ -4,9 +4,9 @@
 		<member name="CORE-SOUNDS-EN-ULAW" displayname="English, mu-Law format">
 		</member>
--- a/asterisk/asterisk.spec
+++ b/asterisk/asterisk.spec
@ -22,8 +22,8 @@
 ##

 #   package version
-%define       V_opkg                     1.6.0.5
-%define       V_asterisk                 1.6.0.5
+%define       V_opkg                     1.6.0.6
+%define       V_asterisk                 1.6.0.6
 %define       V_asterisk_addons          1.6.0.1
 %define       V_asterisk_sounds_core_en  1.4.14
 %define       V_asterisk_sounds_core_de  current
@ -41,7 +41,7 @@ Class:        BASE
 Group:        VoIP
 License:      GPL
 Version:      %{V_opkg}
-Release:      20090130
+Release:      20090223

 #   package options
 %option       with_dahdi   no