From c8cea36d09592c8262425d103f515f31b8c6dbcb Mon Sep 17 00:00:00 2001 From: Stefan Knoblich Date: Thu, 8 Jun 2006 02:19:26 +0000 Subject: [PATCH] Fix zaptel-1.0.10 for linux-2.6.16 and silence some warning messages. Package-Manager: portage-2.1_rc4-r3 --- net-misc/zaptel/ChangeLog | 7 +- net-misc/zaptel/Manifest | 24 ++-- ...0-fix-zapata-debug-undefined-warnings.diff | 118 ++++++++++++++++++ .../files/zaptel-1.0.10-linux2.6.16.diff | 44 +++++++ net-misc/zaptel/zaptel-1.0.10.ebuild | 9 +- 5 files changed, 191 insertions(+), 11 deletions(-) create mode 100644 net-misc/zaptel/files/zaptel-1.0.10-fix-zapata-debug-undefined-warnings.diff create mode 100644 net-misc/zaptel/files/zaptel-1.0.10-linux2.6.16.diff diff --git a/net-misc/zaptel/ChangeLog b/net-misc/zaptel/ChangeLog index eaf94331b61e..9053d7b4f42c 100644 --- a/net-misc/zaptel/ChangeLog +++ b/net-misc/zaptel/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for net-misc/zaptel # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/zaptel/ChangeLog,v 1.75 2006/06/07 17:55:54 stkn Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/zaptel/ChangeLog,v 1.76 2006/06/08 02:19:26 stkn Exp $ + + 08 Jun 2006; Stefan Knoblich + +files/zaptel-1.0.10-fix-zapata-debug-undefined-warnings.diff, + +files/zaptel-1.0.10-linux2.6.16.diff, zaptel-1.0.10.ebuild: + Fix zaptel-1.0.10 for linux-2.6.16 and silence some warning messages. *zaptel-1.2.6 (07 Jun 2006) diff --git a/net-misc/zaptel/Manifest b/net-misc/zaptel/Manifest index c380311a5189..5517f173de8e 100644 --- a/net-misc/zaptel/Manifest +++ b/net-misc/zaptel/Manifest @@ -2,10 +2,18 @@ AUX zaptel-1.0.10-devfs26.diff 6026 RMD160 81a4c9d3520b0b716f28dc41ac1c4518a8d9e MD5 24ffa9ff867ef807083a53f61465fe02 files/zaptel-1.0.10-devfs26.diff 6026 RMD160 81a4c9d3520b0b716f28dc41ac1c4518a8d9efa6 files/zaptel-1.0.10-devfs26.diff 6026 SHA256 da217fc40c3d1faf4de800818c78966b915f3b928e00ff02812725104511cebf files/zaptel-1.0.10-devfs26.diff 6026 +AUX zaptel-1.0.10-fix-zapata-debug-undefined-warnings.diff 4050 RMD160 58507d56ed7ee69fcae3e1256535628a568f9cac SHA1 558e1727c4bb4165281d1b983d99199358201040 SHA256 6103805da0d9a9d9b51783799a0d90d3f905288d49401a86f2b766ec86be95dc +MD5 18e2a30f6c98491ad9556114edb8f8e1 files/zaptel-1.0.10-fix-zapata-debug-undefined-warnings.diff 4050 +RMD160 58507d56ed7ee69fcae3e1256535628a568f9cac files/zaptel-1.0.10-fix-zapata-debug-undefined-warnings.diff 4050 +SHA256 6103805da0d9a9d9b51783799a0d90d3f905288d49401a86f2b766ec86be95dc files/zaptel-1.0.10-fix-zapata-debug-undefined-warnings.diff 4050 AUX zaptel-1.0.10-gentoo.diff 5489 RMD160 c89a9f225c6fd82dacbc2c98655960b956b41a67 SHA1 94754ac2dd8e488ecb2fa0bc4ff70c14476409fc SHA256 40e0de58e0e1376c097d2a83c7d19c4c63d709d5f6a2cac0e936ae0d1f5b17c2 MD5 64804093a66dad967c34de55d3f0633a files/zaptel-1.0.10-gentoo.diff 5489 RMD160 c89a9f225c6fd82dacbc2c98655960b956b41a67 files/zaptel-1.0.10-gentoo.diff 5489 SHA256 40e0de58e0e1376c097d2a83c7d19c4c63d709d5f6a2cac0e936ae0d1f5b17c2 files/zaptel-1.0.10-gentoo.diff 5489 +AUX zaptel-1.0.10-linux2.6.16.diff 1752 RMD160 35ba481e8eda748a1cac0e36dab128ec59f1360f SHA1 3f5ecfa1dea31a43c1cf8d59fbea9c901d573300 SHA256 8efff5390b33b7040d2c3ee7d0073220179635ef536e854e038db8e603798f52 +MD5 5a68f9872b7b06e53b992e609fd0e1b8 files/zaptel-1.0.10-linux2.6.16.diff 1752 +RMD160 35ba481e8eda748a1cac0e36dab128ec59f1360f files/zaptel-1.0.10-linux2.6.16.diff 1752 +SHA256 8efff5390b33b7040d2c3ee7d0073220179635ef536e854e038db8e603798f52 files/zaptel-1.0.10-linux2.6.16.diff 1752 AUX zaptel-1.0.10-ukcid.patch 3787 RMD160 4c4c3b9036db8051643901892a40fbcd153184d6 SHA1 f4da18f52f6dc92c84d9534c10882f3b657d93a3 SHA256 d60c436b44481ec68272572643e83055ec5766f3d0331be0209e789637fb5720 MD5 699723eb0b0ad059702af4fc4de7bf95 files/zaptel-1.0.10-ukcid.patch 3787 RMD160 4c4c3b9036db8051643901892a40fbcd153184d6 files/zaptel-1.0.10-ukcid.patch 3787 @@ -107,10 +115,10 @@ DIST zaptel-1.0.8.tar.gz 326128 RMD160 f55ecfa8a8263b9342e2a0e7625c8e6083165880 DIST zaptel-1.0.9.2.tar.gz 327362 RMD160 22fb125e6a4e93b4d05a01c6ead99a58a4bf3e31 SHA1 c3725086a6fb122f30b77cb59ada2ac872a19ba8 SHA256 2734767ef00d6ddba8dba74801975d56082a48bb5e4c8299aa08210d73d09803 DIST zaptel-1.2.5.tar.gz 673161 RMD160 7de580a8424b436d77504501ef59c47f2498e04d SHA1 ac740850e49daed77683eaffba5732086a88f54f SHA256 8a80ccd9b2852de8a0ccf0036819d8e5cc0f73516f1fdcee3392c813a26ada5c DIST zaptel-1.2.6.tar.gz 676658 RMD160 599cf3c78bb5b71a921dea9ca4716131224cd872 SHA1 cd61a2e7efdab4c5400af5c44c4009702daf5ea2 SHA256 24cd078469f2a3f131c3d28977f88426a45d9810f5a5d22109d5d57e43320938 -EBUILD zaptel-1.0.10.ebuild 6955 RMD160 43112214a810b62fbf25c3cbb56f47427a71037f SHA1 4f1c18fb52ada609612a74c60f907a5893425d31 SHA256 d47ecd0955b1bab2046262b3d0384aaa0a774353e4f72a11c4c8926dae310c42 -MD5 a937510da057c2f6c0ab67872b1086fe zaptel-1.0.10.ebuild 6955 -RMD160 43112214a810b62fbf25c3cbb56f47427a71037f zaptel-1.0.10.ebuild 6955 -SHA256 d47ecd0955b1bab2046262b3d0384aaa0a774353e4f72a11c4c8926dae310c42 zaptel-1.0.10.ebuild 6955 +EBUILD zaptel-1.0.10.ebuild 7194 RMD160 aa8dc4debfe14a9ffb0a68ff626ee870d1f6ed75 SHA1 aefee5d2d54bdb9167a78cee67a0df3d122baede SHA256 96f0203b3ba717f662b9f09302ee84b558cc6a5e7e1f98199f24c3b82bb9d94a +MD5 c808721dc648d4f99dd57434da767da1 zaptel-1.0.10.ebuild 7194 +RMD160 aa8dc4debfe14a9ffb0a68ff626ee870d1f6ed75 zaptel-1.0.10.ebuild 7194 +SHA256 96f0203b3ba717f662b9f09302ee84b558cc6a5e7e1f98199f24c3b82bb9d94a zaptel-1.0.10.ebuild 7194 EBUILD zaptel-1.0.7-r1.ebuild 6517 RMD160 a40ddb6c4fb789193710d9595ed438e715d625b0 SHA1 7f60b010124d3c6e48f4b2314d77d3ab966e309e SHA256 93a80dd479b068dae7aa27c157d4bc2cc84df7084f1f50a9178ae9b22e857ede MD5 276ca202b6c1471af85d43ce0eb6b94f zaptel-1.0.7-r1.ebuild 6517 RMD160 a40ddb6c4fb789193710d9595ed438e715d625b0 zaptel-1.0.7-r1.ebuild 6517 @@ -135,10 +143,10 @@ EBUILD zaptel-1.2.6.ebuild 9205 RMD160 8e08b39c2b1aa7792dc74fa4f9db1188a2430fab MD5 682c943ca7a293de4b933a3a675e2c40 zaptel-1.2.6.ebuild 9205 RMD160 8e08b39c2b1aa7792dc74fa4f9db1188a2430fab zaptel-1.2.6.ebuild 9205 SHA256 445058b42d6cedb7f2edeb50bdea4b92907e20c3c80cc679654b8d7447c92546 zaptel-1.2.6.ebuild 9205 -MISC ChangeLog 14228 RMD160 5d5423591d803daa92f146deb3eb5cca668fa49d SHA1 0692a0350aa57fa50dc8ff7bba6c5bfa4b5c60a2 SHA256 8eb429df03782f5c41a4da24a69ab7a176ce94eb1049c353bfcd272693a70971 -MD5 0fc00594b29a19ecc33614cdc7a77572 ChangeLog 14228 -RMD160 5d5423591d803daa92f146deb3eb5cca668fa49d ChangeLog 14228 -SHA256 8eb429df03782f5c41a4da24a69ab7a176ce94eb1049c353bfcd272693a70971 ChangeLog 14228 +MISC ChangeLog 14478 RMD160 282678bc521ba8a0ad0c54e8573d8aa1ed95aca0 SHA1 6c8ddb70a7bb34f8d1ecc8dac9c9cce7f1e8e7ee SHA256 3d2dd7ba064b97fd8b98f72a50fcdbf5747ad5c67d91a756fdf65e1eff8e9e3f +MD5 6863683286e176c52953666d3ab443af ChangeLog 14478 +RMD160 282678bc521ba8a0ad0c54e8573d8aa1ed95aca0 ChangeLog 14478 +SHA256 3d2dd7ba064b97fd8b98f72a50fcdbf5747ad5c67d91a756fdf65e1eff8e9e3f ChangeLog 14478 MISC metadata.xml 248 RMD160 a989fff0cebc82a58a75fb3a2eec8da0712ad57e SHA1 10bea6cd152e9f0ecb627eaacc19980a9d5f5dc4 SHA256 d0e3ab77a8a7b859511b8d5fda83dc018351e6367724b097dcc13c4aa0a3ee6b MD5 44cf247f04cc83413fcb40ed59d0847a metadata.xml 248 RMD160 a989fff0cebc82a58a75fb3a2eec8da0712ad57e metadata.xml 248 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 new file mode 100644 index 000000000000..b4f1b524a6f9 --- /dev/null +++ b/net-misc/zaptel/files/zaptel-1.0.10-fix-zapata-debug-undefined-warnings.diff @@ -0,0 +1,118 @@ +--- 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;xwriten[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;xwriten[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;xsig) { +-#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;xspan->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-linux2.6.16.diff b/net-misc/zaptel/files/zaptel-1.0.10-linux2.6.16.diff new file mode 100644 index 000000000000..de56811d692c --- /dev/null +++ b/net-misc/zaptel/files/zaptel-1.0.10-linux2.6.16.diff @@ -0,0 +1,44 @@ +--- 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/zaptel-1.0.10.ebuild b/net-misc/zaptel/zaptel-1.0.10.ebuild index 5040d4181f59..5ed45f928d17 100644 --- a/net-misc/zaptel/zaptel-1.0.10.ebuild +++ b/net-misc/zaptel/zaptel-1.0.10.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2005 Gentoo Foundation +# Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/zaptel/zaptel-1.0.10.ebuild,v 1.1 2005/12/02 03:32:51 stkn Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/zaptel/zaptel-1.0.10.ebuild,v 1.2 2006/06/08 02:19:26 stkn Exp $ IUSE="bri devfs26 rtc ukcid" @@ -135,6 +135,11 @@ src_unpack() { # see http://www.lusyn.com/asterisk/patches.html for more information use ukcid && \ epatch ${FILESDIR}/${PN}-1.0.10-ukcid.patch + + # buy some time to get 1.2 into shape, + # fix 2.6.16 compile errors and CONFIG_ZAPATA_DEBUG undefined warnings + epatch ${FILESDIR}/zaptel-1.0.10-linux2.6.16.diff + epatch ${FILESDIR}/zaptel-1.0.10-fix-zapata-debug-undefined-warnings.diff } src_compile() { -- 2.26.2