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: 05-Sep-2008 21:05:54
Branch: HEAD Handle: 2008090520055400
Modified files:
openpkg-src/asterisk asterisk.patch asterisk.spec
Log:
upgrading package: asterisk 1.6.0b9 -> 1.6.0rc4
Summary:
Revision Changes Path
1.42 +56 -64 openpkg-src/asterisk/asterisk.patch
1.76 +4 -4 openpkg-src/asterisk/asterisk.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/asterisk/asterisk.patch
============================================================================
$ cvs diff -u -r1.41 -r1.42 asterisk.patch
--- openpkg-src/asterisk/asterisk.patch 4 Jul 2008 17:52:47 -0000
1.41
+++ openpkg-src/asterisk/asterisk.patch 5 Sep 2008 19:05:54 -0000
1.42
@@ -1,6 +1,6 @@
Index: Makefile
---- Makefile.orig 2008-04-18 22:02:05 +0200
-+++ Makefile 2008-05-07 08:25:13 +0200
+--- Makefile.orig 2008-08-26 20:12:08 +0200
++++ Makefile 2008-09-05 20:50:40 +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
-@@ -526,8 +498,7 @@
+@@ -522,8 +494,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-05-07 08:38:19 +0200
-+++ apps/app_backticks.c 2008-05-07 08:25:13 +0200
+--- /dev/null 2008-09-05 20:51:23 +0200
++++ apps/app_backticks.c 2008-09-05 20:50:40 +0200
@@ -0,0 +1,129 @@
+
+#include "asterisk.h"
+
-+ASTERISK_FILE_VERSION(__FILE__, "$Revision: 1.41 $")
++ASTERISK_FILE_VERSION(__FILE__, "$Revision: 1.42 $")
+
+#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-04-13 16:38:35 +0200
-+++ apps/app_meetme.c 2008-05-07 08:40:11 +0200
-@@ -159,6 +159,7 @@
+--- 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 @@
CONFFLAG_KICK_CONTINUE = (1 << 28),
CONFFLAG_DURATION_STOP = (1 << 29),
CONFFLAG_DURATION_LIMIT = (1 << 30),
@@ -215,7 +215,7 @@
};
enum {
-@@ -168,6 +169,7 @@
+@@ -169,6 +170,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
-@@ -199,6 +201,7 @@
+@@ -200,6 +202,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";
-@@ -1697,6 +1700,12 @@
+@@ -1698,6 +1701,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) {
-@@ -1713,6 +1722,7 @@
+@@ -1714,6 +1723,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-05-07 08:25:13 +0200
++++ build_tools/make_defaults_h 2008-09-05 20:50:40 +0200
@@ -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-05-07 08:25:13 +0200
++++ cdr/cdr_custom.c 2008-09-05 20:50:40 +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);
@@ -277,8 +277,8 @@
ast_log(LOG_NOTICE, "Sorry, only one
mapping is supported at this time, mapping '%s' will be ignored at line %d.\n",
var->next->name, var->next->lineno);
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-05-07 08:25:13 +0200
+--- 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
@@ -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-05-07 08:25:13 +0200
++++ channels/console_video.h 2008-09-05 20:50:40 +0200
@@ -28,10 +28,7 @@
"console {device}"
#else
@@ -304,9 +304,9 @@
#define CONSOLE_VIDEO_CMDS \
"console {videodevice|videocodec" \
Index: configure
---- configure.orig 2008-03-18 16:50:53 +0100
-+++ configure 2008-05-07 08:25:13 +0200
-@@ -4026,12 +4026,6 @@
+--- configure.orig 2008-07-30 23:41:23 +0200
++++ configure 2008-09-05 20:50:40 +0200
+@@ -4033,12 +4033,6 @@
# note- does not work on FreeBSD
case "${host_os}" in
@@ -318,10 +318,10 @@
-
*)
ac_default_prefix=/usr
- if test ${sysconfdir} = '${prefix}/etc'; then
+ 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-05-07 08:25:13 +0200
++++ include/asterisk/module.h 2008-09-05 20:50:40 +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
@@ -332,9 +332,9 @@
#if !defined(EMBEDDED_MODULE)
#define __MODULE_INFO_SECTION
Index: main/Makefile
---- main/Makefile.orig 2008-04-04 02:54:22 +0200
-+++ main/Makefile 2008-05-07 08:25:13 +0200
-@@ -82,10 +82,7 @@
+--- main/Makefile.orig 2008-07-28 21:55:44 +0200
++++ main/Makefile 2008-09-05 20:50:40 +0200
+@@ -81,10 +81,7 @@
endif
ifeq ($(OSARCH),FreeBSD)
@@ -347,8 +347,8 @@
ifneq ($(findstring $(OSARCH), mingw32 cygwin ),)
Index: main/file.c
---- main/file.c.orig 2008-04-10 19:27:35 +0200
-+++ main/file.c 2008-05-07 08:25:13 +0200
+--- main/file.c.orig 2008-07-28 18:49:18 +0200
++++ main/file.c 2008-09-05 20:50:40 +0200
@@ -246,7 +246,7 @@
char *fn = NULL;
@@ -358,10 +358,29 @@
if (filename[0] == '/')
asprintf(&fn, "%s.%s", filename, ext);
+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 @@
+ ast_log(LOG_WARNING, "Got unexpected
GMIME_IS_MESSAGE_PARTIAL\n");
+ return;
+ } else if (GMIME_IS_MULTIPART(part)) {
+- GList *l;
+-
+ ast_log(LOG_WARNING, "Got unexpected GMIME_IS_MULTIPART, trying
to process subparts\n");
+- l = GMIME_MULTIPART (part)->subparts;
+- while (l) {
+- process_message_callback(l->data, cbinfo);
+- l = l->next;
+- }
++ g_mime_multipart_foreach(GMIME_MULTIPART(part),
process_message_callback, cbinfo);
+ } else if (GMIME_IS_PART(part)) {
+ const char *filename;
+
Index: main/tcptls.c
---- main/tcptls.c.orig 2008-03-12 23:50:14 +0100
-+++ main/tcptls.c 2008-05-07 08:25:13 +0200
-@@ -189,6 +189,7 @@
+--- main/tcptls.c.orig 2008-06-18 22:08:45 +0200
++++ main/tcptls.c 2008-09-05 20:50:40 +0200
+@@ -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)
ast_verb(0, "SSL CA file(%s)/path(%s) error\n",
cfg->cafile, cfg->capath);
@@ -370,9 +389,9 @@
ast_verb(0, "SSL certificate ok\n");
Index: menuselect-tree
---- menuselect-tree.orig 2008-04-23 00:30:52 +0200
-+++ menuselect-tree 2008-05-07 08:25:13 +0200
-@@ -134,6 +134,8 @@
+--- menuselect-tree.orig 2008-09-03 17:04:40 +0200
++++ menuselect-tree 2008-09-05 20:50:40 +0200
+@@ -148,6 +148,8 @@
</member>
<member name="app_system" displayname="Generic System() application"
remove_on_change="apps/app_system.o apps/app_system.so">
</member>
@@ -381,15 +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">
-@@ -262,7 +264,6 @@
- </member>
- <member name="chan_zap" displayname="Zapata Telephony"
remove_on_change="channels/chan_zap.o channels/chan_zap.so">
- <depend>res_smdi</depend>
-- <depend>zaptel_vldtmf</depend>
- <depend>zaptel</depend>
- <depend>tonezone</depend>
- <use>pri</use>
-@@ -598,9 +599,9 @@
+@@ -607,9 +609,9 @@
<member name="CORE-SOUNDS-EN-ULAW" displayname="English, mu-Law
format">
</member>
<member name="CORE-SOUNDS-EN-ALAW" displayname="English, a-Law
format">
@@ -400,7 +411,7 @@
</member>
<member name="CORE-SOUNDS-EN-G729" displayname="English, G.729
format">
</member>
-@@ -658,6 +659,7 @@
+@@ -667,6 +669,7 @@
<member name="EXTRA-SOUNDS-EN-ULAW" displayname="English,
mu-Law format">
</member>
<member name="EXTRA-SOUNDS-EN-ALAW" displayname="English, a-Law
format">
@@ -410,7 +421,7 @@
</member>
Index: sounds/sounds.xml
--- sounds/sounds.xml.orig 2008-03-06 05:46:17 +0100
-+++ sounds/sounds.xml 2008-05-07 08:25:13 +0200
++++ sounds/sounds.xml 2008-09-05 20:50:40 +0200
@@ -4,9 +4,9 @@
<member name="CORE-SOUNDS-EN-ULAW" displayname="English, mu-Law
format">
</member>
@@ -430,22 +441,3 @@
</member>
<member name="EXTRA-SOUNDS-EN-GSM" displayname="English, GSM
format" >
</member>
-Index: main/http.c
---- main/http.c.orig 2008-04-24 00:54:41 +0200
-+++ main/http.c 2008-07-04 19:41:01 +0200
-@@ -417,14 +417,8 @@
- ast_log(LOG_WARNING, "Got unexpected
GMIME_IS_MESSAGE_PARTIAL\n");
- return;
- } else if (GMIME_IS_MULTIPART(part)) {
-- GList *l;
--
- ast_log(LOG_WARNING, "Got unexpected GMIME_IS_MULTIPART, trying
to process subparts\n");
-- l = GMIME_MULTIPART (part)->subparts;
-- while (l) {
-- process_message_callback(l->data, cbinfo);
-- l = l->next;
-- }
-+ g_mime_multipart_foreach(GMIME_MULTIPART(part),
process_message_callback, cbinfo);
- } else if (GMIME_IS_PART(part)) {
- const char *filename;
-
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/asterisk/asterisk.spec
============================================================================
$ cvs diff -u -r1.75 -r1.76 asterisk.spec
--- openpkg-src/asterisk/asterisk.spec 8 Jul 2008 17:50:56 -0000
1.75
+++ openpkg-src/asterisk/asterisk.spec 5 Sep 2008 19:05:54 -0000
1.76
@@ -22,9 +22,9 @@
##
# package version
-%define V_opkg 1.6.0b9
-%define V_asterisk 1.6.0-beta9
-%define V_asterisk_addons 1.6.0-beta4
+%define V_opkg 1.6.0rc4
+%define V_asterisk 1.6.0-rc4
+%define V_asterisk_addons 1.6.0-rc1
%define V_asterisk_sounds_core_en 1.4.12
%define V_asterisk_sounds_core_de 20080705
%define V_asterisk_sounds_extra_en 1.4.7
@@ -41,7 +41,7 @@
Group: VoIP
License: GPL
Version: %{V_opkg}
-Release: 20080708
+Release: 20080905
# package options
%option with_zaptel no
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List [email protected]
