version bump, bug #198503, #201665. florz patched dropped until we can get a clean version.

(Portage version: 2.1.4_rc11)

4 files changed, 457 insertions, 1 deletions

diff --git a/net-misc/zaptel/ChangeLog b/net-misc/zaptel/ChangeLog
index b672f4da7559..666563c1ce3f 100644
--- a/net-misc/zaptel/ChangeLog
+++ b/net-misc/zaptel/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/zaptel
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/zaptel/ChangeLog,v 1.98 2007/11/14 19:08:35 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/zaptel/ChangeLog,v 1.99 2007/12/25 06:26:11 rajiv Exp $
+
+*zaptel-1.2.22.1 (25 Dec 2007)
+
+  25 Dec 2007; Rajiv Aaron Manglani <rajiv@gentoo.org>
+  +files/zaptel-1.2.22.1-gentoo.diff, +zaptel-1.2.22.1.ebuild:
+  version bump, bug #198503, #201665. florz patched dropped until we can get a
+  clean version.
 
   14 Nov 2007; Steve Dibb <beandog@gentoo.org> zaptel-1.2.18.ebuild:
   amd64 stable, bug 175321
diff --git a/net-misc/zaptel/files/digest-zaptel-1.2.22.1 b/net-misc/zaptel/files/digest-zaptel-1.2.22.1
new file mode 100644
index 000000000000..d507164aeef6
--- /dev/null
+++ b/net-misc/zaptel/files/digest-zaptel-1.2.22.1
@@ -0,0 +1,6 @@
+MD5 ede315067f70d7a202a081941155c6e9 bristuff-0.3.0-PRE-1y-l.tar.gz 300381
+RMD160 808862df63edf85997753e1e857cc907c54f2b60 bristuff-0.3.0-PRE-1y-l.tar.gz 300381
+SHA256 d083b6529e34c3192e91f34b68c542106ebaa5e3046d816061709297061d3576 bristuff-0.3.0-PRE-1y-l.tar.gz 300381
+MD5 835d57401808b6c47b4b31c9e8945240 zaptel-1.2.22.1.tar.gz 3602765
+RMD160 ffe5173ddcf6bc8ddaaa1ef0e2b4f1f42ad06d2b zaptel-1.2.22.1.tar.gz 3602765
+SHA256 762c593ceaa8b2b910ce4f9edea9be087d88f4453a99a004a78abac6e2ef31fd zaptel-1.2.22.1.tar.gz 3602765
diff --git a/net-misc/zaptel/files/zaptel-1.2.22.1-gentoo.diff b/net-misc/zaptel/files/zaptel-1.2.22.1-gentoo.diff
new file mode 100644
index 000000000000..eaf7f1dbd767
--- /dev/null
+++ b/net-misc/zaptel/files/zaptel-1.2.22.1-gentoo.diff
@@ -0,0 +1,78 @@
+diff -uNr zaptel-1.2.22.1/build_tools/genmodconf zaptel-1.2.22.1.gentoo/build_tools/genmodconf
+--- zaptel-1.2.22.1/build_tools/genmodconf	2007-07-11 14:58:09.000000000 -0400
++++ zaptel-1.2.22.1.gentoo/build_tools/genmodconf	2007-12-23 18:21:29.000000000 -0500
+@@ -79,20 +79,6 @@
+ 
+ echo Building ${target}...
+ 
+-if [ "${1}" = "linux24" ]; then
+-    for mod in ${3}; do
+-	if ! grep -q "post-install ${mod} " ${target}; then
+-	    echo "post-install ${mod} /sbin/ztcfg" >> ${target}
+-	fi
+-    done
+-elif [ "${1}" = "linux26" ]; then
+-    for mod in ${3}; do
+-	if ! grep -q "install ${mod} " ${target}; then
+-	    echo "install ${mod} /sbin/modprobe --ignore-install ${mod} ${cmdopts} && /sbin/ztcfg" >> ${target}
+-	fi
+-    done
+-fi
+-
+ if [ -z "${combined}" ]; then
+     echo "***"
+     echo "*** WARNING:"
+diff -uNr zaptel-1.2.22.1/build_tools/genudevrules zaptel-1.2.22.1.gentoo/build_tools/genudevrules
+--- zaptel-1.2.22.1/build_tools/genudevrules	2007-01-31 12:27:30.000000000 -0500
++++ zaptel-1.2.22.1.gentoo/build_tools/genudevrules	2007-12-23 18:24:05.000000000 -0500
+@@ -22,10 +22,10 @@
+ 
+ cat <<EOF
+ # zaptel devices with ownership/permissions for running as non-root
+-KERNEL${match}"zapctl", NAME="zap/ctl", OWNER="asterisk", GROUP="asterisk", MODE="0660"
+-KERNEL${match}"zaptimer", NAME="zap/timer", OWNER="asterisk", GROUP="asterisk", MODE="0660"
+-KERNEL${match}"zapchannel", NAME="zap/channel", OWNER="asterisk", GROUP="asterisk", MODE="0660"
+-KERNEL${match}"zappseudo", NAME="zap/pseudo", OWNER="asterisk", GROUP="asterisk", MODE="0660"
+-KERNEL${match}"zaptranscode", NAME="zap/transcode", OWNER="asterisk", GROUP="asterisk", MODE="0660"
+-KERNEL${match}"zap[0-9]*", NAME="zap/%n", OWNER="asterisk", GROUP="asterisk", MODE="0660"
++KERNEL${match}"zapctl", NAME="zap/ctl", OWNER="root", GROUP="dialout", MODE="0660"
++KERNEL${match}"zaptimer", NAME="zap/timer", OWNER="root", GROUP="dialout", MODE="0660"
++KERNEL${match}"zapchannel", NAME="zap/channel", OWNER="root", GROUP="dialout", MODE="0660"
++KERNEL${match}"zappseudo", NAME="zap/pseudo", OWNER="root", GROUP="dialout", MODE="0660"
++KERNEL${match}"zaptranscode", NAME="zap/transcode", OWNER="root", GROUP="dialout", MODE="0660"
++KERNEL${match}"zap[0-9]*", NAME="zap/%n", OWNER="root", GROUP="dialout", MODE="0660"
+ EOF
+diff -uNr zaptel-1.2.22.1/Makefile zaptel-1.2.22.1.gentoo/Makefile
+--- zaptel-1.2.22.1/Makefile	2007-10-05 15:45:31.000000000 -0400
++++ zaptel-1.2.22.1.gentoo/Makefile	2007-12-23 21:56:57.000000000 -0500
+@@ -108,7 +108,7 @@
+ 
+ INSTALL_PREFIX	:= /usr
+ 
+-CFLAGS+=-I. -O4 -g -fPIC -Wall
++CFLAGS+=-I. -g -Wall
+ ifneq (,$(findstring ppc,$(MACHINE)))
+   CFLAGS	+= -fsigned-char
+   KFLAGS	+= -msoft-float -fsigned-char
+@@ -391,7 +391,7 @@
+ else # DYNFS
+   ifdef UDEVRULES
+ 	install -d $(DESTDIR)/etc/udev/rules.d
+-	build_tools/genudevrules > $(DESTDIR)/etc/udev/rules.d/zaptel.rules
++	build_tools/genudevrules > $(DESTDIR)/etc/udev/rules.d/10-zaptel.rules
+   else # !UDEVRULES
+ 	@echo "**** Dynamic filesystem detected -- not creating device nodes"
+   endif
+@@ -460,11 +460,10 @@
+ 	rm -f $(DESTDIR)$(MODS_DIR)/wcfxsusb.o
+ endif
+ 	rm -f $(DESTDIR)$(MODS_DIR)/wcfxs.o
+-	[ `id -u` = 0 ] && /sbin/depmod -a $(KVERS) || :
+ 
+ install-libs: libs
+ 	install -D -m 755 $(LIBTONEZONE_SO) $(DESTDIR)$(LIBDIR)/$(LIBTONEZONE_SO).$(LIBTONEZONE_SO_MAJOR_VER).$(LIBTONEZONE_SO_MINOR_VER)
+-	[ `id -u` = 0 ] && /sbin/ldconfig || :
++	[ `id -u` = 0 ] && /sbin/ldconfig -n $(DESTDIR)$(LIBDIR) || :
+ 	rm -f $(DESTDIR)$(LIBDIR)/$(LIBTONEZONE_SO)
+ 	ln -sf $(LIBTONEZONE_SO).$(LIBTONEZONE_SO_MAJOR_VER).$(LIBTONEZONE_SO_MINOR_VER) \
+ 		$(DESTDIR)$(LIBDIR)/$(LIBTONEZONE_SO).$(LIBTONEZONE_SO_MAJOR_VER)
diff --git a/net-misc/zaptel/zaptel-1.2.22.1.ebuild b/net-misc/zaptel/zaptel-1.2.22.1.ebuild
new file mode 100644
index 000000000000..92a60513d145
--- /dev/null
+++ b/net-misc/zaptel/zaptel-1.2.22.1.ebuild
@@ -0,0 +1,365 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/zaptel/zaptel-1.2.22.1.ebuild,v 1.1 2007/12/25 06:26:11 rajiv Exp $
+
+inherit toolchain-funcs eutils linux-mod
+
+BRI_VERSION="0.3.0-PRE-1y-l"
+
+IUSE="astribank bri ecmark ecmark2 ecmark3 ecaggressive eckb1 ecmg2 ecsteve ecsteve2
+rtc watchdog zapras zapnet"
+
+MY_P="${P/_/-}"
+
+DESCRIPTION="Drivers for Digium and ZapataTelephony cards"
+HOMEPAGE="http://www.asterisk.org"
+SRC_URI="http://downloads.digium.com/pub/zaptel/releases/${MY_P}.tar.gz
+	 bri? ( http://www.junghanns.net/downloads/bristuff-${BRI_VERSION}.tar.gz )
+	 "
+
+S="${WORKDIR}/${MY_P}"
+
+S_BRI="${WORKDIR}/bristuff-${BRI_VERSION}"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+RDEPEND="virtual/libc
+	dev-libs/libusb
+	>=dev-libs/newt-0.50.0
+	astribank? ( dev-lang/perl )"
+
+DEPEND="${RDEPEND} virtual/linux-sources"
+
+# list of echo canceller use flags,
+# first active in this list is selected (=order does matter)
+ZAP_EC_FLAGS="ecmark ecmark2 ecmark3 ecsteve ecsteve2 eckb1 ecmg2"
+
+### Begin: Helper functions
+
+select_echo_cancel() {
+	local myEC=""
+
+	for x in ${ZAP_EC_FLAGS}; do
+		if use $x; then
+			myEC=$(echo "$x" | sed -e "s:^ec::" | tr '[:lower:]' '[:upper:]')
+			break;
+		fi
+	done
+
+	echo ${myEC}
+}
+
+zconfig_disable() {
+	if grep -q "${1}" ${S}/zconfig.h; then
+		# match a little more than ${1} so we can use zconfig_disable
+		# to disable all echo cancellers in zconfig.h w/o calling it several times
+		sed -i -e "s:^[ \t]*#define[ \t]\+\(${1}[a-zA-Z0-9_-]*\).*:#undef \1:" \
+			${S}/zconfig.h
+	fi
+
+	return $?
+}
+
+zconfig_enable() {
+	if grep -q "${1}" ${S}/zconfig.h; then
+		sed -i  -e "s:^/\*[ \t]*#define[ \t]\+\(${1}\).*:#define \1:" \
+			-e "s:^[ \t]*#undef[ \t]\+\(${1}\).*:#define \1:" \
+			${S}/zconfig.h
+	fi
+
+	return $?
+}
+
+### End: Helper functions
+
+pkg_setup() {
+	local result=0 numec=0
+
+	linux-mod_pkg_setup
+
+	einfo "Running pre-flight checks..."
+
+	# basic zaptel checks
+	if kernel_is 2 4 ; then
+		if ! linux_chkconfig_present CRC32; then
+			echo
+			eerror "Your kernel lacks CRC32 support!"
+			eerror "Enable CONFIG_CRC32!"
+			result=$((result+1))
+		fi
+	else
+		if ! linux_chkconfig_present CRC_CCITT; then
+			echo
+			eerror "Your kernel lacks CRC_CCIT support!"
+			eerror "Enable CONFIG_CRC_CCIT!"
+			result=$((result+1))
+		fi
+		if ! linux_chkconfig_present FW_LOADER; then
+			echo
+			eerror "Your kernel lacks FW_LOADER support!"
+			eerror "Enable CONFIG_FW_LOADER!"
+			result=$((result+1))
+		fi
+	fi
+
+	# check if multiple echo cancellers have been selected
+	for x in ${ZAP_EC_FLAGS}; do
+		use $x && numec=$((numec+1))
+	done
+	if [[ $numec -gt 1 ]]; then
+		# multiple flags are active, only the first in the ZAP_EC_FLAGS list
+		# will be used, make sure the user knows about this
+		echo
+		ewarn "Multiple echo canceller flags are active but only one will be used!"
+		ewarn "Selected: $(select_echo_cancel)"
+	fi
+
+	# we need at least HDLC generic support
+	if use zapnet && ! linux_chkconfig_present HDLC; then
+		echo
+		eerror "zapnet: Your kernel lacks HDLC support!"
+		eerror "zapnet: Enable CONFIG_HDLC* to use zaptel network support!"
+		result=$((result+1))
+	fi
+
+	# zapras needs PPP support
+	if use zapras && ! linux_chkconfig_present PPP; then
+		echo
+		eerror "zapras: Your kernel lacks PPP support!"
+		eerror "zapras: Enable CONFIG_PPP* to use zaptel ras support!"
+		result=$((result+1))
+	fi
+
+	# rtc needs linux-2.6 and CONFIG_RTC
+	if use rtc; then
+		if ! kernel_is 2 6; then
+			echo
+			eerror "rtc: >=Linux-2.6.0 is needed for rtc support!"
+			result=$((result+1))
+		fi
+
+		if ! linux_chkconfig_present RTC; then
+			eerror "rtc: Your kernel lacks RealTime-Clock support!"
+			result=$((result+1))
+		fi
+	fi
+
+	if [[ $result -gt 0 ]]; then
+		echo
+		ewarn "One or more of the neccessary precondition(s) is/are not met!"
+		ewarn "Look at the messages above, resolve the problem (or disable the use-flag) and try again"
+		echo
+
+		if [[ $result -lt 3 ]]; then
+			eerror "[$result Error(s)] Zaptel is not happy :("
+		else
+			eerror "[$result Error(s)] You're making zaptel cry :'("
+		fi
+		die "[$result] Precondition(s) not met"
+	fi
+
+	echo
+	einfo "Zaptel is happy and continues... :)"
+}
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+	epatch ${FILESDIR}/${P}-gentoo.diff
+	epatch ${FILESDIR}/zaptel-1.2.9.1-ar.patch
+
+	# try to apply bristuff patch
+	if use bri; then
+		# fix for userpriv
+		chmod -R a=rwX ${S_BRI}
+
+		einfo "Patching zaptel w/ BRI stuff (${BRI_VERSION})"
+		epatch ${S_BRI}/patches/zaptel.patch
+
+		cd ${S_BRI}
+
+		# 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
+
+		cd ${S}
+	fi
+
+### Configuration changes
+	local myEC
+
+	# prepare zconfig.h
+	myEC=$(select_echo_cancel)
+	if [[ -n "${myEC}" ]]; then
+		einfo "Selected echo canceller: ${myEC}"
+		# disable default first, set new selected ec afterwards
+		zconfig_disable ECHO_CAN
+		zconfig_enable ECHO_CAN_${myEC}
+	fi
+
+	# enable rtc support on 2.6
+	if use rtc && linux_chkconfig_present RTC && kernel_is 2 6; then
+		einfo "Enabling ztdummy RTC support"
+		zconfig_enable USE_RTC
+	fi
+
+	# enable agressive echo surpression
+	use ecaggressive && \
+		zconfig_enable AGGRESSIVE_SUPPRESSOR
+
+	# ppp ras support
+	use zapras && \
+		zconfig_enable CONFIG_ZAPATA_PPP
+
+	# frame relay, syncppp...
+	use zapnet && \
+		zconfig_enable CONFIG_ZAPATA_NET
+
+	# zaptel watchdog
+	use watchdog && \
+		zconfig_enable CONFIG_ZAPTEL_WATCHDOG
+}
+
+src_compile() {
+	# build
+	make KVERS=${KV_FULL} \
+	     KSRC=${KV_DIR} ARCH=$(tc-arch-kernel) || die
+
+	if use astribank; then
+		cd ${S}/xpp/utils
+		make || die "make xpp utils failed"
+	fi
+
+	if use bri; then
+		cd ${S_BRI}
+		for x in cwain qozap zaphfc; do
+			einfo "Building ${x}..."
+			make KVERS=${KV_FULL} \
+				KSRC=/usr/src/linux \
+				ARCH=$(tc-arch-kernel) \
+				-C ${x} || die "make ${x} failed"
+		done
+	fi
+}
+
+src_install() {
+	# Create firmware directory
+	mkdir -p ${D}/lib/firmware/
+
+	kernel_is 2 4 && cp /etc/modules.conf ${D}/etc
+	make DESTDIR=${D} ARCH=$(tc-arch-kernel) \
+	KVERS=${KV_FULL} KSRC=/usr/src/linux devices firmware \
+	install-modules install-programs || die
+
+	dodoc ChangeLog README README.udev README.fxsusb zaptel.init
+	dodoc zaptel.conf.sample LICENSE zaptel.sysconfig README.fxotune
+
+	# additional tools
+	dobin ztmonitor ztspeed zttest fxotune
+
+	# install all header files, several packages need the complete set
+	# (e.g. sangoma wanpipe)
+	insinto /usr/include/zaptel
+	doins *.h
+
+	if use bri; then
+		einfo "Installing bri"
+		cd ${S_BRI}
+
+		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
+
+		cd ${S}
+	fi
+
+	# install init script
+	newinitd ${FILESDIR}/zaptel.rc6 zaptel
+	newconfd ${FILESDIR}/zaptel.confd zaptel
+
+	# install udev rule file
+	insinto /etc/udev/rules.d
+	newins ${FILESDIR}/zaptel.udevd 10-zaptel.rules
+
+	# fix permissions if there's no udev 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
+
+	if use astribank; then
+		cd ${S}/xpp/utils
+		eval `perl '-V:installarchlib'`
+		make DESTDIR=${D} PERLLIBDIR=${installarchlib} install || die "failed xpp utils install"
+		dosbin zt_registration xpp_sync lszaptel
+	fi
+}
+
+pkg_postinst() {
+	linux-mod_pkg_postinst
+
+	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 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
+}