[gentoo-commits] gentoo-x86 commit in net-misc/dahdi-tools/files: dahdi.init2 dahdi-tools-2.2.0-ifreq.patch dahdi-tools-2.2.0-modprobe-suffix.patch

[Tony Vroon (chainsaw)]

chainsaw    09/10/28 11:25:13

  Added:                dahdi.init2 dahdi-tools-2.2.0-ifreq.patch
                        dahdi-tools-2.2.0-modprobe-suffix.patch
  Log:
  Version bump. Change libusb dependency as requested by Mounir "volkmar" Lamouri in bug #270160. Header & modprobe.d fixups by Csaba Tóth in bug #270283. Run fxotune from the init script, from Jaco Kroon in bug #273390.
  (Portage version: 2.1.7.1/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  net-misc/dahdi-tools/files/dahdi.init2

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/dahdi-tools/files/dahdi.init2?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/dahdi-tools/files/dahdi.init2?rev=1.1&content-type=text/plain

Index: dahdi.init2
===================================================================
#!/sbin/runscript
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/net-misc/dahdi-tools/files/dahdi.init2,v 1.1 2009/10/28 11:25:12 chainsaw Exp $

depend() {
	need net
}

checkconfig() {
	if [ ! -f /etc/dahdi/system.conf ]; then
		eerror "/etc/dahdi/system.conf not found. Nothing to do."
		return 1
	fi

	return 0
}

start() {
	checkconfig || return 1

	ebegin "Starting DAHDI"
	/usr/sbin/dahdi_cfg
	eend $?

	if [ $? -eq 0 -a -r /etc/fxotune.conf ]; then
		ebegin "Loading DAHDI fxotune.conf"
		/usr/sbin/fxotune -s
		eend $?
	fi
}

stop() {
	ebegin "Stopping DAHDI"
	/usr/sbin/dahdi_cfg -s
	eend 
}



1.1                  net-misc/dahdi-tools/files/dahdi-tools-2.2.0-ifreq.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/dahdi-tools/files/dahdi-tools-2.2.0-ifreq.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/dahdi-tools/files/dahdi-tools-2.2.0-ifreq.patch?rev=1.1&content-type=text/plain

Index: dahdi-tools-2.2.0-ifreq.patch
===================================================================
diff -uNr dahdi-tools-2.2.0.ORIG/sethdlc.c dahdi-tools-2.2.0/sethdlc.c
--- dahdi-tools-2.2.0.ORIG/sethdlc.c	2009-10-28 11:07:37.000000000 +0000
+++ dahdi-tools-2.2.0/sethdlc.c	2009-10-28 11:08:10.000000000 +0000
@@ -43,6 +43,8 @@
 #warning "No kernel support for Ethernet over Frame Relay / HDLC, skipping it"
 #endif
 
+#define ifreq __kernel_ifreq
+
 
 static struct ifreq req;	/* for ioctl */
 static int argc;



1.1                  net-misc/dahdi-tools/files/dahdi-tools-2.2.0-modprobe-suffix.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/dahdi-tools/files/dahdi-tools-2.2.0-modprobe-suffix.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/dahdi-tools/files/dahdi-tools-2.2.0-modprobe-suffix.patch?rev=1.1&content-type=text/plain

Index: dahdi-tools-2.2.0-modprobe-suffix.patch
===================================================================
diff -urN dahdi-tools-2.2.0.orig/Makefile dahdi-tools-2.2.0/Makefile
--- dahdi-tools-2.2.0.orig/Makefile	2009-06-08 19:02:48.000000000 +0200
+++ dahdi-tools-2.2.0/Makefile	2009-07-19 14:32:44.246071785 +0200
@@ -70,8 +70,8 @@
 RCCONF_FILE	= /etc/dahdi/init.conf
 MODULES_FILE	= /etc/dahdi/modules
 GENCONF_FILE	= /etc/dahdi/genconf_parameters
-MODPROBE_FILE	= /etc/modprobe.d/dahdi
-BLACKLIST_FILE	= /etc/modprobe.d/dahdi.blacklist
+MODPROBE_FILE	= /etc/modprobe.d/dahdi.conf
+BLACKLIST_FILE	= /etc/modprobe.d/dahdi.blacklist.conf
 
 NETSCR_DIR	:= $(firstword $(wildcard $(DESTDIR)/etc/sysconfig/network-scripts ))
 ifneq (,$(NETSCR_DIR))