OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 07-May-2008 09:06:58
Branch: HEAD Handle: 2008050708065600
Modified files:
openpkg-src/asterisk asterisk.patch asterisk.spec
Log:
upgrading package: asterisk 1.6.0b6 -> 1.6.0b8
Summary:
Revision Changes Path
1.40 +71 -70 openpkg-src/asterisk/asterisk.patch
1.71 +5 -5 openpkg-src/asterisk/asterisk.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/asterisk/asterisk.patch
============================================================================
$ cvs diff -u -r1.39 -r1.40 asterisk.patch
--- openpkg-src/asterisk/asterisk.patch 25 Mar 2008 21:04:30 -0000
1.39
+++ openpkg-src/asterisk/asterisk.patch 7 May 2008 07:06:56 -0000
1.40
@@ -1,6 +1,6 @@
Index: Makefile
---- Makefile.orig 2008-03-18 16:58:50 +0100
-+++ Makefile 2008-03-24 20:45:38 +0100
+--- Makefile.orig 2008-04-18 22:02:05 +0200
++++ Makefile 2008-05-07 08:25:13 +0200
@@ -121,42 +121,20 @@
# Define standard directories for various platforms
@@ -61,7 +61,7 @@
ifeq ($(OSARCH),NetBSD)
ASTCFLAGS+=-pthread -I/usr/pkg/include
endif
-@@ -524,8 +496,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-03-24 20:46:16 +0100
-+++ apps/app_backticks.c 2008-03-24 20:45:38 +0100
+--- /dev/null 2008-05-07 08:38:19 +0200
++++ apps/app_backticks.c 2008-05-07 08:25:13 +0200
@@ -0,0 +1,129 @@
+
+#include "asterisk.h"
+
-+ASTERISK_FILE_VERSION(__FILE__, "$Revision: 1.39 $")
++ASTERISK_FILE_VERSION(__FILE__, "$Revision: 1.40 $")
+
+#include <stdio.h>
+#include <asterisk/file.h>
@@ -204,9 +204,57 @@
+
+AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "BACKTICKS() dialplan function");
+
+Index: apps/app_meetme.c
+--- apps/app_meetme.c.orig 2008-04-13 16:38:35 +0200
++++ apps/app_meetme.c 2008-05-07 08:40:11 +0200
+@@ -159,6 +159,7 @@
+ CONFFLAG_KICK_CONTINUE = (1 << 28),
+ CONFFLAG_DURATION_STOP = (1 << 29),
+ CONFFLAG_DURATION_LIMIT = (1 << 30),
++ CONFFLAG_USERNAME = (1 << 31),
+ };
+
+ enum {
+@@ -168,6 +169,7 @@
+ OPT_ARG_DURATION_LIMIT = 3,
+ OPT_ARG_MOH_CLASS = 4,
+ OPT_ARG_ARRAY_SIZE = 5,
++ OPT_ARG_USERNAME = 6,
+ };
+
+ AST_APP_OPTIONS(meetme_opts, BEGIN_OPTIONS
+@@ -199,6 +201,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),
++ AST_APP_OPTION_ARG('n', CONFFLAG_USERNAME, OPT_ARG_USERNAME),
+ END_OPTIONS );
+
+ static const char *app = "MeetMe";
+@@ -1697,6 +1700,12 @@
+ if (!(confflags & CONFFLAG_QUIET) && ((confflags & CONFFLAG_INTROUSER)
|| (confflags & CONFFLAG_INTROUSERNOREVIEW))) {
+ char destdir[PATH_MAX];
+
++ if ( (confflags & CONFFLAG_USERNAME)
++ && !ast_strlen_zero(optargs[OPT_ARG_USERNAME])
++ && ast_fileexists(optargs[OPT_ARG_USERNAME], NULL, NULL))
++ snprintf(destdir, sizeof(destdir), "%s",
optargs[OPT_ARG_USERNAME]);
++ else {
++
+ snprintf(destdir, sizeof(destdir), "%s/meetme",
ast_config_AST_SPOOL_DIR);
+
+ if (ast_mkdir(destdir, 0777) != 0) {
+@@ -1713,6 +1722,7 @@
+ res = ast_record_review(chan, "vm-rec-name",
user->namerecloc, 10, "sln", &duration, NULL);
+ if (res == -1)
+ goto outrun;
++ }
+ }
+
+ 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-03-24 20:45:38 +0100
++++ build_tools/make_defaults_h 2008-05-07 08:25:13 +0200
@@ -17,7 +17,7 @@
#define DEFAULT_PID "${INSTALL_PATH}${ASTVARRUNDIR}/asterisk.pid"
@@ -217,8 +265,8 @@
#define DEFAULT_DATA_DIR "${INSTALL_PATH}${ASTDATADIR}"
#define DEFAULT_KEY_DIR "${INSTALL_PATH}${ASTDATADIR}/keys"
Index: cdr/cdr_custom.c
---- cdr/cdr_custom.c.orig 2007-11-21 00:16:15 +0100
-+++ cdr/cdr_custom.c 2008-03-24 20:45:38 +0100
+--- cdr/cdr_custom.c.orig 2008-03-25 23:52:24 +0100
++++ cdr/cdr_custom.c 2008-05-07 08:25:13 +0200
@@ -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);
@@ -230,7 +278,7 @@
break;
Index: cdr/cdr_sqlite3_custom.c
--- cdr/cdr_sqlite3_custom.c.orig 2008-03-18 16:58:50 +0100
-+++ cdr/cdr_sqlite3_custom.c 2008-03-24 20:45:38 +0100
++++ cdr/cdr_sqlite3_custom.c 2008-05-07 08:25:13 +0200
@@ -317,7 +317,7 @@
return AST_MODULE_LOAD_DECLINE;
@@ -242,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-03-24 20:45:38 +0100
++++ channels/console_video.h 2008-05-07 08:25:13 +0200
@@ -28,10 +28,7 @@
"console {device}"
#else
@@ -257,7 +305,7 @@
"console {videodevice|videocodec" \
Index: configure
--- configure.orig 2008-03-18 16:50:53 +0100
-+++ configure 2008-03-24 20:45:38 +0100
++++ configure 2008-05-07 08:25:13 +0200
@@ -4026,12 +4026,6 @@
# note- does not work on FreeBSD
@@ -273,7 +321,7 @@
if test ${sysconfdir} = '${prefix}/etc'; then
Index: include/asterisk/module.h
--- include/asterisk/module.h.orig 2008-02-27 09:20:15 +0100
-+++ include/asterisk/module.h 2008-03-24 20:45:38 +0100
++++ include/asterisk/module.h 2008-05-07 08:25:13 +0200
@@ -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
@@ -284,8 +332,8 @@
#if !defined(EMBEDDED_MODULE)
#define __MODULE_INFO_SECTION
Index: main/Makefile
---- main/Makefile.orig 2008-03-17 23:24:46 +0100
-+++ main/Makefile 2008-03-24 20:45:38 +0100
+--- main/Makefile.orig 2008-04-04 02:54:22 +0200
++++ main/Makefile 2008-05-07 08:25:13 +0200
@@ -82,10 +82,7 @@
endif
@@ -299,8 +347,8 @@
ifneq ($(findstring $(OSARCH), mingw32 cygwin ),)
Index: main/file.c
---- main/file.c.orig 2008-03-07 01:25:48 +0100
-+++ main/file.c 2008-03-24 20:45:38 +0100
+--- main/file.c.orig 2008-04-10 19:27:35 +0200
++++ main/file.c 2008-05-07 08:25:13 +0200
@@ -246,7 +246,7 @@
char *fn = NULL;
@@ -312,7 +360,7 @@
asprintf(&fn, "%s.%s", filename, ext);
Index: main/tcptls.c
--- main/tcptls.c.orig 2008-03-12 23:50:14 +0100
-+++ main/tcptls.c 2008-03-24 20:45:38 +0100
++++ main/tcptls.c 2008-05-07 08:25:13 +0200
@@ -189,6 +189,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)
@@ -322,8 +370,8 @@
ast_verb(0, "SSL certificate ok\n");
Index: menuselect-tree
---- menuselect-tree.orig 2008-03-18 18:05:36 +0100
-+++ menuselect-tree 2008-03-24 20:45:38 +0100
+--- menuselect-tree.orig 2008-04-23 00:30:52 +0200
++++ menuselect-tree 2008-05-07 08:25:13 +0200
@@ -134,6 +134,8 @@
</member>
<member name="app_system" displayname="Generic System() application"
remove_on_change="apps/app_system.o apps/app_system.so">
@@ -341,7 +389,7 @@
<depend>zaptel</depend>
<depend>tonezone</depend>
<use>pri</use>
-@@ -616,9 +617,9 @@
+@@ -598,9 +599,9 @@
<member name="CORE-SOUNDS-EN-ULAW" displayname="English, mu-Law
format">
</member>
<member name="CORE-SOUNDS-EN-ALAW" displayname="English, a-Law
format">
@@ -352,7 +400,7 @@
</member>
<member name="CORE-SOUNDS-EN-G729" displayname="English, G.729
format">
</member>
-@@ -676,6 +677,7 @@
+@@ -658,6 +659,7 @@
<member name="EXTRA-SOUNDS-EN-ULAW" displayname="English,
mu-Law format">
</member>
<member name="EXTRA-SOUNDS-EN-ALAW" displayname="English, a-Law
format">
@@ -362,7 +410,7 @@
</member>
Index: sounds/sounds.xml
--- sounds/sounds.xml.orig 2008-03-06 05:46:17 +0100
-+++ sounds/sounds.xml 2008-03-24 20:45:38 +0100
++++ sounds/sounds.xml 2008-05-07 08:25:13 +0200
@@ -4,9 +4,9 @@
<member name="CORE-SOUNDS-EN-ULAW" displayname="English, mu-Law
format">
</member>
@@ -382,50 +430,3 @@
</member>
<member name="EXTRA-SOUNDS-EN-GSM" displayname="English, GSM
format" >
</member>
-Index: apps/app_meetme.c
---- apps/app_meetme.c.orig 2008-03-18 16:58:50 +0100
-+++ apps/app_meetme.c 2008-03-25 21:41:52 +0100
-@@ -159,6 +159,7 @@
- CONFFLAG_KICK_CONTINUE = (1 << 28),
- CONFFLAG_DURATION_STOP = (1 << 29),
- CONFFLAG_DURATION_LIMIT = (1 << 30),
-+ CONFFLAG_USERNAME = (1 << 31),
- };
-
- enum {
-@@ -168,6 +169,7 @@
- OPT_ARG_DURATION_LIMIT = 3,
- OPT_ARG_MOH_CLASS = 4,
- OPT_ARG_ARRAY_SIZE = 5,
-+ OPT_ARG_USERNAME = 6,
- };
-
- AST_APP_OPTIONS(meetme_opts, BEGIN_OPTIONS
-@@ -199,6 +201,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),
-+ AST_APP_OPTION_ARG('n', CONFFLAG_USERNAME, OPT_ARG_USERNAME),
- END_OPTIONS );
-
- static const char *app = "MeetMe";
-@@ -1695,6 +1698,11 @@
- ast_mutex_unlock(&conf->playlock);
-
- if (!(confflags & CONFFLAG_QUIET) && ((confflags & CONFFLAG_INTROUSER)
|| (confflags & CONFFLAG_INTROUSERNOREVIEW))) {
-+ if ( (confflags & CONFFLAG_USERNAME)
-+ && !ast_strlen_zero(optargs[OPT_ARG_USERNAME])
-+ && ast_fileexists(optargs[OPT_ARG_USERNAME], NULL, NULL))
-+ snprintf(user->namerecloc, sizeof(user->namerecloc), "%s",
optargs[OPT_ARG_USERNAME]);
-+ else {
- snprintf(user->namerecloc, sizeof(user->namerecloc),
- "%s/meetme/meetme-username-%s-%d",
ast_config_AST_SPOOL_DIR,
- conf->confno, user->user_no);
-@@ -1704,6 +1712,7 @@
- res = ast_record_review(chan, "vm-rec-name",
user->namerecloc, 10, "sln", &duration, NULL);
- if (res == -1)
- goto outrun;
-+ }
- }
-
- ast_mutex_lock(&conf->playlock);
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/asterisk/asterisk.spec
============================================================================
$ cvs diff -u -r1.70 -r1.71 asterisk.spec
--- openpkg-src/asterisk/asterisk.spec 25 Mar 2008 21:04:31 -0000
1.70
+++ openpkg-src/asterisk/asterisk.spec 7 May 2008 07:06:56 -0000
1.71
@@ -22,10 +22,10 @@
##
# package version
-%define V_opkg 1.6.0b6
-%define V_asterisk 1.6.0-beta6
-%define V_asterisk_addons 1.6.0-beta2
-%define V_asterisk_sounds_core 1.4.11
+%define V_opkg 1.6.0b8
+%define V_asterisk 1.6.0-beta8
+%define V_asterisk_addons 1.6.0-beta3
+%define V_asterisk_sounds_core 1.4.12
%define V_asterisk_sounds_extra 1.4.7
%define V_chan_capi 1_6_1
@@ -40,7 +40,7 @@
Group: VoIP
License: GPL
Version: %{V_opkg}
-Release: 20080325
+Release: 20080507
# package options
%option with_zaptel no
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
