removing asterisk and zaptel 1.0.

(Portage version: 2.1.4_rc14)

8 files changed, 0 insertions, 843 deletions

diff --git a/net-misc/zaptel/files/digest-zaptel-1.0.10-r2 b/net-misc/zaptel/files/digest-zaptel-1.0.10-r2
deleted file mode 100644
index dda57b1c8ec3..000000000000
--- a/net-misc/zaptel/files/digest-zaptel-1.0.10-r2
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 215dd795ce8ea72370b2e9d1bb7d8f6a bristuff-0.2.0-RC8q.tar.gz 152037
-RMD160 aaa9ca23eaeb74abc96dd7240f67e7886d4d6ad9 bristuff-0.2.0-RC8q.tar.gz 152037
-SHA256 8ba7a1e1e6ee8e9d77853d6d790d0de5deced7c11679b9b0e108cca817ed9728 bristuff-0.2.0-RC8q.tar.gz 152037
-MD5 a0ee0e7b276abe8ef88030d1252d6a3d zaptel-1.0.10.tar.gz 327832
-RMD160 a797bb36f35e50c51d30705ad1d628f5728d87ed zaptel-1.0.10.tar.gz 327832
-SHA256 7978f3c56a95033bf2bc2cb8d0cb2830c5371aae21e0021503c6dbf2361795d1 zaptel-1.0.10.tar.gz 327832
diff --git a/net-misc/zaptel/files/zaptel-1.0.10-devfs26.diff b/net-misc/zaptel/files/zaptel-1.0.10-devfs26.diff
deleted file mode 100644
index 9b62e69764c1..000000000000
--- a/net-misc/zaptel/files/zaptel-1.0.10-devfs26.diff
+++ /dev/null
@@ -1,220 +0,0 @@
---- zaptel-1.0.10/zaptel.c.orig	2005-09-02 22:27:45.000000000 +0200
-+++ zaptel-1.0.10/zaptel.c	2005-11-22 19:25:39.000000000 +0100
-@@ -148,12 +148,14 @@
- 
- /* Here are a couple important little additions for devfs */
- #ifdef CONFIG_DEVFS_FS
-+#ifndef LINUX26
- static devfs_handle_t zaptel_devfs_dir;
- static devfs_handle_t channel;
- static devfs_handle_t pseudo;
- static devfs_handle_t ctl;
- static devfs_handle_t timer;
- #endif
-+#endif
- 
- /* udev necessary data structures.  Yeah! */
- #ifdef CONFIG_ZAP_UDEV
-@@ -1123,6 +1125,7 @@
- }
- 
- #ifdef CONFIG_DEVFS_FS
-+#ifndef LINUX26
- static devfs_handle_t register_devfs_channel(struct zt_chan *chan, devfs_handle_t dir)
- {
- 	char path[100];
-@@ -1165,6 +1168,36 @@
- 
- 	return chan_dev;
- }
-+#else
-+static dev_t register_devfs_channel(struct zt_chan *chan, dev_t dir)
-+{
-+#ifdef HAS_DEVFS_MK_SYMLINK
-+	char link[100];
-+	char path[100];
-+#endif
-+	dev_t chan_dev;
-+	umode_t mode = S_IFCHR|S_IRUGO|S_IWUGO;
-+
-+	/* create /dev/zap/span%d/%d channel device node */
-+	if ((chan_dev = devfs_mk_cdev(MKDEV(ZT_MAJOR, chan->channo), mode, "zap/span%d/%d", dir, chan->chanpos)) < 0) {
-+                printk("zaptel: Something really bad happened.  Unable to register devfs entry\n");
-+                return 0;
-+	}
-+
-+#ifdef HAS_DEVFS_MK_SYMLINK
-+	/* link /dev/zap/span%d/%d -> /dev/zap/%d ?!? */
-+	sprintf(path, "zap/span%d/%d", dir, chan->chanpos);
-+	sprintf(link, "zap/%d", chan->channo);
-+	devfs_mk_symlink(link, path);
-+#else
-+	/* register /dev/zap/%d channel node directly */
-+	if(devfs_mk_cdev(MKDEV(ZT_MAJOR, chan->channo), mode, "zap/%d", chan->channo) < 0) {
-+		printk("zaptel: Unable to register compat devfs entry\n");
-+	}
-+#endif
-+	return chan_dev;
-+}
-+#endif
- #endif /* CONFIG_DEVFS_FS */
- 
- static int zt_chan_reg(struct zt_chan *chan)
-@@ -4404,6 +4437,7 @@
- #endif
- 
- #ifdef CONFIG_DEVFS_FS
-+#ifndef LINUX26
- 	{
- 		char span_name[50];
- 		sprintf(span_name, "span%d", span->spanno);
-@@ -4413,6 +4447,15 @@
- 			chan->fhandle = register_devfs_channel(chan, chan->span->dhandle); /* Register our stuff with devfs */
- 		}
- 	}
-+#else
-+	{
-+		devfs_mk_dir("zap/span%d", span->spanno);
-+		for (x = 0; x < span->channels; x++) {
-+			struct zt_chan *chan = &span->chans[x];
-+			register_devfs_channel(chan, span->spanno); /* Register our stuff with devfs */
-+		}
-+	}
-+#endif
- #endif /* CONFIG_DEVFS_FS */
- 
- #ifdef CONFIG_ZAP_UDEV
-@@ -4460,11 +4503,22 @@
-         remove_proc_entry(tempfile, NULL);
- #endif /* CONFIG_PROC_FS */
- #ifdef CONFIG_DEVFS_FS
-+#ifndef LINUX26
- 	for (x = 0; x < span->channels; x++) {
- 		devfs_unregister(span->chans[x].fhandle);
- 		devfs_unregister(span->chans[x].fhandle_symlink);
- 	}
- 	devfs_unregister(span->dhandle);
-+#else
-+	for (x = 0; x < span->channels; x++) {
-+		/* remove symlink/compat device first */
-+		devfs_remove("zap/%d", span->chans[x].channo);
-+		/* remove channel device */
-+		devfs_remove("zap/span%d/%d", span->spanno, span->chans[x].chanpos);
-+	}
-+	/* remove span dir */
-+	devfs_remove("zap/span%d", span->spanno);
-+#endif
- #endif /* CONFIG_DEVFS_FS */
- 
- #ifdef CONFIG_ZAP_UDEV
-@@ -6452,6 +6506,7 @@
- #endif /* CONFIG_ZAP_UDEV */
- 
- #ifdef CONFIG_DEVFS_FS
-+#ifndef LINUX26
- 	{
- 	umode_t mode = S_IFCHR|S_IRUGO|S_IWUGO;
- 	devfs_register_chrdev(ZT_MAJOR, "zaptel", &zt_fops);
-@@ -6463,6 +6518,22 @@
- 	ctl = devfs_register(zaptel_devfs_dir, "ctl", DEVFS_FL_DEFAULT, ZT_MAJOR, 0, mode, &zt_fops, NULL);
- 	}
- #else
-+	{
-+		umode_t mode = S_IFCHR|S_IRUGO|S_IWUGO;
-+		if ((res = register_chrdev(ZT_MAJOR, "zaptel", &zt_fops)) < 0) {
-+                	printk(KERN_ERR "Unable to register for device on %d, error: %d\n", ZT_MAJOR, res);
-+                	return res;
-+		}
-+
-+		devfs_mk_dir("zap");
-+
-+		devfs_mk_cdev(MKDEV(ZT_MAJOR, 253), mode, "zap/timer");
-+		devfs_mk_cdev(MKDEV(ZT_MAJOR, 254), mode, "zap/channel");
-+		devfs_mk_cdev(MKDEV(ZT_MAJOR, 255), mode, "zap/pseudo");
-+		devfs_mk_cdev(MKDEV(ZT_MAJOR, 0),   mode, "zap/ctl");
-+	}
-+#endif
-+#else
- 	if ((res = register_chrdev(ZT_MAJOR, "zaptel", &zt_fops))) {
- 		printk(KERN_ERR "Unable to register tor device on %d\n", ZT_MAJOR);
- 		return res;
-@@ -6493,6 +6564,7 @@
- 		if (tone_zones[x])
- 			kfree(tone_zones[x]);
- #ifdef CONFIG_DEVFS_FS
-+#ifndef LINUX26
- 	devfs_unregister(timer);
- 	devfs_unregister(channel);
- 	devfs_unregister(pseudo);
-@@ -6508,6 +6580,16 @@
- 	class_destroy(zap_class);
- #endif /* CONFIG_ZAP_UDEV */
- 	unregister_chrdev(ZT_MAJOR, "zaptel");
-+
-+	devfs_remove("zap/timer");
-+	devfs_remove("zap/ctl");
-+	devfs_remove("zap/pseudo");
-+	devfs_remove("zap/channel");
-+
-+	devfs_remove("zap");
-+#endif
-+#else
-+	unregister_chrdev(ZT_MAJOR, "zaptel");
- #endif
- #ifdef CONFIG_ZAPTEL_WATCHDOG
- 	watchdog_cleanup();
---- zaptel-1.0.10/zaptel.h.orig	2005-11-15 15:28:44.000000000 +0100
-+++ zaptel-1.0.10/zaptel.h	2005-11-22 19:25:39.000000000 +0100
-@@ -52,18 +52,17 @@
- #define zap_pci_module pci_register_driver
- #else
- #define zap_pci_module pci_module_init
-+/* devfs_mk_symlink has been removed in 2.6.10 */
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,10)
-+#define HAS_DEVFS_MK_SYMLINK
-+#endif
- #endif
- 
- #include "ecdis.h"
- #include "fasthdlc.h"
- #endif
- #ifdef CONFIG_DEVFS_FS
--#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
- #include <linux/devfs_fs_kernel.h>
--#else
--#undef CONFIG_DEVFS_FS
--//#warning "Zaptel doesn't support DEVFS in post 2.4 kernels.  Disabling DEVFS in zaptel"
--#endif
- #endif /* CONFIG_DEVFS_FS */
- #include <linux/ioctl.h>
- 
-@@ -71,6 +70,8 @@
- #define ELAST 500
- #endif
- 
-+
-+
- /* Per-span configuration values */
- #define	ZT_CONFIG_TXLEVEL	7	/* bits 0-2 are tx level */
- 
-@@ -1153,8 +1154,10 @@
- #endif
- 
- #ifdef CONFIG_DEVFS_FS
-+#ifndef LINUX26
- 	devfs_handle_t fhandle;  /* File handle in devfs for the channel */
- 	devfs_handle_t fhandle_symlink;
-+#endif
- #endif /* CONFIG_DEVFS_FS */
- };
- 
-@@ -1290,7 +1293,9 @@
- 	int lastalarms;		/* Previous alarms */
- 
- #ifdef CONFIG_DEVFS_FS
-+#ifndef LINUX26
- 	devfs_handle_t dhandle;  /* Directory name */
-+#endif
- #endif	
- 	/* If the watchdog detects no received data, it will call the
- 	   watchdog routine */
diff --git a/net-misc/zaptel/files/zaptel-1.0.10-fix-zapata-debug-undefined-warnings.diff b/net-misc/zaptel/files/zaptel-1.0.10-fix-zapata-debug-undefined-warnings.diff
deleted file mode 100644
index b4f1b524a6f9..000000000000
--- a/net-misc/zaptel/files/zaptel-1.0.10-fix-zapata-debug-undefined-warnings.diff
+++ /dev/null
@@ -1,118 +0,0 @@
---- zaptel-1.0.10/zaptel.c.orig	2006-06-08 01:59:11.000000000 +0000
-+++ zaptel-1.0.10/zaptel.c	2006-06-08 02:00:02.000000000 +0000
-@@ -1260,7 +1260,7 @@
- #ifndef LINUX26
- 	MOD_INC_USE_COUNT;
- #endif	
--#if CONFIG_ZAPATA_DEBUG
-+#ifdef CONFIG_ZAPATA_DEBUG
- 	printk("ZAPNET: Opened channel %d name %s\n", ms->channo, ms->name);
- #endif
- 	return 0;
-@@ -1420,7 +1420,7 @@
- 		dev->trans_start = jiffies;
- 		stats->tx_packets++;
- 		stats->tx_bytes += ss->writen[oldbuf];
--#if CONFIG_ZAPATA_DEBUG
-+#ifdef CONFIG_ZAPATA_DEBUG
- 		printk("Buffered %d bytes to go out in buffer %d\n", ss->writen[oldbuf], oldbuf);
- 		for (x=0;x<ss->writen[oldbuf];x++)
- 		     printk("%02x ", ss->writebuf[oldbuf][x]);
-@@ -1521,7 +1521,7 @@
- 			   some space for us */
- 			ss->outwritebuf = oldbuf;
- 		}
--#if CONFIG_ZAPATA_DEBUG
-+#ifdef CONFIG_ZAPATA_DEBUG
- 		printk("Buffered %d bytes (skblen = %d) to go out in buffer %d\n", ss->writen[oldbuf], skb->len, oldbuf);
- 		for (x=0;x<ss->writen[oldbuf];x++)
- 		     printk("%02x ", ss->writebuf[oldbuf][x]);
-@@ -1732,7 +1732,7 @@
- 			amnt = chan->blocksize;
- 	}
- 
--#if CONFIG_ZAPATA_DEBUG
-+#ifdef CONFIG_ZAPATA_DEBUG
- 	printk("zt_chan_write(unit: %d, inwritebuf: %d, outwritebuf: %d amnt: %d\n", 
- 		unit, chan->inwritebuf, chan->outwritebuf, amnt);
- #endif
-@@ -1918,7 +1918,7 @@
- 	} else {
- 		for (x=0;x<NUM_SIGS;x++) {
- 			if (outs[x][0] == chan->sig) {
--#if CONFIG_ZAPATA_DEBUG
-+#ifdef CONFIG_ZAPATA_DEBUG
- 				printk("Setting bits to %d for channel %s state %d in %d signalling\n", outs[x][txsig + 1], chan->name, txsig, chan->sig);
- #endif
- 				chan->txhooksig = txsig;
-@@ -3008,14 +3008,14 @@
- 	if (!chan->span)
- 		return;
- 
--#if CONFIG_ZAPATA_DEBUG
-+#ifdef CONFIG_ZAPATA_DEBUG
- 	printk("Recalculating slaves on %s\n", chan->name);
- #endif
- 
- 	/* Link all slaves appropriately */
- 	for (x=chan->chanpos;x<chan->span->channels;x++)
- 		if (chan->span->chans[x].master == chan) {
--#if CONFIG_ZAPATA_DEBUG
-+#ifdef CONFIG_ZAPATA_DEBUG
- 			printk("Channel %s, slave to %s, last is %s, its next will be %d\n", 
- 			       chan->span->chans[x].name, chan->name, last->name, x);
- #endif
-@@ -3024,7 +3024,7 @@
- 		}
- 	/* Terminate list */
- 	last->nextslave = 0;
--#if CONFIG_ZAPATA_DEBUG
-+#ifdef CONFIG_ZAPATA_DEBUG
- 	printk("Done Recalculating slaves on %s (last is %s)\n", chan->name, last->name);
- #endif
- }
-@@ -3271,7 +3271,7 @@
- 			if (y >= 0) chans[ch.chan]->rxsig = (unsigned char)y;
- 			chans[ch.chan]->rxhooksig = ZT_RXSIG_INITIAL;
- 		}
--#if CONFIG_ZAPATA_DEBUG
-+#ifdef CONFIG_ZAPATA_DEBUG
- 		printk("Configured channel %s, flags %04x, sig %04x\n", chans[ch.chan]->name, chans[ch.chan]->flags, chans[ch.chan]->sig);
- #endif		
- 		spin_unlock_irqrestore(&chans[ch.chan]->lock, flags);
-@@ -5229,7 +5229,7 @@
- 				zt_rbs_sethook(chan,ZT_TXSIG_OFFHOOK, ZT_TXSTATE_AFTERSTART, ZT_AFTERSTART_TIME);
- 			}
- 			chan->kewlonhook = 0;
--#if CONFIG_ZAPATA_DEBUG
-+#ifdef CONFIG_ZAPATA_DEBUG
- 			printk("Off hook on channel %d, itimer = %d, gotgs = %d\n", chan->channo, chan->itimer, chan->gotgs);
- #endif
- 			if (chan->itimer) /* if timer still running */
-@@ -5748,7 +5748,7 @@
- 				oldbuf = ms->inreadbuf;
- 				ms->infcs = PPP_INITFCS;
- 				ms->readn[ms->inreadbuf] = ms->readidx[ms->inreadbuf];
--#if CONFIG_ZAPATA_DEBUG
-+#ifdef CONFIG_ZAPATA_DEBUG
- 				printk("EOF, len is %d\n", ms->readn[ms->inreadbuf]);
- #endif
- #if defined(CONFIG_ZAPATA_NET) || defined(CONFIG_ZAPATA_PPP)
-@@ -5818,7 +5818,7 @@
- 						/* Whoops, we're full, and have no where else
- 						to store into at the moment.  We'll drop it
- 						until there's a buffer available */
--#if CONFIG_ZAPATA_DEBUG
-+#ifdef CONFIG_ZAPATA_DEBUG
- 						printk("Out of storage space\n");
- #endif
- 						ms->inreadbuf = -1;
-@@ -5841,7 +5841,7 @@
- 					if (!ms->rxdisable) { /* if receiver enabled */
- 						/* Notify a blocked reader that there is data available
- 						to be read, unless we're waiting for it to be full */
--#if CONFIG_ZAPATA_DEBUG
-+#ifdef CONFIG_ZAPATA_DEBUG
- 						printk("Notifying reader data in block %d\n", oldbuf);
- #endif
- 						wake_up_interruptible(&ms->readbufq);
diff --git a/net-misc/zaptel/files/zaptel-1.0.10-gentoo.diff b/net-misc/zaptel/files/zaptel-1.0.10-gentoo.diff
deleted file mode 100644
index 4724762e8916..000000000000
--- a/net-misc/zaptel/files/zaptel-1.0.10-gentoo.diff
+++ /dev/null
@@ -1,116 +0,0 @@
---- zaptel-1.0.10/Makefile.orig	2005-11-04 06:03:38.000000000 +0100
-+++ zaptel-1.0.10/Makefile	2005-11-22 19:14:05.000000000 +0100
-@@ -15,13 +15,13 @@
- HOSTCC=gcc
- # If you want to build for a kernel other than the current kernel,set KVERS
- KVERS?=`uname -r`
--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)
-@@ -41,7 +41,7 @@
- CFLAGS+=-DZAPTEL_CONFIG=\"$(CONFIG_FILE)\"
- 
- BUILDVER=$(shell if echo -n $(KVERS) | 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)
-+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
-@@ -60,7 +60,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 )
-@@ -264,7 +264,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; \
-@@ -288,45 +288,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 $(KVERS) || :
- 	[ -f $(CONFIG_FILE) ] || install -D -m 644 zaptel.conf.sample $(CONFIG_FILE)
- 
- config:
---- zaptel-1.0.10/Makefile.orig	2005-11-22 19:22:28.000000000 +0100
-+++ zaptel-1.0.10/Makefile	2005-11-22 19:23:34.000000000 +0100
-@@ -49,7 +49,7 @@
- endif
- ifeq (${BUILDVER},linux26)
- #Tests for newer linux-2.6 udev support
--DYNFS=$(shell ps ax | grep -v grep | grep udevd && echo "yes")
-+DYNFS=$(shell ps ax | grep -v grep | grep -q "udevd\|devfsd" && echo "yes")
- endif
- 
- CHKCONFIG=$(shell sh -c 'type -p chkconfig' 2> /dev/null)
---- zaptel-1.0.10/Makefile.orig	2005-11-22 19:40:18.000000000 +0100
-+++ zaptel-1.0.10/Makefile	2005-11-22 19:41:01.000000000 +0100
-@@ -200,7 +200,7 @@
- 
- $(LIBTONEZONE): $(TZOBJS)
- 	$(CC) -shared -Wl,-soname,libtonezone.so.1 -lm -o $@ $(TZOBJS)
--	[ `id -u` = 0 ] && /sbin/ldconfig || :
-+	/sbin/ldconfig -n .
- 	ln -sf libtonezone.so.1 libtonezone.so                                  
- 
- ztcfg.c: ztcfg.h
diff --git a/net-misc/zaptel/files/zaptel-1.0.10-linux2.6.16.diff b/net-misc/zaptel/files/zaptel-1.0.10-linux2.6.16.diff
deleted file mode 100644
index de56811d692c..000000000000
--- a/net-misc/zaptel/files/zaptel-1.0.10-linux2.6.16.diff
+++ /dev/null
@@ -1,44 +0,0 @@
---- zaptel-1.0.10/zaptel.c.orig	2006-06-08 01:53:19.000000000 +0000
-+++ zaptel-1.0.10/zaptel.c	2006-06-08 01:56:35.000000000 +0000
-@@ -4419,7 +4419,11 @@
- 	for (x = 0; x < span->channels; x++) {
- 		char chan_name[50];
- 		sprintf(chan_name, "zap%d", span->chans[x].channo);
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,16)
- 		class_device_create(zap_class, MKDEV(ZT_MAJOR, span->chans[x].channo), NULL, chan_name);
-+#else
-+		class_device_create(zap_class, NULL, MKDEV(ZT_MAJOR, span->chans[x].channo), NULL, chan_name);
-+#endif
- 	}
- #endif /* CONFIG_ZAP_UDEV */
- 
-@@ -6445,10 +6449,17 @@
- 
- #ifdef CONFIG_ZAP_UDEV /* udev support functions */
- 	zap_class = class_create(THIS_MODULE, "zaptel");
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,16)
- 	class_device_create(zap_class, MKDEV(ZT_MAJOR, 253), NULL, "zaptimer");
- 	class_device_create(zap_class, MKDEV(ZT_MAJOR, 254), NULL, "zapchannel");
- 	class_device_create(zap_class, MKDEV(ZT_MAJOR, 255), NULL, "zappseudo");
- 	class_device_create(zap_class, MKDEV(ZT_MAJOR, 0), NULL, "zapctl");
-+#else
-+	class_device_create(zap_class, NULL, MKDEV(ZT_MAJOR, 253), NULL, "zaptimer");
-+	class_device_create(zap_class, NULL, MKDEV(ZT_MAJOR, 254), NULL, "zapchannel");
-+	class_device_create(zap_class, NULL, MKDEV(ZT_MAJOR, 255), NULL, "zappseudo");
-+	class_device_create(zap_class, NULL, MKDEV(ZT_MAJOR, 0), NULL, "zapctl");
-+#endif
- #endif /* CONFIG_ZAP_UDEV */
- 
- #ifdef CONFIG_DEVFS_FS
---- zaptel-1.0.10/wcusb.c.orig	2006-06-08 02:05:33.000000000 +0000
-+++ zaptel-1.0.10/wcusb.c	2006-06-08 02:06:08.000000000 +0000
-@@ -1448,7 +1448,9 @@
- static struct usb_driver wc_usb_driver =
- {
- #ifdef LINUX26
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,16)
- 	owner: THIS_MODULE,
-+#endif
- #else	
- 	fops: NULL,
- 	minor: 0,
diff --git a/net-misc/zaptel/files/zaptel-1.0.10-ukcid.patch b/net-misc/zaptel/files/zaptel-1.0.10-ukcid.patch
deleted file mode 100644
index 940abf8b0a98..000000000000
--- a/net-misc/zaptel/files/zaptel-1.0.10-ukcid.patch
+++ /dev/null
@@ -1,139 +0,0 @@
-Index: zaptel.c
-===================================================================
-RCS file: /usr/cvsroot/zaptel/zaptel.c,v
-retrieving revision 1.95.2.1
-diff -u -r1.95.2.1 zaptel.c
---- zaptel.c	6 Oct 2004 22:11:41 -0000	1.95.2.1
-+++ zaptel.c	2 Nov 2004 10:59:16 -0000
-@@ -703,6 +703,20 @@
- 	unsigned char *newbuf, *oldbuf;
- 	unsigned long flags;
- 	int x;
-+
-+        /* Allocate history buffer, or not.  This probably shouldn't
-+	 *            be here, but it's convenient */
-+       if(!j)
-+       {
-+          if(ss->history) kfree(ss->history);
-+          ss->history = NULL;
-+       }
-+       else
-+       {
-+         if(!ss->history) ss->history=kmalloc(ZT_HISTORY_BUF_LEN, GFP_KERNEL);
-+       }
-+       ss->historypos=0;
-+
- 	/* Check numbufs */
- 	if (numbufs < 2)
- 		numbufs = 2;
-@@ -3856,11 +3870,12 @@
- {
- 	struct zt_chan *chan = chans[unit];
- 	unsigned long flags;
--	int j, rv;
-+	int j, k1, k2, rv;
- 	int ret;
- 	int oldconf;
- 	void *rxgain=NULL;
- 	echo_can_state_t *ec, *tec;
-+	struct zt_history hist;
- 
- 	if (!chan)
- 		return -ENOSYS;
-@@ -4186,6 +4201,29 @@
- 			return -EINVAL;
- 		break;
- #endif
-+	case ZT_GET_HISTORY:
-+		if (copy_from_user(&hist,(struct zt_history *) data,sizeof(hist)))
-+			return -EIO;
-+
-+		if (!(chan->flags & ZT_FLAG_AUDIO)) return (-EINVAL);
-+		if (!chan->history) return -EINVAL;
-+		j=hist.len;
-+		k1=ZT_HISTORY_BUF_LEN-chan->historypos;
-+		k2=chan->historypos;
-+		if(j>0 && k1>0)
-+		{
-+			if (copy_to_user(hist.buf,chan->history+chan->historypos,min(j,k1)))
-+				return -EIO;
-+			j-=min(j,k1);
-+		}
-+		if(j>0 && k2>0)
-+		{
-+			if (copy_to_user(hist.buf+k1,chan->history,min(j,k2)))
-+				return -EIO;
-+			j-=min(j,k2);
-+		}
-+		/* Probably should assert j==0 here */
-+		break;
- 	default:
- 		return zt_chanandpseudo_ioctl(inode, file, cmd, data, unit);
- 	}
-@@ -5371,6 +5409,15 @@
- 	if (!(ms->flags &  ZT_FLAG_PSEUDO)) {
- 		memcpy(ms->putlin, putlin, ZT_CHUNKSIZE * sizeof(short));
- 		memcpy(ms->putraw, rxb, ZT_CHUNKSIZE);
-+	}
-+
-+	/* Store in the history buffer */
-+	if(ms->history)
-+	{
-+		memcpy(ms->history+ms->historypos,rxb,ZT_CHUNKSIZE);
-+		ms->historypos+=ZT_CHUNKSIZE;
-+		if(ms->historypos >= ZT_HISTORY_BUF_LEN)
-+			ms->historypos=0;
- 	}
- 	
- 	/* Take the rxc, twiddle it for conferencing if appropriate and put it
-Index: zaptel.h
-===================================================================
-RCS file: /usr/cvsroot/zaptel/zaptel.h,v
-retrieving revision 1.38
-diff -u -r1.38 zaptel.h
---- zaptel.h	27 Sep 2004 19:50:03 -0000	1.38
-+++ zaptel.h	2 Nov 2004 10:59:17 -0000
-@@ -137,6 +137,8 @@
- #define ZT_MAX_NUM_BUFS		 32
- #define ZT_MAX_BUF_SPACE         32768
- 
-+#define ZT_HISTORY_BUF_LEN       16384 /* Count of ulaw samples */
-+
- #define ZT_DEFAULT_BLOCKSIZE 1024
- #define ZT_DEFAULT_MTR_MRU	 2048
- 
-@@ -277,6 +279,11 @@
- int reserved[4];	/* Reserved for future expansion -- always set to 0 */
- } ZT_DIAL_PARAMS;
- 
-+typedef struct zt_history
-+{
-+	unsigned char   *buf;           /* Sample buffer */
-+	int len;                /* Length of buffer, in bytes */
-+} ZT_HISTORY;
- 
- typedef struct zt_dynamic_span {
- 	char driver[20];	/* Which low-level driver to use */
-@@ -584,6 +591,11 @@
- #define ZT_TIMERPONG _IOW (ZT_CODE, 53, int)
- 
- /*
-+ * Return history buffer
-+ */
-+#define ZT_GET_HISTORY _IOR(ZT_CODE, 54, struct zt_history)
-+
-+/*
-  * Set/get signalling freeze
-  */
- #define ZT_SIGFREEZE _IOW (ZT_CODE, 54, int)
-@@ -989,6 +1001,10 @@
- 	wait_queue_head_t writebufq; /* write wait queue */
- 	
- 	int		blocksize;	/* Block size */
-+
-+
-+        u_char          *history;       /* History buffer, for pre-ring caller ID (ZT_HISTORY_BUF_LEN) */
-+        u_short         historypos;     /* Current position within buffer */
- 
- 	int		eventinidx;  /* out index in event buf (circular) */
- 	int		eventoutidx;  /* in index in event buf (circular) */
diff --git a/net-misc/zaptel/files/zaptel-1.0.4-gcc34.patch b/net-misc/zaptel/files/zaptel-1.0.4-gcc34.patch
deleted file mode 100644
index ea80c9e0ca06..000000000000
--- a/net-misc/zaptel/files/zaptel-1.0.4-gcc34.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -ruN zaptel-1.0.4.orig/wcfxs.c zaptel-1.0.4/wcfxs.c
---- zaptel-1.0.4.orig/wcfxs.c	2005-01-31 14:27:54.828322677 -0500
-+++ zaptel-1.0.4/wcfxs.c	2005-01-31 14:32:15.629810758 -0500
-@@ -740,7 +740,7 @@
-     return 0;
- }
- 
--static inline void wcfxs_voicedaa_check_hook(struct wcfxs *wc, int card)
-+static void wcfxs_voicedaa_check_hook(struct wcfxs *wc, int card)
- {
- #ifndef AUDIO_RINGCHECK
- 	unsigned char res;
-@@ -884,7 +884,7 @@
- 	}
- }
- 
--static inline void wcfxs_proslic_check_hook(struct wcfxs *wc, int card)
-+static void wcfxs_proslic_check_hook(struct wcfxs *wc, int card)
- {
- 	char res;
- 	int hook;
-@@ -939,7 +939,7 @@
- 	
- }
- 
--static inline void wcfxs_proslic_recheck_sanity(struct wcfxs *wc, int card)
-+static void wcfxs_proslic_recheck_sanity(struct wcfxs *wc, int card)
- {
- 	int res;
- 	/* Check loopback */
diff --git a/net-misc/zaptel/files/zaptel-1.0.9-rtc.patch b/net-misc/zaptel/files/zaptel-1.0.9-rtc.patch
deleted file mode 100644
index a3adaa111c79..000000000000
--- a/net-misc/zaptel/files/zaptel-1.0.9-rtc.patch
+++ /dev/null
@@ -1,170 +0,0 @@
-Index: ztdummy.c
-===================================================================
-RCS file: /usr/cvsroot/zaptel/ztdummy.c,v
-retrieving revision 1.4.2.4
-diff -u -r1.4.2.4 ztdummy.c
---- ztdummy.c 21 Jan 2005 05:05:18 -0000	1.4.2.4
-+++ ztdummy.c 21 May 2005 21:53:28 -0000
-@@ -6,6 +6,7 @@
-  * Written by Robert Pleh <robert.pleh@hermes.si>
-  * 2.6 version by Tony Hoyle
-  * Unified by Mark Spencer <markster@digium.com>
-+ * Converted to use RTC on i386 by Tony Mountifield <tony@softins.co.uk>
-  *
-  * Copyright (C) 2002, Hermes Softlab
-  * Copyright (C) 2004, Digium, Inc.
-@@ -38,6 +39,15 @@
- #  error "This kernel is too old: not supported by this file"
- #endif
- 
-+/*
-+ * NOTE: (only applies to kernel 2.6)
-+ * If using an i386 architecture without a PC real-time clock,
-+ * the #define USE_RTC should be commented out.
-+ */
-+#if defined(__i386__) || defined(__x86_64__)
-+#define USE_RTC
-+#endif
-+
- #include <linux/kernel.h>
- #include <linux/errno.h>
- #include <linux/module.h>
-@@ -54,6 +64,9 @@
- #include <asm/io.h>
- #endif
- #ifdef LINUX26
-+#ifdef USE_RTC
-+#include <linux/rtc.h>
-+#endif
- #include <linux/moduleparam.h>
- #endif
- #include "ztdummy.h"
-@@ -77,8 +90,10 @@
- static int debug = 0;
- 
- #ifdef LINUX26
-+#ifndef USE_RTC
- /* New 2.6 kernel timer stuff */
- static struct timer_list timer;
-+#endif
- #else
- #if LINUX_VERSION_CODE < VERSION_CODE(2,4,5)
- #  error "This kernel is too old: not supported by this file"
-@@ -103,6 +118,28 @@
- 
- 
- #ifdef LINUX26
-+#ifdef USE_RTC
-+/* rtc_interrupt - called at 1024Hz from hook in RTC handler */
-+static void rtc_interrupt(void *private_data)
-+{
-+	struct ztdummy *ztd = private_data;
-+	unsigned int ticks;
-+
-+	atomic_inc(&ztd->ticks);
-+	ticks = atomic_read(&ztd->ticks);
-+	if (ticks == 42 || ticks == 85) {
-+		/* skip it */
-+	} else if (ticks >= 128) {
-+		/* skip and restart count */
-+		atomic_set(&ztd->ticks, 0);
-+	} else {
-+		/* zaptel timing - called in 125 of every 128 interrupts = 1000Hz */
-+		zt_receive(&ztd->span);
-+		zt_transmit(&ztd->span);
-+	}
-+}
-+#else
-+/* use kernel system tick timer if PC architecture RTC is not available */
- static void ztdummy_timer(unsigned long param)
- {
-     zt_receive(&ztd->span);
-@@ -110,6 +147,7 @@
-     timer.expires = jiffies + 1;
-     add_timer(&timer);
- }
-+#endif
- #else
- static void ztdummy_interrupt(int irq, void *dev_id, struct pt_regs *regs)
- {
-@@ -150,7 +188,11 @@
- 
- int init_module(void)
- {
--#ifndef LINUX26
-+#ifdef LINUX26
-+#ifdef USE_RTC
-+    int err;
-+#endif
-+#else
-     int irq;
-     spinlock_t mylock = SPIN_LOCK_UNLOCKED;
- 	
-@@ -180,10 +222,25 @@
-     }
- 
- #ifdef LINUX26
-+#ifdef USE_RTC
-+    atomic_set(&ztd->ticks, 0);
-+    ztd->rtc_task.func = rtc_interrupt;
-+    ztd->rtc_task.private_data = ztd;
-+    err = rtc_register(&ztd->rtc_task);
-+    if (err < 0) {
-+	printk("ztdummy: Unable to register zaptel rtc driver\n");
-+        zt_unregister(&ztd->span);
-+	kfree(ztd);
-+	return err;
-+    }
-+    rtc_control(&ztd->rtc_task, RTC_IRQP_SET, 1024);	/* 1024 Hz */
-+    rtc_control(&ztd->rtc_task, RTC_PIE_ON, 0);
-+#else
-     init_timer(&timer);
-     timer.function = ztdummy_timer;
-     timer.expires = jiffies + 1;
-     add_timer(&timer);
-+#endif
- #else
-     irq=s->irq;
-     spin_lock_irq(&mylock);
-@@ -214,7 +271,12 @@
- void cleanup_module(void)
- {
- #ifdef LINUX26
-+#ifdef USE_RTC
-+    rtc_control(&ztd->rtc_task, RTC_PIE_OFF, 0);
-+    rtc_unregister(&ztd->rtc_task);
-+#else
-     del_timer(&timer);
-+#endif
- #else
-     free_irq(s->irq, ztd);  /* disable interrupts */
- #endif
-Index: ztdummy.h
-===================================================================
-RCS file: /usr/cvsroot/zaptel/ztdummy.h,v
-retrieving revision 1.2
-diff -u -r1.2 ztdummy.h
---- ztdummy.h 24 Feb 2003 06:00:31 -0000	1.2
-+++ ztdummy.h 21 May 2005 21:53:28 -0000
-@@ -32,9 +32,16 @@
- struct ztdummy {
- 	struct zt_span span;
- 	struct zt_chan chan;
-+#ifdef LINUX26
-+#ifdef USE_RTC
-+	atomic_t ticks;
-+	rtc_task_t rtc_task;
-+#endif
-+#endif
- };
- 
- 
-+#ifndef LINUX26
- /* Uhci definitions and structures - from file usb-uhci.h */
- #define TD_CTRL_IOC		(1 << 24)	/* Interrupt on Complete */
- #define USBSTS 2
-@@ -141,3 +148,4 @@
- 	struct pci_pool *desc_pool;
- 	long last_error_time;          // last error output in uhci_interrupt()
- } uhci_t, *puhci_t;
-+#endif