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: 30-Aug-2009 22:29:01
Branch: HEAD Handle: 2009083021290000
Modified files:
openpkg-src/asterisk asterisk.patch asterisk.spec
Log:
upgrading package: asterisk 1.6.1.4 -> 1.6.1.5
Summary:
Revision Changes Path
1.52 +42 -42 openpkg-src/asterisk/asterisk.patch
1.101 +3 -3 openpkg-src/asterisk/asterisk.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/asterisk/asterisk.patch
============================================================================
$ cvs diff -u -r1.51 -r1.52 asterisk.patch
--- openpkg-src/asterisk/asterisk.patch 16 Aug 2009 15:57:36 -0000
1.51
+++ openpkg-src/asterisk/asterisk.patch 30 Aug 2009 20:29:00 -0000
1.52
@@ -1,7 +1,7 @@
Index: Makefile
---- Makefile.orig 2009-02-24 21:44:50 +0100
-+++ Makefile 2009-08-05 20:40:23 +0200
-@@ -122,42 +122,20 @@
+--- Makefile.orig 2009-08-04 16:54:45 +0200
++++ Makefile 2009-08-30 22:11:17 +0200
+@@ -116,42 +116,20 @@
# Define standard directories for various platforms
# These apply if they are not redefined in asterisk.conf
@@ -48,20 +48,20 @@
# Asterisk.conf is located in ASTETCDIR or by using the -C flag
# when starting Asterisk
-@@ -258,12 +236,6 @@
- ASTCFLAGS+=-fsigned-char
+@@ -251,12 +229,6 @@
+ _ASTCFLAGS+=-fsigned-char
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)
-- ASTCFLAGS+=$(shell if test $(BSDVERSION) -lt 500016 ; then echo
"-D_THREAD_SAFE"; fi)
+- _ASTCFLAGS+=$(shell if test $(BSDVERSION) -lt 500016 ; then echo
"-D_THREAD_SAFE"; fi)
-endif
-
ifeq ($(OSARCH),NetBSD)
- ASTCFLAGS+=-pthread -I/usr/pkg/include
+ _ASTCFLAGS+=-pthread -I/usr/pkg/include
endif
-@@ -534,8 +506,7 @@
+@@ -525,8 +497,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 2009-08-05 20:40:27 +0200
-+++ apps/app_backticks.c 2009-08-05 20:40:23 +0200
+--- /dev/null 2009-08-30 22:11:23 +0200
++++ apps/app_backticks.c 2009-08-30 22:08:00 +0200
@@ -0,0 +1,129 @@
+
+#include "asterisk.h"
+
-+ASTERISK_FILE_VERSION(__FILE__, "$Revision: 1.51 $")
++ASTERISK_FILE_VERSION(__FILE__, "$Revision: 1.52 $")
+
+#include <stdio.h>
+#include <asterisk/file.h>
@@ -205,8 +205,8 @@
+AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "BACKTICKS() dialplan function");
+
Index: apps/app_meetme.c
---- apps/app_meetme.c.orig 2009-03-03 00:39:56 +0100
-+++ apps/app_meetme.c 2009-08-05 20:40:23 +0200
+--- 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 @@
CONFFLAG_DURATION_LIMIT = (1 << 30),
/*! Do not write any audio to this channel until the state is up. */
@@ -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-05 20:40:23 +0200
++++ build_tools/make_defaults_h 2009-08-30 22:08:00 +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-11-20 19:23:03 +0100
-+++ cdr/cdr_custom.c 2009-08-05 20:40:23 +0200
++++ cdr/cdr_custom.c 2009-08-30 22:08:00 +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,10 +277,10 @@
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-03-02 18:19:41 +0100
-+++ cdr/cdr_sqlite3_custom.c 2009-08-05 20:40:23 +0200
-@@ -322,7 +322,7 @@
- return AST_MODULE_LOAD_DECLINE;
+--- 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 @@
+ }
/* is the database there? */
- snprintf(filename, sizeof(filename), "%s/master.db",
ast_config_AST_LOG_DIR);
@@ -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-05 20:40:23 +0200
++++ chan_capi-1.1.4/Makefile 2009-08-30 22:08:00 +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)
@@ -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-05 20:40:23 +0200
++++ chan_capi-1.1.4/chan_capi20.h 2009-08-30 22:08:00 +0200
@@ -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-05 20:41:26 +0200
++++ chan_capi-1.1.4/chan_capi_utils.c 2009-08-30 22:08:00 +0200
@@ -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-05 20:40:23 +0200
++++ chan_capi-1.1.4/libcapi20/capi20.c 2009-08-30 22:08:00 +0200
@@ -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-05 20:40:23 +0200
++++ chan_capi-1.1.4/libcapi20/convert.c 2009-08-30 22:08:00 +0200
@@ -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-05 20:40:23 +0200
++++ channels/console_video.h 2009-08-30 22:08:00 +0200
@@ -28,10 +28,7 @@
"console {device}"
#else
@@ -681,9 +681,9 @@
#define CONSOLE_VIDEO_CMDS \
"console {videodevice|videocodec" \
Index: configure
---- configure.orig 2009-03-19 19:14:55 +0100
-+++ configure 2009-08-05 20:40:23 +0200
-@@ -4053,12 +4053,6 @@
+--- configure.orig 2009-06-16 21:28:00 +0200
++++ configure 2009-08-30 22:08:00 +0200
+@@ -4179,12 +4179,6 @@
# note- does not work on FreeBSD
case "${host_os}" in
@@ -697,8 +697,8 @@
cat >>confdefs.h <<\_ACEOF
Index: main/Makefile
---- main/Makefile.orig 2009-04-09 07:16:25 +0200
-+++ main/Makefile 2009-08-05 20:40:23 +0200
+--- main/Makefile.orig 2009-08-01 03:25:04 +0200
++++ main/Makefile 2009-08-30 22:08:00 +0200
@@ -72,10 +72,7 @@
endif
@@ -712,9 +712,9 @@
ifneq ($(findstring $(OSARCH), mingw32 cygwin ),)
Index: main/file.c
---- main/file.c.orig 2009-04-15 22:20:23 +0200
-+++ main/file.c 2009-08-05 20:40:23 +0200
-@@ -248,7 +248,7 @@
+--- main/file.c.orig 2009-06-26 23:26:50 +0200
++++ main/file.c 2009-08-30 22:08:00 +0200
+@@ -254,7 +254,7 @@
char *fn = NULL;
if (!strcmp(ext, "wav49"))
@@ -725,7 +725,7 @@
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-05 20:40:23 +0200
++++ main/tcptls.c 2009-08-30 22:08:00 +0200
@@ -314,6 +314,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)
@@ -735,8 +735,8 @@
ast_verb(0, "SSL certificate ok\n");
Index: menuselect-tree
---- menuselect-tree.orig 2009-07-27 23:05:03 +0200
-+++ menuselect-tree 2009-08-05 20:40:23 +0200
+--- menuselect-tree.orig 2009-08-28 17:49:18 +0200
++++ menuselect-tree 2009-08-30 22:08:00 +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">
@@ -746,7 +746,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">
-@@ -647,9 +649,9 @@
+@@ -654,9 +656,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 +757,7 @@
</member>
<member name="CORE-SOUNDS-EN-G729" displayname="English, G.729
format">
</member>
-@@ -709,6 +711,7 @@
+@@ -716,6 +718,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,8 +766,8 @@
<member name="EXTRA-SOUNDS-EN-GSM" displayname="English, GSM
format" >
</member>
Index: res/res_http_post.c
---- res/res_http_post.c.orig 2009-01-14 00:14:29 +0100
-+++ res/res_http_post.c 2009-08-05 20:40:23 +0200
+--- 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 @@
ast_log(LOG_WARNING, "Got unexpected
GMIME_IS_MESSAGE_PARTIAL\n");
return;
@@ -786,8 +786,8 @@
const char *filename;
Index: sounds/sounds.xml
---- sounds/sounds.xml.orig 2008-10-09 22:01:38 +0200
-+++ sounds/sounds.xml 2009-08-05 20:40:23 +0200
+--- sounds/sounds.xml.orig 2009-08-18 22:42:51 +0200
++++ sounds/sounds.xml 2009-08-30 22:08:00 +0200
@@ -4,9 +4,9 @@
<member name="CORE-SOUNDS-EN-ULAW" displayname="English, mu-Law
format">
</member>
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/asterisk/asterisk.spec
============================================================================
$ cvs diff -u -r1.100 -r1.101 asterisk.spec
--- openpkg-src/asterisk/asterisk.spec 16 Aug 2009 15:57:36 -0000
1.100
+++ openpkg-src/asterisk/asterisk.spec 30 Aug 2009 20:29:00 -0000
1.101
@@ -22,8 +22,8 @@
##
# package version
-%define V_opkg 1.6.1.4
-%define V_asterisk 1.6.1.4
+%define V_opkg 1.6.1.5
+%define V_asterisk 1.6.1.5
%define V_asterisk_addons 1.6.1.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: 20090816
+Release: 20090830
# package options
%option with_dahdi no
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
