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: 04-May-2009 14:08:45 Branch: HEAD Handle: 2009050413084500 Modified files: openpkg-src/asterisk asterisk.patch asterisk.spec Log: upgrading package: asterisk 1.6.0.9 -> 1.6.1.0 Summary: Revision Changes Path 1.48 +77 -76 openpkg-src/asterisk/asterisk.patch 1.94 +19 -15 openpkg-src/asterisk/asterisk.spec ____________________________________________________________________________ patch -p0 <<'@@ .' Index: openpkg-src/asterisk/asterisk.patch ============================================================================ $ cvs diff -u -r1.47 -r1.48 asterisk.patch --- openpkg-src/asterisk/asterisk.patch 3 Apr 2009 07:53:24 -0000 1.47 +++ openpkg-src/asterisk/asterisk.patch 4 May 2009 12:08:45 -0000 1.48 @@ -1,6 +1,6 @@ Index: Makefile ---- Makefile.orig 2008-12-03 01:53:56 +0100 -+++ Makefile 2009-04-03 09:41:24 +0200 +--- Makefile.orig 2009-02-24 21:44:50 +0100 ++++ Makefile 2009-05-04 12:48:53 +0200 @@ -122,42 +122,20 @@ # Define standard directories for various platforms @@ -48,7 +48,7 @@ # Asterisk.conf is located in ASTETCDIR or by using the -C flag # when starting Asterisk -@@ -250,12 +228,6 @@ +@@ -258,12 +236,6 @@ ASTCFLAGS+=-fsigned-char endif @@ -61,7 +61,7 @@ ifeq ($(OSARCH),NetBSD) ASTCFLAGS+=-pthread -I/usr/pkg/include endif -@@ -526,8 +498,7 @@ +@@ -534,8 +506,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-04-03 09:41:48 +0200 -+++ apps/app_backticks.c 2009-04-03 09:41:24 +0200 +--- /dev/null 2009-05-04 12:48:56 +0200 ++++ apps/app_backticks.c 2009-05-04 12:48:53 +0200 @@ -0,0 +1,129 @@ + +#include "asterisk.h" + -+ASTERISK_FILE_VERSION(__FILE__, "$Revision: 1.47 $") ++ASTERISK_FILE_VERSION(__FILE__, "$Revision: 1.48 $") + +#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-03-03 00:38:23 +0100 -+++ apps/app_meetme.c 2009-04-03 09:41:24 +0200 -@@ -165,6 +165,7 @@ +--- apps/app_meetme.c.orig 2009-03-03 00:39:56 +0100 ++++ apps/app_meetme.c 2009-05-04 12:48:53 +0200 +@@ -163,6 +163,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 { -@@ -174,6 +175,7 @@ +@@ -172,6 +173,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 -@@ -206,6 +208,7 @@ +@@ -204,6 +206,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"; -@@ -1832,6 +1835,12 @@ +@@ -1876,6 +1879,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) { -@@ -1848,6 +1857,7 @@ +@@ -1892,6 +1901,7 @@ res = ast_record_review(chan, "vm-rec-name", user->namerecloc, 10, "sln", &duration, NULL); if (res == -1) goto outrun; @@ -252,9 +252,21 @@ } ast_mutex_lock(&conf->playlock); +Index: asterisk-addons-1.6.1.0/Makefile +--- asterisk-addons-1.6.1.0/Makefile.orig 2008-11-06 18:44:05 +0100 ++++ asterisk-addons-1.6.1.0/Makefile 2009-05-04 12:48:53 +0200 +@@ -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: + 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-04-03 09:41:24 +0200 ++++ build_tools/make_defaults_h 2009-05-04 12:48:53 +0200 @@ -17,7 +17,7 @@ #define DEFAULT_PID "${INSTALL_PATH}${ASTVARRUNDIR}/asterisk.pid" @@ -265,8 +277,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 2008-03-25 23:52:24 +0100 -+++ cdr/cdr_custom.c 2009-04-03 09:41:24 +0200 +--- cdr/cdr_custom.c.orig 2008-11-20 19:23:03 +0100 ++++ cdr/cdr_custom.c 2009-05-04 12:48:53 +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); @@ -274,11 +286,11 @@ - snprintf(master, sizeof(master),"%s/%s/%s", ast_config_AST_LOG_DIR, name, var->name); + snprintf(master, sizeof(master),"%s/cdr/%s", ast_config_AST_LOG_DIR, var->name); if (var->next) { - 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); + 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:16:57 +0100 -+++ cdr/cdr_sqlite3_custom.c 2009-04-03 09:41:24 +0200 +--- cdr/cdr_sqlite3_custom.c.orig 2009-03-02 18:19:41 +0100 ++++ cdr/cdr_sqlite3_custom.c 2009-05-04 12:48:53 +0200 @@ -322,7 +322,7 @@ return AST_MODULE_LOAD_DECLINE; @@ -290,7 +302,7 @@ ast_log(LOG_ERROR, "Could not open database %s.\n", filename); 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-04-03 09:41:24 +0200 ++++ chan_capi-1.1.2/Makefile 2009-05-04 12:48:53 +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 +315,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-04-03 09:41:24 +0200 ++++ chan_capi-1.1.2/chan_capi20.h 2009-05-04 12:48:53 +0200 @@ -8,6 +8,8 @@ #undef CAPI_OS_HINT @@ -324,7 +336,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-04-03 09:41:24 +0200 ++++ chan_capi-1.1.2/libcapi20/capi20.c 2009-05-04 12:48:53 +0200 @@ -19,8 +19,10 @@ #include <stdio.h> #include <ctype.h> @@ -636,7 +648,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-04-03 09:41:24 +0200 ++++ chan_capi-1.1.2/libcapi20/convert.c 2009-05-04 12:48:53 +0200 @@ -11,7 +11,14 @@ #include <stddef.h> #include <time.h> @@ -653,8 +665,8 @@ #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 +--- channels/console_video.h.orig 2008-06-30 17:45:15 +0200 ++++ channels/console_video.h 2009-05-04 12:48:53 +0200 @@ -28,10 +28,7 @@ "console {device}" #else @@ -668,9 +680,9 @@ #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 @@ +--- configure.orig 2009-03-19 19:14:55 +0100 ++++ configure 2009-05-04 12:48:53 +0200 +@@ -4053,12 +4053,6 @@ # note- does not work on FreeBSD case "${host_os}" in @@ -683,21 +695,9 @@ 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 +--- main/Makefile.orig 2009-04-09 07:16:25 +0200 ++++ main/Makefile 2009-05-04 12:48:53 +0200 @@ -72,10 +72,7 @@ endif @@ -711,9 +711,9 @@ 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 @@ +--- main/file.c.orig 2009-04-15 22:20:23 +0200 ++++ main/file.c 2009-05-04 12:48:53 +0200 +@@ -248,7 +248,7 @@ char *fn = NULL; if (!strcmp(ext, "wav49")) @@ -722,29 +722,10 @@ 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 @@ +--- main/tcptls.c.orig 2009-03-09 22:22:42 +0100 ++++ main/tcptls.c 2009-05-04 12:48:53 +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) ast_verb(0, "SSL CA file(%s)/path(%s) error\n", cfg->cafile, cfg->capath); @@ -753,9 +734,9 @@ 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 @@ +--- menuselect-tree.orig 2009-04-27 21:45:53 +0200 ++++ menuselect-tree 2009-05-04 12:48:53 +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> @@ -764,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"> -@@ -617,9 +619,9 @@ +@@ -647,9 +649,9 @@ <member name="CORE-SOUNDS-EN-ULAW" displayname="English, mu-Law format"> </member> <member name="CORE-SOUNDS-EN-ALAW" displayname="English, a-Law format"> @@ -775,7 +756,7 @@ </member> <member name="CORE-SOUNDS-EN-G729" displayname="English, G.729 format"> </member> -@@ -677,6 +679,7 @@ +@@ -709,6 +711,7 @@ <member name="EXTRA-SOUNDS-EN-ULAW" displayname="English, mu-Law format"> </member> <member name="EXTRA-SOUNDS-EN-ALAW" displayname="English, a-Law format"> @@ -783,9 +764,29 @@ </member> <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-05-04 12:48:53 +0200 +@@ -119,14 +119,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; +- } ++ ast_log(LOG_WARNING, "Got unexpected GMIME_IS_MULTIPART, trying to process subparts\n"); ++ g_mime_multipart_foreach(GMIME_MULTIPART(part), process_message_callback, cbinfo); + } else if (GMIME_IS_PART(part)) { + const char *filename; + 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 +--- sounds/sounds.xml.orig 2008-10-09 22:01:38 +0200 ++++ sounds/sounds.xml 2009-05-04 12:48:53 +0200 @@ -4,9 +4,9 @@ <member name="CORE-SOUNDS-EN-ULAW" displayname="English, mu-Law format"> </member> @@ -797,7 +798,7 @@ </member> <member name="CORE-SOUNDS-EN-G729" displayname="English, G.729 format"> </member> -@@ -64,6 +64,7 @@ +@@ -66,6 +66,7 @@ <member name="EXTRA-SOUNDS-EN-ULAW" displayname="English, mu-Law format"> </member> <member name="EXTRA-SOUNDS-EN-ALAW" displayname="English, a-Law format"> @@ . patch -p0 <<'@@ .' Index: openpkg-src/asterisk/asterisk.spec ============================================================================ $ cvs diff -u -r1.93 -r1.94 asterisk.spec --- openpkg-src/asterisk/asterisk.spec 18 Apr 2009 13:08:48 -0000 1.93 +++ openpkg-src/asterisk/asterisk.spec 4 May 2009 12:08:45 -0000 1.94 @@ -22,9 +22,9 @@ ## # package version -%define V_opkg 1.6.0.9 -%define V_asterisk 1.6.0.9 -%define V_asterisk_addons 1.6.0.1 +%define V_opkg 1.6.1.0 +%define V_asterisk 1.6.1.0 +%define V_asterisk_addons 1.6.1.0 %define V_asterisk_sounds_core_en 1.4.15 %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: 20090407 +Release: 20090504 # package options %option with_dahdi no @@ -59,10 +59,10 @@ %option with_odbc no # list of sources -Source0: http://downloads.digium.com/pub/asterisk/releases/asterisk-%{V_asterisk}.tar.gz -Source1: http://downloads.digium.com/pub/asterisk/releases/asterisk-addons-%{V_asterisk_addons}.tar.gz -Source2: http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-core-sounds-en-alaw-%{V_asterisk_sounds_core_en}.tar.gz -Source3: http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-extra-sounds-en-alaw-%{V_asterisk_sounds_extra_en}.tar.gz +Source0: http://downloads.asterisk.org/pub/telephony/asterisk/releases/asterisk-%{V_asterisk}.tar.gz +Source1: http://downloads.asterisk.org/pub/telephony/asterisk/releases/asterisk-addons-%{V_asterisk_addons}.tar.gz +Source2: http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en-alaw-%{V_asterisk_sounds_core_en}.tar.gz +Source3: http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-extra-sounds-en-alaw-%{V_asterisk_sounds_extra_en}.tar.gz Source4: http://www.amooma.de/asterisk/sprachbausteine/asterisk-core-sounds-de-gsm-%{V_asterisk_sounds_core_de}.tar.gz Source5: ftp://ftp.chan-capi.org/chan-capi/chan_capi-%{V_chan_capi}.tar.gz Source6: asterisk.txt @@ -74,8 +74,8 @@ BuildRoot: %{l_buildroot} BuildPreReq: OpenPKG, openpkg >= 20040130, bison, gcc, make, grep PreReq: OpenPKG, openpkg >= 20040130, MTA -BuildPreReq: zlib, curl, openssl, ncurses, speex, popt, gmime -PreReq: zlib, curl, openssl, ncurses, speex, popt, gmime +BuildPreReq: zlib, curl, openssl, ncurses, speex, popt, gmime22 +PreReq: zlib, curl, openssl, ncurses, speex, popt, gmime22 %if "%{with_ogg}" == "yes" BuildPreReq: vorbis-libs PreReq: vorbis-libs @@ -134,22 +134,22 @@ %track prog asterisk = { version = %{V_asterisk} - url = http://downloads.digium.com/pub/asterisk/releases/ + url = http://downloads.asterisk.org/pub/telephony/asterisk/releases/ regex = asterisk-(\d+\.\d+(\.\d+)+)\.tar\.gz } prog asterisk:addons = { version = %{V_asterisk_addons} - url = http://downloads.digium.com/pub/asterisk/releases/ + url = http://downloads.asterisk.org/pub/telephony/asterisk/releases/ regex = asterisk-addons-(\d+\.\d+(\.\d+)+)\.tar\.gz } prog asterisk:sounds_core_en = { version = %{V_asterisk_sounds_core_en} - url = http://downloads.digium.com/pub/telephony/sounds/releases/ + url = http://downloads.asterisk.org/pub/telephony/sounds/releases/ regex = asterisk-core-sounds-en-alaw-(\d+\.\d+(\.\d+)+)\.tar\.gz } prog asterisk:sounds_extra_en = { version = %{V_asterisk_sounds_extra_en} - url = http://downloads.digium.com/pub/telephony/sounds/releases/ + url = http://downloads.asterisk.org/pub/telephony/sounds/releases/ regex = asterisk-extra-sounds-en-alaw-(\d+\.\d+(\.\d+)+)\.tar\.gz } prog asterisk:sounds_core_de = { @@ -168,6 +168,7 @@ %setup -q -n asterisk-%{V_asterisk} -D -T -a 1 %setup -q -n asterisk-%{V_asterisk} -D -T -a 5 %patch -p0 + exit 0 cp %{SOURCE2} %{SOURCE3} sounds/ %{l_shtool} subst \ -e 's;\(CORE_SOUNDS_VERSION\):=.*$;\1:=%{V_asterisk_sounds_core_en};' \ @@ -216,12 +217,15 @@ -e 's;lua5\.1/lua\.h;lua/lua.h;' \ -e 's;ffmpeg/avcodec\.h;libavcodec/avcodec.h;' \ configure - ( echo "ac_cv_prog_CONFIG_GMIME='pkg-config gmime-2.0'" + ( echo "ac_cv_prog_CONFIG_GMIME=%{l_prefix}/bin/gmime-config" ) >config.cache cflags="%{l_cflags -O}" cppflags="%{l_cppflags ncurses lua .}" ldflags="%{l_ldflags}" libs="" + cppflags="$cppflags `pkg-config gmime-2.0 --cflags-only-I`" + ldflags="$ldflags `pkg-config gmime-2.0 --libs-only-L`" + libs="$libs `pkg-config gmime-2.0 --libs-only-l`" %if "%{with_ogg}" == "yes" libs="$libs -logg -lm" %endif @@ . ______________________________________________________________________ OpenPKG http://openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org