Updated autoconf by Jaco Kroon closes bug #390091. Version bump to upstream release 2.6.1 as requested by Oliver Jaksch in bug #404521.

(Portage version: 2.1.10.57/cvs/Linux x86_64)

4 files changed, 83 insertions, 43 deletions

diff --git a/net-misc/dahdi-tools/ChangeLog b/net-misc/dahdi-tools/ChangeLog
index c8f063967b0f..ebb7c02076fa 100644
--- a/net-misc/dahdi-tools/ChangeLog
+++ b/net-misc/dahdi-tools/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-misc/dahdi-tools
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dahdi-tools/ChangeLog,v 1.20 2012/05/06 14:37:40 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dahdi-tools/ChangeLog,v 1.21 2012/05/08 14:17:01 chainsaw Exp $
+
+*dahdi-tools-2.6.1 (08 May 2012)
+
+  08 May 2012; Tony Vroon <chainsaw@gentoo.org> +dahdi-tools-2.6.1.ebuild,
+  +files/dahdi-autoconf.init3, -files/dahdi-autoconf.conf,
+  -files/dahdi-autoconf.init:
+  Updated autoconf by Jaco Kroon closes bug #390091. Version bump to upstream
+  release 2.6.1 as requested by Oliver Jaksch in bug #404521.
 
   06 May 2012; Agostino Sarubbo <ago@gentoo.org> -dahdi-tools-2.4.1.ebuild:
   Remove old
diff --git a/net-misc/dahdi-tools/dahdi-tools-2.6.1.ebuild b/net-misc/dahdi-tools/dahdi-tools-2.6.1.ebuild
new file mode 100644
index 000000000000..4e9385d199d7
--- /dev/null
+++ b/net-misc/dahdi-tools/dahdi-tools-2.6.1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dahdi-tools/dahdi-tools-2.6.1.ebuild,v 1.1 2012/05/08 14:17:01 chainsaw Exp $
+
+EAPI=4
+
+inherit base
+
+DESCRIPTION="Userspace tools to configure the kernel modules from net-misc/dahdi"
+HOMEPAGE="http://www.asterisk.org"
+SRC_URI="http://downloads.asterisk.org/pub/telephony/${PN}/releases/${P}.tar.gz
+	mirror://gentoo/gentoo-${PN}-patchset-0.2.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="ppp"
+
+DEPEND="dev-libs/newt
+	ppp? ( net-dialup/ppp )
+	>=net-misc/dahdi-2.5.0
+	!net-misc/zaptel
+	>=sys-kernel/linux-headers-2.6.35
+	virtual/libusb:0"
+RDEPEND="${DEPEND}"
+
+EPATCH_SUFFIX="diff"
+PATCHES=( "${WORKDIR}/${PN}-patchset" )
+
+src_compile() {
+	default_src_compile
+	emake tests
+	use ppp && emake -C ppp
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	use ppp && emake DESTDIR="${D}" -C ppp install
+	emake DESTDIR="${D}" config
+
+	dosbin patgen pattest patlooptest hdlcstress hdlctest hdlcgen hdlcverify timertest
+
+	# install init scripts
+	newinitd "${FILESDIR}"/dahdi.init2 dahdi
+	newinitd "${FILESDIR}"/dahdi-autoconf.init2 dahdi-autoconf
+	newconfd "${FILESDIR}"/dahdi-autoconf.conf2 dahdi-autoconf
+}
diff --git a/net-misc/dahdi-tools/files/dahdi-autoconf.conf b/net-misc/dahdi-tools/files/dahdi-autoconf.conf
deleted file mode 100644
index f0fd8e645bcc..000000000000
--- a/net-misc/dahdi-tools/files/dahdi-autoconf.conf
+++ /dev/null
@@ -1,36 +0,0 @@
-# Global settings
-# Set this to your country code.
-DAHDI_ZONE=za
-DAHDI_ECHOCAN=oslec # mg2,jpah,kb1,sec,sec2 (there may be more, we recommend oslec)
-
-# Settings for analog
-#Analog signal types, one of:
-# ks - KewlStart (recommended, default)
-# ls - LoopStart
-# gs - GroundStart
-
-# Signalling to be used on FXO ports
-DAHDI_FXO_SIGNALLING=ks
-
-# Signalling to be used on FXS ports
-DAHDI_FXS_SIGNALLING=ks
-
-# Whether or not to echocan:
-DAHDI_FXO_ECHOCAN=yes
-DAHDI_FXS_ECHOCAN=yes
-
-# These settings will be used for BRI cards.
-# Known options: B8ZS,AMI,HDB3
-DAHDI_BRI_CODING=AMI
-
-# Known options: ESF,D4,CCS,CRC4
-DAHDI_BRI_FRAMING=CCS
-
-# Our experience is that it's not required (still defaults to yes)
-DAHDI_BRI_NT_ECHOCAN=no
-DAHDI_BRI_TE_ECHOCAN=no
-
-# PRI (E1/T1) not currently supported.
-# If you have a card that gets loaded but not configured please file a bug on
-# bugs.gentoo.org and add jaco@uls.co.za as a CC.  Please do attach the the
-# output of "dahdi_scan" to us.
diff --git a/net-misc/dahdi-tools/files/dahdi-autoconf.init b/net-misc/dahdi-tools/files/dahdi-autoconf.init3
index c49c3a4e9617..550a90e780d7 100644
--- a/net-misc/dahdi-tools/files/dahdi-autoconf.init
+++ b/net-misc/dahdi-tools/files/dahdi-autoconf.init3
@@ -1,9 +1,10 @@
 #!/sbin/runscript
-# Copyright 2010-2011 Ultimate Linux Solutions CC
+# Copyright 1999-2012 Ultimate Linux Solutions CC
 # Distributed under the terms of the GNU General Public License v2
 
 depend() {
 	before dahdi
+	after wanrouter
 }
 
 dahdi_load_modules() {
@@ -85,16 +86,28 @@ dahdi_gen_bri_nt_config() {
 	[ "${DAHDI_BRI_NT_ECHOCAN-yes}" = yes ] && echo "echocanceller=${DAHDI_ECHOCAN-mg2},${basechan}-$(( basechan + 1 ))"
 }
 
-dahdi_gen_e1_te_config() {
+dahdi_gen_e1_cpe_config() {
 	span=$1
 	port=$2
 	basechan=$3
 
-	echo "span=${span},$(( port + 1 )),0,${DAHDI_E1_FRAMING-CCS},${DAHDI_E1_CODING-HDB3,CRC4}"
+	echo "span=${span},${port},0,${DAHDI_E1_FRAMING-CCS},${DAHDI_E1_CODING-HDB3,CRC4}"
 	bchans="${basechan}-$(( basechan + 14 )),$(( basechan + 16 ))-$(( basechan + 30 ))"
 	echo "bchan=${bchans}"
 	echo "dchan=$(( basechan + 15 ))"
-	[ "${DAHDI_E1_TE_ECHOCAN-yes}" = yes ] && echo "echocanceller=${DAHDI_ECHOCAN-mg2},${bchans}"
+	[ "${DAHDI_E1_CPE_ECHOCAN-yes}" = yes ] && echo "echocanceller=${DAHDI_ECHOCAN-mg2},${bchans}"
+}
+
+dahdi_gen_e1_net_config() {
+	span=$1
+	port=$2
+	basechan=$3
+
+	echo "span=${span},0,0,${DAHDI_E1_FRAMING-CCS},${DAHDI_E1_CODING-HDB3,CRC4}"
+	bchans="${basechan}-$(( basechan + 14 )),$(( basechan + 16 ))-$(( basechan + 30 ))"
+	echo "bchan=${bchans}"
+	echo "dchan=$(( basechan + 15 ))"
+	[ "${DAHDI_E1_NET_ECHOCAN-yes}" = yes ] && echo "echocanceller=${DAHDI_ECHOCAN-mg2},${bchans}"
 }
 
 dahdi_conf_span() {
@@ -103,6 +116,7 @@ dahdi_conf_span() {
 	local desc=$3
 	local port=$4
 	local basechan=$5
+	local vname=""
 
 	# Analog we need to deal with on a port-by-port basis.
 	[ "${type}" = "analog" ] && return 0
@@ -116,8 +130,15 @@ dahdi_conf_span() {
 			dahdi_gen_bri_nt_config "${span}" "${port}" "${basechan}"
 		;;
 		digital-E1)
-			# For the moment assume TE.
-			dahdi_gen_e1_te_config "${span}" "${port}" "${basechan}"
+			# Use CPE by default.  Unfortunately there is no easy
+			# way to detect CPE vs NET as far as I know and specifying
+			# in a config that you want NET mode seems the sanest way.
+			vname="PRI_SPAN_${span}_NET"
+			if [[ "${!vname}" = [Yy][Ee][Ss] ]]; then
+				dahdi_gen_e1_net_config "${span}" "${port}" "${basechan}"
+			else
+				dahdi_gen_e1_cpe_config "${span}" "${port}" "${basechan}"
+			fi
 		;;
 		*)
 			echo "# Don't know how to configure this (type=${type})."