remove dependency to dahdi-linux

This reverts commit 980780d920.

.gitignore

@@ -12,6 +12,7 @@
 .libs
 .dirstamp
 .version
+/.pc
 Makefile
 Makefile.in
 auxdir/

.version

@@ -0,0 +1 @@
+3.1.0

Makefile.am

@@ -5,7 +5,7 @@ LEGACY_MAKE	= \
 		top_srcdir=$(top_srcdir) \
 		srcdir=$(srcdir)
 
-CFLAGS	= -g -Wall -O2 $(DAHDI_INCLUDE)
+CFLAGS	+= -g -Wall -O2 $(DAHDI_INCLUDE)
 if DAHDI_DEVMODE
 CFLAGS	+= \
 	-Werror \

Makefile.legacy

@@ -86,7 +86,7 @@ install: all install-programs
 	@echo "### DAHDI tools installed successfully."
 	@echo "### If you have not done so before, install init scripts with:"
 	@echo "###"
-	@echo "###   make config"
+	@echo "###   make install-config"
 	@echo "###"
 	@echo "###################################################"
 

dahdi-bash-completion

@@ -48,7 +48,7 @@ __dahdi_span_types() {
 	has_cmd=0
 	for (( i=0; i < COMP_CWORD; i++)); do
 		case "${COMP_WORDS[$i]}" in
-		dumpconfig | list | set)
+		dumpconfig | list | set | compare)
 			has_cmd=1
 			break
 			;;
@@ -69,7 +69,7 @@ __dahdi_span_types() {
 					grep -l '[EJT]1' /sys/devices/pci0000:00/0000:00:10.4/usb1/1-1/xbus-00/*/spantype 2>/dev/null | sed -e 's|/spantype||') )
 			else
 				COMPREPLY=( ${COMPREPLY[@]} $(compgen -W \
-					'dumpconfig list set' -- $cur) )
+					'dumpconfig list set compare' -- $cur) )
 			fi
 			;;
 		esac

dahdi_span_assignments

@@ -66,6 +66,8 @@ usage() {
 	echo >&2 "         add        - assign spans, according to /etc/dahdi/assigned-spans.conf"
 	echo >&2 "         remove     - unassign spans"
 	echo >&2 "         list       - human-readable list of all spans"
+	echo >&2 "         matched    - found spans matched in configuration"
+	echo >&2 "         unmatched  - found spans not matched in configuration"
 	echo >&2 "         dumpconfig - dump current state as new configuration"
 	echo >&2 ""
 	echo >&2 "       options:"
@@ -109,7 +111,7 @@ while true ; do
 		break
 		;;
 	*)
-		echo "Internal error!"
+		echo >&2 "Internal error!"
 		exit 1
 		;;
 	esac
@@ -215,10 +217,10 @@ unassign_all_spans() {
 			sort | while read spandir; do
 			local_spanno=`cat "$spandir/local_spanno"`
 			if [ "$dry_run" = true ]; then
-				echo "(dry-run) unassign $device $local_spanno"
+				echo >&2 "(dry-run) unassign $device $local_spanno"
 				continue
 			fi
-			echo "unassign $device $local_spanno"
+			echo >&2 "unassign $device $local_spanno"
 			if ! echo "$local_spanno" > "$device/unassign_span"; then
 				echo >&2 "$0: failed unassigning '$local_spanno' in '$device'"
 			fi
@@ -245,12 +247,12 @@ assign_device_spans() {
 		if [ -d "$span" ]; then
 			span_local_spanno=`cat "$span/local_spanno"`
 			if [ "$span_local_spanno" != "$local_spanno" ]; then
-				echo "WARNING: $span_local_spanno != $local_spanno"
+				echo >&2 "WARNING: $span_local_spanno != $local_spanno"
 			fi
-			echo "$device [$local_spanno] already assigned to span $spanno. Skipping..."
+			echo >&2 "$device [$local_spanno] already assigned to span $spanno. Skipping..."
 			continue
 		fi
-		echo "assign $device: $s"
+		echo >&2 "assign $device: $s"
 		if ! echo "$s" > "$device/assign_span"; then
 			echo >&2 "$0: failed assigning '$s' to '$device'"
 		fi
@@ -267,21 +269,21 @@ match_device() {
 		# We use case to enable shell-style globbing in configuration
 		case "$hardware_id" in
 		$id)
-			[ "$verbose" = true ] && echo "match by hwid ($id ~ $hardware_id): $spanspecs"
+			[ "$verbose" = true ] && echo >&2 "match by hwid ($id ~ $hardware_id): $spanspecs"
 			assign_device_spans "$device"
 			;;
 		esac
 		# We use case to enable shell-style globbing in configuration
 		case "$location" in
 		$id)
-			[ "$verbose" = true ] && echo "match by location ($id ~ $location): $spanspecs"
+			[ "$verbose" = true ] && echo >&2 "match by location ($id ~ $location): $spanspecs"
 			assign_device_spans "$device"
 			;;
 		esac
 		# We use case to enable shell-style globbing in configuration
 		case "$devpath" in
 		$id)
-			[ "$verbose" = true ] && echo "match by devpath ($id ~ $devpath): $spanspecs"
+			[ "$verbose" = true ] && echo >&2 "match by devpath ($id ~ $devpath): $spanspecs"
 			assign_device_spans "$device"
 			;;
 		esac
@@ -293,7 +295,7 @@ assign_devices() {
 		echo >&2 "$0: Missing '$DAHDISASSIGNEDSPANSCONF'"
 		exit 1
 	fi
-	echo "using '$DAHDISASSIGNEDSPANSCONF'"
+	echo >&2 "using '$DAHDISASSIGNEDSPANSCONF'"
 	for device in $DEVICES
 	do
 		match_device "$device"
@@ -303,13 +305,71 @@ assign_devices() {
 auto_assign_devices() {
 	for device in $DEVICES
 	do
-		echo "auto-assign $device"
+		echo >&2 "auto-assign $device"
 		if [ "$dry_run" != true ]; then
 			echo 1 > "$device/auto_assign"
 		fi
 	done
 }
 
+dev_match_conf() {
+	local devpath="$1"
+	local location="$2"
+	local hardware_id="$3"
+	local local_spanno="$4"
+	filter_conf | while read id spanspecs
+	do
+		spanno=`echo "$spanspecs" | cut -d: -f1`
+		match_dev=no
+		# We use case to enable shell-style globbing in configuration
+		case "$hardware_id" in
+		$id)
+			match_dev=yes
+			;;
+		esac
+		# We use case to enable shell-style globbing in configuration
+		case "$location" in
+		$id)
+			match_dev=yes
+			;;
+		esac
+		# We use case to enable shell-style globbing in configuration
+		case "$devpath" in
+		$id)
+			match_dev=yes
+			;;
+		esac
+		if [ "$match_dev" = 'yes' -a "$local_spanno" = "$spanno" ]; then
+			#printf "%-8s (%s) %-14s %s %s\n" "$local_spanno" "$spanno" "[$hardware_id]" "$location" "$devpath"
+			echo "[$hardware_id]:$local_spanno"
+		fi
+	done
+}
+
+list_devices() {
+	wanted="$1"
+	if [ ! -f "$DAHDISASSIGNEDSPANSCONF" ]; then
+		echo >&2 "$0: Missing '$DAHDISASSIGNEDSPANSCONF'"
+		exit 1
+	fi
+	echo >&2 "using '$DAHDISASSIGNEDSPANSCONF'"
+	for device in $DEVICES
+	do
+		devpath=`cd "$device" && pwd -P`
+		location='@'`attr_clean "$device/location"`
+		hardware_id=`attr_clean "$device/hardware_id"`
+		for local_spanno in `cut -d: -f1 "$device/spantype"`
+		do
+			found=`dev_match_conf "$devpath" "$location" "$hardware_id" "$local_spanno"`
+			if [ "$wanted" = "unmatched" ]; then
+				[ -z "$found" ] && echo "[$hardware_id]:$local_spanno"
+			else
+				[ -z "$found" ] || echo "[$hardware_id]:$local_spanno"
+			fi
+		done
+	done
+}
+
 case "$action" in
 auto)
 	auto_assign_devices
@@ -326,6 +386,12 @@ list)
 dumpconfig)
 	dump_config
 	;;
+matched)
+	list_devices "matched"
+	;;
+unmatched)
+	list_devices "unmatched"
+	;;
 *)
 	echo >&2 "Bad action='$action'"
 	usage

dahdi_span_types

@@ -69,6 +69,7 @@ usage() {
 	echo >&2 "Usage: $0 [options] action [devpath ...]"
 	echo >&2 "       action:"
 	echo >&2 "         set        - set spans to E1/T1 according to /etc/dahdi/span-types.conf"
+	echo >&2 "         compare    - show config values that differ from system"
 	echo >&2 "         list       - human-readable list of all spans"
 	echo >&2 "         dumpconfig - dump current state in /etc/dahdi/span-types.conf format"
 	echo >&2 ""
@@ -88,6 +89,8 @@ if [ $? != 0 ]; then
 	usage
 fi
 
+compare=false
+
 # Note the quotes around `$TEMP': they are essential!
 eval set -- "$TEMP"
 
@@ -321,13 +324,26 @@ handle_span() {
 					echo >&2 "Set $devname span $spanno = $val"
 				fi
 				if [ "$dry_run" != 'true' ]; then
-					echo "$spanno:$val" > "$attr_file"
+					if [ "$compare" = 'true' ]; then
+						config="$spanno:$val"
+						system=`grep "$spanno:" "$attr_file"`
+						if [ "$config" != "$system" ]; then
+
+							active_val=`echo $system | cut -d: -f2`
+							echo "$devname $spanno     $val     $active_val" >>"$compare_results_file"
+						fi
+					else
+						echo "$spanno:$val" > "$attr_file"
+					fi
 				fi
 			fi
 		done
 }
 
 set_all_devices() {
+	span_differs='false'
+	SPANS_DIFFER='false'
+
 	if [ ! -f "$DAHDISPANTYPESCONF" ]; then
 		echo >&2 "$0: Missing configuration '$DAHDISPANTYPESCONF'"
 		exit 1
@@ -348,6 +364,16 @@ set_all_devices() {
 			esac
 		done
 	done
+	if [ "$compare" = 'true' ]; then
+		if [ -s "$compare_results_file" ]; then
+			echo "# Device           Unit  Config Active"
+			cat "$compare_results_file"
+			rm -f "$compare_results_file"
+			exit 5
+		fi
+		rm -f "$compare_results_file"
+		exit 0
+	fi
 }
 
 case "$action" in
@@ -360,6 +386,11 @@ dumpconfig)
 set)
 	set_all_devices
 	;;
+compare)
+	compare=true
+	compare_results_file=`mktemp`
+	set_all_devices
+	;;
 *)
 	usage
 	;;

dahdi_test.c

@@ -64,7 +64,7 @@ void hup_handler(int sig)
 	printf("\n--- Results after %d passes ---\n", pass);
 	printf("Best: %.3f%% -- Worst: %.3f%% -- Average: %f%%\n",
 			best, worst, pass ? total/pass : 100.00);
-	printf("Cummulative Accuracy (not per pass): %0.3f\n",
+	printf("Cumulative Accuracy (not per pass): %0.3f\n",
 	       pass ? accuracy : 0.0);
 	exit(0);
 }

debian/.gitignore

@@ -0,0 +1,12 @@
+*debhelper*
+*.substvars
+.debhelper/
+autoreconf.after
+autoreconf.before
+dahdi.udev
+dahdi/
+files
+libtonezone-dev/
+libtonezone2.0/
+savedfiles.cpio
+tmp/

debian/README.Debian

@@ -0,0 +1,89 @@
+Echo Canceller
+--------------
+In DAHDI (software) echo cancellers are separate modules, that are 
+automatically loaded if their name is used in /etc/dahdi/system.conf .
+dahdi_genconf, the configuration generator, thus defaults to creating a 
+system.conf with an echocanceller line for each channel. By default it is 
+'mg2' (the MG2 echo canceller) but this can be changed by setting 
+'echocanceller' (see the sample genconf_parameters file).
+
+The Debian package of dahdi-linux is patched to include support of the 
+echo canceller OSLEC. Thus dahdi-tools has been patched accordingly to
+make it the default echo canceller, and to remove 'echo' as well when
+unloading modules.
+
+However if you, for any strange reason, use a version of the DAHDI
+kernel modules that does not include a working dahdi_echocan_oslec.ko,
+just set in /etc/dahdi/genconf_parameters:
+
+  echo_can mg2
+
+
+FXOTune
+-------
+FXOTune is a utility provided by Digium for fine-tuning parameters of the 
+FXO modules of their TDM cards and compatibles, as well as of those of the 
+Xorcom Astribank.
+
+This package includes the fxotune utility. It will also load configuration 
+from /etc/fxotune.conf if fxotune was used to tune the FXO modules. Note 
+that fxotune will not work with X100P and similar cards.
+
+
+Supported tone-zones
+--------------------
+DAHDI is capable of playing ring tone, buy tone etc. for a large variety of
+countries. This is done using the loadzone and defaultzone settings in 
+system.conf.  A list of tone-zones supported by DAHDI and libtonezone is 
+included in the file tonezones.txt in the documentation directory. 
+
+Example section of system.conf:
+loadzone=us,uk,de
+defaultzone=us
+
+
+dahdi vs. dahdi-linux
+---------------------
+Upstream DAHDI is split to two parts: dahdi-linux are parts that are 
+supposed to be linux-specific, whereas dahdi-tools are supposed to be
+generic utilities to use the DAHDI interface.
+
+DAHDI-linux includes mostly kernel modules, but also udev rules, xpp 
+initialization scripts and firmwares (latter are stripped from the 
+Debian package). Those are included in the package dahdi-linux.
+
+Most of the dahdi utilities, e.g. dahdi_cfg, dahdi_test, dahdi_monitor
+and the dahdi-perl utilities are included in the package 'dahdi' that is
+built from the source package dahdi-tools.
+
+
+Automatic startup
+-----------------
+There is work in progress to start DAHDI devices automatically.
+See also http://docs.tzafrir.org.il/dahdi-tools/#_initialization and for
+the low-level description:
+http://docs.tzafrir.org.il/dahdi-linux/#_span_assignments
+
+The dahdi-linux package sets dahdi.auto_assigned_spans to 0 by default,
+but the dahdi-tools should have the required scriptary in place to make
+sure an upgrade will not break an existing system. That said, if your
+system has more than one DAHDI device, you should create a
+/etc/dahdi/assigned-spans.conf using 'dahdi_genconf assignedspan' (or
+manually) rather than relying on any other ordering mechanism.
+
+Much work has been put in place to make sure configurations
+work as before if there are no changes. It is still recommended to create
+a span-assignments file for your setup if you have more than one device:
+
+  dahdi_genconf assigedspans
+
+The udev hook scripts run two main hooks:
+* /usr/share/dahdi/dahdi_handle_device:
+      Run when a new DAHDI device is added or removed. Mainly to assign
+      spans.
+* /usr/share/dahdi/dahdi_config_span:
+      Run when a new DAHDI span is added or removed. Mainly to configure
+      the new spans.
+
+As you would expect, there are .d directories for the scripts and those
+are places for your hooks, if needed.

debian/README.source

@@ -0,0 +1,9 @@
+The packaging is based on the upstream git repository.  However, the
+upstream release tarballs are different.
+
+* We use pristine-tar.
+* We manually clean some generated files at build time (we re-create
+  them anyway).
+
+Before building a new release, be sure to download the tarball and
+commit it with pristine-tar.

debian/TODO

@@ -0,0 +1,3 @@
+* Transition from zaptel?
+* Fix copyright
+* xpp/README.Astribank.html

debian/clean

@@ -0,0 +1,28 @@
+dahdi_tool
+autoconfig.h
+genconf_parameters.sample
+version.c
+debian/dahdi.udev
+xpp/dahdi_genconf.8.html
+xpp/dahdi_hardware.8.html
+xpp/dahdi_registration.8.html
+xpp/lsdahdi.8.html
+xpp/twinstar.8.html
+xpp/xpp_blink.8.html
+xpp/xpp_sync.8.html
+
+# Autotools files:
+Makefile
+config.log
+config.status
+doc/Makefile
+hotplug/Makefile
+libtool
+makeopts
+ppp/Makefile
+stamp-h1
+xpp/Makefile
+xpp/oct612x/Makefile
+xpp/perl_modules/Makefile
+xpp/xtalk/Makefile
+

debian/compat

@@ -0,0 +1 @@
+10

debian/control

@@ -0,0 +1,57 @@
+Source: dahdi-tools
+Section: comm
+Priority: optional
+Maintainer: Debian VoIP Team <pkg-voip-maintainers@lists.alioth.debian.org>
+Uploaders: Tzafrir Cohen <tzafrir@debian.org>, Mark Purcell <msp@debian.org>
+# groff, man-db and asciidoc are required for generating documentation
+Build-Depends: debhelper (>= 10),
+ autoconf,
+ automake,
+ cpio,
+ pkg-config,
+ linux-libc-dev,
+ libnewt-dev,
+ bzip2,
+ libusb-1.0-0-dev,
+ asciidoc-base | asciidoc,
+ groff,
+ man-db,
+Standards-Version: 4.3.0
+Homepage: http://www.asterisk.org/
+Vcs-Git: https://salsa.debian.org/pkg-voip-team/dahdi-tools.git
+Vcs-Browser: https://salsa.debian.org/pkg-voip-team/dahdi-tools
+Rules-Requires-Root: no
+
+Package: dahdi
+Architecture: linux-any
+Multi-Arch: foreign
+Depends: ${shlibs:Depends}, ${perl:Depends}, ${misc:Depends}, procps, fxload, usbutils
+Description: utilities for using the DAHDI kernel modules
+ DAHDI (formly Zaptel) is an interface for telephony devices used by e.g.
+ the Asterisk PBX software. The dahdi-* packages provide the kernel
+ DAHDI kernel modules and their required setup environment.
+ .
+ This package includes userspace utilities required to configure DAHDI
+ modules.
+
+Package: libtonezone2.0
+Section: libs
+Architecture: linux-any
+Multi-Arch: same
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: tonezone library (runtime)
+ A library for generating tones to be sent through the DAHDI telephony
+ interface.
+ .
+ This package contains the runtime library files.
+
+Package: libtonezone-dev
+Section: libdevel
+Architecture: linux-any
+Multi-Arch: same
+Depends: libtonezone2.0 (= ${binary:Version}), ${misc:Depends}
+Description: tonezone library (development)
+ A library for generating tones to be sent through the DAHDI telephony
+ interface.
+ .
+ This package contains the development files.

debian/control.modules.in

@@ -0,0 +1,17 @@
+Source: zaptel
+Section: comm
+Priority: extra
+Maintainer: Debian VoIP Team <pkg-voip-maintainers@lists.alioth.debian.org>
+Uploaders: Kilian Krause <kk@verfaction.de>, Jose Carlos Garcia Sogo <jsogo@debian.org>, Mark Purcell <msp@debian.org>, Santiago Garcia Mantinan <manty@debian.org>, Santiago Ruano Rincon <santiago@unicauca.edu.co>
+Build-Depends: debhelper (>> 3.0.0), bzip2
+Standards-Version: 3.6.1.1
+
+Package: zaptel-modules-_KVERS_
+Architecture: any
+Provides: zaptel-modules
+Description: zaptel modules for Linux (kernel _KVERS_).
+ This package contains the set of loadable kernel modules for the
+ zapata telephony API.
+ This package contains the compiled kernel modules for _KVERS_
+ .
+ In order to compile these modules use the module-assistant utility.

debian/copyright

@@ -0,0 +1,114 @@
+This package was debianized by Tzafrir Cohen <tzafrir.cohen@xorcom.com> on
+Tue, 26 Aug 2008 10:06:40 +0300
+
+It was downloaded from
+  http://downloads.asterisk.org/pub/telephony/dahdi-tools/
+
+Copyright: (from dahdi_cfg.c)
+
+ * Written by Mark Spencer <markster@digium.com>
+ * Based on previous works, designs, and architectures conceived and
+ * written by Jim Dixon <jim@lambdatel.com>.
+ *
+ * Copyright (C) 2001 Jim Dixon / Zapata Telephony.
+ * Copyright (C) 2001-2008 Digium, Inc.
+ *
+ * All rights reserved.
+ *
+ * Primary Author: Mark Spencer <markster@digium.com>
+ * Radio Support by Jim Dixon <jim@lambdatel.com>
+ *
+ * This program is free software, distributed under the terms of
+ * the GNU General Public License Version 2 as published by the
+ * Free Software Foundation. See the LICENSE file included with
+ * this program for more details.
+
+On Debian systems, a copy of the GNU General Public License Version 2 
+may be found in /usr/share/common-licenses/GPL-2 .
+
+Other Portions:
+dahdi_monitor.c: * Copyright (C) 2001 Jim Dixon / Zapata Telephony.
+dahdi_monitor.c: * Copyright (C) 2001-2008 Digium, Inc.
+dahdi_scan.c: * Copyright (C) 2007 Digium, Inc.
+dahdi_tool.c: * Copyright (C) 2001 Jim Dixon / Zapata Telephony.
+dahdi_tool.c: * Copyright (C) 2001-2008 Digium, Inc.
+sethdlc.c: * Copyright (C) 1999 - 2002 Krzysztof Halasa <khc@pm.waw.pl>
+sethdlc.c:              "Copyright (C) 2000 - 2003 Krzysztof Halasa <khc@pm.waw.pl>\n"
+
+Files in the xpp/ subdirectory:
+
+* Written by Oron Peled <oron@actcom.co.il>
+* Copyright (C) 2004-2010, Xorcom
+
+Perl programs and modules in the xpp/ directory:
+# This program is free software; you can redistribute and/or
+# modify it under the same terms as Perl itself.
+
+Other scripts in the xpp directory:
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+
+
+
+Files in menuselect/:
+
+menuselect is a GPLed program used in the build process of Asterisk and
+other Digium programs. Thus expect to find the same on those packages,
+and also not to find it in any binary package.
+
+menuselect/Makefile:# Copyright (C) 2005-2008, Digium, Inc.
+menuselect/menuselect.c: * Copyright (C) 2005 - 2006, Russell Bryant
+menuselect/menuselect_curses.c: * Copyright (C) 2005 - 2006, Russell Bryant
+menuselect/menuselect.h: * Copyright (C) 2005-2006, Russell Bryant
+menuselect/menuselect_newt.c: * Copyright (C) 2008 Sean Bright
+menuselect/menuselect_stub.c: * Copyright (C) 2005 - 2006, Russell Bryant
+menuselect/missing:# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005
+menuselect/README:Copyright (C) 2005-2006, Digium, Inc.
+menuselect/strcompat.c: * Copyright (C) 1999 - 2006, Digium, Inc.
+
+ * This program is free software, distributed under the terms of
+ * the GNU General Public License Version 2. See the LICENSE file
+ * at the top of the source tree.
+
+Portions of menuselect/strcompat.c:
+ * Based on Code from bsd-asprintf from OpenSSH
+ * Copyright (c) 2004 Darren Tucker.
+ *
+ * Based originally on asprintf.c from OpenBSD:
+ * Copyright (c) 1997 Todd C. Miller <Todd.Miller@courtesan.com>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+
+Files under menuselect/mxml/:
+
+mxml is a minimal XML parsing library used by Asterisk and co. Likewise
+used at build time for building menuselect above.
+
+ * Copyright 2003-2005 by Michael Sweet.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+
+On Debian systems, a copy of the GNU General Public License may be found in
+/usr/share/common-licenses/GPL-2.

debian/dahdi.dirs

@@ -0,0 +1 @@
+etc/init.d

debian/dahdi.doc-base.astribank

@@ -0,0 +1,13 @@
+Document: dahdi.astribank
+Title: Xorcom Astribank Documentation
+Author: Tzafrir Cohen
+Abstract: Technical Documentation of the Xorcom Astribank
+Section: Network/Communication
+
+Format: HTML
+Index: /usr/share/doc/dahdi/README.Astribank.html
+Files: /usr/share/doc/dahdi/README.Astribank.html
+
+Format: text
+Files: /usr/share/doc/dahdi/README.Astribank.gz
+

debian/dahdi.doc-base.readme

@@ -0,0 +1,13 @@
+Document: dahdi
+Title: DAHDI Telephony Interface Driver
+Author: Tzafrir Cohen
+Abstract: Basic documentation of the DAHDI telephony interface
+Section: Network/Communication
+
+Format: HTML
+Index: /usr/share/doc/dahdi/README.html
+Files: /usr/share/doc/dahdi/README.html
+
+Format: text
+Files: /usr/share/doc/dahdi/README.gz
+

debian/dahdi.examples

@@ -0,0 +1,3 @@
+hotplug/span_config.d/50-asterisk
+xpp/genconf_parameters
+*.conf.sample

debian/dahdi.install

@@ -0,0 +1,6 @@
+usr/sbin/*
+usr/share/perl5/Dahdi*
+usr/share/dahdi/*
+usr/share/man/man8/*
+usr/lib/dracut/dracut.conf.d/50-dahdi.conf
+usr/share/bash-completion/completions/dahdi

debian/dahdi.lintian

@@ -0,0 +1 @@
+dahdi: mknod-in-maintainer-script postinst:16

debian/docs

@@ -0,0 +1,5 @@
+README
+README.html
+tonezones.txt
+xpp/README.Astribank
+README.Astribank.html

debian/libtonezone-dev.install

@@ -0,0 +1,3 @@
+usr/include/dahdi/tonezone.h
+usr/lib/*/lib*.a
+usr/lib/*/lib*.so

debian/libtonezone2.0.docs

@@ -0,0 +1 @@
+tonezones.txt

debian/libtonezone2.0.install

@@ -0,0 +1 @@
+usr/lib/*/lib*.so.2*

debian/libtonezone2.0.symbols

@@ -0,0 +1,12 @@
+libtonezone.so.2.0 libtonezone2.0 #MINVER#
+* Build-Depends-Package: libtonezone-dev
+ builtin_zones@Base 1:2.2.1.1
+ dahdi_tools_version@Base 1:2.2.1.1
+ tone_zone_find@Base 1:2.2.1.1
+ tone_zone_find_by_num@Base 1:2.2.1.1
+ tone_zone_get_zone@Base 1:2.2.1.1
+ tone_zone_play_tone@Base 1:2.2.1.1
+ tone_zone_register@Base 1:2.2.1.1
+ tone_zone_register_zone@Base 1:2.2.1.1
+ tone_zone_set_zone@Base 1:2.2.1.1
+ tone_zone_tone_name@Base 1:2.2.1.1

debian/modulestest

@@ -0,0 +1,71 @@
+#!/bin/sh
+
+# debian/modulestest: a postbuild script to build zaptel modules
+# example usage:
+#  
+#  svn-buildpackage --svn-postbuild='debian/modulestest -r' --svn-ignore-new 
+
+# At least one of the following two must be set to a sensible value:
+# If both are empty, the script does nothing useful)
+#
+# kernel versions: Comma-separated. Use those if you have their
+# kernel-headers/linux-headers packages installed
+#
+
+# Full pathes to trees:
+# Use this to provide a full path to a custom kernel tree:
+#KERNEL_SOURCES=$HOME/Proj/Debs/Kernel/SwSusp/linux-2.6.15-rc5
+KERNEL_HEADERS=
+KERNEL_SOURCES=
+# run module-asustant with environment params that will generate
+# .changes files even without signing
+MODASS="env SIGNCHANGES=1 DEBSIGNCOMMAND=not_an_executable m-a"
+me=`basename $0`
+
+# workaround for silly bash parsing issue in our build scripts:
+if [ "$#" -lt 1 ]; then
+  set -- $MODULESTEST_ARGS
+fi
+
+while getopts ah:rs:t arg
+do
+  case "$arg" in
+    a) # All of the kernel-headers packages installed:
+        KERNEL_HEADERS=`COLUMNS=160 dpkg -l 'kernel-headers-2.[46].*-*-*' | awk '/^.i/{print $2}' | sed -e 's/^kernel-headers-//'| xargs| tr ' ' ,`
+      ;;
+    h) KERNEL_HEADERS=$OPTARG;;
+    s) KERNEL_SOURCES=$OPTARG;;
+    r) KERNEL_HEADERS=`uname -r`;;
+    t) # TODO: make this test per-distro or something 
+      KERNEL_HEADERS=2.4.27-2-386,2.6.8-2-686-smp
+      ;;
+  esac
+done
+shift $(( $OPTIND-1 ))
+
+echo "Building for: Headers: $KERNEL_HEADERS, Sources: $KERNEL_SOURCES"
+
+if [ "$KERNEL_HEADERS" != '' ]; then hdrs_sw="-l $KERNEL_HEADERS"; fi
+if [ "$KERNEL_SOURCES" != '' ]; then srcs_sw="-k $KERNEL_SOURCES"; fi
+
+# must be absolute for m-a ta accept TARBALL:
+# Also note that $PWD is ugly and is about to be deleted. We need
+# $PWD/.. 
+TOP_DIR=`dirname $PWD`
+MODS_DIR=$TOP_DIR/modules
+TAR_BALL=$MODS_DIR/usr/src/zaptel.tar.bz2
+DEB=$TOP_DIR/$PACKAGE-source_${TAG_VERSION}_all.deb
+LOG_FILE=$TOP_DIR/$PACKAGE-modules-build-$TAG_VERSION.log
+
+rm -f $LOG_FILE
+dpkg -x $DEB $MODS_DIR
+
+if [ "$hdrs_sw" != '' ]; then
+  TARBALL=$TAR_BALL $MODASS -u $TOP_DIR -t -i -f $hdrs_sw build $PACKAGE >>$LOG_FILE
+fi
+if [ "$srcs_sw" != '' ]; then
+  TARBALL=$TAR_BALL $MODASS -u $TOP_DIR -t -i -f $srcs_sw build $PACKAGE >>$LOG_FILE
+fi
+
+ls -l $TOP_DIR/$PACKAGE-modules-*_$TAG_VERSION+*.deb
+echo "$me: Log file: $LOG_FILE"

debian/patches/dahdi-tools-3.1.0-fno-common.patch

@@ -0,0 +1,43 @@
+From: Jaco Kroon <jaco@uls.co.za>
+Subject: Remove unused union names that break build
+Bug: https://issues.asterisk.org/jira/browse/DAHTOOL-85
+
+diff --git a/xpp/mpptalk.c b/xpp/mpptalk.c
+index fdb34f1..8fb3687 100644
+--- a/xpp/mpptalk.c
++++ b/xpp/mpptalk.c
+@@ -237,7 +237,7 @@ union XTALK_PDATA(MPP) {
+ 		MEMBER(MPP, TWS_PORT_GET_REPLY);
+ 		MEMBER(MPP, TWS_PWR_GET);
+ 		MEMBER(MPP, TWS_PWR_GET_REPLY);
+-} PACKED members;
++} PACKED;
+ 
+ /*
+  * Statuses
+diff --git a/xpp/xtalk/xtalk_raw.c b/xpp/xtalk/xtalk_raw.c
+index 49e47d5..251a502 100644
+--- a/xpp/xtalk/xtalk_raw.c
++++ b/xpp/xtalk/xtalk_raw.c
+@@ -48,7 +48,7 @@ CMD_DEF(XTALK, ACK,
+ 
+ union XTALK_PDATA(XTALK) {
+ 	MEMBER(XTALK, ACK);
+-} PACKED members;
++} PACKED;
+ 
+ const struct xtalk_protocol	xtalk_raw_proto = {
+ 	.name	= "XTALK-RAW",
+diff --git a/xpp/xtalk/xtalk_sync.c b/xpp/xtalk/xtalk_sync.c
+index 18a5cad..ffa79d2 100644
+--- a/xpp/xtalk/xtalk_sync.c
++++ b/xpp/xtalk/xtalk_sync.c
+@@ -60,7 +60,7 @@ union XTALK_PDATA(XTALK) {
+ 	MEMBER(XTALK, ACK);
+ 	MEMBER(XTALK, PROTO_GET);
+ 	MEMBER(XTALK, PROTO_GET_REPLY);
+-} PACKED members;
++} PACKED;
+ 
+ const struct xtalk_protocol	xtalk_sync_proto = {
+ 	.name	= "XTALK-SYNC",

debian/patches/dahdi_spantypes.patch

@@ -0,0 +1,134 @@
+From: Tzafrir Cohen <tzafrir@debian.org>
+Date: Sat, 2 Mar 2019 01:37:51 +0200
+Bug: https://issues.asterisk.org/jira/browse/DAHTOOL-82
+Subject: [PATCH] handle both spantypes and dahdi_spantypes in sysfs
+
+dahdi_span_types and dahdi_span_assignments use information from sysfs.
+As of kernel 4.13, the name of the attribute chnaged. Handle both old
+and new name.
+
+Signed-off-by: Tzafrir Cohen <tzafrir@debian.org>
+---
+ dahdi_span_assignments | 15 ++++++++++++---
+ dahdi_span_types       | 23 ++++++++++++++++++-----
+ 2 files changed, 30 insertions(+), 8 deletions(-)
+
+diff --git a/dahdi_span_assignments b/dahdi_span_assignments
+index 9b4f305..235d61e 100755
+--- a/dahdi_span_assignments
++++ b/dahdi_span_assignments
+@@ -151,6 +151,15 @@ attr_clean() {
+ 	cat "$1" 2>/dev/null | tr -d '\n' | tr '!' '/' | tr -c 'a-zA-Z0-9/:.-' '_'
+ }
+ 
++get_device_spannos() {
++	device=$1
++	sp_file="dahdi_spantype"
++	if [ ! -f "$device/$sp_file" ]; then
++		sp_file="spantype"
++	fi
++	cut -d: -f1 "$device/$sp_file"
++}
++
+ show_devices() {
+ 
+ 	for device in $DEVICES
+@@ -158,7 +167,7 @@ show_devices() {
+ 		devpath=`cd "$device" && pwd -P`
+ 		location='@'`attr_clean "$device/location"`
+ 		hardware_id=`attr_clean "$device/hardware_id"`
+-		for local_spanno in `cut -d: -f1 "$device/spantype"`
++		for local_spanno in `get_device_spannos "$device"`
+ 		do
+ 			span=`grep 2>/dev/null -Hw "$local_spanno" "$device/span-"*"/local_spanno" | \
+ 				sed -e 's,/local_spanno:.*,,' -e 's,.*/,,'`
+@@ -193,7 +202,7 @@ dump_config() {
+ 			id="$devpath"
+ 		fi
+ 		echo "# Device: [$hardware_id] @$location $devpath"
+-		for local_spanno in `cut -d: -f1 "$device/spantype"`
++		for local_spanno in `get_device_spannos "$device"`
+ 		do
+ 			span=`grep 2>/dev/null -Hw "$local_spanno" "$device/span-"*"/local_spanno" | \
+ 				sed -e 's,/local_spanno:.*,,' -e 's,.*/,,'`
+@@ -358,7 +367,7 @@ list_devices() {
+ 		devpath=`cd "$device" && pwd -P`
+ 		location='@'`attr_clean "$device/location"`
+ 		hardware_id=`attr_clean "$device/hardware_id"`
+-		for local_spanno in `cut -d: -f1 "$device/spantype"`
++		for local_spanno in `get_device_spannos "$device"`
+ 		do
+ 			found=`dev_match_conf "$devpath" "$location" "$hardware_id" "$local_spanno"`
+ 			if [ "$wanted" = "unmatched" ]; then
+diff --git a/dahdi_span_types b/dahdi_span_types
+index 5fce110..f44b494 100755
+--- a/dahdi_span_types
++++ b/dahdi_span_types
+@@ -172,6 +172,15 @@ attr_clean() {
+ 	cat "$1" 2>/dev/null | tr -d '\n' | tr '!' '/' | tr -c 'a-zA-Z0-9/:.-' '_'
+ }
+ 
++get_device_spantype_file() {
++	device=$1
++	sp_file="dahdi_spantype"
++	if [ ! -f "$device/$sp_file" ]; then
++		sp_file="spantype"
++	fi
++	echo "$device/$sp_file"
++}
++
+ show_spantypes() {
+ 	echo "# PRI span types (E1/T1/J1)"
+ 	for device in $DEVICES
+@@ -179,7 +188,8 @@ show_spantypes() {
+ 		devpath=`cd "$device" && pwd -P`
+ 		location='@'`attr_clean "$device/location"`
+ 		hardware_id=`attr_clean "$device/hardware_id"`
+-		cat "$device/spantype" | while read st; do
++		sp_file=`get_device_spantype_file "$device"`
++		cat "$sp_file" | while read st; do
+ 			case "$st" in
+ 			*:[ETJ]1)
+ 				printf "%-10s %-20s %-30s %s\n" \
+@@ -192,7 +202,7 @@ show_spantypes() {
+ }
+ 
+ list_pri_spantypes() {
+-	find $DEVICES -follow -maxdepth 1 -name spantype | \
++	find $DEVICES -follow -maxdepth 1 -name spantype -or -name dahdi_spantype | \
+ 		xargs cat | \
+ 		sed -n '/:[ETJ]1$/s/^.*://p' | \
+ 		sort -u | \
+@@ -255,7 +265,8 @@ dump_config() {
+ 			id="$devpath"
+ 		fi
+ 		echo "# Device: [$hardware_id] @$location $devpath"
+-		cat "$device/spantype" | while read st; do
++		sp_file=`get_device_spantype_file "$device"`
++		cat "$sp_file" | while read st; do
+ 			case "$st" in
+ 			*:[ETJ]1)
+ 				if [ "$num_spantypes" -eq 1 ]; then
+@@ -281,7 +292,8 @@ filter_conf() {
+ handle_span() {
+ 	device="$1"
+ 	spantype="$2"
+-	attr_file="$device/spantype"
++	sp_file=`get_device_spantype_file "$device"`
++	attr_file="$sp_file"
+ 	devpath=`cd "$device" && pwd -P`
+ 	devname=`echo "$device" | sed "s,$devbase/,,"`
+ 	location='@'`attr_clean "$device/location"`
+@@ -351,7 +363,8 @@ set_all_devices() {
+ 	for device in $DEVICES
+ 	do
+ 		devname=`echo "$device" | sed "s,$devbase/,,"`
+-		cat "$device/spantype" | while read spantype; do
++		sp_file=`get_device_spantype_file "$device"`
++		cat "$sp_file" | while read spantype; do
+ 			case "$spantype" in
+ 			*:[ETJ]1)
+ 				handle_span "$device" "$spantype"
+-- 
+2.20.1
+

debian/patches/echocan_oslec

@@ -0,0 +1,21 @@
+Subject: Make OSLEC the default DAHDI echo canceller
+Author: Tzafrir Cohen <tzafrir.cohen@xorcom.com>
+Forwarded: no
+
+Our dahdi-linux packages provide OSLEC, which is generally a better echo
+canceller than those included with DAHDI. Thus we should make it the 
+default echo canceller in generated configurations.
+
+Debian-specific configuration tweak.
+
+--- a/xpp/perl_modules/Dahdi/Config/Params.pm
++++ b/xpp/perl_modules/Dahdi/Config/Params.pm
+@@ -111,7 +111,7 @@ sub item($$@) {
+ 			group_lines		=> '0',
+ 			brint_overlap		=> 'no',
+ 			bri_sig_style		=> 'bri_ptmp',
+-			echo_can		=> 'mg2',
++			echo_can		=> 'oslec',
+ 			bri_hardhdlc		=> 'auto',
+ 			pri_connection_type	=> 'PRI',
+ 			r2_idle_bits		=> '1101',

debian/patches/fix_install_paths.patch

@@ -0,0 +1,16 @@
+From: Tzafrir Cohen <tzafrir@debian.org>
+Subject: Change defaults for some install paths
+
+Index: dahdi-tools/Makefile.am
+===================================================================
+--- dahdi-tools.orig/Makefile.am	2020-08-19 23:41:45.003051626 +0300
++++ dahdi-tools/Makefile.am	2020-08-19 23:41:44.999051671 +0300
+@@ -111,7 +111,7 @@
+ 	@echo "Compatibility symlinks (should be removed in the future)"
+ 	ln -sf libtonezone.so.2.0.0 $(DESTDIR)$(libdir)/libtonezone.so.2.0
+ 
+-bashcompdir	= $(sysconfdir)/bash_completion.d
++bashcompdir	= $(datadir)/bash-completion/completions
+ 
+ install-data-hook:
+ 	mkdir -p $(DESTDIR)$(bashcompdir)

debian/patches/remove_dahdi_speed

@@ -0,0 +1,22 @@
+Author: Tzafrir Cohen <tzafrir.cohen@xorcom.com>
+Description: Remove the useless utility dahdi_speed
+
+It was useful long ago, but pointless now.
+
+diff --git a/Makefile.am b/Makefile.am
+index d43ce91..09e4f12 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -35,11 +35,11 @@ sbin_PROGRAMS	= \
+ 	dahdi_maint \
+ 	dahdi_monitor \
+ 	dahdi_cfg \
+-	dahdi_speed \
+ 	dahdi_scan \
+ 	fxotune
+ 
+ noinst_PROGRAMS	= \
++	dahdi_speed \
+ 	fxstest \
+ 	patgen \
+ 	pattest \

debian/patches/series

@@ -0,0 +1,8 @@
+zaptel_perl
+echocan_oslec
+remove_dahdi_speed
+soname.patch
+dahdi_spantypes.patch
+typos.patch
+dahdi-tools-3.1.0-fno-common.patch
+fix_install_paths.patch

debian/patches/soname.patch

@@ -0,0 +1,17 @@
+From: Tzafrir Cohen <tzafrir@debian.org>
+Subject: add extra digit to library SO name: 2.0
+
+Asterisk and various other programs were already looking for that SO
+name.
+
+diff --git a/configure.ac b/configure.ac
+index 826a7ec..2afe476 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -392,5 +392,6 @@ AC_CONFIG_FILES([
+ 	xpp/perl_modules/Makefile
+ 	])
+ AC_OUTPUT
++sed -i -e '/^soname_spec=/s/major/&.\\$revision/' libtool
+ 
+ AC_MSG_NOTICE(*** dahdi-tools build successfully configured ***)

debian/patches/typos.patch

@@ -0,0 +1,14 @@
+Index: dahdi-tools/xpp/astribank_is_starting.8
+===================================================================
+--- dahdi-tools.orig/xpp/astribank_is_starting.8	2019-03-03 23:44:05.883016682 +0200
++++ dahdi-tools/xpp/astribank_is_starting.8	2019-03-04 01:34:40.398114773 +0200
+@@ -85,7 +85,7 @@
+ .SH BUGS
+ Option ordering matter. The \fB\-v\fR and \fB\-d\fR options should precede
+ the actions (\fB\-a\fR, \fB\-r\fR and \fB\-w\fR).
+-The \fB\-t\fItimeout\fR option should preceed the \fB\-w\fR option.
++The \fB\-t\fItimeout\fR option should precede the \fB\-w\fR option.
+ 
+ .SH SEE ALSO
+ semctl(3)
+

debian/patches/zaptel_perl

@@ -0,0 +1,39 @@
+Subject: Set perl installation path to vendorlib
+Author: Tzafrir Cohen <tzafrir.cohen@xorcom.com>
+Forwarded: no
+
+Point DAHDI PERL modules to the right directory under which to install
+perl modules.
+
+(sitelib in Debian is under /usr/local. We don't want to install there)
+
+Debian-specific configuration.
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -120,20 +120,22 @@ fi
+ #    - The "$datadir/perl5" directory otherwise (e.g: during "make distcheck")
+ #
+ AC_MSG_CHECKING(for perl libdir)
++set -x
+ m4_define([_PERL_LIBDIR_DEFAULT], [${datadir}/perl5])dnl
+ AC_ARG_WITH(perllib,
+ 	[AS_HELP_STRING([--with-perllib=PATH],
+-		[Location of perl modules @<:@default=]_PERL_LIBDIR_DEFAULT[, or perl -V:sitelib@:>@])],
++		[Location of perl modules @<:@default=]_PERL_LIBDIR_DEFAULT[, or perl -V:vendorlib@:>@])],
+ 	[perllibdir=$withval],
+ 	[
+ 		if test "$prefix" = 'NONE' -o "$prefix" = '/usr'; then
+-			eval `"$PERL" -V:sitelib`
+-			perllibdir="$sitelib"
++			eval `"$PERL" -V:vendorlib`
++			perllibdir="$vendorlib"
+ 		else
+ 			perllibdir='_PERL_LIBDIR_DEFAULT'
+ 		fi
+ 	]
+ )
++set +x
+ AC_SUBST([perllibdir], "$perllibdir")
+ AC_MSG_RESULT([$perllibdir])
+ AM_CONDITIONAL([PERL], [test "$perllibdir" != ''])

debian/rules

@@ -0,0 +1,58 @@
+#!/usr/bin/make -f
+# Sample debian/rules that uses debhelper.
+# GNU copyright 1997 to 1999 by Joey Hess.
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+DEB_BUILD_MAINT_OPTIONS = hardening=+all
+
+ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
+	CFLAGS += -g
+endif
+
+CHANGED_FILES_LIST = debian/savedfiles.lst
+CHANGED_FILES_ARCHIVE = debian/savedfiles.cpio
+
+%:
+	dh $@ --with autoreconf
+
+override_dh_autoreconf:
+	if [ ! -f "$(CHANGED_FILES_ARCHIVE)" -a -f Makefile.in ]; then \
+	  cpio -o < $(CHANGED_FILES_LIST) > $(CHANGED_FILES_ARCHIVE); \
+	fi
+	dh_autoreconf
+
+override_dh_autoreconf_clean:
+	dh_autoreconf_clean
+	if [ -f "$(CHANGED_FILES_ARCHIVE)" ]; then \
+	  cpio -idu < $(CHANGED_FILES_ARCHIVE) && \
+	  rm -f $(CHANGED_FILES_ARCHIVE); \
+	fi
+
+# An ugly workaround because those files are included in the tarball
+override_dh_clean:
+	dh_clean -X autom4te.cache
+
+
+override_dh_auto_build:
+	$(MAKE) all docs
+	cat dahdi.rules xpp/xpp.rules >debian/dahdi.udev
+
+override_dh_auto_clean:
+ifeq ($(wildcard Makefile),)
+	$(MAKE) -f Makefile.legacy clean
+else
+	$(MAKE) clean
+endif
+
+override_dh_auto_configure:
+	dh_auto_configure
+
+override_dh_auto_install:
+	# also run the 'config' target, in addition to the 'install' target:
+	dh_auto_install -- config
+	rm $(CURDIR)/debian/tmp/usr/share/dahdi/span_config.d/50-asterisk
+	rm $(CURDIR)/debian/tmp/usr/lib/*/libtonezone.la
+	rm -rf $(CURDIR)/debian/tmp/etc/dahdi
+	rm -rf $(CURDIR)/debian/tmp/etc/udev/rules.d

debian/savedfiles.lst

@@ -0,0 +1,27 @@
+Makefile.in
+aclocal.m4
+autoconfig.h.in
+autom4te.cache/output.0
+autom4te.cache/output.1
+autom4te.cache/output.2
+autom4te.cache/requests
+autom4te.cache/traces.0
+autom4te.cache/traces.1
+autom4te.cache/traces.2
+auxdir/config.guess
+auxdir/config.sub
+auxdir/install-sh
+auxdir/ltmain.sh
+configure
+doc/Makefile.in
+hotplug/Makefile.in
+m4/libtool.m4
+m4/ltoptions.m4
+m4/ltsugar.m4
+m4/ltversion.m4
+m4/lt~obsolete.m4
+ppp/Makefile.in
+xpp/Makefile.in
+xpp/oct612x/Makefile.in
+xpp/perl_modules/Makefile.in
+xpp/xtalk/Makefile.in

debian/source/format

@@ -0,0 +1 @@
+3.0 (quilt)

debian/upstream/signing-key.asc

@@ -0,0 +1,184 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+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
+g3LstQ==
+=vz6h
+-----END PGP PUBLIC KEY BLOCK-----

debian/watch

@@ -0,0 +1,4 @@
+version=3
+opts=uversionmangle=s/\-rc/~rc/,pgpsigurlmangle=s/$/.asc/ \
+	https://downloads.asterisk.org/pub/telephony/dahdi-tools/releases/dahdi-tools-(.*)\.tar\.gz\
+	debian uupdate

doc/dahdi_span_types.8

@@ -4,7 +4,7 @@
 dahdi_span_types \- set line modes of DAHDI spans before assignment
 .SH SYNOPSIS
 
-.B dahdi_span_types [\fIoptions\fB] <list|dumpconfig|set> \fB[\fIdevpath \fB...]
+.B dahdi_span_types [\fIoptions\fB] <list|dumpconfig|compare|set> \fB[\fIdevpath \fB...]
 
 .SH DESCRIPTION
 The span type (the line mode: E1/T1/J1) must be set to a span before
@@ -58,6 +58,16 @@ device(s) specified in the command line (or all devices, if none
 specified).
 .RE
 
+.B compare
+.RS
+Compare the settings on the system to those in the configuration file.
+For each line that applies to a device on the system, print it if the
+value to be set and the active value on the system differ.
+
+The exit status is 0 if there is no difference and non-zero if a
+difference was detected.
+.RE
+
 .B list
 .RS
 List line modes for all spans in the system which may be set with

doc/dahdi_tool.8

@@ -7,7 +7,7 @@ dahdi_tool \- Shows status of DAHDI interfaces
 .B dahdi_tool
 
 .SH DESCRIPTION
-dahdi_tool shows the current status the DAHDI inteface cards plugged 
+dahdi_tool shows the current status the DAHDI interface cards plugged 
 to the computer.
 
 It displays values like Current Alarms, SyncSource, Tx/Rx

doc/fxotune.8

@@ -33,7 +33,7 @@ is generated in the current directory.
 fxotune just reads the settings from fxotune.conf into the FXO modules.
 
 You are advised to run fxotune on all FXO ports you have that support 
-it and that are connected. Note that the tunning is affected by e.g.
+it and that are connected. Note that the tuning is affected by e.g.
 the physical parameters of the connection, and thus if it has been 
 radically changed, you may need to re-run fxotune.
 
@@ -44,7 +44,7 @@ cards and clones) do not have the hardware to support such tuning.
 The tuning process needs a clear line to do the tuning.  In order to do
 that, it runs in cycles of the following: sets the line off-hook, dials
 a dial string (which should set the PSTN provider waiting for the next
-digit), and then starts tuning. It has a limited ammount of time for
+digit), and then starts tuning. It has a limited amount of time for
 tuning before the PSTN gives up and gives a busy tone. So after a while
 it hangs up and starts a new cycle.
 
@@ -180,7 +180,7 @@ so if you stop it half-way, you may get a half-configured system. If you
 have already tuned your FXO channels and wish to test-run fxotune again, 
 you are advised to backup /etc/fxotune.conf .
 
-The default for \-m is 18 seconds. This asusmes that you get a clear line 
+The default for \-m is 18 seconds. This assumes that you get a clear line 
 for at least 18 seconds. It is advised that you test that timeout earlier
 by connecting a phone to the FXO line, dialing 4 (or whatever dial string 
 you put with \-n) and see how much time of silence you have.

hotplug/dahdi_auto_assign_compat

@@ -22,4 +22,9 @@ devices_by_registration_time | \
 	done
 
 # Now handle Astribanks
-LC_ALL=C dahdi_registration -Rv on
+unmatched="`dahdi_span_assignments unmatched`"
+if [ -n "$unmatched" ]; then
+	# Only if astribanks are not matched in span-assignments.conf
+	# TODO: have dahdi_registration run only on "$unmatched"
+	LC_ALL=C dahdi_registration -Rv on
+fi

hotplug/handle_device.d/30-xpp-sync

@@ -0,0 +1,18 @@
+#! /bin/sh
+
+# Run xpp_sync whenever an Astribank is connected.
+
+# May be set in /etc/dahdi/init.conf
+XPP_SYNC=${XPP_SYNC:-auto}
+
+case "$ACTION" in
+add) ;;
+*) exit 0 ;;
+esac
+
+case "${DEVPATH##*/}" in
+astribanks:*) ;;
+*) exit 0 ;;
+esac
+
+xpp_sync "$XPP_SYNC"

xpp/50-dahdi.conf

@@ -0,0 +1,5 @@
+# A dracut.conf(5) snippet
+# Disable loading the Astribank (xpp_usb) drivers. This is because
+# it relies on files in the root filesystem:
+# See https://issues.asterisk.org/jira/browse/DAHLIN-352
+omit_drivers+=" xpp_usb "

xpp/Makefile.am

@@ -62,6 +62,9 @@ dist_sbin_SCRIPTS	= $(perl_scripts)
 man_MANS		+= $(perl_mans)
 CLEANFILES		= $(perl_checks) $(perl_mans)
 
+dracutconfdir = @prefix@/lib/dracut/dracut.conf.d
+dracutconf_DATA = 50-dahdi.conf
+
 if	PBX_USB
 
 SUBDIRS		+= oct612x xtalk

xpp/README.Astribank

@@ -47,9 +47,9 @@ Apart from the standard DAHDI build requirements, you also need:
 
 * *libusb development headers* to build the Astribank firmware tools
   (astribank_tool, astribank_hexload, astribank_allow).
-  This is typically the package libusb-dev on Debian (and derivatives
-  like Ubuntu) or libusb-devel on RedHat (and derivatives like
-  CentOS/Trixbox).
+  This is typically the package libusb-1.0-0-dev on Debian (and
+  derivatives such as Ubuntu) or libusbx-devel on RedHat (and derivatives
+  such as CentOS).
 * *Echo Canceller Module firmware*: If you have an Astribank with an
   echo canceller module, see the following section.
 
@@ -1257,8 +1257,8 @@ Astribanks Synchronization Source
 If there is more than one Astribank on the system, all the Astribanks
 keep their clock in sync. Optionally the Astribanks can synchronize
 their clock to the master DAHDI device (in case it is a different DAHDI
-device). Normally you just use the default init.d script or run
-explicitly:
+device). Normally it would be run automatically from the udev hooks
+run on device plug (handle_device), but you can also run it explicitly:
 
   xpp_sync auto
 
@@ -1488,6 +1488,9 @@ other side.
 current. That is: which ones are connected to an active FXS on the
 other side.
 
+===== /sys/bus/astribanks/devices/xbus-NN/NN:M:P/hwid
+Prints <module type>.<module subtype>. Both are small numbers.
+
 ===== /sys/bus/astribanks/devices/xbus-NN/NN:M:P/offhook
 Shows ports that are (1) or are not (0) off-hook. When a channel is
 not off-hook. For BRI and E1/T1 the value is 1 if the span is in use.

xpp/astribank_hexload.8

@@ -117,7 +117,7 @@ Examples:
 1:T1,2:T1,*:E1 \- First and second ports are T1, the rest are E1.
 .RE
 
-If the \fB\-S\fR is not given, the PRI default is determined by the existance of the \fB\-A-fR option.
+If the \fB\-S\fR is not given, the PRI default is determined by the existence of the \fB\-A-fR option.
 .RE
 
 .SH SEE ALSO

xpp/astribank_hook

@@ -94,22 +94,27 @@ wait_for_udev() {
 	UDEV_SETTLE_MAX_TIME=10
 
 	echo "Waiting for udev to settle down..."
-	if [ -x /sbin/udevsettle ]; then
-		# Old system, stand-alone udevsettle command
-		/sbin/udevsettle --timeout="$UDEV_SETTLE_MAX_TIME"
+	udevsettle_cmd=
+	if [ -x /bin/udevadm ]; then
+		udevsettle_cmd="/bin/udevadm settle"
 	elif [ -x /sbin/udevadm ]; then
-		# Assume modern system, udevadm has settle parameter
-		if ! /sbin/udevadm settle --timeout="$UDEV_SETTLE_MAX_TIME"
-		then
-			echo "udevadm failed ($?)."
-			echo "Fallback to sleep $UDEV_SETTLE_MAX_TIME seconds."
-			sleep "$UDEV_SETTLE_MAX_TIME"
-		fi
+		udevsettle_cmd="/sbin/udevadm settle"
+	elif [ -x /sbin/udevsettle ]; then
+		udevsettle_cmd="/sbin/udevsettle"
 	else
 		echo "No udevsettle/udevadm."
 		echo "Fallback to sleep $UDEV_SETTLE_MAX_TIME seconds."
 		sleep "$UDEV_SETTLE_MAX_TIME"
+		return
 	fi
+
+	if ! $udevsettle_cmd --timeout="$UDEV_SETTLE_MAX_TIME"
+	then
+		echo "udevadm failed ($?)."
+		echo "Fallback to sleep $UDEV_SETTLE_MAX_TIME seconds."
+		sleep "$UDEV_SETTLE_MAX_TIME"
+	fi
+
 	sleep 1	# Wait a bit more (races)
 }
 

xpp/astribank_is_starting.8

@@ -83,7 +83,7 @@ Q: Why do you use a semaphore?
 A: because, unlike the filesystem, it is writable at any given time.
 
 .SH BUGS
-Option ordering matter. The \fB\-v\fR and \fB\-d\fR options should preceed
+Option ordering matter. The \fB\-v\fR and \fB\-d\fR options should precede
 the actions (\fB\-a\fR, \fB\-r\fR and \fB\-w\fR).
 The \fB\-t\fItimeout\fR option should preceed the \fB\-w\fR option.
 

xpp/astribank_tool.c

@@ -72,7 +72,7 @@ static int reset_kind(const char *arg)
 		if(strcasecmp(reset_kinds[i].name, arg) == 0)
 			return reset_kinds[i].type_code;
 	}
-	ERR("Uknown reset kind '%s'\n", arg);
+	ERR("Unknown reset kind '%s'\n", arg);
 	return -1;
 }
 
@@ -157,9 +157,9 @@ int main(int argc, char *argv[])
 			ERR("Bad reset kind '%s'\n", opt_reset);
 			return 1;
 		}
-		DBG("Reseting (%s)\n", opt_reset);
+		DBG("Resetting (%s)\n", opt_reset);
 		if((ret = mpp_reset(mpp, full_reset)) < 0) {
-			ERR("%s Reseting astribank failed: %d\n",
+			ERR("%s Resetting astribank failed: %d\n",
 				(full_reset) ? "Full" : "Half", ret);
 		}
 		goto out;

xpp/dahdi_registration

@@ -109,9 +109,15 @@ foreach my $xbus (Dahdi::Xpp::xbuses($sorter)) {
 			system @cmd;
 			warn "Failed '@cmd' (status=$?)\n" if $?;
 		}
+	}
+}
+if (defined($on) && $on) {
+	if ($opts{'R'} || ! $default_auto_assign) {
 		# wait for UDEV to do its stuff
 		system "dahdi_waitfor_span_assignments assigned";
 	}
+}
+foreach my $xbus (Dahdi::Xpp::xbuses($sorter)) {
 	foreach my $xpd (Dahdi::Xpp::Xpd::telephony_devs($xbus->xpds())) {
 		my $spanno = $xpd->xpd_getattr('span');
 		myprintf "\t%-10s: ", $xpd->fqn;

xpp/xpp_fxloader

@@ -349,7 +349,7 @@ load_fw_device() {
 				echo "WARNING: ECHO burning was skipped (no capabilities)"
 			fi
 		fi
-		pic_files=`echo "$FIRMWARE_DIR"/PIC_TYPE_[1-4].hex`
+		pic_files=`echo "$FIRMWARE_DIR"/PIC_TYPE_[1-46].hex`
 		debug "PIC burning into $dev: begin $pic_files"
 		run_astribank_hexload -D "$dev" -p $pic_files
 		debug "PIC burning into $dev: end $pic_files"
@@ -443,7 +443,7 @@ fpga_firmware_all_devices() {
 reset_fpga() {
 	devices=`filter_devs 'e4e4/11[3456][124]/*'`
 	totaldevs=`numdevs 'e4e4/11[3456][124]/*'`
-	echo >&2 -- "Reseting devices [$totaldevs devices]"
+	echo >&2 -- "Resetting devices [$totaldevs devices]"
 	echo "$devices" | grep -v '^$' | while read id_str dev
 	do
 		(

xpp/xpp_sync

@@ -64,7 +64,7 @@ sub do_select(@) {
 	foreach my $xpd (@_) {
 		my $xbus = $xpd->xbus;
 		my $busnum = $xbus->name;
-		die "Uknown bus name" unless $busnum;
+		die "Unknown bus name" unless $busnum;
 		$busnum =~ s/XBUS-//;
 		die "bad bus name" unless $busnum =~ /^\d+$/;
 		#printf "Setting sync: %-10s (%s)\n", $xpd->fqn, $xpd->type;

xpp/xtalk/Makefile.am

@@ -21,8 +21,7 @@ USB_NAME		= libusb
 endif
 endif
 
-noinst_PROGRAMS		= xlist_test xusb_test xusb_test_bypath xtalk_test xtalk_raw_test
-sbin_PROGRAMS		= xtalk_send
+noinst_PROGRAMS		= xlist_test xusb_test xusb_test_bypath xtalk_test xtalk_raw_test xtalk_send
 noinst_LTLIBRARIES	= libxtalk.la
 dist_noinst_HEADERS	= \
 	xtalk_base.h	\
@@ -39,8 +38,6 @@ dist_noinst_HEADERS	= \
 	include/xtalk/xtalk_iface.h	\
 	#
 
-man_MANS		= xtalk_send.8
-
 libxtalk_la_CFLAGS	= \
 		$(COMMON_CFLAGS) \
 		-I$(srcdir)/include \

xpp/xtalk/xtalk_sync.c

@@ -183,7 +183,7 @@ int process_command(
 	}
 	DBG("REPLY OP: 0x%X [%s]\n", reply->header.op, reply_desc->name);
 	if (reply->header.op == XTALK_ACK) {
-		int	status = CMD_FIELD(reply, XTALK, ACK, stat);
+		uint8_t status = CMD_FIELD(reply, XTALK, ACK, stat);
 
 		if (expected) {
 			ERR("Expected OP=0x%02X: Got ACK(%d): %s\n",

xpp/xtalk/xusb_common.c

@@ -215,7 +215,7 @@ int xusb_filter_bypath(const struct xusb_device *xusb_device, void *data)
 	assert(path != NULL);
 	p = path_tail(path);
 	if (strcmp(xusb_device->devpath_tail, p) != 0) {
-		DBG("%s: device path missmatch (!= '%s')\n",
+		DBG("%s: device path mismatch (!= '%s')\n",
 			xusb_device->devpath_tail, p);
 		return 0;
 	}