summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Gianelloni <wolf31o2@gentoo.org>2008-04-25 23:53:06 +0000
committerChris Gianelloni <wolf31o2@gentoo.org>2008-04-25 23:53:06 +0000
commit86ee5cdaacf02c2733159203d4995c77cdbc1dc0 (patch)
tree74314c78237ed7f513263838a6e917182c23ab29
parentVersion bump for testing. (diff)
downloadwolf31o2-86ee5cdaacf02c2733159203d4995c77cdbc1dc0.tar.gz
wolf31o2-86ee5cdaacf02c2733159203d4995c77cdbc1dc0.tar.bz2
wolf31o2-86ee5cdaacf02c2733159203d4995c77cdbc1dc0.zip
Fixing patch for dynamic blacklist for bug #218571.
svn path=/; revision=179
-rw-r--r--sys-apps/hwsetup/Manifest2
-rw-r--r--sys-apps/hwsetup/files/1.2-3-dyn_blacklist.patch7
2 files changed, 8 insertions, 1 deletions
diff --git a/sys-apps/hwsetup/Manifest b/sys-apps/hwsetup/Manifest
index a1fcac3..d1ec49e 100644
--- a/sys-apps/hwsetup/Manifest
+++ b/sys-apps/hwsetup/Manifest
@@ -1,4 +1,4 @@
-AUX 1.2-3-dyn_blacklist.patch 1625 RMD160 bba78724a2a9d89309f8fd2a50d8d2525cc818e2 SHA1 b94f2cb866e50b7f6d855e2aa512421a577f6f41 SHA256 87a3cf5452b96f069832b18d4fd7dfc0cac1a073f954937a0118e935cb9ad472
+AUX 1.2-3-dyn_blacklist.patch 1972 RMD160 d72fec23a306e71fbd9402b043bf2ac88413b353 SHA1 2ccdeb5f0f15c68821434a1e2b081dce229cdf70 SHA256 8fd9a2d691fd4b820ac12535c6fa5a1ba2ccbbc3e9025871ecd054bec454744b
AUX 1.2-3-fastprobe.patch 2817 RMD160 5cadca96d654739d61db18287bf2a71f4d7a00ca SHA1 9d05f2542f4fc9b8ae4ace559bec8a9720ea77b5 SHA256 9a16e4ddaada2bc115a48a6d60b5cac72d49f33c7eecf245f6337df627a4a0d0
AUX 1.2-3-gentoo.patch 1430 RMD160 fae21df5ef10085fe6336c483b5b2c2145f1f787 SHA1 b17b2ae05a819c9be68145f8ba5054dddf276a6d SHA256 1d1b6b3199b4a395febe7a68fc85a59c090ab99918f6a5e02739210e7c182e83
AUX 1.2-7-dyn_blacklist.patch 1996 RMD160 e299ee153e13f9a80d7a28209cf62268dfb9e8bd SHA1 192ea0961e02a1a84b6efc98a02b360d859d4ca1 SHA256 625c60827eea5f17b5d833276cf7924223e6ab1fa681f8518c4e8e1070465339
diff --git a/sys-apps/hwsetup/files/1.2-3-dyn_blacklist.patch b/sys-apps/hwsetup/files/1.2-3-dyn_blacklist.patch
index bc50cd3..7348993 100644
--- a/sys-apps/hwsetup/files/1.2-3-dyn_blacklist.patch
+++ b/sys-apps/hwsetup/files/1.2-3-dyn_blacklist.patch
@@ -2,6 +2,13 @@ diff -urN hwsetup-1.2.orig/hwsetup.c hwsetup-1.2/hwsetup.c
--- hwsetup-1.2.orig/hwsetup.c 2005-05-28 18:11:51.000000000 -0400
+++ hwsetup-1.2/hwsetup.c 2005-11-17 14:08:03.000000000 -0500
@@ -43,12 +43,39 @@
+ /* Do not, under any circumstances, load these modules automatically, */
+ /* even if in pcitable. (libkudzu may ignore this, and the KNOPPIX */
+ /* autoconfig scripts may probe them, too) */
+-char *blacklist[] =
++char blacklist[200][200] =
+ { "apm","agpgart","yenta_socket","i82092","i82365","tcic",
+ "pcmcia_core","ds","ohci1394","hisax",
/* Winmodems, unusable, can block sound slot */
"snd-atiixp-modem", "snd-intel8x0m","snd-via82xx-modem"
};