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: 20-Dec-2009 11:34:21
Branch: HEAD Handle: 2009122010342000
Modified files:
openpkg-src/asterisk asterisk.patch asterisk.spec
Log:
upgrading package: asterisk 1.6.1.11 -> 1.6.2.0
Summary:
Revision Changes Path
1.53 +69 -58 openpkg-src/asterisk/asterisk.patch
1.109 +4 -4 openpkg-src/asterisk/asterisk.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/asterisk/asterisk.patch
============================================================================
$ cvs diff -u -r1.52 -r1.53 asterisk.patch
--- openpkg-src/asterisk/asterisk.patch 30 Aug 2009 20:29:00 -0000
1.52
+++ openpkg-src/asterisk/asterisk.patch 20 Dec 2009 10:34:20 -0000
1.53
@@ -1,7 +1,7 @@
Index: Makefile
---- Makefile.orig 2009-08-04 16:54:45 +0200
-+++ Makefile 2009-08-30 22:11:17 +0200
-@@ -116,42 +116,20 @@
+--- Makefile.orig 2009-11-03 21:01:30 +0100
++++ Makefile 2009-12-20 11:05:32 +0100
+@@ -126,42 +126,19 @@
# Define standard directories for various platforms
# These apply if they are not redefined in asterisk.conf
@@ -26,9 +26,10 @@
ASTSBINDIR=$(sbindir)
- ASTSPOOLDIR=$(localstatedir)/spool/asterisk
- ASTLOGDIR=$(localstatedir)/log/asterisk
+- ASTVARRUNDIR=$(localstatedir)/run/asterisk
+ ASTSPOOLDIR=$(localstatedir)/spool
+ ASTLOGDIR=$(localstatedir)/log
- ASTVARRUNDIR=$(localstatedir)/run
++ ASTVARRUNDIR=$(localstatedir)/run
ASTMANDIR=$(mandir)
-ifneq ($(findstring BSD,$(OSARCH)),)
ASTVARLIBDIR=$(prefix)/share/asterisk
@@ -38,7 +39,6 @@
- ASTVARLIBDIR=$(localstatedir)/lib/asterisk
- ASTDBDIR=$(ASTVARLIBDIR)
-endif
-+ ASTVARRUNDIR=$(localstatedir)/run
+ ASTDBDIR=$(localstatedir)/db
ASTKEYDIR=$(ASTVARLIBDIR)
-endif
@@ -48,7 +48,7 @@
# Asterisk.conf is located in ASTETCDIR or by using the -C flag
# when starting Asterisk
-@@ -251,12 +229,6 @@
+@@ -261,12 +238,6 @@
_ASTCFLAGS+=-fsigned-char
endif
@@ -61,10 +61,10 @@
ifeq ($(OSARCH),NetBSD)
_ASTCFLAGS+=-pthread -I/usr/pkg/include
endif
-@@ -525,8 +497,7 @@
- if [ -n "$(OLDHEADERS)" ]; then \
- rm -f $(addprefix $(DESTDIR)$(ASTHEADERDIR)/,$(OLDHEADERS)) ;\
+@@ -566,8 +537,7 @@
fi
+ mkdir -p $(DESTDIR)$(ASTDATADIR)/documentation
+ mkdir -p $(DESTDIR)$(ASTDATADIR)/documentation/thirdparty
- mkdir -p $(DESTDIR)$(ASTLOGDIR)/cdr-csv
- mkdir -p $(DESTDIR)$(ASTLOGDIR)/cdr-custom
+ mkdir -p $(DESTDIR)$(ASTLOGDIR)/cdr
@@ -72,13 +72,13 @@
mkdir -p $(DESTDIR)$(ASTDATADIR)/firmware
mkdir -p $(DESTDIR)$(ASTDATADIR)/firmware/iax
Index: apps/app_backticks.c
---- /dev/null 2009-08-30 22:11:23 +0200
-+++ apps/app_backticks.c 2009-08-30 22:08:00 +0200
+--- /dev/null 2009-12-20 11:05:01 +0100
++++ apps/app_backticks.c 2009-12-20 11:01:03 +0100
@@ -0,0 +1,129 @@
+
+#include "asterisk.h"
+
-+ASTERISK_FILE_VERSION(__FILE__, "$Revision: 1.52 $")
++ASTERISK_FILE_VERSION(__FILE__, "$Revision: 1.53 $")
+
+#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-08-10 21:30:55 +0200
-+++ apps/app_meetme.c 2009-08-30 22:08:00 +0200
-@@ -163,6 +163,7 @@
+--- apps/app_meetme.c.orig 2009-11-05 23:13:45 +0100
++++ apps/app_meetme.c 2009-12-20 11:01:03 +0100
+@@ -522,6 +522,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 @@
+@@ -531,6 +532,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
-@@ -204,6 +206,7 @@
+@@ -563,6 +565,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";
-@@ -1876,6 +1879,12 @@
+@@ -2211,6 +2214,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) {
-@@ -1892,6 +1901,7 @@
+@@ -2227,6 +2236,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-08-30 22:08:00 +0200
++++ build_tools/make_defaults_h 2009-12-20 11:01:03 +0100
@@ -17,7 +17,7 @@
#define DEFAULT_PID "${INSTALL_PATH}${ASTVARRUNDIR}/asterisk.pid"
@@ -265,9 +265,9 @@
#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 2008-11-20 19:23:03 +0100
-+++ cdr/cdr_custom.c 2009-08-30 22:08:00 +0200
-@@ -78,7 +78,7 @@
+--- cdr/cdr_custom.c.orig 2008-11-20 18:48:58 +0100
++++ cdr/cdr_custom.c 2009-12-20 11:01:03 +0100
+@@ -83,7 +83,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);
strcat(format,"\n");
@@ -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 2009-06-22 18:31:02 +0200
-+++ cdr/cdr_sqlite3_custom.c 2009-08-30 22:08:00 +0200
-@@ -304,7 +304,7 @@
+--- cdr/cdr_sqlite3_custom.c.orig 2009-10-09 19:27:48 +0200
++++ cdr/cdr_sqlite3_custom.c 2009-12-20 11:01:03 +0100
+@@ -296,7 +296,7 @@
}
/* is the database there? */
@@ -290,7 +290,7 @@
ast_log(LOG_ERROR, "Could not open database %s.\n", filename);
Index: chan_capi-1.1.4/Makefile
--- chan_capi-1.1.4/Makefile.orig 2009-07-23 16:11:08 +0200
-+++ chan_capi-1.1.4/Makefile 2009-08-30 22:08:00 +0200
++++ chan_capi-1.1.4/Makefile 2009-12-20 11:01:03 +0100
@@ -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)
@@ -303,7 +303,7 @@
CC=gcc
Index: chan_capi-1.1.4/chan_capi20.h
--- chan_capi-1.1.4/chan_capi20.h.orig 2005-09-20 20:33:40 +0200
-+++ chan_capi-1.1.4/chan_capi20.h 2009-08-30 22:08:00 +0200
++++ chan_capi-1.1.4/chan_capi20.h 2009-12-20 11:01:03 +0100
@@ -8,6 +8,8 @@
#undef CAPI_OS_HINT
@@ -324,7 +324,7 @@
#endif
Index: chan_capi-1.1.4/chan_capi_utils.c
--- chan_capi-1.1.4/chan_capi_utils.c.orig 2009-07-23 16:11:08 +0200
-+++ chan_capi-1.1.4/chan_capi_utils.c 2009-08-30 22:08:00 +0200
++++ chan_capi-1.1.4/chan_capi_utils.c 2009-12-20 11:01:03 +0100
@@ -1087,6 +1087,9 @@
{
MESSAGE_EXCHANGE_ERROR error;
@@ -337,7 +337,7 @@
Index: chan_capi-1.1.4/libcapi20/capi20.c
--- chan_capi-1.1.4/libcapi20/capi20.c.orig 2009-07-23 16:11:08 +0200
-+++ chan_capi-1.1.4/libcapi20/capi20.c 2009-08-30 22:08:00 +0200
++++ chan_capi-1.1.4/libcapi20/capi20.c 2009-12-20 11:01:03 +0100
@@ -19,8 +19,10 @@
#include <stdio.h>
#include <ctype.h>
@@ -649,7 +649,7 @@
* functions added to the CAPI2.0 spec
Index: chan_capi-1.1.4/libcapi20/convert.c
--- chan_capi-1.1.4/libcapi20/convert.c.orig 2009-07-23 16:11:08 +0200
-+++ chan_capi-1.1.4/libcapi20/convert.c 2009-08-30 22:08:00 +0200
++++ chan_capi-1.1.4/libcapi20/convert.c 2009-12-20 11:01:03 +0100
@@ -11,7 +11,14 @@
#include <stddef.h>
#include <time.h>
@@ -667,7 +667,7 @@
Index: channels/console_video.h
--- channels/console_video.h.orig 2008-06-30 17:45:15 +0200
-+++ channels/console_video.h 2009-08-30 22:08:00 +0200
++++ channels/console_video.h 2009-12-20 11:01:03 +0100
@@ -28,10 +28,7 @@
"console {device}"
#else
@@ -681,9 +681,9 @@
#define CONSOLE_VIDEO_CMDS \
"console {videodevice|videocodec" \
Index: configure
---- configure.orig 2009-06-16 21:28:00 +0200
-+++ configure 2009-08-30 22:08:00 +0200
-@@ -4179,12 +4179,6 @@
+--- configure.orig 2009-10-27 01:16:39 +0100
++++ configure 2009-12-20 11:02:57 +0100
+@@ -4105,11 +4105,6 @@
# note- does not work on FreeBSD
case "${host_os}" in
@@ -692,14 +692,13 @@
- CPPFLAGS=-I/usr/local/include
- LDFLAGS=-L/usr/local/lib
- ;;
--
- darwin*)
-
- cat >>confdefs.h <<\_ACEOF
+ openbsd*)
+ ac_default_prefix=/usr/local
+ if test ${prefix} = '/usr/local' || test ${prefix} = 'NONE'; then
Index: main/Makefile
---- main/Makefile.orig 2009-08-01 03:25:04 +0200
-+++ main/Makefile 2009-08-30 22:08:00 +0200
-@@ -72,10 +72,7 @@
+--- main/Makefile.orig 2009-11-03 21:01:30 +0100
++++ main/Makefile 2009-12-20 11:01:03 +0100
+@@ -75,10 +75,7 @@
endif
ifeq ($(OSARCH),FreeBSD)
@@ -712,8 +711,8 @@
ifneq ($(findstring $(OSARCH), mingw32 cygwin ),)
Index: main/file.c
---- main/file.c.orig 2009-06-26 23:26:50 +0200
-+++ main/file.c 2009-08-30 22:08:00 +0200
+--- main/file.c.orig 2009-12-02 00:36:12 +0100
++++ main/file.c 2009-12-20 11:01:03 +0100
@@ -254,7 +254,7 @@
char *fn = NULL;
@@ -724,9 +723,9 @@
if (filename[0] == '/') {
if (asprintf(&fn, "%s.%s", filename, ext) < 0) {
Index: main/tcptls.c
---- main/tcptls.c.orig 2009-03-09 22:22:42 +0100
-+++ main/tcptls.c 2009-08-30 22:08:00 +0200
-@@ -314,6 +314,7 @@
+--- main/tcptls.c.orig 2009-10-22 23:55:48 +0200
++++ main/tcptls.c 2009-12-20 11:01:03 +0100
+@@ -319,6 +319,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);
@@ -735,9 +734,9 @@
ast_verb(0, "SSL certificate ok\n");
Index: menuselect-tree
---- menuselect-tree.orig 2009-08-28 17:49:18 +0200
-+++ menuselect-tree 2009-08-30 22:08:00 +0200
-@@ -148,6 +148,8 @@
+--- menuselect-tree.orig 2009-12-17 21:31:44 +0100
++++ menuselect-tree 2009-12-20 11:01:03 +0100
+@@ -153,6 +153,8 @@
</member>
<member name="app_system" displayname="Generic System() application"
remove_on_change="apps/app_system.o apps/app_system.so">
</member>
@@ -746,7 +745,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">
-@@ -654,9 +656,9 @@
+@@ -684,9 +686,9 @@
<member name="CORE-SOUNDS-EN-ULAW" displayname="English, mu-Law
format">
</member>
<member name="CORE-SOUNDS-EN-ALAW" displayname="English, a-Law
format">
@@ -757,7 +756,7 @@
</member>
<member name="CORE-SOUNDS-EN-G729" displayname="English, G.729
format">
</member>
-@@ -716,6 +718,7 @@
+@@ -762,6 +764,7 @@
<member name="EXTRA-SOUNDS-EN-ULAW" displayname="English,
mu-Law format">
</member>
<member name="EXTRA-SOUNDS-EN-ALAW" displayname="English, a-Law
format">
@@ -766,9 +765,9 @@
<member name="EXTRA-SOUNDS-EN-GSM" displayname="English, GSM
format" >
</member>
Index: res/res_http_post.c
---- res/res_http_post.c.orig 2009-08-10 21:30:55 +0200
-+++ res/res_http_post.c 2009-08-30 22:08:00 +0200
-@@ -119,14 +119,8 @@
+--- res/res_http_post.c.orig 2009-10-27 18:12:09 +0100
++++ res/res_http_post.c 2009-12-20 11:01:03 +0100
+@@ -122,14 +122,8 @@
ast_log(LOG_WARNING, "Got unexpected
GMIME_IS_MESSAGE_PARTIAL\n");
return;
} else if (GMIME_IS_MULTIPART(part)) {
@@ -786,8 +785,8 @@
const char *filename;
Index: sounds/sounds.xml
---- sounds/sounds.xml.orig 2009-08-18 22:42:51 +0200
-+++ sounds/sounds.xml 2009-08-30 22:08:00 +0200
+--- sounds/sounds.xml.orig 2009-08-18 22:31:40 +0200
++++ sounds/sounds.xml 2009-12-20 11:01:03 +0100
@@ -4,9 +4,9 @@
<member name="CORE-SOUNDS-EN-ULAW" displayname="English, mu-Law
format">
</member>
@@ -799,7 +798,7 @@
</member>
<member name="CORE-SOUNDS-EN-G729" displayname="English, G.729
format">
</member>
-@@ -66,6 +66,7 @@
+@@ -82,6 +82,7 @@
<member name="EXTRA-SOUNDS-EN-ULAW" displayname="English,
mu-Law format">
</member>
<member name="EXTRA-SOUNDS-EN-ALAW" displayname="English, a-Law
format">
@@ -807,3 +806,15 @@
</member>
<member name="EXTRA-SOUNDS-EN-GSM" displayname="English, GSM
format" >
</member>
+Index: asterisk-addons-1.6.2.0/Makefile
+--- asterisk-addons-1.6.2.0/Makefile.orig 2008-11-06 18:44:05 +0100
++++ asterisk-addons-1.6.2.0/Makefile 2009-12-20 11:23:47 +0100
+@@ -185,7 +185,7 @@
+
+ install-xmldoc: doc/addons-en_US.xml
+ @echo "Installing XML documentation"
+- @$(INSTALL) -m 644 doc/addons-*.xml $(ASTDATADIR)/documentation
++ @$(INSTALL) -m 644 doc/addons-*.xml
$(DESTDIR)$(ASTDATADIR)/documentation
+
+ cleantest:
+
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/asterisk/asterisk.spec
============================================================================
$ cvs diff -u -r1.108 -r1.109 asterisk.spec
--- openpkg-src/asterisk/asterisk.spec 4 Dec 2009 10:56:33 -0000
1.108
+++ openpkg-src/asterisk/asterisk.spec 20 Dec 2009 10:34:20 -0000
1.109
@@ -22,9 +22,9 @@
##
# package version
-%define V_opkg 1.6.1.11
-%define V_asterisk 1.6.1.11
-%define V_asterisk_addons 1.6.1.2
+%define V_opkg 1.6.2.0
+%define V_asterisk 1.6.2.0
+%define V_asterisk_addons 1.6.2.0
%define V_asterisk_sounds_core_en 1.4.16
%define V_asterisk_sounds_core_de current
%define V_asterisk_sounds_extra_en 1.4.9
@@ -41,7 +41,7 @@
Group: VoIP
License: GPL
Version: %{V_opkg}
-Release: 20091204
+Release: 20091220
# package options
%option with_dahdi no
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
