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:   03-Apr-2009 09:53:25
  Branch: HEAD                             Handle: 2009040308532400

  Modified files:
    openpkg-src/asterisk    asterisk.patch asterisk.spec

  Log:
    upgrading package: asterisk 1.6.0.6 -> 1.6.0.8

  Summary:
    Revision    Changes     Path
    1.47        +173 -173   openpkg-src/asterisk/asterisk.patch
    1.91        +3  -3      openpkg-src/asterisk/asterisk.spec
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/asterisk/asterisk.patch
  ============================================================================
  $ cvs diff -u -r1.46 -r1.47 asterisk.patch
  --- openpkg-src/asterisk/asterisk.patch       28 Mar 2009 19:14:52 -0000      
1.46
  +++ openpkg-src/asterisk/asterisk.patch       3 Apr 2009 07:53:24 -0000       
1.47
  @@ -1,6 +1,6 @@
   Index: Makefile
   --- Makefile.orig    2008-12-03 01:53:56 +0100
  -+++ Makefile 2009-02-23 22:08:08 +0100
  ++++ Makefile 2009-04-03 09:41:24 +0200
   @@ -122,42 +122,20 @@
    
    # Define standard directories for various platforms
  @@ -72,13 +72,13 @@
        mkdir -p $(DESTDIR)$(ASTDATADIR)/firmware
        mkdir -p $(DESTDIR)$(ASTDATADIR)/firmware/iax
   Index: apps/app_backticks.c
  ---- /dev/null        2009-02-23 22:11:56 +0100
  -+++ apps/app_backticks.c     2009-02-23 22:08:08 +0100
  +--- /dev/null        2009-04-03 09:41:48 +0200
  ++++ apps/app_backticks.c     2009-04-03 09:41:24 +0200
   @@ -0,0 +1,129 @@
   +
   +#include "asterisk.h"
   +
  -+ASTERISK_FILE_VERSION(__FILE__, "$Revision: 1.46 $")
  ++ASTERISK_FILE_VERSION(__FILE__, "$Revision: 1.47 $")
   +
   +#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   2009-01-22 17:53:12 +0100
  -+++ apps/app_meetme.c        2009-02-23 22:11:46 +0100
  -@@ -163,6 +163,7 @@
  +--- apps/app_meetme.c.orig   2009-03-03 00:38:23 +0100
  ++++ apps/app_meetme.c        2009-04-03 09:41:24 +0200
  +@@ -165,6 +165,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),
  @@ -215,7 +215,7 @@
    };
    
    enum {
  -@@ -172,6 +173,7 @@
  +@@ -174,6 +175,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
  -@@ -203,6 +205,7 @@
  +@@ -206,6 +208,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";
  -@@ -1830,6 +1833,12 @@
  +@@ -1832,6 +1835,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) {
  -@@ -1846,6 +1855,7 @@
  +@@ -1848,6 +1857,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      2009-02-23 22:08:08 +0100
  ++++ build_tools/make_defaults_h      2009-04-03 09:41:24 +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 2009-02-23 22:08:08 +0100
  ++++ cdr/cdr_custom.c 2009-04-03 09:41:24 +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,9 +277,9 @@
                                        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-08-14 20:48:39 +0200
  -+++ cdr/cdr_sqlite3_custom.c 2009-02-23 22:08:08 +0100
  -@@ -317,7 +317,7 @@
  +--- cdr/cdr_sqlite3_custom.c.orig    2009-03-02 18:16:57 +0100
  ++++ cdr/cdr_sqlite3_custom.c 2009-04-03 09:41:24 +0200
  +@@ -322,7 +322,7 @@
                return AST_MODULE_LOAD_DECLINE;
    
        /* is the database there? */
  @@ -288,162 +288,9 @@
        res = sqlite3_open(filename, &db);
        if (res != SQLITE_OK) {
                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-02-23 22:08:08 +0100
  -@@ -28,10 +28,7 @@
  -             "console {device}"
  - #else
  - 
  --#include <ffmpeg/avcodec.h>
  --#ifndef OLD_FFMPEG
  --#include <ffmpeg/swscale.h>     /* requires a recent ffmpeg */
  --#endif
  -+#include <libavcoded/avcodec.h>
  - 
  - #define CONSOLE_VIDEO_CMDS                  \
  -     "console {videodevice|videocodec"       \
  -Index: configure
  ---- 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
  --     freebsd*)
  --     ac_default_prefix=/usr/local
  --     CPPFLAGS=-I/usr/local/include
  --     LDFLAGS=-L/usr/local/lib
  --     ;;
  --
  -      *)
  -      ac_default_prefix=/usr
  -      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-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
  -    and populated at the end of the module's source file... */
  --const static __attribute__((unused)) struct ast_module_info 
*ast_module_info;
  -+static const __attribute__((unused)) struct ast_module_info 
*ast_module_info;
  - 
  - #if !defined(EMBEDDED_MODULE)
  - #define __MODULE_INFO_SECTION
  -Index: main/Makefile
  ---- main/Makefile.orig       2008-11-29 19:37:55 +0100
  -+++ main/Makefile    2009-02-23 22:08:08 +0100
  -@@ -81,10 +81,7 @@
  - endif
  - 
  - ifeq ($(OSARCH),FreeBSD)
  --  # -V is understood by BSD Make, not by GNU make.
  --  BSDVERSION=$(shell make -V OSVERSION -f /usr/share/mk/bsd.port.subdir.mk)
  --  AST_LIBS+=$(shell if test $(BSDVERSION) -lt 502102 ; then echo "-lc_r"; 
else echo "-pthread"; fi)
  --  AST_LIBS+=-lcrypto
  -+  AST_LIBS+=-lpthread -lcrypto
  - endif
  - 
  - ifneq ($(findstring $(OSARCH), mingw32 cygwin ),)
  -Index: main/file.c
  ---- 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"))
  --            ext = "WAV";
  -+            ext = "wav";
  - 
  -     if (filename[0] == '/') {
  -             if (asprintf(&fn, "%s.%s", filename, ext) < 0) {
  -Index: main/http.c
  ---- 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;
  -     } 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       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)
  -                     ast_verb(0, "SSL CA file(%s)/path(%s) error\n", 
cfg->cafile, cfg->capath);
  -+        SSL_CTX_set_client_CA_list(cfg->ssl_ctx, S_OR(cfg->cafile, NULL));
  -     }
  - 
  -     ast_verb(0, "SSL certificate ok\n");
  -Index: menuselect-tree
  ---- 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>
  -+<member name="app_backticks" displayname="Generic Backticks() application" 
remove_on_change="apps/app_backticks.o apps/app_backticks.so">
  -+</member>
  - <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">
  -@@ -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">
  -+                    <defaultenabled>yes</defaultenabled>
  -             </member>
  -             <member name="CORE-SOUNDS-EN-GSM" displayname="English, GSM 
format" >
  --                    <defaultenabled>yes</defaultenabled>
  -             </member>
  -             <member name="CORE-SOUNDS-EN-G729" displayname="English, G.729 
format">
  -             </member>
  -@@ -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">
  -+                    <defaultenabled>yes</defaultenabled>
  -             </member>
  -             <member name="EXTRA-SOUNDS-EN-GSM" displayname="English, GSM 
format" >
  -             </member>
  -Index: sounds/sounds.xml
  ---- sounds/sounds.xml.orig   2008-03-06 05:46:17 +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>
  -             <member name="CORE-SOUNDS-EN-ALAW" displayname="English, a-Law 
format">
  -+                    <defaultenabled>yes</defaultenabled>
  -             </member>
  -             <member name="CORE-SOUNDS-EN-GSM" displayname="English, GSM 
format" >
  --                    <defaultenabled>yes</defaultenabled>
  -             </member>
  -             <member name="CORE-SOUNDS-EN-G729" displayname="English, G.729 
format">
  -             </member>
  -@@ -64,6 +64,7 @@
  -             <member name="EXTRA-SOUNDS-EN-ULAW" displayname="English, 
mu-Law format">
  -             </member>
  -             <member name="EXTRA-SOUNDS-EN-ALAW" displayname="English, a-Law 
format">
  -+                    <defaultenabled>yes</defaultenabled>
  -             </member>
  -             <member name="EXTRA-SOUNDS-EN-GSM" displayname="English, GSM 
format" >
  -             </member>
   Index: chan_capi-1.1.2/Makefile
   --- chan_capi-1.1.2/Makefile.orig    2009-01-17 18:36:50 +0100
  -+++ chan_capi-1.1.2/Makefile 2009-03-28 18:27:10 +0100
  ++++ chan_capi-1.1.2/Makefile 2009-04-03 09:41:24 +0200
   @@ -90,6 +90,9 @@
    CFLAGS+=-O6
    CFLAGS+=$(shell if $(CC) -march=$(PROC) -S -o /dev/null -xc /dev/null 
>/dev/null 2>&1; then echo "-march=$(PROC)"; fi)
  @@ -456,7 +303,7 @@
    CC=gcc
   Index: chan_capi-1.1.2/chan_capi20.h
   --- chan_capi-1.1.2/chan_capi20.h.orig       2005-09-20 20:33:40 +0200
  -+++ chan_capi-1.1.2/chan_capi20.h    2009-03-28 18:28:02 +0100
  ++++ chan_capi-1.1.2/chan_capi20.h    2009-04-03 09:41:24 +0200
   @@ -8,6 +8,8 @@
    
    #undef CAPI_OS_HINT
  @@ -477,7 +324,7 @@
    #endif
   Index: chan_capi-1.1.2/libcapi20/capi20.c
   --- chan_capi-1.1.2/libcapi20/capi20.c.orig  2008-12-31 17:29:36 +0100
  -+++ chan_capi-1.1.2/libcapi20/capi20.c       2009-03-28 19:25:29 +0100
  ++++ chan_capi-1.1.2/libcapi20/capi20.c       2009-04-03 09:41:24 +0200
   @@ -19,8 +19,10 @@
    #include <stdio.h>
    #include <ctype.h>
  @@ -789,7 +636,7 @@
     * functions added to the CAPI2.0 spec
   Index: chan_capi-1.1.2/libcapi20/convert.c
   --- chan_capi-1.1.2/libcapi20/convert.c.orig 2008-03-13 12:02:41 +0100
  -+++ chan_capi-1.1.2/libcapi20/convert.c      2009-03-28 18:34:40 +0100
  ++++ chan_capi-1.1.2/libcapi20/convert.c      2009-04-03 09:41:24 +0200
   @@ -11,7 +11,14 @@
    #include <stddef.h>
    #include <time.h>
  @@ -805,3 +652,156 @@
    
    #include "capi20.h"
    
  +Index: channels/console_video.h
  +--- channels/console_video.h.orig    2008-01-09 19:03:40 +0100
  ++++ channels/console_video.h 2009-04-03 09:41:24 +0200
  +@@ -28,10 +28,7 @@
  +             "console {device}"
  + #else
  + 
  +-#include <ffmpeg/avcodec.h>
  +-#ifndef OLD_FFMPEG
  +-#include <ffmpeg/swscale.h>     /* requires a recent ffmpeg */
  +-#endif
  ++#include <libavcoded/avcodec.h>
  + 
  + #define CONSOLE_VIDEO_CMDS                  \
  +     "console {videodevice|videocodec"       \
  +Index: configure
  +--- configure.orig   2009-03-18 15:24:27 +0100
  ++++ configure        2009-04-03 09:42:04 +0200
  +@@ -4040,12 +4040,6 @@
  +     # note- does not work on FreeBSD
  + 
  + case "${host_os}" in
  +-     freebsd*)
  +-     ac_default_prefix=/usr/local
  +-     CPPFLAGS=-I/usr/local/include
  +-     LDFLAGS=-L/usr/local/lib
  +-     ;;
  +-
  +      darwin*)
  + 
  + cat >>confdefs.h <<\_ACEOF
  +Index: include/asterisk/module.h
  +--- include/asterisk/module.h.orig   2008-11-29 19:37:55 +0100
  ++++ include/asterisk/module.h        2009-04-03 09:41:24 +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
  +    and populated at the end of the module's source file... */
  +-const static __attribute__((unused)) struct ast_module_info 
*ast_module_info;
  ++static const __attribute__((unused)) struct ast_module_info 
*ast_module_info;
  + 
  + #if !defined(EMBEDDED_MODULE)
  + #define __MODULE_INFO_SECTION
  +Index: main/Makefile
  +--- main/Makefile.orig       2009-03-18 15:24:27 +0100
  ++++ main/Makefile    2009-04-03 09:41:24 +0200
  +@@ -72,10 +72,7 @@
  + endif
  + 
  + ifeq ($(OSARCH),FreeBSD)
  +-  # -V is understood by BSD Make, not by GNU make.
  +-  BSDVERSION=$(shell make -V OSVERSION -f /usr/share/mk/bsd.port.subdir.mk)
  +-  AST_LIBS+=$(shell if test $(BSDVERSION) -lt 502102 ; then echo "-lc_r"; 
else echo "-pthread"; fi)
  +-  AST_LIBS+=-lcrypto
  ++  AST_LIBS+=-lpthread -lcrypto
  + endif
  + 
  + ifneq ($(findstring $(OSARCH), mingw32 cygwin ),)
  +Index: main/file.c
  +--- main/file.c.orig 2009-02-04 16:30:54 +0100
  ++++ main/file.c      2009-04-03 09:41:24 +0200
  +@@ -247,7 +247,7 @@
  +     char *fn = NULL;
  + 
  +     if (!strcmp(ext, "wav49"))
  +-            ext = "WAV";
  ++            ext = "wav";
  + 
  +     if (filename[0] == '/') {
  +             if (asprintf(&fn, "%s.%s", filename, ext) < 0) {
  +Index: main/http.c
  +--- main/http.c.orig 2009-01-14 00:11:19 +0100
  ++++ main/http.c      2009-04-03 09:41:24 +0200
  +@@ -435,14 +435,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       2009-02-04 19:55:32 +0100
  ++++ main/tcptls.c    2009-04-03 09:41:24 +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);
  ++        SSL_CTX_set_client_CA_list(cfg->ssl_ctx, S_OR(cfg->cafile, NULL));
  +     }
  + 
  +     ast_verb(0, "SSL certificate ok\n");
  +Index: menuselect-tree
  +--- menuselect-tree.orig     2009-04-02 19:47:58 +0200
  ++++ menuselect-tree  2009-04-03 09:41:24 +0200
  +@@ -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>
  ++<member name="app_backticks" displayname="Generic Backticks() application" 
remove_on_change="apps/app_backticks.o apps/app_backticks.so">
  ++</member>
  + <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">
  +@@ -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">
  ++                    <defaultenabled>yes</defaultenabled>
  +             </member>
  +             <member name="CORE-SOUNDS-EN-GSM" displayname="English, GSM 
format" >
  +-                    <defaultenabled>yes</defaultenabled>
  +             </member>
  +             <member name="CORE-SOUNDS-EN-G729" displayname="English, G.729 
format">
  +             </member>
  +@@ -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">
  ++                    <defaultenabled>yes</defaultenabled>
  +             </member>
  +             <member name="EXTRA-SOUNDS-EN-GSM" displayname="English, GSM 
format" >
  +             </member>
  +Index: sounds/sounds.xml
  +--- sounds/sounds.xml.orig   2008-03-06 05:46:17 +0100
  ++++ sounds/sounds.xml        2009-04-03 09:41:24 +0200
  +@@ -4,9 +4,9 @@
  +             <member name="CORE-SOUNDS-EN-ULAW" displayname="English, mu-Law 
format">
  +             </member>
  +             <member name="CORE-SOUNDS-EN-ALAW" displayname="English, a-Law 
format">
  ++                    <defaultenabled>yes</defaultenabled>
  +             </member>
  +             <member name="CORE-SOUNDS-EN-GSM" displayname="English, GSM 
format" >
  +-                    <defaultenabled>yes</defaultenabled>
  +             </member>
  +             <member name="CORE-SOUNDS-EN-G729" displayname="English, G.729 
format">
  +             </member>
  +@@ -64,6 +64,7 @@
  +             <member name="EXTRA-SOUNDS-EN-ULAW" displayname="English, 
mu-Law format">
  +             </member>
  +             <member name="EXTRA-SOUNDS-EN-ALAW" displayname="English, a-Law 
format">
  ++                    <defaultenabled>yes</defaultenabled>
  +             </member>
  +             <member name="EXTRA-SOUNDS-EN-GSM" displayname="English, GSM 
format" >
  +             </member>
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/asterisk/asterisk.spec
  ============================================================================
  $ cvs diff -u -r1.90 -r1.91 asterisk.spec
  --- openpkg-src/asterisk/asterisk.spec        28 Mar 2009 19:14:52 -0000      
1.90
  +++ openpkg-src/asterisk/asterisk.spec        3 Apr 2009 07:53:24 -0000       
1.91
  @@ -22,8 +22,8 @@
   ##
   
   #   package version
  -%define       V_opkg                     1.6.0.6
  -%define       V_asterisk                 1.6.0.6
  +%define       V_opkg                     1.6.0.8
  +%define       V_asterisk                 1.6.0.8
   %define       V_asterisk_addons          1.6.0.1
   %define       V_asterisk_sounds_core_en  1.4.15
   %define       V_asterisk_sounds_core_de  current
  @@ -41,7 +41,7 @@
   Group:        VoIP
   License:      GPL
   Version:      %{V_opkg}
  -Release:      20090328
  +Release:      20090403
   
   #   package options
   %option       with_dahdi   no
  @@ .
______________________________________________________________________
OpenPKG                                             http://openpkg.org
CVS Repository Commit List                     openpkg-cvs@openpkg.org

Reply via email to