new version, switched to kernel-mod.eclass (bug #68451), works with >=linux-2.6.9 (bug #66168)

7 files changed, 192 insertions, 24 deletions

diff --git a/net-misc/zaptel/ChangeLog b/net-misc/zaptel/ChangeLog
index bc672a812d61..a0a5a9a5d6d3 100644
--- a/net-misc/zaptel/ChangeLog
+++ b/net-misc/zaptel/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-misc/zaptel
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/zaptel/ChangeLog,v 1.16 2004/10/04 04:09:48 iggy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/zaptel/ChangeLog,v 1.17 2004/10/26 01:42:03 stkn Exp $
+
+*zaptel-1.0.1 (24 Oct 2004)
+
+  24 Oct 2004; <stkn@gentoo.org> +files/zaptel-1.0.1-modulesd.diff,
+  +files/zaptel-1.0.1-skbuff.diff, +zaptel-1.0.1.ebuild:
+  New version, includes skbuff fixes for >=linux-2.6.9 (bug #66168, thx to Kevin
+  Daughtridge <kevin@kdau.ath.cx>), now using kernel-mod.eclass
+  (bug #68451, thx to Stefan Schweizer <sschweizer@gmail.com>)
 
   03 Oct 2004; <iggy@gentoo.org> zaptel-1.0.0.ebuild:
   switched custom ARCH setting code to use set_arch_to_* from eutils, also
diff --git a/net-misc/zaptel/Manifest b/net-misc/zaptel/Manifest
index a04c78510cc9..eea0311c5450 100644
--- a/net-misc/zaptel/Manifest
+++ b/net-misc/zaptel/Manifest
@@ -1,29 +1,23 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 50a2f3af01a95978f69765ecb3e61e8a zaptel-1.0.0.ebuild 3196
-MD5 7f1a2d9310ce76f745a72baaa7a2ec47 zaptel-0.8.1.ebuild 1350
-MD5 4181d4bc03ffde84cb0ea2bc55eacbbf zaptel-0.7.0.ebuild 1403
-MD5 5443aee5ae773bde196704cf0e314bab ChangeLog 2298
+MD5 09de619370e6e84c9f759f3dcb10e41d ChangeLog 2661
 MD5 44cf247f04cc83413fcb40ed59d0847a metadata.xml 248
+MD5 4181d4bc03ffde84cb0ea2bc55eacbbf zaptel-0.7.0.ebuild 1403
+MD5 7f1a2d9310ce76f745a72baaa7a2ec47 zaptel-0.8.1.ebuild 1350
 MD5 2f9c63c938ecf48124ba4fd3e4f2648a zaptel-0.9.1.ebuild 3529
-MD5 48c7eb4a7726cb0ce920784778ad2efb files/zaptel-modulesd.patch 1601
-MD5 fae1145da422b8838c2a6ac3405dc4c4 files/zaptel.confd 371
-MD5 c80f1e0e4038771d3e3bc08284ecf917 files/zaptel-0.9.1-modulesd.diff 1941
+MD5 50a2f3af01a95978f69765ecb3e61e8a zaptel-1.0.0.ebuild 3196
+MD5 956bb27ba1724c3c22a02c720bc211ea zaptel-1.0.1.ebuild 3186
 MD5 4f38ae7d0fb20dee726303a35ca85eda files/digest-zaptel-0.7.0 64
-MD5 e356380452b756847ed2a73660c97ec4 files/digest-zaptel-0.8.1 134
+MD5 4f7493422ca6187bf1d786f94548656f files/digest-zaptel-0.8.1 64
 MD5 3921a7fd4a60c8785d510e857ff2eabe files/digest-zaptel-0.9.1 64
-MD5 9cf4f1d646d216441b7f4508ac7c0e8b files/digest-zaptel-1.0.0 64
 MD5 1dcd4bcf154cf1140d716eeeb8892ef3 files/zaptel-0.9.1-experimental-devfs26.diff 6432
-MD5 b72142a9b09e32506b88b96706abaeb4 files/zaptel.rc6 903
-MD5 e6a38926132312059bd3a8a712d8d88e files/zaptel-mkdir-usrincludelinux.patch 469
-MD5 c80f1e0e4038771d3e3bc08284ecf917 files/zaptel-1.0.0-modulesd.diff 1941
+MD5 c80f1e0e4038771d3e3bc08284ecf917 files/zaptel-0.9.1-modulesd.diff 1941
 MD5 fea918445512e51f2019ff20d78a7926 files/zaptel-install_prefix-typo.patch 486
+MD5 e6a38926132312059bd3a8a712d8d88e files/zaptel-mkdir-usrincludelinux.patch 469
+MD5 48c7eb4a7726cb0ce920784778ad2efb files/zaptel-modulesd.patch 1601
+MD5 fae1145da422b8838c2a6ac3405dc4c4 files/zaptel.confd 371
+MD5 b72142a9b09e32506b88b96706abaeb4 files/zaptel.rc6 903
+MD5 9cf4f1d646d216441b7f4508ac7c0e8b files/digest-zaptel-1.0.0 64
 MD5 60910db3ceada75031a91d419832871d files/zaptel-1.0.0-experimental-devfs26.diff 5474
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFBYM2YMSkoRwEucGERArkdAKCk5AIxgMuI0cwR3WRN5FgqIDa3vwCg81Vw
-8uDTy47NnduYKcst1zSHKkg=
-=Cfo8
------END PGP SIGNATURE-----
+MD5 c80f1e0e4038771d3e3bc08284ecf917 files/zaptel-1.0.0-modulesd.diff 1941
+MD5 648b9f0335741cf4aea7542ffe4705c6 files/zaptel-1.0.1-modulesd.diff 1837
+MD5 0edad95ac20c6e43ea6ee933e25ac23a files/zaptel-1.0.1-skbuff.diff 564
+MD5 dbd81e086a8331bea5752bf92e288f43 files/digest-zaptel-1.0.1 64
diff --git a/net-misc/zaptel/files/digest-zaptel-0.8.1 b/net-misc/zaptel/files/digest-zaptel-0.8.1
index 6f3a8a864b99..154840f98255 100644
--- a/net-misc/zaptel/files/digest-zaptel-0.8.1
+++ b/net-misc/zaptel/files/digest-zaptel-0.8.1
@@ -1,2 +1 @@
 MD5 d4ce4a6f1a17b5c2f3906b2f14806315 zaptel-0.8.1.tar.gz 287529
-MD5 d88b9795302be7999ccbc8e7fd1ef676 bri-stuff-0.0.2rc10.tar.gz 46107
diff --git a/net-misc/zaptel/files/digest-zaptel-1.0.1 b/net-misc/zaptel/files/digest-zaptel-1.0.1
new file mode 100644
index 000000000000..98b70d17c5da
--- /dev/null
+++ b/net-misc/zaptel/files/digest-zaptel-1.0.1
@@ -0,0 +1 @@
+MD5 728bad0a3aa73905ef6a57d13779d6da zaptel-1.0.1.tar.gz 296861
diff --git a/net-misc/zaptel/files/zaptel-1.0.1-modulesd.diff b/net-misc/zaptel/files/zaptel-1.0.1-modulesd.diff
new file mode 100644
index 000000000000..316c3cd61681
--- /dev/null
+++ b/net-misc/zaptel/files/zaptel-1.0.1-modulesd.diff
@@ -0,0 +1,41 @@
+--- Makefile.orig	2004-10-02 18:18:32.384754608 -0400
++++ Makefile	2004-10-02 18:19:41.581235144 -0400
+@@ -37,7 +37,8 @@
+ 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 $(INSTALL_PREFIX)/etc/modprobe.d ]; then echo "$(INSTALL_PREFIX)/etc/modprobe.d/zaptel"; elif [ -d $(INSTALL_PREFIX)/etc/modutils ]; then echo "$(INSTALL_PREFIX)/etc/modutils/zaptel"; elif [ -f $(INSTALL_PREFIX)/etc/modprobe.conf ]; then echo "$(INSTALL_PREFIX)/etc/modprobe.conf"; elif [ -f $(INSTALL_PREFIX)/etc/modules.conf ]; then echo "$(INSTALL_PREFIX)/etc/modules.conf"; else echo $(INSTALL_PREFIX)/etc/conf.modules ; fi)
++# Patch for Gentoo, uses modules.d
++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
+@@ -72,8 +73,7 @@
+ 
+ linux26: 
+ linux26: prereq $(BINS)
+-	@if ! [ -d /usr/src/linux-2.6 ]; then echo "Link /usr/src/linux-2.6 to your kernel sources first!"; exit 1 ; fi
+-	make -C /usr/src/linux-2.6 SUBDIRS=$(PWD) modules
++	make -C /usr/src/linux SUBDIRS=$(PWD) modules
+ 
+ obj-m := $(MODULESO) ztdummy.o
+ 
+@@ -285,6 +285,7 @@
+ 	install -m 644 tonezone.h $(INSTALL_PREFIX)/usr/include
+ 	( cd $(INSTALL_PREFIX)/usr/lib ; rm -f libtonezone.so ; ln -sf $(LIBTONEZONE) libtonezone.so )
+ 	/sbin/ldconfig
++	mkdir -p $(INSTALL_PREFIX)/etc/modules.d
+ 	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" | \
+@@ -309,10 +310,6 @@
+ 		fi; \
+ 	done
+ 
+-	if [ -d /etc/modutils ]; then \
+-		/sbin/update-modules ; \
+-	fi
+-	-/sbin/depmod -a
+ 	[ -f $(CONFIG_FILE) ] || install -m 644 zaptel.conf.sample $(CONFIG_FILE)
+ 
+ config:
diff --git a/net-misc/zaptel/files/zaptel-1.0.1-skbuff.diff b/net-misc/zaptel/files/zaptel-1.0.1-skbuff.diff
new file mode 100644
index 000000000000..5844aaf7b237
--- /dev/null
+++ b/net-misc/zaptel/files/zaptel-1.0.1-skbuff.diff
@@ -0,0 +1,15 @@
+--- zaptel-1.0.1-orig/ztd-eth.c	2004-08-16 13:27:12.000000000 -0400
++++ zaptel/ztd-eth.c	2004-10-12 23:36:01.000000000 -0400
+@@ -86,7 +86,11 @@
+ 	struct zt_span *span;
+ 	struct ztdeth_header *zh;
+ 	zh = (struct ztdeth_header *)skb->nh.raw;
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,9)
++	span = ztdeth_getspan(eth_hdr(skb)->h_source, zh->subaddr);
++#else
+ 	span = ztdeth_getspan(skb->mac.ethernet->h_source, zh->subaddr);
++#endif	
+ 	if (span) {
+ 		skb_pull(skb, sizeof(struct ztdeth_header));
+ 		zt_dynamic_receive(span, (unsigned char *)skb->data, skb->len);
+
diff --git a/net-misc/zaptel/zaptel-1.0.1.ebuild b/net-misc/zaptel/zaptel-1.0.1.ebuild
new file mode 100644
index 000000000000..f2ccf3c2ce51
--- /dev/null
+++ b/net-misc/zaptel/zaptel-1.0.1.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/zaptel/zaptel-1.0.1.ebuild,v 1.1 2004/10/26 01:42:03 stkn Exp $
+
+IUSE="devfs26"
+
+inherit eutils kernel-mod
+
+DESCRIPTION="Pseudo-TDM engine"
+HOMEPAGE="http://www.asterisk.org"
+SRC_URI="ftp://ftp.asterisk.org/pub/telephony/zaptel/zaptel-${PV}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~ppc"
+
+DEPEND="virtual/libc
+	virtual/linux-sources
+	>=dev-libs/newt-0.50.0"
+
+pkg_setup() {
+	einfo "Please make sure that your kernel has the appropriate"
+	einfo "ppp support enabled or present as modules before merging"
+	einfo "e.g."
+	einfo "CONFIG_PPP=m"
+	einfo "CONFIG_PPP_ASYNC=m"
+	einfo "CONFIG_PPP_DEFLATE=m"
+	einfo "CONFIG_PPPOE=m"
+	einfo "Otherwise quit this ebuild, rebuild your kernel and reboot"
+
+	# show an nice warning message about zaptel not supporting devfs on 2.6
+	if [ $(echo $KV | cut -d. -f1) -eq 2 ] && [ $(echo $KV|cut -d. -f2) -eq 6 ]; then
+		echo
+		einfo "You're using zaptel with linux-2.6:"
+		ewarn "   Zaptel doesn't support devfs with 2.6, you'll need to use udev or disable devfs"
+		ewarn "   or use devfs and write a script which re-creates the device nodes for you"
+		ewarn ""
+		ewarn "There's an experimental patch which adds devfs support when using linux-2.6, but:"
+		ewarn "  1. It's an ugly hack atm and needs a cleanup..."
+		ewarn "  2. I was only abled to test loding / unloading with the ztd-eth driver..."
+		ewarn "  3. I _really_ don't know if it works with real hardware..."
+		eerror "  4. And more important: This is not officially supported by Digium / the Asterisk project!!!"
+		ewarn ""
+		ewarn "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"
+		ewarn "You have been warned!"
+		echo
+		einfo "Sleeping 20 Seconds..."
+		epause 20
+	else
+		echo
+		einfo "Sleeping 10 Seconds..."
+		epause 10
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+	# >= 0.9.1 requires new patch
+	epatch ${FILESDIR}/${P}-modulesd.diff
+
+	# skbuff fix for >=linux-2.6.9
+	epatch ${FILESDIR}/${P}-skbuff.diff
+
+	# remove all from install target
+	sed -i -e "s#^\(install:\)[ \t]\+all[ \t]\+\(.*\)#\1 \2#" Makefile
+
+	# enable ztdummy...
+	sed -i -e "s:#\( ztdummy.*\):\1:" Makefile
+
+	# devfs support
+	if use devfs26; then
+		einfo "Enabling experimental devfs support for linux-2.6..."
+		epatch ${FILESDIR}/${PN}-1.0.0-experimental-devfs26.diff
+	fi
+}
+
+src_compile() {
+	set_arch_to_kernel
+	make || die
+	set_arch_to_portage
+}
+
+src_install() {
+	make INSTALL_PREFIX=${D} install || die
+
+	dodoc ChangeLog README README.udev README.Linux26 README.fxsusb zaptel.init zaptel.sysconfig
+	dodoc zaptel.conf.sample
+
+	# additional tools
+	dobin ztmonitor ztspeed zttest
+
+	# install init script
+	exeinto /etc/init.d
+	newexe ${FILESDIR}/zaptel.rc6 zaptel
+	insinto /etc/conf.d
+	newins ${FILESDIR}/zaptel.confd zaptel
+}
+
+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
+}