Convert module name to a regular expression, to match autoload/blacklist entries regardless of being written with - or _.

Package-Manager: portage-2.1.3_rc8

3 files changed, 23 insertions, 14 deletions

diff --git a/sys-fs/udev/ChangeLog b/sys-fs/udev/ChangeLog
index 13390437d225..9e765f0f6003 100644
--- a/sys-fs/udev/ChangeLog
+++ b/sys-fs/udev/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-fs/udev
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.315 2007/07/12 14:24:15 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.316 2007/07/12 15:07:40 zzam Exp $
+
+  12 Jul 2007; Matthias Schwarzott <zzam@gentoo.org>
+  files/modprobe-113-r2.sh:
+  Convert module name to a regular expression, to match autoload/blacklist
+  entries regardless of being written with - or _.
 
 *udev-113-r2 (12 Jul 2007)
 
diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest
index 9ae6a21d36c7..2cf076c618c2 100644
--- a/sys-fs/udev/Manifest
+++ b/sys-fs/udev/Manifest
@@ -33,10 +33,10 @@ AUX modprobe-111-r1.sh 1474 RMD160 9d2680c1921925a02af8e6972df33e08f8a29dc2 SHA1
 MD5 544a873721f948faf423388704c6864d files/modprobe-111-r1.sh 1474
 RMD160 9d2680c1921925a02af8e6972df33e08f8a29dc2 files/modprobe-111-r1.sh 1474
 SHA256 cad8bef24f0cdf0da3381477f94c30e672f5f3791ec847546fbd91685d2de946 files/modprobe-111-r1.sh 1474
-AUX modprobe-113-r2.sh 1884 RMD160 feeebd2c7b35f6eab20cdb0ced9dac33895121ef SHA1 c97e3e7bfd743c4a0d6e0157e0da714255d2ca23 SHA256 ebe4a6df187b72c39c39f8d8bb677b962859cdc2a32ab8ed358479ac0dd09e04
-MD5 8c3c8d21b0021a43e4cc91bc4429e999 files/modprobe-113-r2.sh 1884
-RMD160 feeebd2c7b35f6eab20cdb0ced9dac33895121ef files/modprobe-113-r2.sh 1884
-SHA256 ebe4a6df187b72c39c39f8d8bb677b962859cdc2a32ab8ed358479ac0dd09e04 files/modprobe-113-r2.sh 1884
+AUX modprobe-113-r2.sh 2039 RMD160 a23853d00b0acf23fae51e88cd57621df1c1d133 SHA1 3813fd6ed0ed7a1e521796e4f2d02d5796e1b804 SHA256 a79547c236627536d8d5b5daea65b30c2cf293018b04401dfa60e661deedfbc5
+MD5 a3dd3c47ace9465c5f2c867321deff07 files/modprobe-113-r2.sh 2039
+RMD160 a23853d00b0acf23fae51e88cd57621df1c1d133 files/modprobe-113-r2.sh 2039
+SHA256 a79547c236627536d8d5b5daea65b30c2cf293018b04401dfa60e661deedfbc5 files/modprobe-113-r2.sh 2039
 AUX move_tmp_persistent_rules-112-r1.sh 646 RMD160 462b7836fc1492491e8e67de9301acb05cef847e SHA1 32b1cf96cfa55193c7b7e82640296fc11e7e8031 SHA256 d5dcbb9a13223633e9c4ac8b4eb26ddb38b55af7ea0eec9e512eb47475a07400
 MD5 7bf11e11519117f743483c73e0767750 files/move_tmp_persistent_rules-112-r1.sh 646
 RMD160 462b7836fc1492491e8e67de9301acb05cef847e files/move_tmp_persistent_rules-112-r1.sh 646
@@ -181,10 +181,10 @@ EBUILD udev-113.ebuild 8992 RMD160 95388eeddc9d94f769420319e7341596c68251bb SHA1
 MD5 3039d0ed4628e076e283b8d01b083edf udev-113.ebuild 8992
 RMD160 95388eeddc9d94f769420319e7341596c68251bb udev-113.ebuild 8992
 SHA256 f8a095cf087cee16e31f6fa71a0217d41125af86e25cb6a5a9e183206cfd8b91 udev-113.ebuild 8992
-MISC ChangeLog 63866 RMD160 80ed81e793ef878bbfb6e28ac0e0c904b8a646f2 SHA1 d8ca5229cdeeb82f7dc8507f02c4979425913fc3 SHA256 4eafdb65e25cc8c08280f3632a444e410a693161f82d7dc221ed76ca2957ed76
-MD5 0ce9381ad97295dfa99d48a378f5a138 ChangeLog 63866
-RMD160 80ed81e793ef878bbfb6e28ac0e0c904b8a646f2 ChangeLog 63866
-SHA256 4eafdb65e25cc8c08280f3632a444e410a693161f82d7dc221ed76ca2957ed76 ChangeLog 63866
+MISC ChangeLog 64074 RMD160 c6f462257ce2c5567c40883be515de638abee58d SHA1 f27e29053f38f338084e298a160af17cdd142fa7 SHA256 d332ab5395af5ac551e78257fdd154aba8d9d72158442907dc766c039c4dd4fd
+MD5 6f0db411bdef144ed3c499ce396364b2 ChangeLog 64074
+RMD160 c6f462257ce2c5567c40883be515de638abee58d ChangeLog 64074
+SHA256 d332ab5395af5ac551e78257fdd154aba8d9d72158442907dc766c039c4dd4fd ChangeLog 64074
 MISC metadata.xml 447 RMD160 d1ba09bd6a434b25c718673de9258cc544e090be SHA1 70c43d2863c09958849bfce8c5bb97d406a0662b SHA256 a9881de1424ac71191111bd30c7c1253589673b0cdce13c352204f1499e9d884
 MD5 f74bee0505505c00e76da6313db29e49 metadata.xml 447
 RMD160 d1ba09bd6a434b25c718673de9258cc544e090be metadata.xml 447
@@ -219,7 +219,7 @@ SHA256 64c3a37d941e4b18999d5848050520182dc7d2096da5fd08b8d3c40928445154 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.5 (GNU/Linux)
 
-iD8DBQFGljmUt2vP6XvVdOcRApZ2AJ4zBeEGG91uagcwhGlObauNp3NmzwCgpIqT
-9a6djBv/x98P7utzWg29Mjk=
-=Sbrv
+iD8DBQFGlkPBt2vP6XvVdOcRAuluAKCjyAomLHTPToT7JLKyRNNoMdZqjQCdFomB
++sn5WUoQf5J/PaN1rOefork=
+=Qp4g
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/udev/files/modprobe-113-r2.sh b/sys-fs/udev/files/modprobe-113-r2.sh
index 23e198d1f66d..86bcec2629fb 100755
--- a/sys-fs/udev/files/modprobe-113-r2.sh
+++ b/sys-fs/udev/files/modprobe-113-r2.sh
@@ -44,6 +44,7 @@ unlock_modprobe() {
 	rmdir "$MODPROBE_LOCK" || true
 }
 
+# Get normalized names only with _
 MODLIST=$("${MODPROBE}" -q -i --show-depends "${@}" 2>/dev/null \
 	| sed -e "s#^insmod /lib.*/\(.*\)\.ko.*#\1#g" -e 's|-|_|g')
 
@@ -53,16 +54,19 @@ for m in ${MODLIST}; do
 	MODNAME=$m
 done
 
+# build regex to match module name written with either - or _
+MOD_REGEX="$(echo "${MODNAME}"|sed -e 's#_#[-_]#g')"
+
 # check for blacklisting
 if [ -f /etc/modprobe.conf ]; then
-	if grep -q '^blacklist.*[[:space:]]'"${MODNAME}"'\([[:space:]]\|$\)' /etc/modprobe.conf; then
+	if grep -q '^blacklist.*[[:space:]]'"${MOD_REGEX}"'\([[:space:]]\|$\)' /etc/modprobe.conf; then
 		# module blacklisted
 		exit 0
 	fi
 fi
 
 if [ "$implicitly_blacklist_modules_autoload" = "yes" -a -f "${MODULES_AUTOLOAD_FILE}" ]; then
-	if grep -q "^${MODNAME}"'\([[:space:]]\|$\)' "${MODULES_AUTOLOAD_FILE}"; then
+	if grep -q "^${MOD_REGEX}"'\([[:space:]]\|$\)' "${MODULES_AUTOLOAD_FILE}"; then
 		# module implictly blacklisted
 		# as present in modules.autoload, Bug 184833
 		exit 0