Merge lp:~noskcaj/ubuntu/saucy/dahdi-tools/2.7.0-1 into lp:ubuntu/saucy/dahdi-tools

[Jackson Doak]

Merge from debian unstable.

[Daniel Holbach (dholbach)]

Thanks. Uploaded.

review: Approve

Unmerged revisions

10. By Jackson Doak on 2013-08-25

* Merge from debian. Remaining changes:
  - debian/control: Added gawk as dependency for dkms build
  - debian/control: Package dahdi Depends on dahdi-dkms | dahdi-source
  - debian/control: Set ubuntu maintainer
  - added debian/dahdi.postinst
  - debian/control: Removed Uploaders field.
  - added debian/dahdi.postinst
  - added --error-handler=init_failed to debian/rules

=== added file '.gitignore'
--- .gitignore	1970-01-01 00:00:00 +0000
+++ .gitignore	2013-08-25 04:54:26 +0000
@@ -0,0 +1,36 @@
+*.o
+.*.o.d
+.*.lo.d
+build_tools/menuselect-deps
+config.log
+config.status
+dahdi_cfg
+dahdi_maint
+dahdi_monitor
+dahdi_scan
+dahdi_speed
+dahdi_test
+dahdi_tool
+fxotune
+libtonezone.a
+libtonezone.so
+makeopts
+sethdlc
+tonezone.lo
+version.c
+xpp/.depend
+xpp/.octasic.depend
+xpp/.perlcheck
+xpp/astribank_allow
+xpp/astribank_hexload
+xpp/astribank_is_starting
+xpp/astribank_tool
+xpp/dahdi_genconf.8
+xpp/dahdi_hardware.8
+xpp/dahdi_registration.8
+xpp/lsdahdi.8
+xpp/test_parse
+xpp/twinstar.8
+xpp/xpp_blink.8
+xpp/xpp_sync.8
+zonedata.lo
 
=== removed file '.pc/applied-patches'
--- .pc/applied-patches	2011-03-13 23:45:36 +0000
+++ .pc/applied-patches	1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
-zaptel_perl
-echocan_oslec
-init_unload_oslec
 
=== removed directory '.pc/echocan_oslec'
=== removed directory '.pc/echocan_oslec/xpp'
=== removed directory '.pc/echocan_oslec/xpp/perl_modules'
=== removed directory '.pc/echocan_oslec/xpp/perl_modules/Dahdi'
=== removed directory '.pc/echocan_oslec/xpp/perl_modules/Dahdi/Config'
=== removed file '.pc/echocan_oslec/xpp/perl_modules/Dahdi/Config/Params.pm'
--- .pc/echocan_oslec/xpp/perl_modules/Dahdi/Config/Params.pm	2011-03-13 23:45:36 +0000
+++ .pc/echocan_oslec/xpp/perl_modules/Dahdi/Config/Params.pm	1970-01-01 00:00:00 +0000
@@ -1,156 +0,0 @@
-package Dahdi::Config::Params;
-#
-# Written by Oron Peled <[e-mail]>
-# Copyright (C) 2009, Xorcom
-# This program is free software; you can redistribute and/or
-# modify it under the same terms as Perl itself.
-#
-# $Id: Params.pm 7224 2009-09-27 15:01:20Z tzafrir $
-#
-use strict;
-
-=head1 NAME
-
-Dahdi::Config::Params -- Object oriented representation of F<genconf_parameters> file.
-
-=head1 SYNOPSIS
-
- use Dahdi::Config::Params;
- my $params = Dahdi::Config::Params->new('the-config-file');
- print $params->item{'some-key'};
- print $params->item{'some-key', NODEFAULTS => 1};
- $params->dump;	# For debugging
-
-=head1 DESCRIPTION
-
-The constructor must be given a configuration file name:
-
-=over 4
-
-=item * Missing file is B<not> an error.
-
-=item * Other opening errors cause a C<die> to be thrown.
-
-=item * The file name is saved as the value of C<GENCONF_FILE> key.
-
-=back
-
-The access to config keys should only be done via the C<item()> method:
-
-=over 4
-
-=item * It contains all hard-coded defaults.
-
-=item * All these values are overriden by directives in the config file.
-
-=item * Calling it with C<NODEFAULTS =E<gt> 1> option, returns C<undef> for keys that
-do not appear in the configuration file.
-
-=back
-
-=cut
-
-sub new($$) {
-	my $pack = shift || die;
-	my $cfg_file = shift || die;
-	my $self = {
-			GENCONF_FILE	=> $cfg_file,
-		};
-	bless $self, $pack;
-	if(!open(F, $cfg_file)) {
-		if(defined($!{ENOENT})) {
-			#print STDERR "No $cfg_file. Assume empty config\n";
-			return $self; # Empty configuration
-		}
-		die "$pack: Failed to open '$cfg_file': $!\n";
-	}
-	#print STDERR "$pack: $cfg_file\n";
-	my $array_key;
-	while(<F>) {
-		my ($key, $val);
-		chomp;
-		s/#.*$//;
-		s/\s+$//;	# trim tail whitespace
-		next unless /\S/;
-		if(defined $array_key && /^\s+/) {
-			s/^\s+//;	# trim beginning whitespace
-			push(@{$self->{$array_key}}, $_);
-			next; 
-		}
-		undef $array_key;
-		($key, $val) = split(/\s+/, $_, 2);
-		$key = lc($key);
-		if(! defined $val) {
-			$array_key = $key;
-			next;
-		}
-		die "$cfg_file:$.: Duplicate key '$key'\n", if exists $self->{$key};
-		$self->{$key} = $val;
-	}
-	close F;
-	return $self;
-}
-
-sub item($$@) {
-	my $self = shift || die;
-	my $key = shift || die;
-	my %options = @_;
-	my %defaults = (
-			base_exten		=> '4000',
-			freepbx			=> 'no',	# Better via -F command line
-			fxs_immediate		=> 'no',
-			fxs_default_start	=> 'ks',
-			fxo_default_start	=> 'ks',
-			em_signalling		=> 'none',
-			lc_country		=> 'us',
-			context_lines		=> 'from-pstn',
-			context_phones		=> 'from-internal',
-			context_input		=> 'astbank-input',
-			context_output		=> 'astbank-output',
-			group_phones		=> '5',
-			group_lines		=> '0',
-			brint_overlap		=> 'no',
-			bri_sig_style		=> 'bri_ptmp',
-			echo_can		=> 'mg2',
-			bri_hardhdlc		=> 'auto',
-			pri_connection_type	=> 'PRI',
-			r2_idle_bits		=> '1101',
-			tdm_framing		=> 'esf',
-			'pri_termtype'		=> [ 'SPAN/* TE' ],
-		);
-	return $self->{$key} if exists($self->{$key}) or $options{NODEFAULTS};
-	return $defaults{$key};
-}
-
-sub dump($) {
-	my $self = shift || die;
-	printf STDERR "%s dump:\n", ref $self;
-	my $width = 30;
-	foreach my $k (sort keys %$self) {
-		my $val = $self->{$k};
-		my $ref = ref $val;
-		#print STDERR "DEBUG: '$k', '$ref', '$val'\n";
-		if($ref eq '') {
-			printf STDERR "%-${width}s %s\n", $k, $val;
-		} elsif($ref eq 'SCALAR') {
-			printf STDERR "%-${width}s %s\n", $k, ${$val};
-		} elsif($ref eq 'ARRAY') {
-			#printf STDERR "%s:\n", $k;
-			my $i = 0;
-			foreach my $v (@{$val}) {
-				printf STDERR "%-${width}s %s\n", "$k\->[$i]", $v;
-				$i++;
-			}
-		} elsif($ref eq 'HASH') {
-			#printf STDERR "%s:\n", $k;
-			foreach my $k1 (keys %{$val}) {
-				printf STDERR "%-${width}s %s\n", "$k\->\{$k1\}", ${$val}{$k1};
-			}
-		} else {
-			printf STDERR "%-${width}s (-> %s)\n", $k, $ref;
-		}
-	}
-}
-
-1;
-
 
=== removed directory '.pc/init_unload_oslec'
=== removed file '.pc/init_unload_oslec/dahdi.init'
--- .pc/init_unload_oslec/dahdi.init	2011-03-13 23:45:36 +0000
+++ .pc/init_unload_oslec/dahdi.init	1970-01-01 00:00:00 +0000
@@ -1,333 +0,0 @@
-#!/bin/sh
-#
-# dahdi         This shell script takes care of loading and unloading \
-#               DAHDI Telephony interfaces
-# chkconfig: 2345 9 92
-# description: The DAHDI drivers allow you to use your linux \
-# computer to accept incoming data and voice interfaces
-#
-# config: /etc/dahdi/init.conf
-
-### BEGIN INIT INFO
-# Provides:        dahdi
-# Required-Start:  $local_fs $remote_fs
-# Required-Stop:   $local_fs $remote_fs
-# Should-Start:    $network $syslog
-# Should-Stop:     $network $syslog
-# Default-Start:   2 3 4 5
-# Default-Stop:    0 1 6
-# Description:     dahdi - load and configure DAHDI modules
-### END INIT INFO
-
-initdir=/etc/init.d
-
-# Don't edit the following values. Edit /etc/dahdi/init.conf instead.
-
-DAHDI_CFG=/usr/sbin/dahdi_cfg
-DAHDI_CFG_CMD=${DAHDI_CFG_CMD:-"$DAHDI_CFG"} # e.g: for a custom system.conf location
-
-FXOTUNE=/usr/sbin/fxotune
-
-# The default syncer Astribank. Usually set automatically to a sane
-# value by xpp_sync(1) if you have an Astribank. You can set this to an
-# explicit Astribank (e.g: 01).
-XPP_SYNC=auto
-
-# The maximal timeout (seconds) to wait for udevd to finish generating
-# device nodes after the modules have loaded and before running dahdi_cfg.
-DAHDI_DEV_TIMEOUT=20
-
-# A list of modules to unload when stopping.
-# All of their dependencies will be unloaded as well.
-DAHDI_UNLOAD_MODULES="dahdi"
-
-#
-# Determine which kind of configuration we're using
-#
-system=redhat  # assume redhat
-if [ -f /etc/debian_version ]; then
-    system=debian
-fi
-
-if [ -f /etc/gentoo-release ]; then
-    system=debian
-fi
-
-if [ -f /etc/SuSE-release -o -f /etc/novell-release ]
-then
-    system=debian
-fi
-
-# Source function library.
-if [ $system = redhat ]; then
-    . $initdir/functions || exit 0
-fi
-
-DAHDI_MODULES_FILE="/etc/dahdi/modules"
-
-[ -r /etc/dahdi/init.conf ] && . /etc/dahdi/init.conf
-
-if [ $system = redhat ]; then
-	LOCKFILE=/var/lock/subsys/dahdi
-fi
-
-# recursively unload a module and its dependencies, if possible.
-# where's modprobe -r when you need it?
-# inputs: module to unload.
-# returns: the result from
-unload_module() {
-	module="$1"
-	line=`lsmod 2>/dev/null | grep "^$1 "`
-	if [ "$line" = '' ]; then return; fi # module was not loaded
-
-	set -- $line
-	# $1: the original module, $2: size, $3: refcount, $4: deps list
-	mods=`echo $4 | tr , ' '`
-	ec_modules=""
-	# xpp_usb keeps the xpds below busy if an xpp hardware is
-	# connected. Hence must be removed before them:
-	case "$module" in xpd_*) mods="xpp_usb $mods";; esac
-
-	for mod in $mods; do
-		case "$mod" in
-		dahdi_echocan_*)
-			ec_modules="$mod $ec_modules"
-			;;
-		*)
-			# run in a subshell, so it won't step over our vars:
-			(unload_module $mod)
-			;;
-		esac
-	done
-	# Now that all the other dependencies are unloaded, we can unload the
-	# dahdi_echocan modules.  The drivers that register spans may keep
-	# references on the echocan modules before they are unloaded.
-	for mod in $ec_modules; do
-		(unload_module $mod)
-	done
-	rmmod $module
-}
-
-unload_modules() {
-	for module in $DAHDI_UNLOAD_MODULES; do
-		unload_module $module
-	done
-}
-
-# In (xpp) hotplug mode, the init script is also executed from the
-# hotplug hook. In that case it should not attempt to loade modules.
-#
-# This function only retunrs false (1) if we're in hotplug mode and
-# coming from the hotplug hook script.
-hotplug_should_load_modules() {
-	if [ "$XPP_HOTPLUG_DAHDI" = yes -a "$CALLED_FROM_ATRIBANK_HOOK" != '' ]
-	then
-		return 1
-	fi
-	return 0
-}
-
-# In (xpp) hotplug mode: quit after we loaded modules.
-#
-# In hotplug mode, the main run should end here, whereas the rest of the
-# script should be finished by the instance running from the hook.
-# Note that we only get here if there are actually Astribanks on the
-# system (otherwise noone will trigger the run of the hotplug hook
-# script).
-hotplug_exit_after_load() {
-	if [ "$XPP_HOTPLUG_DAHDI" = yes -a "$CALLED_FROM_ATRIBANK_HOOK" = '' ]
-	then
-		exit 0
-	fi
-}
-
-# Initialize the Xorcom Astribank (xpp/) using perl utiliites:
-xpp_startup() {
-	# do nothing if there are no astribank devices:
-	if ! /usr/share/dahdi/waitfor_xpds; then return 0; fi
-
-	hotplug_exit_after_load
-
-	# overriding locales for the above two, as perl can be noisy
-	# when locales are missing.
-	# No register all the devices if they didn't auto-register:
-	LC_ALL=C dahdi_registration on
-}
-
-
-hpec_start() {
-	# HPEC license found
-	if ! echo /var/lib/digium/licenses/HPEC-*.lic | grep -v '\*' | grep -q .; then
-		return
-	fi
-
-	# dahdihpec_enable not installed in /usr/sbin
-	if [ ! -f /usr/sbin/dahdihpec_enable ]; then
-		echo -n "Running dahdihpec_enable: Failed"
-		echo -n "."
-		echo "  The dahdihpec_enable binary is not installed in /usr/sbin."
-		return
-	fi
-
-	# dahdihpec_enable not set executable
-	if [ ! -x /usr/sbin/dahdihpec_enable ]; then
-		echo -n "Running dahdihpec_enable: Failed"
-		echo -n "."
-		echo "  /usr/sbin/dahdihpec_enable is not set as executable."
-		return
-	fi
-
-	# dahdihpec_enable properly installed
-	if [ $system = debian ]; then
-		echo -n "Running dahdihpec_enable: "
-		/usr/sbin/dahdihpec_enable 2> /dev/null
-	elif [ $system = redhat ]; then
-		action "Running dahdihpec_enable: " /usr/sbin/dahdihpec_enable
-	fi
-	if [ $? = 0 ]; then
-		echo -n "done"
-		echo "."
-	else
-		echo -n "Failed"
-		echo -n "."
-		echo "  This can be caused if you had already run dahdihpec_enable, or if your HPEC license is no longer valid."
-	fi
-}
-
-shutdown_dynamic() {
-	if ! grep -q ' DYN/' /proc/dahdi/* 2>/dev/null; then return; fi
-
-	# we should only get here if we have dynamic spans. Right?
-	$DAHDI_CFG_CMD -s
-}
-
-load_modules() {
-  	# Some systems, e.g. Debian Lenny, add here -b, which will break
-	# loading of modules blacklisted in modprobe.d/*
-	unset MODPROBE_OPTIONS
-  	modules=`sed -e 's/#.*$//' $DAHDI_MODULES_FILE 2>/dev/null`
-	#if [ "$modules" = '' ]; then
-		# what?
-	#fi
-	echo "Loading DAHDI hardware modules:"
-	modprobe dahdi
-	for line in $modules; do
-		if [ $system = debian ]; then
-			echo -n "   ${line}: "
-			if modprobe $line 2> /dev/null; then
-				echo -n "done"
-			else
-				echo -n "error"
-			fi
-		elif [ $system = redhat ]; then
-			action "  ${line}: " modprobe $line
-		fi
-	done
-	echo ""
-}
-
-if [ ! -x "$DAHDI_CFG" ]; then
-       echo "dahdi_cfg not executable"
-       exit 0
-fi
-
-if [ ! -f /etc/dahdi/system.conf ]; then
-	echo "/etc/dahdi/system.conf not found. Nothing to do."
-       exit 0
-fi
-
-RETVAL=0
-
-# See how we were called.
-case "$1" in
-  start)
-  	if hotplug_should_load_modules; then
-		load_modules
-	fi
-
-	TMOUT=$DAHDI_DEV_TIMEOUT # max secs to wait
-
-	while [ ! -d /dev/dahdi ] ; do
- 		sleep 1
-		TMOUT=`expr $TMOUT - 1`
-		if [ $TMOUT -eq 0 ] ; then
-			echo "Error: missing /dev/dahdi!"
-			exit 1
-		fi
-	done
-
-	xpp_startup
-
-	if [ ! -e /proc/dahdi/1 ]; then
-		echo "No hardware timing source found in /proc/dahdi, loading dahdi_dummy"
-		modprobe dahdi_dummy 2> /dev/null
-	fi
-
-	if [ $system = debian ]; then
-	    echo -n "Running dahdi_cfg: "
-	    $DAHDI_CFG_CMD 2> /dev/null && echo -n "done"
-	    echo "."
-	elif [ $system = redhat ]; then
-	    action "Running dahdi_cfg: " $DAHDI_CFG_CMD
-	fi
-	RETVAL=$?
-
-	if [ "$LOCKFILE" != '' ]; then
-		[ $RETVAL -eq 0 ] && touch $LOCKFILE
-	fi
-
-	if [ -x "$FXOTUNE" ] && [ -r /etc/fxotune.conf ]; then
-		# Allowed to fail if e.g. Asterisk already uses channels:
-		$FXOTUNE -s || :
-	fi
-
-	# Set the right Astribanks ticker:
-	LC_ALL=C xpp_sync "$XPP_SYNC"
-
-	hpec_start
-	;;
-  stop)
-	# Unload drivers
-	#shutdown_dynamic # FIXME: needs test from someone with dynamic spans
-	echo -n "Unloading DAHDI hardware modules: "
-	if unload_modules; then
-		echo "done"
-	else
-		echo "error"
-	fi
-	if [ "$LOCKFILE" != '' ]; then
-		[ $RETVAL -eq 0 ] && rm -f $LOCKFILE
-	fi
-	;;
-  unload)
-	unload_modules
-	;;
-  restart|force-reload)
-	$0 stop
-	$0 start
-	;;
-  reload)
-	if [ $system = debian ]; then
-	    echo -n "Rerunning dahdi_cfg: "
-	    $DAHDI_CFG_CMD 2> /dev/null && echo -n "done"
-	    echo "."
-	elif [ $system = redhat ]; then
-	    action "Rerunning dahdi_cfg: " $DAHDI_CFG_CMD
-	fi
-	RETVAL=$?
-	;;
-  status)
-	if [ -d /proc/dahdi ]; then
-		/usr/sbin/lsdahdi
-		RETVAL=0
-	else
-		RETVAL=3
-	fi
-	;;
-  *)
-	echo "Usage: dahdi {start|stop|restart|status|reload|unload}"
-	exit 1
-esac
-
-exit $RETVAL
-
 
=== removed directory '.pc/zaptel_perl'
=== removed directory '.pc/zaptel_perl/xpp'
=== removed file '.pc/zaptel_perl/xpp/Makefile'
--- .pc/zaptel_perl/xpp/Makefile	2011-03-13 23:45:36 +0000
+++ .pc/zaptel_perl/xpp/Makefile	1970-01-01 00:00:00 +0000
@@ -1,140 +0,0 @@
-PEDANTIC	= -ansi -pedantic -std=c99
-
-INSTALL		= install
-INSTALL_DATA	= install -m 644
-
-#
-# Ugly hack to find kernel directories before/after the split
-# to kernel/user-space.
-#
-# These variables should be passed to us. But until then...
-#
-DAHDI_TOOLSDIR	?= ..
-DAHDI_KERNELDIR	=
-
--include $(DAHDI_TOOLSDIR)/makeopts
-
-INSTALL_DATA	= $(INSTALL) -m 644
-
-# In 1.4 those are provided by autoconf through makeopts
-prefix		?= /usr
-datadir		?= $(prefix)/share
-mandir		?= $(datadir)/man
-INSTALL		?= install
-
-INSTALL_DATA	= $(INSTALL) -m 644
-
-SBINDIR		= $(prefix)/sbin
-DATADIR		= $(datadir)/dahdi
-MANDIR		= $(mandir)/man8
-HOTPLUG_USB_DIR	= $(sysconfdir)/hotplug/usb
-PERLLIBDIR	:= $(shell eval `perl -V:sitelib`; echo "$$sitelib")
-PERL_DIRS	:= $(shell cd perl_modules; find * -name '[A-Z]*' -type d| xargs)
-PERL_MODS_PAT	:= *.pm $(PERL_DIRS:%=%/*.pm)
-PERL_MODS	:= $(shell cd perl_modules; echo $(PERL_MODS_PAT))
-
-# Variables that should be defined above, but need sane defaults:
-# FIXME: Are those values really sane?
-HOSTCC		?= $(CC)
-
-
-CFLAGS		+= -g -Wall $(USB_INCLUDE)
-
-%.8: %
-	pod2man --section 8 $^ > $@ || $(RM) $@
-PERL_SCRIPTS	=	\
-		dahdi_registration	\
-		xpp_sync	\
-		lsdahdi		\
-		xpp_blink	\
-		dahdi_genconf	\
-		dahdi_hardware	\
-		twinstar	\
-		#
-
-PERL_MANS	= $(PERL_SCRIPTS:%=%.8)
-
-ABHEXLOAD_OBJS		= astribank_hexload.o hexfile.o pic_loader.o astribank_usb.o mpp_funcs.o debug.o
-ABTOOL_OBJS		= astribank_tool.o astribank_usb.o mpp_funcs.o debug.o
-ABALLOW_OBJS		= astribank_allow.o astribank_usb.o mpp_funcs.o debug.o
-
-TARGETS	= .perlcheck astribank_is_starting
-PROG_INSTALL	= astribank_is_starting
-MAN_INSTALL	= $(PROG_INSTALL:%=%.8)
-ifeq	(1,$(PBX_USB))
-TARGETS	+= fpga_load		\
-	   astribank_tool	\
-	   astribank_hexload	\
-	   astribank_allow	\
-	   test_parse
-PROG_INSTALL	+= fpga_load astribank_tool astribank_hexload astribank_allow
-endif
-ifneq	(,$(PERLLIBDIR))
-PROG_INSTALL	+= $(PERL_SCRIPTS)
-TARGETS		+= $(PERL_MANS)
-endif
-
-all: $(TARGETS)
-
-docs: $(PERL_MANS)
-
-install: all
-	$(INSTALL) -d $(DESTDIR)$(SBINDIR)
-	$(INSTALL) $(PROG_INSTALL) $(DESTDIR)$(SBINDIR)/
-	$(INSTALL) -d $(DESTDIR)$(DATADIR)
-	$(INSTALL) xpp_fxloader astribank_hook $(DESTDIR)$(DATADIR)/
-	$(INSTALL) waitfor_xpds $(DESTDIR)$(DATADIR)/
-	$(INSTALL) -d $(DESTDIR)$(MANDIR)
-	$(INSTALL_DATA) $(MAN_INSTALL) $(DESTDIR)$(MANDIR)/
-	$(INSTALL) -d $(DESTDIR)$(HOTPLUG_USB_DIR)
-	$(INSTALL_DATA) xpp_fxloader.usermap $(DESTDIR)$(HOTPLUG_USB_DIR)/
-	# for backward compatibility and for hotplug users:
-	ln -sf $(DATADIR)/xpp_fxloader $(DESTDIR)$(HOTPLUG_USB_DIR)/
-ifneq	(,$(PERLLIBDIR))
-	$(INSTALL) -d $(DESTDIR)$(PERLLIBDIR)
-	for i in $(PERL_DIRS); \
-	do \
-		$(INSTALL) -d "$(DESTDIR)$(PERLLIBDIR)/$$i"; \
-	done
-	for i in $(PERL_MODS); \
-	do \
-		$(INSTALL_DATA) "perl_modules/$$i" "$(DESTDIR)$(PERLLIBDIR)/$$i"; \
-	done
-endif
-
-fpga_load: fpga_load.o hexfile.o
-fpga_load: LIBS+=$(EXTRA_LIBS) $(USB_LIB)
-
-astribank_hexload: $(ABHEXLOAD_OBJS)
-astribank_hexload: LIBS+=$(EXTRA_LIBS) $(USB_LIB)
-
-astribank_tool: $(ABTOOL_OBJS)
-astribank_tool: LIBS+=$(EXTRA_LIBS) $(USB_LIB)
-
-astribank_allow: $(ABALLOW_OBJS)
-astribank_allow: LIBS+=$(EXTRA_LIBS) $(USB_LIB)
-
-astribank_is_starting: astribank_is_starting.o
-astribank_is_starting: LIBS+=$(EXTRA_LIBS)
-
-fpga_load.o: CFLAGS+=-D_GNU_SOURCE	# We use memrchr()
-
-test_parse: test_parse.o hexfile.o
-test_parse: LIBS+=$(EXTRA_LIBS) $(USB_LIB)
-
-%: %.o
-	$(CC) $(LDFLAGS) $^ $(LIBS) -o $@
-
-.perlcheck: $(PERL_SCRIPTS)
-	for i in $^; do perl -I./perl_modules -c $$i || exit 1; done
-	touch $@
-
-clean:
-	$(RM) .depend *.o $(TARGETS)
-
-.PHONY: depend
-depend: .depend
-.depend: *.c *.h
-	@$(CC) -MM *.c > $@ || rm -f $@
-
-include .depend
 
=== modified file '.version'
--- .version	2011-03-13 23:45:36 +0000
+++ .version	2013-08-25 04:54:26 +0000
@@ -1,1 +1,1 @@
-2.4.1
+2.7.0
 
=== removed file 'ChangeLog'
--- ChangeLog	2011-03-13 23:45:36 +0000
+++ ChangeLog	1970-01-01 00:00:00 +0000
@@ -1,1460 +0,0 @@
-2011-03-03 Shaun Ruffell <[e-mail]>
-
-	* dahdi-tools version 2.4.1 released.
-
-2011-02-08 14:42 +0000 [r9733-9744]  Tzafrir Cohen <[e-mail]>
-
-	* /, xpp/perl_modules/Dahdi/Chans.pm,
-	  xpp/perl_modules/Dahdi/Config/Gen/System.pm: dahdi-perl: more
-	  left-over $span->xpd Replace the remaining $span->xpd with
-	  xpd_of_span(). Following up on r9648. Merged revisions 9731 via
-	  svnmerge from http://svn.digium.com/svn/dahdi/tools/trunk
-
-	* xpp/perl_modules/Dahdi/Hardware/USB.pm, /: dahdi-perl: fix xpp
-	  driver in dahdi_hardware Don't require 'dahdi_hardware -v' to
-	  show the driver for a USB device. Only works when the usbfs is
-	  not used (when /proc/bus/usb is not mounted). Signed-off-by:
-	  Tzafrir Cohen <[e-mail]> Merged revisions 9699
-	  via svnmerge from http://svn.digium.com/svn/dahdi/tools/trunk
-
-	* /, xpp/perl_modules/Dahdi/Span.pm: dahdi-perl: left-over
-	  $span->xpd Replace one remaining $span->{XPD} with xpd_of_span().
-	  Signed-off-by: Tzafrir Cohen <[e-mail]> Merged
-	  revisions 9648 via svnmerge from
-	  http://svn.digium.com/svn/dahdi/tools/trunk
-
-	* /, xpp/perl_modules/Dahdi/Config/Gen/System.pm: dahdi_genconf:
-	  Don't generate configurations that use channel 16 on E1 CAS
-	  Attempting to use channel 16 on E1 CAS is disallowed since that
-	  channel is reserved for RBS signaling. Configurations should not
-	  be generated that attempt to use it. Closes DAHDI-763. Patch by
-	  dmartinez. Merged revisions 9485 via svnmerge from
-	  http://svn.digium.com/svn/dahdi/tools/trunk
-
-	* /, xpp/xpp_fxloader: xpp_fxloader: Don't try to load FPGA
-	  firmware twice When called from udev to load the FPGA firmware,
-	  make sure that this is not the event generated for the first
-	  end-point of the existing two, as we need to talk with the second
-	  one. This is probably better done in the udev rules, but will be
-	  slightly more complicated to apply only to the FPGA loading and
-	  not to USB firmware loading. Merged revisions 9482 via svnmerge
-	  from http://svn.digium.com/svn/dahdi/tools/trunk
-
-	* dahdi_scan.c, /: dahdi_scan: Show CAS framing on the framing
-	  line. Also, always append "/CRC4" on any span where that was
-	  specified as an option. Signed-off-by: Shaun Ruffell
-	  <[e-mail]> Acked-by: Kinsey Moore <[e-mail]>
-	  Merged revisions 9473 via svnmerge from
-	  http://svn.digium.com/svn/dahdi/tools/trunk
-
-	* dahdi_scan.c, /: Fixed up the loss of crc4-multiframe alignment
-	  logic Loss of crc4-multiframe alignment on an E1 link is not a
-	  condition which brings the span down. The span will continue to
-	  run as long as it can maintain double frame alignment. Because of
-	  this, we cannot place the LMFA alarm in the usual spaninfo.alarms
-	  member, due to userspace programs using this as a catch-all for a
-	  span being up or down. We can detect the alarm by watching the
-	  frame error counter (fecount). If it continuously increments, the
-	  span is configured for crc4, and the span remains OK (alarms =
-	  0), then we are in loss of crc4-multiframe state. In order to
-	  test this alarm, you'll need to synthesize a loss of crc4
-	  alignment on the span. You can usually do this by configuring the
-	  local span to use crc4 and the remote end to not use crc4. I used
-	  the Fireberd 6000 in my lab to do this. dahdi-743 & dahdi-420
-	  Acked-by: Shaun Ruffell <[e-mail]> Merged revisions
-	  9458 via svnmerge from
-	  http://svn.digium.com/svn/dahdi/tools/trunk
-
-	* xpp/perl_modules/Dahdi/Hardware/PCI.pm, /: Dahdi::Hardware:
-	  Support beroNet BN4S0e PCI Express card Add extra PCI IDs to
-	  support "beroNet BN4S0e PCI Express 4x S0 Karte". Origin:
-	  http://bugs.debian.org/600839 Merged revisions 9452 via svnmerge
-	  from http://svn.digium.com/svn/dahdi/tools/trunk
-
-	* autoconfig.h.in, xpp/astribank_is_starting.c, /, configure,
-	  configure.ac: astribank_is_starting: use semop if no semtimedop
-	  astribank_is_starting should use a timeout for the semaphore, but
-	  if the GNU-specific semtimedop() is not available, we'll just
-	  fall back to using semop with no time out. Not as good, but
-	  better than nothing. (closes issue #16783) Reported by: abelbeck
-	  Merged revisions 9426 via svnmerge from
-	  http://svn.digium.com/svn/dahdi/tools/trunk
-
-	* /, zonedata.c: tonezone: Add Macao,China to tone zone data Adding
-	  Macao tone zone data according to
-	  http://www.itu.int/ITU-T/inr/forms/files/tones-0203.pdf (closes
-	  issue #17744) Reported by: alfredtang Patches: zonedata.patch
-	  uploaded by alfredtang (license 1094) Merged revisions 9313 via
-	  svnmerge from http://svn.digium.com/svn/dahdi/tools/trunk
-
-2010-08-31 Shaun Ruffell <[e-mail]>
-
-	* dahdi-tools version 2.4.0 released.
-
-2010-08-31 16:12 +0000 [r9220]  Kinsey Moore <[e-mail]>
-
-	* ppp/dahdi.c: PPP: Fix an incorrect function call that was causing
-	  dahdi.so to fail to load
-
-2010-08-18 13:49 +0000 [r9159]  Tzafrir Cohen <[e-mail]>
-
-	* xpp/perl_modules/Dahdi/Config/Gen.pm: DAHDI-perl: Config (sort
-	  of) for dynamic channels Generate some sort of configuration for
-	  dynamic channels. Usable enough for testing.
-
-2010-08-18 Shaun Ruffell <[e-mail]>
-
-	* dahdi-tools version 2.4.0-rc1 released.
-
-2010-08-13 18:40 +0000 [r9133]  Shaun Ruffell <[e-mail]>
-
-	* dahdi_scan.c: dahdi_scan: Use 'linecompat' to identify digital
-	  spans. This fixes the case where the BRI spans on the Hx8 cards
-	  were displayed as analog spans.
-
-2010-08-03 12:14 +0000 [r9079]  Tzafrir Cohen <[e-mail]>
-
-	* xpp/perl_modules/Dahdi/Hardware/PCI.pm,
-	  xpp/perl_modules/Dahdi/Chans.pm: dahdi-perl: also detect Aligera
-	  cards (closes issue #17783) Reported by: frawd Patches:
-	  dahdi-tools_aligera.patch uploaded by frawd (license 610)
-
-2010-08-01 22:39 +0000 [r9076]  Tzafrir Cohen <[e-mail]>
-
-	* dahdi_scan.c, dahdi_maint.c: fix build of dahdi_scan and
-	  dahdi_maint with -linux 2.3 New functionality that was added in
-	  r8992 and r8993 uses new items defined only in dahdi-linux trunk
-	  (and eventually: 2.4). As in both cases it's a single place to
-	  check, we'll just ifdef it away.
-
-2010-07-30 15:28 +0000 [r9066-9067]  Kinsey Moore <[e-mail]>
-
-	* dahdi_cfg.c: dahdi_cfg: Display more appropriate error messages
-	  when an invalid signaling is chosen along with suggestions on how
-	  to fix the problem.
-
-	* xpp/perl_modules/Dahdi/Chans.pm: perl: make sure the channel
-	  parser recognizes "Reserved" for unusable channels and fix a bug
-	  preventing E&M-E1 from being detected properly
-
-2010-07-28 12:30 +0000 [r9031]  Tzafrir Cohen <[e-mail]>
-
-	* xpp/twinstar: twinstar: err on an invalid command.
-
-2010-07-26 18:56 +0000 [r8991-8994]  Russ Meyerriecks <[e-mail]>
-
-	* dahdi_scan.c: Removed no longer existing alarm condition
-
-	* dahdi_scan.c: Modified dahdi_sync to report detailed alarms
-
-	* dahdi_maint.c: wip: dahdi_maint can now trip the alarm sim
-
-	* dahdi_maint.c: dahdi_maint: Fixed outdated usage text
-
-2010-07-22 11:41 +0000 [r8964]  Tzafrir Cohen <[e-mail]>
-
-	* xpp/xpp_fxloader: increase maximal firmware delay to 15 seconds
-	  Hmm... how badly congested can the startup of Centos be?
-
-2010-07-21 08:47 +0000 [r8948-8954]  Tzafrir Cohen <[e-mail]>
-
-	* xpp/astribank_hexload.8, xpp/astribank_tool.8,
-	  xpp/astribank_allow.8: More hyphen/minus fixes.
-
-	* xpp/xpp_fxloader: xpp_fxloader: replace a sleep with a sleep loop
-	  For newer kernels there's no need to sleep at all. For Centos5
-	  systems there seems to be a need for a large sleep for firmware
-	  load at boot time. So let's make it a loop.
-
-	* xpp/README.Astribank: README.Astribank: new VMWI settings
-
-2010-07-14 10:58 +0000 [r8923-8924]  Tzafrir Cohen <[e-mail]>
-
-	* xpp/perl_modules/Dahdi/Config/Gen.pm: dahdi_genconf: better error
-	  message for a bad generator module
-
-	* xpp/perl_modules/Dahdi/Span.pm, xpp/genconf_parameters: Allow
-	  using CONNECTOR/LABEL in genconf_parameters Allow using
-	  CONNECTOR/LABEL in addition to SPAN and NUM for pri_termtype in
-	  genconf_parameters
-
-2010-07-06 17:52 +0000 [r8854]  Tzafrir Cohen <[e-mail]>
-
-	* xpp/perl_modules/Dahdi/Hardware/PCI.pm: Extra PCI IDs for
-	  Junghanns PCI-E card (dahdi-perl)
-
-2010-06-29 15:21 +0000 [r8827]  Tzafrir Cohen <[e-mail]>
-
-	* dahdi_tool.c: dahdi_tool: center span window as well. If your
-	  window was larger than 80X25, you got a main "window" in the
-	  center and the span one in the corner. This puts the span one in
-	  the center as well.
-
-2010-06-15 15:44 +0000 [r8777]  Tzafrir Cohen <[e-mail]>
-
-	* dahdi_cfg.c: Convert all '%i' to '%d' in dahdi_cfg Various values
-	  in system.conf were parsed using %i. This means that a value with
-	  a leading 0x was considered hexadecimal and a value with a
-	  leading 0 would be considered octal ('030' == '24' == '0x1E').
-	  This was never documented and seems a potential cause for
-	  confusion in case a leading zero sneaks in. It is thus removed.
-
-2010-06-03 20:56 +0000 [r8746]  Doug Bailey <[e-mail]>
-
-	* patlooptest.c: Add enhanced command line parsing and add more
-	  options into how errors are flagged and what is displayed. Still
-	  runs with the old usage: patlooptest <dahdi device> [<timeout>]
-
-2010-06-02 17:05 +0000 [r8741]  Tzafrir Cohen <[e-mail]>
-
-	* xpp/perl_modules/Dahdi/Hardware/PCI.pm: An extra PCI ID for an
-	  OpenVox card I ran into.
-
-2010-05-20 13:10 +0000 [r8670]  Sean Bright <[e-mail]>
-
-	* /, xpp: Add dahdi_maint and xpp/twinstar.8 to svn:ignore
-
-2010-05-17 13:26 +0000 [r8630-8638]  Tzafrir Cohen <[e-mail]>
-
-	* /, xpp/waitfor_xpds, xpp/astribank_hook: Fix bashism (Raphael
-	  Geissert, checkbashism)
-
-	* xpp/perl_modules/Dahdi/Hardware/USB.pm: A more correct way to
-	  pass parameters
-
-2010-05-09 14:09 +0000 [r8615]  Tzafrir Cohen <[e-mail]>
-
-	* dahdi_cfg.c: Remove duplicate code: rad_apply_channels
-	  rad_apply_channels() was the same as apply_channels()
-
-2010-05-04 15:33 +0000 [r8606]  Kevin P. Fleming <[e-mail]>
-
-	* dahdi_cfg.c: Report correct span number in dahdi_cfg verbose
-	  output. When the DAHDI configuration file does not configure
-	  every single span in the system, but leaves spans unconfigured,
-	  the verbose output from dahdi_cfg would show incorrect span
-	  numbers when reporting the line configuration, as it printed the
-	  index into the array of configured spans, instead of their actual
-	  span numbers.
-
-2010-05-03 13:54 +0000 [r8589]  Tzafrir Cohen <[e-mail]>
-
-	* xpp/xpp_fxloader: xpp_fxloader: make sure 1163 is not missed.
-
-2010-04-29 15:06 +0000 [r8580]  Tzafrir Cohen <[e-mail]>
-
-	* xpp/xpp_fxloader: Load xpp firmware in the background (udev) Move
-	  loading the the xpp firmwares (when called from udev) to a
-	  background sub-process. This helps with: * Don't block udev * It
-	  seems that with older systems (e.g. CentOS 5) we need to wait a
-	  bit for the device file to appear (in one of the upcoming udev
-	  events). If we keep blocking udev, we won't have the device file.
-	  The 'sleep' does not seem to be required for newer systems (e.g.
-	  Debian Lenny).
-
-2010-04-22 09:55 +0000 [r8547]  Tzafrir Cohen <[e-mail]>
-
-	* xpp/Makefile: astribank_is_starting does not depend on libusb.
-
-2010-04-18 12:52 +0000 [r8529-8535]  Tzafrir Cohen <[e-mail]>
-
-	* dahdi.init: Add proper dependencies to the 'stop' action as well.
-
-	* doc/pattest.8, xpp/dahdi_genconf, xpp/astribank_is_starting.8,
-	  doc/dahdi_cfg.8, doc/dahdi_test.8, doc/fxotune.8,
-	  doc/dahdi_diag.8, doc/dahdi_scan.8, doc/patgen.8,
-	  doc/dahdi_monitor.8: man pages: hyphen to minus Groff considers
-	  '-' a hyphen. If we want a minus (or a dash) we need to use '\-'.
-
-2010-04-14 14:55 +0000 [r8520]  Kinsey Moore <[e-mail]>
-
-	* system.conf.sample: Add documentation for e&me1 (E&M over E1
-	  lines).
-
-2010-04-12 Shaun Ruffell <[e-mail]>
-
-	* dahdi-tools version 2.3.0 released.
-
-2010-04-12 20:18 +0000 [r8503-8508]  Tzafrir Cohen <[e-mail]>
-
-	* xpp/perl_modules/Dahdi/Hardware/USB.pm: Also detect USB devices
-	  connected on a hub.
-
-	* xpp/perl_modules/Dahdi/Span.pm: Also detect type for Sangoma
-	  E1/T1 cards.
-
-2010-04-01 15:45 +0000 [r8451]  Shaun Ruffell <[e-mail]>
-
-	* Makefile: dahdi_maint: install dahdi_maint on 'make install'
-
-2010-03-29 21:04 +0000 [r8444]  Kinsey Moore <[e-mail]>
-
-	* dahdi_maint.c: Add a space between words and correct an error
-	  message.
-
-2010-03-25 15:29 +0000 [r8422-8430]  Tzafrir Cohen <[e-mail]>
-
-	* xpp/perl_modules/Dahdi/Hardware/PCI.pm: wcb4xxp - add Swyx 4xS0
-	  SX2 QuadBri PCI IDs to dahdi-perl (issue #16493) Reported by:
-	  nic_bellamy
-
-	* xpp/perl_modules/Dahdi/Hardware/PCI.pm: Some more wcb4xxp PCI IDs
-	  for Junghanns cards (issue #15446) (issue #16447) Reported by:
-	  lpistone Tested by: okrief
-
-2010-03-23 13:41 +0000 Russ Meyerriecks <[e-mail]>
-
-	* dahdi-tools version 2.2.1.1 released.
-
-2010-03-10 17:37 +0000 Russ Meyerriecks <[e-mail]>
-
-	* xpp/perl_modules/Dahdi/Hardware/PCI.pm: Added IDs for gen5 firmware
-
-2010-01-11 Shaun Ruffell <[e-mail]>
-
-	* dahdi-tools version 2.2.1 released.
-
-2010-01-10 15:39 +0000 [r7793-7829]  Tzafrir Cohen <[e-mail]>
-
-	* /, xpp/README.Astribank: Another round of updates to
-	  README.Astribank. zap->dahdi and others Merged revisions 7754 via
-	  svnmerge from http://svn.digium.com/svn/dahdi/tools/trunk
-
-	* xpp/perl_modules/Dahdi/Hardware/USB.pm, /: dahdi-perl: only get
-	  'serial' and 'devnum' attributes from Astribanks We can tell if a
-	  device is an Astribank by the vendorId and productId attribute.
-	  Get other attributed only after we give up on other devices.
-	  (closes issue #16552) Merged revisions 7558 via svnmerge from
-	  https://origsvn.digium.com/svn/dahdi/tools/trunk
-
-	* /, xpp/xpp_fxloader: xpp_fxloader: adapt to newer kernels This
-	  commit prepares xpp_fxloader to get hotplug envirnment from newer
-	  kernel versions: * DEVICE will eventually be replaced with
-	  DEVNAME. Accept both (and look at DEVNAME first). * If we get
-	  DEVICE, we'll probably get an invalid path based at /proc/bus/usb
-	  . Fix it to use /dev/bus/usb . * While we're at it, allow using
-	  PRODUCT from the envirnment instead of from the command-line.
-	  This should allow fixing udev rules but will also work with
-	  existing rules in DAHDI-linux from trunk (for systems where they
-	  are valid). Merged revisions 7752 via svnmerge from
-	  http://svn.digium.com/svn/dahdi/tools/trunk
-
-	* /, xpp/waitfor_xpds, xpp/twinstar_hook, xpp/xpp_fxloader: xpp:
-	  Comment-only changes: copyright, keywords Merged revisions 7463
-	  via svnmerge from http://svn.digium.com/svn/dahdi/tools/trunk
-
-	* /, xpp/twinstar: Add perldoc for twinstar. This also avoids a
-	  bogus, empty twinstar.8 man page. Merged revisions 7219,7263 via
-	  svnmerge from http://svn.digium.com/svn/dahdi/tools/trunk
-	  ........ r7219 | tzafrir | 2009-09-27 13:49:40 +0200 (Sun, 27 Sep
-	  2009) | 5 lines xpp: install twinstar by default; Add a man page
-	  Add a man page to twinstar (as perl POD) and get it installed by
-	  default. ........ r7263 | tzafrir | 2009-09-29 22:45:50 +0200
-	  (Tue, 29 Sep 2009) | 2 lines xpp: fix a typo in documentation
-	  ........
-
-	* README, /: Fix README for asciidoc 8.5.2 Tweak title a bit to
-	  avoid asciidoc consider it a header for a syntax block. Merged
-	  revisions 7792 via svnmerge from
-	  http://svn.digium.com/svn/dahdi/tools/trunk
-
-2009-12-15 Shaun Ruffell <[e-mail]>
-
-	* dahdi-tools version 2.2.1-rc2 released.
-
-2009-12-01 13:14 +0000 [r7655]  Tzafrir Cohen <[e-mail]>
-
-	* xpp/Makefile: Also install the twinstar tool on the system
-	  Originaly part of trunk r7219.
-
-2009-11-22 11:48 +0000 [r7621]  Tzafrir Cohen <[e-mail]>
-
-	* xpp/astribank_hexload.c, xpp/perl_modules/Dahdi/Hardware/USB.pm,
-	  xpp/mpp_funcs.c, xpp/astribank_tool.c, xpp/astribank_usb.h,
-	  xpp/mpp_funcs.h, xpp/astribank_tool.8,
-	  xpp/perl_modules/Dahdi/Xpp/Mpp.pm, xpp/mpp.h: xpp: MPP protocol
-	  v.1.4 * New firmware loading protocol - Older one (1.3) is still
-	  supported for now * Support loading firmwares from Astribanks
-	  with a minimal firmware (1163) * astribank_tool -Q: always query,
-	  regardless of verbosity level xpp rev: up to 7559 Merged
-	  revisions 7609 via svnmerge from
-	  https://origsvn.digium.com/svn/dahdi/tools/trunk
-
-2009-11-19 23:11 +0000 [r7611]  Tzafrir Cohen <[e-mail]>
-
-	* xpp/xpp_fxloader, xpp/astribank_tool.c: xpp: support loading
-	  USB firmware into 1163 devices as well Demote some messages to
-	  debug while we're at it. Merged revisions 7596 via svnmerge from
-	  http://svn.digium.com/svn/dahdi/tools/trunk
-
-2009-11-05 09:41 +0000 [r7466-7492]  Tzafrir Cohen <[e-mail]>
-
-	* xpp/xpp_sync, xpp/perl_modules/Dahdi/Xpp/Xpd.pm: Use the
-	  timing_priority attribute, if available, to provide more corrent
-	  LED indiction and such. 
-
-	* xpp: use xpd sysfs attr. timing_priority to set NT/TE 
-
-	* dahdi.init, xpp/astribank_is_starting.c (added), 
-	  xpp/waitfor_xpds, xpp/astribank_is_starting.8 (added),
-	  xpp/twinstar_hook, xpp/xpp_fxloader, xpp/Makefile,
-	  xpp/astribank_hook, init.conf.sample: Add optional "hotplug mode"
-	  to init scripts The hotplug mode is only used in
-	  XPP_HOTPLUG_DAHDI=yes is set in /etc/dahdi/init.conf . If it is
-	  set and the system actually has Astribanks, most of the init
-	  script will actually be run from the context of a udev event.
-
-	* xpp: Add astribank_is_starting: astribank_is_running is used to
-	  tell when we may have an Astribank that is initializing (and may
-	  be re-enumerating and thus not listed as a device). It uses a
-	  semaphore as we can always write to one and we can't always write
-	  to a file. xpp: A man page for astribank_is_starting xpp rev: 7321 
-
-	* dahdi.init: move module loading to a separate function Move the
-	  module loading parts of the dahdi init script to a seperate
-	  function - load_modules. To be used by a later commit. There is
-	  not functional change here (but the diff is confusing). 
-
-	* Add XPP_HOTPLUG_DAHDI mode: cfg initiated mostly from hotplug If
-	  XPP_HOTPLUG_DAHDI=yes is set in /etc/dahdi/init.conf (which is
-	  not the default), the normal run of the 'start' operation of the
-	  dahdi init script will only be responsible for loading modules.
-	  The rest will be done (if there are indeed Astribanks on the
-	  system) by a second call to the init script once all of them have
-	  connected. The astribank_hook has also been mostly rewritten.
-	  Most of the functionality of twinstar_hook moved to it. The
-	  current twinstar_hook is a simple example script.
-	  XPP_HOTPLUG_DAHDI mode assumes that all Astribanks on the system
-	  are listed in /etc/dahdi/xpp_order (which can be generated using,
-	  e.g. 'dahdi_genconf xpporder') 
-
-	* Fix XPP_HOTPLUG_DAHDI: logic; end of init.d script 'Hotplug mode'
-	  was introduced in r7335. * The logic in the script was broken. -
-	  Negative logic is not such a grand idea to start with. *
-	  Interactive invocation of init.d ends when expected and not
-	  sooner. This change makes waitfor_xpds wait longer. Rather than
-	  waiting for all the Astribanks to load, it will now wait until
-	  the initialization of dahdi from the Astribanks hook script is
-	  run. This allows running e.g.: /etc/init.d/dahdi start;
-	  /etc/init.d/asterisk start It also means that
-	  'astribank_is_starting' is actually used as a semaphore and not
-	  only as stamp file. As before, those changes have no effect if
-	  hotplug mode is not explicitly enabled (setting
-	  'XPP_HOTPLUG_DAHDI=yes' in init.conf). 
-
-	* xpp: make astribank_is_starting build without warnings.
-	  autoconfig.h is needed as semtimedop() requires _GNU_SOURCE. xpp
-	  rev: 7471
-
-	* xpp/perl_modules/Dahdi/Config/Params.pm,
-	  xpp/perl_modules/Dahdi/Config/Gen.pm,
-	  xpp/perl_modules/Dahdi/Config/Gen/Chandahdi.pm,
-	  xpp/perl_modules/Dahdi/Config/Gen/System.pm,
-	  xpp/genconf_parameters: CAS DAHD/Asterisk configuration
-	  generation support Also support generating (open)R2 config in
-	  chan_dahdi.conf, while we're at it. Default configuration remains
-	  ISDN as before if no extra settings are given in
-	  genconf_parameters. 
-	  
-
-	* dahdi-perl: chan_dahdi.conf generator can generate openr2 conf If
-	  configured to use R2 ("pri_connection_type R2" in
-	  genconf_parameters), the chandahdi generator of dahdi_genconf
-	  will now generate configuration for the openr2 support in
-	  chan_dahdi. 
-
-	* xpp: Dahdi::Config::Gen.pm: improvements in preperation for
-	  T1-CAS: - New channo_range() method which returns range strings
-	  for any list of channel numbers (handle sorting, validation,
-	  etc.) - Reimplement bchan_range() as a small wrapper around
-	  channo_range(). - Another small wrapper is chan_range() that
-	  works on channel objects. - Also a parse_chan_range() does the
-	  reverse (from range string to a list of channel numbers). This
-	  isn't used at the moment. xpp rev: 7306 
-
-	* dahdi-perl: Add basic T1-CAS support for dahdi_genconf - Support
-	  added in generators of system.conf and of chan_dahdi.conf . -
-	  Some strange asumptions about being FXS/FXO depending on being
-	  timing provider/supplier. - New gen_cas() method for Chandahdi
-	  and System. - Now gen_digital() is a bit cleaner. - Call
-	  gen_cas(), gen_openr2(), gen_digital() according to the
-	  'pri_connection_type' config (CAS, R2, PRI/BRI). xpp rev: 7307
-	  
-
-	* dahdi_perl: improved config generation for T1 CAS A few extra
-	  options for a CAS span signalling. xpp rev: 7343, 7346, 7369 
-
-	* xpp: reduce the clutter of firmware loading Make the new XPP
-	  tools much less verbose: * demote messages to be debug * Convert
-	  multi-line messages to be single-line messages Making
-	  xpp_fxloader run in debug mode can be done by setting DEBUG=yes
-	  in /etc/dahdi/init.conf. 
-
-	* dahdi-perl fixes, mostly xpp-specific. * Fix pattern for PCI BRI
-	  cards * Fix recognizing xpp devices by @connector in xpp_order *
-	  Print more helpful comments in xpp_order * Remove most (if not
-	  all) need of /proc/bus/usb * Handle other similar "is_twinstar"
-	  errors.
-
-	* dahdi_genconf: xpp_order generator: Extra '#' after connector
-	  comment Add an extra '#' right after the connector string to make
-	  it simpler to use the connector string from the generated
-	  xpp_order. xpp rev: 7292 
-
-	* xpp: make /proc/bus/usb/devices optional Get the information we
-	  read from /proc/bus/usb/devices from /sys/bus/usb/devices .
-	  Tested on my Debian Unstable with 2.6.30 kernel. The default is
-	  still /proc/bus/usb and sysfs is only used if the procfs file is
-	  not found. Also fixes a case of using the sysfs attribute busnum,
-	  that does not exist in kernel 2.6.9 . Devise the bus number from
-	  the name of the node. 
-
-	* dahdi-perl: Avoid '"is_twinstar" on unblessed reference' Dpn't
-	  panic if a device is not found in the list of hardware. This is
-	  not only indication of a bug, but can also happen if a device
-	  appeared after the script was started. 
-
-	* zonedata.c: zonedata: Add tone definitions for Panama. (closes
-	  issue #14832) Reported by: jlduran Patch by: jldruan
-
-	* Pass correct channel number to DAHDI_GET_PARAMS when passing span
-	  numbers to dahdi_scan. When filtering, we weren't taking into
-	  account the number of channels in the spans that we were
-	  skipping. (closes issue #15553) Reported by: tony Patches:
-	  20090723_issue15553.patch uploaded by seanbright (license 71)
-	  Tested by: seanbright 
-
-	* xpp: cleanup gcc warnings and one real astribank_tool bug xpp
-	  rev: 7281 
-
-	* Add a missing trailing slash on the install-libs target (closes
-	  issue #15793) Reported by: pprindeville Patches:
-	  dahdi-tools-makefile.patch uploaded by pprindeville (license 347) 
-
-	* dahdi_genconf: Add the TC400P transcoder card to our hardware
-	  list (seanbright) 
-
-2009-06-08 17:02 +0000 [r6677-6678]  Sean Bright <[e-mail]>
-
-	* dahdi-tools version 2.2.0 released.
-
-	* Makefile: Since this 'echo' is part of a larger statement, we
-	  don't need the @ symbol. Cleans up an error I am seeing on
-	  Ubuntu.
-
-	* Makefile: Get rid of parallel build warnings from GNU make.
-
-2009-05-28 14:04 +0000 [r6668]  Tzafrir Cohen <[e-mail]>
-
-	* xpp/waitfor_xpds: xpp: if $dahdi_hardware is empty, don't use it
-	  in an error message
-
-2009-05-27 Shaun Ruffell <[e-mail]>
-
-	* dahdi-tools version 2.2.0-rc3 released.
-
-2009-05-26 09:55 +0000 [r6655-6657]  Tzafrir Cohen <[e-mail]>
-
-	* Makefile: Reword the message after 'make config' for the case no
-	  hardware found Check the output of dahdi_hardware and give a
-	  different message for the case it found no hardware. (closes
-	  issue #14792) Reported by: Dovid Patches:
-	  dahdi_hardware_nodev_make.diff uploaded by tzafrir (license 46)
-
-	* xpp/waitfor_xpds: Properly fix usage of waitfor_xpds in
-	  non-standard settings. From xpp rev. 7137.
-
-2009-05-19 16:46 +0000 [r6643-6647]  Tzafrir Cohen <[e-mail]>
-
-	* xpp/perl_modules/Dahdi/Config/Params.pm, xpp/dahdi_genconf,
-	  xpp/perl_modules/Dahdi/Config/Gen/Xpporder.pm,
-	  xpp/perl_modules/Dahdi/Config/Gen/System.pm,
-	  xpp/perl_modules/Dahdi/Xpp/Xpd.pm, xpp/genconf_parameters:
-	  dahdi-perl: make dahdi_genconf default to hardhdlc
-	  dahdi_genconf's 'bri_hardhdlc' parameter changes. Should
-	  generally work with no need for manual configuration unless you
-	  use a bristuffed driver (zaphfc, qozap). See notes in
-	  genconf_parameters.
-
-	* xpp/waitfor_xpds, dahdi.init: dahdi.init: moved test for
-	  astribanks into waitfor_xpds If the system starts with an
-	  Astribank with no firmware, the firmware loading may take a while
-	  and the Astribank only becomes ready some time after the DAHDI
-	  init script starts. This means that the test at the beginning of
-	  xpp_startup() in dahdi.init fails to find an Astribank, and the
-	  init script simply continues ignoring this. This changeset moves
-	  the testing inside the script waitfor_xpds. The script now: 1.
-	  Tests for an Astribank using dahdi_hardware and exists
-	  immediately if none found. 2. A loop (of maximum 10 seconds)
-	  waits for the first Astribank to be detected by the driver. 3.
-	  Waiting for the initialization of all the Astribanks to complete
-	  (The original waitfor_xpds) The support for the old procfs
-	  iinterface has been removed, as it has never been used with
-	  DAHDI.
-
-	* xpp/Makefile, xpp/astribank_tool.8, xpp/astribank_allow.8
-	  (added): xpp: install astribank_allow As we install it, we need a
-	  matching man page.
-
-2009-05-17 12:01 +0000 [r6630-6632]  Tzafrir Cohen <[e-mail]>
-
-	* xpp/perl_modules/Dahdi/Config/Gen/Users.pm: A closer-to-reality
-	  users.conf generation module
-
-	* xpp/perl_modules/Dahdi/Config/Gen/Xpporder.pm,
-	  xpp/perl_modules/Dahdi/Xpp/Mpp.pm, xpp/genconf_parameters: Fix
-	  typos in xpp documentation
-
-2009-05-14 14:02 +0000 [r6619]  Shaun Ruffell <[e-mail]>
-
-	* dahdi_cfg.c: dahdi_cfg: Default to the us tonezone if not
-	  specified in system.conf. If there are not "loadzone" and
-	  "defaultzone" lines in /etc/dahdi/system.conf, default to the us
-	  zone. This mimics the behavior of older zaptel releases.
-	  DAHDI-29.
-
-2009-05-13 20:18 +0000 [r6613-6617]  Tzafrir Cohen <[e-mail]>
-
-	* xpp/mpp_funcs.c, xpp/astribank_tool.c: astribank_tool: Support
-	  'reset' of pre-MPP protocol as fallback As of USB firmware rev.
-	  6926, the Astribank control connection protocol has changed in an
-	  incompatible manner. If astribank_tool fails to open a device
-	  when running a reset command, try to reset the device with the
-	  command from the old (pre-MPP) protocol (A single 0x20 byte). No
-	  support whatsoever for any other feature of the old protocol.
-	  From xpp rev. 7067. (previous commit was xpp rev. 7066).
-
-	* xpp/mpp_funcs.c: xpp: better error reporting when failing to talk
-	  to a pre-MPP Astribank.
-
-	* xpp/perl_modules/Dahdi/Chans.pm, xpp/perl_modules/Dahdi/Span.pm:
-	  dahdi-perl: Patterns for Rhino E1/T1 cards.
-
-2009-05-12 07:50 +0000 [r6601-6603]  Tzafrir Cohen <[e-mail]>
-
-	* xpp/README.Astribank: A few more chan_zap -> chan_dahdi in
-	  README.Astribank .
-
-	* xpp/perl_modules/Dahdi/Chans.pm: DAHDI-perl: Fix detection of
-	  empty slots in Rhino cards.
-
-2009-05-09 06:33 +0000 [r6579-6585]  Tzafrir Cohen <[e-mail]>
-
-	* xpp/README.Astribank: Fix a broken link
-
-	* xpp/README.Astribank: documentation updates: xpp_order, new USB
-	  loading, and more
-
-	* xpp/perl_modules/Dahdi.pm: dahdi-perl: scan only "number" files
-	  under /proc . (In case someone, such as dahdi_dynamic_ethmf adds
-	  there some other entries)
-
-2009-04-29 Shaun Ruffell <[e-mail]>
-
-	* dahdi-tools version 2.2.0-rc2 released.
-
-2009-04-27 19:45 +0000 [r6512]  Kevin P. Fleming <[e-mail]>
-
-	* configure, acinclude.m4: incorporate the autoconf 2.63 fixes here
-	  too
-
-2009-04-26 10:29 +0000 [r6492]  Tzafrir Cohen <[e-mail]>
-
-	* Makefile, xpp/xpp_order (removed): Remove useless sample file The
-	  sample xpp_order will be generated anyway when running
-	  'dahdi_genconf xpporder' (see
-	  xpp/perl_modules/Dahdi/Config/Gen/Xpporder.pm) . No need to
-	  clutter the main DAHDI installation with it.
-
-2009-04-23 17:03 +0000 [r6476]  Tzafrir Cohen <[e-mail]>
-
-	* Makefile, xpp/xpp_order: xpp: xpp_order is another config file
-	  that should go to /etc/dahdi Also slightly fix the sample config.
-
-2009-04-22 10:25 +0000 [r6427-6442]  Tzafrir Cohen <[e-mail]>
-
-	* dahdi.init: make sure '/etc/init.d/dahdi stop' ends with a
-	  newline
-
-	* ppp/dahdi.c: Yet another left-over DAHDI_PARAMS. ppp almost
-	  builds
-
-	* xpp/perl_modules/Dahdi/Config/Gen/Xpporder.pm:
-	  Dahdi::Config::Gen::Xpporder: use number rather than object in
-	  warning
-
-2009-04-21 13:44 +0000 [r6419-6421]  Sean Bright <[e-mail]>
-
-	* dahdi_monitor.c: Correct error check for fopen() calls in
-	  dahdi_monitor.c. dahdi_monitor.c was checking for an error
-	  calling fopen() by determining if the return value was less than
-	  0. fopen(), however, returns a FILE * and returns NULL on
-	  failure. (closes issue #14894) Reported by:
-	  gknispel_proformatique Patches:
-	  dahdi_monitor_fix_check_fopen_result.patch uploaded by gknispel
-	  (license 261)
-
-	* dahdi_monitor.c: Use correct return value type for getopt(). In
-	  dahdi_monitor.c, the return value of getopt() was being assigned
-	  to a char while the function actually returns an int. Fix
-	  suggested by reporter. (closes issue #14893) Reported by:
-	  gknispel_proformatique
-
-	* dahdi_monitor.c: Whitespace and coding guidelines changes
-
-2009-04-20 13:44 +0000 [r6417]  Tzafrir Cohen <[e-mail]>
-
-	* xpp/dahdi_hardware, xpp/perl_modules/Dahdi/Xpp/Xbus.pm,
-	  xpp/test_parse.c, xpp/twinstar, xpp/twinstar_hook,
-	  xpp/twinstar_setup, xpp/perl_modules/Dahdi/Config/Gen/Xpporder.pm
-	  (added), xpp/perl_modules/Dahdi/Xpp/Mpp.pm: xpp: twinstar-related
-	  perl improvements * New generator Dahdi::Config::Gen::Xpporder
-	  can generate and xpp_order config for an existing setup. * Add
-	  more TwinStar related logic to Dahdi::Xpp::Mpp. Simplifies the
-	  twinstar utility accordingly. * twinstar_hook: for the multiple
-	  Astribanks case. * twinstar_setup: More logic tests. Now
-	  delegates configuration generation to dahdi_genconf (with new
-	  Xpporder generator). * dahdi_hardware: Show number of channels
-	  with -v
-
-2009-04-16 17:32 +0000 [r6375]  Tzafrir Cohen <[e-mail]>
-
-	* xpp/xpp_fxloader: xpp_fxloader: exit properly when run with
-	  incorrect argument
-
-2009-04-10 09:53 +0000 [r6344]  Tzafrir Cohen <[e-mail]>
-
-	* xpp/Makefile, xpp/astribank_hook (added): Move astribank_hook
-	  from linux to tools. Install it by default
-
-2009-04-07 08:13 +0000 [r6337]  Tzafrir Cohen <[e-mail]>
-
-	* xpp/hexfile.c: hexfile.c was accidentally left out of r6313
-
-2009-04-02 20:56 +0000 [r6278-6313]  Tzafrir Cohen <[e-mail]>
-
-	* xpp/pic_loader.h (added), xpp/astribank_hexload.8 (added),
-	  xpp/twinstar_setup (added), xpp/xpp_fxloader,
-	  xpp/astribank_tool.c (added), xpp/astribank_allow.c (added), xpp,
-	  xpp/xpp_sync, xpp/dahdi_genconf, xpp/twinstar (added),
-	  xpp/mpp_funcs.c (added), xpp/Makefile, xpp/mpp_funcs.h (added),
-	  xpp/astribank_tool.8 (added), xpp/perl_modules/Dahdi/Xpp/Mpp.pm
-	  (added), xpp/astribank_upgrade (added),
-	  xpp/perl_modules/Dahdi/Xpp.pm,
-	  xpp/perl_modules/Dahdi/Hardware/PCI.pm, xpp/dahdi_hardware,
-	  xpp/twinstar_hook (added), xpp/xpp_order (added),
-	  xpp/astribank_hexload.c (added), xpp/dahdi_registration,
-	  xpp/perl_modules/Dahdi/Hardware/USB.pm,
-	  xpp/perl_modules/Dahdi/Xpp/Xbus.pm, xpp/debug.c (added),
-	  xpp/dahdi_drivers, xpp/lsdahdi, xpp/astribank_usb.c (added),
-	  xpp/hexfile.h, xpp/perl_modules/Dahdi/Hardware.pm, xpp/debug.h
-	  (added), xpp/astribank_usb.h (added),
-	  xpp/perl_modules/Dahdi/Xpp/Xpd.pm, xpp/mpp.h (added),
-	  xpp/pic_loader.c (added): Support for Astribanks 116x: tools part
-	  * New USB firmware loading mechanism. - Incompatible with
-	  previous one: upgrade using fxload or hard reset -
-	  astribank_hexload is the new low-level loading tool - fpga_load
-	  remains for backward compatibility. - xpp/astribank_upgrade:
-	  automate upgrading using fxload * Much enhanced control protocol
-	  ("MPP") - astribank_tool is the low-level tool for that. *
-	  Support for the TwinStar (dual USB port) - Managed through
-	  astribank_tool - Wrapper perl modules and scripts provided *
-	  Allow explicit ordering of Astribanks - /etc/dahdi/xpp_order -
-	  explicit order of Astribanks on the system - The default sorter
-	  is now to use those and fall back to connectors (previous
-	  default). - An option to dahdi_registration to change sorting.
-
-	* hdlcstress.c: hdlcstress.c: add option -b not to stress BRI too
-	  much Aparantly the HFC chip can't stand the heat of this test.
-	  Let's give it an occasional rest. Also add getopts support.
-
-	* Makefile: Install genconf_parameters on 'make install' as well
-
-	* blacklist.sample: xpp_usb should not be blacklisted: it does not
-	  register automatically anyway.
-
-	* xpp/perl_modules/Dahdi/Config/Gen/Modules.pm (added): Implement
-	  'dahdi_genconf modules' (generate /etc/dahdi/modules)
-
-2009-03-29 18:53 +0000 [r6272]  Tzafrir Cohen <[e-mail]>
-
-	* xpp/perl_modules/Dahdi/Config/Gen.pm: dahdi_genconf: Set the
-	  context same as groups.
-
-2009-03-26 18:28 +0000 [r6261]  Tzafrir Cohen <[e-mail]>
-
-	* doc/dahdi_scan.8: s/zap/dahdi/ again in dahd_scan.8
-
-2009-03-26 18:02 +0000 [r6259]  Kevin P. Fleming <[e-mail]>
-
-	* dahdi_cfg.c: when /etc/dahdi/system.conf does not have an echo
-	  canceller defined for a channel, but the channel previously had
-	  one assigned, running dahdi_cfg does not remove the assigned echo
-	  canceller from the channel as it should. this commit changes that
-	  behavior, so that every channel with a defined signaling mode is
-	  updated to have the proper (or no) echo canceller assigned.
-
-2009-03-22 10:31 +0000 [r6215]  Tzafrir Cohen <[e-mail]>
-
-	* xpp/perl_modules/Dahdi/Config/Gen/Users.pm,
-	  xpp/perl_modules/Dahdi/Config/Gen/Chandahdi.pm,
-	  xpp/perl_modules/Dahdi/Config/Gen/System.pm,
-	  xpp/perl_modules/Dahdi/Config/Gen/Unicall.pm: dahdi-perl: "allow"
-	  hand-editing of generated files Rework the text added by
-	  dahdi_genconf generators to say that you can hand-edit files. But
-	  just don't complain if they get mysteriously overriden when it is
-	  run again :-) (closes issue #14569) Reported by: jtodd
-
-2009-03-17 17:07 +0000 [r6189]  Jason Parker <[e-mail]>
-
-	* dahdi_monitor.c: Remove remnants of -p option, since it no longer
-	  exists.
-
-2009-03-17 13:52 +0000 [r6187]  Russell Bryant <[e-mail]>
-
-	* zonedata.c: Add tone definitions for Turkey. (closes issue
-	  #10450) Reported by: msahinbas
-
-2009-03-17 09:10 +0000 [r6167-6185]  Tzafrir Cohen <[e-mail]>
-
-	* Makefile: Use LIBS instead of LDFLAGS directly in tools Makefile
-	  The Makefile of dahdi-tools set the variable LDFLAGS directly,
-	  rather than adding to LIBS. This does not allow placing LIBS
-	  after all the linked objects. (closes issue #14638) Reported by:
-	  Chainsaw Patches: dahdi-tools-2.1.0.2-asneeded.patch uploaded by
-	  Chainsaw (license 723)
-
-	* xpp/README.Astribank, xpp/xpp_sync, dahdi.init: dahdi.init: call
-	  xpp_sync a bit later. xpp_sync needs to only be called after
-	  dahdi_cfg was run, because the application of system.conf may
-	  change the priority of a PRI module span (If it is a sync
-	  provider, "NT", priority is lower). Also some documentation-only
-	  changes for xpp_sync.
-
-2009-03-09 16:30 +0000 [r6110]  Tzafrir Cohen <[e-mail]>
-
-	* xpp/perl_modules/Dahdi/Chans.pm: Fix detection of channels of
-	  dynamic spans in Dahdi::Chans Fix the pattern detection of
-	  channels belonging to dynamic (dahdi_dynamic) spans in perl
-	  programs that use Dahdi::Chans (e.g.: lsdahdi) (closes issue
-	  #14630) Reported by: tamiel Patches:
-	  20090309-perl5-Dahdi-Chans.diff uploaded by tamiel (license 712)
-
-2009-03-07 00:10 +0000 [r6107]  Tzafrir Cohen <[e-mail]>
-
-	* xpp/perl_modules/Dahdi/Chans.pm,
-	  xpp/perl_modules/Dahdi/Hardware/USB.pm: Detect Sangoma USB FXO
-	  device; fix detection of Sangoma DAHDI channels (By Alessandro
-	  Zummo)
-
-2009-03-05 21:10 +0000 [r6095]  Tzafrir Cohen <[e-mail]>
-
-	* dahdi.init: Fix a typo in shutting down dynamic spans in
-	  dahdi.init Fixes shutdown_dynamic() in the dahdi init.d script.
-	  Not enabling it by default just yet (the second half of the
-	  patch) until we get some further confirmation that such a
-	  shutdown is always good. (from issue #14603) Reported by: tamiel
-	  Patches: 20090304_dahdi.init.patch uploaded by tamiel (license
-	  712)
-
-2009-03-03 20:39 +0000 [r6071-6078]  Tzafrir Cohen <[e-mail]>
-
-	* Makefile, README, /: Include sample genconf_parameters in
-	  dahdi-tools README.
-
-	* xpp/perl_modules/Dahdi/Config/Params.pm,
-	  xpp/perl_modules/Dahdi/Config/Gen.pm, xpp/genconf_parameters:
-	  genconf_parameters: Add option fxo_default_start; Document
-	  genconf_parameters * Add a dqahdi_genconf option
-	  fxo_default_start, equivalent of fxs_default_start. * Set all
-	  trunks in group 'group_lines' rather than hard-coded 0 (for TE)
-	  and 6 (for NT). * Document all parameters in genconf_parameters.
-
-	* xpp/perl_modules/Dahdi/Config/Params.pm (added),
-	  xpp/dahdi_genconf, xpp/perl_modules/Dahdi/Config/Gen.pm,
-	  xpp/perl_modules/Dahdi/Config/Gen/Users.pm,
-	  xpp/perl_modules/Dahdi/Config/Gen/Chandahdi.pm,
-	  xpp/perl_modules/Dahdi/Config/Gen/System.pm,
-	  xpp/perl_modules/Dahdi/Config/Gen/Unicall.pm: dahdi_genconf:
-	  configuration handling cleanup. * Parsing genconf_parameters is
-	  now in Dahdi::Config::Params All hard-coded defaults are there
-	  too (in the item() method). * Dahdi::Config::Genconf is gone
-	  (merged into Dahdi::Config::Gen) All semantic mapping is in the
-	  constructor. * dahdi_genconf is now lean and mean. * Add some
-	  implementation docs into these files.
-
-	* xpp/perl_modules/Dahdi/Config/Gen/System.pm: dahdi-perl: Do
-	  generate 'echocanceller' in system.conf Fixed a regression from
-	  r6013 .
-
-	* xpp/perl_modules/Dahdi/Config/GenconfDefaults.pm (removed):
-	  dahdi-perl: Remove an obsolete and unused module
-	  GenconfDefaults.pm
-
-	* xpp/README.Astribank: README.Astribank: Killed one remaining
-	  /sys/devices/xpp
-
-2009-03-01 14:29 +0000 [r6054-6058]  Tzafrir Cohen <[e-mail]>
-
-	* xpp/README.Astribank: More README updates
-
-	* xpp/perl_modules/Dahdi/Xpp/Xbus.pm, xpp/dahdi_genconf,
-	  xpp/perl_modules/Dahdi/Config/Gen/Chandahdi.pm,
-	  xpp/perl_modules/Dahdi/Xpp/Xpd.pm: xpp-dahdi: freepbx code
-	  generation; better procfs compatibility * dahdi_genconf -F will
-	  generate chan_dahdi.conf for freepbx (like genzaptelconf -F) *
-	  Better procfs compatibility for xpp modules.
-
-	* xpp/dahdi_drivers,
-	  xpp/perl_modules/Dahdi/Config/GenconfDefaults.pm,
-	  xpp/perl_modules/Dahdi/Config/Gen.pm,
-	  xpp/perl_modules/Dahdi/Config/Gen/Users.pm: dahdi-perl: more
-	  defensive coding and some docs
-
-	* xpp/perl_modules/Dahdi.pm: Dahdi.pm: the sample code should
-	  actually work.
-
-	* xpp/fpga_load.c: fpga_load.c: Flush USB device buffer on startup.
-	  Fixes some firmware loading issues.
-
-2009-02-26 15:41 +0000 [r6041-6043]  Tzafrir Cohen <[e-mail]>
-
-	* xpp/perl_modules/Dahdi/Hardware/PCI.pm: Add PCI IDs of another
-	  HFC-S card that zaphfc can handle.
-
-	* xpp/perl_modules/Dahdi/Chans.pm: Fix a typo for detecting zaphfc.
-
-2009-02-18 21:20 +0000 [r6022]  Doug Bailey <[e-mail]>
-
-	* fxstest.c: Remove 8 bit restriction on setting indirect registers
-	  (closes issue #14323) Reported by: alecdavis Patches:
-	  fxstest_setindirect.diff.txt uploaded by alecdavis (license 585)
-	  Tested by: alecdavis
-
-2009-02-13 21:09 +0000 [r6013]  Tzafrir Cohen <[e-mail]>
-
-	* xpp/dahdi_genconf, xpp/perl_modules/Dahdi/Config/Gen.pm (added),
-	  xpp/perl_modules/Dahdi/Config/Gen/Users.pm (added),
-	  xpp/perl_modules/Dahdi/Config/Gen/Chandahdi.pm (added),
-	  xpp/perl_modules/Dahdi/Config/Gen/System.pm (added),
-	  xpp/perl_modules/Dahdi/Config/Gen (added),
-	  xpp/perl_modules/Dahdi/Config/Gen/Unicall.pm (added): Rework
-	  dahdi_genconf to have separate configuration generation modules.
-	  'dahdi_genconf foo bar' will use the modules
-	  Dahdi::Config::Gen::Foo and Dahdi::Config::Gen::Bar to generate
-	  configuraion files. Extra formats can thus be added without
-	  modifying dahdi_genconf and independently of DAHDI.
-
-2009-02-08 11:04 +0000 [r5984]  Tzafrir Cohen <[e-mail]>
-
-	* xpp/dahdi_genconf: dahdi_genconf: do reset default files list
-	  when command-line has files This fixes a regression that was
-	  added whwn handling of R2 was added. Originally: Xorcom rev 6683.
-
-2009-01-28 18:49 +0000 [r5886]  Shaun Ruffell <[e-mail]>
-
-	* dahdi.init: Use the dahdihpec_enable tool instead of the
-	  zaphpec_enable. Issue: DAHDI-233 patch by: cmoye
-
-2009-01-27 15:14 +0000 [r5827]  Doug Bailey <[e-mail]>
-
-	* fxstest.c: Break VMWI ioctl calls into two separate calls to
-	  maintain old revision compatibility (issue #14104) Reported by:
-	  alecdavis Tested by: dbailey
-
-2009-01-25 00:50 +0000 [r5808-5809]  Sean Bright <[e-mail]>
-
-	* dahdi.init: Use the debian commands on Gentoo. (closes issue
-	  #14277) Reported by: darren1713 Patches: dahdi.init.txt uploaded
-	  by darren1713 (license 116)
-
-2009-01-22 15:45 +0000 [r5800]  Doug Bailey <[e-mail]>
-
-	* fxstest.c: Alec Davis change to modify vmwi test to use new ioctl
-	  call structure and enhance functionality (issue #14104) Reported
-	  by: alecdavis Patches: mwiioctl_structure_fxstest.diff.txt
-	  uploaded by dbailey (license ) Tested by: alecdavis, dbailey
-
-2009-01-20 18:54 +0000 [r5768]  Tzafrir Cohen <[e-mail]>
-
-	* xpp/dahdi_genconf: dahdi_genconf: Finally set $fxs_default_start
-	  = 'ks' rather than 'ls'
-
-2009-01-19 15:19 +0000 [r5728]  Doug Bailey <[e-mail]>
-
-	* fxstest.c: Add test to excercise VMWI Enhance polarity test by
-	  making sure the line is in an active state before testing (issue
-	  #14104) Reported by: alecdavis Patches: dahditools-14104.diff.txt
-	  uploaded by dbailey (license ) Tested by: alecdavis
-
-2009-01-19 12:46 +0000 [r5705-5707]  Tzafrir Cohen <[e-mail]>
-
-	* Makefile: dahdi-tools: Delete test binaries on 'make clean'
-
-	* xpp/perl_modules/Dahdi/Xpp/Xpd.pm, xpp/xpp_sync: xpp_sync xpd
-	  order fix.
-
-	* xpp/perl_modules/Dahdi/Span.pm: Dahdi-perl: Do detect Astribank
-	  PRI modules.
-
-2009-01-18 10:22 +0000 [r5671]  Tzafrir Cohen <[e-mail]>
-
-	* xpp/perl_modules/Dahdi/Xpp/Xbus.pm,
-	  xpp/perl_modules/Dahdi/Chans.pm,
-	  xpp/perl_modules/Dahdi/Xpp/Line.pm,
-	  xpp/perl_modules/Dahdi/Span.pm,
-	  xpp/perl_modules/Dahdi/Xpp/Xpd.pm, xpp/xpp_sync,
-	  xpp/perl_modules/Dahdi/Xpp.pm: XPP tool updates to match r5663:
-	  sysfs migration.
-
-2009-01-16 14:18 +0000 [r5662]  Sean Bright <[e-mail]>
-
-	* configure, configure.ac: Properly detect GENERIC_HDLC_VERSION on
-	  various kernel versions. (closes issue #14150) Reported by:
-	  ccesario Patches: 20090115__bug14150.diff.txt uploaded by
-	  seanbright (license 71) Tested by: ccesario
-
-2009-01-15 12:47 +0000 [r5661]  Tzafrir Cohen <[e-mail]>
-
-	* xpp/dahdi_genconf: Add an extra output format, 'asterisk': make
-	  the configuration readable for an Asterisk configuration parser.
-
-2009-01-14 20:06 +0000 [r5656-5660]  Sean Bright <[e-mail]>
-
-	* hdlctest.c: Whitespace and coding guidelines changes only.
-
-	* hdlctest.c: Fix some uninitialized variable warnings that were
-	  causing hdlctest to not compile. Tested the program as well and
-	  it appears to work correctly. (closes issue #13906) Reported by:
-	  tzafrir
-
-	* dahdi_monitor.c: This commit deserves no comment.
-
-	* dahdi_monitor.c: The problem with using dahdi_copy_string here is
-	  that it is guaranteed to NULL terminate the destination string,
-	  which in this case was not correct. So revert back to using
-	  strncpy and also decrease the buffer by 1 since it was reserving
-	  an extra byte behind NULL for some reason. Fix suggested by
-	  reporter. (closes issue #14103) Reported by: gork
-
-2009-01-06 08:09 +0000 [r5643]  Tzafrir Cohen <[e-mail]>
-
-	* xpp/perl_modules/Dahdi/Hardware/PCI.pm: d00d must be in small
-	  caps
-
-2009-01-03 21:14 +0000 [r5626]  Tzafrir Cohen <[e-mail]>
-
-	* xpp/perl_modules/Dahdi/Span.pm: Dahdi::Span: Remove an
-	  over-general span header "pri" pattern. Should fix #14061 .
-
-2008-12-16 17:02 +0000 [r5555]  Doug Bailey <[e-mail]>
-
-	* fxotune.c: Add ability to use sine tables for systems that don't
-	  have efficient floating point Add the ability to print out the
-	  best results found during tuning Some format cleanup
-
-2008-12-15 Shaun Ruffell <[e-mail]>
-
-	* dahdi-tools version 2.1.0.2 released.
-
-2008-12-15 20:19 +0000 [r5533]  Shaun Ruffell <[e-mail]>
-
-	* Makefile: Overwrite the libtonezone.so.1.0 and libtonezone.so.1
-	  links and libraries in order to maintain binary compatibility
-	  with applications linked with dahdi-tools 2.0.0.
-
-2008-12-15 11:19 +0000 [r5530-5532]  Tzafrir Cohen <[e-mail]>
-
-	* xpp/README.Astribank: README.Astribank: minor formatting fix.
-
-	* xpp/README.Astribank: Document patching the xpp BRI driver for
-	  now.
-
-	* dahdi_cfg.c: Allow the span timing to be up to 255. The test for
-	  15 was ineffective anyway. Some drivers can use higher values.
-	  See issue #13954 .
-
-2008-12-11 Shaun Ruffell <[e-mail]>
-
-	* dahdi-tools version 2.1.0.1 released.
-
-2008-12-11 22:45 +0000 [r5514]  Tzafrir Cohen <[e-mail]>
-
-	* dahdi.init: Drop the "redhat" action at the 'stop' case for now:
-	  RHEL4's 'action' only works with programs and not with functions.
-
-2008-12-09 Shaun Ruffell <[e-mail]>
-
-	* dahdi-tools version 2.1.0 released.
-
-2008-12-09 19:41 +0000 [r5461]  Shaun Ruffell <[e-mail]>
-
-	* modules.sample: Adding the wctc4xxp driver to the modules.sample.
-
-2008-12-08 14:02 +0000 [r5452]  Tzafrir Cohen <[e-mail]>
-
-	* xpp/perl_modules/Dahdi/Span.pm: Fix detection of the B410P card.
-	  All ports will be reported as TE. Tested by write_erase on
-	  #asterisk-dev.
-
-2008-12-05 00:24 +0000 [r5432-5440]  Tzafrir Cohen <[e-mail]>
-
-	* xpp/dahdi_genconf: dahdi_genconf: add output type 'modules'
-	  (/etc/dahdi/modules) Also improved documentation.
-
-	* xpp/README.Astribank: A minor formatting fix.
-
-2008-12-01 18:41 +0000 [r5409-5426]  Tzafrir Cohen <[e-mail]>
-
-	* xpp/README.Astribank: Next README.Astribank revision: Devices are
-	  not under the bun. (And various other fixes)
-
-	* xpp/README.Astribank: README.Astribank catching up with sysfs,
-	  dahdi and all. Many more entries in the table of contents. Most
-	  of sysfs is documented.
-
-2008-11-27 10:01 +0000 [r5402-5404]  Tzafrir Cohen <[e-mail]>
-
-	* Makefile, /: dahdi-tools: Re-add README.Astribank.html
-	  generation.
-
-	* xpp/README.Astribank (added): Moving README.Astribank to
-	  dahdi-tools .
-
-2008-11-25 Shaun Ruffell <[e-mail]>
-
-	* dahdi-tools version 2.1.0-rc5 released.
-
-2008-11-24 20:42 +0000 [r5379-5381]  Tzafrir Cohen <[e-mail]>
-
-	* dahdi_cfg.c: dahdi_cfg: {} as per coding guidelines.
-
-	* dahdi_cfg.c: dahdi_cfg: Make the message about echo canceller
-	  selection verbose.
-
-	* xpp/waitfor_xpds, xpp/test_parse.c, xpp/xpp_fxloader,
-	  xpp/fpga_load.c: Add some missing copyright statements in the
-	  xpp/ directory as well.
-
-2008-11-21 23:26 +0000 [r5365-5366]  Kevin P. Fleming <[e-mail]>
-
-	* dahdi_diag.c, hdlcstress.c, patgen.c, patlooptest.c,
-	  hdlcverify.c, fxstest.c, timertest.c, hdlcgen.c, pattest.c,
-	  dahdi_test.c, dahdi_speed.c, hdlctest.c: add copyright headers to
-	  all the files that don't have them
-
-	* dahdi_monitor.c, fxotune.c: minor fixes to accommodate compilers
-	  who check return result usage
-
-2008-11-19 21:16 +0000 [r5334]  Tzafrir Cohen <[e-mail]>
-
-	* dahdi.init: LSB init script comments.
-
-2008-11-17 Shaun Ruffell <[e-mail]>
-
-	* dahdi-tools version 2.1.0-rc4 released.
-
-2008-11-16 17:55 +0000 [r5308-5309]  Tzafrir Cohen <[e-mail]>
-
-	* hdlcverify.c: Fix a compilation warning about signedness
-
-	* hdlcstress.c, patgen.c, patlooptest.c, pattest.c, hdlctest.c: Fix
-	  usage strings and eliminate all traces of tor
-
-2008-11-10 Shaun Ruffell <[e-mail]>
-
-	* dahdi-tools 2.1.0-rc3 released.
-
-2008-11-06 22:38 +0000 [r5266]  Doug Bailey <[e-mail]>
-
-	* zonedata.c: set DTMF twist levels for listed EU countries to meet
-	  TBR-21 standard of -9/-11 dB
-
-2008-11-05 Shaun Ruffell <[e-mail]>
-
-	* dahdi-tools 2.1.0-rc2 released.
-
-2008-11-05 19:17 +0000 [r5231]  Shaun Ruffell <[e-mail]>
-
-	* system.conf.sample: Update system.conf.sample to clarify BRI
-	  configuration.
-
-2008-11-04 15:58 +0000 [r5228]  Shaun Ruffell <[e-mail]>
-
-	* hdlcstress.c, hdlcverify.c, hdlcgen.c, hdlctest.c: Fix
-	  compilation issues with the hdlc tests.
-
-2008-11-03 20:14 +0000 [r5226]  Tzafrir Cohen <[e-mail]>
-
-	* Makefile: Bump SONAME of libtonezone to 2.0: API and ABI have not
-	  changed from Zaptel, but the library behaves differently.
-
-2008-11-03 Shaun Ruffell <[e-mail]>
-
-	* dahdi-tools 2.1.0-rc1 released.
-
-2008-10-28 20:42 +0000 [r5160]  Tzafrir Cohen <[e-mail]>
-
-	* xpp/perl_modules/Dahdi/Chans.pm: Get wcb4xxp listed in lsdahdi .
-
-2008-10-28 18:34 +0000 [r5155]  Shaun Ruffell <[e-mail]>
-
-	* xpp/perl_modules/Dahdi/Hardware/PCI.pm, blacklist.sample,
-	  modules.sample: Adding support for the wcb4xxp module.
-
-2008-10-27 16:07 +0000 [r5134]  Tzafrir Cohen <[e-mail]>
-
-	* xpp/perl_modules/Dahdi/Xpp/Line.pm,
-	  xpp/perl_modules/Dahdi/Xpp.pm: perl xpp: Support for FXO batter
-	  attribute from sysfs (from r5133). Still falls back to reading
-	  the battery status from procfs. Also fixes error message.
-
-2008-10-16 18:03 +0000 [r5098-5099]  Tzafrir Cohen <[e-mail]>
-
-	* xpp/waitfor_xpds (added), xpp/perl_modules/Dahdi/Xpp/Line.pm,
-	  xpp/Makefile, xpp/perl_modules/Dahdi/Xpp/Xpd.pm, dahdi.init,
-	  xpp/perl_modules/Dahdi/Xpp.pm: xpp: userspace support for sysfx
-	  migration. The userspace side of dahdi-linux r5097. * Perl
-	  modules default to using xpp sysfs but will fallback (with
-	  warning) to procfs interface. * An additional
-	  /usr/share/dahdi/waitfor_xpds to replace the line in the init.d
-	  script.
-
-	* xpp/dahdi_genconf: dahdi_genconf: report channel number in case
-	  of error.
-
-2008-10-15 17:11 +0000 [r5094]  Tzafrir Cohen <[e-mail]>
-
-	* xpp/perl_modules/Dahdi/Chans.pm: Dahdi-perl: Fix detection of
-	  empty slots in Rhino analog cards. Closes issue #13685
-
-2008-10-12 23:09 +0000 [r5088]  Tzafrir Cohen <[e-mail]>
-
-	* xpp/dahdi.cgi (added): A CGI script to give some information
-	  about Zaptel through the Dahdi perl interface. A simple demo. Not
-	  installed automatically.
-
-2008-10-10 18:29 +0000 [r5079-5082]  Tzafrir Cohen <[e-mail]>
-
-	* Makefile: Fix 'make config' for distros with no chkconfig and no
-	  update-rc.d . This would cause the error on 'make config' for
-	  "unknown command dahdi", and 'make -n config' would show that it
-	  tries to run "dahdi defaults 15 30"
-
-	* dahdi_test.c: revert r5077 as r5078 fixes this better: now we can
-	  use 8 entries in a line.
-
-	* dahdi_test.c: make dahdi_test's prints fit in one line. It makes
-	  them slightly less "accurate", but we already use it in the
-	  verbose messages, and dahdi_test is not really accurate.
-
-2008-10-10 16:15 +0000 [r5072-5077]  Sean Bright <[e-mail]>
-
-	* dahdi_test.c: Wrap at 6 instead of 8 so we are sure to fit on an
-	  80 column terminal.
-
-	* dahdi.init: Return the appropriate values to indicate if the
-	  modules are loaded or not.
-
-	* dahdi.init: Add a status command to the DAHDI init script.
-	  (closes issue #13655) Reported by: jcollie Patches:
-	  0001-Add-a-trivial-status-command-to-the-init-script.patch
-	  uploaded by jcollie (license 412) (Slight modification by me to
-	  update the usage text)
-
-2008-10-03 19:37 +0000 [r5044]  Tzafrir Cohen <[e-mail]>
-
-	* xpp/perl_modules/Dahdi/Config/GenconfDefaults.pm: When the config
-	  file is not found: return "empty" data and don't die. Closes
-	  issues #13615 .
-
-2008-10-03 19:03 +0000 [r5038-5042]  Sean Bright <[e-mail]>
-
-	* dahdi_test.c: Whitespace and formatting only.
-
-	* dahdi_test.c: The first line was getting wrapped after 7 instead
-	  of 8.
-
-	* xpp/genzaptelconf (removed), xpp/genzaptelconf.8 (removed):
-	  Remove some leftovers.
-
-	* dahdi_scan.c, doc/dahdi_scan.8: Fix the dahdi_scan manpage
-	  (s/dahdi_span/dahdi_scan/) and make dahdi_scan do what it is
-	  advertised to do. Namely take span numbers on the command line.
-	  (closes issue #13614) Reported by: jfinstrom
-
-2008-09-29 Shaun Ruffell <[e-mail]>
-
-	* dahdi-tools 2.0.0 released.
-
-2008-09-25 15:47 +0000 [r4984]  Tzafrir Cohen <[e-mail]>
-
-	* dahdi.init: dahdi_init: Fix a typo in xpp initialization (Stephen
-	  Farrell)
-
-2008-09-24 19:54 +0000 [r4977]  Sean Bright <[e-mail]>
-
-	* build_tools/menuselect-deps.in, configure, configure.ac,
-	  dahdi.xml: Re-enable sethdlc by default in menuselect. Add
-	  configure checks to properly discover the linux/hdlc.h
-	  dependency.
-
-2008-09-24 17:35 +0000 [r4975]  Jason Parker <[e-mail]>
-
-	* dahdi.xml: Disable sethdlc in menuselect by default. This is how
-	  it was in Zaptel, and it's causing issues. Ideally, this would
-	  eventually be checked in the configure script.
-
-2008-09-23 04:56 +0000 [r4969]  Shaun Ruffell <[e-mail]>
-
-	* README: Removing the note about running install_prereq since from
-	  the README since that script is not present currently.
-
-2008-09-16 18:26 +0000 [r4913-4915]  Shaun Ruffell <[e-mail]>
-
-	* dahdi.init: Remove the extra space printed after each line when a
-	  module is loaded.
-
-	* dahdi_cfg.c: Close the /dev/dahdi/channel file handle if we're
-	  unable to associate it with a particular channel.
-
-	* dahdi_cfg.c: Provide system error information if open on
-	  /dev/dahdi/channel fails.
-
-2008-09-12 18:06 +0000 [r4904]  Sean Bright <[e-mail]>
-
-	* Makefile, /, configure, configure.ac, makeopts.in: A few changes:
-	  1) Start using menuselect trunk 2) Bring in changes similar to
-	  those in asterisk trunk so that 'make menuselect' works as it
-	  should from the dahdi-tools directory. 3) Stop looking for
-	  curses/ncurses in the top level configure since nothing uses it
-	  (except menuselect which will find it on it's own).
-
-2008-09-11 20:52 +0000 [r4894]  Tzafrir Cohen <[e-mail]>
-
-	* xpp/Makefile, xpp/xpp.rules (removed): Move udev rules xpp.rules
-	  from dahdi-tools to dahdi-linux .
-
-2008-09-11 15:45 +0000 [r4891-4893]  Jason Parker <[e-mail]>
-
-	* Makefile: Fix installation of ifup-hdlc and init script when
-	  using DESTDIR. (Step 2 of cleanup) (closes issue #13430) Reported
-	  by: jcollie Patches:
-	  0001-Fix-install-of-ifup-hdlc-when-installing-into-an-alt.patch
-	  uploaded by jcollie (license 412) Tested by: qwell Note: Patch
-	  from #13430 was extended to modify init script installation as
-	  well.
-
-	* build_tools/genmodconf (removed), dahdi.rules (removed),
-	  build_tools/genudevrules (removed): Remove files that aren't used
-	  or are duplicated from dahdi-linux. Step 1 of cleanup.
-
-2008-09-09 18:21 +0000 [r4882-4883]  Jason Parker <[e-mail]>
-
-	* Makefile: Fix a few typos
-
-	* dahdi.init: Fix location of fxotune (closes issue #13428)
-	  Reported by: eeman
-
-2008-09-04 16:37 +0000 [r4860]  Shaun Ruffell <[e-mail]>
-
-	* Makefile, UPGRADE.txt: * Updates the instructions presented after
-	  'make config' about where to set which modules are loaded. *
-	  Update UPGRADE.txt to indicate where to set which modules are
-	  loaded and where the module parameters are set. Issue# DAHDI-187
-
-2008-09-03 19:38 +0000 [r4859]  Tzafrir Cohen <[e-mail]>
-
-	* Makefile, README, UPGRADE.txt: Slightly reformat UPDATES.txt for
-	  asciidoc . Include it in README.html . See e.g.
-	  http://docs.tzafrir.org.il/dahdi-tools/README.html#_upgrade_notes
-	  Also fix some links in the README.
-
-2008-08-28 21:40 +0000 [r4853-4855]  Tzafrir Cohen <[e-mail]>
-
-	* dahdi.init: Simplify reading list of modules from
-	  /etc/dahdi/modules .
-
-	* doc, xpp: Ignore generated HTML files.
-
-	* xpp/Makefile: Don't install genzaptelconf: deprecated, and
-	  collides with Zaptel.
-
-2008-08-27 17:13 +0000 [r4845-4850]  Kevin P. Fleming <[e-mail]>
-
-	* modules.sample, dahdi.init: remove some silly echo statement
-	  constructions in the init script clean up the modules.sample file
-	  to have proper lists of cards supported by each module and remove
-	  reference to dahdi_dummy since the init script takes care of
-	  loading that module
-
-	* makeopts.in, fxotune.c: actually implement the rest of
-	  --enable-dev-mode, and fix up more problems it found
-
-	* Makefile, configure, configure.ac, sethdlc.c, makeopts.in,
-	  dahdi_cfg.c: add --enable-dev-mode support, and fix up a couple
-	  of warnings found using it (only two, surprisingly)
-
-2008-08-26 14:35 +0000 [r4833-4844]  Tzafrir Cohen <[e-mail]>
-
-	* Makefile, README, system.conf.sample: * Add a "docs" target to
-	  generate documentation. * Demote/promote some headers. * Fix URL
-	  for on-line copy of the README.
-
-	* xpp/perl_modules/Dahdi/Chans.pm: Fix default path of dahdi_cfg
-	  (used for probing type of wctdm channels)
-
-2008-08-25 16:12 +0000 [r4826-4827]  Jason Parker <[e-mail]>
-
-	* dahdi_cfg.c: Fix more crazy formatting
-
-	* dahdi_cfg.c: Reverse some incorrect logic, and cleanup some very
-	  ugly formatting in passing.
-
-2008-08-24 10:53 +0000 [r4821-4822]  Tzafrir Cohen <[e-mail]>
-
-	* dahdi_cfg.c: We've got a new "zap" string to zap.
-
-	* dahdi_cfg.c: dahdi_cfg.c: Reduce nesting in main() .
-
-2008-08-24 05:54 +0000 [r4818]  Matthew Fredrickson <[e-mail]>
-
-	* dahdi_cfg.c: Add support for 56 KB HDLC as well as selectable
-	  rate in system.conf
-
-2008-08-20 Kevin P. Fleming <[e-mail]>
-
-	* dahdi-tools version 2.0.0-rc2 released.
-
-2008-08-17 15:50 +0000 [r4787]  Tzafrir Cohen <[e-mail]>
-
-	* xpp/perl_modules/Dahdi/Chans.pm: Dahdi::Chans: fix leftovers from
-	  r4767 (handling of spaces) While r4767 solved some parsing
-	  problems of channels with "strange" encoding names, it introduced
-	  a new problem (e.g.: "RED" after "(In use)" which is fixed here.
-
-2008-08-12 12:59 +0000 [r4764-4767]  Tzafrir Cohen <[e-mail]>
-
-	* xpp/perl_modules/Dahdi/Chans.pm: Dahdi-perl: More robust parsing
-	  of channel signalling types. Use a list of signalling types
-	  rather than a regular experssion of a "word".
-
-	* xpp/dahdi_genconf, xpp/genconf_parameters: MFC/R2 configuration
-	  generation support If optional setting 'pri_connection_type' is
-	  set to R2, configure E1 spans as CAS and generate a unicall.conf
-	  snippet (unicall-channels.conf).
-
-	* xpp/perl_modules/Dahdi/Hardware/PCI.pm, xpp/xpp_fxloader: *
-	  xpp_fxloader: shows USB firmware version. * Update PCI IDs
-	  database.
-
-	* xpp/lsdahdi, xpp/perl_modules/Dahdi/Chans.pm: Dahdi-perl: Add
-	  alarms() method for channels. Use it in lsdahdi. * Better paring
-	  of the /proc/dahdi/N channel lines for alarms * Provide it as a
-	  separate alarms() method.
-
-2008-08-06 Kevin P. Fleming <[e-mail]>
-
-	* dahdi-tools version 2.0.0-rc1 released.
-
-
 
=== modified file 'Makefile'
--- Makefile	2011-03-13 23:45:36 +0000
+++ Makefile	2013-08-25 04:54:26 +0000
@@ -5,19 +5,7 @@
 #
 #
 
-# If the file .dahdi.makeopts is present in your home directory, you can
-# include all of your favorite menuselect options so that every time you download
-# a new version of Asterisk, you don't have to run menuselect to set them.
-# The file /etc/dahdi.makeopts will also be included but can be overridden
-# by the file in your home directory.
-
-GLOBAL_MAKEOPTS=$(wildcard /etc/dahdi.makeopts)
-USER_MAKEOPTS=$(wildcard ~/.dahdi.makeopts)
-
 ifeq ($(strip $(foreach var,clean distclean dist-clean update,$(findstring $(var),$(MAKECMDGOALS)))),)
- ifneq ($(wildcard menuselect.makeopts),)
-  include menuselect.makeopts
- endif
 endif
 
 ifeq ($(strip $(foreach var,clean distclean dist-clean update,$(findstring $(var),$(MAKECMDGOALS)))),)
@@ -100,6 +88,7 @@
 LIB_DIR:=$(libdir)
 INC_DIR:=$(includedir)/dahdi
 MAN_DIR:=$(mandir)/man8
+DATA_DIR:=${datadir}/dahdi
 CONFIG_DIR:=$(sysconfdir)/dahdi
 CONFIG_FILE:=$(CONFIG_DIR)/system.conf
 
@@ -111,10 +100,21 @@
 UTILS		+= patgen pattest patlooptest hdlcstress hdlctest hdlcgen \
 		   hdlcverify timertest dahdi_maint
 
-BINS:=fxotune fxstest sethdlc dahdi_cfg dahdi_diag dahdi_monitor dahdi_speed dahdi_test dahdi_scan dahdi_tool dahdi_maint
-BINS:=$(filter-out $(MENUSELECT_UTILS),$(BINS))
+
+BINS:=fxotune dahdi_cfg dahdi_monitor dahdi_speed dahdi_test dahdi_scan dahdi_maint
+ifeq	(1,$(PBX_NEWT))
+	BINS	+= dahdi_tool
+endif
+ifeq	(1,$(PBX_HDLC))
+	BINS	+= sethdlc
+endif
 MAN_PAGES:=$(wildcard $(BINS:%=doc/%.8))
 
+PINNED_DATA_SCRIPTS:=dahdi_cfg_device_args handle_device \
+	span_assignments span_types
+PINNED_UTILS:=dahdi_map
+PINNED_CONF:=pinned-spans.conf spantype.conf
+
 TEST_BINS:=patgen pattest patlooptest hdlcstress hdlctest hdlcgen hdlcverify timertest dahdi_maint
 # All the man pages. Not just installed ones:
 GROFF_PAGES	:= $(wildcard doc/*.8 xpp/*.8)
@@ -122,10 +122,7 @@
 
 GENERATED_DOCS	:= $(GROFF_HTML) README.html README.Astribank.html
 
-all: menuselect.makeopts 
-	@$(MAKE) _all
-
-_all: prereq programs
+all: prereq programs
 
 libs: $(LTZ_SO) $(LTZ_A)
 
@@ -176,6 +173,9 @@
 
 dahdi_cfg: $(LTZ_A)
 dahdi_cfg: LIBS+=-lm
+dahdi_pcap:
+	$(CC) $(CFLAGS) dahdi_pcap.c -lpcap -o $@ $<
+	
 
 fxstest: $(LTZ_SO)
 fxstest: LIBS+=-lm
@@ -233,6 +233,12 @@
 	$(INSTALL) -d $(DESTDIR)$(CONFIG_DIR)
 	$(INSTALL) -m 644 system.conf.sample $(DESTDIR)$(CONFIG_FILE)
 endif
+ifeq ($(DAHDI_PINNED),yes)
+	install -d $(DESTDIR)$(DATA_DIR)
+	install $(PINNED_DATA_SCRIPTS) $(DESTDIR)$(DATA_DIR)/
+	install $(PINNED_UTILS) $(DESTDIR)/$(BIN_DIR)/
+	install -m 644 $(PINNED_CONF) $(DESTDIR)/$(CONFIG_DIR)/
+endif
 
 install-libs: libs
 	$(INSTALL) -d -m 755 $(DESTDIR)/$(LIB_DIR)
@@ -270,6 +276,12 @@
 		$(MAKE) -C $$dir install; \
 	done
 
+install-tests: tests
+ifneq (,$(TEST_BINS))
+	install -d $(DESTDIR)$(BIN_DIR)
+	install  $(TEST_BINS) $(DESTDIR)$(BIN_DIR)/
+endif
+
 config:
 ifneq (,$(COPY_INITD))
 	$(COPY_INITD)
@@ -324,7 +336,6 @@
 	fi
 
 clean:
-	-@$(MAKE) -C menuselect clean
 	rm -f $(BINS) $(TEST_BINS)
 	rm -f *.o dahdi_cfg tzdriver sethdlc
 	rm -f $(LTZ_SO) $(LTZ_A) *.lo
@@ -339,12 +350,12 @@
 	rm -f core
 	rm -f dahdi_cfg-shared fxstest
 	rm -rf $(GENERATED_DOCS) *.asciidoc tonezones.txt
+	rm -f dahdi_pcap
 
 distclean: dist-clean
 
 dist-clean: clean
-	@$(MAKE) -C menuselect dist-clean
-	rm -f makeopts menuselect.makeopts menuselect-tree build_tools/menuselect-deps
+	rm -f makeopts
 	rm -f config.log config.status
 	rm -f .*.d
 
@@ -356,62 +367,7 @@
 	@echo "****"
 	@exit 1
 
-menuselect.makeopts: menuselect/menuselect menuselect-tree makeopts
-	menuselect/menuselect --check-deps $@ $(GLOBAL_MAKEOPTS) $(USER_MAKEOPTS)
-
-menuconfig: menuselect
-
-cmenuconfig: cmenuselect
-
-gmenuconfig: gmenuselect
-
-nmenuconfig: nmenuselect
-
-menuselect: menuselect/cmenuselect menuselect/nmenuselect menuselect/gmenuselect
-	@if [ -x menuselect/nmenuselect ]; then \
-		$(MAKE) nmenuselect; \
-	elif [ -x menuselect/cmenuselect ]; then \
-		$(MAKE) cmenuselect; \
-	elif [ -x menuselect/gmenuselect ]; then \
-		$(MAKE) gmenuselect; \
-	else \
-		echo "No menuselect user interface found. Install ncurses,"; \
-		echo "newt or GTK libraries to build one and re-rerun"; \
-		echo "'make menuselect'."; \
-	fi
-
-cmenuselect: menuselect/cmenuselect menuselect-tree
-	-@menuselect/cmenuselect menuselect.makeopts $(GLOBAL_MAKEOPTS) $(USER_MAKEOPTS) && echo "menuselect changes saved!" || echo "menuselect changes NOT saved!"
-
-gmenuselect: menuselect/gmenuselect menuselect-tree
-	-@menuselect/gmenuselect menuselect.makeopts $(GLOBAL_MAKEOPTS) $(USER_MAKEOPTS) && echo "menuselect changes saved!" || echo "menuselect changes NOT saved!"
-
-nmenuselect: menuselect/nmenuselect menuselect-tree
-	-@menuselect/nmenuselect menuselect.makeopts $(GLOBAL_MAKEOPTS) $(USER_MAKEOPTS) && echo "menuselect changes saved!" || echo "menuselect changes NOT saved!"
-
-# options for make in menuselect/
-MAKE_MENUSELECT=CC="$(HOST_CC)" CXX="$(CXX)" LD="" AR="" RANLIB="" CFLAGS="" $(MAKE) -C menuselect CONFIGURE_SILENT="--silent"
-
-menuselect/menuselect: menuselect/makeopts
-	+$(MAKE_MENUSELECT) menuselect
-
-menuselect/cmenuselect: menuselect/makeopts
-	+$(MAKE_MENUSELECT) cmenuselect
-
-menuselect/gmenuselect: menuselect/makeopts
-	+$(MAKE_MENUSELECT) gmenuselect
-
-menuselect/nmenuselect: menuselect/makeopts
-	+$(MAKE_MENUSELECT) nmenuselect
-
-menuselect/makeopts: makeopts
-	+$(MAKE_MENUSELECT) makeopts
-
-menuselect-tree: dahdi.xml
-	@echo "Generating input for menuselect ..."
-	@build_tools/make_tree > $@
-
-.PHONY: menuselect distclean dist-clean clean all _all install programs tests devel data config update install-programs install-libs install-utils-subdirs utils-subdirs prereq
+.PHONY: distclean dist-clean clean all install programs tests devel data config update install-programs install-libs install-utils-subdirs utils-subdirs prereq
 
 FORCE:
 
 
=== modified file 'README'
--- README	2011-03-13 23:45:36 +0000
+++ README	2013-08-25 04:54:26 +0000
@@ -1,10 +1,10 @@
 DAHDI Telephony Interface Driver
 =================================
 Asterisk Development Team <[e-mail]>
-$Revision: 7792 $, $Date: 2010-01-09 06:23:55 -0600 (Sat, 09 Jan 2010) $
+$Revision$, $Date$
 
 DAHDI stands for Digium Asterisk Hardware Device Interface. This
-package contains the userspace tools to configure the kernel modules
+package contains the user-space tools to configure the kernel modules
 included in the package dahdi-linux.
 
 Build Requirements
@@ -14,7 +14,7 @@
 
 Build System
 ~~~~~~~~~~~~
-gcc and friends. Generally you will need to install the package gcc.
+GCC and friends. Generally you will need to install the package gcc.
 There may be cases where you will need a specific version of gcc to build
 kernel modules.
 
@@ -34,8 +34,6 @@
 Note: If using `sudo` to build/install, you may need to add /sbin to your PATH.
 ----------------------------------
 ./configure
-# optional step: select custom configuration:
-#make menuselect
 make
 make install
 # To install init scripts and config files:
@@ -51,7 +49,7 @@
 parts of DAHDI:
 
 . Build targets:
-  - make: Build DAHDI userspace programs. partial 
+  - make: Build DAHDI user-space programs. partial
     targets of it:
     * make 'utilname': builds 'utilname' alone (e.g: `make dahdi_diag`)
     * make utils: Build libtonezone.
@@ -66,7 +64,7 @@
 ^^^^^^^^^^^^^^^^^^^^^^^^^
 The following may be useful when testing the package or when preparing a
 package for a binary distribution (such as an rpm package) installing
-onto a subtree rather than on th real system. 
+onto a subtree rather than on the real system.
 
   make install DESTDIR=targetdir
 
@@ -75,9 +73,9 @@
 
 Options For ./configure
 ^^^^^^^^^^^^^^^^^^^^^^^
-The configure script various several tests and based on them generates
-some files ( build_tools/menuselect-deps and makeopts). You can pass it
---with options and variable settings, for instance:
+The configure script executes various tests and based on them generates
+makeopts. You can pass it --with options and variable settings, for
+instance:
 
   ./configure --without-ncurses CC="gcc-4.10"
 
@@ -89,7 +87,7 @@
 To re-run ./configure with the same parameters it was run with last
 time, use:
 
-  ./ocnfig.status --recheck
+  ./config.status --recheck
 
 
 Configuration
@@ -106,7 +104,9 @@
 A sample annotated system.conf is included in this directory and
 installed by default. Edit it to suit your configuration. Alternatively 
 use the script dahdi_genconf to generate one that should work with your 
-system.
+system. Note that while dahdi_genconf will generate a working configuration,
+it will not automatically detect hardware echo cancellation modules.  These
+will have to be enabled manually in system.conf.
 
 /etc/dahdi/init.conf
 ~~~~~~~~~~~~~~~~~~~~
@@ -136,7 +136,7 @@
 Tonezones
 ~~~~~~~~~
 The file zonedata.c contains the information about the tone zones used
-in libtonezone (and hence also in ztcfg). Here is a list of those zones:
+in libtonezone (and hence also in dahdi_cfg). Here is a list of those zones:
 
 include::tonezones.txt[]
 
@@ -144,14 +144,14 @@
 DAHDI PERL modules
 ~~~~~~~~~~~~~~~~~~
 The directory xpp has, in addition to helper utilities for the
-Xorcom Astribank, a collection of perl modules to provide information
-related to DAHDI. The perl modules themselves are under xpp/perl_modules/ .
+Xorcom Astribank, a collection of PERL modules to provide information
+related to DAHDI. The PERL modules themselves are under xpp/perl_modules/ .
 In xpp/ there are several utilities that use those modules:
 - xpp-specific: dahdi_registration, xpp_sync, xpp_blink .
 - General: lsdahdi, dahdi_genconf, dahdi_hardware, dahdi_drivers
 
-The DAHDI perl modules will currently only be automatically installed if you
-happen to install the xpp directory. Those utilities require the perl modules 
+The DAHDI PERL modules will currently only be automatically installed if you
+happen to install the xpp directory. Those utilities require the PERL modules
 to be installed, however they will also look for them in the directory 
 perl_modules, and thus can be run directly from the DAHDI source tree. For 
 example:
@@ -165,7 +165,7 @@
   perldoc ./xpp/lsdahdi
 
 Some of them are specific for the Xorcom Astribank and described in its
-docuemntation. the others are:
+documentation. the others are:
 
 lsdahdi:: 
   A somewhat glorified `cat /proc/dahdi/*`.
@@ -174,9 +174,9 @@
   /etc/dahdi/genconf_parameters (replaces genzaptelconf as well).
 dahdi_drivers::
   A two-liner script (not installed by default) that simply returns the
-  modules that should be modprobed on this system.
+  modules that should be modprobe-d on this system.
 dahdi_hardware:: 
-  Uses the information from sysfs and its own knowledge to show
+  Uses the information from SysFS and its own knowledge to show
   what PCI/USB DAHDI hardware is connected and if it is currently used
   by a driver. Shows also some more information for Astribanks from
   /proc/xpp .
@@ -184,8 +184,8 @@
 
 PPP Support
 ~~~~~~~~~~~
-DAHDI digital cards can provide data channels through ppp as
-point-to-point connections. This requires a plugin to the ppp daemon
+DAHDI digital cards can provide data channels through PPP as
+point-to-point connections. This requires a plug-in to the PPP daemon
 that is included in the ppp/ subdirectory. To install it:
 
 1. Make sure you have the PPP source / headers installed. On Debian:
 
=== modified file 'UPGRADE.txt'
--- UPGRADE.txt	2009-06-01 08:23:38 +0000
+++ UPGRADE.txt	2013-08-25 04:54:26 +0000
@@ -62,10 +62,9 @@
 canceler to be used on the system's channels can be configured using
 the dahdi_cfg tool from the dahdi-tools package.
 
-IMPORTANT: It is *mandatory* to configure an echo canceler for the
-system's channels using dahdi_cfg unless the interface cards in use
-have echo canceler modules available and enabled. There is *no*
-default software echo canceler with DAHDI. See
+IMPORTANT: It is *mandatory* to configure an echo canceler for the system's
+channels using dahdi_cfg. There is *no* default echo canceler with DAHDI, not
+even hardware echo cancellation modules. See
 <<_echo_cancellers,section on echo cancellers>> in sample system.conf.
 
 
 
=== modified file 'blacklist.sample'
--- blacklist.sample	2009-06-01 08:23:38 +0000
+++ blacklist.sample	2013-08-25 04:54:26 +0000
@@ -4,6 +4,7 @@
 
 blacklist wct4xxp
 blacklist wcte12xp
+blacklist wcte13xp
 blacklist wct1xxp
 blacklist wcte11xp
 blacklist wctdm24xxp
@@ -11,3 +12,10 @@
 blacklist wctdm
 blacklist wctc4xxp
 blacklist wcb4xxp
+
+# Some mISDN drivers may try to attach to cards supported by DAHDI. If you
+# have a card which is *not* supported by DAHDI but supported by one of the
+# below drivers you should feel free to remove it from the blacklist below.
+blacklist hfcmulti
+blacklist netjet
+blacklist hfcpci
 
=== modified file 'build_tools/dahdi_svn_tarball'
--- build_tools/dahdi_svn_tarball	2009-06-01 08:23:38 +0000
+++ build_tools/dahdi_svn_tarball	2013-08-25 04:54:26 +0000
@@ -18,7 +18,7 @@
 
 usage() {
   echo >&2 "$0: Generate snapshot from DAHDI SVN"
-  echo >&2 '    ($Id: dahdi_svn_tarball 4356 2008-05-23 16:39:27Z mattf $)'
+  echo >&2 '    ($Id$)'
   echo >&2 ""
   echo >&2 "$0 [-r REV] [-2] [-s]"
   echo >&2 "$0 <-h | --help>: This message"
 
=== added file 'build_tools/dahdi_sysfs_copy'
--- build_tools/dahdi_sysfs_copy	1970-01-01 00:00:00 +0000
+++ build_tools/dahdi_sysfs_copy	2013-08-25 04:54:26 +0000
@@ -0,0 +1,142 @@
+#! /usr/bin/perl
+#
+# Written by Oron Peled <[e-mail]>
+# Copyright (C) 2012, Xorcom
+# This program is free software; you can redistribute and/or
+# modify it under the same terms as Perl itself.
+#
+#dahdi_sysfs_copy: Short perl script to copy dahdi related sysfs trees
+#                  into a designated directory.
+#
+# $Id: $
+#
+use strict;
+use warnings;
+
+use File::Path qw(mkpath);
+use File::Copy;
+use Cwd qw(realpath);
+
+my $destdir = shift || die "Usage: $0 <destdir>\n";
+
+my %symlinks;
+my %walk_ups;
+my %inode_cash;
+
+# Starting points for recursion
+my @toplevels = qw(
+	/sys/bus/dahdi_devices
+	/sys/bus/astribanks
+	/sys/class/dahdi
+	);
+
+# Loop prevention (by inode number lookup)
+sub seen {
+	my $ino = shift || die;
+	my $path = shift || die;
+	if(defined $inode_cash{$ino}) {
+		#print STDERR "DEBUG($ino): $path\n";
+		return 1;
+	}
+	$inode_cash{$ino}++;
+	return 0;
+}
+
+# Walk up a path and copy readable attributes from any
+# directory level.
+sub walk_up {
+	my $path = shift || die;
+	my $curr = $path;
+	# Walk up
+	for (my $curr = $path; $curr; $curr =~ s'/?[^/]+$'') {
+		my ($dev, $ino, $mode, $nlink, $uid, $gid) = lstat($curr);
+		next if seen($ino, $curr);	# Skip visited directories
+		# Scan directory
+		opendir(my $d, $curr) || die "Failed opendir($curr): $!\n";
+		my @entries = readdir $d;
+		foreach my $entry (@entries) {
+			next if $entry =~ /^[.][.]?$/;
+			my $file = "$curr/$entry";
+			my ($dev, $ino, $mode, $nlink, $uid, $gid) = lstat($file);
+			# Copy file
+			if (-f _ && ($mode & 0004)) {	# The '-r _' is buggy
+				copy($file, "$destdir$file") ||
+					die "Failed to copy '$file': $!\n";
+			}
+		}
+		closedir $d;
+	}
+}
+
+# Handle a given path (directory,symlink,regular-file)
+sub handle_path {
+	my $path = shift || die;
+	my ($dev, $ino, $mode, $nlink, $uid, $gid) = lstat($path);
+	# Save attributes before recursion starts
+	my $isdir = -d _;
+	my $islink = -l _;
+	my $isreadable = $mode & 00004;	# The '-r _' was buggy
+	return if seen($ino, $path);	# Loop prevention
+	my $dest = "$destdir/$path";
+	if ($isdir) {
+		mkpath("$dest");
+		scan_directory($path);
+	} elsif ($islink) {
+		# We follow links (the seen() protect us from loops)
+		my $target = readlink($path) ||
+			die "Failed readlink($path): $!\n";
+		my $follow = $target;
+		if ($target !~ m{^/}) {	# fix relative symlinks
+			my $dir = $path;
+			$dir =~ s,/[^/]*$,,;
+			$follow = realpath("$dir/$target");
+		}
+		# Save symlink details, so we create them after all
+		# destination tree (subdirectories, files) is ready
+		die "Duplicate entry '$dest'\n" if exists $symlinks{$dest};
+		$symlinks{$dest} = "$target";
+		# Now follow symlink
+		handle_path($follow);
+		$walk_ups{$follow}++;
+	} elsif ($isreadable) {
+		copy($path, "$dest") ||
+			die "Failed to copy '$path': $!\n";
+	}
+}
+
+# Scan a given directory (calling handle_path for recursion)
+sub scan_directory {
+	my $dir = shift || die;
+	my $entry;
+	opendir(my $d, $dir) || die "Failed opendir($dir): $!\n";
+	my @dirs = readdir $d;
+	foreach my $entry (@dirs) {
+		next if $entry =~ /^[.][.]?$/;
+		handle_path("$dir/$entry");
+	}
+	closedir $d;
+}
+
+# Filter out non-existing toplevels
+my @scan = grep { lstat($_) } @toplevels;
+
+# Recurse all trees, creating subdirectories and copying files
+foreach my $path (@scan) {
+	handle_path($path);
+}
+
+# Now, that all sub-directories were created, we can
+# create the wanted symlinks
+for my $dest (keys %symlinks) {
+	my $link = $symlinks{$dest};
+	die "Missing link for '$dest'\n" unless defined $link;
+	unlink $dest if -l $dest;
+	symlink($link,$dest) ||
+		die "Failed symlink($link,$dest): $!\n";
+}
+
+# Walk up directories that were symlink destinations
+# and fill their attributes
+foreach my $dir (keys %walk_ups) {
+	walk_up($dir);
+}
 
=== modified file 'build_tools/dump_sys_state'
--- build_tools/dump_sys_state	2011-03-13 23:45:36 +0000
+++ build_tools/dump_sys_state	2013-08-25 04:54:26 +0000
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # dump_sys_state: dump some /sys and /proc files to a directory.
-# $Id: dump_sys_state 8211 2010-03-02 14:55:22Z tzafrir $
+# $Id$
 #
 # Written by Tzafrir Cohen <[e-mail]>
 # Copyright (C) 2009, Xorcom
@@ -31,117 +31,46 @@
 #  # And then later:
 #  DAHDI_VIRT_TOP="$PWD/my_sys_state" dahdi_genconf
 
-name=dahdi_sys_state_dump
-
-usage() {
-  echo "$0: dump system data for Dahdi-Perl"
-  echo "Usage: $0 [<name>]]"
-  echo ""
-  echo "<name>: name of directory/tarball to create. Default: $name"
-}
-
-output_tar() {
-  gzip -9 >$name.tar.gz
-}
-
-output_cpio() {
-  gzip -9 >$name.cpio.gz
-}
-
-output_dir() {
-  rm -rf $name
-  mkdir -p $name
-  cd $name
-  #tar xf -
-  cpio -id
-}
+mydir=`dirname $0`
+dahdi_sysfs_copy="$mydir/dahdi_sysfs_copy"
 
 # Give usage message on expected texts
-case $1 in 
-  help | -* ) usage; exit 1;;
-esac
-
-if [ "$1" != '' ]; then
-  name="$1"
-fi
-
-# funky permissions on procfs. Sadly rm -f does not kill them.
-if [ -d "$name" ]; then
-  chmod -R u+w "$name"
-fi
-rm -rf "$name"
-mkdir -p "$name"
-
-# delete a (potentially empty) list of files
-rm_files() {
-	xargs rm -f rm_files_non_existing_file
-}
+
+if [ "$#" -ne 0 ]; then
+	echo >&2 "Usage: $0"
+	exit 1
+fi
+
+id="sys_dump.`hostname`_`date +%F_%H.%M.%S`"
+tarball="$id.tar.gz"
+
+tmpdir=`mktemp -td 'dahdi_dump.XXXXXX'`
+echo -n >&2 "Creating ... "
+trap "[ -d '$tmpdir' ] && rm -rf '$tmpdir'" 0 1 2 15
+
+topdir="$tmpdir/$id"
 
 if [ -r /proc/bus/usb/devices ]; then
-	mkdir -p "$name/proc/bus/usb"
-	cp -a /proc/bus/usb/devices "$name/proc/bus/usb/"
+	mkdir -p "$topdir/proc/bus/usb"
+	cp -a /proc/bus/usb/devices "$topdir/proc/bus/usb/"
 fi
 
 if [ -d /proc/dahdi ]; then
-	mkdir -p "$name/proc/dahdi"
+	mkdir -p "$topdir/proc/dahdi"
 	if find /proc/dahdi -type f >/dev/null; then
-		cp -a /proc/dahdi/* "$name/proc/dahdi/" 
+		cp -a /proc/dahdi/* "$topdir/proc/dahdi/"
 	fi
 fi
 
 if [ -d /proc/xpp ]; then
-	mkdir -p "$name/proc/xpp"
+	mkdir -p "$topdir/proc/xpp"
 	if find /proc/xpp -type f >/dev/null; then
-		cp -a /proc/xpp/* "$name/proc/xpp/" 
-		find "$name/proc/xpp" -type f -name command | rm_files
+		cp -a /proc/xpp/* "$topdir/proc/xpp/"
+		find "$topdir/proc/xpp" -type f -name command -exec rm -f '{}' ';'
 	fi
 fi
 
-# FIXME: the following grab tons of files from sysfs. Any way to do with
-# less information?
-pci_dev_pat='/sys/devices/pci*'
-mkdir -p "$name/sys/devices"
-cp -a $pci_dev_pat "$name/sys/devices/" 2>/dev/null
-
-for bus in astribanks xpds pci pci_express usb; do
-	if [ -d /sys/bus/$bus ]; then
-		mkdir -p "$name/sys/bus/"
-		cp -a /sys/bus/$bus "$name/sys/bus/" 2>/dev/null
-	fi
-done
-
-# Remove PCI devices of irelevan classes:
-irrelevant_devs() {
-	grep . "$name"/$pci_dev_pat/0*/class "$name"/$pci_dev_pat/0*/0*/class \
-	| perl -n -e '# Perl provides commented regexes:
-		next unless m{/class:( # The following is a list of device classes
-			# that can be safely removed:
-			0x060000 | # Host bridge
-			0x030000 | # VGA compatible controller
-			0x038000 | # Display controller
-			0x040300 | # Audio device
-			0x060401 | # PCI bridge
-			0x060100 | # ISA bridge
-			0x01018a | # IDE interface
-			0x01018f | # IDE interface
-			0x0c0500 | # SMBus
-			0x060700 | # CardBus bridge
-			0x0c0010 | # FireWire (IEEE 1394)
-			# The following are not to be removed:
-			#0x0c0300 | # USB Controller (UHCI?)
-			#0x060400 | # PCI bridge
-			#0x0c0320 | # USB Controller (EHCI?)
-			#0x020000 | # Ethernet controller
-			#0x0c0010 | # Network controller: (Wifi?)
-		)$}x;
-		# Leave out just the name of the node:
-		s{/[^/]*$}{};
-		print;
-		print "\n"
-	'
-}
-
-# FIXME: deleting those seems to remove common 'vendor' directories
-# and mess things up. Skip it for now.
-#rm -rf `irrelevant_devs`
-
+"$dahdi_sysfs_copy" "$topdir"
+echo -n >&2 "tarball ... "
+( cd "$tmpdir" && tar czf - . ) > "$tarball";
+echo >&2 "ready in '$tarball'"
 
=== modified file 'build_tools/make_tree'
--- build_tools/make_tree	2009-06-01 08:23:38 +0000
+++ build_tools/make_tree	2013-08-25 04:54:26 +0000
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-echo "<?xml version=\"1.0\"?>"
-echo
-echo "<menu name=\"DAHDI Tools Selection\">"
-cat dahdi.xml
-echo "</menu>"
 
=== modified file 'build_tools/menuselect-deps.in'
--- build_tools/menuselect-deps.in	2009-06-01 08:23:38 +0000
+++ build_tools/menuselect-deps.in	2013-08-25 04:54:26 +0000
@@ -1,2 +0,0 @@
-LIBNEWT=@PBX_NEWT@
-HDLC=@PBX_HDLC@
 
=== modified file 'configure'
--- configure	2011-03-13 23:45:36 +0000
+++ configure	2013-08-25 04:54:26 +0000
@@ -1,12 +1,10 @@
 #! /bin/sh
-# From configure.ac Revision: 8266 .
+# From configure.ac Revision.
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.67.
-#
-#
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
-# Foundation, Inc.
+# Generated by GNU Autoconf 2.69.
+#
+#
+# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
 #
 #
 # This configure script is free software; the Free Software Foundation
@@ -92,6 +90,7 @@
 IFS=" ""	$as_nl"
 
 # Find who we are.  Look in the path if we contain no directory separator.
+as_myself=
 case $0 in #((
   *[\\/]* ) as_myself=$0 ;;
   *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -136,6 +135,31 @@
 # CDPATH.
 (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 
+# Use a proper internal environment variable to ensure we don't fall
+  # into an infinite loop, continuously re-executing ourselves.
+  if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then
+    _as_can_reexec=no; export _as_can_reexec;
+    # We cannot yet assume a decent shell, so we have to provide a
+# neutralization value for shells without unset; and this also
+# works around shells that cannot unset nonexistent variables.
+# Preserve -v and -x to the replacement shell.
+BASH_ENV=/dev/null
+ENV=/dev/null
+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+case $- in # ((((
+  *v*x* | *x*v* ) as_opts=-vx ;;
+  *v* ) as_opts=-v ;;
+  *x* ) as_opts=-x ;;
+  * ) as_opts= ;;
+esac
+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+# Admittedly, this is quite paranoid, since all the known shells bail
+# out after a failed `exec'.
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+as_fn_exit 255
+  fi
+  # We don't want this to propagate to other subprocesses.
+          { _as_can_reexec=; unset _as_can_reexec;}
 if test "x$CONFIG_SHELL" = x; then
   as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
   emulate sh
@@ -169,7 +193,8 @@
 else
   exitcode=1; echo positional parameters were not saved.
 fi
-test x\$exitcode = x0 || exit 1"
+test x\$exitcode = x0 || exit 1
+test -x / || exit 1"
   as_suggested="  as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
   as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
   eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
@@ -214,14 +239,25 @@
 
 
       if test "x$CONFIG_SHELL" != x; then :
-  # We cannot yet assume a decent shell, so we have to provide a
-	# neutralization value for shells without unset; and this also
-	# works around shells that cannot unset nonexistent variables.
-	BASH_ENV=/dev/null
-	ENV=/dev/null
-	(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
-	export CONFIG_SHELL
-	exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
+  export CONFIG_SHELL
+             # We cannot yet assume a decent shell, so we have to provide a
+# neutralization value for shells without unset; and this also
+# works around shells that cannot unset nonexistent variables.
+# Preserve -v and -x to the replacement shell.
+BASH_ENV=/dev/null
+ENV=/dev/null
+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+case $- in # ((((
+  *v*x* | *x*v* ) as_opts=-vx ;;
+  *v* ) as_opts=-v ;;
+  *x* ) as_opts=-x ;;
+  * ) as_opts= ;;
+esac
+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+# Admittedly, this is quite paranoid, since all the known shells bail
+# out after a failed `exec'.
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+exit 255
 fi
 
     if test x$as_have_required = xno; then :
@@ -323,6 +359,14 @@
 
 
 } # as_fn_mkdir_p
+
+# as_fn_executable_p FILE
+# -----------------------
+# Test if FILE is an executable regular file.
+as_fn_executable_p ()
+{
+  test -f "$1" && test -x "$1"
+} # as_fn_executable_p
 # as_fn_append VAR VALUE
 # ----------------------
 # Append the text in VALUE to the end of the definition contained in VAR. Take
@@ -444,6 +488,10 @@
   chmod +x "$as_me.lineno" ||
     { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
 
+  # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
+  # already done that, so ensure we don't try to do so again and fall
+  # in an infinite loop.  This has already happened in practice.
+  _as_can_reexec=no; export _as_can_reexec
   # Don't try to exec as it changes $[0], causing all sort of problems
   # (the dirname of $[0] is not the place where we might find the
   # original and so on.  Autoconf is especially sensitive to this).
@@ -478,16 +526,16 @@
     # ... but there are two gotchas:
     # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
     # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-    # In both cases, we have to default to `cp -p'.
+    # In both cases, we have to default to `cp -pR'.
     ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-      as_ln_s='cp -p'
+      as_ln_s='cp -pR'
   elif ln conf$$.file conf$$ 2>/dev/null; then
     as_ln_s=ln
   else
-    as_ln_s='cp -p'
+    as_ln_s='cp -pR'
   fi
 else
-  as_ln_s='cp -p'
+  as_ln_s='cp -pR'
 fi
 rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
 rmdir conf$$.dir 2>/dev/null
@@ -499,28 +547,8 @@
   as_mkdir_p=false
 fi
 
-if test -x / >/dev/null 2>&1; then
-  as_test_x='test -x'
-else
-  if ls -dL / >/dev/null 2>&1; then
-    as_ls_L_option=L
-  else
-    as_ls_L_option=
-  fi
-  as_test_x='
-    eval sh -c '\''
-      if test -d "$1"; then
-	test -d "$1/.";
-      else
-	case $1 in #(
-	-*)set "./$1";;
-	esac;
-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
-	???[sx]*):;;*)false;;esac;fi
-    '\'' sh
-  '
-fi
-as_executable_p=$as_test_x
+as_test_x='test -x'
+as_executable_p=as_fn_executable_p
 
 # Sed expression to map a string onto a valid CPP name.
 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@ -615,6 +643,7 @@
 DAHDI_INCLUDE
 DAHDI_LIB
 DAHDI_DECLARATION_AFTER_STATEMENT
+DAHDI_PINNED
 DAHDI_DEVMODE
 DOWNLOAD
 FETCH
@@ -681,6 +710,7 @@
 ac_user_opts='
 enable_option_checking
 enable_dev_mode
+enable_pinned
 with_dahdi
 with_newt
 with_usb
@@ -1100,7 +1130,7 @@
     $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
     expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
       $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
-    : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
+    : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}"
     ;;
 
   esac
@@ -1151,8 +1181,6 @@
 if test "x$host_alias" != x; then
   if test "x$build_alias" = x; then
     cross_compiling=maybe
-    $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.
-    If a cross compiler is detected then cross compile mode will be used" >&2
   elif test "x$build_alias" != "x$host_alias"; then
     cross_compiling=yes
   fi
@@ -1306,6 +1334,7 @@
   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
   --enable-dev-mode    Turn on developer mode
+  --enable-pinned    Install pinned-spans support
 
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
@@ -1393,9 +1422,9 @@
 if $ac_init_version; then
   cat <<\_ACEOF
 configure
-generated by GNU Autoconf 2.67
+generated by GNU Autoconf 2.69
 
-Copyright (C) 2010 Free Software Foundation, Inc.
+Copyright (C) 2012 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
 
@@ -1441,7 +1470,7 @@
 
 	ac_retval=1
 fi
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
   as_fn_set_status $ac_retval
 
 } # ac_fn_c_try_compile
@@ -1478,7 +1507,7 @@
 
     ac_retval=1
 fi
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
   as_fn_set_status $ac_retval
 
 } # ac_fn_c_try_cpp
@@ -1491,10 +1520,10 @@
 ac_fn_c_check_header_mongrel ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  if eval "test \"\${$3+set}\"" = set; then :
+  if eval \${$3+:} false; then :
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
-if eval "test \"\${$3+set}\"" = set; then :
+if eval \${$3+:} false; then :
   $as_echo_n "(cached) " >&6
 fi
 eval ac_res=\$$3
@@ -1557,7 +1586,7 @@
 esac
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
-if eval "test \"\${$3+set}\"" = set; then :
+if eval \${$3+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   eval "$3=\$ac_header_compiler"
@@ -1566,7 +1595,7 @@
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
 fi
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } # ac_fn_c_check_header_mongrel
 
@@ -1607,7 +1636,7 @@
        ac_retval=$ac_status
 fi
   rm -rf conftest.dSYM conftest_ipa8_conftest.oo
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
   as_fn_set_status $ac_retval
 
 } # ac_fn_c_try_run
@@ -1621,7 +1650,7 @@
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
-if eval "test \"\${$3+set}\"" = set; then :
+if eval \${$3+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -1639,7 +1668,7 @@
 eval ac_res=\$$3
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } # ac_fn_c_check_header_compile
 
@@ -1670,7 +1699,7 @@
 	 test ! -s conftest.err
        } && test -s conftest$ac_exeext && {
 	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
+	 test -x conftest$ac_exeext
        }; then :
   ac_retval=0
 else
@@ -1684,7 +1713,7 @@
   # interfere with the next link command; also delete a directory that is
   # left behind by Apple's compiler.  We do this before executing the actions.
   rm -rf conftest.dSYM conftest_ipa8_conftest.oo
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
   as_fn_set_status $ac_retval
 
 } # ac_fn_c_try_link
@@ -1697,7 +1726,7 @@
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
-if eval "test \"\${$3+set}\"" = set; then :
+if eval \${$3+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -1752,7 +1781,7 @@
 eval ac_res=\$$3
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } # ac_fn_c_check_func
 cat >config.log <<_ACEOF
@@ -1760,7 +1789,7 @@
 running configure, to aid debugging if configure makes a mistake.
 
 It was created by $as_me, which was
-generated by GNU Autoconf 2.67.  Invocation command line was
+generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
 
@@ -2018,7 +2047,7 @@
       || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "failed to load site script $ac_site_file
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
   fi
 done
 
@@ -2141,7 +2170,7 @@
 set dummy ${ac_tool_prefix}gcc; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
+if ${ac_cv_prog_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
@@ -2153,7 +2182,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="${ac_tool_prefix}gcc"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -2181,7 +2210,7 @@
 set dummy gcc; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
+if ${ac_cv_prog_ac_ct_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_CC"; then
@@ -2193,7 +2222,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_CC="gcc"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -2234,7 +2263,7 @@
 set dummy ${ac_tool_prefix}cc; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
+if ${ac_cv_prog_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
@@ -2246,7 +2275,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="${ac_tool_prefix}cc"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -2274,7 +2303,7 @@
 set dummy cc; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
+if ${ac_cv_prog_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
@@ -2287,7 +2316,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
        ac_prog_rejected=yes
        continue
@@ -2333,7 +2362,7 @@
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
+if ${ac_cv_prog_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
@@ -2345,7 +2374,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -2377,7 +2406,7 @@
 set dummy $ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
+if ${ac_cv_prog_ac_ct_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_CC"; then
@@ -2389,7 +2418,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_CC="$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -2432,7 +2461,7 @@
 test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "no acceptable C compiler found in \$PATH
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
 
 # Provide some information about the compiler.
 $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
@@ -2547,7 +2576,7 @@
 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error 77 "C compiler cannot create executables
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
@@ -2590,7 +2619,7 @@
   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
 fi
 rm -f conftest conftest$ac_cv_exeext
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
@@ -2649,7 +2678,7 @@
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "cannot run C compiled programs.
 If you meant to cross compile, use \`--host'.
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
     fi
   fi
 fi
@@ -2660,7 +2689,7 @@
 ac_clean_files=$ac_clean_files_save
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
 $as_echo_n "checking for suffix of object files... " >&6; }
-if test "${ac_cv_objext+set}" = set; then :
+if ${ac_cv_objext+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -2701,7 +2730,7 @@
 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "cannot compute suffix of object files: cannot compile
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
 fi
 rm -f conftest.$ac_cv_objext conftest.$ac_ext
 fi
@@ -2711,7 +2740,7 @@
 ac_objext=$OBJEXT
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
 $as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
-if test "${ac_cv_c_compiler_gnu+set}" = set; then :
+if ${ac_cv_c_compiler_gnu+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -2748,7 +2777,7 @@
 ac_save_CFLAGS=$CFLAGS
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
 $as_echo_n "checking whether $CC accepts -g... " >&6; }
-if test "${ac_cv_prog_cc_g+set}" = set; then :
+if ${ac_cv_prog_cc_g+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_save_c_werror_flag=$ac_c_werror_flag
@@ -2826,7 +2855,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
 $as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
-if test "${ac_cv_prog_cc_c89+set}" = set; then :
+if ${ac_cv_prog_cc_c89+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_cv_prog_cc_c89=no
@@ -2835,8 +2864,7 @@
 /* end confdefs.h.  */
 #include <stdarg.h>
 #include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
+struct stat;
 /* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
 struct buf { int x; };
 FILE * (*rcsopen) (struct buf *, struct stat *, int);
@@ -2934,7 +2962,7 @@
   CPP=
 fi
 if test -z "$CPP"; then
-  if test "${ac_cv_prog_CPP+set}" = set; then :
+  if ${ac_cv_prog_CPP+:} false; then :
   $as_echo_n "(cached) " >&6
 else
       # Double quotes because CPP needs to be expanded
@@ -3050,7 +3078,7 @@
   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
 fi
 
 ac_ext=c
@@ -3062,7 +3090,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
 $as_echo_n "checking for grep that handles long lines and -e... " >&6; }
-if test "${ac_cv_path_GREP+set}" = set; then :
+if ${ac_cv_path_GREP+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -z "$GREP"; then
@@ -3076,7 +3104,7 @@
     for ac_prog in grep ggrep; do
     for ac_exec_ext in '' $ac_executable_extensions; do
       ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
-      { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
+      as_fn_executable_p "$ac_path_GREP" || continue
 # Check for GNU ac_path_GREP and select it if it is found.
   # Check for GNU $ac_path_GREP
 case `"$ac_path_GREP" --version 2>&1` in
@@ -3125,7 +3153,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
 $as_echo_n "checking for egrep... " >&6; }
-if test "${ac_cv_path_EGREP+set}" = set; then :
+if ${ac_cv_path_EGREP+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
@@ -3142,7 +3170,7 @@
     for ac_prog in egrep; do
     for ac_exec_ext in '' $ac_executable_extensions; do
       ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
-      { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
+      as_fn_executable_p "$ac_path_EGREP" || continue
 # Check for GNU ac_path_EGREP and select it if it is found.
   # Check for GNU $ac_path_EGREP
 case `"$ac_path_EGREP" --version 2>&1` in
@@ -3192,7 +3220,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
 $as_echo_n "checking for ANSI C header files... " >&6; }
-if test "${ac_cv_header_stdc+set}" = set; then :
+if ${ac_cv_header_stdc+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -3321,7 +3349,7 @@
 
 
   ac_fn_c_check_header_mongrel "$LINENO" "minix/config.h" "ac_cv_header_minix_config_h" "$ac_includes_default"
-if test "x$ac_cv_header_minix_config_h" = x""yes; then :
+if test "x$ac_cv_header_minix_config_h" = xyes; then :
   MINIX=yes
 else
   MINIX=
@@ -3343,14 +3371,14 @@
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether it is safe to define __EXTENSIONS__" >&5
 $as_echo_n "checking whether it is safe to define __EXTENSIONS__... " >&6; }
-if test "${ac_cv_safe_to_define___extensions__+set}" = set; then :
+if ${ac_cv_safe_to_define___extensions__+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
-#	  define __EXTENSIONS__ 1
-	  $ac_includes_default
+#         define __EXTENSIONS__ 1
+          $ac_includes_default
 int
 main ()
 {
@@ -3401,7 +3429,7 @@
 set dummy ${ac_tool_prefix}ld; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_LD+set}" = set; then :
+if ${ac_cv_prog_LD+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$LD"; then
@@ -3413,7 +3441,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_LD="${ac_tool_prefix}ld"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -3441,7 +3469,7 @@
 set dummy ld; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_LD+set}" = set; then :
+if ${ac_cv_prog_ac_ct_LD+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_LD"; then
@@ -3453,7 +3481,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_LD="ld"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -3500,7 +3528,7 @@
 set dummy ${ac_tool_prefix}gcc; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
+if ${ac_cv_prog_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
@@ -3512,7 +3540,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="${ac_tool_prefix}gcc"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -3540,7 +3568,7 @@
 set dummy gcc; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
+if ${ac_cv_prog_ac_ct_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_CC"; then
@@ -3552,7 +3580,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_CC="gcc"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -3593,7 +3621,7 @@
 set dummy ${ac_tool_prefix}cc; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
+if ${ac_cv_prog_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
@@ -3605,7 +3633,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="${ac_tool_prefix}cc"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -3633,7 +3661,7 @@
 set dummy cc; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
+if ${ac_cv_prog_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
@@ -3646,7 +3674,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
        ac_prog_rejected=yes
        continue
@@ -3692,7 +3720,7 @@
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
+if ${ac_cv_prog_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
@@ -3704,7 +3732,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -3736,7 +3764,7 @@
 set dummy $ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
+if ${ac_cv_prog_ac_ct_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_CC"; then
@@ -3748,7 +3776,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_CC="$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -3791,7 +3819,7 @@
 test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "no acceptable C compiler found in \$PATH
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
 
 # Provide some information about the compiler.
 $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
@@ -3820,7 +3848,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
 $as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
-if test "${ac_cv_c_compiler_gnu+set}" = set; then :
+if ${ac_cv_c_compiler_gnu+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -3857,7 +3885,7 @@
 ac_save_CFLAGS=$CFLAGS
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
 $as_echo_n "checking whether $CC accepts -g... " >&6; }
-if test "${ac_cv_prog_cc_g+set}" = set; then :
+if ${ac_cv_prog_cc_g+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_save_c_werror_flag=$ac_c_werror_flag
@@ -3935,7 +3963,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
 $as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
-if test "${ac_cv_prog_cc_c89+set}" = set; then :
+if ${ac_cv_prog_cc_c89+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_cv_prog_cc_c89=no
@@ -3944,8 +3972,7 @@
 /* end confdefs.h.  */
 #include <stdarg.h>
 #include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
+struct stat;
 /* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
 struct buf { int x; };
 FILE * (*rcsopen) (struct buf *, struct stat *, int);
@@ -4042,7 +4069,7 @@
   CPP=
 fi
 if test -z "$CPP"; then
-  if test "${ac_cv_prog_CPP+set}" = set; then :
+  if ${ac_cv_prog_CPP+:} false; then :
   $as_echo_n "(cached) " >&6
 else
       # Double quotes because CPP needs to be expanded
@@ -4158,7 +4185,7 @@
   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
 fi
 
 ac_ext=c
@@ -4213,7 +4240,7 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
 $as_echo_n "checking for a BSD-compatible install... " >&6; }
 if test -z "$INSTALL"; then
-if test "${ac_cv_path_install+set}" = set; then :
+if ${ac_cv_path_install+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -4233,7 +4260,7 @@
     # by default.
     for ac_prog in ginstall scoinst install; do
       for ac_exec_ext in '' $ac_executable_extensions; do
-	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
+	if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
 	  if test $ac_prog = install &&
 	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
 	    # AIX install.  It has an incompatible calling convention.
@@ -4302,7 +4329,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU make" >&5
 $as_echo_n "checking for GNU make... " >&6; }
-if test "${ac_cv_GNU_MAKE+set}" = set; then :
+if ${ac_cv_GNU_MAKE+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_cv_GNU_MAKE='Not Found' ;
@@ -4348,7 +4375,7 @@
 set dummy grep; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_GREP+set}" = set; then :
+if ${ac_cv_path_GREP+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case $GREP in
@@ -4362,7 +4389,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_GREP="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -4389,7 +4416,7 @@
 set dummy sh; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_SHELL+set}" = set; then :
+if ${ac_cv_path_SHELL+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case $SHELL in
@@ -4403,7 +4430,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_SHELL="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -4430,7 +4457,7 @@
 set dummy ln; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_LN+set}" = set; then :
+if ${ac_cv_path_LN+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case $LN in
@@ -4444,7 +4471,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_LN="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -4472,7 +4499,7 @@
 set dummy wget; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_WGET+set}" = set; then :
+if ${ac_cv_path_WGET+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case $WGET in
@@ -4486,7 +4513,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_WGET="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -4516,7 +4543,7 @@
 set dummy fetch; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_FETCH+set}" = set; then :
+if ${ac_cv_path_FETCH+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case $FETCH in
@@ -4530,7 +4557,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_FETCH="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -4569,7 +4596,18 @@
   enableval=$enable_dev_mode; case "${enableval}" in
 	      y|ye|yes) DAHDI_DEVMODE=yes ;;
 	      n|no)  DAHDI_DEVMODE=no ;;
-	      *) as_fn_error $? "bad value ${enableval} for --enable-dev-mode" "$LINENO" 5   ;;
+	      *) as_fn_error $? "bad value ${enableval} for --enable-dev-mode" "$LINENO" 5  ;;
+	esac
+fi
+
+
+
+# Check whether --enable-pinned was given.
+if test "${enable_pinned+set}" = set; then :
+  enableval=$enable_pinned; case "${enableval}" in
+	      y|ye|yes) DAHDI_PINNED=yes ;;
+	      n|no)  DAHDI_PINNED=no ;;
+	      *) as_fn_error $? "bad value ${enableval} for --enable-pinned" "$LINENO" 5  ;;
 	esac
 fi
 
@@ -4788,7 +4826,7 @@
       as_ac_Lib=`$as_echo "ac_cv_lib_newt_${pbxfuncname}" | $as_tr_sh`
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lnewt" >&5
 $as_echo_n "checking for ${pbxfuncname} in -lnewt... " >&6; }
-if eval "test \"\${$as_ac_Lib+set}\"" = set; then :
+if eval \${$as_ac_Lib+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -4845,7 +4883,7 @@
          saved_cppflags="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${NEWT_INCLUDE} "
 	 ac_fn_c_check_header_mongrel "$LINENO" "newt.h" "ac_cv_header_newt_h" "$ac_includes_default"
-if test "x$ac_cv_header_newt_h" = x""yes; then :
+if test "x$ac_cv_header_newt_h" = xyes; then :
   NEWT_HEADER_FOUND=1
 else
   NEWT_HEADER_FOUND=0
@@ -4895,7 +4933,7 @@
       as_ac_Lib=`$as_echo "ac_cv_lib_usb_${pbxfuncname}" | $as_tr_sh`
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lusb" >&5
 $as_echo_n "checking for ${pbxfuncname} in -lusb... " >&6; }
-if eval "test \"\${$as_ac_Lib+set}\"" = set; then :
+if eval \${$as_ac_Lib+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -4952,7 +4990,7 @@
          saved_cppflags="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${USB_INCLUDE} "
 	 ac_fn_c_check_header_mongrel "$LINENO" "usb.h" "ac_cv_header_usb_h" "$ac_includes_default"
-if test "x$ac_cv_header_usb_h" = x""yes; then :
+if test "x$ac_cv_header_usb_h" = xyes; then :
   USB_HEADER_FOUND=1
 else
   USB_HEADER_FOUND=0
@@ -4988,7 +5026,7 @@
 for ac_func in semtimedop
 do :
   ac_fn_c_check_func "$LINENO" "semtimedop" "ac_cv_func_semtimedop"
-if test "x$ac_cv_func_semtimedop" = x""yes; then :
+if test "x$ac_cv_func_semtimedop" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_SEMTIMEDOP 1
 _ACEOF
@@ -5153,7 +5191,7 @@
 
 
 
-ac_config_files="$ac_config_files build_tools/menuselect-deps makeopts"
+ac_config_files="$ac_config_files makeopts"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -5219,10 +5257,21 @@
      :end' >>confcache
 if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
   if test -w "$cache_file"; then
-    test "x$cache_file" != "x/dev/null" &&
+    if test "x$cache_file" != "x/dev/null"; then
       { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
 $as_echo "$as_me: updating cache $cache_file" >&6;}
-    cat confcache >$cache_file
+      if test ! -f "$cache_file" || test -h "$cache_file"; then
+	cat confcache >"$cache_file"
+      else
+        case $cache_file in #(
+        */* | ?:*)
+	  mv -f confcache "$cache_file"$$ &&
+	  mv -f "$cache_file"$$ "$cache_file" ;; #(
+        *)
+	  mv -f confcache "$cache_file" ;;
+	esac
+      fi
+    fi
   else
     { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
 $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
@@ -5254,7 +5303,7 @@
 
 
 
-: ${CONFIG_STATUS=./config.status}
+: "${CONFIG_STATUS=./config.status}"
 ac_write_fail=0
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
@@ -5355,6 +5404,7 @@
 IFS=" ""	$as_nl"
 
 # Find who we are.  Look in the path if we contain no directory separator.
+as_myself=
 case $0 in #((
   *[\\/]* ) as_myself=$0 ;;
   *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -5550,16 +5600,16 @@
     # ... but there are two gotchas:
     # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
     # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-    # In both cases, we have to default to `cp -p'.
+    # In both cases, we have to default to `cp -pR'.
     ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-      as_ln_s='cp -p'
+      as_ln_s='cp -pR'
   elif ln conf$$.file conf$$ 2>/dev/null; then
     as_ln_s=ln
   else
-    as_ln_s='cp -p'
+    as_ln_s='cp -pR'
   fi
 else
-  as_ln_s='cp -p'
+  as_ln_s='cp -pR'
 fi
 rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
 rmdir conf$$.dir 2>/dev/null
@@ -5619,28 +5669,16 @@
   as_mkdir_p=false
 fi
 
-if test -x / >/dev/null 2>&1; then
-  as_test_x='test -x'
-else
-  if ls -dL / >/dev/null 2>&1; then
-    as_ls_L_option=L
-  else
-    as_ls_L_option=
-  fi
-  as_test_x='
-    eval sh -c '\''
-      if test -d "$1"; then
-	test -d "$1/.";
-      else
-	case $1 in #(
-	-*)set "./$1";;
-	esac;
-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
-	???[sx]*):;;*)false;;esac;fi
-    '\'' sh
-  '
-fi
-as_executable_p=$as_test_x
+
+# as_fn_executable_p FILE
+# -----------------------
+# Test if FILE is an executable regular file.
+as_fn_executable_p ()
+{
+  test -f "$1" && test -x "$1"
+} # as_fn_executable_p
+as_test_x='test -x'
+as_executable_p=as_fn_executable_p
 
 # Sed expression to map a string onto a valid CPP name.
 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@ -5662,7 +5700,7 @@
 # values after options handling.
 ac_log="
 This file was extended by $as_me, which was
-generated by GNU Autoconf 2.67.  Invocation command line was
+generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -5724,10 +5762,10 @@
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
 config.status
-configured by $0, generated by GNU Autoconf 2.67,
+configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
-Copyright (C) 2010 Free Software Foundation, Inc.
+Copyright (C) 2012 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
 
@@ -5816,7 +5854,7 @@
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 if \$ac_cs_recheck; then
-  set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+  set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
   shift
   \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
   CONFIG_SHELL='$SHELL'
@@ -5846,10 +5884,9 @@
 do
   case $ac_config_target in
     "autoconfig.h") CONFIG_HEADERS="$CONFIG_HEADERS autoconfig.h" ;;
-    "build_tools/menuselect-deps") CONFIG_FILES="$CONFIG_FILES build_tools/menuselect-deps" ;;
     "makeopts") CONFIG_FILES="$CONFIG_FILES makeopts" ;;
 
-  *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;;
+  *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
   esac
 done
 
@@ -5871,9 +5908,10 @@
 # after its creation but before its name has been assigned to `$tmp'.
 $debug ||
 {
-  tmp=
+  tmp= ac_tmp=
   trap 'exit_status=$?
-  { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
+  : "${ac_tmp:=$tmp}"
+  { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status
 ' 0
   trap 'as_fn_exit 1' 1 2 13 15
 }
@@ -5881,12 +5919,13 @@
 
 {
   tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
-  test -n "$tmp" && test -d "$tmp"
+  test -d "$tmp"
 }  ||
 {
   tmp=./conf$$-$RANDOM
   (umask 077 && mkdir "$tmp")
 } || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
+ac_tmp=$tmp
 
 # Set up the scripts for CONFIG_FILES section.
 # No need to generate them if there are no CONFIG_FILES.
@@ -5908,7 +5947,7 @@
   ac_cs_awk_cr=$ac_cr
 fi
 
-echo 'BEGIN {' >"$tmp/subs1.awk" &&
+echo 'BEGIN {' >"$ac_tmp/subs1.awk" &&
 _ACEOF
 
 
@@ -5936,7 +5975,7 @@
 rm -f conf$$subs.sh
 
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&
+cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK &&
 _ACEOF
 sed -n '
 h
@@ -5984,7 +6023,7 @@
 rm -f conf$$subs.awk
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 _ACAWK
-cat >>"\$tmp/subs1.awk" <<_ACAWK &&
+cat >>"\$ac_tmp/subs1.awk" <<_ACAWK &&
   for (key in S) S_is_set[key] = 1
   FS = ""
 
@@ -6016,7 +6055,7 @@
   sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
 else
   cat
-fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
+fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \
   || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
 _ACEOF
 
@@ -6050,7 +6089,7 @@
 # No need to generate them if there are no CONFIG_HEADERS.
 # This happens for instance with `./config.status Makefile'.
 if test -n "$CONFIG_HEADERS"; then
-cat >"$tmp/defines.awk" <<\_ACAWK ||
+cat >"$ac_tmp/defines.awk" <<\_ACAWK ||
 BEGIN {
 _ACEOF
 
@@ -6062,8 +6101,8 @@
 # handling of long lines.
 ac_delim='%!_!# '
 for ac_last_try in false false :; do
-  ac_t=`sed -n "/$ac_delim/p" confdefs.h`
-  if test -z "$ac_t"; then
+  ac_tt=`sed -n "/$ac_delim/p" confdefs.h`
+  if test -z "$ac_tt"; then
     break
   elif $ac_last_try; then
     as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5
@@ -6164,7 +6203,7 @@
   esac
   case $ac_mode$ac_tag in
   :[FHL]*:*);;
-  :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;;
+  :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;;
   :[FH]-) ac_tag=-:-;;
   :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
   esac
@@ -6183,7 +6222,7 @@
     for ac_f
     do
       case $ac_f in
-      -) ac_f="$tmp/stdin";;
+      -) ac_f="$ac_tmp/stdin";;
       *) # Look for the file first in the build tree, then in the source tree
 	 # (if the path is not absolute).  The absolute path cannot be DOS-style,
 	 # because $ac_f cannot contain `:'.
@@ -6192,7 +6231,7 @@
 	   [\\/$]*) false;;
 	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
 	   esac ||
-	   as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5 ;;
+	   as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;
       esac
       case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
       as_fn_append ac_file_inputs " '$ac_f'"
@@ -6218,8 +6257,8 @@
     esac
 
     case $ac_tag in
-    *:-:* | *:-) cat >"$tmp/stdin" \
-      || as_fn_error $? "could not create $ac_file" "$LINENO" 5  ;;
+    *:-:* | *:-) cat >"$ac_tmp/stdin" \
+      || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
     esac
     ;;
   esac
@@ -6349,21 +6388,22 @@
 s&@INSTALL@&$ac_INSTALL&;t t
 $ac_datarootdir_hack
 "
-eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
-  || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \
+  >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5
 
 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
-  { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
-  { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
+  { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } &&
+  { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' \
+      "$ac_tmp/out"`; test -z "$ac_out"; } &&
   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
 which seems to be undefined.  Please make sure it is defined" >&5
 $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
 which seems to be undefined.  Please make sure it is defined" >&2;}
 
-  rm -f "$tmp/stdin"
+  rm -f "$ac_tmp/stdin"
   case $ac_file in
-  -) cat "$tmp/out" && rm -f "$tmp/out";;
-  *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
+  -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";;
+  *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";;
   esac \
   || as_fn_error $? "could not create $ac_file" "$LINENO" 5
  ;;
@@ -6374,20 +6414,20 @@
   if test x"$ac_file" != x-; then
     {
       $as_echo "/* $configure_input  */" \
-      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
-    } >"$tmp/config.h" \
+      && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs"
+    } >"$ac_tmp/config.h" \
       || as_fn_error $? "could not create $ac_file" "$LINENO" 5
-    if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
+    if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then
       { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
 $as_echo "$as_me: $ac_file is unchanged" >&6;}
     else
       rm -f "$ac_file"
-      mv "$tmp/config.h" "$ac_file" \
+      mv "$ac_tmp/config.h" "$ac_file" \
 	|| as_fn_error $? "could not create $ac_file" "$LINENO" 5
     fi
   else
     $as_echo "/* $configure_input  */" \
-      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
+      && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \
       || as_fn_error $? "could not create -" "$LINENO" 5
   fi
  ;;
 
=== modified file 'configure.ac'
--- configure.ac	2011-03-13 23:45:36 +0000
+++ configure.ac	2013-08-25 04:54:26 +0000
@@ -12,7 +12,7 @@
 AC_CONFIG_SRCDIR([dahdi_cfg.c])
 
 AC_COPYRIGHT("dahdi-tools")
-AC_REVISION($Revision: 9736 $)
+AC_REVISION($Revision$)
 
 ac_default_prefix=/usr
 if test ${sysconfdir} = '${prefix}/etc'; then
@@ -79,6 +79,15 @@
 	esac])
 AC_SUBST(DAHDI_DEVMODE)
 
+AC_ARG_ENABLE(pinned,
+	[  --enable-pinned    Install pinned-spans support],
+	[case "${enableval}" in
+	      y|ye|yes) DAHDI_PINNED=yes ;;
+	      n|no)  DAHDI_PINNED=no ;;
+	      *) AC_MSG_ERROR(bad value ${enableval} for --enable-pinned)  ;;
+	esac])
+AC_SUBST(DAHDI_PINNED)
+
 AC_MSG_CHECKING(for -Wdeclaration-after-statement support)
 if $(${CC} -Wdeclaration-after-statement -S -o /dev/null -xc /dev/null > /dev/null 2>&1); then
 	AC_MSG_RESULT(yes)
@@ -211,7 +220,7 @@
 
 AC_SUBST(PPPD_VERSION)
 
-AC_CONFIG_FILES([build_tools/menuselect-deps makeopts])
+AC_CONFIG_FILES([makeopts])
 AC_OUTPUT
 
 AC_MSG_NOTICE(*** dahdi-tools build successfully configured ***)
 
=== removed file 'dahdi-tools-2.4.1-summary.html'
--- dahdi-tools-2.4.1-summary.html	2011-03-13 23:45:36 +0000
+++ dahdi-tools-2.4.1-summary.html	1970-01-01 00:00:00 +0000
@@ -1,82 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /><title>Release Summary - dahdi-tools-2.4.1</title></head>
-<body>
-<h1 align="center"><a name="top">Release Summary</a></h1>
-<h3 align="center">dahdi-tools-2.4.1</h3>
-<h3 align="center">Date: 2011-03-03</h3>
-<h3 align="center">&lt;[e-mail]&gt;</h3>
-<hr/>
-<h2 align="center">Table of Contents</h2>
-<ol>
-   <li><a href="#summary">Summary</a></li>
-   <li><a href="#contributors">Contributors</a></li>
-   <li><a href="#issues">Closed Issues</a></li>
-   <li><a href="#commits">Other Changes</a></li>
-   <li><a href="#diffstat">Diffstat</a></li>
-</ol>
-<hr/>
-<a name="summary"><h2 align="center">Summary</h2></a>
-<center><a href="#top">[Back to Top]</a></center><br/><p>This release includes only bug fixes.  The changes included were made only to address problems that have been identified in this release series.  Users should be able to safely upgrade to this version if this release series is already in use.  Users considering upgrading from a previous release series are strongly encouraged to review the UPGRADE.txt document as well as the CHANGES document for information about upgrading to this release series.</p>
-<p>The data in this summary reflects changes that have been made since the previous release, dahdi-tools-2.4.0.</p>
-<hr/>
-<a name="contributors"><h2 align="center">Contributors</h2></a>
-<center><a href="#top">[Back to Top]</a></center><br/><p>This table lists the people who have submitted code, those that have tested patches, as well as those that reported issues on the issue tracker that were resolved in this release.  For coders, the number is how many of their patches (of any size) were committed into this release.  For testers, the number is the number of times their name was listed as assisting with testing a patch.  Finally, for reporters, the number is the number of issues that they reported that were closed by commits that went into this release.</p>
-<table width="100%" border="0">
-<tr>
-<td width="33%"><h3>Coders</h3></td>
-<td width="33%"><h3>Testers</h3></td>
-<td width="33%"><h3>Reporters</h3></td>
-</tr>
-<tr valign="top">
-<td>
-11 tzafrir<br/>
-1 alfredtang<br/>
-</td>
-<td>
-</td>
-<td>
-1 abelbeck<br/>
-1 alfredtang<br/>
-</td>
-</tr>
-</table>
-<hr/>
-<a name="issues"><h2 align="center">Closed Issues</h2></a>
-<center><a href="#top">[Back to Top]</a></center><br/><p>This is a list of all issues from the issue tracker that were closed by changes that went into this release.</p>
-<h3>Category: General</h3><br/>
-<a href="https://issues.asterisk.org/view.php?id=16783">#16783</a>: [patch] DAHDI 2.2.1, XPP and astribank_is_starting.c uses semtimedop() which is not supported in our uClibc.<br/>
-Revision: <a href="http://svn.digium.com/view/dahdi/tools/branches/2.4?view=revision&revision=9736">9736</a><br/>
-Reporter: abelbeck<br/>
-Coders: tzafrir<br/>
-<br/>
-<h3>Category: NewFeature</h3><br/>
-<a href="https://issues.asterisk.org/view.php?id=17744">#17744</a>: [patch] add macao to tone zone data<br/>
-Revision: <a href="http://svn.digium.com/view/dahdi/tools/branches/2.4?view=revision&revision=9735">9735</a><br/>
-Reporter: alfredtang<br/>
-Coders: alfredtang<br/>
-<br/>
-<hr/>
-<a name="commits"><h2 align="center">Commits Not Associated with an Issue</h2></a>
-<center><a href="#top">[Back to Top]</a></center><br/><p>This is a list of all changes that went into this release that did not directly close an issue from the issue tracker.  The commits may have been marked as being related to an issue.  If that is the case, the issue numbers are listed here, as well.</p>
-<table width="100%" border="1">
-<tr><td><b>Revision</b></td><td><b>Author</b></td><td><b>Summary</b></td><td><b>Issues Referenced</b></td></tr><tr><td><a href="http://svn.digium.com/view/dahdi/tools/branches/2.4?view=revision&revision=9733">9733</a></td><td>tzafrir</td><td>Branch dahdi-tools 2.4</td>
-<td></td></tr><tr><td><a href="http://svn.digium.com/view/dahdi/tools/branches/2.4?view=revision&revision=9734">9734</a></td><td>tzafrir</td><td>svnmerge stuff</td>
-<td></td></tr><tr><td><a href="http://svn.digium.com/view/dahdi/tools/branches/2.4?view=revision&revision=9737">9737</a></td><td>tzafrir</td><td>Dahdi::Hardware: Support beroNet BN4S0e PCI Express card</td>
-<td></td></tr><tr><td><a href="http://svn.digium.com/view/dahdi/tools/branches/2.4?view=revision&revision=9738">9738</a></td><td>tzafrir</td><td>Fixed up the loss of crc4-multiframe alignment logic</td>
-<td></td></tr><tr><td><a href="http://svn.digium.com/view/dahdi/tools/branches/2.4?view=revision&revision=9739">9739</a></td><td>tzafrir</td><td>dahdi_scan: Show CAS framing on the framing line.</td>
-<td></td></tr><tr><td><a href="http://svn.digium.com/view/dahdi/tools/branches/2.4?view=revision&revision=9740">9740</a></td><td>tzafrir</td><td>xpp_fxloader: Don't try to load FPGA firmware twice</td>
-<td></td></tr><tr><td><a href="http://svn.digium.com/view/dahdi/tools/branches/2.4?view=revision&revision=9741">9741</a></td><td>tzafrir</td><td>dahdi_genconf: Don't generate configurations that use channel 16 on E1 CAS</td>
-<td></td></tr><tr><td><a href="http://svn.digium.com/view/dahdi/tools/branches/2.4?view=revision&revision=9742">9742</a></td><td>tzafrir</td><td>dahdi-perl: left-over $span->xpd</td>
-<td></td></tr><tr><td><a href="http://svn.digium.com/view/dahdi/tools/branches/2.4?view=revision&revision=9743">9743</a></td><td>tzafrir</td><td>dahdi-perl: fix xpp driver in dahdi_hardware</td>
-<td></td></tr><tr><td><a href="http://svn.digium.com/view/dahdi/tools/branches/2.4?view=revision&revision=9744">9744</a></td><td>tzafrir</td><td>dahdi-perl: more left-over $span->xpd</td>
-<td></td></tr></table>
-<hr/>
-<a name="diffstat"><h2 align="center">Diffstat Results</h2></a>
-<center><a href="#top">[Back to Top]</a></center><br/><p>This is a summary of the changes to the source code that went into this release that was generated using the diffstat utility.</p>
-<pre>
-0 files changed
-</pre><br/>
-<hr/>
-</body>
-</html>
 
=== removed file 'dahdi-tools-2.4.1-summary.txt'
--- dahdi-tools-2.4.1-summary.txt	2011-03-13 23:45:36 +0000
+++ dahdi-tools-2.4.1-summary.txt	1970-01-01 00:00:00 +0000
@@ -1,162 +0,0 @@
-                                Release Summary
-
-                               dahdi-tools-2.4.1
-
-                                Date: 2011-03-03
-
-                           <[e-mail]>
-
-   --------------------------------------------------------------------------
-
-                               Table of Contents
-
-    1. [1]Summary
-    2. [2]Contributors
-    3. [3]Closed Issues
-    4. [4]Other Changes
-    5. [5]Diffstat
-
-   --------------------------------------------------------------------------
-
-                                    Summary
-
-                                [6][Back to Top]
-
-   This release includes only bug fixes. The changes included were made only
-   to address problems that have been identified in this release series.
-   Users should be able to safely upgrade to this version if this release
-   series is already in use. Users considering upgrading from a previous
-   release series are strongly encouraged to review the UPGRADE.txt document
-   as well as the CHANGES document for information about upgrading to this
-   release series.
-
-   The data in this summary reflects changes that have been made since the
-   previous release, dahdi-tools-2.4.0.
-
-   --------------------------------------------------------------------------
-
-                                  Contributors
-
-                                [7][Back to Top]
-
-   This table lists the people who have submitted code, those that have
-   tested patches, as well as those that reported issues on the issue tracker
-   that were resolved in this release. For coders, the number is how many of
-   their patches (of any size) were committed into this release. For testers,
-   the number is the number of times their name was listed as assisting with
-   testing a patch. Finally, for reporters, the number is the number of
-   issues that they reported that were closed by commits that went into this
-   release.
-
-     Coders                   Testers                  Reporters             
-   11 tzafrir                                        1 abelbeck              
-   1 alfredtang                                      1 alfredtang            
-
-   --------------------------------------------------------------------------
-
-                                 Closed Issues
-
-                                [8][Back to Top]
-
-   This is a list of all issues from the issue tracker that were closed by
-   changes that went into this release.
-
-  Category: General
-
-   [9]#16783: [patch] DAHDI 2.2.1, XPP and astribank_is_starting.c uses
-   semtimedop() which is not supported in our uClibc.
-   Revision: [10]9736
-   Reporter: abelbeck
-   Coders: tzafrir
-
-  Category: NewFeature
-
-   [11]#17744: [patch] add macao to tone zone data
-   Revision: [12]9735
-   Reporter: alfredtang
-   Coders: alfredtang
-
-   --------------------------------------------------------------------------
-
-                      Commits Not Associated with an Issue
-
-                               [13][Back to Top]
-
-   This is a list of all changes that went into this release that did not
-   directly close an issue from the issue tracker. The commits may have been
-   marked as being related to an issue. If that is the case, the issue
-   numbers are listed here, as well.
-
-   +------------------------------------------------------------------------+
-   | Revision | Author  | Summary                              | Issues     |
-   |          |         |                                      | Referenced |
-   |----------+---------+--------------------------------------+------------|
-   | [14]9733 | tzafrir | Branch dahdi-tools 2.4               |            |
-   |----------+---------+--------------------------------------+------------|
-   | [15]9734 | tzafrir | svnmerge stuff                       |            |
-   |----------+---------+--------------------------------------+------------|
-   | [16]9737 | tzafrir | Dahdi::Hardware: Support beroNet     |            |
-   |          |         | BN4S0e PCI Express card              |            |
-   |----------+---------+--------------------------------------+------------|
-   | [17]9738 | tzafrir | Fixed up the loss of crc4-multiframe |            |
-   |          |         | alignment logic                      |            |
-   |----------+---------+--------------------------------------+------------|
-   | [18]9739 | tzafrir | dahdi_scan: Show CAS framing on the  |            |
-   |          |         | framing line.                        |            |
-   |----------+---------+--------------------------------------+------------|
-   | [19]9740 | tzafrir | xpp_fxloader: Don't try to load FPGA |            |
-   |          |         | firmware twice                       |            |
-   |----------+---------+--------------------------------------+------------|
-   |          |         | dahdi_genconf: Don't generate        |            |
-   | [20]9741 | tzafrir | configurations that use channel 16   |            |
-   |          |         | on E1 CAS                            |            |
-   |----------+---------+--------------------------------------+------------|
-   | [21]9742 | tzafrir | dahdi-perl: left-over $span->xpd     |            |
-   |----------+---------+--------------------------------------+------------|
-   | [22]9743 | tzafrir | dahdi-perl: fix xpp driver in        |            |
-   |          |         | dahdi_hardware                       |            |
-   |----------+---------+--------------------------------------+------------|
-   | [23]9744 | tzafrir | dahdi-perl: more left-over           |            |
-   |          |         | $span->xpd                           |            |
-   +------------------------------------------------------------------------+
-
-   --------------------------------------------------------------------------
-
-                                Diffstat Results
-
-                               [24][Back to Top]
-
-   This is a summary of the changes to the source code that went into this
-   release that was generated using the diffstat utility.
-
- 0 files changed
-
-   --------------------------------------------------------------------------
-
-References
-
-   Visible links
-   1. file:///home/sruffell/repotools/dahdi-tools-2.4.1-summary.html#summary
-   2. file:///home/sruffell/repotools/dahdi-tools-2.4.1-summary.html#contributors
-   3. file:///home/sruffell/repotools/dahdi-tools-2.4.1-summary.html#issues
-   4. file:///home/sruffell/repotools/dahdi-tools-2.4.1-summary.html#commits
-   5. file:///home/sruffell/repotools/dahdi-tools-2.4.1-summary.html#diffstat
-   6. file:///home/sruffell/repotools/dahdi-tools-2.4.1-summary.html#top
-   7. file:///home/sruffell/repotools/dahdi-tools-2.4.1-summary.html#top
-   8. file:///home/sruffell/repotools/dahdi-tools-2.4.1-summary.html#top
-   9. https://issues.asterisk.org/view.php?id=16783
-  10. http://svn.digium.com/view/dahdi/tools/branches/2.4?view=revision&revision=9736
-  11. https://issues.asterisk.org/view.php?id=17744
-  12. http://svn.digium.com/view/dahdi/tools/branches/2.4?view=revision&revision=9735
-  13. file:///home/sruffell/repotools/dahdi-tools-2.4.1-summary.html#top
-  14. http://svn.digium.com/view/dahdi/tools/branches/2.4?view=revision&revision=9733
-  15. http://svn.digium.com/view/dahdi/tools/branches/2.4?view=revision&revision=9734
-  16. http://svn.digium.com/view/dahdi/tools/branches/2.4?view=revision&revision=9737
-  17. http://svn.digium.com/view/dahdi/tools/branches/2.4?view=revision&revision=9738
-  18. http://svn.digium.com/view/dahdi/tools/branches/2.4?view=revision&revision=9739
-  19. http://svn.digium.com/view/dahdi/tools/branches/2.4?view=revision&revision=9740
-  20. http://svn.digium.com/view/dahdi/tools/branches/2.4?view=revision&revision=9741
-  21. http://svn.digium.com/view/dahdi/tools/branches/2.4?view=revision&revision=9742
-  22. http://svn.digium.com/view/dahdi/tools/branches/2.4?view=revision&revision=9743
-  23. http://svn.digium.com/view/dahdi/tools/branches/2.4?view=revision&revision=9744
-  24. file:///home/sruffell/repotools/dahdi-tools-2.4.1-summary.html#top
 
=== modified file 'dahdi.init'
--- dahdi.init	2011-03-13 23:45:36 +0000
+++ dahdi.init	2013-08-25 04:54:26 +0000
@@ -16,6 +16,7 @@
 # Should-Stop:     $network $syslog
 # Default-Start:   2 3 4 5
 # Default-Stop:    0 1 6
+# Short-Description: DAHDI kernel modules
 # Description:     dahdi - load and configure DAHDI modules
 ### END INIT INFO
 
@@ -39,7 +40,7 @@
 
 # A list of modules to unload when stopping.
 # All of their dependencies will be unloaded as well.
-DAHDI_UNLOAD_MODULES="dahdi echo"
+DAHDI_UNLOAD_MODULES="dahdi"
 
 #
 # Determine which kind of configuration we're using
@@ -226,6 +227,11 @@
 	echo ""
 }
 
+# Make sure that either dahdi is loaded or modprobe-able
+dahdi_modules_loadable() {
+	modinfo dahdi >/dev/null 2>&1 || lsmod | grep -q -w ^dahdi
+}
+
 if [ ! -x "$DAHDI_CFG" ]; then
        echo "dahdi_cfg not executable"
        exit 0
@@ -241,6 +247,10 @@
 # See how we were called.
 case "$1" in
   start)
+	if ! dahdi_modules_loadable; then
+		echo "No DAHDI modules on the system. Not starting"
+		exit 0
+	fi
   	if hotplug_should_load_modules; then
 		load_modules
 	fi
@@ -258,11 +268,6 @@
 
 	xpp_startup
 
-	if [ ! -e /proc/dahdi/1 ]; then
-		echo "No hardware timing source found in /proc/dahdi, loading dahdi_dummy"
-		modprobe dahdi_dummy 2> /dev/null
-	fi
-
 	if [ $system = debian ]; then
 	    echo -n "Running dahdi_cfg: "
 	    $DAHDI_CFG_CMD 2> /dev/null && echo -n "done"
 
=== added file 'dahdi.rules'
--- dahdi.rules	1970-01-01 00:00:00 +0000
+++ dahdi.rules	2013-08-25 04:54:26 +0000
@@ -0,0 +1,3 @@
+# DAHDI devices with ownership/permissions for running as non-root
+SUBSYSTEM=="dahdi",		OWNER="asterisk", GROUP="asterisk", MODE="0660"
+SUBSYSTEM=="dahdi_devices",	RUN="/usr/share/dahdi/handle_device"
 
=== modified file 'dahdi_cfg.c'
--- dahdi_cfg.c	2011-03-13 23:45:36 +0000
+++ dahdi_cfg.c	2013-08-25 04:54:26 +0000
@@ -85,6 +85,13 @@
 
 static struct dahdi_chanconfig cc[DAHDI_MAX_CHANNELS];
 
+static int current_span = 0;
+static int only_span = 0;
+static int restrict_channels = 0;
+static int selected_channels[DAHDI_MAX_CHANNELS];
+static int chan2span[DAHDI_MAX_CHANNELS];
+static int declared_spans[DAHDI_MAX_SPANS];
+
 static struct dahdi_attach_echocan ae[DAHDI_MAX_CHANNELS];
 
 static struct dahdi_dynamic_span zds[NUM_DYNAMIC];
@@ -176,16 +183,6 @@
 	}
 }
 
-int ind_ioctl(int channo, int fd, int op, void *data)
-{
-	struct dahdi_indirect_data ind;
-
-	ind.chan = channo;
-	ind.op = op;
-	ind.data = data;
-	return ioctl(fd, DAHDI_INDIRECT, &ind);
-}
-
 static void clear_fields()
 {
 
@@ -238,6 +235,35 @@
 	return buf;
 }
 
+static int skip_channel(int x)
+{
+	int	spanno = chan2span[x];
+
+	if (restrict_channels) {
+		if (!selected_channels[x])
+			return 1;
+		/* sanity check */
+		if (only_span) {
+			if (spanno != 0 && only_span != spanno) {
+				fprintf(stderr,
+					"Only span %d. Skip selected channel %d from span %d\n",
+					only_span, x, spanno);
+				return 1;
+			}
+		}
+	} else {
+		if (only_span && !declared_spans[only_span]) {
+			fprintf(stderr,
+				"Error: analog span %d given to '-S', without '-C' restriction.\n",
+				only_span);
+			exit(1);
+		}
+		if (only_span && only_span != spanno)
+			return 1;
+	}
+	return 0;
+}
+
 static int parseargs(char *input, char *output[], int maxargs, char sep)
 {
 	char *c;
@@ -268,11 +294,10 @@
 int dspanconfig(char *keyword, char *args)
 {
 	static char *realargs[10];
-	int argc;
 	int res;
 	int chans;
 	int timing;
-	argc = res = parseargs(args, realargs, 4, ',');
+	res = parseargs(args, realargs, 4, ',');
 	if (res != 4) {
 		error("Incorrect number of arguments to 'dynamic' (should be <driver>,<address>,<num channels>, <timing>)\n");
 		return -1;
@@ -321,6 +346,8 @@
 		error("Span number should be a valid span number, not '%s'\n", realargs[0]);
 		return -1;
 	}
+	current_span = span;
+	declared_spans[span] = 1;
 	res = sscanf(realargs[1], "%d", &timing);
 	if ((res != 1) || (timing < 0) || (timing > MAX_TIMING)) {
 		error("Timing should be a number from 0 to %d, not '%s'\n", 
@@ -492,6 +519,7 @@
 	int master=0;
 	int dacschan = 0;
 	char *idle;
+	int is_digital;
 	bzero(chans, sizeof(chans));
 	strtok(args, ":");
 	idle = strtok(NULL, ":");
@@ -503,6 +531,7 @@
 	if (res <= 0)
 		return -1;
 	for (x=1;x<DAHDI_MAX_CHANNELS;x++) {
+		is_digital = 0;
 		if (chans[x]) {
 			if (slineno[x]) {
 				error("Channel %d already configured as '%s' at line %d\n", x, sig[x], slineno[x]);
@@ -548,6 +577,7 @@
 					return -1;
 				cc[x].sigtype = DAHDI_SIG_CAS;
 				sig[x] = sigtype_to_str(cc[x].sigtype);
+				is_digital = 1;
 			} else if (!strcasecmp(keyword, "dacs")) {
 				/* Setup channel for monitor */
 				cc[x].idlebits = dacschan;
@@ -558,6 +588,7 @@
 				cc[dacschan].sigtype = DAHDI_SIG_DACS;
 				sig[x] = sigtype_to_str(cc[dacschan].sigtype);
 				dacschan++;
+				is_digital = 1;
 			} else if (!strcasecmp(keyword, "dacsrbs")) {
 				/* Setup channel for monitor */
 				cc[x].idlebits = dacschan;
@@ -567,6 +598,7 @@
 				cc[dacschan].idlebits = x;
 				cc[dacschan].sigtype = DAHDI_SIG_DACS_RBS;
 				sig[x] = sigtype_to_str(cc[dacschan].sigtype);
+				is_digital = 1;
 				dacschan++;
 			} else if (!strcasecmp(keyword, "unused")) {
 				cc[x].sigtype = 0;
@@ -574,6 +606,7 @@
 			} else if (!strcasecmp(keyword, "indclear") || !strcasecmp(keyword, "bchan")) {
 				cc[x].sigtype = DAHDI_SIG_CLEAR;
 				sig[x] = sigtype_to_str(cc[x].sigtype);
+				is_digital = 1;
 			} else if (!strcasecmp(keyword, "clear")) {
 				sig[x] = sigtype_to_str(DAHDI_SIG_CLEAR);
 				if (master) {
@@ -583,6 +616,7 @@
 					cc[x].sigtype = DAHDI_SIG_CLEAR;
 					master = x;
 				}
+				is_digital = 1;
 			} else if (!strcasecmp(keyword, "rawhdlc")) {
 				sig[x] = sigtype_to_str(DAHDI_SIG_HDLCRAW);
 				if (master) {
@@ -592,6 +626,7 @@
 					cc[x].sigtype = DAHDI_SIG_HDLCRAW;
 					master = x;
 				}
+				is_digital = 1;
 			} else if (!strcasecmp(keyword, "nethdlc")) {
 				sig[x] = sigtype_to_str(DAHDI_SIG_HDLCNET);
 				memset(cc[x].netdev_name, 0, sizeof(cc[x].netdev_name));
@@ -605,6 +640,7 @@
 					}
 					master = x;
 				}
+				is_digital = 1;
 			} else if (!strcasecmp(keyword, "fcshdlc")) {
 				sig[x] = sigtype_to_str(DAHDI_SIG_HDLCFCS);
 				if (master) {
@@ -614,18 +650,26 @@
 					cc[x].sigtype = DAHDI_SIG_HDLCFCS;
 					master = x;
 				}
+				is_digital = 1;
 			} else if (!strcasecmp(keyword, "dchan")) {
 				sig[x] = "D-channel";
 				cc[x].sigtype = DAHDI_SIG_HDLCFCS;
+				is_digital = 1;
 			} else if (!strcasecmp(keyword, "hardhdlc")) {
 				sig[x] = "Hardware assisted D-channel";
 				cc[x].sigtype = DAHDI_SIG_HARDHDLC;
+				is_digital = 1;
 			} else if (!strcasecmp(keyword, "mtp2")) {
 				sig[x] = "MTP2";
 				cc[x].sigtype = DAHDI_SIG_MTP2;
+				is_digital = 1;
 			} else {
 				fprintf(stderr, "Huh? (%s)\n", keyword);
 			}
+			if (is_digital)
+				chan2span[x] = current_span;
+			else
+				current_span = 0;
 		}
 	}
 	return 0;
@@ -677,6 +721,8 @@
 	int chanfd;
 
 	for (x = 1; x < DAHDI_MAX_CHANNELS; x++) {
+		if (skip_channel(x))
+			continue;
 		chanfd = open("/dev/dahdi/channel", O_RDWR);
 		if (chanfd == -1) {
 			fprintf(stderr, 
@@ -765,13 +811,12 @@
 int ctcss(char *keyword, char *args)
 {
 	static char *realargs[10];
-	int argc;
 	int res;
 	int rxtone;
 	int rxtag;
 	int txtone;
 	int isdcs = 0;
-	argc = res = parseargs(args, realargs, 3, ',');
+	res = parseargs(args, realargs, 3, ',');
 	if (res != 3) {
 		error("Incorrect number of arguments to 'ctcss' (should be <rxtone>,<rxtag>,<txtone>)\n");
 		return -1;
@@ -818,10 +863,9 @@
 int dcsrx(char *keyword, char *args)
 {
 	static char *realargs[10];
-	int argc;
 	int res;
 	int rxtone;
-	argc = res = parseargs(args, realargs, 1, ',');
+	res = parseargs(args, realargs, 1, ',');
 	if (res != 1) {
 		error("Incorrect number of arguments to 'dcsrx' (should be <rxtone>)\n");
 		return -1;
@@ -841,11 +885,10 @@
 int tx(char *keyword, char *args)
 {
 	static char *realargs[10];
-	int argc;
 	int res;
 	int txtone;
 	int isdcs = 0;
-	argc = res = parseargs(args, realargs, 1, ',');
+	res = parseargs(args, realargs, 1, ',');
 	if (res != 1) {
 		error("Incorrect number of arguments to 'tx' (should be <txtone>)\n");
 		return -1;
@@ -870,10 +913,9 @@
 int debounce_time(char *keyword, char *args)
 {
 	static char *realargs[10];
-	int argc;
 	int res;
 	int val;
-	argc = res = parseargs(args, realargs, 1, ',');
+	res = parseargs(args, realargs, 1, ',');
 	if (res != 1) {
 		error("Incorrect number of arguments to 'debouncetime' (should be <value>)\n");
 		return -1;
@@ -893,10 +935,9 @@
 int burst_time(char *keyword, char *args)
 {
 	static char *realargs[10];
-	int argc;
 	int res;
 	int val;
-	argc = res = parseargs(args, realargs, 1, ',');
+	res = parseargs(args, realargs, 1, ',');
 	if (res != 1) {
 		error("Incorrect number of arguments to 'bursttime' (should be <value>)\n");
 		return -1;
@@ -916,10 +957,9 @@
 int tx_gain(char *keyword, char *args)
 {
 	static char *realargs[10];
-	int argc;
 	int res;
 	int val;
-	argc = res = parseargs(args, realargs, 1, ',');
+	res = parseargs(args, realargs, 1, ',');
 	if (res != 1) {
 		error("Incorrect number of arguments to 'txgain' (should be <value>)\n");
 		return -1;
@@ -937,10 +977,9 @@
 int rx_gain(char *keyword, char *args)
 {
 	static char *realargs[10];
-	int argc;
 	int res;
 	int val;
-	argc = res = parseargs(args, realargs, 1, ',');
+	res = parseargs(args, realargs, 1, ',');
 	if (res != 1) {
 		error("Incorrect number of arguments to 'rxgain' (should be <value>)\n");
 		return -1;
@@ -958,10 +997,9 @@
 int de_emp(char *keyword, char *args)
 {
 	static char *realargs[10];
-	int argc;
 	int res;
 	int val;
-	argc = res = parseargs(args, realargs, 1, ',');
+	res = parseargs(args, realargs, 1, ',');
 	if (res != 1) {
 		error("Incorrect number of arguments to 'de-emp' (should be <value>)\n");
 		return -1;
@@ -981,10 +1019,9 @@
 int pre_emp(char *keyword, char *args)
 {
 	static char *realargs[10];
-	int argc;
 	int res;
 	int val;
-	argc = res = parseargs(args, realargs, 1, ',');
+	res = parseargs(args, realargs, 1, ',');
 	if (res != 1) {
 		error("Incorrect number of arguments to 'pre_emp' (should be <value>)\n");
 		return -1;
@@ -1004,10 +1041,9 @@
 int invert_cor(char *keyword, char *args)
 {
 	static char *realargs[10];
-	int argc;
 	int res;
 	int val;
-	argc = res = parseargs(args, realargs, 1, ',');
+	res = parseargs(args, realargs, 1, ',');
 	if (res != 1) {
 		error("Incorrect number of arguments to 'invertcor' (should be <value>)\n");
 		return -1;
@@ -1031,10 +1067,9 @@
 int ext_tone(char *keyword, char *args)
 {
 	static char *realargs[10];
-	int argc;
 	int res;
 	int val;
-	argc = res = parseargs(args, realargs, 1, ',');
+	res = parseargs(args, realargs, 1, ',');
 	if (res != 1) {
 		error("Incorrect number of arguments to 'exttone' (should be <value>)\n");
 		return -1;
@@ -1060,11 +1095,10 @@
 int cor_thresh(char *keyword, char *args)
 {
 	static char *realargs[10];
-	int argc;
 	int res;
 	int val;
 	int x = 0;
-	argc = res = parseargs(args, realargs, 1, ',');
+	res = parseargs(args, realargs, 1, ',');
 	if (res != 1) {
 		error("Incorrect number of arguments to 'corthresh' (should be <value>)\n");
 		return -1;
@@ -1091,6 +1125,7 @@
 	int res = 0;
 	int x,i,n;
 	struct dahdi_radio_param p;
+	int chanfd;
 
 	toneindex = 1;
 	bzero(chans, sizeof(chans));
@@ -1099,8 +1134,21 @@
 		return -1;
 	for (x=1;x<DAHDI_MAX_CHANNELS;x++) {
 		if (chans[x]) {
+			const char *CHANNEL_FILENAME = "/dev/dahdi/channel";
+			chanfd = open(CHANNEL_FILENAME, O_RDWR);
+			if (-1 == chanfd) {
+				error("Failed to open '%s'.\n", CHANNEL_FILENAME);
+				exit(-1);
+			}
+
+			res = ioctl(chanfd, DAHDI_SPECIFY, &x);
+			if (res) {
+				error("Failed to open channel %d.\n", x);
+				close(chanfd);
+				continue;
+			}
 			p.radpar = DAHDI_RADPAR_NUMTONES;
-			if (ind_ioctl(x,fd,DAHDI_RADIO_GETPARAM,&p) == -1)
+			if (ioctl(chanfd,DAHDI_RADIO_GETPARAM,&p) == -1)
 				n = 0;