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: 24-Mar-2008 21:11:28
Branch: HEAD Handle: 2008032420112700
Modified files:
openpkg-src/asterisk asterisk.patch asterisk.spec asterisk.txt
Log:
move AGI directory; add some SIP notify settings and use lower case
extension
Summary:
Revision Changes Path
1.38 +26 -14 openpkg-src/asterisk/asterisk.patch
1.69 +5 -3 openpkg-src/asterisk/asterisk.spec
1.46 +6 -1 openpkg-src/asterisk/asterisk.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/asterisk/asterisk.patch
============================================================================
$ cvs diff -u -r1.37 -r1.38 asterisk.patch
--- openpkg-src/asterisk/asterisk.patch 23 Mar 2008 10:41:00 -0000
1.37
+++ openpkg-src/asterisk/asterisk.patch 24 Mar 2008 20:11:27 -0000
1.38
@@ -1,6 +1,6 @@
Index: Makefile
--- Makefile.orig 2008-03-18 16:58:50 +0100
-+++ Makefile 2008-03-23 11:34:24 +0100
++++ Makefile 2008-03-24 20:45:38 +0100
@@ -121,42 +121,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 2008-03-23 11:34:42 +0100
-+++ apps/app_backticks.c 2008-03-23 11:34:24 +0100
+--- /dev/null 2008-03-24 20:46:16 +0100
++++ apps/app_backticks.c 2008-03-24 20:45:38 +0100
@@ -0,0 +1,129 @@
+
+#include "asterisk.h"
+
-+ASTERISK_FILE_VERSION(__FILE__, "$Revision: 1.37 $")
++ASTERISK_FILE_VERSION(__FILE__, "$Revision: 1.38 $")
+
+#include <stdio.h>
+#include <asterisk/file.h>
@@ -206,7 +206,7 @@
+
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-03-23 11:35:27 +0100
++++ build_tools/make_defaults_h 2008-03-24 20:45:38 +0100
@@ -17,7 +17,7 @@
#define DEFAULT_PID "${INSTALL_PATH}${ASTVARRUNDIR}/asterisk.pid"
@@ -218,7 +218,7 @@
#define DEFAULT_KEY_DIR "${INSTALL_PATH}${ASTDATADIR}/keys"
Index: cdr/cdr_custom.c
--- cdr/cdr_custom.c.orig 2007-11-21 00:16:15 +0100
-+++ cdr/cdr_custom.c 2008-03-23 11:34:24 +0100
++++ cdr/cdr_custom.c 2008-03-24 20:45:38 +0100
@@ -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);
@@ -230,7 +230,7 @@
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-03-23 11:34:24 +0100
++++ cdr/cdr_sqlite3_custom.c 2008-03-24 20:45:38 +0100
@@ -317,7 +317,7 @@
return AST_MODULE_LOAD_DECLINE;
@@ -242,7 +242,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-03-23 11:34:24 +0100
++++ channels/console_video.h 2008-03-24 20:45:38 +0100
@@ -28,10 +28,7 @@
"console {device}"
#else
@@ -257,7 +257,7 @@
"console {videodevice|videocodec" \
Index: configure
--- configure.orig 2008-03-18 16:50:53 +0100
-+++ configure 2008-03-23 11:34:24 +0100
++++ configure 2008-03-24 20:45:38 +0100
@@ -4026,12 +4026,6 @@
# note- does not work on FreeBSD
@@ -273,7 +273,7 @@
if test ${sysconfdir} = '${prefix}/etc'; then
Index: include/asterisk/module.h
--- include/asterisk/module.h.orig 2008-02-27 09:20:15 +0100
-+++ include/asterisk/module.h 2008-03-23 11:34:24 +0100
++++ include/asterisk/module.h 2008-03-24 20:45:38 +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
@@ -285,7 +285,7 @@
#define __MODULE_INFO_SECTION
Index: main/Makefile
--- main/Makefile.orig 2008-03-17 23:24:46 +0100
-+++ main/Makefile 2008-03-23 11:34:24 +0100
++++ main/Makefile 2008-03-24 20:45:38 +0100
@@ -82,10 +82,7 @@
endif
@@ -298,9 +298,21 @@
endif
ifneq ($(findstring $(OSARCH), mingw32 cygwin ),)
+Index: main/file.c
+--- main/file.c.orig 2008-03-07 01:25:48 +0100
++++ main/file.c 2008-03-24 20:45:38 +0100
+@@ -246,7 +246,7 @@
+ char *fn = NULL;
+
+ if (!strcmp(ext, "wav49"))
+- ext = "WAV";
++ ext = "wav";
+
+ if (filename[0] == '/')
+ asprintf(&fn, "%s.%s", filename, ext);
Index: main/tcptls.c
--- main/tcptls.c.orig 2008-03-12 23:50:14 +0100
-+++ main/tcptls.c 2008-03-23 11:34:24 +0100
++++ main/tcptls.c 2008-03-24 20:45:38 +0100
@@ -189,6 +189,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)
@@ -311,7 +323,7 @@
ast_verb(0, "SSL certificate ok\n");
Index: menuselect-tree
--- menuselect-tree.orig 2008-03-18 18:05:36 +0100
-+++ menuselect-tree 2008-03-23 11:34:24 +0100
++++ menuselect-tree 2008-03-24 20:45:38 +0100
@@ -134,6 +134,8 @@
</member>
<member name="app_system" displayname="Generic System() application"
remove_on_change="apps/app_system.o apps/app_system.so">
@@ -350,7 +362,7 @@
</member>
Index: sounds/sounds.xml
--- sounds/sounds.xml.orig 2008-03-06 05:46:17 +0100
-+++ sounds/sounds.xml 2008-03-23 11:34:24 +0100
++++ sounds/sounds.xml 2008-03-24 20:45:38 +0100
@@ -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.68 -r1.69 asterisk.spec
--- openpkg-src/asterisk/asterisk.spec 23 Mar 2008 11:55:25 -0000
1.68
+++ openpkg-src/asterisk/asterisk.spec 24 Mar 2008 20:11:27 -0000
1.69
@@ -40,7 +40,7 @@
Group: VoIP
License: GPL
Version: %{V_opkg}
-Release: 20080323
+Release: 20080324
# package options
%option with_zaptel no
@@ -71,7 +71,7 @@
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
BuildPreReq: OpenPKG, openpkg >= 20040130, bison, gcc, make, grep
-PreReq: OpenPKG, openpkg >= 20040130
+PreReq: OpenPKG, openpkg >= 20040130, MTA
BuildPreReq: zlib, curl, openssl, ncurses, speex, popt, gmime
PreReq: zlib, curl, openssl, ncurses, speex, popt, gmime
%if "%{with_ogg}" == "yes"
@@ -407,7 +407,9 @@
# post-adjust installation
strip $RPM_BUILD_ROOT%{l_prefix}/sbin/* >/dev/null 2>&1 || true
- for bin in $RPM_BUILD_ROOT%{l_prefix}/share/asterisk/agi-bin/*.*; do
+ mv $RPM_BUILD_ROOT%{l_prefix}/share/asterisk/agi-bin \
+ $RPM_BUILD_ROOT%{l_prefix}/lib/asterisk/agi-bin
+ for bin in $RPM_BUILD_ROOT%{l_prefix}/lib/asterisk/agi-bin/*.*; do
mv $bin `echo $bin | sed -e 's;\.[^.]*$;;'`
done
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/asterisk/asterisk.txt
============================================================================
$ cvs diff -u -r1.45 -r1.46 asterisk.txt
--- openpkg-src/asterisk/asterisk.txt 23 Mar 2008 22:39:13 -0000 1.45
+++ openpkg-src/asterisk/asterisk.txt 24 Mar 2008 20:11:27 -0000 1.46
@@ -6,7 +6,7 @@
[directories]
astetcdir = @l_prefix@/etc/asterisk
astmoddir = @l_prefix@/lib/asterisk/modules
-astagidir = @l_prefix@/share/asterisk/agi-bin
+astagidir = @l_prefix@/lib/asterisk/agi-bin
astvarlibdir = @l_prefix@/share/asterisk
astspooldir = @l_prefix@/var/asterisk/spool
astrundir = @l_prefix@/var/asterisk/run
@@ -147,6 +147,11 @@
videosupport = no
;allow = h263
;allow = h263p
+notifyhold = yes
+notifyringing = yes
+limitonpeer = yes
+call-limit = 1
+incominglimit = 1
context = external
;register = NNNNNNN:XXXXXX:[EMAIL PROTECTED]/s
;tos = 0x18
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
