OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: r...@openpkg.org
Module: openpkg-src Date: 08-Jan-2009 21:14:40
Branch: HEAD Handle: 2009010820144000
Modified files:
openpkg-src/asterisk asterisk.patch asterisk.spec
Log:
upgrading package: asterisk 1.6.0.2 -> 1.6.0.3
Summary:
Revision Changes Path
1.44 +40 -60 openpkg-src/asterisk/asterisk.patch
1.85 +3 -3 openpkg-src/asterisk/asterisk.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/asterisk/asterisk.patch
============================================================================
$ cvs diff -u -r1.43 -r1.44 asterisk.patch
--- openpkg-src/asterisk/asterisk.patch 14 Dec 2008 10:35:25 -0000
1.43
+++ openpkg-src/asterisk/asterisk.patch 8 Jan 2009 20:14:40 -0000
1.44
@@ -1,7 +1,7 @@
Index: Makefile
---- Makefile.orig 2008-08-26 20:12:08 +0200
-+++ Makefile 2008-09-05 20:50:40 +0200
-@@ -121,42 +121,20 @@
+--- Makefile.orig 2008-12-03 01:53:56 +0100
++++ Makefile 2009-01-08 08:25:58 +0100
+@@ -122,42 +122,20 @@
# Define standard directories for various platforms
# These apply if they are not redefined in asterisk.conf
@@ -48,7 +48,7 @@
# Asterisk.conf is located in ASTETCDIR or by using the -C flag
# when starting Asterisk
-@@ -245,12 +223,6 @@
+@@ -250,12 +228,6 @@
ASTCFLAGS+=-fsigned-char
endif
@@ -61,7 +61,7 @@
ifeq ($(OSARCH),NetBSD)
ASTCFLAGS+=-pthread -I/usr/pkg/include
endif
-@@ -522,8 +494,7 @@
+@@ -526,8 +498,7 @@
if [ -n "$(OLDHEADERS)" ]; then \
rm -f $(addprefix $(DESTDIR)$(ASTHEADERDIR)/,$(OLDHEADERS)) ;\
fi
@@ -72,13 +72,13 @@
mkdir -p $(DESTDIR)$(ASTDATADIR)/firmware
mkdir -p $(DESTDIR)$(ASTDATADIR)/firmware/iax
Index: apps/app_backticks.c
---- /dev/null 2008-09-05 20:51:23 +0200
-+++ apps/app_backticks.c 2008-09-05 20:50:40 +0200
+--- /dev/null 2009-01-08 20:47:46 +0100
++++ apps/app_backticks.c 2009-01-08 08:25:58 +0100
@@ -0,0 +1,129 @@
+
+#include "asterisk.h"
+
-+ASTERISK_FILE_VERSION(__FILE__, "$Revision: 1.43 $")
++ASTERISK_FILE_VERSION(__FILE__, "$Revision: 1.44 $")
+
+#include <stdio.h>
+#include <asterisk/file.h>
@@ -205,9 +205,9 @@
+AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "BACKTICKS() dialplan function");
+
Index: apps/app_meetme.c
---- apps/app_meetme.c.orig 2008-07-30 00:29:11 +0200
-+++ apps/app_meetme.c 2008-09-05 20:50:40 +0200
-@@ -160,6 +160,7 @@
+--- 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),
CONFFLAG_DURATION_LIMIT = (1 << 30),
@@ -215,7 +215,7 @@
};
enum {
-@@ -169,6 +170,7 @@
+@@ -170,6 +171,7 @@
OPT_ARG_DURATION_LIMIT = 3,
OPT_ARG_MOH_CLASS = 4,
OPT_ARG_ARRAY_SIZE = 5,
@@ -223,7 +223,7 @@
};
AST_APP_OPTIONS(meetme_opts, BEGIN_OPTIONS
-@@ -200,6 +202,7 @@
+@@ -201,6 +203,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 @@
END_OPTIONS );
static const char *app = "MeetMe";
-@@ -1698,6 +1701,12 @@
+@@ -1817,6 +1820,12 @@
if (!(confflags & CONFFLAG_QUIET) && ((confflags & CONFFLAG_INTROUSER)
|| (confflags & CONFFLAG_INTROUSERNOREVIEW))) {
char destdir[PATH_MAX];
@@ -244,7 +244,7 @@
snprintf(destdir, sizeof(destdir), "%s/meetme",
ast_config_AST_SPOOL_DIR);
if (ast_mkdir(destdir, 0777) != 0) {
-@@ -1714,6 +1723,7 @@
+@@ -1833,6 +1842,7 @@
res = ast_record_review(chan, "vm-rec-name",
user->namerecloc, 10, "sln", &duration, NULL);
if (res == -1)
goto outrun;
@@ -254,7 +254,7 @@
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 2008-09-05 20:50:40 +0200
++++ build_tools/make_defaults_h 2009-01-08 08:25:58 +0100
@@ -17,7 +17,7 @@
#define DEFAULT_PID "${INSTALL_PATH}${ASTVARRUNDIR}/asterisk.pid"
@@ -266,7 +266,7 @@
#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 2008-09-05 20:50:40 +0200
++++ cdr/cdr_custom.c 2009-01-08 08:25:58 +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 @@
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 2008-09-05 20:50:40 +0200
++++ cdr/cdr_sqlite3_custom.c 2009-01-08 08:25:58 +0100
@@ -317,7 +317,7 @@
return AST_MODULE_LOAD_DECLINE;
@@ -290,7 +290,7 @@
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 2008-09-05 20:50:40 +0200
++++ channels/console_video.h 2009-01-08 08:25:58 +0100
@@ -28,10 +28,7 @@
"console {device}"
#else
@@ -304,9 +304,9 @@
#define CONSOLE_VIDEO_CMDS \
"console {videodevice|videocodec" \
Index: configure
---- configure.orig 2008-07-30 23:41:23 +0200
-+++ configure 2008-09-05 20:50:40 +0200
-@@ -4033,12 +4033,6 @@
+--- configure.orig 2008-12-01 22:45:00 +0100
++++ configure 2009-01-08 08:25:58 +0100
+@@ -4039,12 +4039,6 @@
# note- does not work on FreeBSD
case "${host_os}" in
@@ -320,8 +320,8 @@
ac_default_prefix=/usr
if test ${prefix} = '/usr' || test ${prefix} = 'NONE'; then
Index: include/asterisk/module.h
---- include/asterisk/module.h.orig 2008-02-27 09:20:15 +0100
-+++ include/asterisk/module.h 2008-09-05 20:50:40 +0200
+--- include/asterisk/module.h.orig 2008-11-29 19:37:55 +0100
++++ include/asterisk/module.h 2009-01-08 08:25:58 +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
@@ -332,8 +332,8 @@
#if !defined(EMBEDDED_MODULE)
#define __MODULE_INFO_SECTION
Index: main/Makefile
---- main/Makefile.orig 2008-07-28 21:55:44 +0200
-+++ main/Makefile 2008-09-05 20:50:40 +0200
+--- main/Makefile.orig 2008-11-29 19:37:55 +0100
++++ main/Makefile 2009-01-08 08:25:58 +0100
@@ -81,10 +81,7 @@
endif
@@ -347,8 +347,8 @@
ifneq ($(findstring $(OSARCH), mingw32 cygwin ),)
Index: main/file.c
---- main/file.c.orig 2008-07-28 18:49:18 +0200
-+++ main/file.c 2008-09-05 20:50:40 +0200
+--- 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 @@
char *fn = NULL;
@@ -356,12 +356,12 @@
- ext = "WAV";
+ ext = "wav";
- if (filename[0] == '/')
- asprintf(&fn, "%s.%s", filename, ext);
+ if (filename[0] == '/') {
+ if (asprintf(&fn, "%s.%s", filename, ext) < 0) {
Index: main/http.c
---- main/http.c.orig 2008-08-01 00:34:44 +0200
-+++ main/http.c 2008-09-05 20:50:40 +0200
-@@ -433,14 +433,8 @@
+--- main/http.c.orig 2008-11-03 01:39:04 +0100
++++ main/http.c 2009-01-08 08:25:58 +0100
+@@ -435,14 +435,8 @@
ast_log(LOG_WARNING, "Got unexpected
GMIME_IS_MESSAGE_PARTIAL\n");
return;
} else if (GMIME_IS_MULTIPART(part)) {
@@ -379,7 +379,7 @@
Index: main/tcptls.c
--- main/tcptls.c.orig 2008-06-18 22:08:45 +0200
-+++ main/tcptls.c 2008-09-05 20:50:40 +0200
++++ main/tcptls.c 2009-01-08 08:25:58 +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 @@
ast_verb(0, "SSL certificate ok\n");
Index: menuselect-tree
---- menuselect-tree.orig 2008-09-03 17:04:40 +0200
-+++ menuselect-tree 2008-09-05 20:50:40 +0200
-@@ -148,6 +148,8 @@
+--- menuselect-tree.orig 2009-01-06 22:54:50 +0100
++++ menuselect-tree 2009-01-08 08:25:58 +0100
+@@ -149,6 +149,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 @@
<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">
-@@ -607,9 +609,9 @@
+@@ -608,9 +610,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 @@
</member>
<member name="CORE-SOUNDS-EN-G729" displayname="English, G.729
format">
</member>
-@@ -667,6 +669,7 @@
+@@ -668,6 +670,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 @@
</member>
Index: sounds/sounds.xml
--- sounds/sounds.xml.orig 2008-03-06 05:46:17 +0100
-+++ sounds/sounds.xml 2008-09-05 20:50:40 +0200
++++ sounds/sounds.xml 2009-01-08 08:25:58 +0100
@@ -4,9 +4,9 @@
<member name="CORE-SOUNDS-EN-ULAW" displayname="English, mu-Law
format">
</member>
@@ -441,23 +441,3 @@
</member>
<member name="EXTRA-SOUNDS-EN-GSM" displayname="English, GSM
format" >
</member>
-Index: main/manager.c
---- main/manager.c.orig 2008-12-01 17:04:31 +0100
-+++ main/manager.c 2008-07-31 23:58:26 +0200
-@@ -1728,15 +1719,7 @@
- }
-
- if (varname[strlen(varname) - 1] == ')') {
-- if (!c) {
-- c = ast_channel_alloc(0, 0, "", "", "", "", "", 0,
"Bogus/%p", SENTINEL);
-- if (c) {
-- ast_func_read(c, (char *) varname, workspace,
sizeof(workspace));
-- ast_channel_free(c);
-- } else
-- ast_log(LOG_ERROR, "Unable to allocate bogus
channel for variable substitution. Function results may be blank.\n");
-- } else
-- ast_func_read(c, (char *) varname, workspace,
sizeof(workspace));
-+ ast_func_read(c, (char *) varname, workspace,
sizeof(workspace));
- varval = workspace;
- } else {
- pbx_retrieve_variable(c, varname, &varval, workspace,
sizeof(workspace), NULL);
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/asterisk/asterisk.spec
============================================================================
$ cvs diff -u -r1.84 -r1.85 asterisk.spec
--- openpkg-src/asterisk/asterisk.spec 14 Dec 2008 10:35:25 -0000
1.84
+++ openpkg-src/asterisk/asterisk.spec 8 Jan 2009 20:14:40 -0000
1.85
@@ -22,8 +22,8 @@
##
# package version
-%define V_opkg 1.6.0.2
-%define V_asterisk 1.6.0.2
+%define V_opkg 1.6.0.3
+%define V_asterisk 1.6.0.3
%define V_asterisk_addons 1.6.0.1
%define V_asterisk_sounds_core_en 1.4.13
%define V_asterisk_sounds_core_de 20080705
@@ -41,7 +41,7 @@
Group: VoIP
License: GPL
Version: %{V_opkg}
-Release: 20081214
+Release: 20090108
# package options
%option with_dahdi no
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
