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: 09-Mar-2008 21:15:20
Branch: HEAD Handle: 2008030920151901
Modified files:
openpkg-src/asterisk asterisk.patch asterisk.spec asterisk.txt
Log:
provide more clean out-of-the-box configuration
Summary:
Revision Changes Path
1.26 +58 -11 openpkg-src/asterisk/asterisk.patch
1.42 +6 -3 openpkg-src/asterisk/asterisk.spec
1.22 +28 -1 openpkg-src/asterisk/asterisk.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/asterisk/asterisk.patch
============================================================================
$ cvs diff -u -r1.25 -r1.26 asterisk.patch
--- openpkg-src/asterisk/asterisk.patch 9 Mar 2008 12:41:04 -0000
1.25
+++ openpkg-src/asterisk/asterisk.patch 9 Mar 2008 20:15:19 -0000
1.26
@@ -1,7 +1,54 @@
Index: Makefile
--- Makefile.orig 2008-02-26 21:19:03 +0100
-+++ Makefile 2008-03-09 13:27:48 +0100
-@@ -245,12 +245,6 @@
++++ Makefile 2008-03-09 20:35:44 +0100
+@@ -121,42 +121,20 @@
+
+ # Define standard directories for various platforms
+ # These apply if they are not redefined in asterisk.conf
+-ifeq ($(OSARCH),SunOS)
+- ASTETCDIR=/var/etc/asterisk
+- ASTLIBDIR=/opt/asterisk/lib
+- ASTVARLIBDIR=/var/opt/asterisk
+- ASTDBDIR=$(ASTVARLIBDIR)
+- ASTKEYDIR=$(ASTVARLIBDIR)
+- ASTSPOOLDIR=/var/spool/asterisk
+- ASTLOGDIR=/var/log/asterisk
+- ASTHEADERDIR=/opt/asterisk/include
+- ASTBINDIR=/opt/asterisk/bin
+- ASTSBINDIR=/opt/asterisk/sbin
+- ASTVARRUNDIR=/var/run/asterisk
+- ASTMANDIR=/opt/asterisk/man
+-else
+ ASTETCDIR=$(sysconfdir)/asterisk
+ ASTLIBDIR=$(libdir)/asterisk
+ ASTHEADERDIR=$(includedir)/asterisk
+ ASTBINDIR=$(bindir)
+ ASTSBINDIR=$(sbindir)
+- ASTSPOOLDIR=$(localstatedir)/spool/asterisk
+- ASTLOGDIR=$(localstatedir)/log/asterisk
++ ASTSPOOLDIR=$(localstatedir)/spool
++ ASTLOGDIR=$(localstatedir)/log
+ ASTVARRUNDIR=$(localstatedir)/run
+ ASTMANDIR=$(mandir)
+-ifneq ($(findstring BSD,$(OSARCH)),)
+ ASTVARLIBDIR=$(prefix)/share/asterisk
+- ASTVARRUNDIR=$(localstatedir)/run/asterisk
+- ASTDBDIR=$(localstatedir)/db/asterisk
+-else
+- ASTVARLIBDIR=$(localstatedir)/lib/asterisk
+- ASTDBDIR=$(ASTVARLIBDIR)
+-endif
++ ASTVARRUNDIR=$(localstatedir)/run
++ ASTDBDIR=$(localstatedir)/db
+ ASTKEYDIR=$(ASTVARLIBDIR)
+-endif
+-ifeq ($(ASTDATADIR),)
+ ASTDATADIR:=$(ASTVARLIBDIR)
+-endif
+
+ # Asterisk.conf is located in ASTETCDIR or by using the -C flag
+ # when starting Asterisk
+@@ -245,12 +223,6 @@
ASTCFLAGS+=-fsigned-char
endif
@@ -16,7 +63,7 @@
endif
Index: appconference-2.0.1/Makefile
--- appconference-2.0.1/Makefile.orig 2008-02-26 17:05:57 +0100
-+++ appconference-2.0.1/Makefile 2008-03-09 13:27:48 +0100
++++ appconference-2.0.1/Makefile 2008-03-09 20:33:38 +0100
@@ -18,9 +18,9 @@
#
@@ -40,7 +87,7 @@
#CFLAGS += -O3 -march=pentium3 -msse -mfpmath=sse,387 -ffast-math
Index: appconference-2.0.1/app_conference.h
--- appconference-2.0.1/app_conference.h.orig 2008-02-26 17:05:57
+0100
-+++ appconference-2.0.1/app_conference.h 2008-03-09 13:27:48 +0100
++++ appconference-2.0.1/app_conference.h 2008-03-09 20:33:38 +0100
@@ -44,6 +44,7 @@
#include <pthread.h>
@@ -51,7 +98,7 @@
#include <asterisk/module.h>
Index: asterisk-perl-0.10/Makefile.PL
--- asterisk-perl-0.10/Makefile.PL.orig 2003-06-13 07:52:12 +0200
-+++ asterisk-perl-0.10/Makefile.PL 2008-03-09 13:27:48 +0100
++++ asterisk-perl-0.10/Makefile.PL 2008-03-09 20:33:38 +0100
@@ -14,3 +14,4 @@
},
);
@@ -59,7 +106,7 @@
+
Index: channels/console_video.h
--- channels/console_video.h.orig 2008-01-09 19:03:40 +0100
-+++ channels/console_video.h 2008-03-09 13:27:48 +0100
++++ channels/console_video.h 2008-03-09 20:33:38 +0100
@@ -28,10 +28,7 @@
"console {device}"
#else
@@ -74,7 +121,7 @@
"console {videodevice|videocodec" \
Index: configure
--- configure.orig 2008-02-23 00:56:55 +0100
-+++ configure 2008-03-09 13:27:48 +0100
++++ configure 2008-03-09 20:33:38 +0100
@@ -4049,12 +4049,6 @@
# note- does not work on FreeBSD
@@ -90,7 +137,7 @@
if test ${sysconfdir} = '${prefix}/etc'; then
Index: iax-0.2.2/src/Makefile.in
--- iax-0.2.2/src/Makefile.in.orig 2001-11-13 18:45:14 +0100
-+++ iax-0.2.2/src/Makefile.in 2008-03-09 13:27:48 +0100
++++ iax-0.2.2/src/Makefile.in 2008-03-09 20:33:38 +0100
@@ -71,7 +71,7 @@
PACKAGE = @PACKAGE@
RANLIB = @RANLIB@
@@ -120,7 +167,7 @@
# Otherwise a system limit (for SysV at least) may be exceeded.
Index: iax-0.2.2/src/iax.c
--- iax-0.2.2/src/iax.c.orig 2001-11-07 00:10:41 +0100
-+++ iax-0.2.2/src/iax.c 2008-03-09 13:27:48 +0100
++++ iax-0.2.2/src/iax.c 2008-03-09 20:33:38 +0100
@@ -33,13 +33,11 @@
#include <sys/time.h>
#include <stdlib.h>
@@ -137,7 +184,7 @@
#include <arpa/inet.h>
Index: main/Makefile
--- main/Makefile.orig 2008-02-28 01:11:31 +0100
-+++ main/Makefile 2008-03-09 13:27:48 +0100
++++ main/Makefile 2008-03-09 20:33:38 +0100
@@ -82,10 +82,7 @@
endif
@@ -152,7 +199,7 @@
ifneq ($(findstring $(OSARCH), mingw32 cygwin ),)
Index: menuselect-tree
--- menuselect-tree.orig 2008-03-04 18:52:08 +0100
-+++ menuselect-tree 2008-03-09 13:28:44 +0100
++++ menuselect-tree 2008-03-09 20:33:38 +0100
@@ -668,6 +668,7 @@
<member name="EXTRA-SOUNDS-EN-ALAW" displayname="English, a-Law
format">
</member>
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/asterisk/asterisk.spec
============================================================================
$ cvs diff -u -r1.41 -r1.42 asterisk.spec
--- openpkg-src/asterisk/asterisk.spec 9 Mar 2008 19:19:30 -0000
1.41
+++ openpkg-src/asterisk/asterisk.spec 9 Mar 2008 20:15:20 -0000
1.42
@@ -250,7 +250,7 @@
./configure \
--prefix=%{l_prefix} \
--mandir=%{l_prefix}/man \
- --sysconfdir=%{l_prefix}/etc/asterisk \
+ --sysconfdir=%{l_prefix}/etc \
--localstatedir=%{l_prefix}/var/asterisk \
--with-curl=%{l_prefix} \
--with-ncurses \
@@ -338,7 +338,7 @@
./configure \
--prefix=%{l_prefix} \
--mandir=%{l_prefix}/man \
- --sysconfdir=%{l_prefix}/etc/asterisk \
+ --sysconfdir=%{l_prefix}/etc \
--localstatedir=%{l_prefix}/var/asterisk \
--with-ncurses \
--with-asterisk \
@@ -428,7 +428,10 @@
rm -rf $RPM_BUILD_ROOT%{l_prefix}/share/asterisk/sounds/en/CHANGES*
>/dev/null 2>&1 || true
rmdir $RPM_BUILD_ROOT%{l_prefix}/share/asterisk/sounds/es >/dev/null
2>&1 || true
rmdir $RPM_BUILD_ROOT%{l_prefix}/share/asterisk/sounds/fr >/dev/null
2>&1 || true
- rmdir $RPM_BUILD_ROOT%{l_prefix}/etc/asterisk/asterisk >/dev/null 2>&1
|| true
+
+ # create additional directories
+ %{l_shtool} mkdir -f -p -m 755 \
+ $RPM_BUILD_ROOT%{l_prefix}/var/asterisk/db
# post-adjust installation
strip $RPM_BUILD_ROOT%{l_prefix}/sbin/* >/dev/null 2>&1 || true
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/asterisk/asterisk.txt
============================================================================
$ cvs diff -u -r1.21 -r1.22 asterisk.txt
--- openpkg-src/asterisk/asterisk.txt 9 Mar 2008 12:46:34 -0000 1.21
+++ openpkg-src/asterisk/asterisk.txt 9 Mar 2008 20:15:20 -0000 1.22
@@ -11,6 +11,7 @@
astspooldir = @l_prefix@/var/asterisk/spool
astrundir = @l_prefix@/var/asterisk/run
astlogdir = @l_prefix@/var/asterisk/log
+astdbdir = @l_prefix@/var/asterisk/db
[files]
astctlowner = @l_rusr@
@@ -44,7 +45,7 @@
[modules]
autoload = yes
-noload = chan_iax2.so ; not wished
+noload = chan_iax2.so ; not yet wished
noload = chan_agent.so ; not yet wished
noload = chan_mgcp.so ; not yet wished
noload = chan_skinny.so ; not yet wished
@@ -52,6 +53,8 @@
noload = app_queue.so ; not yet wished
noload = cdr_custom.so ; not yet wished
noload = pbx_ael.so ; not yet wished
+noload = res_phoneprov.so ; not yet wished
+noload = res_smdi.so ; not yet wished
noload = app_meetme.so ; not yet wished
load = app_conference.so ; wished
load = res_musiconhold.so ; wished
@@ -513,3 +516,27 @@
;context = parkedcalls
</file>
+<file name="jabber.conf">
+;;
+;; jabber.conf -- Asterisk Jabber configuration
+;;
+
+[general]
+;debug = yes
+;autoprune = yes
+;autoregister = yes
+
+;[asterisk]
+;type = client
+;serverhost = jabber.example.com
+;username = [EMAIL PROTECTED]/asterisk
+;secret = asterisk
+;priority = 1
+;port = 5222
+;usetls = no
+;usesasl = no
+;buddy = [EMAIL PROTECTED]
+;status = available
+;timeout = 100
+
+</file>
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
