This commit was manufactured by cvs2svn to create tag 'RELEASE_7_3_0'.release/7.3.0

5 files changed, 0 insertions, 153 deletions

diff --git a/misc/dahdi-kmod/files/dahdi.in b/misc/dahdi-kmod/files/dahdi.in
deleted file mode 100644
index 15f6d43e741c..000000000000
--- a/misc/dahdi-kmod/files/dahdi.in
+++ /dev/null
@@ -1,56 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-# PROVIDE: dahdi
-# REQUIRE: NETWORKING
-# KEYWORD: shutdown
-# BEFORE: asterisk
-#
-# Add the following lines to /etc/rc.conf.local or /etc/rc.conf
-# to enable this service:
-#
-# dahdi_enable (bool):			YES/NO (default: NO)
-# dahdi_modules (list of strings):	dahdi modules to load at boot (default: dahdi)
-#	Valid modules are: dahdi, wct4xxp, wcb4xxp
-#
-# Example:
-#
-# dahdi_enable="YES"
-# dahdi_modules="wct4xxp"
-#
-
-. %%RC_SUBR%%
-
-name="dahdi"
-start_cmd="dahdi_start"
-stop_cmd="dahdi_stop"
-load_rc_config $name
-
-kmod_dir=%%PREFIX%%/lib/dahdi
-dahdi_modules=${dahdi_modules:-dahdi}
-# reverse list
-dahdi_modules_unload=""
-for m in ${dahdi_modules}; do
-	dahdi_modules_unload="$m ${dahdi_modules_unload}"
-done
-
-dahdi_start()
-{
-	echo -n " ${name}"
-
-	for m in ${dahdi_modules}; do
-		kldload ${kmod_dir}/$m.ko || exit 1
-	done
-	%%PREFIX%%/sbin/dahdi_cfg
-}
-
-dahdi_stop()
-{
-        echo -n " ${name}"
-	for m in ${dahdi_modules_unload}; do
-		kldunload $m
-	done
-}
-
-run_rc_command "$1"
diff --git a/misc/dahdi-kmod/files/patch-freebsd-drivers-dahdi-wct4xxp-base.c b/misc/dahdi-kmod/files/patch-freebsd-drivers-dahdi-wct4xxp-base.c
deleted file mode 100644
index 3838d69fb38f..000000000000
--- a/misc/dahdi-kmod/files/patch-freebsd-drivers-dahdi-wct4xxp-base.c
+++ /dev/null
@@ -1,18 +0,0 @@
---- freebsd/drivers/dahdi/wct4xxp/base.c.orig	2010-03-03 19:04:37.000000000 +0600
-+++ freebsd/drivers/dahdi/wct4xxp/base.c	2010-03-03 19:04:51.000000000 +0600
-@@ -3070,7 +3070,6 @@
- {
- 	struct t4 *wc = (struct t4 *)data;
- 
--	DPRINTF(wc->dev, "%s\n", __FUNCTION__);
- #ifdef VPM_SUPPORT
- 	if (wc->vpm) {
- 		if (test_and_clear_bit(T4_CHECK_VPM, &wc->checkflag)) {
-@@ -3214,7 +3213,6 @@
- 	res = FILTER_HANDLED;
- #endif
- 	if (unlikely(test_bit(T4_CHECK_VPM, &wc->checkflag))) {
--		DPRINTF(wc->dev, "scheduling filter thread\n");
- #if defined(__FreeBSD__)
- 		res |= FILTER_SCHEDULE_THREAD;
- #else
diff --git a/misc/dahdi-kmod/files/patch-tools-Makefile b/misc/dahdi-kmod/files/patch-tools-Makefile
deleted file mode 100644
index 4cd89f5d414f..000000000000
--- a/misc/dahdi-kmod/files/patch-tools-Makefile
+++ /dev/null
@@ -1,40 +0,0 @@
---- tools/Makefile.orig	2009-11-04 22:36:21.000000000 +0600
-+++ tools/Makefile	2010-03-03 17:36:39.000000000 +0600
-@@ -27,7 +27,7 @@
- endif
- 
- SUBDIRS_UTILS_ALL:= ppp
--SUBDIRS_UTILS := xpp
-+#SUBDIRS_UTILS := xpp
- 
- OPTFLAGS=-O2
- CFLAGS+=-I. $(OPTFLAGS) -g -fPIC -Wall -DBUILDING_TONEZONE #-DTONEZONE_DRIVER
-@@ -229,13 +229,13 @@
- 	install -d $(DESTDIR)$(MAN_DIR)
- 	install -m 644 $(MAN_PAGES) $(DESTDIR)$(MAN_DIR)/
- endif
--ifeq (,$(wildcard $(DESTDIR)$(CONFIG_FILE)))
--	$(INSTALL) -D -m 644 system.conf.sample $(DESTDIR)$(CONFIG_FILE)
--endif
-+	$(INSTALL) -d -m755 $(DESTDIR)$(CONFIG_DIR)
-+	$(INSTALL) -m 644 system.conf.sample $(DESTDIR)$(CONFIG_DIR)
- 
- install-libs: libs
--	$(INSTALL) -D -m 755 $(LTZ_A) $(DESTDIR)$(LIB_DIR)/$(LTZ_A)
--	$(INSTALL) -D -m 755 $(LTZ_SO) $(DESTDIR)$(LIB_DIR)/$(LTZ_SO).$(LTZ_SO_MAJOR_VER).$(LTZ_SO_MINOR_VER)
-+	$(INSTALL) -d -m755 $(DESTDIR)$(LIB_DIR)
-+	$(INSTALL) -m 755 $(LTZ_A) $(DESTDIR)$(LIB_DIR)/$(LTZ_A)
-+	$(INSTALL) -m 755 $(LTZ_SO) $(DESTDIR)$(LIB_DIR)/$(LTZ_SO).$(LTZ_SO_MAJOR_VER).$(LTZ_SO_MINOR_VER)
- ifeq (,$(DESTDIR))
- 	if [ `id -u` = 0 ]; then \
- 		/sbin/ldconfig || : ;\
-@@ -260,7 +260,8 @@
- 	/sbin/restorecon -v $(DESTDIR)$(LIB_DIR)/$(LTZ_SO)
-   endif
- endif
--	$(INSTALL) -D -m 644 tonezone.h $(DESTDIR)$(INC_DIR)/tonezone.h
-+	$(INSTALL) -d -m755 $(DESTDIR)$(INC_DIR)
-+	$(INSTALL) -m 644 tonezone.h $(DESTDIR)$(INC_DIR)/tonezone.h
- 
- install-utils-subdirs:
- 	@for dir in $(SUBDIRS_UTILS); do \
diff --git a/misc/dahdi-kmod/files/patch-tools-dahdi_monitor.c b/misc/dahdi-kmod/files/patch-tools-dahdi_monitor.c
deleted file mode 100644
index b175aaf1199f..000000000000
--- a/misc/dahdi-kmod/files/patch-tools-dahdi_monitor.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- tools/dahdi_monitor.c.orig	2009-04-21 20:44:58.000000000 +0700
-+++ tools/dahdi_monitor.c	2010-03-03 17:24:25.000000000 +0600
-@@ -40,7 +40,11 @@
- #include <dahdi/user.h>
- #include "dahdi_tools_version.h"
- 
-+#if defined(__FreeBSD__)
-+#include <sys/soundcard.h>
-+#else
- #include <linux/soundcard.h>
-+#endif
- 
- /*
- * defines for file handle numbers
diff --git a/misc/dahdi-kmod/files/patch-tools-tonezone.c b/misc/dahdi-kmod/files/patch-tools-tonezone.c
deleted file mode 100644
index 66bb1c0034b9..000000000000
--- a/misc/dahdi-kmod/files/patch-tools-tonezone.c
+++ /dev/null
@@ -1,25 +0,0 @@
---- tools/tonezone.c.orig	2008-08-06 06:43:02.000000000 +0700
-+++ tools/tonezone.c	2010-03-03 17:24:01.000000000 +0600
-@@ -46,6 +46,10 @@
- #define CLIP 32635
- #define BIAS 0x84
- 
-+#ifndef ENODATA
-+#define ENODATA EINVAL
-+#endif
-+
- struct tone_zone *tone_zone_find(char *country)
- {
- 	struct tone_zone *z;
-@@ -440,7 +444,11 @@
- 	dump_tone_zone(h, MAX_SIZE - space);
- #endif
- 
-+#if defined(__FreeBSD__)
-+	if ((res = ioctl(fd, DAHDI_LOADZONE, &h))) {
-+#else
- 	if ((res = ioctl(fd, DAHDI_LOADZONE, h))) {
-+#endif
- 		fprintf(stderr, "ioctl(DAHDI_LOADZONE) failed: %s\n", strerror(errno));
- 		return res;
- 	}