rpms/asterisk/devel asterisk-1.6.0-beta7-chanusbradiofix.patch, NONE, 1.1 .cvsignore, 1.10, 1.11 asterisk-1.6.0-beta6-chanmobile.patch, 1.2, 1.3 asterisk.spec, 1.20, 1.21 menuselect.makeopts, 1.3, 1.4 sources, 1.10, 1.11 asterisk-strip.sh, 1.1, NONE

Sat Mar 29 04:54:22 UTC 2008

Author: jcollie

Update of /cvs/pkgs/rpms/asterisk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12141

Modified Files:
	.cvsignore asterisk-1.6.0-beta6-chanmobile.patch asterisk.spec 
	menuselect.makeopts sources 
Added Files:
	asterisk-1.6.0-beta7-chanusbradiofix.patch 
Removed Files:
	asterisk-strip.sh 
Log Message:
* Fri Mar 28 2008 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.0-0.10.beta7
- Update to 1.6.0-beta7
- The Asterisk tarball no longer contains the iLBC code, so we can
  directly use the upstream tarball without having to modify it.
- Get rid of the asterisk-strip.sh script since it's no longer needed.
- Diable build of codec_ilbc and format_ilbc (these do not contain any
  legally suspect code so they can be included in the tarball but it's
  pointless building them).
- Update chan_mobile patch to fix API breakages.
- Add a patch to chan_usbradio to fix API breakages.


asterisk-1.6.0-beta7-chanusbradiofix.patch:

--- NEW FILE asterisk-1.6.0-beta7-chanusbradiofix.patch ---
>From d1a67f08305dacfee89bc40b498c3947feeb1a21 Mon Sep 17 00:00:00 2001
From: Jeffrey C. Ollie <jeff at ocjtech.us>
Date: Fri, 28 Mar 2008 22:55:30 -0500
Subject: [PATCH] Fix API breakage in chan_usbradio

---
 channels/chan_usbradio.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/channels/chan_usbradio.c b/channels/chan_usbradio.c
index 84a2ce2..f7c05a6 100644
--- a/channels/chan_usbradio.c
+++ b/channels/chan_usbradio.c
@@ -2282,7 +2282,7 @@ static struct chan_usbradio_pvt *store_config(struct ast_config *cfg, char *ctg)
 	o->lastopen = ast_tvnow();	/* don't leave it 0 or tvdiff may wrap */
 	o->dsp = ast_dsp_new();
 	if (o->dsp) {
-		ast_dsp_set_features(o->dsp, DSP_FEATURE_DTMF_DETECT);
+		ast_dsp_set_features(o->dsp, DSP_FEATURE_DIGIT_DETECT);
 		ast_dsp_set_digitmode(o->dsp, DSP_DIGITMODE_DTMF | DSP_DIGITMODE_MUTECONF | DSP_DIGITMODE_RELAXDTMF);
 	}
 
-- 
1.5.4.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	19 Mar 2008 17:41:14 -0000	1.10
+++ .cvsignore	29 Mar 2008 04:53:47 -0000	1.11
@@ -1 +1 @@
-asterisk-1.6.0-beta6-stripped.tar.gz
+asterisk-1.6.0-beta7.tar.gz

asterisk-1.6.0-beta6-chanmobile.patch:

Index: asterisk-1.6.0-beta6-chanmobile.patch
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/devel/asterisk-1.6.0-beta6-chanmobile.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- asterisk-1.6.0-beta6-chanmobile.patch	25 Mar 2008 20:20:22 -0000	1.2
+++ asterisk-1.6.0-beta6-chanmobile.patch	29 Mar 2008 04:53:47 -0000	1.3
@@ -1,23 +1,5 @@
-From 3f5b21bd6efb829d144605c431a87c13936ecb5e Mon Sep 17 00:00:00 2001
-From: Jeffrey C. Ollie <jeff at ocjtech.us>
-Date: Mon, 25 Feb 2008 09:23:28 -0600
-Subject: [PATCH] Add chan_mobile from asterisk-addons.
-
----
- build_tools/menuselect-deps.in |    1 +
- channels/Makefile              |    2 +
- channels/chan_mobile.c         | 2118 ++++++++++++++++++++++++++++++++++++++++
- configs/mobile.conf.sample     |   60 ++
- configure.ac                   |    4 +
- doc/chan_mobile.txt            |  240 +++++
- makeopts.in                    |    3 +
- 7 files changed, 2428 insertions(+), 0 deletions(-)
- create mode 100644 channels/chan_mobile.c
- create mode 100644 configs/mobile.conf.sample
- create mode 100644 doc/chan_mobile.txt
-
 diff --git a/build_tools/menuselect-deps.in b/build_tools/menuselect-deps.in
-index 8be9081..6349e71 100644
+index f724fe3..cd079c1 100644
 --- a/build_tools/menuselect-deps.in
 +++ b/build_tools/menuselect-deps.in
 @@ -1,5 +1,6 @@
@@ -39,7 +21,7 @@
 +chan_mobile.so: LIBS+=$(BLUETOOTH_LIB)
 diff --git a/channels/chan_mobile.c b/channels/chan_mobile.c
 new file mode 100644
-index 0000000..1312ea9
+index 0000000..b8fd9af
 --- /dev/null
 +++ b/channels/chan_mobile.c
 @@ -0,0 +1,2118 @@
@@ -2042,8 +2024,8 @@
 +							pvt->dtmf_skip = 200;
 +					} else
 +						pvt->dtmf_skip = 200;
-+					ast_dsp_set_features(pvt->dsp, DSP_FEATURE_DTMF_DETECT);
-+					ast_dsp_digitmode(pvt->dsp, DSP_DIGITMODE_DTMF | DSP_DIGITMODE_RELAXDTMF);
++					ast_dsp_set_features(pvt->dsp, DSP_FEATURE_DIGIT_DETECT);
++					ast_dsp_set_digitmode(pvt->dsp, DSP_DIGITMODE_DTMF | DSP_DIGITMODE_RELAXDTMF);
 +					pvt->adapter = adapter;
 +					AST_LIST_INSERT_HEAD(&devices, pvt, entry);
 +				}
@@ -2228,7 +2210,7 @@
 +type=headset
 +adapter=dlink
 diff --git a/configure.ac b/configure.ac
-index 09e445a..13e82da 100644
+index 498bf69..e92f97f 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -203,6 +203,8 @@ AST_EXT_LIB_SETUP([ALSA], [Advanced Linux Sound Architecture], [asound])
@@ -2240,7 +2222,7 @@
  AST_EXT_LIB_SETUP([CAP], [POSIX 1.e capabilities], [cap])
  AST_EXT_LIB_SETUP([CURL], [cURL], [curl])
  AST_EXT_LIB_SETUP([CURSES], [curses], [curses])
-@@ -521,6 +523,8 @@ AC_CHECK_SIZEOF(int)
+@@ -520,6 +522,8 @@ AC_CHECK_SIZEOF(int)
  
  AST_EXT_LIB_CHECK([ALSA], [asound], [snd_spcm_init], [alsa/asoundlib.h], [-lm -ldl])
  
@@ -2496,7 +2478,7 @@
 +
 +email me at   david.bowerman at gmail.com   or dseeb_ on #asterisk & #asterisk-dev irc.
 diff --git a/makeopts.in b/makeopts.in
-index 3d564b7..a394c18 100644
+index 3bf203e..9e99a6f 100644
 --- a/makeopts.in
 +++ b/makeopts.in
 @@ -69,6 +69,9 @@ AST_NO_STRICT_OVERFLOW=@AST_NO_STRICT_OVERFLOW@
@@ -2509,6 +2491,3 @@
  CURL_INCLUDE=@CURL_INCLUDE@
  CURL_LIB=@CURL_LIB@
  
--- 
-1.5.4.3
-


Index: asterisk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/devel/asterisk.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- asterisk.spec	27 Mar 2008 13:05:42 -0000	1.20
+++ asterisk.spec	29 Mar 2008 04:53:47 -0000	1.21
@@ -1,36 +1,18 @@
 %define with_apidoc %{?_with_apidoc: 1} %{!?_with_apidoc: 0}
-%define beta 6
+%define beta 7
 
 Summary: The Open Source PBX
 Name: asterisk
 Version: 1.6.0
-Release: 0.9.beta%{beta}%{?dist}
+Release: 0.10.beta%{beta}%{?dist}
 License: GPLv2
 Group: Applications/Internet
 URL: http://www.asterisk.org/
 
-# The asterisk tarball contains some items that we don't want in there,
-# so start with the original tarball from here:
-# http://downloads.digium.com/pub/telephony/asterisk/releases/asterisk-%{version}.tar.gz
-# Then run the included script file to build the stripped tarball:
-#
-# sh asterisk-strip.sh %{version}
-#
-# MD5 Sums
-# ========
-# aa5d2cf5c822bc5b542f58d21a2dc086  asterisk-1.6.0-beta6.tar.gz
-# 4415aa27d70796046c330a2f9d43a752  asterisk-1.6.0-beta6-stripped.tar.gz
-#
-# SHA1 Sums
-# =========
-# 52c7eaf2ff6e80644d8b7ef7a8f70520ca2a1396  asterisk-1.6.0-beta6.tar.gz
-# 4f309a4b6bf00a9d1f18d26cc9fd540b756bbbd9  asterisk-1.6.0-beta6-stripped.tar.gz
-
-Source0: asterisk-%{version}%{?beta:-beta%{beta}}-stripped.tar.gz
+Source0: http://downloads.digium.com/pub/telephony/asterisk/releases/asterisk-%{version}%{?beta:-beta%{beta}}.tar.gz
 Source1: asterisk-logrotate
 Source2: menuselect.makedeps
 Source3: menuselect.makeopts
-Source4: asterisk-strip.sh
 
 Patch1:  asterisk-1.6.0-beta6-initscripts.patch
 Patch2:  asterisk-1.6.0-beta6-alternate-voicemail.patch
@@ -42,6 +24,7 @@
 Patch8:  asterisk-1.6.0-beta6-lua.patch
 Patch9:  asterisk-1.6.0-beta6-editline.patch
 Patch10: asterisk-1.6.0-beta6-autoconf.patch
+Patch11: asterisk-1.6.0-beta7-chanusbradiofix.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
 
@@ -408,6 +391,7 @@
 %patch8 -p1
 %patch9 -p1
 %patch10 -p1
+%patch11 -p1
 
 cp %{SOURCE2} menuselect.makedeps
 cp %{SOURCE3} menuselect.makeopts
@@ -672,6 +656,7 @@
 %{_libdir}/asterisk/modules/func_callerid.so
 %{_libdir}/asterisk/modules/func_cdr.so
 %{_libdir}/asterisk/modules/func_channel.so
+%{_libdir}/asterisk/modules/func_config.so
 %{_libdir}/asterisk/modules/func_curl.so
 %{_libdir}/asterisk/modules/func_cut.so
 %{_libdir}/asterisk/modules/func_db.so
@@ -753,7 +738,9 @@
 %config(noreplace) %{_sysconfdir}/asterisk/cdr_manager.conf
 %config(noreplace) %{_sysconfdir}/asterisk/cli.conf
 %config(noreplace) %{_sysconfdir}/asterisk/codecs.conf
+%config(noreplace) %{_sysconfdir}/asterisk/dbsep.conf
 %config(noreplace) %{_sysconfdir}/asterisk/dnsmgr.conf
+%config(noreplace) %{_sysconfdir}/asterisk/dsp.conf
 %config(noreplace) %{_sysconfdir}/asterisk/dundi.conf
 %config(noreplace) %{_sysconfdir}/asterisk/enum.conf
 %config(noreplace) %{_sysconfdir}/asterisk/extconfig.conf
@@ -1019,6 +1006,17 @@
 %{_libdir}/asterisk/modules/codec_zap.so
 
 %changelog
+* Fri Mar 28 2008 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.0-0.10.beta7
+- Update to 1.6.0-beta7
+- The Asterisk tarball no longer contains the iLBC code, so we can
+  directly use the upstream tarball without having to modify it.
+- Get rid of the asterisk-strip.sh script since it's no longer needed.
+- Diable build of codec_ilbc and format_ilbc (these do not contain any
+  legally suspect code so they can be included in the tarball but it's
+  pointless building them).
+- Update chan_mobile patch to fix API breakages.
+- Add a patch to chan_usbradio to fix API breakages.
+
 * Thu Mar 27 2008 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.6.0-0.9.beta6
 - Add Postgresql schemas from contrib as documentation to the Postgresql subpackage.
 


Index: menuselect.makeopts
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/devel/menuselect.makeopts,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- menuselect.makeopts	26 Feb 2008 22:56:39 -0000	1.3
+++ menuselect.makeopts	29 Mar 2008 04:53:47 -0000	1.4
@@ -1,8 +1,8 @@
 MENUSELECT_APPS=app_ivrdemo app_mp3 app_osplookup app_rpt app_skel 
 MENUSELECT_CDR=cdr_sqlite
 MENUSELECT_CHANNELS=chan_h323 chan_nbs chan_vpb 
-MENUSELECT_CODECS=
-MENUSELECT_FORMATS=
+MENUSELECT_CODECS=codec_ilbc
+MENUSELECT_FORMATS=format_ilbc
 MENUSELECT_FUNCS=
 MENUSELECT_PBX=pbx_gtkconsole
 MENUSELECT_RES=res_config_sqlite


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/asterisk/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	19 Mar 2008 17:41:15 -0000	1.10
+++ sources	29 Mar 2008 04:53:47 -0000	1.11
@@ -1 +1 @@
-4415aa27d70796046c330a2f9d43a752  asterisk-1.6.0-beta6-stripped.tar.gz
+680df432fd2a212533223349a508616f  asterisk-1.6.0-beta7.tar.gz


--- asterisk-strip.sh DELETED ---


