Hello community, here is the log from the commit of package make for openSUSE:Factory checked in at Thu Apr 21 11:49:57 CEST 2011.
-------- --- make/make.changes 2010-09-07 19:37:08.000000000 +0200 +++ /mounts/work_src_done/STABLE/make/make.changes 2011-04-19 17:24:30.000000000 +0200 @@ -1,0 +2,7 @@ +Tue Apr 19 15:22:27 UTC 2011 - [email protected] + +- make-fix_whitespace_tokenization.diff + Fix Savannah bug #33125 (bnc #681108): + Memory corruption during build of android build system. + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- make-fix_whitespace_tokenization.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ make.spec ++++++ --- /var/tmp/diff_new_pack.9diVH5/_old 2011-04-21 11:47:14.000000000 +0200 +++ /var/tmp/diff_new_pack.9diVH5/_new 2011-04-21 11:47:14.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package make (Version 3.82) +# spec file for package make # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -26,13 +26,14 @@ PreReq: %install_info_prereq AutoReqProv: on Version: 3.82 -Release: 1 +Release: 2 Summary: GNU make Source: make-%version.tar.bz2 Patch2: make-slowdown-parallelism.diff Patch3: make-disable-broken-tests.diff Patch4: make-savannah-bug30723-expand_makeflags_before_reexec.diff Patch5: make-savannah-bug30612-handling_of_archives.diff +Patch6: make-fix_whitespace_tokenization.diff Patch64: make-library-search-path.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -45,6 +46,7 @@ %patch3 -p1 %patch4 %patch5 +%patch6 -p1 if [ %_lib == lib64 ]; then %patch64 fi ++++++ make-fix_whitespace_tokenization.diff ++++++ Index: make-3.82/function.c =================================================================== --- make-3.82.orig/function.c +++ make-3.82/function.c @@ -1133,19 +1133,14 @@ func_sort (char *o, char **argv, const c /* Find the maximum number of words we'll have. */ t = argv[0]; - wordi = 1; - while (*t != '\0') + wordi = 0; + while ((p = find_next_token (&t, &len)) != 0) { - char c = *(t++); - - if (! isspace ((unsigned char)c)) - continue; - - ++wordi; - - while (isspace ((unsigned char)*t)) - ++t; + ++t; + wordi++; } + if (! wordi) + wordi = 1; words = xmalloc (wordi * sizeof (char *)); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
