Version bump.

(Portage version: 2.0.51.22-r2)

4 files changed, 365 insertions, 1 deletions

diff --git a/net-misc/zaptel/ChangeLog b/net-misc/zaptel/ChangeLog
index 93c3309759bf..c10158ab8f7b 100644
--- a/net-misc/zaptel/ChangeLog
+++ b/net-misc/zaptel/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/zaptel
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/zaptel/ChangeLog,v 1.60 2005/08/27 23:31:39 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/zaptel/ChangeLog,v 1.61 2005/09/15 02:29:49 stkn Exp $
+
+*zaptel-1.0.9_p2 (15 Sep 2005)
+
+  15 Sep 2005; Stefan Knoblich <stkn@gentoo.org>
+  +files/zaptel-1.0.9_p2-gentoo.diff, +zaptel-1.0.9_p2.ebuild:
+  Version bump, new upstream release fixes issues with linux-2.6.13, tor2 on
+  64bit systems and problems with dual-span cards.
 
   28 Aug 2005; Stefan Knoblich <stkn@gentoo.org> zaptel-1.2.0_beta1.ebuild:
   Small cleanup.
diff --git a/net-misc/zaptel/files/digest-zaptel-1.0.9_p2 b/net-misc/zaptel/files/digest-zaptel-1.0.9_p2
new file mode 100644
index 000000000000..13c638a6f372
--- /dev/null
+++ b/net-misc/zaptel/files/digest-zaptel-1.0.9_p2
@@ -0,0 +1,3 @@
+MD5 4d9dc3afbe7e61c557115bd5442d3e5e zaptel-1.0.9.2.tar.gz 327362
+MD5 a6b5c61c16b35f02c616c8abadb9999d bristuff-0.2.0-RC8n.tar.gz 143979
+MD5 717f869f45ec20ceda216285cd90455a zaphfc_0.2.0-RC8j_florz-8.diff.gz 10559
diff --git a/net-misc/zaptel/files/zaptel-1.0.9_p2-gentoo.diff b/net-misc/zaptel/files/zaptel-1.0.9_p2-gentoo.diff
new file mode 100644
index 000000000000..0f2c8f1152c3
--- /dev/null
+++ b/net-misc/zaptel/files/zaptel-1.0.9_p2-gentoo.diff
@@ -0,0 +1,113 @@
+--- zaptel-1.0.9.2/Makefile.orig	2005-09-15 04:16:23.000000000 +0200
++++ zaptel-1.0.9.2/Makefile	2005-09-15 04:16:56.000000000 +0200
+@@ -13,13 +13,13 @@
+ # (assuming He's running Linux -- which we all know He must).
+ #
+ HOSTCC=gcc
+-KINCLUDES=$(shell if [ -d /usr/src/linux-2.4/include ]; then echo /usr/src/linux-2.4/include ; else echo /usr/src/linux/include ; fi)
++KINCLUDES=/usr/src/linux/include
+ 
+-CFLAGS+=-I. -O4 -g -Wall -DBUILDING_TONEZONE #-DTONEZONE_DRIVER
++CFLAGS+=-I. -g -Wall -DBUILDING_TONEZONE #-DTONEZONE_DRIVER
+ CFLAGS+=$(shell if uname -m | grep -q ppc; then echo "-fsigned-char"; fi)
+ CFLAGS+=$(shell if uname -m | grep -q x86_64; then echo "-m64"; fi)
+ LCFLAGS=-fPIC $(CFLAGS) -DBUILDING_TONEZONE
+-KFLAGS+=-I/usr/src/linux-2.4/include -O6
++KFLAGS+=-I/usr/src/linux/include -O6
+ KFLAGS+=-DMODULE -D__KERNEL__ -DEXPORT_SYMTAB -I/usr/src/linux/drivers/net \
+ 	-Wall -I. -Wstrict-prototypes -fomit-frame-pointer -I/usr/src/linux/drivers/net/wan -I /usr/src/linux/include -I/usr/src/linux/include/net
+ KFLAGS+=$(shell if [ -f $(KINCLUDES)/linux/modversions.h ] ; then echo "-DMODVERSIONS -include $(KINCLUDES)/linux/modversions.h" ; fi)
+@@ -38,8 +38,8 @@
+ CONFIG_FILE=$(INSTALL_PREFIX)/etc/zaptel.conf
+ CFLAGS+=-DZAPTEL_CONFIG=\"$(CONFIG_FILE)\"
+ 
+-BUILDVER=$(shell if uname -r | grep -q ^2.6; then echo "linux26"; else echo "linux24"; fi)
+-MODCONF=$(shell if [ -d $(ROOT_PREFIX)/etc/modprobe.d ]; then echo "$(ROOT_PREFIX)/etc/modprobe.d/zaptel"; elif [ -d $(ROOT_PREFIX)/etc/modutils ]; then echo "$(ROOT_PREFIX)/etc/modutils/zaptel"; elif [ -f $(ROOT_PREFIX)/etc/modprobe.conf ]; then echo "$(ROOT_PREFIX)/etc/modprobe.conf"; elif [ -f $(ROOT_PREFIX)/etc/modules.conf ]; then echo "$(ROOT_PREFIX)/etc/modules.conf"; else echo $(ROOT_PREFIX)/etc/conf.modules ; fi)
++BUILDVER?=$(shell if uname -r | grep -q ^2.6; then echo "linux26"; else echo "linux24"; fi)
++MODCONF=$(INSTALL_PREFIX)/etc/modules.d/zaptel
+ 
+ ifeq (${BUILDVER},linux24)
+ #We only support DEVFS in linux 2.4 kernels, since its considered obsolete post 2.4
+@@ -58,7 +58,7 @@
+ TZOBJS=zonedata.lo tonezone.lo
+ LIBTONEZONE=libtonezone.so.1.0
+ MODULES=zaptel tor2 torisa wcusb wcfxo wcfxs \
+-	ztdynamic ztd-eth wct1xxp wct4xxp wcte11xp # ztdummy
++	ztdynamic ztd-eth wct1xxp wct4xxp wcte11xp ztdummy
+ #MODULES+=wcfxsusb
+ 
+ MODULESO=$(shell for x in $(MODULES); do echo "$$x.o "; done )
+@@ -71,7 +71,7 @@
+ PRIMARY=torisa
+ #PRIMARY=wcfxo
+ PWD=$(shell pwd)
+-KERNEL_SOURCE?=/lib/modules/`uname -r`/build
++KERNEL_SOURCE?=/usr/src/linux
+ 
+ all: $(BUILDVER) $(LIBTONEZONE)
+ 
+@@ -198,7 +198,6 @@
+ 
+ $(LIBTONEZONE): $(TZOBJS)
+ 	$(CC) -shared -Wl,-soname,libtonezone.so.1 -lm -o $@ $(TZOBJS)
+-	[ `id -u` = 0 ] && /sbin/ldconfig || :
+ 	ln -sf libtonezone.so.1 libtonezone.so                                  
+ 
+ ztcfg.c: ztcfg.h
+@@ -262,7 +261,7 @@
+ 	@echo "**** If you are running udev, read README.udev"
+ endif
+ 
+-install:  all devices
++install: devices
+ 	install -D -m 755 ztcfg $(INSTALL_PREFIX)/sbin/ztcfg
+ 	if [ -f sethdlc-new ]; then \
+ 		install -D -m 755 sethdlc-new $(INSTALL_PREFIX)/sbin/sethdlc; \
+@@ -286,45 +285,24 @@
+ 		fi; \
+ 	fi
+ 	install -D -m 755 $(LIBTONEZONE) $(INSTALL_PREFIX)/usr/lib/$(LIBTONEZONE)
+-	if [ -x /usr/sbin/sestatus ] && (/usr/sbin/sestatus | grep "SELinux status:" | grep -q "enabled") ; then restorecon -v $(INSTALL_PREFIX)/usr/lib/$(LIBTONEZONE); fi
+ 	install -D -m 644 zaptel.h $(INSTALL_PREFIX)/usr/include/linux/zaptel.h
+ 	install -D -m 644 torisa.h $(INSTALL_PREFIX)/usr/include/linux/torisa.h
+ 	install -D -m 644 tonezone.h $(INSTALL_PREFIX)/usr/include/tonezone.h
+ 	( cd $(INSTALL_PREFIX)/usr/lib ; rm -f libtonezone.so ; ln -sf $(LIBTONEZONE) libtonezone.so )
+-	[ `id -u` = 0 ] && /sbin/ldconfig || :
+-	if [ -f $(MODCONF) ]; then mv -f $(MODCONF) $(MODCONF).bak ; fi
+-	cat $(MODCONF).bak | grep -v "alias char-major-250" | \
+-	grep -v "post-install torisa /sbin/ztcfg" | \
+-	grep -v "post-install wcfxsusb /sbin/ztcfg" | \
+-	grep -v "alias wcfxs" | \
+-	grep -v "post-install wcfxs /sbin/ztcfg" > $(MODCONF) || true
++	if [ ! -d `dirname $(MODCONF)` ]; then install -d -m 755 `dirname $(MODCONF)` ; fi
++	/sbin/ldconfig -n $(INSTALL_PREFIX)/usr/lib
+ 	if ! grep "options torisa" $(MODCONF); then \
+ 		echo "options torisa base=$(BASEADDR)" >> $(MODCONF); \
+ 	fi
+ 	if ! grep "alias char-major-196" $(MODCONF); then \
+ 		echo "alias char-major-196 $(PRIMARY)" >> $(MODCONF); \
+ 	fi
+-	for x in $(MODULES); do \
+-		if ! grep "post-install $$x" $(MODCONF); then \
+-			if ! grep "install $$x " $(MODCONF); then \
+-				if [ "$$x" != "zaptel" ] ; then \
+-					if [ -f zaptel.ko ]; then echo "install $$x /sbin/modprobe --ignore-install $$x && /sbin/ztcfg" >> $(MODCONF); \
+-					else echo "post-install $$x /sbin/ztcfg" >> $(MODCONF); \
+-					fi; \
+-				fi; \
+-			fi; \
+-		fi; \
+-	done
+ 	if ! grep "alias wctdm" $(MODCONF); then \
+ 		echo "alias wctdm wcfxs" >> $(MODCONF); \
+ 	fi
+ 	if ! grep "alias wct2xxp" $(MODCONF); then \
+ 		echo "alias wct2xxp wct4xxp" >> $(MODCONF); \
+ 	fi
+-	if [ -d /etc/modutils ]; then \
+-		/sbin/update-modules ; \
+-	fi
+-	[ `id -u` = 0 ] && /sbin/depmod -a || :
+ 	[ -f $(CONFIG_FILE) ] || install -D -m 644 zaptel.conf.sample $(CONFIG_FILE)
+ 
+ config:
diff --git a/net-misc/zaptel/zaptel-1.0.9_p2.ebuild b/net-misc/zaptel/zaptel-1.0.9_p2.ebuild
new file mode 100644
index 000000000000..5fb105e993cc
--- /dev/null
+++ b/net-misc/zaptel/zaptel-1.0.9_p2.ebuild
@@ -0,0 +1,241 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/zaptel/zaptel-1.0.9_p2.ebuild,v 1.1 2005/09/15 02:29:49 stkn Exp $
+
+IUSE="devfs26 bri florz rtc"
+
+inherit toolchain-funcs eutils linux-mod
+
+BRI_VERSION="0.2.0-RC8n"
+FLORZ_VERSION="0.2.0-RC8j_florz-8"
+
+MY_PV="${PV/_p/.}"
+
+DESCRIPTION="Drivers for Digium and ZapataTelephony cards"
+HOMEPAGE="http://www.asterisk.org"
+SRC_URI="ftp://ftp.digium.com/pub/telephony/zaptel/zaptel-${MY_PV}.tar.gz
+	 bri? ( http://www.junghanns.net/downloads/bristuff-${BRI_VERSION}.tar.gz )
+	 florz? ( http://zaphfc.florz.dyndns.org/zaphfc_${FLORZ_VERSION}.diff.gz )"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~ppc ~amd64"
+
+DEPEND="virtual/libc
+	virtual/linux-sources
+	>=dev-libs/newt-0.50.0"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+pkg_setup() {
+	linux-mod_pkg_setup
+
+	# show an nice warning message about zaptel not supporting devfs on 2.6
+	if kernel_is 2 6 && linux_chkconfig_present DEVFS_FS ; then
+		echo
+		einfo "You're using a 2.6 kernel with DEVFS."
+		einfo "The Zaptel drivers won't work unless you either:"
+		einfo "   * switch to udev"
+		einfo "   * write a script that re-creates the necessary device nodes for you"
+		einfo "   * enable the devfs26 useflag (see below)"
+		einfo ""
+		einfo "There's an experimental patch which adds devfs support when using linux-2.6, but:"
+		einfo "   1. It disables udev support to avoid conflicts"
+		ewarn "   2. It is not supported by Digium / the Asterisk project!"
+		einfo ""
+		einfo "If you're still interested, abort now (ctrl+c) and enable the devfs26 USE-flag"
+		einfo "Feedback and bug-reports should go to: stkn@gentoo.org"
+		einfo "You have been warned!"
+		echo
+		einfo "Sleeping 20 Seconds..."
+		epause 20
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+	# patch makefile(s) for gentoo
+	epatch ${FILESDIR}/${PN}-1.0.9_p2-gentoo.diff
+
+	# devfs support
+	if use devfs26; then
+		einfo "Enabling experimental devfs support for linux-2.6..."
+		epatch ${FILESDIR}/${PN}-1.0.4-experimental-devfs26.diff
+
+		# disable udev
+		sed -i -e "s:#define[\t ]\+\(CONFIG_ZAP_UDEV\):#undef \1:" \
+			zconfig.h
+
+		# fix Makefile to not create device nodes for
+		# devfs enabled 2.6 kernels
+		sed -i -e 's:grep udevd:grep -q \"udevd\\|devfsd\":' \
+			Makefile || die "QA error: No substitution performed"
+	fi
+
+	# apply patch for gcc-3.4.x if that's the compiler in use...
+	# fixes (#76707)
+	if use x86 && [[ `gcc-fullversion` = "3.4.3" ]]; then
+		epatch ${FILESDIR}/${PN}-1.0.4-gcc34.patch
+	fi
+
+	# try to apply bristuff patch
+	if use bri; then
+		einfo "Patching zaptel w/ BRI stuff (${BRI_VERSION})"
+		epatch ${FILESDIR}/zaptel-bristuff-${BRI_VERSION}.patch
+
+		cd ${WORKDIR}/bristuff-${BRI_VERSION}
+
+		if use florz; then
+			einfo "Using florz patches (${FLORZ_VERSION}) for zaphfc"
+
+			epatch ${WORKDIR}/zaphfc_${FLORZ_VERSION}.diff
+		fi
+
+		# patch includes
+		sed -i  -e "s:^#include.*zaptel\.h.*:#include <zaptel.h>:" \
+			qozap/qozap.c \
+			zaphfc/zaphfc.c \
+			cwain/cwain.c
+
+		# patch makefiles
+		sed -i  -e "s:^ZAP[\t ]*=.*:ZAP=-I${S}:" \
+			-e "s:^MODCONF=.*:MODCONF=/etc/modules.d/zaptel:" \
+			-e "s:linux-2.6:linux:g" \
+			qozap/Makefile \
+			zaphfc/Makefile \
+			cwain/Makefile
+
+		sed -i  -e "s:^\(CFLAGS+=-I. \).*:\1 \$(ZAP):" \
+			zaphfc/Makefile
+	fi
+
+	# replace `uname -r` with ${KV_FULL} in all Makefiles
+	find ${WORKDIR} -iname "Makefile" -exec sed -i -e "s:\`uname -r\`:${KV_FULL}:g" {} \;
+
+	cd ${S}
+	#######################################################################
+	# apply other patches here,
+	# make sure they work with things that have been added before!
+	#
+
+	# apply x86 rtc patch for ztdummy (http://bugs.digium.com/view.php?id=4301)
+	# this won't have any effect on non-x86 systems...
+	if use rtc; then
+		if use x86 || use amd64; then
+			epatch ${FILESDIR}/${PN}-1.0.9-rtc.patch
+		else
+			ewarn "RTC is unsupported on your arch, skipping patch"
+		fi
+	fi
+}
+
+src_compile() {
+	make ARCH=$(tc-arch-kernel) KERNEL_SOURCE=/usr/src/linux || die
+
+	if use bri; then
+		cd ${WORKDIR}/bristuff-${BRI_VERSION}
+		make ARCH=$(tc-arch-kernel) -C qozap  || die
+		make ARCH=$(tc-arch-kernel) -C zaphfc || die
+		make ARCH=$(tc-arch-kernel) -C cwain  || die
+	fi
+}
+
+src_install() {
+	make INSTALL_PREFIX=${D} install || die
+
+	dodoc ChangeLog README README.udev README.Linux26 README.fxsusb zaptel.init
+	dodoc zaptel.conf.sample LICENSE zaptel.sysconfig
+
+	# additional tools
+	dobin ztmonitor ztspeed zttest
+
+	if use bri; then
+		einfo "Installing bri"
+		cd ${WORKDIR}/bristuff-${BRI_VERSION}
+
+		insinto /lib/modules/${KV_FULL}/misc
+		doins qozap/qozap.${KV_OBJ}
+		doins zaphfc/zaphfc.${KV_OBJ}
+		doins cwain/cwain.${KV_OBJ}
+
+		# install example configs for octoBRI and quadBRI
+		insinto /etc
+		doins qozap/zaptel.conf.octoBRI
+		newins qozap/zaptel.conf zaptel.conf.quadBRI
+		newins zaphfc/zaptel.conf zaptel.conf.zaphfc
+
+		insinto /etc/asterisk
+		doins qozap/zapata.conf.octoBRI
+		newins qozap/zapata.conf zapata.conf.quadBRI
+		newins zaphfc/zapata.conf zapata.conf.zaphfc
+
+		docinto bristuff
+		dodoc CHANGES INSTALL
+
+		docinto bristuff/qozap
+		dodoc qozap/LICENSE qozap/TODO qozap/*.conf*
+
+		docinto bristuff/zaphfc
+		dodoc zaphfc/LICENSE zaphfc/*.conf
+
+		docinto bristuff/cwain
+		dodoc cwain/TODO cwain/LICENSE
+	fi
+
+	# install init script
+	newinitd ${FILESDIR}/zaptel.rc6 zaptel
+	newconfd ${FILESDIR}/zaptel.confd zaptel
+
+	# install devfsd rule file
+	insinto /etc/devfs.d
+	newins ${FILESDIR}/zaptel.devfsd zaptel
+
+	# install udev rule file
+	insinto /etc/udev/rules.d
+	newins ${FILESDIR}/zaptel.udevd 10-zaptel.rules
+
+	# fix permissions if there's no udev / devfs around
+	if [[ -d ${D}/dev/zap ]]; then
+		chown -R root:dialout	${D}/dev/zap
+		chmod -R u=rwX,g=rwX,o= ${D}/dev/zap
+	fi
+}
+
+pkg_postinst() {
+	linux-mod_pkg_postinst
+
+	if use devfs26; then
+		ewarn "*** Warning! ***"
+		ewarn "Devfs support for linux-2.6 is experimental and not"
+		ewarn "supported by digium or the asterisk project!"
+		echo
+		ewarn "Send bug-reports to: stkn@gentoo.org"
+	fi
+
+	echo
+	einfo "Use the /etc/init.d/zaptel script to load zaptel.conf settings on startup!"
+	echo
+
+	if use bri; then
+		einfo "Bristuff configs have been merged as:"
+		einfo ""
+		einfo "${ROOT}etc/"
+		einfo "    zaptel.conf.zaphfc"
+		einfo "    zaptel.conf.quadBRI"
+		einfo "    zaptel.conf.octoBRI"
+		einfo ""
+		einfo "${ROOT}etc/asterisk/"
+		einfo "    zapata.conf.zaphfc"
+		einfo "    zapata.conf.quadBRI"
+		einfo "    zapata.conf.octoBRI"
+		echo
+	fi
+
+	# fix permissions if there's no udev / devfs around
+	if [[ -d ${ROOT}/dev/zap ]]; then
+		chown -R root:dialout	${ROOT}/dev/zap
+		chmod -R u=rwX,g=rwX,o= ${ROOT}/dev/zap
+	fi
+}