Removing the fcdslslusb patch as it turned out to be malicious, revision bump and removing old ebuild.

Package-Manager: portage-1.589-cvs

5 files changed, 12 insertions, 141 deletions

diff --git a/net-dialup/fcdsl/ChangeLog b/net-dialup/fcdsl/ChangeLog
index dbf62e65b523..931aa36ff31e 100644
--- a/net-dialup/fcdsl/ChangeLog
+++ b/net-dialup/fcdsl/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-dialup/fcdsl
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/fcdsl/ChangeLog,v 1.18 2005/05/04 20:51:26 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/fcdsl/ChangeLog,v 1.19 2005/06/02 20:12:46 genstef Exp $
+
+*fcdsl-2.6.20.7-r5 (02 Jun 2005)
+
+  02 Jun 2005; Stefan Schweizer <genstef@gentoo.org> -files/fcdslslusb.diff,
+  -fcdsl-2.6.20.7-r4.ebuild, +fcdsl-2.6.20.7-r5.ebuild:
+  Removing the fcdslslusb patch as it turned out to be malicious, revision
+  bump and removing old ebuild.
 
   04 May 2005; Stefan Schweizer <genstef@gentoo.org>
   fcdsl-2.6.20.7-r4.ebuild:
diff --git a/net-dialup/fcdsl/Manifest b/net-dialup/fcdsl/Manifest
index 993ef0a9d1a8..33b150cd7d5b 100644
--- a/net-dialup/fcdsl/Manifest
+++ b/net-dialup/fcdsl/Manifest
@@ -1,8 +1,7 @@
-MD5 7072084fbb7e6cea36694f19e89fd6cd ChangeLog 3411
+MD5 7dd6a1d828d2e2c7aa057e2dfa345386 fcdsl-2.6.20.7-r5.ebuild 7897
+MD5 659815a1416ef32529cb6436d5e84b50 ChangeLog 3686
 MD5 ec2f84816306825d125d0c01bd86758d metadata.xml 163
-MD5 82afb50dabd3d119bcaf266cce0b76c2 fcdsl-2.6.20.7-r4.ebuild 7897
-MD5 35e156955da1166d6de5e56bb66857db files/fcdslslusb.diff 4002
 MD5 776e0c65eda5432a30f9beae8896ca97 files/fcdslsl.diff 1896
 MD5 22a65f3dcb8b67dc53a23ef35886bf18 files/fcdsl.diff 4636
-MD5 7d0d40b4547c891577925915b046cffc files/digest-fcdsl-2.6.20.7-r4 381
+MD5 7d0d40b4547c891577925915b046cffc files/digest-fcdsl-2.6.20.7-r5 381
 MD5 4d073842f89f61ce68ae5ee7ac100d70 files/fcdsl2.diff 1867
diff --git a/net-dialup/fcdsl/fcdsl-2.6.20.7-r4.ebuild b/net-dialup/fcdsl/fcdsl-2.6.20.7-r5.ebuild
index 434608b93e7b..e4fb0acc70c2 100644
--- a/net-dialup/fcdsl/fcdsl-2.6.20.7-r4.ebuild
+++ b/net-dialup/fcdsl/fcdsl-2.6.20.7-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/fcdsl/fcdsl-2.6.20.7-r4.ebuild,v 1.9 2005/05/04 20:51:26 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/fcdsl/fcdsl-2.6.20.7-r5.ebuild,v 1.1 2005/06/02 20:12:46 genstef Exp $
 
 inherit linux-mod eutils
 
diff --git a/net-dialup/fcdsl/files/digest-fcdsl-2.6.20.7-r4 b/net-dialup/fcdsl/files/digest-fcdsl-2.6.20.7-r5
index 31e652664807..31e652664807 100644
--- a/net-dialup/fcdsl/files/digest-fcdsl-2.6.20.7-r4
+++ b/net-dialup/fcdsl/files/digest-fcdsl-2.6.20.7-r5
diff --git a/net-dialup/fcdsl/files/fcdslslusb.diff b/net-dialup/fcdsl/files/fcdslslusb.diff
deleted file mode 100644
index e8dfe40e6c8f..000000000000
--- a/net-dialup/fcdsl/files/fcdslslusb.diff
+++ /dev/null
@@ -1,135 +0,0 @@
---- driver.c.orig	2004-06-17 02:00:00.000000000 +0200
-+++ driver.c	2005-02-26 10:40:39.000000000 +0100
-@@ -18,6 +18,16 @@
-  * http://www.opensource.org/licenses/lgpl-license.html
-  * 
-  * Contact: AVM GmbH, Alt-Moabit 95, 10559 Berlin, Germany, email: info@avm.de
-+ *
-+ * Sunday Dec 07 18:10 2003
-+ * Modified by Christian 'greeny' Heckhoff to improve locking
-+ * based on modifications by Joerg Lehrke for Fritz!Card DSL
-+ *
-+ * Saturday Jul 24 2004, Oswin Horvath 
-+ * small modifications to make the patch work for the Fritz!Card SL USB (03.11.94)
-+ * 
-+ * Saturday Feb 26 2005, Stefan Schweizer
-+ * Fixed patch for rev 0.2.2
-  */
- 
- #include <asm/io.h>
-@@ -54,6 +64,8 @@
- #include "devif.h"
- #include "driver.h"
- 
-+#undef SINGLE_LOCK
-+
- #ifndef HZ
- # error HZ is not defined...
- #endif
-@@ -84,7 +96,11 @@
- \*---------------------------------------------------------------------------*/
- card_p				capi_card		= NULL;
- lib_callback_t *		capi_lib		= NULL;
-+#if defined (SINGLE_LOCK)
-+# define stack_lock qt_lock
-+#else
- spinlock_t			stack_lock		= SPIN_LOCK_UNLOCKED;
-+#endif
- struct capi_ctr *		capi_controller[2]	= { NULL, NULL } ;
- int				card_config;
- 
-@@ -919,12 +935,17 @@ static inline int in_critical (void) {
- /*---------------------------------------------------------------------------*\
- \*---------------------------------------------------------------------------*/
- static inline void check (void) {
-+	unsigned long flags;
- 
-         if (atomic_read (&rx_flag) > 0) {
-+		spin_lock_irqsave (&stack_lock, flags);
- 		rx_handler (capi_card);
-+		spin_unlock_irqrestore (&stack_lock, flags);
- 	}
- 	if (atomic_read (&tx_flag) > 0) {
-+		spin_lock_irqsave (&stack_lock, flags);
- 		tx_handler (capi_card);
-+		spin_unlock_irqrestore (&stack_lock, flags);
- 	}
- } /* check */
- 
-@@ -1101,6 +1122,7 @@ static __attr void __stack scheduler_con
- /*-S-------------------------------------------------------------------------*\
- \*---------------------------------------------------------------------------*/
- static int scheduler (void * arg) {
-+        unsigned long flags;
- 
- 	UNUSED_ARG (arg);
- 	daemonize (TARGET);
-@@ -1134,6 +1156,7 @@ static int scheduler (void * arg) {
- 		}
- 		
- 		/* Body of thread, invoke scheduler */
-+		local_irq_save(flags);
- 		if (spin_trylock (&stack_lock)) {
- 			info (!atomic_xchg (&in_scheduler, 1));
- 			os_timer_poll ();
-@@ -1146,6 +1169,7 @@ static int scheduler (void * arg) {
- #endif
- 			spin_unlock (&stack_lock);
- 		}
-+		local_irq_restore(flags);
- 	}
- 	LOG("Scheduler thread stopped.\n");
- 	up (&thread_sync);
-@@ -1324,22 +1348,44 @@ static void rx_handler (card_p pdc) {
- /*---------------------------------------------------------------------------*\
- \*---------------------------------------------------------------------------*/ 
- static void tx_task (unsigned long data) {
--
-+	unsigned long flags;
- 	UNUSED_ARG (data);
--	if (!in_critical () && spin_trylock (&stack_lock)) {
--		tx_handler (capi_card);
--		spin_unlock (&stack_lock);
-+
-+	if (in_critical ()){
-+		atomic_set (&tx_flag, 1);
-+		kick_scheduler ();
-+	} else {
-+		local_irq_save(flags);
-+		if (spin_trylock (&stack_lock)) {
-+			tx_handler (capi_card);
-+			spin_unlock (&stack_lock);
-+		} else {
-+			atomic_set (&tx_flag, 1);
-+			kick_scheduler ();
-+		}
-+		local_irq_restore(flags);
- 	}
- } /* tx_task */
- 
- /*---------------------------------------------------------------------------*\
- \*---------------------------------------------------------------------------*/ 
- static void rx_task (unsigned long data) {
--
-+	unsigned long flags;
- 	UNUSED_ARG (data);
--	if (!in_critical () && spin_trylock (&stack_lock)) {
--		rx_handler (capi_card);
--		spin_unlock (&stack_lock);
-+
-+	if (in_critical ()){
-+		atomic_set (&tx_flag, 1);
-+		kick_scheduler ();
-+	} else {
-+		local_irq_save(flags);
-+		if (spin_trylock (&stack_lock)) {
-+			tx_handler (capi_card);
-+			spin_unlock (&stack_lock);
-+		} else {
-+			atomic_set (&tx_flag, 1);
-+			kick_scheduler ();
-+		}
-+		local_irq_restore(flags);
- 	}
- } /* rx_task */
-