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: 18-Mar-2008 23:04:58
Branch: HEAD Handle: 2008031822045700
Modified files:
openpkg-src/asterisk asterisk.patch asterisk.spec
Log:
use ALAW format only as the GSM sound would be downloaded and it of
lower quality anyway
Summary:
Revision Changes Path
1.30 +34 -34 openpkg-src/asterisk/asterisk.patch
1.48 +8 -9 openpkg-src/asterisk/asterisk.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/asterisk/asterisk.patch
============================================================================
$ cvs diff -u -r1.29 -r1.30 asterisk.patch
--- openpkg-src/asterisk/asterisk.patch 18 Mar 2008 20:58:14 -0000
1.29
+++ openpkg-src/asterisk/asterisk.patch 18 Mar 2008 22:04:57 -0000
1.30
@@ -1,6 +1,6 @@
Index: Makefile
--- Makefile.orig 2008-02-26 21:19:03 +0100
-+++ Makefile 2008-03-17 09:31:15 +0100
++++ Makefile 2008-03-18 22:06:58 +0100
@@ -121,42 +121,20 @@
# Define standard directories for various platforms
@@ -63,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-17 09:31:15 +0100
++++ appconference-2.0.1/Makefile 2008-03-18 22:06:58 +0100
@@ -18,11 +18,11 @@
#
@@ -90,7 +90,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-17 09:31:15 +0100
++++ appconference-2.0.1/app_conference.h 2008-03-18 22:06:58 +0100
@@ -44,6 +44,7 @@
#include <pthread.h>
@@ -101,7 +101,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-17 09:31:15 +0100
++++ asterisk-perl-0.10/Makefile.PL 2008-03-18 22:06:58 +0100
@@ -14,3 +14,4 @@
},
);
@@ -109,7 +109,7 @@
+
Index: channels/console_video.h
--- channels/console_video.h.orig 2008-01-09 19:03:40 +0100
-+++ channels/console_video.h 2008-03-17 09:31:15 +0100
++++ channels/console_video.h 2008-03-18 22:06:58 +0100
@@ -28,10 +28,7 @@
"console {device}"
#else
@@ -124,7 +124,7 @@
"console {videodevice|videocodec" \
Index: configure
--- configure.orig 2008-02-23 00:56:55 +0100
-+++ configure 2008-03-17 09:31:15 +0100
++++ configure 2008-03-18 22:06:58 +0100
@@ -4049,12 +4049,6 @@
# note- does not work on FreeBSD
@@ -140,7 +140,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-17 09:31:15 +0100
++++ iax-0.2.2/src/Makefile.in 2008-03-18 22:06:58 +0100
@@ -71,7 +71,7 @@
PACKAGE = @PACKAGE@
RANLIB = @RANLIB@
@@ -170,7 +170,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-17 09:31:15 +0100
++++ iax-0.2.2/src/iax.c 2008-03-18 22:06:58 +0100
@@ -33,13 +33,11 @@
#include <sys/time.h>
#include <stdlib.h>
@@ -187,7 +187,7 @@
#include <arpa/inet.h>
Index: main/Makefile
--- main/Makefile.orig 2008-02-28 01:11:31 +0100
-+++ main/Makefile 2008-03-17 09:31:15 +0100
++++ main/Makefile 2008-03-18 22:06:58 +0100
@@ -82,10 +82,7 @@
endif
@@ -200,58 +200,58 @@
endif
ifneq ($(findstring $(OSARCH), mingw32 cygwin ),)
+Index: main/tcptls.c
+--- main/tcptls.c.orig 2008-02-06 00:00:15 +0100
++++ main/tcptls.c 2008-03-18 22:06:58 +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)
+ ast_verb(0, "SSL CA file(%s)/path(%s) error\n",
cfg->cafile, cfg->capath);
++ SSL_CTX_set_client_CA_list(cfg->ssl_ctx, S_OR(cfg->cafile, NULL));
+ }
+
+ ast_verb(0, "SSL certificate ok\n");
Index: menuselect-tree
--- menuselect-tree.orig 2008-03-04 18:52:08 +0100
-+++ menuselect-tree 2008-03-17 09:31:31 +0100
-@@ -612,6 +612,7 @@
++++ menuselect-tree 2008-03-18 22:07:33 +0100
+@@ -612,9 +612,9 @@
<member name="CORE-SOUNDS-EN-ULAW" displayname="English, mu-Law
format">
</member>
<member name="CORE-SOUNDS-EN-ALAW" displayname="English, a-Law
format">
+ <defaultenabled>yes</defaultenabled>
</member>
<member name="CORE-SOUNDS-EN-GSM" displayname="English, GSM
format" >
- <defaultenabled>yes</defaultenabled>
-@@ -666,8 +667,10 @@
+- <defaultenabled>yes</defaultenabled>
+ </member>
+ <member name="CORE-SOUNDS-EN-G729" displayname="English, G.729
format">
+ </member>
+@@ -666,6 +666,7 @@
<member name="EXTRA-SOUNDS-EN-ULAW" displayname="English,
mu-Law format">
</member>
<member name="EXTRA-SOUNDS-EN-ALAW" displayname="English, a-Law
format">
+ <defaultenabled>yes</defaultenabled>
</member>
<member name="EXTRA-SOUNDS-EN-GSM" displayname="English, GSM
format" >
-+ <defaultenabled>yes</defaultenabled>
- </member>
- <member name="EXTRA-SOUNDS-EN-G729" displayname="English, G.729
format">
</member>
Index: sounds/sounds.xml
--- sounds/sounds.xml.orig 2006-10-25 19:12:59 +0200
-+++ sounds/sounds.xml 2008-03-17 09:31:41 +0100
-@@ -4,6 +4,7 @@
++++ sounds/sounds.xml 2008-03-18 22:07:44 +0100
+@@ -4,9 +4,9 @@
<member name="CORE-SOUNDS-EN-ULAW" displayname="English, mu-Law
format">
</member>
<member name="CORE-SOUNDS-EN-ALAW" displayname="English, a-Law
format">
+ <defaultenabled>yes</defaultenabled>
</member>
<member name="CORE-SOUNDS-EN-GSM" displayname="English, GSM
format" >
- <defaultenabled>yes</defaultenabled>
-@@ -58,8 +59,10 @@
+- <defaultenabled>yes</defaultenabled>
+ </member>
+ <member name="CORE-SOUNDS-EN-G729" displayname="English, G.729
format">
+ </member>
+@@ -58,6 +58,7 @@
<member name="EXTRA-SOUNDS-EN-ULAW" displayname="English,
mu-Law format">
</member>
<member name="EXTRA-SOUNDS-EN-ALAW" displayname="English, a-Law
format">
+ <defaultenabled>yes</defaultenabled>
</member>
<member name="EXTRA-SOUNDS-EN-GSM" displayname="English, GSM
format" >
-+ <defaultenabled>yes</defaultenabled>
- </member>
- <member name="EXTRA-SOUNDS-EN-G729" displayname="English, G.729
format">
</member>
-Index: main/tcptls.c
---- main/tcptls.c.orig 2008-02-06 00:00:15 +0100
-+++ main/tcptls.c 2008-03-18 21:29:51 +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)
- ast_verb(0, "SSL CA file(%s)/path(%s) error\n",
cfg->cafile, cfg->capath);
-+ SSL_CTX_set_client_CA_list(cfg->ssl_ctx, S_OR(cfg->cafile, NULL));
- }
-
- ast_verb(0, "SSL certificate ok\n");
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/asterisk/asterisk.spec
============================================================================
$ cvs diff -u -r1.47 -r1.48 asterisk.spec
--- openpkg-src/asterisk/asterisk.spec 18 Mar 2008 20:58:14 -0000
1.47
+++ openpkg-src/asterisk/asterisk.spec 18 Mar 2008 22:04:57 -0000
1.48
@@ -64,13 +64,12 @@
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}.tar.gz
Source3:
http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-extra-sounds-en-alaw-%{V_asterisk_sounds_extra}.tar.gz
-Source4:
http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-extra-sounds-en-gsm-%{V_asterisk_sounds_extra}.tar.gz
-Source5:
http://downloads.digium.com/pub/libiax/iax-%{V_asterisk_libiax}.tar.gz
-Source6:
http://switch.dl.sourceforge.net/appconference/appconference-%{V_app_conference}.tar.gz
-Source7:
http://asterisk.gnuinter.net/files/asterisk-perl-%{V_asterisk_perl}.tar.gz
-Source8:
http://www.turbocat.net/~hselasky/capi4pbx/releases/chan_capi_%{V_chan_capi}.tar.bz2
-Source9: asterisk.txt
-Source10: rc.asterisk
+Source4:
http://downloads.digium.com/pub/libiax/iax-%{V_asterisk_libiax}.tar.gz
+Source5:
http://switch.dl.sourceforge.net/appconference/appconference-%{V_app_conference}.tar.gz
+Source6:
http://asterisk.gnuinter.net/files/asterisk-perl-%{V_asterisk_perl}.tar.gz
+Source7:
http://www.turbocat.net/~hselasky/capi4pbx/releases/chan_capi_%{V_chan_capi}.tar.bz2
+Source8: asterisk.txt
+Source9: rc.asterisk
Patch0: asterisk.patch
# build information
@@ -182,12 +181,12 @@
%prep
%setup -q -n asterisk-%{V_asterisk}
%setup -q -n asterisk-%{V_asterisk} -D -T -a 1
+ %setup -q -n asterisk-%{V_asterisk} -D -T -a 4
%setup -q -n asterisk-%{V_asterisk} -D -T -a 5
%setup -q -n asterisk-%{V_asterisk} -D -T -a 6
%setup -q -n asterisk-%{V_asterisk} -D -T -a 7
- %setup -q -n asterisk-%{V_asterisk} -D -T -a 8
%patch -p0
- cp %{SOURCE2} %{SOURCE3} %{SOURCE4} sounds/
+ cp %{SOURCE2} %{SOURCE3} sounds/
%{l_shtool} subst \
-e 's;\(CORE_SOUNDS_VERSION\):=.*$;\1:=%{V_asterisk_sounds_core};' \
-e 's;\(EXTRA_SOUNDS_VERSION\):=.*$;\1:=%{V_asterisk_sounds_extra};'
\
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
