Hello community, here is the log from the commit of package module-init-tools checked in at Tue Apr 18 11:51:40 CEST 2006. -------- --- module-init-tools/module-init-tools.changes 2006-03-23 22:35:03.000000000 +0100 +++ STABLE/module-init-tools/module-init-tools.changes 2006-04-18 09:40:48.000000000 +0200 @@ -1,0 +2,5 @@ +Tue Apr 18 09:39:32 CEST 2006 - mjancar@suse.cz + +- fix range pattern matching (#134559) + +------------------------------------------------------------------- New: ---- module-init-tools-3.2.2-regex.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ module-init-tools.spec ++++++ --- /var/tmp/diff_new_pack.gMBjAf/_old 2006-04-18 11:50:07.000000000 +0200 +++ /var/tmp/diff_new_pack.gMBjAf/_new 2006-04-18 11:50:07.000000000 +0200 @@ -13,7 +13,7 @@ Name: module-init-tools BuildRequires: dietlibc dietzlib docbook-utils xmlcharent Version: 3.2.2 -Release: 19 +Release: 23 %define ver 3.2.2 License: GPL Group: System/Kernel @@ -40,6 +40,7 @@ Patch11: %{name}-%{ver}-use_blacklist.diff Patch12: %{name}-%{ver}-skip-unsupported.diff Patch13: %{name}-%{ver}-fmt.diff +Patch14: %{name}-%{ver}-regex.diff Exclusiveos: Linux BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -75,6 +76,7 @@ %patch12 %patch13 %patch8 +%patch14 %build %{suse_update_config -f} @@ -144,6 +146,8 @@ /etc/modprobe.d %changelog -n module-init-tools +* Tue Apr 18 2006 - mjancar@suse.cz +- fix range pattern matching (#134559) * Thu Mar 23 2006 - agruen@suse.de - weak-modules: The module compatibility check did not handle the case where modules in a kernel's /lib/modules/.../updates ++++++ module-init-tools-3.2.2-regex.diff ++++++ --- modprobe.c +++ modprobe.c @@ -1121,13 +1121,27 @@ return ret; } +/* Careful! Don't munge - in [ ] as per Debian Bug#350915 */ static char *underscores(char *string) { if (string) { unsigned int i; - for (i = 0; string[i]; i++) - if (string[i] == '-') - string[i] = '_'; + int inbracket = 0; + for (i = 0; string[i]; i++) { + switch (string[i]) { + case '[': + inbracket++; + break; + case ']': + inbracket--; + break; + case '-': + if (!inbracket) + string[i] = '_'; + } + } + if (inbracket) + warn("Unmatched bracket in %s\n", string); } return string; } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...
participants (1)
-
root@suse.de