diff options
author | Pacho Ramos <pacho@gentoo.org> | 2013-02-10 07:58:51 +0000 |
---|---|---|
committer | Pacho Ramos <pacho@gentoo.org> | 2013-02-10 07:58:51 +0000 |
commit | 9bacee5e77f48eb71c2f704cf5074f23e962e66f (patch) | |
tree | 850722410d3cf0c7c33f3dcf9cb3f29585026c5b /net-dialup | |
parent | Clean masked package (diff) | |
download | gentoo-2-9bacee5e77f48eb71c2f704cf5074f23e962e66f.tar.gz gentoo-2-9bacee5e77f48eb71c2f704cf5074f23e962e66f.tar.bz2 gentoo-2-9bacee5e77f48eb71c2f704cf5074f23e962e66f.zip |
Clean masked package
Diffstat (limited to 'net-dialup')
-rw-r--r-- | net-dialup/misdn/ChangeLog | 163 | ||||
-rw-r--r-- | net-dialup/misdn/Manifest | 20 | ||||
-rw-r--r-- | net-dialup/misdn/files/README.hfcmulti | 61 | ||||
-rw-r--r-- | net-dialup/misdn/files/misdn-2.6.23.diff | 53 | ||||
-rw-r--r-- | net-dialup/misdn/files/misdn-2.6.24.diff | 331 | ||||
-rw-r--r-- | net-dialup/misdn/metadata.xml | 12 | ||||
-rw-r--r-- | net-dialup/misdn/misdn-1.1.7.2-r1.ebuild | 217 | ||||
-rw-r--r-- | net-dialup/misdn/misdn-1.1.7.2.ebuild | 215 | ||||
-rw-r--r-- | net-dialup/misdn/misdn-1.1.7.ebuild | 183 |
9 files changed, 0 insertions, 1255 deletions
diff --git a/net-dialup/misdn/ChangeLog b/net-dialup/misdn/ChangeLog deleted file mode 100644 index 3349ab55a169..000000000000 --- a/net-dialup/misdn/ChangeLog +++ /dev/null @@ -1,163 +0,0 @@ -# ChangeLog for net-dialup/misdn -# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-dialup/misdn/ChangeLog,v 1.31 2012/12/11 16:48:03 axs Exp $ - - 11 Dec 2012; Ian Stakenvicius <axs@gentoo.org> misdn-1.1.7.2-r1.ebuild: - virtualize udev by using udev.eclass to determine udevdir - -*misdn-1.1.7.2-r1 (12 Aug 2012) - - 12 Aug 2012; Samuli Suominen <ssuominen@gentoo.org> +misdn-1.1.7.2-r1.ebuild: - Query value of udevdir from udev.pc pkg-config file. - - 23 Aug 2008; Doug Goldstein <cardoe@gentoo.org> metadata.xml: - add GLEP 56 USE flag desc from use.local.desc - - 27 Mar 2008; Stefan Schweizer <genstef@gentoo.org> misdn-1.1.7.ebuild, - misdn-1.1.7.2.ebuild: - use modprobe.d instead of modules.d, bug 214023 - -*misdn-1.1.7.2 (12 Feb 2008) - - 12 Feb 2008; Stefan Briesenick <sbriesen@gentoo.org> - +files/misdn-2.6.24.diff, +misdn-1.1.7.2.ebuild: - version bump + kernel 2.6.24 patches (solving bug #207891). - -*misdn-1.1.7 (12 Nov 2007) - - 12 Nov 2007; Stefan Schweizer <genstef@gentoo.org> -misdn-1.1.2.ebuild, - -misdn-1.1.3.ebuild, -misdn-1.1.5.ebuild, -misdn-1.1.6.ebuild, - +misdn-1.1.7.ebuild: - version bump - -*misdn-1.1.6 (22 Oct 2007) - - 22 Oct 2007; Stefan Schweizer <genstef@gentoo.org> - +files/misdn-2.6.23.diff, +misdn-1.1.6.ebuild: - version bump - -*misdn-1.1.5 (07 Jul 2007) - - 07 Jul 2007; Stefan Schweizer <genstef@gentoo.org> +misdn-1.1.5.ebuild: - version bump - - 16 May 2007; Stefan Schweizer <genstef@gentoo.org> +misdn-1.1.2.ebuild: - Readd 1.1.2 for Jörg in bug 178765 - -*misdn-1.1.3 (09 May 2007) - - 09 May 2007; Stefan Schweizer <genstef@gentoo.org> -misdn-1.1.2.ebuild, - +misdn-1.1.3.ebuild: - version bump - - 06 May 2007; Marius Mauch <genone@gentoo.org> misdn-1.1.2.ebuild: - Replacing einfo with elog - -*misdn-1.1.2 (12 Apr 2007) - - 12 Apr 2007; Stefan Schweizer <genstef@gentoo.org> -misdn-1.1.1.ebuild, - +misdn-1.1.2.ebuild: - version bump - -*misdn-1.1.1 (27 Mar 2007) - - 27 Mar 2007; <genstef@gentoo.org> -files/misdn-1.0.4-kernel-2.6.19.patch, - -misdn-1.0.4.ebuild, +misdn-1.1.1.ebuild: - version bump thanks to Christian Weiske <cweiske@cweiske.de> in bug 172008 - - 10 Feb 2007; Alin Năstac <mrness@gentoo.org> misdn-1.0.4.ebuild: - Update home page. - - 10 Jan 2007; Alin Năstac <mrness@gentoo.org> misdn-1.0.4.ebuild: - Add sys-devel/bc to RDEPEND (#161101). - - 20 Dec 2006; Alin Năstac <mrness@gentoo.org> - files/misdn-1.0.4-kernel-2.6.19.patch: - Make kernel patch future-proof (bug #156783 comment #11). - - 02 Dec 2006; Alin Năstac <mrness@gentoo.org> - +files/misdn-1.0.4-kernel-2.6.19.patch, misdn-1.0.4.ebuild: - Fix broken compilation against kernel 2.6.19 (#156861). - -*misdn-1.0.4 (18 Nov 2006) - - 18 Nov 2006; Stefan Schweizer <genstef@gentoo.org> +misdn-1.0.4.ebuild, - -misdn-20060811.ebuild, -misdn-20061003.ebuild: - version bump - -*misdn-20061003 (08 Oct 2006) - - 08 Oct 2006; Stefan Briesenick <sbriesen@gentoo.org> - +misdn-20061003.ebuild: - version bump, adding echo canceler USE-flags. - - 14 Sep 2006; Stefan Schweizer <genstef@gentoo.org> misdn-20060811.ebuild: - MODE="0660" is needed for udev, thanks sbriesen - -*misdn-20060811 (11 Aug 2006) - - 11 Aug 2006; Stefan Schweizer <genstef@gentoo.org> - -files/change-pci_find_subsys-to-pci_get_subsys.patch, - -files/module-param.diff, -files/mqueue.modulesd, -files/nodevfs.patch, - -files/packed.diff, -misdn-20060321.ebuild, -misdn-20060722.ebuild, - +misdn-20060811.ebuild: - version bump, use tarball again, remove patches and old ebuilds - -*misdn-20060722 (24 Jul 2006) - - 24 Jul 2006; Stefan Schweizer <genstef@gentoo.org> -files/misdn.modulesd, - -misdn-20051017.ebuild, +misdn-20060722.ebuild: - version bump, use misdn-init, kernel 2.6.18 support thanks to Martin von - Gagern <Martin.vGagern@gmx.net> in bug 141020 - -*misdn-20060321 (21 Mar 2006) - - 21 Mar 2006; Stefan Schweizer <genstef@gentoo.org> - +files/module-param.diff, +files/packed.diff, -misdn-20050409.ebuild, - -misdn-20050508.ebuild, -misdn-20050514.ebuild, -misdn-20050519.ebuild, - -misdn-20051228.ebuild, -misdn-20060222.ebuild, +misdn-20060321.ebuild: - version bump, mqueue has been merged back into head, remove old ebuilds - -*misdn-20060222 (28 Feb 2006) - - 28 Feb 2006; Stefan Schweizer <genstef@gentoo.org> +misdn-20060222.ebuild: - version bump - -*misdn-20051228 (01 Jan 2006) - - 01 Jan 2006; Stefan Schweizer <genstef@gentoo.org> +files/README.hfcmulti, - +files/mqueue.modulesd, +misdn-20051228.ebuild: - version bump, hard masked because it is now from the experimental mqueue branch - -*misdn-20051017 (17 Oct 2005) - - 17 Oct 2005; Stefan Schweizer <genstef@gentoo.org> +misdn-20051017.ebuild: - Version bump - - 03 Sep 2005; Stefan Briesenick <sbriesen@gentoo.org> files/misdn.modulesd: - updated modules.d/misdn config - -*misdn-20050519 (30 May 2005) - - 30 May 2005; Stefan Schweizer <genstef@gentoo.org> +misdn-20050519.ebuild: - Version bump - -*misdn-20050514 (16 May 2005) - - 16 May 2005; Stefan Schweizer <genstef@gentoo.org> files/misdn.modulesd, - +misdn-20050514.ebuild: - Version bump, new modulesd file - -*misdn-20050508 (08 May 2005) - - 08 May 2005; Stefan Schweizer <genstef@gentoo.org> +misdn-20050508.ebuild: - version bump thanks to sbriesen - -*misdn-20050409 (24 Apr 2005) - - 24 Apr 2005; Stefan Schweizer <genstef@gentoo.org> - +files/change-pci_find_subsys-to-pci_get_subsys.patch, - +files/misdn.modulesd, +metadata.xml, +misdn-20050409.ebuild: - New ebuild for the experimental mISDN driver, thanks to sbriesen and - strafbomber for testing - diff --git a/net-dialup/misdn/Manifest b/net-dialup/misdn/Manifest deleted file mode 100644 index 802606f8f290..000000000000 --- a/net-dialup/misdn/Manifest +++ /dev/null @@ -1,20 +0,0 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 - -AUX README.hfcmulti 2488 SHA256 29793879cd9a752fb1f71e9f9aebc8988024b5ec8cdb53d0d551fc75ade0377f SHA512 6b9eff7032a05071a92e5d713911d9bf36a82e92b9360992a5108191a93dfa55ecd7eb6abdf3d4fd82ebf3cff92d6c01271b1b5c671a9e27ee58602c064e4fdd WHIRLPOOL c084a8ca4509ff5b1e471d64e10233bab5d64e96d2031b05306e28e8ed599646d7916b8b84bea1c2e31370c7d8fb26c10b393618b11735f80d3dcaadbb39c3e5 -AUX misdn-2.6.23.diff 1329 SHA256 a31e4b8f29f0bc9d032eb3f1d382274e36e105b679ddb9ff23128bf75e5b763e SHA512 d987ccbd58181d68622eabf113359e7a320f78b7e812afbdae517f4b734e9348d423c44bc69db45f3c5a534897eefbd288545aefcdaddf40ecf263d3b47fb48f WHIRLPOOL baae7aea25b94b6656a439bd40da648f0607fc7e01458f20d7f7afc49c877915bd1a8c286c63a3ac9758e418d2f641574c3d104b245ddc2def28842140cdeddf -AUX misdn-2.6.24.diff 11969 SHA256 bb62d30fec3eea7a80d42caec72d2b6915bc218956e47513ef540fb9e6f43725 SHA512 2a3bd36c0239d5abc2ccf2b4dca66e443e7c3ec8e7dc55af43b9f29e31199e3e6382ab0cfb695ce115f8398616d903a8c8ad1194b2dd9f28f075c70eda2fdd43 WHIRLPOOL 715ab96085a9bee235e69154d2693ca88b3fa51fca20c00877816a83126deaa54a95339078fd4615e4ff341b161edef3b80176ae4f4e456aee85d7fe56732077 -DIST mISDN-1_1_7.tar.gz 471967 SHA256 d3228fafe17046150062f296549abbdccaa9f976e9275f0edd12d1a25ca93f2b -DIST mISDN-1_1_7_2.tar.gz 477593 SHA256 24a63f063d9a3cbdaa2e7f5a3f9fb55988ba3f08cb5ccf19c3d7eb726eb806d9 -EBUILD misdn-1.1.7.2-r1.ebuild 6100 SHA256 b35f92c5bd1548f4a2c136467c9c11634baf26d973c085c4ed31967334acac3a SHA512 f37559e720fd04d8d74e575e23ab5ff88d12f3f5d11a3d40f64dcbf5aa09e1d775d9e7972b9287d5e5439fee5aca0dff48ea5fa8e190ab34d9796b0098aeabfd WHIRLPOOL 0b94a81066f9f4afd2e0c438a10f5bb3a30b051db4b165292d74d59922ccd292a13e77f6963f3cdf393038fa462aa3594027d94454dbbc3646a6968593d7bb20 -EBUILD misdn-1.1.7.2.ebuild 6014 SHA256 b36d4c2d14b4417fbaeefe60b9f1fc3ba0f256250331c06f2c3fd9afdec11993 SHA512 f3b0f9b2479e0ee5487802b89f64f94239620e4a9c1d80755bcd221e20b99296db12c777c622e3c623c664697c367869fe3d26734079b074193154998b33592a WHIRLPOOL 54ef7388eaee53cb6143cc15ee764b456281959977022930dd006d4baef16921bb668662036ee557954c6877e310ee78494d22a5f294bc9dedd9ba8ab7255791 -EBUILD misdn-1.1.7.ebuild 5344 SHA256 12e8b4c508248bedb729d9e81b7c70fbb5f2e84591d414f7e2de1f6752673ddd SHA512 3c85135a65b4b03d50df7cae0efae4e76922db62aca591c3a598e15ca3ae5bd189ec234c60dd6e6fab2176186ca58b727508dc78dbb1b3df0d183e1aa51bd118 WHIRLPOOL c2981602e8d927533d68928c14aec4b27b92e53f1ca4a69124b49935668477745104a5b65e4ed77dc91ef134c42259ae4f5bb29ad8e17cfc08198157ff56c07a -MISC ChangeLog 5504 SHA256 f2ebeb37c87230bf2b2d7d269cfa1f0346119265c2c25d3b30cd5af8b31afd05 SHA512 a2586b9f2928ad40c20b4fbdc5669c303e6b246d99438b1afa503ec3cc22b6983fdd71192cb42718a79e55e8f010f0be19a3b5ded24cdff7f648ac249e244c6c WHIRLPOOL a1a8fa79d3ddf5173afeaa36c1fb4883643dadec70c82791ccc7b2a242aa2a0bcd9d54914976dc512f1dede9fa50aedf0bb4e533aadb0074cb07df0d28e563ac -MISC metadata.xml 446 SHA256 4758fca4e5a42fb513396be46ad1254a719ea9027463961e4024659156ee0607 SHA512 b7951c7c9e9944d8cd017110428d93317c922f858a5d7166d163287eea56855723e6e3ca125193c051cbb7a75ad8021e3efb9f5b6205c4a1405610ce443b7912 WHIRLPOOL cdceb07528d21bb386c953cc792e8d4e0d8a48c275829956297775d83a49c0b6d0c09d57f0c90a67df9cb55f1ce45d93cc8933a35411e9dedecdc4d6c78e9b39 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.19 (GNU/Linux) - -iF4EAREIAAYFAlDHY9EACgkQ2ugaI38ACPBFwgD9Gv3NwBLKF62LyPHhCEc1ZQp+ -bNDFKmW/WehQrCbrm/YA/2r3esWJVkZasZcKaox3yaVpUTlqYW/exHyc72YBoXY9 -=PnLs ------END PGP SIGNATURE----- diff --git a/net-dialup/misdn/files/README.hfcmulti b/net-dialup/misdn/files/README.hfcmulti deleted file mode 100644 index 1b29369e3fdf..000000000000 --- a/net-dialup/misdn/files/README.hfcmulti +++ /dev/null @@ -1,61 +0,0 @@ - * hfcmulti - low level driver for hfc-4s/hfc-8s/hfc-e1 based cards - * module parameters: - - * type: - Value 1 = HFC-E1 (1 port) 0x01 - Value 4 = HFC-4S (4 ports) 0x04 - Value 8 = HFC-8S (8 ports) 0x08 - Bit 8 = uLaw (instead of aLaw) - Bit 9 = Enable DTMF detection on all B-channels - Bit 10 = spare - Bit 11 = Set PCM bus into slave mode. - Bit 12 = Ignore missing frame clock on PCM bus. - Bit 13 = Use direct RX clock for PCM sync rather than PLL. (E1 only) - Bit 14 = Use external ram (128K) - Bit 15 = Use external ram (512K) - Bit 16 = Use 64 timeslots instead of 32 - Bit 17 = Use 128 timeslots instead of anything else - - * protocol: - NOTE: Must be given for all ports, not for the number of cards. - HFC-4S/HFC-8S/HFC-E1 bits: - Bit 0-3 = protocol - Bit 4 = NT-Mode - Bit 5 = PTP (instead of multipoint) - - HFC-4S/HFC-8S only bits: - Bit 16 = Use master clock for this S/T interface (ony once per chip). - Bit 17 = transmitter line setup (non capacitive mode) DONT CARE! - Bit 18 = Disable E-channel. (No E-channel processing) - Bit 19 = Register E-channel as D-stack (TE-mode only) - - HFC-E1 only bits: - Bit 16 = interface: 0=copper, 1=optical - Bit 17 = reserved (later for 32 B-channels transparent mode) - Bit 18 = Report LOS - Bit 19 = Report AIS - Bit 20 = Report SLIP - Bit 21-22 = elastic jitter buffer (1-3), Use 0 for default. - (all other bits are reserved and shall be 0) - - * layermask: - NOTE: Must be given for all ports, not for the number of cards. - mask of layers to be used for D-channel stack - - * debug: - NOTE: only one debug value must be given for all cards - enable debugging (see hfc_multi.h for debug options) - - * poll: - NOTE: only one poll value must be given for all cards - Give the number of samples for each fifo process. - By default 128 is used. Decrease to reduce delay, increase to - reduce cpu load. If unsure, don't mess with it! - Valid is 8, 16, 32, 64, 128, 256. - - * pcm: - NOTE: only one pcm value must be given for all cards - Give the id of the PCM bus. All PCM busses with the same ID - are expected to be connected and have equal slots. - Only one chip of the PCM bus must be master, the others slave. - -1 means no support of PCM bus. diff --git a/net-dialup/misdn/files/misdn-2.6.23.diff b/net-dialup/misdn/files/misdn-2.6.23.diff deleted file mode 100644 index df38ba619068..000000000000 --- a/net-dialup/misdn/files/misdn-2.6.23.diff +++ /dev/null @@ -1,53 +0,0 @@ -diff -ur mISDN.orig/capi.c mISDN/capi.c ---- mISDN.orig/capi.c 2007-10-22 20:29:42.000000000 +0200 -+++ mISDN/capi.c 2007-10-22 20:31:18.000000000 +0200 -@@ -258,7 +258,7 @@ - #else - sizeof(_cmsg), - #endif -- 0, 0, NULL, NULL); -+ 0, 0, NULL); - if (!mISDN_cmsg_cp) { - CapiCachesFree(); - return(-ENOMEM); -@@ -269,7 +269,7 @@ - #else - sizeof(AppPlci_t), - #endif -- 0, 0, NULL, NULL); -+ 0, 0, NULL); - if (!mISDN_AppPlci_cp) { - CapiCachesFree(); - return(-ENOMEM); -@@ -280,7 +280,7 @@ - #else - sizeof(Ncci_t), - #endif -- 0, 0, NULL, NULL); -+ 0, 0, NULL); - if (!mISDN_ncci_cp) { - CapiCachesFree(); - return(-ENOMEM); -@@ -291,7 +291,7 @@ - #else - sizeof(SSProcess_t), - #endif -- 0, 0, NULL, NULL); -+ 0, 0, NULL); - if (!mISDN_sspc_cp) { - CapiCachesFree(); - return(-ENOMEM); -diff -ur mISDN.orig/udevice.c mISDN/udevice.c ---- mISDN.orig/udevice.c 2007-10-22 20:29:42.000000000 +0200 -+++ mISDN/udevice.c 2007-10-22 20:33:35.000000000 +0200 -@@ -2025,9 +2025,7 @@ - if ((err = mISDN_unregister(&udev_obj))) { - printk(KERN_ERR "Can't unregister UserDevice(%d)\n", err); - } -- if ((err = unregister_chrdev(mISDN_MAJOR, "mISDN"))) { -- printk(KERN_WARNING "mISDN: devices busy on remove\n"); -- } -+ unregister_chrdev(mISDN_MAJOR, "mISDN"); - #ifdef CONFIG_DEVFS_FS - devfs_remove("mISDN"); - #endif diff --git a/net-dialup/misdn/files/misdn-2.6.24.diff b/net-dialup/misdn/files/misdn-2.6.24.diff deleted file mode 100644 index 66c9f8265237..000000000000 --- a/net-dialup/misdn/files/misdn-2.6.24.diff +++ /dev/null @@ -1,331 +0,0 @@ -diff -Naur mISDN-1_1_7_2.orig/drivers/isdn/hardware/mISDN/app_plci.c mISDN-1_1_7_2/drivers/isdn/hardware/mISDN/app_plci.c ---- mISDN-1_1_7_2.orig/drivers/isdn/hardware/mISDN/app_plci.c 2008-01-18 10:24:49.000000000 +0100 -+++ mISDN-1_1_7_2/drivers/isdn/hardware/mISDN/app_plci.c 2008-02-05 23:06:46.000000000 +0100 -@@ -825,6 +825,7 @@ - cmsg->LLC = &p[qi->llc.off + 1]; - if (qi->hlc.off) - cmsg->HLC = &p[qi->hlc.off + 1]; -+#ifdef CAPIUTIL_VERSION - #if CAPIUTIL_VERSION > 1 - /* ETS 300 092 Annex B */ - if (qi->calling_nr.repeated) { -@@ -834,6 +835,7 @@ - int_error(); - } - #endif -+#endif - // all else set to default - } - if (mISDN_FsmEvent(&aplci->plci_m, EV_PI_CONNECT_IND, cmsg)) -diff -Naur mISDN-1_1_7_2.orig/drivers/isdn/hardware/mISDN/avm_fritz.c mISDN-1_1_7_2/drivers/isdn/hardware/mISDN/avm_fritz.c ---- mISDN-1_1_7_2.orig/drivers/isdn/hardware/mISDN/avm_fritz.c 2008-01-18 10:24:49.000000000 +0100 -+++ mISDN-1_1_7_2/drivers/isdn/hardware/mISDN/avm_fritz.c 2008-02-05 23:06:46.000000000 +0100 -@@ -689,7 +689,11 @@ - } - - static irqreturn_t -+#ifdef OLD_IRQ_CALL - avm_fritz_interrupt(int intno, void *dev_id, struct pt_regs *regs) -+#else -+avm_fritz_interrupt(int intno, void *dev_id) -+#endif - { - fritzpnppci *fc = dev_id; - u_char val; -@@ -722,7 +726,11 @@ - } - - static irqreturn_t -+#ifdef OLD_IRQ_CALL - avm_fritzv2_interrupt(int intno, void *dev_id, struct pt_regs *regs) -+#else -+avm_fritzv2_interrupt(int intno, void *dev_id) -+#endif - { - fritzpnppci *fc = dev_id; - u_char val; -@@ -876,7 +884,7 @@ - static int init_card(fritzpnppci *fc) - { - int cnt = 3; -- u_int shared = SA_SHIRQ; -+ u_int shared = __IRQF_SHARED; - u_long flags; - u_char *id = "AVM Fritz!PCI"; - -diff -Naur mISDN-1_1_7_2.orig/drivers/isdn/hardware/mISDN/core.c mISDN-1_1_7_2/drivers/isdn/hardware/mISDN/core.c ---- mISDN-1_1_7_2.orig/drivers/isdn/hardware/mISDN/core.c 2007-12-17 16:29:59.000000000 +0100 -+++ mISDN-1_1_7_2/drivers/isdn/hardware/mISDN/core.c 2008-02-05 23:06:46.000000000 +0100 -@@ -759,9 +759,11 @@ - int - mISDNInit(void) - { -- DECLARE_MUTEX_LOCKED(sem); -+ struct semaphore sem; - int err; - -+ init_MUTEX_LOCKED(&sem); -+ - printk(KERN_INFO "Modular ISDN Stack core version (%s) revision (%s)\n", mISDN_core_version, mISDN_core_revision); - core_debug = debug; - #ifdef MISDN_MEMDEBUG -@@ -801,7 +803,8 @@ - } - - void mISDN_cleanup(void) { -- DECLARE_MUTEX_LOCKED(sem); -+ struct semaphore sem; -+ init_MUTEX_LOCKED(&sem); - - free_mISDNdev(); - if (!list_empty(&mISDN_objectlist)) { -diff -Naur mISDN-1_1_7_2.orig/drivers/isdn/hardware/mISDN/dsp_core.c mISDN-1_1_7_2/drivers/isdn/hardware/mISDN/dsp_core.c ---- mISDN-1_1_7_2.orig/drivers/isdn/hardware/mISDN/dsp_core.c 2008-01-18 10:24:50.000000000 +0100 -+++ mISDN-1_1_7_2/drivers/isdn/hardware/mISDN/dsp_core.c 2008-02-05 23:10:32.000000000 +0100 -@@ -1005,8 +1005,10 @@ - /* fill mISDN object (dsp_obj) */ - memset(&dsp_obj, 0, sizeof(dsp_obj)); - #ifdef MODULE -+#ifdef SET_MODULE_OWNER - SET_MODULE_OWNER(&dsp_obj); - #endif -+#endif - spin_lock_init(&dsp_obj.lock); - dsp_obj.name = DSPName; - dsp_obj.BPROTO.protocol[3] = ISDN_PID_L3_B_DSP; -diff -Naur mISDN-1_1_7_2.orig/drivers/isdn/hardware/mISDN/hfc_multi.c mISDN-1_1_7_2/drivers/isdn/hardware/mISDN/hfc_multi.c ---- mISDN-1_1_7_2.orig/drivers/isdn/hardware/mISDN/hfc_multi.c 2008-01-18 10:24:50.000000000 +0100 -+++ mISDN-1_1_7_2/drivers/isdn/hardware/mISDN/hfc_multi.c 2008-02-05 23:06:46.000000000 +0100 -@@ -119,7 +119,7 @@ - #define bugtest \ - if (hc->irq) free_irq(hc->irq, hc); \ - hc->irq = 0; \ -- if (request_irq(hc->pci_dev->irq, hfcmulti_interrupt, SA_SHIRQ, "HFC-multi", hc)) { \ -+ if (request_irq(hc->pci_dev->irq, hfcmulti_interrupt, __IRQF_SHARED, "HFC-multi", hc)) { \ - printk(KERN_WARNING "mISDN: Could not get interrupt %d.\n", hc->pci_dev->irq); \ - hc->irq = hc->pci_dev->irq; } - #endif -@@ -1930,7 +1930,11 @@ - } - - static irqreturn_t -+#ifdef OLD_IRQ_CALL - hfcmulti_interrupt(int intno, void *dev_id, struct pt_regs *regs) -+#else -+hfcmulti_interrupt(int intno, void *dev_id) -+#endif - { - #ifdef IRQCOUNT_DEBUG - static int iq1=0,iq2=0,iq3=0,iq4=0,iq5=0,iq6=0,iqcnt=0; -@@ -3294,7 +3298,7 @@ - disable_hwirq(hc); - spin_unlock_irqrestore(&hc->lock, flags); - -- if (request_irq(hc->pci_dev->irq, hfcmulti_interrupt, SA_SHIRQ, "HFC-multi", hc)) { -+ if (request_irq(hc->pci_dev->irq, hfcmulti_interrupt, __IRQF_SHARED, "HFC-multi", hc)) { - printk(KERN_WARNING "mISDN: Could not get interrupt %d.\n", hc->pci_dev->irq); - return(-EIO); - } -diff -Naur mISDN-1_1_7_2.orig/drivers/isdn/hardware/mISDN/hfc_pci.c mISDN-1_1_7_2/drivers/isdn/hardware/mISDN/hfc_pci.c ---- mISDN-1_1_7_2.orig/drivers/isdn/hardware/mISDN/hfc_pci.c 2008-01-18 10:24:50.000000000 +0100 -+++ mISDN-1_1_7_2/drivers/isdn/hardware/mISDN/hfc_pci.c 2008-02-05 23:06:46.000000000 +0100 -@@ -1034,7 +1034,11 @@ - } - - static irqreturn_t -+#ifdef OLD_IRQ_CALL - hfcpci_interrupt(int intno, void *dev_id, struct pt_regs *regs) -+#else -+hfcpci_interrupt(int intno, void *dev_id) -+#endif - { - hfc_pci_t *hc = dev_id; - u_char exval; -@@ -1693,7 +1697,7 @@ - spin_lock_irqsave(&hc->lock, flags); - disable_hwirq(hc); - spin_unlock_irqrestore(&hc->lock, flags); -- if (request_irq(hc->irq, hfcpci_interrupt, SA_SHIRQ, "HFC PCI", hc)) { -+ if (request_irq(hc->irq, hfcpci_interrupt, __IRQF_SHARED, "HFC PCI", hc)) { - printk(KERN_WARNING "mISDN: couldn't get interrupt %d\n", hc->irq); - return(-EIO); - } -diff -Naur mISDN-1_1_7_2.orig/drivers/isdn/hardware/mISDN/hfcs_mini.c mISDN-1_1_7_2/drivers/isdn/hardware/mISDN/hfcs_mini.c ---- mISDN-1_1_7_2.orig/drivers/isdn/hardware/mISDN/hfcs_mini.c 2008-01-18 10:24:50.000000000 +0100 -+++ mISDN-1_1_7_2/drivers/isdn/hardware/mISDN/hfcs_mini.c 2008-02-05 23:06:46.000000000 +0100 -@@ -983,7 +983,11 @@ - /* Interrupt handler */ - /*********************/ - static irqreturn_t -+#ifdef OLD_IRQ_CALL - hfcsmini_interrupt(int intno, void *dev_id, struct pt_regs *regs) -+#else -+hfcsmini_interrupt(int intno, void *dev_id) -+#endif - { - __u8 fifo_irq, misc_irq; - hfcsmini_hw *hw = dev_id; -@@ -1587,7 +1591,7 @@ - printk(KERN_WARNING "%s %s: requesting IRQ %d\n", - hw->card_name, __FUNCTION__, hw->irq); - -- if (request_irq(hw->irq, hfcsmini_interrupt, SA_SHIRQ, "HFC-S mini", hw)) { -+ if (request_irq(hw->irq, hfcsmini_interrupt, __IRQF_SHARED, "HFC-S mini", hw)) { - printk(KERN_WARNING "%s %s: couldn't get interrupt %d\n", - hw->card_name, __FUNCTION__, hw->irq); - -diff -Naur mISDN-1_1_7_2.orig/drivers/isdn/hardware/mISDN/hfcs_usb.c mISDN-1_1_7_2/drivers/isdn/hardware/mISDN/hfcs_usb.c ---- mISDN-1_1_7_2.orig/drivers/isdn/hardware/mISDN/hfcs_usb.c 2008-01-18 10:24:50.000000000 +0100 -+++ mISDN-1_1_7_2/drivers/isdn/hardware/mISDN/hfcs_usb.c 2008-02-05 23:06:46.000000000 +0100 -@@ -1109,17 +1109,13 @@ - { - int k; - -- spin_lock_init(&urb->lock); -- urb->dev = dev; -- urb->pipe = pipe; -- urb->complete = complete; -+ usb_fill_bulk_urb(urb, dev, pipe, buf, packet_size * num_packets, complete, context); -+ - urb->number_of_packets = num_packets; -- urb->transfer_buffer_length = packet_size * num_packets; -- urb->context = context; -- urb->transfer_buffer = buf; - urb->transfer_flags = URB_ISO_ASAP; - urb->actual_length = 0; - urb->interval = interval; -+ - for (k = 0; k < num_packets; k++) { - urb->iso_frame_desc[k].offset = packet_size * k; - urb->iso_frame_desc[k].length = packet_size; -diff -Naur mISDN-1_1_7_2.orig/drivers/isdn/hardware/mISDN/netjet.c mISDN-1_1_7_2/drivers/isdn/hardware/mISDN/netjet.c ---- mISDN-1_1_7_2.orig/drivers/isdn/hardware/mISDN/netjet.c 2008-01-18 10:24:50.000000000 +0100 -+++ mISDN-1_1_7_2/drivers/isdn/hardware/mISDN/netjet.c 2008-02-05 23:06:46.000000000 +0100 -@@ -1463,7 +1463,11 @@ - } - - static irqreturn_t -+#ifdef OLD_IRQ_CALL - nj_interrupt(int intno, void *dev_id, struct pt_regs *regs) -+#else -+nj_interrupt(int intno, void *dev_id) -+#endif - { - netjet_t *card = dev_id; - u_int8_t val, s1val, s0val; -@@ -1544,7 +1548,7 @@ - nj_disable_hwirq(card); - spin_unlock_irqrestore(&card->lock, flags); - -- if (request_irq(card->irq, nj_interrupt, SA_SHIRQ, "NETjet", card)) { -+ if (request_irq(card->irq, nj_interrupt, __IRQF_SHARED, "NETjet", card)) { - printk(KERN_WARNING "mISDN: couldn't get interrupt %d\n", - card->irq); - return (-EIO); -diff -Naur mISDN-1_1_7_2.orig/drivers/isdn/hardware/mISDN/sedl_fax.c mISDN-1_1_7_2/drivers/isdn/hardware/mISDN/sedl_fax.c ---- mISDN-1_1_7_2.orig/drivers/isdn/hardware/mISDN/sedl_fax.c 2008-01-18 10:24:50.000000000 +0100 -+++ mISDN-1_1_7_2/drivers/isdn/hardware/mISDN/sedl_fax.c 2008-02-05 23:06:46.000000000 +0100 -@@ -338,7 +338,7 @@ - { - int cnt = 3; - u_long flags; -- u_int shared = SA_SHIRQ; -+ u_int shared = __IRQF_SHARED; - void *irq_func = speedfax_pci_interrupt; - - if (sf->subtyp == SEDL_SPEEDFAX_ISA) { -diff -Naur mISDN-1_1_7_2.orig/drivers/isdn/hardware/mISDN/stack.c mISDN-1_1_7_2/drivers/isdn/hardware/mISDN/stack.c ---- mISDN-1_1_7_2.orig/drivers/isdn/hardware/mISDN/stack.c 2008-01-18 10:24:50.000000000 +0100 -+++ mISDN-1_1_7_2/drivers/isdn/hardware/mISDN/stack.c 2008-02-05 23:06:46.000000000 +0100 -@@ -786,9 +786,11 @@ - static int - delete_stack(mISDNstack_t *st) - { -- DECLARE_MUTEX_LOCKED(sem); -+ struct semaphore sem; - u_long flags; - -+ init_MUTEX_LOCKED(&sem); -+ - if (core_debug & DEBUG_CORE_FUNC) - printk(KERN_DEBUG "%s: st(%p:%08x)\n", __FUNCTION__, st, st->id); - mISDN_unregister_sysfs_st(st); -@@ -1198,7 +1200,8 @@ - hhe->addr = st->id; - - if (wait) { -- DECLARE_MUTEX_LOCKED(sem); -+ struct semaphore sem; -+ init_MUTEX_LOCKED(&sem); - - hhe->data[0] = &sem; - _queue_message(st, skb); -diff -Naur mISDN-1_1_7_2.orig/drivers/isdn/hardware/mISDN/w6692.c mISDN-1_1_7_2/drivers/isdn/hardware/mISDN/w6692.c ---- mISDN-1_1_7_2.orig/drivers/isdn/hardware/mISDN/w6692.c 2008-01-18 10:24:50.000000000 +0100 -+++ mISDN-1_1_7_2/drivers/isdn/hardware/mISDN/w6692.c 2008-02-05 23:06:46.000000000 +0100 -@@ -855,7 +855,11 @@ - } - - static irqreturn_t -+#ifdef OLD_IRQ_CALL - w6692_interrupt(int intno, void *dev_id, struct pt_regs *regs) -+#else -+w6692_interrupt(int intno, void *dev_id) -+#endif - { - w6692pci *card = dev_id; - u_char ista; -@@ -994,7 +998,7 @@ - spin_lock_irqsave(&card->lock, flags); - disable_hwirq(card); - spin_unlock_irqrestore(&card->lock, flags); -- if (request_irq(card->irq, w6692_interrupt, SA_SHIRQ, "w6692", card)) { -+ if (request_irq(card->irq, w6692_interrupt, __IRQF_SHARED, "w6692", card)) { - printk(KERN_WARNING "mISDN: couldn't get interrupt %d\n", card->irq); - return(-EIO); - } -diff -Naur mISDN-1_1_7_2.orig/drivers/isdn/hardware/mISDN/xhfc_su.c mISDN-1_1_7_2/drivers/isdn/hardware/mISDN/xhfc_su.c ---- mISDN-1_1_7_2.orig/drivers/isdn/hardware/mISDN/xhfc_su.c 2008-01-18 10:24:50.000000000 +0100 -+++ mISDN-1_1_7_2/drivers/isdn/hardware/mISDN/xhfc_su.c 2008-02-05 23:06:46.000000000 +0100 -@@ -1103,7 +1103,11 @@ - /* Interrupt handler */ - /*********************/ - static irqreturn_t -+#ifdef OLD_IRQ_CALL - xhfc_interrupt(int intno, void *dev_id, struct pt_regs *regs) -+#else -+xhfc_interrupt(int intno, void *dev_id) -+#endif - { - xhfc_pi *pi = dev_id; - xhfc_t * xhfc = NULL; -@@ -2031,7 +2035,7 @@ - } - - /* init interrupt engine */ -- if (request_irq(pi->irq, xhfc_interrupt, SA_SHIRQ, "XHFC", pi)) { -+ if (request_irq(pi->irq, xhfc_interrupt, __IRQF_SHARED, "XHFC", pi)) { - printk(KERN_WARNING "%s %s: couldn't get interrupt %d\n", - pi->name, __FUNCTION__, pi->irq); - pi->irq = 0; -diff -Naur mISDN-1_1_7_2.orig/include/linux/isdn_compat.h mISDN-1_1_7_2/include/linux/isdn_compat.h ---- mISDN-1_1_7_2.orig/include/linux/isdn_compat.h 2008-01-18 10:25:33.000000000 +0100 -+++ mISDN-1_1_7_2/include/linux/isdn_compat.h 2008-02-05 23:06:46.000000000 +0100 -@@ -128,6 +128,17 @@ - #define MISDN_COMPAT_KMEMCACHE - #endif - -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20) -+#define OLD_IRQ_CALL -+#else -+#undef OLD_IRQ_CALL -+#endif -+ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,22) -+#define __IRQF_SHARED SA_SHIRQ -+#else -+#define __IRQF_SHARED IRQF_SHARED -+#endif - - - #endif /* __KERNEL__ */ diff --git a/net-dialup/misdn/metadata.xml b/net-dialup/misdn/metadata.xml deleted file mode 100644 index 5b83a55776f6..000000000000 --- a/net-dialup/misdn/metadata.xml +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<herd>net-dialup</herd> -<use> - <flag name='ecaggressive'>Make the selected echo canceller a little more - aggressive</flag> - <flag name='eckb1'>Use the KB1 echo canceller</flag> - <flag name='ecmark2'>Use the MARK2 echo canceller</flag> - <flag name='ecmg2'>Use the MG2 echo canceller (default)</flag> -</use> -</pkgmetadata> diff --git a/net-dialup/misdn/misdn-1.1.7.2-r1.ebuild b/net-dialup/misdn/misdn-1.1.7.2-r1.ebuild deleted file mode 100644 index 9478720d4fa2..000000000000 --- a/net-dialup/misdn/misdn-1.1.7.2-r1.ebuild +++ /dev/null @@ -1,217 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-dialup/misdn/misdn-1.1.7.2-r1.ebuild,v 1.2 2012/12/11 16:48:03 axs Exp $ - -inherit eutils linux-mod udev toolchain-funcs - -MY_P=mISDN-${PV//./_} - -DESCRIPTION="mISDN is the new ISDN stack of the linux kernel 2.6" -HOMEPAGE="http://www.misdn.org/" -SRC_URI="http://www.misdn.org/downloads/releases/${MY_P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" - -RDEPEND="net-dialup/capi4k-utils - dev-libs/libxslt - sys-devel/bc" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -# list of echo canceller use flags, -# first active in this list is selected (=order does matter) -MISDN_EC_FLAGS=("ecmg2" "eckb1" "ecmark2") - -# list of card modules -MISDN_MODULES=("avmfritz" "hfcpci" "hfcmulti" "hfcsusb" "hfcsmini" "xhfc" "sedlfax" "w6692pci" "netjetpci") -MISDN_KCONFIG=("AVM_FRITZ" "HFCPCI" "HFCMULTI" "HFCUSB" "HFCMINI" "XHFC" "SPEEDFAX" "W6692" "NETJET") - -IUSE="ecaggressive ${MISDN_EC_FLAGS[*]}" -for i in ${MISDN_MODULES[@]}; do IUSE="${IUSE} misdn_cards_${i}"; done - -MY_S=${WORKDIR}/${MY_P} -S=${MY_S}/drivers/isdn/hardware/mISDN - -### Begin: Helper functions - -select_echo_cancel() { - local i myEC=${MISDN_EC_FLAGS[0]} - for i in ${MISDN_EC_FLAGS[*]}; do - if use ${i}; then - myEC=$(echo "${i}" | sed -e "s:^ec\(.*\):\U\1\E:") - break; - fi - done - echo "${myEC}" | sed -e "s:^ec\(.*\):\U\1\E:" -} - -dsp_enable() { - local i - for i in "${@}"; do - sed -i -e "s:.*\(#include.*dsp_${i}\):\1:m" dsp.h - done -} - -dsp_disable() { - local i - for i in "${@}"; do - sed -i -e "s:.*\(#include.*dsp_${i}\)://\1:m" dsp.h - done -} - -### End: Helper functions - -#CONFIG_I4L_CAPI_LAYER -> I4LmISDN -#CONFIG_MISDN_MEMDEBUG -> memdbg -#CONFIG_MISDN_NETDEV -> netdev - -# def SYSFS_SUPPORT - -pkg_setup() { - local USERCARD CARD EC NUM=0 - - CONFIG_CHECK="ISDN_CAPI ISDN_CAPI_CAPI20 ISDN_CAPI_CAPIFS_BOOL" - kernel_is ge 2 6 24 && CONFIG_CHECK="${CONFIG_CHECK} PCI_LEGACY" - linux-mod_pkg_setup - - # base modules - BUILD_TARGETS="modules" - BUILD_PARAMS="-C ${KV_DIR} SUBDIRS=${S} MINCLUDES=${MY_S}/include CONFIG_MISDN_DRV=m" - MODULE_NAMES="mISDN_core(net:) mISDN_isac(net:) mISDN_l1(net:) mISDN_l2(net:) - mISDN_x25dte(net:) l3udss1(net:) mISDN_capi(net:) mISDN_dtmf(net:)" - - # extra modules - BUILD_PARAMS="${BUILD_PARAMS} CONFIG_MISDN_DSP=m CONFIG_MISDN_LOOP=m CONFIG_MISDN_DEBUGTOOL=m" - MODULE_NAMES="${MODULE_NAMES} mISDN_dsp(net:) mISDN_loop(net:) mISDN_debugtool(net:)" - - # check if multiple echo cancellers have been selected - EC_SELECTED=$(select_echo_cancel) - for EC in ${MISDN_EC_FLAGS}; do - use ${EC} && : $((NUM++)) - done - if [ ${NUM} -gt 1 ]; then - # multiple flags are active, only the first in the MISDN_EC_FLAGS - # list will be used, make sure the user knows about this - ewarn "Multiple echo canceller flags are active but only one will be used!" - ewarn "Selected: ${EC_SELECTED}" - else - elog "Selected echo canceller: ${EC_SELECTED}" - fi - - # Check existence of user selected cards - if [ -n "${MISDN_CARDS}" ]; then - for USERCARD in ${MISDN_CARDS}; do - for ((CARD=0; CARD < ${#MISDN_MODULES[*]}; CARD++)); do - if [ "${USERCARD}" = "${MISDN_MODULES[CARD]}" ]; then - MODULE_NAMES="${MODULE_NAMES} ${MISDN_MODULES[CARD]}(net:)" - BUILD_PARAMS="${BUILD_PARAMS} CONFIG_MISDN_${MISDN_KCONFIG[CARD]}=m" - continue 2 - fi - done - die "Module ${USERCARD} not present in ${P}" - done - else - elog "You can control the modules which are built with the variable" - elog "MISDN_CARDS which should contain a blank separated list" - elog "of a selection from the following cards:" - elog " ${MISDN_MODULES[*]}" - # enable everything - for ((CARD=0; CARD < ${#MISDN_MODULES[*]}; CARD++)); do - MODULE_NAMES="${MODULE_NAMES} ${MISDN_MODULES[CARD]}(net:)" - BUILD_PARAMS="${BUILD_PARAMS} CONFIG_MISDN_${MISDN_KCONFIG[CARD]}=m" - done - fi -} - -src_unpack() { - unpack ${A} - - # mostly backported from mISDN-git, so it should - # not be needed anymore next version ;-) - epatch "${FILESDIR}/misdn-2.6.24.diff" - - cd "${S}" - sed -i -e "s:^\(CFLAGS\):EXTRA_\1:g" "Makefile" - - sed -i -e "s:^\(USER=\).*:\1root:" \ - -e "s:^\(GROUP=\).*:\1uucp:" \ - "${MY_S}/misdn-init" - - sed -i -e "s:^\(DEVNODE_user=\).*:\1'root':" \ - -e "s:^\(DEVNODE_group=\).*:\1'uucp':" \ - -e "s:^\(DEVNODE_mode=\).*:\1'0660':" \ - "${MY_S}/config/mISDN" - - if use ecaggressive; then - sed -i -e "s:.*\(#define.*AGGRESSIVE_SUPPRESSOR\):\1:m" dsp.h - fi - - case "${EC_SELECTED}" in - MG2) - dsp_enable mg2ec - dsp_disable kb1ec mec2 - ;; - KB1) - dsp_enable kb1ec - dsp_disable mg2ec mec2 - ;; - MARK2) - dsp_enable mec2 - dsp_disable mg2ec kb1ec - ;; - esac -} - -src_install() { - linux-mod_src_install - - insinto /usr/include/linux - doins "${MY_S}/include/linux/"*.h - - local udevdir="$(udev_get_udevdir)" - dodir "${udevdir}"/rules.d - echo 'KERNEL=="obj-*", NAME="mISDN", GROUP="uucp", MODE="0660"' \ - > "${D}/${udevdir}"/rules.d/53-${PN}.rules - - insinto /etc/modprobe.d - newins "${MY_S}/mISDN.modprobe.d" ${PN} - dosbin "${MY_S}/misdn-init" - dodoc "${MY_S}/README.misdn-init" - -# insinto /etc -# doins "${MY_S}/config/mISDN.conf" - insinto /usr/lib/mISDN - doins "${MY_S}/config/"*.xsl - dosbin "${MY_S}/config/mISDN" - dodoc "${MY_S}/config/README.mISDN" - - dodoc Kconfig.v2.6 "${FILESDIR}/README.hfcmulti" -} - -pkg_preinst() { - # save old config, in case portage will remove it - if [ -e "${ROOT}etc/misdn-init.conf" ]; then - cp -pf "${ROOT}etc/misdn-init.conf" "${ROOT}etc/misdn-init.conf.pkginst" - fi -} - -pkg_postinst() { - linux-mod_pkg_postinst - - # restore old config, in case portage removed it - if [ -e "${ROOT}etc/misdn-init.conf.pkginst" ]; then - if [ -e "${ROOT}etc/misdn-init.conf" ]; then - rm -f "${ROOT}etc/misdn-init.conf.pkginst" - else - mv -f "${ROOT}etc/misdn-init.conf.pkginst" "${ROOT}etc/misdn-init.conf" - fi - fi - - ewarn - ewarn "This driver is still under heavy development" - ewarn "Please report ebuild related bugs / wishes to http://bugs.gentoo.org" - ewarn "Please report driver bugs to the mISDN mailing-list:" - ewarn " https://www.isdn4linux.de/mailman/listinfo/isdn4linux" -} diff --git a/net-dialup/misdn/misdn-1.1.7.2.ebuild b/net-dialup/misdn/misdn-1.1.7.2.ebuild deleted file mode 100644 index 0b914b17df1c..000000000000 --- a/net-dialup/misdn/misdn-1.1.7.2.ebuild +++ /dev/null @@ -1,215 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-dialup/misdn/misdn-1.1.7.2.ebuild,v 1.4 2008/03/27 17:36:28 genstef Exp $ - -inherit eutils linux-mod - -MY_P="mISDN-${PV//./_}" - -DESCRIPTION="mISDN is the new ISDN stack of the linux kernel 2.6" -HOMEPAGE="http://www.misdn.org/" -SRC_URI="http://www.misdn.org/downloads/releases/${MY_P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~x86 ~amd64 ~ppc" - -DEPEND="" -RDEPEND="net-dialup/capi4k-utils - dev-libs/libxslt - sys-devel/bc" - -# list of echo canceller use flags, -# first active in this list is selected (=order does matter) -MISDN_EC_FLAGS=("ecmg2" "eckb1" "ecmark2") - -# list of card modules -MISDN_MODULES=("avmfritz" "hfcpci" "hfcmulti" "hfcsusb" "hfcsmini" "xhfc" "sedlfax" "w6692pci" "netjetpci") -MISDN_KCONFIG=("AVM_FRITZ" "HFCPCI" "HFCMULTI" "HFCUSB" "HFCMINI" "XHFC" "SPEEDFAX" "W6692" "NETJET") - -IUSE="ecaggressive ${MISDN_EC_FLAGS[*]}" -for i in ${MISDN_MODULES[@]}; do IUSE="${IUSE} misdn_cards_${i}"; done - -MY_S="${WORKDIR}/${MY_P}" -S="${MY_S}/drivers/isdn/hardware/mISDN" - -### Begin: Helper functions - -select_echo_cancel() { - local i myEC=${MISDN_EC_FLAGS[0]} - for i in ${MISDN_EC_FLAGS[*]}; do - if use ${i}; then - myEC=$(echo "${i}" | sed -e "s:^ec\(.*\):\U\1\E:") - break; - fi - done - echo "${myEC}" | sed -e "s:^ec\(.*\):\U\1\E:" -} - -dsp_enable() { - local i - for i in "${@}"; do - sed -i -e "s:.*\(#include.*dsp_${i}\):\1:m" dsp.h - done -} - -dsp_disable() { - local i - for i in "${@}"; do - sed -i -e "s:.*\(#include.*dsp_${i}\)://\1:m" dsp.h - done -} - -### End: Helper functions - -#CONFIG_I4L_CAPI_LAYER -> I4LmISDN -#CONFIG_MISDN_MEMDEBUG -> memdbg -#CONFIG_MISDN_NETDEV -> netdev - -# def SYSFS_SUPPORT - -pkg_setup() { - local USERCARD CARD EC NUM=0 - - CONFIG_CHECK="ISDN_CAPI ISDN_CAPI_CAPI20 ISDN_CAPI_CAPIFS_BOOL" - kernel_is ge 2 6 24 && CONFIG_CHECK="${CONFIG_CHECK} PCI_LEGACY" - linux-mod_pkg_setup - - # base modules - BUILD_TARGETS="modules" - BUILD_PARAMS="-C ${KV_DIR} SUBDIRS=${S} MINCLUDES=${MY_S}/include CONFIG_MISDN_DRV=m" - MODULE_NAMES="mISDN_core(net:) mISDN_isac(net:) mISDN_l1(net:) mISDN_l2(net:) - mISDN_x25dte(net:) l3udss1(net:) mISDN_capi(net:) mISDN_dtmf(net:)" - - # extra modules - BUILD_PARAMS="${BUILD_PARAMS} CONFIG_MISDN_DSP=m CONFIG_MISDN_LOOP=m CONFIG_MISDN_DEBUGTOOL=m" - MODULE_NAMES="${MODULE_NAMES} mISDN_dsp(net:) mISDN_loop(net:) mISDN_debugtool(net:)" - - # check if multiple echo cancellers have been selected - EC_SELECTED=$(select_echo_cancel) - for EC in ${MISDN_EC_FLAGS}; do - use ${EC} && : $((NUM++)) - done - if [ ${NUM} -gt 1 ]; then - # multiple flags are active, only the first in the MISDN_EC_FLAGS - # list will be used, make sure the user knows about this - ewarn "Multiple echo canceller flags are active but only one will be used!" - ewarn "Selected: ${EC_SELECTED}" - else - elog "Selected echo canceller: ${EC_SELECTED}" - fi - - # Check existence of user selected cards - if [ -n "${MISDN_CARDS}" ]; then - for USERCARD in ${MISDN_CARDS}; do - for ((CARD=0; CARD < ${#MISDN_MODULES[*]}; CARD++)); do - if [ "${USERCARD}" = "${MISDN_MODULES[CARD]}" ]; then - MODULE_NAMES="${MODULE_NAMES} ${MISDN_MODULES[CARD]}(net:)" - BUILD_PARAMS="${BUILD_PARAMS} CONFIG_MISDN_${MISDN_KCONFIG[CARD]}=m" - continue 2 - fi - done - die "Module ${USERCARD} not present in ${P}" - done - else - elog "You can control the modules which are built with the variable" - elog "MISDN_CARDS which should contain a blank separated list" - elog "of a selection from the following cards:" - elog " ${MISDN_MODULES[*]}" - # enable everything - for ((CARD=0; CARD < ${#MISDN_MODULES[*]}; CARD++)); do - MODULE_NAMES="${MODULE_NAMES} ${MISDN_MODULES[CARD]}(net:)" - BUILD_PARAMS="${BUILD_PARAMS} CONFIG_MISDN_${MISDN_KCONFIG[CARD]}=m" - done - fi -} - -src_unpack() { - unpack ${A} - - # mostly backported from mISDN-git, so it should - # not be needed anymore next version ;-) - epatch "${FILESDIR}/misdn-2.6.24.diff" - - cd "${S}" - sed -i -e "s:^\(CFLAGS\):EXTRA_\1:g" "Makefile" - - sed -i -e "s:^\(USER=\).*:\1root:" \ - -e "s:^\(GROUP=\).*:\1uucp:" \ - "${MY_S}/misdn-init" - - sed -i -e "s:^\(DEVNODE_user=\).*:\1'root':" \ - -e "s:^\(DEVNODE_group=\).*:\1'uucp':" \ - -e "s:^\(DEVNODE_mode=\).*:\1'0660':" \ - "${MY_S}/config/mISDN" - - if use ecaggressive; then - sed -i -e "s:.*\(#define.*AGGRESSIVE_SUPPRESSOR\):\1:m" dsp.h - fi - - case "${EC_SELECTED}" in - MG2) - dsp_enable mg2ec - dsp_disable kb1ec mec2 - ;; - KB1) - dsp_enable kb1ec - dsp_disable mg2ec mec2 - ;; - MARK2) - dsp_enable mec2 - dsp_disable mg2ec kb1ec - ;; - esac -} - -src_install() { - linux-mod_src_install - - insinto /usr/include/linux - doins "${MY_S}/include/linux/"*.h - - dodir /etc/udev/rules.d - echo 'KERNEL=="obj-*", NAME="mISDN", GROUP="uucp", MODE="0660"' \ - > "${D}etc/udev/rules.d/53-${PN}.rules" - - insinto /etc/modprobe.d - newins "${MY_S}/mISDN.modprobe.d" ${PN} - dosbin "${MY_S}/misdn-init" - dodoc "${MY_S}/README.misdn-init" - -# insinto /etc -# doins "${MY_S}/config/mISDN.conf" - insinto /usr/lib/mISDN - doins "${MY_S}/config/"*.xsl - dosbin "${MY_S}/config/mISDN" - dodoc "${MY_S}/config/README.mISDN" - - dodoc Kconfig.v2.6 "${FILESDIR}/README.hfcmulti" -} - -pkg_preinst() { - # save old config, in case portage will remove it - if [ -e "${ROOT}etc/misdn-init.conf" ]; then - cp -pf "${ROOT}etc/misdn-init.conf" "${ROOT}etc/misdn-init.conf.pkginst" - fi -} - -pkg_postinst() { - linux-mod_pkg_postinst - - # restore old config, in case portage removed it - if [ -e "${ROOT}etc/misdn-init.conf.pkginst" ]; then - if [ -e "${ROOT}etc/misdn-init.conf" ]; then - rm -f "${ROOT}etc/misdn-init.conf.pkginst" - else - mv -f "${ROOT}etc/misdn-init.conf.pkginst" "${ROOT}etc/misdn-init.conf" - fi - fi - - ewarn - ewarn "This driver is still under heavy development" - ewarn "Please report ebuild related bugs / wishes to http://bugs.gentoo.org" - ewarn "Please report driver bugs to the mISDN mailing-list:" - ewarn " https://www.isdn4linux.de/mailman/listinfo/isdn4linux" -} diff --git a/net-dialup/misdn/misdn-1.1.7.ebuild b/net-dialup/misdn/misdn-1.1.7.ebuild deleted file mode 100644 index e71742c533e2..000000000000 --- a/net-dialup/misdn/misdn-1.1.7.ebuild +++ /dev/null @@ -1,183 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-dialup/misdn/misdn-1.1.7.ebuild,v 1.2 2008/03/27 17:36:28 genstef Exp $ - -inherit eutils linux-mod - -MY_P=mISDN-${PV//./_} -DESCRIPTION="mISDN is the new ISDN stack of the linux kernel 2.6." -HOMEPAGE="http://www.misdn.org/" -SRC_URI="http://www.misdn.org/downloads/releases/${MY_P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~x86 ~amd64 ~ppc" - -# list of echo canceller use flags, -# first active in this list is selected (=order does matter) -MISDN_EC_FLAGS="ecmg2 eckb1 ecmark2" - -# list of card modules -MISDN_MODULES=("avmfritz" "hfcpci" "hfcmulti" "hfcsusb" "hfcsmini" "xhfc" "sedlfax" "w6692pci" "netjetpci") -MISDN_KCONFIG=("AVM_FRITZ" "HFCPCI" "HFCMULTI" "HFCUSB" "HFCMINI" "XHFC" "SPEEDFAX" "W6692" "NETJET") - -IUSE="ecaggressive ${MISDN_EC_FLAGS}" -for i in ${MISDN_MODULES[@]}; do IUSE="${IUSE} misdn_cards_${i}"; done - -RDEPEND=">=net-dialup/capi4k-utils-20050718 - sys-devel/bc" - -S=${WORKDIR}/${MY_P}/drivers/isdn/hardware/mISDN - -### Begin: Helper functions - -select_echo_cancel() { - local myEC="" - for x in ${MISDN_EC_FLAGS}; do - if use ${x}; then - myEC=$(echo "${x}" | sed -e "s:^ec\(.*\):\U\1\E:") - break; - fi - done - echo ${myEC} -} - -dsp_enable() { - local i - for i in "${@}"; do - sed -i -e "s:.*\(#include.*dsp_${i}\):\1:m" dsp.h - done -} - -dsp_disable() { - local i - for i in "${@}"; do - sed -i -e "s:.*\(#include.*dsp_${i}\)://\1:m" dsp.h - done -} - -### End: Helper functions - -pkg_setup() { - local numec=0 - - CONFIG_CHECK="ISDN_CAPI ISDN_CAPI_CAPI20 ISDN_CAPI_CAPIFS_BOOL" - linux-mod_pkg_setup - MODULE_NAMES="mISDN_capi(net:) mISDN_dtmf(net:) mISDN_l1(net:) - mISDN_x25dte(net:) l3udss1(net:) mISDN_core(net:) mISDN_isac(net:) - mISDN_l2(net:) mISDN_dsp(net:)" - BUILD_PARAMS="-C ${KV_DIR} SUBDIRS=${S} MINCLUDES=${WORKDIR}/${MY_P}/include CONFIG_MISDN_DRV=m CONFIG_MISDN_DSP=y" - BUILD_TARGETS="modules" - #I4LmISDN(net:) does not compile :( CONFIG_I4L_CAPI_LAYER=m - # the i4l->capi simulation seems to be only for kernel 2.4 - - # check if multiple echo cancellers have been selected - for x in ${MISDN_EC_FLAGS}; do - use ${x} && : $((numec++)) - done - if [[ ${numec} -gt 1 ]]; then - # multiple flags are active, only the first in the ZAP_EC_FLAGS list - # will be used, make sure the user knows about this - ewarn - ewarn "Multiple echo canceller flags are active but only one will be used!" - ewarn "Selected: $(select_echo_cancel)" - fi - - # Check existence of user selected cards - if [ -n "${MISDN_CARDS}" ]; then - for USERCARD in ${MISDN_CARDS} ; do - for ((CARD=0; CARD < ${#MISDN_MODULES[*]}; CARD++)); do - if [ "${USERCARD}" = "${MISDN_MODULES[CARD]}" ]; then - MODULE_NAMES="${MODULE_NAMES} ${MISDN_MODULES[CARD]}(net:)" - #[ "sedlfax" = "${MISDN_MODULES[CARD]}" ] && MODULE_NAMES="${MODULE_NAMES} faxl3(net:)" - BUILD_PARAMS="${BUILD_PARAMS} CONFIG_MISDN_${MISDN_KCONFIG[CARD]}=y" - continue 2 - fi - done - die "Module ${USERCARD} not present in ${P}" - done - else - elog - elog "You can control the modules which are built with the variable" - elog "MISDN_CARDS which should contain a blank separated list" - elog "of a selection from the following cards:" - elog " ${MISDN_MODULES[*]}" - elog - ewarn "I give you the chance of hitting Ctrl-C and make the necessary" - ewarn "adjustments in /etc/make.conf." - - # enable everything - for ((CARD=0; CARD < ${#MISDN_MODULES[*]}; CARD++)); do - MODULE_NAMES="${MODULE_NAMES} ${MISDN_MODULES[CARD]}(net:)" - #[ "sedlfax" = "${MISDN_MODULES[CARD]}" ] && MODULE_NAMES="${MODULE_NAMES} faxl3(net:)" - BUILD_PARAMS="${BUILD_PARAMS} CONFIG_MISDN_${MISDN_KCONFIG[CARD]}=y" - done - fi -} - -src_unpack() { - unpack ${A} - - cd "${S}" - kernel_is ge 2 6 23 && epatch "${FILESDIR}"/misdn-2.6.23.diff - - if use ecaggressive; then - sed -i -e "s:.*#define \(AGGRESSIVE_SUPPRESSOR\):#define \1:m" dsp.h - fi - - case "$(select_echo_cancel)" in - MG2) - dsp_enable mg2ec - dsp_disable kb1ec mec2 - ;; - KB1) - dsp_enable kb1ec - dsp_disable mg2ec mec2 - ;; - MARK2) - dsp_enable mec2 - dsp_disable mg2ec kb1ec - ;; - esac -} - -src_install() { - linux-mod_src_install - - insinto /usr/include/linux - doins "${WORKDIR}/${MY_P}/"include/linux/*.h - - dodir /etc/udev/rules.d - echo 'KERNEL=="obj-*", NAME="mISDN", GROUP="dialout", MODE="0660"' \ - > "${D}/etc/udev/rules.d/53-${PN}.rules" - - insinto /etc/modprobe.d - newins "${WORKDIR}/${MY_P}/"mISDN.modprobe.d ${PN} - - sed -i -e "s:USER=.*:USER=root:" \ - -e "s:GROUP=.*:GROUP=dialout:" "${WORKDIR}/${MY_P}/"misdn-init - dosbin "${WORKDIR}/${MY_P}/"misdn-init - - dodoc Kconfig.v2.6 - dodoc "${FILESDIR}/README.hfcmulti" "${WORKDIR}/${MY_P}/"README.misdn-init -} - -pkg_preinst() { - if [ -e "${ROOT}"/etc/misdn-init.conf ]; then - cp "${ROOT}"/etc/misdn-init.conf "${D}"/etc - else - sed -i -e "s:/etc/misdn-init.conf:${D}\0:" "${D}"/usr/sbin/misdn-init - "${D}"/usr/sbin/misdn-init config - sed -i -e "s:${D}/etc/misdn-init.conf:/etc/misdn-init.conf:" "${D}"/usr/sbin/misdn-init - fi -} - -pkg_postinst() { - linux-mod_pkg_postinst - - ewarn - ewarn "This driver is still under heavy development" - ewarn "Please report ebuild related bugs / wishes to http://bugs.gentoo.org" - ewarn "Please report driver bugs to the mISDN mailing-list:" - ewarn " https://www.isdn4linux.de/mailman/listinfo/isdn4linux" -} |