Get argentina zonedata into zaptel, files cleanup

(Portage version: 2.1.1)
 (Signed Manifest commit)

9 files changed, 22 insertions, 1224 deletions

diff --git a/net-misc/zaptel/Manifest b/net-misc/zaptel/Manifest
index 1210081b9302..24c37b722bff 100644
--- a/net-misc/zaptel/Manifest
+++ b/net-misc/zaptel/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX zaptel-1.0.10-devfs26.diff 6026 RMD160 81a4c9d3520b0b716f28dc41ac1c4518a8d9efa6 SHA1 5a018b95fd6c7340ae383624a2206566c2fd3874 SHA256 da217fc40c3d1faf4de800818c78966b915f3b928e00ff02812725104511cebf
 MD5 24ffa9ff867ef807083a53f61465fe02 files/zaptel-1.0.10-devfs26.diff 6026
 RMD160 81a4c9d3520b0b716f28dc41ac1c4518a8d9efa6 files/zaptel-1.0.10-devfs26.diff 6026
@@ -18,38 +21,22 @@ AUX zaptel-1.0.10-ukcid.patch 3787 RMD160 4c4c3b9036db8051643901892a40fbcd153184
 MD5 699723eb0b0ad059702af4fc4de7bf95 files/zaptel-1.0.10-ukcid.patch 3787
 RMD160 4c4c3b9036db8051643901892a40fbcd153184d6 files/zaptel-1.0.10-ukcid.patch 3787
 SHA256 d60c436b44481ec68272572643e83055ec5766f3d0331be0209e789637fb5720 files/zaptel-1.0.10-ukcid.patch 3787
-AUX zaptel-1.0.4-experimental-devfs26.diff 5982 RMD160 e7d331073edc6e50e394af8a142c865e2aa9a1d2 SHA1 68c82135d1fbb28f717dbfffe0e1cbcf1a63e60a SHA256 1d8ea43898ae88b7dd46bb6c868b909696350ee791af93c64664e803c1b9a66e
-MD5 d40a84eeea5866a3afbac2603e970e7b files/zaptel-1.0.4-experimental-devfs26.diff 5982
-RMD160 e7d331073edc6e50e394af8a142c865e2aa9a1d2 files/zaptel-1.0.4-experimental-devfs26.diff 5982
-SHA256 1d8ea43898ae88b7dd46bb6c868b909696350ee791af93c64664e803c1b9a66e files/zaptel-1.0.4-experimental-devfs26.diff 5982
 AUX zaptel-1.0.4-gcc34.patch 821 RMD160 64b53c7b57e62c0678cf84522809f14cf13c94e5 SHA1 24360edfca90977a00efa08061f7fb5bf8c5244a SHA256 8bd95bb618531fef437edb9d83e1a296bd10bea4eb7576cf7f0a2eb09a69dcbe
 MD5 090668aabb8e77cfd0d83835f52bd105 files/zaptel-1.0.4-gcc34.patch 821
 RMD160 64b53c7b57e62c0678cf84522809f14cf13c94e5 files/zaptel-1.0.4-gcc34.patch 821
 SHA256 8bd95bb618531fef437edb9d83e1a296bd10bea4eb7576cf7f0a2eb09a69dcbe files/zaptel-1.0.4-gcc34.patch 821
-AUX zaptel-1.0.7-gentoo.diff 4459 RMD160 85292201131fac627baa7ad7750d2c2bb245f202 SHA1 634ddffa1c19ad2652b11015d2410933125ec8fd SHA256 0e352a3b13939941659970d313c30b10fd2b29457dead9b7bba4fc52e19b6ca4
-MD5 8471d7eb15aebff9c72f67861cb1ad88 files/zaptel-1.0.7-gentoo.diff 4459
-RMD160 85292201131fac627baa7ad7750d2c2bb245f202 files/zaptel-1.0.7-gentoo.diff 4459
-SHA256 0e352a3b13939941659970d313c30b10fd2b29457dead9b7bba4fc52e19b6ca4 files/zaptel-1.0.7-gentoo.diff 4459
-AUX zaptel-1.0.8-gentoo.diff 4747 RMD160 61966135b54cd306722cb18e51b4532f0cba7a5f SHA1 a37f3fa324c8bc625d8b10f5809856c55f98d879 SHA256 6115064bf1def0c6397b00da49b8b9c67ff05790adbcabd70bc083ea853577a5
-MD5 e72dc0fa3cbcd55182b6f05d8c731694 files/zaptel-1.0.8-gentoo.diff 4747
-RMD160 61966135b54cd306722cb18e51b4532f0cba7a5f files/zaptel-1.0.8-gentoo.diff 4747
-SHA256 6115064bf1def0c6397b00da49b8b9c67ff05790adbcabd70bc083ea853577a5 files/zaptel-1.0.8-gentoo.diff 4747
-AUX zaptel-1.0.9-gentoo.diff 4855 RMD160 2862e476b25e1486f1eafb7d27bca2c739184913 SHA1 0340ca0b6c531ce7496a263e9a88791ebc57992b SHA256 e428664769e339327f4aa099d0212b404fc89acf525d7f08e7c768b8cb90e207
-MD5 5fe59834ed82727b3297f9e39eb855be files/zaptel-1.0.9-gentoo.diff 4855
-RMD160 2862e476b25e1486f1eafb7d27bca2c739184913 files/zaptel-1.0.9-gentoo.diff 4855
-SHA256 e428664769e339327f4aa099d0212b404fc89acf525d7f08e7c768b8cb90e207 files/zaptel-1.0.9-gentoo.diff 4855
 AUX zaptel-1.0.9-rtc.patch 4238 RMD160 022a7501aacc70553fc6603681804732c358e3b5 SHA1 9136545f118afae522020da789de60323368e3c7 SHA256 f213fb1db81f4f00f07ac87654729875e529554f3374007ca7dea70821f85e00
 MD5 6029a1280d38d8c67577bc7a873fd336 files/zaptel-1.0.9-rtc.patch 4238
 RMD160 022a7501aacc70553fc6603681804732c358e3b5 files/zaptel-1.0.9-rtc.patch 4238
 SHA256 f213fb1db81f4f00f07ac87654729875e529554f3374007ca7dea70821f85e00 files/zaptel-1.0.9-rtc.patch 4238
-AUX zaptel-1.0.9_p2-gentoo.diff 5179 RMD160 cd93992bd6ca2b5da23a87d388fc467bf47cdc7b SHA1 5af003a0bf33a6e8d6d946a6fb09e2cc1723e1ce SHA256 bcd27714804472e020003663ee641d99eab80f1034328605f9442c5c3b960bf7
-MD5 077231bb1ba50aedfd08476b9d4eb18b files/zaptel-1.0.9_p2-gentoo.diff 5179
-RMD160 cd93992bd6ca2b5da23a87d388fc467bf47cdc7b files/zaptel-1.0.9_p2-gentoo.diff 5179
-SHA256 bcd27714804472e020003663ee641d99eab80f1034328605f9442c5c3b960bf7 files/zaptel-1.0.9_p2-gentoo.diff 5179
 AUX zaptel-1.2.0-ukcid.patch 3787 RMD160 4c4c3b9036db8051643901892a40fbcd153184d6 SHA1 f4da18f52f6dc92c84d9534c10882f3b657d93a3 SHA256 d60c436b44481ec68272572643e83055ec5766f3d0331be0209e789637fb5720
 MD5 699723eb0b0ad059702af4fc4de7bf95 files/zaptel-1.2.0-ukcid.patch 3787
 RMD160 4c4c3b9036db8051643901892a40fbcd153184d6 files/zaptel-1.2.0-ukcid.patch 3787
 SHA256 d60c436b44481ec68272572643e83055ec5766f3d0331be0209e789637fb5720 files/zaptel-1.2.0-ukcid.patch 3787
+AUX zaptel-1.2.9.1-ar.patch 924 RMD160 24eac6e9c5a9576b04df1e595fa6a2e2487772fe SHA1 fdf329d360508d8e629d196d4f0e6ccfabf24dff SHA256 8a8374b2689ed70108d10eb704bb6d3b35550f33a183e039e7efd69c7a681485
+MD5 235d2550fd9a0bde64929e27a6a2343d files/zaptel-1.2.9.1-ar.patch 924
+RMD160 24eac6e9c5a9576b04df1e595fa6a2e2487772fe files/zaptel-1.2.9.1-ar.patch 924
+SHA256 8a8374b2689ed70108d10eb704bb6d3b35550f33a183e039e7efd69c7a681485 files/zaptel-1.2.9.1-ar.patch 924
 AUX zaptel-1.2.9.1-gcc411_is_a_retard-kbuild.patch 306 RMD160 565eb368b1b05a177caee5a43206738cb8302b2d SHA1 950ab0c803564831a8258e6df4b09688e0b18d9f SHA256 08b1d97bb66c9594dddec108404220fa499f4ac8b2b211f63f7d8cc98b0a78bf
 MD5 93494506ca6c66b90a6175a2f50965ec files/zaptel-1.2.9.1-gcc411_is_a_retard-kbuild.patch 306
 RMD160 565eb368b1b05a177caee5a43206738cb8302b2d files/zaptel-1.2.9.1-gcc411_is_a_retard-kbuild.patch 306
@@ -58,18 +45,6 @@ AUX zaptel-1.2.9.1-gentoo.diff 5129 RMD160 b85980028878905c8db0821c5f5d59d500591
 MD5 2ba3db989e7bacdefb157b6bb6d57f61 files/zaptel-1.2.9.1-gentoo.diff 5129
 RMD160 b85980028878905c8db0821c5f5d59d500591a8f files/zaptel-1.2.9.1-gentoo.diff 5129
 SHA256 2414a99c0608e562afaa84446756cb8df59cdb91b8f81aecaef65d6a0db3b3ed files/zaptel-1.2.9.1-gentoo.diff 5129
-AUX zaptel-bristuff-0.2.0-RC8g.patch 5551 RMD160 9592e1f860ca0ef8cdb206a3f0379520937766da SHA1 5c6429756616a4a66363e0d62f927e25b0f4980d SHA256 9a637faa2891a7b2773f2a0f8124cb89041b64a1e33bf2b35e9e916ddc62dca2
-MD5 cce31b4380f9c62e91293dff1523d5e0 files/zaptel-bristuff-0.2.0-RC8g.patch 5551
-RMD160 9592e1f860ca0ef8cdb206a3f0379520937766da files/zaptel-bristuff-0.2.0-RC8g.patch 5551
-SHA256 9a637faa2891a7b2773f2a0f8124cb89041b64a1e33bf2b35e9e916ddc62dca2 files/zaptel-bristuff-0.2.0-RC8g.patch 5551
-AUX zaptel-bristuff-0.2.0-RC8h.patch 6064 RMD160 7f678d0591b3b4e39e20d74b9eff1c2b81ae8f9a SHA1 9211da7fb5f14bc4b32aae10b658e9d886e2ede6 SHA256 3ce8bbb2075cb000b371318cef6e8f1b4d59ce8e772543f5739a632f8aa47586
-MD5 d893c36bffff825ab0e6d48e1ad0acea files/zaptel-bristuff-0.2.0-RC8h.patch 6064
-RMD160 7f678d0591b3b4e39e20d74b9eff1c2b81ae8f9a files/zaptel-bristuff-0.2.0-RC8h.patch 6064
-SHA256 3ce8bbb2075cb000b371318cef6e8f1b4d59ce8e772543f5739a632f8aa47586 files/zaptel-bristuff-0.2.0-RC8h.patch 6064
-AUX zaptel-bristuff-0.2.0-RC8n.patch 6064 RMD160 d2bcb835e35875e90f3322dff83298d0826aaa8e SHA1 b2733e47d686264c960bf283276bf1d4d553d65a SHA256 9b6df20d52b75122108c52160aee246bc0d8103d678687192398e02a320c692b
-MD5 f5d81a19c52c5e88fefed12251674134 files/zaptel-bristuff-0.2.0-RC8n.patch 6064
-RMD160 d2bcb835e35875e90f3322dff83298d0826aaa8e files/zaptel-bristuff-0.2.0-RC8n.patch 6064
-SHA256 9b6df20d52b75122108c52160aee246bc0d8103d678687192398e02a320c692b files/zaptel-bristuff-0.2.0-RC8n.patch 6064
 AUX zaptel-bristuff-0.2.0-RC8q.patch 6080 RMD160 39e063f8716198a78e1bc5a232bc60de355db1f6 SHA1 c310dc130a66b9479b99d248933086d7f75d2a1a SHA256 7344aa1fbdfb4ead188ed3d26695cfe93e9c650e1dc4f9ef2de067e88a21eefa
 MD5 5ebdd425fca1594698e4f21e44c5e055 files/zaptel-bristuff-0.2.0-RC8q.patch 6080
 RMD160 39e063f8716198a78e1bc5a232bc60de355db1f6 files/zaptel-bristuff-0.2.0-RC8q.patch 6080
@@ -99,14 +74,14 @@ EBUILD zaptel-1.0.10-r1.ebuild 7197 RMD160 2f60f18488f4b49ac43e4310fe4501939f96b
 MD5 33564fe4757a198a8f2a627408c9a9b1 zaptel-1.0.10-r1.ebuild 7197
 RMD160 2f60f18488f4b49ac43e4310fe4501939f96b405 zaptel-1.0.10-r1.ebuild 7197
 SHA256 e533d31fd85708fec97e0e315ee738ad964aadfeb84f8f9595059a6efca501a3 zaptel-1.0.10-r1.ebuild 7197
-EBUILD zaptel-1.2.9.1.ebuild 8530 RMD160 cbfcbdd1add7eed4f6e9461ea31878258fcba2bd SHA1 a0ae0d0a807cfa343bce578748f18411073ea5d7 SHA256 a0786f264e7b0a943adb0ed79df1295b77a8150c8e765ef62a4752084d789a59
-MD5 959182587bbbbb2a8e16f2f95aff1827 zaptel-1.2.9.1.ebuild 8530
-RMD160 cbfcbdd1add7eed4f6e9461ea31878258fcba2bd zaptel-1.2.9.1.ebuild 8530
-SHA256 a0786f264e7b0a943adb0ed79df1295b77a8150c8e765ef62a4752084d789a59 zaptel-1.2.9.1.ebuild 8530
-MISC ChangeLog 15583 RMD160 bbb6e5e85633366b4aa91cb41ed38a977f4d2937 SHA1 c55199a66190e3adb5947e3fd55e02e530d4fe09 SHA256 ad21ff3dd83438b3b8d84bd052fbebcd4f2fd2a2f4a616d4a6a7df77a052ec85
-MD5 d474bc25940e2680d7b4607f39966fda ChangeLog 15583
-RMD160 bbb6e5e85633366b4aa91cb41ed38a977f4d2937 ChangeLog 15583
-SHA256 ad21ff3dd83438b3b8d84bd052fbebcd4f2fd2a2f4a616d4a6a7df77a052ec85 ChangeLog 15583
+EBUILD zaptel-1.2.9.1.ebuild 8575 RMD160 b9af570db9ba331de49ac430b145ac53e2e42003 SHA1 8a7e985373e5ccd71cf487aeb44fe4cd958a1fa3 SHA256 04c3aeabac5b9986e2a3300a44d6bc5bf0d1f008a8358a36d5ebd9da512e02bc
+MD5 007389577e55270a7e8b7412a375f6d6 zaptel-1.2.9.1.ebuild 8575
+RMD160 b9af570db9ba331de49ac430b145ac53e2e42003 zaptel-1.2.9.1.ebuild 8575
+SHA256 04c3aeabac5b9986e2a3300a44d6bc5bf0d1f008a8358a36d5ebd9da512e02bc zaptel-1.2.9.1.ebuild 8575
+MISC ChangeLog 16065 RMD160 1c91580e7063482f0e71232f8a9a22733bc3fa51 SHA1 1ac4fb976aa83e86e6ae7c699f34755394c5b9b1 SHA256 7164cae64ee5bc3dd0f34257920834527cb4eaa60c9ba7a0ff4215d67e66d3be
+MD5 50e822129c111ecbc24317f4913a318b ChangeLog 16065
+RMD160 1c91580e7063482f0e71232f8a9a22733bc3fa51 ChangeLog 16065
+SHA256 7164cae64ee5bc3dd0f34257920834527cb4eaa60c9ba7a0ff4215d67e66d3be ChangeLog 16065
 MISC metadata.xml 382 RMD160 315172442a4bfaa87b855d4c421b22a2527e97b2 SHA1 7b95f41def10946742929592db1d76b7e3bb0a19 SHA256 f79d5cd273e9ecc2181e60ea226a7cb0128011d877fc7531b2df30bd5fd9ae20
 MD5 f3d5d5b8a638e7a9a83fe0eb0d94282c metadata.xml 382
 RMD160 315172442a4bfaa87b855d4c421b22a2527e97b2 metadata.xml 382
@@ -117,3 +92,10 @@ SHA256 97f4cbc2c2075338a5fbb1c0da7f79f365725d49e9d6cb89a974db23c6e5a83d files/di
 MD5 e2e7717e2b2b91f4467e4033eb8607ab files/digest-zaptel-1.2.9.1 718
 RMD160 bbbf4cfe894f55f780600625ef67ddfe1df3857f files/digest-zaptel-1.2.9.1 718
 SHA256 7fd0cc0e5893f855fd9543b817ca20d2bcf6101634c7483a6b29eb2bbb8fabae files/digest-zaptel-1.2.9.1 718
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5-ecc0.1.6 (GNU/Linux)
+
+iD8DBQFFImUnKRy60XGEcJIRAjFHAJ9Boa04xr+ACwd1jKLunQ3lBi+eZgCfV/t5
+G23smNZNukIhkz3quTUAiIM=
+=cAiQ
+-----END PGP SIGNATURE-----
diff --git a/net-misc/zaptel/files/zaptel-1.0.4-experimental-devfs26.diff b/net-misc/zaptel/files/zaptel-1.0.4-experimental-devfs26.diff
deleted file mode 100644
index e33002e57a2a..000000000000
--- a/net-misc/zaptel/files/zaptel-1.0.4-experimental-devfs26.diff
+++ /dev/null
@@ -1,220 +0,0 @@
---- zaptel/zaptel.c.orig	2005-01-03 23:31:28.266487240 +0100
-+++ zaptel/zaptel.c	2005-01-03 23:20:16.149664528 +0100
-@@ -143,12 +143,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
-@@ -1087,6 +1089,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];
-@@ -1129,6 +1132,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)
-@@ -4304,6 +4337,7 @@
- #endif
- 
- #ifdef CONFIG_DEVFS_FS
-+#ifndef LINUX26
- 	{
- 		char span_name[50];
- 		sprintf(span_name, "span%d", span->spanno);
-@@ -4313,6 +4347,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
-@@ -4360,11 +4403,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
-@@ -6301,6 +6355,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);
-@@ -6312,6 +6367,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;
-@@ -6342,6 +6413,7 @@
- 		if (tone_zones[x])
- 			kfree(tone_zones[x]);
- #ifdef CONFIG_DEVFS_FS
-+#ifndef LINUX26
- 	devfs_unregister(timer);
- 	devfs_unregister(channel);
- 	devfs_unregister(pseudo);
-@@ -6357,6 +6429,16 @@
- 	class_simple_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/zaptel.h.orig	2005-01-03 23:31:32.029915112 +0100
-+++ zaptel/zaptel.h	2005-01-03 23:20:18.380325416 +0100
-@@ -46,18 +46,17 @@
- 
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
- #define LINUX26
-+/* 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>
- 
-@@ -65,6 +64,8 @@
- #define ELAST 500
- #endif
- 
-+
-+
- /* Per-span configuration values */
- #define	ZT_CONFIG_TXLEVEL	7	/* bits 0-2 are tx level */
- 
-@@ -1123,8 +1124,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 */
- };
- 
-@@ -1254,7 +1257,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.7-gentoo.diff b/net-misc/zaptel/files/zaptel-1.0.7-gentoo.diff
deleted file mode 100644
index 13740a62e037..000000000000
--- a/net-misc/zaptel/files/zaptel-1.0.7-gentoo.diff
+++ /dev/null
@@ -1,91 +0,0 @@
---- zaptel-1.0.7/Makefile.orig	2005-03-20 23:08:04.803610656 +0000
-+++ zaptel-1.0.7/Makefile	2005-03-20 23:10:24.390390240 +0000
-@@ -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)
-@@ -39,7 +39,7 @@
- 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)
-+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
-@@ -54,7 +54,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 )
-@@ -255,7 +255,7 @@
- 	@echo "**** If you are running udev, read README.udev"
- endif
- 
--install:  all devices $(LIBTONEZONE)
-+install: devices $(LIBTONEZONE)
- 	install -D -m 755 ztcfg $(INSTALL_PREFIX)/sbin/ztcfg
- 	if [ -f sethdlc-new ]; then \
- 		install -D -m 755 sethdlc-new $(INSTALL_PREFIX)/sbin/sethdlc; \
-@@ -281,43 +281,21 @@
- 	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 "post-install wcfxs /sbin/ztcfg" > $(MODCONF) || true
-+	if [ ! -d `dirname $(MODCONF)` ]; then install -d -m 755 `dirname $(MODCONF)` ; fi
- 	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 [ -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/files/zaptel-1.0.8-gentoo.diff b/net-misc/zaptel/files/zaptel-1.0.8-gentoo.diff
deleted file mode 100644
index bff270eae84c..000000000000
--- a/net-misc/zaptel/files/zaptel-1.0.8-gentoo.diff
+++ /dev/null
@@ -1,101 +0,0 @@
---- zaptel-1.0.8/Makefile.orig	2005-06-25 09:53:46.537475736 +0200
-+++ zaptel-1.0.8/Makefile	2005-06-25 10:00:40.082607320 +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)
- 
-@@ -262,7 +262,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,42 +288,22 @@
- 	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 "post-install wcfxs /sbin/ztcfg" > $(MODCONF) || true
-+	if [ ! -d `dirname $(MODCONF)` ]; then install -d -m 755 `dirname $(MODCONF)` ; fi
- 	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 [ -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/files/zaptel-1.0.9-gentoo.diff b/net-misc/zaptel/files/zaptel-1.0.9-gentoo.diff
deleted file mode 100644
index da388ecff467..000000000000
--- a/net-misc/zaptel/files/zaptel-1.0.9-gentoo.diff
+++ /dev/null
@@ -1,103 +0,0 @@
---- zaptel-1.0.9.1/Makefile.orig	2005-07-25 14:42:56.000000000 +0000
-+++ zaptel-1.0.9.1/Makefile	2005-07-26 01:10:55.000000000 +0000
-@@ -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)
- 
-@@ -262,7 +262,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,44 +286,23 @@
- 		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 "post-install wcfxs /sbin/ztcfg" > $(MODCONF) || true
-+	if [ ! -d `dirname $(MODCONF)` ]; then install -d -m 755 `dirname $(MODCONF)` ; fi
- 	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/files/zaptel-1.0.9_p2-gentoo.diff b/net-misc/zaptel/files/zaptel-1.0.9_p2-gentoo.diff
deleted file mode 100644
index 0f2c8f1152c3..000000000000
--- a/net-misc/zaptel/files/zaptel-1.0.9_p2-gentoo.diff
+++ /dev/null
@@ -1,113 +0,0 @@
---- 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/files/zaptel-bristuff-0.2.0-RC8g.patch b/net-misc/zaptel/files/zaptel-bristuff-0.2.0-RC8g.patch
deleted file mode 100644
index 8c0f47ed0e55..000000000000
--- a/net-misc/zaptel/files/zaptel-bristuff-0.2.0-RC8g.patch
+++ /dev/null
@@ -1,174 +0,0 @@
-diff -ur zaptel-1.0.7.orig/zaptel.c zaptel-1.0.7/zaptel.c
---- zaptel-1.0.7.orig/zaptel.c	2005-01-17 02:58:09.000000000 +0100
-+++ zaptel-1.0.7/zaptel.c	2005-03-31 09:26:59.000000000 +0200
-@@ -4775,11 +4775,40 @@
- 					*(txb++) = fasthdlc_tx_run_nocheck(&ms->txhdlc);
- 				}
- 				bytes -= left;
-+#ifdef CONFIG_ZAPATA_BRI_DCHANS
-+			} else if (ms->flags & ZT_FLAG_BRIDCHAN) {
-+			    /*
-+			     * Let's get this right, we want to transmit complete frames only.
-+			     * The card driver will do the dirty HDLC work for us.
-+			     * txb (transmit buffer) is supposed to be big enough to store one frame
-+			     * we will make this as big as the D fifo (1KB or 2KB)
-+			     */
-+
-+			    /* there are 'left' bytes in the user buffer left to transmit */
-+			    left = ms->writen[ms->outwritebuf] - ms->writeidx[ms->outwritebuf] - 2;
-+			    if (left > ms->maxbytes2transmit) {
-+				memcpy(txb, buf + ms->writeidx[ms->outwritebuf], ms->maxbytes2transmit);
-+				ms->writeidx[ms->outwritebuf] += ms->maxbytes2transmit;
-+				txb += ms->maxbytes2transmit;
-+				ms->bytes2transmit = ms->maxbytes2transmit;
-+				ms->eoftx = 0;
-+			    } else {
-+				memcpy(txb, buf + ms->writeidx[ms->outwritebuf], left);
-+				ms->writeidx[ms->outwritebuf] += left + 2;
-+				txb += left;
-+				ms->bytes2transmit = left;
-+				ms->eoftx = 1;
-+			    }
-+			    bytes = 0;
-+#endif
- 			} else {
- 				memcpy(txb, buf + ms->writeidx[ms->outwritebuf], left);
- 				ms->writeidx[ms->outwritebuf]+=left;
- 				txb += left;
- 				bytes -= left;
-+#if defined(CONFIG_ZAPATA_BRI_DCHANS)	
-+				ms->bytes2transmit=ZT_CHUNKSIZE;
-+#endif
- 			}
- 			/* Check buffer status */
- 			if (ms->writeidx[ms->outwritebuf] >= ms->writen[ms->outwritebuf]) {
-@@ -4824,6 +4853,17 @@
- 				/* Transmit a flag if this is an HDLC channel */
- 				if (ms->flags & ZT_FLAG_HDLC)
- 					fasthdlc_tx_frame_nocheck(&ms->txhdlc);
-+#if defined(CONFIG_ZAPATA_BRI_DCHANS)	
-+				if(ms->flags & ZT_FLAG_BRIDCHAN) { 
-+			//	    if (ms->bytes2transmit > 0) {
-+					// txb += 2;
-+					// ms->bytes2transmit -= 2;
-+			    bytes=0;
-+					ms->eoftx = 1;
-+//					printk(KERN_CRIT "zaptel EOF(%d) bytes2transmit %d\n",ms->eoftx,ms->bytes2transmit);
-+			//	    }
-+				}
-+#endif
- #ifdef CONFIG_ZAPATA_NET
- 				if (ms->flags & ZT_FLAG_NETDEV)
- 					netif_wake_queue(ztchan_to_dev(ms));
-@@ -4834,7 +4874,7 @@
- 					tasklet_schedule(&ms->ppp_calls);
- 				}
- #endif
--			}
-+			} 
- 		} else if (ms->curtone && !(ms->flags & ZT_FLAG_PSEUDO)) {
- 			left = ms->curtone->tonesamples - ms->tonep;
- 			if (left > bytes)
-@@ -4872,8 +4912,17 @@
- 		} else if (ms->flags & ZT_FLAG_CLEAR) {
- 			/* Clear channels should idle with 0xff for the sake
- 			of silly PRI's that care about idle B channels */
-+#if defined(CONFIG_ZAPATA_BRI_DCHANS)	
-+	//		ms->bytes2transmit=0;
-+#endif
- 			memset(txb, 0xff, bytes);
- 			bytes = 0;
-+#if defined(CONFIG_ZAPATA_BRI_DCHANS)	
-+		} else if(ms->flags & ZT_FLAG_BRIDCHAN) { 
-+		    // ms->bytes2transmit = ZT_CHUNKSIZE - bytes;
-+		    bytes = 0;
-+		    if (ms->bytes2transmit > 0) printk(KERN_CRIT "bytes2transmit %d\n",ms->bytes2transmit); 
-+#endif
- 		} else {
- 			memset(txb, ZT_LIN2X(0, ms), bytes);	/* Lastly we use silence on telephony channels */
- 			bytes = 0;
-@@ -5533,6 +5582,13 @@
- 	int left, x;
- 
- 	int bytes = ZT_CHUNKSIZE;
-+#if defined(CONFIG_ZAPATA_BRI_DCHANS)	
-+	if (ms->flags & ZT_FLAG_BRIDCHAN) {
-+	    bytes = ms->bytes2receive;
-+	    if (bytes < 1) return;
-+//	    printk(KERN_CRIT "bytes2receive %d\n",ms->bytes2receive);
-+	}
-+#endif
- 
- 	while(bytes) {
- #if defined(CONFIG_ZAPATA_NET)  || defined(CONFIG_ZAPATA_PPP)
-@@ -5591,6 +5647,19 @@
- 						}
- 					}
- 				}
-+#ifdef CONFIG_ZAPATA_BRI_DCHANS
-+			} else if (ms->flags & ZT_FLAG_BRIDCHAN) {
-+			    memcpy(buf + ms->readidx[ms->inreadbuf], rxb, left);
-+			    rxb += left;
-+			    ms->readidx[ms->inreadbuf] += left;
-+			    bytes -= left;
-+			    if (ms->eofrx == 1) {
-+				eof=1;
-+			    }
-+//			    printk(KERN_CRIT "receiving %d bytes\n",ms->bytes2receive);
-+			    ms->bytes2receive = 0;
-+			    ms->eofrx = 0;
-+#endif
- 			} else {
- 				/* Not HDLC */
- 				memcpy(buf + ms->readidx[ms->inreadbuf], rxb, left);
-diff -ur zaptel-1.0.7.orig/zaptel.h zaptel-1.0.7/zaptel.h
---- zaptel-1.0.7.orig/zaptel.h	2004-09-27 21:50:03.000000000 +0200
-+++ zaptel-1.0.7/zaptel.h	2005-03-31 09:26:59.000000000 +0200
-@@ -932,6 +932,13 @@
- 	int do_ppp_error;
- 	struct sk_buff_head ppp_rq;
- #endif
-+#ifdef CONFIG_ZAPATA_BRI_DCHANS
-+	int bytes2receive;
-+	int maxbytes2transmit; /* size of the tx buffer in the card driver */
-+	int bytes2transmit;
-+	int eofrx;
-+	int eoftx;
-+#endif
- 	spinlock_t lock;
- 	char name[40];		/* Name */
- 	/* Specified by zaptel */
-@@ -1006,7 +1013,7 @@
- 	int		txbufpolicy;			/* Buffer policy */
- 	int		rxbufpolicy;			/* Buffer policy */
- 	int		txdisable;				/* Disable transmitter */
--	int 	rxdisable;				/* Disable receiver */
-+	int 		rxdisable;				/* Disable receiver */
- 	
- 	
- 	/* Tone zone stuff */
-@@ -1169,6 +1176,10 @@
- #define ZT_FLAG_T1PPP			(1 << 15)
- #define ZT_FLAG_SIGFREEZE		(1 << 16)	/* Freeze signalling */
- 
-+#if defined(CONFIG_ZAPATA_BRI_DCHANS)	
-+#define ZT_FLAG_BRIDCHAN		(1 << 17)
-+#endif
-+
- struct zt_span {
- 	spinlock_t lock;
- 	void *pvt;			/* Private stuff */
-diff -ur zaptel-1.0.7.orig/zconfig.h zaptel-1.0.7/zconfig.h
---- zaptel-1.0.7.orig/zconfig.h	2005-01-02 01:19:57.000000000 +0100
-+++ zaptel-1.0.7/zconfig.h	2005-03-31 09:26:59.000000000 +0200
-@@ -127,4 +127,10 @@
-  */
- /* #define TDM_REVH_MATCHALL */
- 
-+/*
-+ * Uncomment the following for BRI D channels
-+ *
-+ */
-+#define CONFIG_ZAPATA_BRI_DCHANS
-+
- #endif
diff --git a/net-misc/zaptel/files/zaptel-bristuff-0.2.0-RC8h.patch b/net-misc/zaptel/files/zaptel-bristuff-0.2.0-RC8h.patch
deleted file mode 100644
index 0b0925b7d501..000000000000
--- a/net-misc/zaptel/files/zaptel-bristuff-0.2.0-RC8h.patch
+++ /dev/null
@@ -1,191 +0,0 @@
-diff -ur zaptel-1.0.8.orig/Makefile zaptel-1.0.8/Makefile
---- zaptel-1.0.8.orig/Makefile	2005-05-12 04:26:49.000000000 +0200
-+++ zaptel-1.0.8/Makefile	2005-06-24 10:41:08.498991496 +0200
-@@ -343,7 +343,7 @@
- 
- clean:
- 	rm -f torisatool makefw tor2fw.h
--	rm -f zttool
-+	rm -f zttool ztspeed zttest ztmonitor
- 	rm -f *.o ztcfg tzdriver sethdlc sethdlc-new
- 	rm -f $(TZOBJS) $(LIBTONEZONE) *.lo
- 	rm -f *.ko *.mod.c .*o.cmd
-@@ -351,3 +351,4 @@
- 	rm -f libtonezone*
- 	rm -f tor2ee
- 	rm -f core
-+	rm -rf .tmp_versions
-diff -ur zaptel-1.0.8.orig/zaptel.c zaptel-1.0.8/zaptel.c
---- zaptel-1.0.8.orig/zaptel.c	2005-06-15 23:31:22.000000000 +0200
-+++ zaptel-1.0.8/zaptel.c	2005-06-24 10:41:08.000000000 +0200
-@@ -4851,11 +4851,40 @@
- 					*(txb++) = fasthdlc_tx_run_nocheck(&ms->txhdlc);
- 				}
- 				bytes -= left;
-+#ifdef CONFIG_ZAPATA_BRI_DCHANS
-+			} else if (ms->flags & ZT_FLAG_BRIDCHAN) {
-+			    /*
-+			     * Let's get this right, we want to transmit complete frames only.
-+			     * The card driver will do the dirty HDLC work for us.
-+			     * txb (transmit buffer) is supposed to be big enough to store one frame
-+			     * we will make this as big as the D fifo (1KB or 2KB)
-+			     */
-+
-+			    /* there are 'left' bytes in the user buffer left to transmit */
-+			    left = ms->writen[ms->outwritebuf] - ms->writeidx[ms->outwritebuf] - 2;
-+			    if (left > ms->maxbytes2transmit) {
-+				memcpy(txb, buf + ms->writeidx[ms->outwritebuf], ms->maxbytes2transmit);
-+				ms->writeidx[ms->outwritebuf] += ms->maxbytes2transmit;
-+				txb += ms->maxbytes2transmit;
-+				ms->bytes2transmit = ms->maxbytes2transmit;
-+				ms->eoftx = 0;
-+			    } else {
-+				memcpy(txb, buf + ms->writeidx[ms->outwritebuf], left);
-+				ms->writeidx[ms->outwritebuf] += left + 2;
-+				txb += left;
-+				ms->bytes2transmit = left;
-+				ms->eoftx = 1;
-+			    }
-+			    bytes = 0;
-+#endif
- 			} else {
- 				memcpy(txb, buf + ms->writeidx[ms->outwritebuf], left);
- 				ms->writeidx[ms->outwritebuf]+=left;
- 				txb += left;
- 				bytes -= left;
-+#if defined(CONFIG_ZAPATA_BRI_DCHANS)	
-+				ms->bytes2transmit=ZT_CHUNKSIZE;
-+#endif
- 			}
- 			/* Check buffer status */
- 			if (ms->writeidx[ms->outwritebuf] >= ms->writen[ms->outwritebuf]) {
-@@ -4900,6 +4929,17 @@
- 				/* Transmit a flag if this is an HDLC channel */
- 				if (ms->flags & ZT_FLAG_HDLC)
- 					fasthdlc_tx_frame_nocheck(&ms->txhdlc);
-+#if defined(CONFIG_ZAPATA_BRI_DCHANS)	
-+				if(ms->flags & ZT_FLAG_BRIDCHAN) { 
-+			//	    if (ms->bytes2transmit > 0) {
-+					// txb += 2;
-+					// ms->bytes2transmit -= 2;
-+			    bytes=0;
-+					ms->eoftx = 1;
-+//					printk(KERN_CRIT "zaptel EOF(%d) bytes2transmit %d\n",ms->eoftx,ms->bytes2transmit);
-+			//	    }
-+				}
-+#endif
- #ifdef CONFIG_ZAPATA_NET
- 				if (ms->flags & ZT_FLAG_NETDEV)
- 					netif_wake_queue(ztchan_to_dev(ms));
-@@ -4910,7 +4950,7 @@
- 					tasklet_schedule(&ms->ppp_calls);
- 				}
- #endif
--			}
-+			} 
- 		} else if (ms->curtone && !(ms->flags & ZT_FLAG_PSEUDO)) {
- 			left = ms->curtone->tonesamples - ms->tonep;
- 			if (left > bytes)
-@@ -4948,8 +4988,17 @@
- 		} else if (ms->flags & ZT_FLAG_CLEAR) {
- 			/* Clear channels should idle with 0xff for the sake
- 			of silly PRI's that care about idle B channels */
-+#if defined(CONFIG_ZAPATA_BRI_DCHANS)	
-+	//		ms->bytes2transmit=0;
-+#endif
- 			memset(txb, 0xff, bytes);
- 			bytes = 0;
-+#if defined(CONFIG_ZAPATA_BRI_DCHANS)	
-+		} else if(ms->flags & ZT_FLAG_BRIDCHAN) { 
-+		    // ms->bytes2transmit = ZT_CHUNKSIZE - bytes;
-+		    bytes = 0;
-+		    if (ms->bytes2transmit > 0) printk(KERN_CRIT "bytes2transmit %d\n",ms->bytes2transmit); 
-+#endif
- 		} else {
- 			memset(txb, ZT_LIN2X(0, ms), bytes);	/* Lastly we use silence on telephony channels */
- 			bytes = 0;
-@@ -5648,6 +5697,13 @@
- 	int left, x;
- 
- 	int bytes = ZT_CHUNKSIZE;
-+#if defined(CONFIG_ZAPATA_BRI_DCHANS)	
-+	if (ms->flags & ZT_FLAG_BRIDCHAN) {
-+	    bytes = ms->bytes2receive;
-+	    if (bytes < 1) return;
-+//	    printk(KERN_CRIT "bytes2receive %d\n",ms->bytes2receive);
-+	}
-+#endif
- 
- 	while(bytes) {
- #if defined(CONFIG_ZAPATA_NET)  || defined(CONFIG_ZAPATA_PPP)
-@@ -5706,6 +5762,19 @@
- 						}
- 					}
- 				}
-+#ifdef CONFIG_ZAPATA_BRI_DCHANS
-+			} else if (ms->flags & ZT_FLAG_BRIDCHAN) {
-+			    memcpy(buf + ms->readidx[ms->inreadbuf], rxb, left);
-+			    rxb += left;
-+			    ms->readidx[ms->inreadbuf] += left;
-+			    bytes -= left;
-+			    if (ms->eofrx == 1) {
-+				eof=1;
-+			    }
-+//			    printk(KERN_CRIT "receiving %d bytes\n",ms->bytes2receive);
-+			    ms->bytes2receive = 0;
-+			    ms->eofrx = 0;
-+#endif
- 			} else {
- 				/* Not HDLC */
- 				memcpy(buf + ms->readidx[ms->inreadbuf], rxb, left);
-diff -ur zaptel-1.0.8.orig/zaptel.h zaptel-1.0.8/zaptel.h
---- zaptel-1.0.8.orig/zaptel.h	2005-06-15 23:31:22.000000000 +0200
-+++ zaptel-1.0.8/zaptel.h	2005-06-24 10:41:08.511989520 +0200
-@@ -956,6 +956,13 @@
- 	int do_ppp_error;
- 	struct sk_buff_head ppp_rq;
- #endif
-+#ifdef CONFIG_ZAPATA_BRI_DCHANS
-+	int bytes2receive;
-+	int maxbytes2transmit; /* size of the tx buffer in the card driver */
-+	int bytes2transmit;
-+	int eofrx;
-+	int eoftx;
-+#endif
- 	spinlock_t lock;
- 	char name[40];		/* Name */
- 	/* Specified by zaptel */
-@@ -1030,7 +1037,7 @@
- 	int		txbufpolicy;			/* Buffer policy */
- 	int		rxbufpolicy;			/* Buffer policy */
- 	int		txdisable;				/* Disable transmitter */
--	int 	rxdisable;				/* Disable receiver */
-+	int 		rxdisable;				/* Disable receiver */
- 	
- 	
- 	/* Tone zone stuff */
-@@ -1193,6 +1200,10 @@
- #define ZT_FLAG_T1PPP			(1 << 15)
- #define ZT_FLAG_SIGFREEZE		(1 << 16)	/* Freeze signalling */
- 
-+#if defined(CONFIG_ZAPATA_BRI_DCHANS)	
-+#define ZT_FLAG_BRIDCHAN		(1 << 17)
-+#endif
-+
- struct zt_span {
- 	spinlock_t lock;
- 	void *pvt;			/* Private stuff */
-diff -ur zaptel-1.0.8.orig/zconfig.h zaptel-1.0.8/zconfig.h
---- zaptel-1.0.8.orig/zconfig.h	2005-01-02 01:19:57.000000000 +0100
-+++ zaptel-1.0.8/zconfig.h	2005-06-24 10:41:08.000000000 +0200
-@@ -127,4 +127,10 @@
-  */
- /* #define TDM_REVH_MATCHALL */
- 
-+/*
-+ * Uncomment the following for BRI D channels
-+ *
-+ */
-+#define CONFIG_ZAPATA_BRI_DCHANS
-+
- #endif
diff --git a/net-misc/zaptel/files/zaptel-bristuff-0.2.0-RC8n.patch b/net-misc/zaptel/files/zaptel-bristuff-0.2.0-RC8n.patch
deleted file mode 100644
index 8e55f0ece855..000000000000
--- a/net-misc/zaptel/files/zaptel-bristuff-0.2.0-RC8n.patch
+++ /dev/null
@@ -1,191 +0,0 @@
-diff -ur zaptel-1.0.9.orig/Makefile zaptel-1.0.9/Makefile
---- zaptel-1.0.9.orig/Makefile	2005-05-12 04:26:49.000000000 +0200
-+++ zaptel-1.0.9/Makefile	2005-07-03 13:36:31.000000000 +0200
-@@ -343,7 +343,7 @@
- 
- clean:
- 	rm -f torisatool makefw tor2fw.h
--	rm -f zttool
-+	rm -f zttool ztspeed zttest ztmonitor
- 	rm -f *.o ztcfg tzdriver sethdlc sethdlc-new
- 	rm -f $(TZOBJS) $(LIBTONEZONE) *.lo
- 	rm -f *.ko *.mod.c .*o.cmd
-@@ -351,3 +351,4 @@
- 	rm -f libtonezone*
- 	rm -f tor2ee
- 	rm -f core
-+	rm -rf .tmp_versions
-diff -ur zaptel-1.0.9.orig/zaptel.c zaptel-1.0.9/zaptel.c
---- zaptel-1.0.9.orig/zaptel.c	2005-06-15 23:31:22.000000000 +0200
-+++ zaptel-1.0.9/zaptel.c	2005-07-03 13:36:31.000000000 +0200
-@@ -4851,11 +4851,40 @@
- 					*(txb++) = fasthdlc_tx_run_nocheck(&ms->txhdlc);
- 				}
- 				bytes -= left;
-+#ifdef CONFIG_ZAPATA_BRI_DCHANS
-+			} else if (ms->flags & ZT_FLAG_BRIDCHAN) {
-+			    /*
-+			     * Let's get this right, we want to transmit complete frames only.
-+			     * The card driver will do the dirty HDLC work for us.
-+			     * txb (transmit buffer) is supposed to be big enough to store one frame
-+			     * we will make this as big as the D fifo (1KB or 2KB)
-+			     */
-+
-+			    /* there are 'left' bytes in the user buffer left to transmit */
-+			    left = ms->writen[ms->outwritebuf] - ms->writeidx[ms->outwritebuf] - 2;
-+			    if (left > ms->maxbytes2transmit) {
-+				memcpy(txb, buf + ms->writeidx[ms->outwritebuf], ms->maxbytes2transmit);
-+				ms->writeidx[ms->outwritebuf] += ms->maxbytes2transmit;
-+				txb += ms->maxbytes2transmit;
-+				ms->bytes2transmit = ms->maxbytes2transmit;
-+				ms->eoftx = 0;
-+			    } else {
-+				memcpy(txb, buf + ms->writeidx[ms->outwritebuf], left);
-+				ms->writeidx[ms->outwritebuf] += left + 2;
-+				txb += left;
-+				ms->bytes2transmit = left;
-+				ms->eoftx = 1;
-+			    }
-+			    bytes = 0;
-+#endif
- 			} else {
- 				memcpy(txb, buf + ms->writeidx[ms->outwritebuf], left);
- 				ms->writeidx[ms->outwritebuf]+=left;
- 				txb += left;
- 				bytes -= left;
-+#if defined(CONFIG_ZAPATA_BRI_DCHANS)	
-+				ms->bytes2transmit=ZT_CHUNKSIZE;
-+#endif
- 			}
- 			/* Check buffer status */
- 			if (ms->writeidx[ms->outwritebuf] >= ms->writen[ms->outwritebuf]) {
-@@ -4900,6 +4929,17 @@
- 				/* Transmit a flag if this is an HDLC channel */
- 				if (ms->flags & ZT_FLAG_HDLC)
- 					fasthdlc_tx_frame_nocheck(&ms->txhdlc);
-+#if defined(CONFIG_ZAPATA_BRI_DCHANS)	
-+				if(ms->flags & ZT_FLAG_BRIDCHAN) { 
-+			//	    if (ms->bytes2transmit > 0) {
-+					// txb += 2;
-+					// ms->bytes2transmit -= 2;
-+			    bytes=0;
-+					ms->eoftx = 1;
-+//					printk(KERN_CRIT "zaptel EOF(%d) bytes2transmit %d\n",ms->eoftx,ms->bytes2transmit);
-+			//	    }
-+				}
-+#endif
- #ifdef CONFIG_ZAPATA_NET
- 				if (ms->flags & ZT_FLAG_NETDEV)
- 					netif_wake_queue(ztchan_to_dev(ms));
-@@ -4910,7 +4950,7 @@
- 					tasklet_schedule(&ms->ppp_calls);
- 				}
- #endif
--			}
-+			} 
- 		} else if (ms->curtone && !(ms->flags & ZT_FLAG_PSEUDO)) {
- 			left = ms->curtone->tonesamples - ms->tonep;
- 			if (left > bytes)
-@@ -4948,8 +4988,17 @@
- 		} else if (ms->flags & ZT_FLAG_CLEAR) {
- 			/* Clear channels should idle with 0xff for the sake
- 			of silly PRI's that care about idle B channels */
-+#if defined(CONFIG_ZAPATA_BRI_DCHANS)	
-+	//		ms->bytes2transmit=0;
-+#endif
- 			memset(txb, 0xff, bytes);
- 			bytes = 0;
-+#if defined(CONFIG_ZAPATA_BRI_DCHANS)	
-+		} else if(ms->flags & ZT_FLAG_BRIDCHAN) { 
-+		    // ms->bytes2transmit = ZT_CHUNKSIZE - bytes;
-+		    bytes = 0;
-+		    if (ms->bytes2transmit > 0) printk(KERN_CRIT "bytes2transmit %d\n",ms->bytes2transmit); 
-+#endif
- 		} else {
- 			memset(txb, ZT_LIN2X(0, ms), bytes);	/* Lastly we use silence on telephony channels */
- 			bytes = 0;
-@@ -5648,6 +5697,13 @@
- 	int left, x;
- 
- 	int bytes = ZT_CHUNKSIZE;
-+#if defined(CONFIG_ZAPATA_BRI_DCHANS)	
-+	if (ms->flags & ZT_FLAG_BRIDCHAN) {
-+	    bytes = ms->bytes2receive;
-+	    if (bytes < 1) return;
-+//	    printk(KERN_CRIT "bytes2receive %d\n",ms->bytes2receive);
-+	}
-+#endif
- 
- 	while(bytes) {
- #if defined(CONFIG_ZAPATA_NET)  || defined(CONFIG_ZAPATA_PPP)
-@@ -5706,6 +5762,19 @@
- 						}
- 					}
- 				}
-+#ifdef CONFIG_ZAPATA_BRI_DCHANS
-+			} else if (ms->flags & ZT_FLAG_BRIDCHAN) {
-+			    memcpy(buf + ms->readidx[ms->inreadbuf], rxb, left);
-+			    rxb += left;
-+			    ms->readidx[ms->inreadbuf] += left;
-+			    bytes -= left;
-+			    if (ms->eofrx == 1) {
-+				eof=1;
-+			    }
-+//			    printk(KERN_CRIT "receiving %d bytes\n",ms->bytes2receive);
-+			    ms->bytes2receive = 0;
-+			    ms->eofrx = 0;
-+#endif
- 			} else {
- 				/* Not HDLC */
- 				memcpy(buf + ms->readidx[ms->inreadbuf], rxb, left);
-diff -ur zaptel-1.0.9.orig/zaptel.h zaptel-1.0.9/zaptel.h
---- zaptel-1.0.9.orig/zaptel.h	2005-06-15 23:31:22.000000000 +0200
-+++ zaptel-1.0.9/zaptel.h	2005-07-03 13:36:31.000000000 +0200
-@@ -956,6 +956,13 @@
- 	int do_ppp_error;
- 	struct sk_buff_head ppp_rq;
- #endif
-+#ifdef CONFIG_ZAPATA_BRI_DCHANS
-+	int bytes2receive;
-+	int maxbytes2transmit; /* size of the tx buffer in the card driver */
-+	int bytes2transmit;
-+	int eofrx;
-+	int eoftx;
-+#endif
- 	spinlock_t lock;
- 	char name[40];		/* Name */
- 	/* Specified by zaptel */
-@@ -1030,7 +1037,7 @@
- 	int		txbufpolicy;			/* Buffer policy */
- 	int		rxbufpolicy;			/* Buffer policy */
- 	int		txdisable;				/* Disable transmitter */
--	int 	rxdisable;				/* Disable receiver */
-+	int 		rxdisable;				/* Disable receiver */
- 	
- 	
- 	/* Tone zone stuff */
-@@ -1193,6 +1200,10 @@
- #define ZT_FLAG_T1PPP			(1 << 15)
- #define ZT_FLAG_SIGFREEZE		(1 << 16)	/* Freeze signalling */
- 
-+#if defined(CONFIG_ZAPATA_BRI_DCHANS)	
-+#define ZT_FLAG_BRIDCHAN		(1 << 17)
-+#endif
-+
- struct zt_span {
- 	spinlock_t lock;
- 	void *pvt;			/* Private stuff */
-diff -ur zaptel-1.0.9.orig/zconfig.h zaptel-1.0.9/zconfig.h
---- zaptel-1.0.9.orig/zconfig.h	2005-01-02 01:19:57.000000000 +0100
-+++ zaptel-1.0.9/zconfig.h	2005-07-03 13:36:31.000000000 +0200
-@@ -127,4 +127,10 @@
-  */
- /* #define TDM_REVH_MATCHALL */
- 
-+/*
-+ * Uncomment the following for BRI D channels
-+ *
-+ */
-+#define CONFIG_ZAPATA_BRI_DCHANS
-+
- #endif