diff --git a/aaa_base.changes b/aaa_base.changes index 7ebbd25..3001db2 100644 --- a/aaa_base.changes +++ b/aaa_base.changes @@ -1,3 +1,21 @@ +------------------------------------------------------------------- +Thu Dec 11 17:40:11 CET 2008 - ro@suse.de + +- only mount /proc and /sys if not mounted already + (bnc#457984) + +------------------------------------------------------------------- +Wed Dec 10 16:03:54 CET 2008 - bwalle@suse.de + +- Make /sbin/get_kernel_version a bit more tolerant: Accept + '2.6.27.private-ppc64' as version string. (bnc #441821) + +------------------------------------------------------------------- +Wed Dec 10 14:18:38 CET 2008 - werner@suse.de + +- Do not set CMOS HW clock on XEN systems (bnc#422010) +- use mkill(8) instead of fuser + ------------------------------------------------------------------- Mon Dec 8 02:06:32 CET 2008 - ro@suse.de diff --git a/aaa_base.spec b/aaa_base.spec index 06dc323..0111b66 100644 --- a/aaa_base.spec +++ b/aaa_base.spec @@ -28,7 +28,7 @@ Recommends: cron logrotate PreReq: /usr/bin/sed /usr/bin/grep /bin/mv /bin/cat /bin/ls /bin/date /usr/bin/cmp /bin/fillup /sbin/insserv udev net-tools AutoReqProv: on Version: 11.1 -Release: 10009 +Release: 10010 Summary: SUSE Linux Base Package BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: aaa_base.tar.bz2 @@ -139,6 +139,15 @@ rm -f /root/.gnupg/secring.gpg.aaa_save %defattr(-,root,root) %changelog +* Thu Dec 11 2008 ro@suse.de +- only mount /proc and /sys if not mounted already + (bnc#457984) +* Wed Dec 10 2008 bwalle@suse.de +- Make /sbin/get_kernel_version a bit more tolerant: Accept + '2.6.27.private-ppc64' as version string. (bnc #441821) +* Wed Dec 10 2008 werner@suse.de +- Do not set CMOS HW clock on XEN systems (bnc#422010) +- use mkill(8) instead of fuser * Mon Dec 08 2008 ro@suse.de - updated list of settings for DEFAULT_WM (from control.xml) (bnc#445646) diff --git a/aaa_base.tar.bz2 b/aaa_base.tar.bz2 index 579d07c..bfc0d86 100644 --- a/aaa_base.tar.bz2 +++ b/aaa_base.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:431927ef147fa66436b11ae22dcd9fb8cd3285b39bd2097732c89eb28afab198 -size 79816 +oid sha256:5131985af263a01f945af5ef04756bac971755224e7b0e55ea71e4f6702654f0 +size 79835 diff --git a/get_kernel_version.c b/get_kernel_version.c index 5221df1..675c0df 100644 --- a/get_kernel_version.c +++ b/get_kernel_version.c @@ -102,20 +102,23 @@ main (int argc, char *argv[]) { int j = i+14; int invalid_char = 0; - int in_number_range = 1; + int number_dots = 0; /* check if we really found a version */ for (j = j+1; buffer[j] != ' '; j++) { char c = buffer[j]; - if (c == '-') - in_number_range = 0; + if (c == '.') { + number_dots++; + continue; + } - if ((in_number_range && !isdigit(c) && c != '.') || - (!in_number_range && !my_is_alnum_punct(c))) + if (((number_dots < 2) && !isdigit(c)) || + ((number_dots >= 2) && !my_is_alnum_punct(c))) { - invalid_char = 1; + //invalid_char = 1; + printf("invalid=1 for %c\n", c); break; } }