March 2013 - openSUSE Commits - openSUSE Mailing Lists

commit pigz.1466 for openSUSE:12.1:Update
by root＠hilbert.suse.de 26 Mar '13

26 Mar '13

Hello community, here is the log from the commit of package pigz.1466 for openSUSE:12.1:Update checked in at 2013-03-26 18:00:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.1:Update/pigz.1466 (Old) and /work/SRC/openSUSE:12.1:Update/.pigz.1466.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "pigz.1466", Maintainer is "" Changes: -------- New Changes file: --- /dev/null 2013-02-26 18:15:11.936010755 +0100 +++ /work/SRC/openSUSE:12.1:Update/.pigz.1466.new/pigz.changes 2013-03-26 18:00:04.000000000 +0100 @@ -0,0 +1,28 @@ +------------------------------------------------------------------- +Tue Mar 19 10:59:35 UTC 2013 - agraf(a)suse.com + +- fix temporary file permission bug (bnc#803933, CVE-2013-0296) + +------------------------------------------------------------------- +Thu Jun 2 12:20:22 CEST 2011 - visnov(a)suse.cz + +- update to 2.1.6 +- package unpigz +- create debug packages +- package manpage + +------------------------------------------------------------------- +Tue Apr 20 00:44:25 CEST 2010 - agraf(a)suse.de + +- fix dictzip with #CPU == 1 (bnc#597756) + +------------------------------------------------------------------- +Wed Mar 3 16:12:37 CET 2010 - visnov(a)suse.de + +- include symlinks patch + +------------------------------------------------------------------- +Tue Oct 20 16:32:03 CEST 2009 - jmatejek(a)suse.de + +- initial package + New: ---- pigz-2.1.6.tar.bz2 pigz-always-thread.patch pigz-dictzip.patch pigz-do-symlinks.patch pigz-spl.patch pigz-tmpperm.patch pigz.changes pigz.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pigz.spec ++++++ # # spec file for package pigz # # Copyright (c) 2013 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 # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # Name: pigz Version: 2.1.6 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: binutils BuildRequires: filesystem BuildRequires: glibc-devel BuildRequires: zlib-devel Requires: glibc Requires: zlib Source: %name-%version.tar.bz2 Patch1: pigz-dictzip.patch Patch2: pigz-spl.patch Patch3: pigz-do-symlinks.patch Patch4: pigz-always-thread.patch Patch5: pigz-tmpperm.patch Url: http://www.zlib.net/pigz/ Summary: Multi-core gzip version License: Zlib Group: Productivity/Archiving/Compression %description A parallel implementation of gzip for modern multi-processor, multi-core machines %prep %setup %patch1 -p1 %patch2 -p1 %patch3 -p1 %patch4 -p1 %patch5 -p1 %build export MYCFLAGS="${RPM_OPT_FLAGS}" %{__make} CFLAGS="$MYCFLAGS" PREFIX=%{_prefix} LIBDIR=%{_libdir} %install mkdir -p $RPM_BUILD_ROOT/usr/bin cp -v pigz $RPM_BUILD_ROOT/usr/bin/ cp -v unpigz $RPM_BUILD_ROOT/usr/bin/ #man page mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man1/ cp -v pigz.1 $RPM_BUILD_ROOT/%{_mandir}/man1/ cp -v pigz.1 $RPM_BUILD_ROOT/%{_mandir}/man1/unpigz.1 gzip $RPM_BUILD_ROOT/%{_mandir}/man1/pigz.1 gzip $RPM_BUILD_ROOT/%{_mandir}/man1/unpigz.1 %clean %{__rm} -rf "$RPM_BUILD_ROOT" %files %defattr(-,root,root) %doc README %doc %{_mandir}/man1/pigz.1.gz %doc %{_mandir}/man1/unpigz.1.gz /usr/bin/pigz /usr/bin/unpigz %changelog ++++++ pigz-always-thread.patch ++++++ Dictzip only really works in the threaded code paths. So let's force use them and ignore the non-parallel case (bnc#597756). Index: pigz-2.1.5/pigz.c =================================================================== --- pigz-2.1.5.orig/pigz.c +++ pigz-2.1.5/pigz.c @@ -2820,7 +2820,7 @@ local void process(char *path) unlzw(); } #ifndef NOTHREAD - else if (procs > 1) + else if (1) parallel_compress(); #endif else ++++++ pigz-dictzip.patch ++++++ diff -u -r pigz-2.1.6.orig/pigz.c pigz-2.1.6/pigz.c --- pigz-2.1.6.orig/pigz.c 2010-01-17 21:09:37.000000000 +0100 +++ pigz-2.1.6/pigz.c 2011-06-02 12:29:12.245689087 +0200 @@ -304,6 +304,8 @@ } \ } while (0) +#define DZIP_HEADER_LEN 24 + /* globals (modified by main thread only when it's the only thread) */ local int ind; /* input file descriptor */ local int outd; /* output file descriptor */ @@ -322,11 +324,12 @@ local int list; /* true to list files instead of compress */ local int first = 1; /* true if we need to print listing header */ local int decode; /* 0 to compress, 1 to decompress, 2 to test */ +local int dictzip; /* true to write random access dictionary */ local int level; /* compression level */ local int rsync; /* true for rsync blocking */ local int procs; /* maximum number of compression threads (>= 1) */ local int dict; /* true to initialize dictionary in each thread */ -local size_t size; /* uncompressed input size per thread (>= 32K) */ +size_t size; /* uncompressed input size per thread (>= 32K) */ /* saved gzip/zip header data for decompression, testing, and listing */ local time_t stamp; /* time stamp from gzip header */ @@ -560,6 +563,17 @@ return dos; } +long long get_file_size(int fd) +{ + long long old_pos = lseek(fd, 0, SEEK_CUR); + long long retval; + + retval = lseek(fd, 0, SEEK_END); + lseek(fd, old_pos, SEEK_SET); + + return retval; +} + /* put a 4-byte integer into a byte array in LSB order or MSB order */ #define PUT2L(a,b) (*(a)=(b)&0xff,(a)[1]=(b)>>8) #define PUT4L(a,b) (PUT2L(a,(b)&0xffff),PUT2L((a)+2,(b)>>16)) @@ -613,12 +627,27 @@ head[0] = 31; head[1] = 139; head[2] = 8; /* deflate */ - head[3] = name != NULL ? 8 : 0; + head[3] = 0; + if (dictzip) + head[3] |= 4; + if (name != NULL) + head[3] |= 8; PUT4L(head + 4, mtime); head[8] = level == 9 ? 2 : (level == 1 ? 4 : 0); head[9] = 3; /* unix */ writen(outd, head, 10); len = 10; + if (dictzip) { + long long file_len = get_file_size(ind); + int extra_len = DZIP_HEADER_LEN + ((file_len / size) + 2) * sizeof(int); + + char *extra = (char*)malloc(extra_len); + + memset(extra, 0, extra_len); + writen(outd, extra, extra_len); + free(extra); + len += extra_len; + } if (name != NULL) writen(outd, (unsigned char *)name, strlen(name) + 1); if (name != NULL) @@ -1165,6 +1194,10 @@ unsigned long ulen; /* total uncompressed size (overflow ok) */ unsigned long clen; /* total compressed size (overflow ok) */ unsigned long check; /* check value of uncompressed data */ + char *extra = NULL; /* dictzip extra header field */ + int dz_cur; /* dictzip current pointer to header */ + long long file_len = get_file_size(ind); + int extra_len = DZIP_HEADER_LEN + ((file_len / size) + 2) * sizeof(int); (void)dummy; @@ -1172,6 +1205,25 @@ Trace(("-- write thread running")); head = put_header(); + if (dictzip) { + extra = (char*)malloc(extra_len + 32); + memset(extra, 0, extra_len); + + if (extra_len >= ((1ULL << 16) - 1)) + bail("file too long for dictzip\n", ""); + /* extra length */ + PUT2L(extra, extra_len - 2); + /* Random Access ID */ + extra[2] = 'R'; + extra[3] = 'A'; + /* RA version 99 */ + /* XXX need to standardize! */ + PUT2L(extra + 6, 99); + // PUT2L(extra + 6, 1); + + dz_cur = 0; + } + /* process output of compress threads until end of input */ ulen = clen = 0; check = CHECK(0L, Z_NULL, 0); @@ -1191,6 +1243,15 @@ ulen += (unsigned long)len; clen += (unsigned long)(job->out->len); + if (dictzip) { + if (((dz_cur * 4) + DZIP_HEADER_LEN + sizeof(int)) > extra_len) { + printf(" %d > %d\n", dz_cur, file_len / size); + bail ("input file too large\n", ""); + } + PUT4L(extra + (dz_cur * 4) + DZIP_HEADER_LEN, job->out->len); + dz_cur++; + } + /* write the compressed data and drop the output buffer */ Trace(("-- writing #%ld", seq)); writen(outd, job->out->buf, job->out->len); @@ -1215,6 +1276,22 @@ /* write trailer */ put_trailer(ulen, clen, check, head); + if (dictzip) { + /* chunk length */ + PUT4L(extra + 8, size); + /* chunk count */ + PUT4L(extra + 12, dz_cur); +// PUT4L(extra + 12, (file_len / size) + 1); + /* Target file size (64 bit) */ + PUT4L(extra + 16, file_len); + PUT4L(extra + 20, file_len >> 32); + /* write extra header */ + if (lseek(outd, 10, SEEK_SET) != 10) + bail("couldn't seek in output file\n", ""); + writen(outd, extra, extra_len); + free(extra); + } + /* verify no more jobs, prepare for next use */ possess(compress_have); assert(compress_head == NULL && peek_lock(compress_have) == 0); @@ -2625,6 +2702,18 @@ /* prepare gzip header information for compression */ name = headis & 1 ? justname(in) : NULL; mtime = headis & 2 ? st.st_mtime : 0; + + /* Find a sane chunk size */ + if (dictzip) { + long long file_len = get_file_size(ind); + int extra_len; + + extra_len = DZIP_HEADER_LEN + ((file_len / size) + 2) * sizeof(int); + while (extra_len >= ((1 << 16) - 1)) { + size += (1 << 10ULL); + extra_len = DZIP_HEADER_LEN + ((file_len / size) + 2) * sizeof(int); + } + } } SET_BINARY_MODE(ind); @@ -2678,6 +2767,8 @@ out = malloc(strlen("<stdout>") + 1); if (out == NULL) bail("not enough memory", ""); + if (dictzip) + bail("need to have a seekable output for dictzip\n", ""); strcpy(out, "<stdout>"); outd = 1; if (!decode && !force && isatty(outd)) @@ -2796,6 +2887,7 @@ " -i, --independent Compress blocks independently for damage recovery", " -R, --rsyncable Input-determined block locations for rsync", " -d, --decompress Decompress the compressed input", +" -e, --dictzip Write dictzip random seek information in gzip header", " -t, --test Test the integrity of the compressed input", " -l, --list List the contents of the compressed input", " -f, --force Force overwrite, compress .gz, links, and to terminal", @@ -2868,17 +2960,18 @@ force = 0; /* don't overwrite, don't compress links */ recurse = 0; /* don't go into directories */ form = 0; /* use gzip format */ + dictzip = 0; /* don't write dictzip information */ } /* long options conversion to short options */ local char *longopts[][2] = { {"LZW", "Z"}, {"ascii", "a"}, {"best", "9"}, {"bits", "Z"}, - {"blocksize", "b"}, {"decompress", "d"}, {"fast", "1"}, {"force", "f"}, - {"help", "h"}, {"independent", "i"}, {"keep", "k"}, {"license", "L"}, - {"list", "l"}, {"name", "N"}, {"no-name", "n"}, {"no-time", "T"}, - {"processes", "p"}, {"quiet", "q"}, {"recursive", "r"}, {"rsyncable", "R"}, - {"silent", "q"}, {"stdout", "c"}, {"suffix", "S"}, {"test", "t"}, - {"to-stdout", "c"}, {"uncompress", "d"}, {"verbose", "v"}, + {"blocksize", "b"}, {"decompress", "d"}, {"dictzip", "e"}, {"fast", "1"}, + {"force", "f"}, {"help", "h"}, {"independent", "i"}, {"keep", "k"}, + {"license", "L"}, {"list", "l"}, {"name", "N"}, {"no-name", "n"}, + {"no-time", "T"}, {"processes", "p"}, {"quiet", "q"}, {"recursive", "r"}, + {"rsyncable", "R"}, {"silent", "q"}, {"stdout", "c"}, {"suffix", "S"}, + {"test", "t"}, {"to-stdout", "c"}, {"uncompress", "d"}, {"verbose", "v"}, {"version", "V"}, {"zip", "K"}, {"zlib", "z"}}; #define NLOPTS (sizeof(longopts) / (sizeof(char *) << 1)) @@ -2984,6 +3077,7 @@ case 'b': get = 1; break; case 'c': pipeout = 1; break; case 'd': decode = 1; headis = 0; break; + case 'e': dictzip = 1; dict = 0; break; case 'f': force = 1; break; case 'h': help(); break; case 'i': dict = 0; break; @@ -3112,6 +3206,19 @@ fprintf(stderr, "warning: output is concatenated zip files "); fprintf(stderr, "-- pigz will not be able to extract\n"); } + + /* dictzip sanity checks */ + if (dictzip && (form > 1)) { + fprintf(stderr, "warning: dictzip only works on gzip files\n"); + } + +#if 0 + if (dictzip && (size >= (64 << 10))) { + fprintf(stderr, "warning: dictzip needs chunks < 64k.\n"); + size = (63 << 10); + } +#endif + process(strcmp(argv[n], "-") ? argv[n] : NULL); done++; } ++++++ pigz-do-symlinks.patch ++++++ --- pigz-2.1.6/pigz.c.orig 2011-06-02 12:36:40.043909605 +0200 +++ pigz-2.1.6/pigz.c 2011-06-02 12:39:32.148763023 +0200 @@ -2596,11 +2596,13 @@ in); return; } +#if 0 if ((st.st_mode & S_IFMT) == S_IFLNK && !force && !pipeout) { if (verbosity > 0) fprintf(stderr, "%s is a symbolic link -- skipping\n", in); return; } +#endif if ((st.st_mode & S_IFMT) == S_IFDIR && !recurse) { if (verbosity > 0) fprintf(stderr, "%s is a directory -- skipping\n", in); ++++++ pigz-spl.patch ++++++ --- pigz-2.1.6/pigz.c.orig 2011-06-02 12:36:25.000000000 +0200 +++ pigz-2.1.6/pigz.c 2011-06-02 12:36:40.043909605 +0200 @@ -1861,7 +1861,7 @@ nm += len - 4; len = 4; if (strcmp(nm, ".zip") == 0 || strcmp(nm, ".ZIP") == 0 || - strcmp(nm, ".tgz") == 0) + strcmp(nm, ".tgz") == 0 || strcmp(nm, ".spl") == 0) return 4; } if (len > 3) { ++++++ pigz-tmpperm.patch ++++++ Index: pigz/pigz.c =================================================================== --- pigz-2.2.4/pigz.c (Revision 4038) +++ pigz-2.2.5/pigz.c (Arbeitskopie) @@ -3228,7 +3228,7 @@ memcpy(out, to, len); strcpy(out + len, decode ? "" : sufx); outd = open(out, O_CREAT | O_TRUNC | O_WRONLY | - (force ? 0 : O_EXCL), 0666); + (force ? 0 : O_EXCL), 0600); /* if exists and not -f, give user a chance to overwrite */ if (outd < 0 && errno == EEXIST && isatty(0) && verbosity) { @@ -3244,7 +3244,7 @@ } while (ch != EOF && ch != '\n' && ch != '\r'); if (reply == 1) outd = open(out, O_CREAT | O_TRUNC | O_WRONLY, - 0666); + 0600); } /* if exists and no overwrite, report and go on to next */ -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit make for openSUSE:12.2:Update
by root＠hilbert.suse.de 26 Mar '13

26 Mar '13

Hello community, here is the log from the commit of package make for openSUSE:12.2:Update checked in at 2013-03-26 17:15:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.2:Update/make (Old) and /work/SRC/openSUSE:12.2:Update/.make.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "make", Maintainer is "" Changes: -------- New Changes file: NO CHANGES FILE!!! New: ---- _link ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ _link ++++++ <link package='make.1471' cicount='copy' /> -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit make.1471 for openSUSE:12.2:Update
by root＠hilbert.suse.de 26 Mar '13

26 Mar '13

Hello community, here is the log from the commit of package make.1471 for openSUSE:12.2:Update checked in at 2013-03-26 17:15:49 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.2:Update/make.1471 (Old) and /work/SRC/openSUSE:12.2:Update/.make.1471.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "make.1471", Maintainer is "" Changes: -------- New Changes file: --- /dev/null 2013-02-26 18:15:11.936010755 +0100 +++ /work/SRC/openSUSE:12.2:Update/.make.1471.new/make.changes 2013-03-26 17:15:50.000000000 +0100 @@ -0,0 +1,280 @@ +------------------------------------------------------------------- +Wed Mar 20 22:22:57 UTC 2013 - jengelh(a)inai.de + +- Add make-parallel-build.patch from openSUSE:12.3/make + (bnc#810657) + +------------------------------------------------------------------- +Tue Apr 10 14:26:35 CEST 2012 - meissner(a)suse.de + +- Faster globbing support from upstream to speed up + some large make projects like libreoffice. bnc#753323 + +------------------------------------------------------------------- +Tue Oct 11 22:37:40 CEST 2011 - mhrusecky(a)suse.cz + +- reverting previous change (qemu binfmt was fixed) + +------------------------------------------------------------------- +Fri Sep 30 13:03:23 CEST 2011 - mhrusecky(a)suse.cz + +- using full ar path in tests on arm (fixes build) + +------------------------------------------------------------------- +Tue Apr 19 15:22:27 UTC 2011 - mhopf(a)novell.com + +- make-fix_whitespace_tokenization.diff + Fix Savannah bug #33125 (bnc #681108): + Memory corruption during build of android build system. + +------------------------------------------------------------------- +Tue Sep 7 17:22:32 UTC 2010 - mhopf(a)novell.com + +- make-savannah-bug30612-handling_of_archives.diff + Fix Savannah bug #30612: handling of archive references with >1 object.. + Add oneshell to $(.FEATURES). + Fix the NEWS file to be accurate. +- make-savannah-bug30723-expand_makeflags_before_reexec.diff + Fix Savannah bug #30723: expand MAKEFLAGS before we re-exec after rebuilding + makefiles. + +------------------------------------------------------------------- +Mon Aug 30 17:37:23 UTC 2010 - mhopf(a)novell.com + +- Disable some inherrently broken test cases. + +------------------------------------------------------------------- +Mon Aug 23 13:39:12 UTC 2010 - mhopf(a)novell.com + +- Update to 3.82 + - Bug fixes + - Backwards Incompatibilities: + - Makefiles with .POSIX target: shells called with -e + - $? contains prerequisites even if not existent + - Prerequisite with '=' cannot be backslash escaped any more + (use variable with '=' instead) + - Variable names may not contain whitespaces any more + - Mixture of explicit and pattern targets didn't always fail + - Pattern specific rules application order changed + - Library search behavior now compatible with standard linker + - New features + - --eval=STRING: Evaluate makefile syntax string before makefile + - Variable .RECIPEPREFIX: Exchange TAB character + - Variable .SHELLFLAGS: Options passed to shells + - Target .ONESHELL: Single instance of shell for recipe + - Modifier private: Suppresses inheritance of variables + - Directive undefine: Undefine variable + - Changed features + - Multiple modifiers for variables allowed now. + - Directive define: Allow variable assignment operator. +- Nuke memory-hog-2.diff which didn't apply since 3.81 +- Addapt make-slowdown-parallelism.diff to new parallelization tests +- Separate make checks into %checks section + +------------------------------------------------------------------- +Mon Jun 28 06:38:35 UTC 2010 - jengelh(a)medozas.de + +- use %_smp_mflags + +------------------------------------------------------------------- +Mon May 24 17:16:41 UTC 2010 - coolo(a)novell.com + +- fix test case + +------------------------------------------------------------------- +Fri Jan 8 17:33:04 CET 2010 - ro(a)suse.de + +- enable parallel build + +------------------------------------------------------------------- +Mon May 14 17:46:30 CEST 2007 - coolo(a)suse.de + +- use %find_lang + +------------------------------------------------------------------- +Tue Oct 31 12:48:35 CET 2006 - mhopf(a)suse.de + +- Reducing race probability in test case features/parallelism even more. + +------------------------------------------------------------------- +Wed Jun 7 12:20:28 CEST 2006 - mhopf(a)suse.de + +- Improving occasional build failures due to races in test cases. + +------------------------------------------------------------------- +Mon May 29 14:28:37 CEST 2006 - mhopf(a)suse.de + +- Update to 3.81 + - Bug fixes + - New functions: lastword, abspath, realpath, info, flavor, or, and + - New variables: .INCLUDE_DIRS, .FEATURES, .DEFAULT_GOAL, MAKE_RESTARTS, $| + - Some new features + - More POSIX compatibility +- memory-hog-2.diff doesn't apply any longer + +------------------------------------------------------------------- +Wed Feb 1 20:29:39 CET 2006 - kssingvo(a)suse.de + +- fix for memory-hog.diff (bugzilla#147229) + +------------------------------------------------------------------- +Wed Feb 1 18:15:14 CET 2006 - kssingvo(a)suse.de + +- disabled memory-hog.diff due to crashes (bugzilla#147229) + +------------------------------------------------------------------- +Wed Jan 25 21:30:30 CET 2006 - mls(a)suse.de + +- converted neededforbuild to BuildRequires + +------------------------------------------------------------------- +Thu Jan 19 14:36:00 CET 2006 - aj(a)suse.de + +- Reduce memory usage. + +------------------------------------------------------------------- +Fri Jan 9 16:16:49 CET 2004 - adrian(a)suse.de + +- do not strip binaries during install + +------------------------------------------------------------------- +Tue Sep 30 18:56:18 CEST 2003 - stepan(a)suse.de + +- fix "virtual memory exhausted" bug (backport from mainline) + +------------------------------------------------------------------- +Thu Apr 24 12:20:23 CEST 2003 - ro(a)suse.de + +- fix install_info --delete call and move from preun to postun + +------------------------------------------------------------------- +Wed Apr 16 16:20:30 CEST 2003 - coolo(a)suse.de + +- use BuildRoot + +------------------------------------------------------------------- +Fri Feb 7 02:03:03 CET 2003 - ro(a)suse.de + +- added install_info macros + +------------------------------------------------------------------- +Mon Dec 30 16:57:22 CET 2002 - aj(a)suse.de + +- Update to version 3.80: + - number of bug fixes + - new features as mentioned in the NEWS file: + * New functions $(value ...), $(eval ...) + * New feature: order-only prerequesites. + * Argument to ifdef can now be a variable. + * new option --always-make + +------------------------------------------------------------------- +Tue Sep 17 18:43:14 CEST 2002 - ro(a)suse.de + +- removed bogus self-provides + +------------------------------------------------------------------- +Thu May 23 15:39:17 CEST 2002 - meissner(a)suse.de + +- Made %_lib fix generic, do not use ifarch. + +------------------------------------------------------------------- +Mon Apr 22 14:43:25 CEST 2002 - meissner(a)suse.de + +- x86_64 needs /*/lib64 as search path too. + +------------------------------------------------------------------- +Fri Apr 19 14:55:23 CEST 2002 - ke(a)suse.de + +- Update German translation from + http://www.iro.umontreal.ca/contrib/po/teams/PO/de/ [# 15851]. + +------------------------------------------------------------------- +Tue Dec 11 17:19:45 CET 2001 - froh(a)suse.de + +- s390x, sparc64 and ia64: extended the 'Dynamic Library Search' + default path to search /lib64 and /usr/lib64 as well. + ++++ 83 more lines (skipped) ++++ between /dev/null ++++ and /work/SRC/openSUSE:12.2:Update/.make.1471.new/make.changes New: ---- make-3.82.tar.bz2 make-disable-broken-tests.diff make-fix_whitespace_tokenization.diff make-glob-faster.patch make-library-search-path.diff make-parallel-build.patch make-savannah-bug30612-handling_of_archives.diff make-savannah-bug30723-expand_makeflags_before_reexec.diff make-slowdown-parallelism.diff make.changes make.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ make.spec ++++++ # # spec file for package make # # Copyright (c) 2013 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 # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # Name: make Url: http://www.gnu.org/software/make/make.html Provides: gmake PreReq: %install_info_prereq Version: 3.82 Release: 0 Summary: GNU make License: GPL-2.0+ Group: Development/Tools/Building 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 Patch7: make-glob-faster.patch Patch8: make-parallel-build.patch Patch64: make-library-search-path.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %description The GNU make command with extensive documentation. %prep %setup -q %patch2 %patch3 -p1 %patch4 %patch5 %patch6 -p1 %patch7 -p0 %patch -P 8 -p1 if [ %_lib == lib64 ]; then %patch64 fi %build CFLAGS=$RPM_OPT_FLAGS \ ./configure --prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info make %{?_smp_mflags} %check make check %install make DESTDIR=$RPM_BUILD_ROOT install ln -s make $RPM_BUILD_ROOT/usr/bin/gmake %find_lang %name %files -f %name.lang %defattr(-,root,root) /usr/bin/make /usr/bin/gmake %doc /usr/share/info/make.info-*.gz %doc /usr/share/info/make.info.gz %doc /usr/share/man/man1/make.1.gz %clean rm -rf $RPM_BUILD_ROOT %post %install_info --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz %postun %install_info_delete --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz %changelog ++++++ make-disable-broken-tests.diff ++++++ Index: make-3.82/tests/scripts/targets/SECONDARY =================================================================== --- make-3.82.orig/tests/scripts/targets/SECONDARY +++ make-3.82/tests/scripts/targets/SECONDARY @@ -121,69 +121,73 @@ all: version2', unlink('version2'); -# TEST #9 -- Savannah bug #15919 -# The original fix for this bug caused a new bug, shown here. - -touch(qw(1.a 2.a)); - -run_make_test(' -%.c : %.b ; cp $< $@ -%.b : %.a ; cp $< $@ -all : 1.c 2.c', '-rR -j', -'cp 1.a 1.b -cp 2.a 2.b -cp 1.b 1.c -cp 2.b 2.c -rm 1.b 2.b'); - -unlink(qw(1.a 2.a 1.c 2.c)); - -# TEST #10 -- Savannah bug #15919 -touch('test.0'); -run_make_test(' -.SECONDARY : test.1 test.2 test.3 - -test : test.4 - -%.4 : %.int %.3 ; touch $@ - -%.int : %.3 %.2 ; touch $@ - -%.3 : | %.2 ; touch $@ - -%.2 : %.1 ; touch $@ - -%.1 : %.0 ; touch $@', '-rR -j 2', -'touch test.1 -touch test.2 -touch test.3 -touch test.int -touch test.4 -rm test.int'); - -# After a touch of test.0 it should give the same output, except we don't need -# to rebuild test.3 (order-only) -sleep(1); -touch('test.0'); -run_make_test(undef, '-rR -j 2', -'touch test.1 -touch test.2 -touch test.int -touch test.4 -rm test.int'); - -# With both test.0 and test.3 updated it should still build everything except -# test.3 -sleep(1); -touch('test.0', 'test.3'); -run_make_test(undef, '-rR -j 2', -'touch test.1 -touch test.2 -touch test.int -touch test.4 -rm test.int'); - -unlink(qw(test.0 test.1 test.2 test.3 test.4)); +# All these tests don't reliably work under high load conditions. +# Heck, I had two different failures on my workstation, and it's +# perfectly clear that ordering can differ. - mhopf + +# # TEST #9 -- Savannah bug #15919 +# # The original fix for this bug caused a new bug, shown here. +# +# touch(qw(1.a 2.a)); +# +# run_make_test(' +# %.c : %.b ; cp $< $@ +# %.b : %.a ; cp $< $@ +# all : 1.c 2.c', '-rR -j', +# 'cp 1.a 1.b +# cp 2.a 2.b +# cp 1.b 1.c +# cp 2.b 2.c +# rm 1.b 2.b'); +# +# unlink(qw(1.a 2.a 1.c 2.c)); +# +# # TEST #10 -- Savannah bug #15919 +# touch('test.0'); +# run_make_test(' +# .SECONDARY : test.1 test.2 test.3 +# +# test : test.4 +# +# %.4 : %.int %.3 ; touch $@ +# +# %.int : %.3 %.2 ; touch $@ +# +# %.3 : | %.2 ; touch $@ +# +# %.2 : %.1 ; touch $@ +# +# %.1 : %.0 ; touch $@', '-rR -j 2', +# 'touch test.1 +# touch test.2 +# touch test.3 +# touch test.int +# touch test.4 +# rm test.int'); +# +# # After a touch of test.0 it should give the same output, except we don't need +# # to rebuild test.3 (order-only) +# sleep(1); +# touch('test.0'); +# run_make_test(undef, '-rR -j 2', +# 'touch test.1 +# touch test.2 +# touch test.int +# touch test.4 +# rm test.int'); +# +# # With both test.0 and test.3 updated it should still build everything except +# # test.3 +# sleep(1); +# touch('test.0', 'test.3'); +# run_make_test(undef, '-rR -j 2', +# 'touch test.1 +# touch test.2 +# touch test.int +# touch test.4 +# rm test.int'); +# +# unlink(qw(test.0 test.1 test.2 test.3 test.4)); # This tells the test driver that the perl test script executed properly. 1; ++++++ 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 *)); ++++++ make-glob-faster.patch ++++++ Index: read.c =================================================================== RCS file: /sources/make/make/read.c,v retrieving revision 1.198 retrieving revision 1.200 diff -u -p -u -r1.198 -r1.200 --- read.c 29 Apr 2011 15:27:39 -0000 1.198 +++ read.c 7 May 2011 14:36:12 -0000 1.200 @@ -2901,6 +2901,7 @@ parse_file_seq (char **stringp, unsigned const char *name; const char **nlist = 0; char *tildep = 0; + int globme = 1; #ifndef NO_ARCHIVES char *arname = 0; char *memname = 0; @@ -3109,32 +3110,40 @@ parse_file_seq (char **stringp, unsigned } #endif /* !NO_ARCHIVES */ - switch (glob (name, GLOB_NOSORT|GLOB_ALTDIRFUNC, NULL, &gl)) - { - case GLOB_NOSPACE: - fatal (NILF, _("virtual memory exhausted")); - - case 0: - /* Success. */ - i = gl.gl_pathc; - nlist = (const char **)gl.gl_pathv; - break; - - case GLOB_NOMATCH: - /* If we want only existing items, skip this one. */ - if (flags & PARSEFS_EXISTS) - { - i = 0; - break; - } - /* FALLTHROUGH */ - - default: - /* By default keep this name. */ + /* glob() is expensive: don't call it unless we need to. */ + if (!(flags & PARSEFS_EXISTS) && strpbrk (name, "?*[") == NULL) + { + globme = 0; i = 1; nlist = &name; - break; - } + } + else + switch (glob (name, GLOB_NOSORT|GLOB_ALTDIRFUNC, NULL, &gl)) + { + case GLOB_NOSPACE: + fatal (NILF, _("virtual memory exhausted")); + + case 0: + /* Success. */ + i = gl.gl_pathc; + nlist = (const char **)gl.gl_pathv; + break; + + case GLOB_NOMATCH: + /* If we want only existing items, skip this one. */ + if (flags & PARSEFS_EXISTS) + { + i = 0; + break; + } + /* FALLTHROUGH */ + + default: + /* By default keep this name. */ + i = 1; + nlist = &name; + break; + } /* For each matched element, add it to the list. */ while (i-- > 0) @@ -3174,7 +3183,8 @@ parse_file_seq (char **stringp, unsigned #endif /* !NO_ARCHIVES */ NEWELT (concat (2, prefix, nlist[i])); - globfree (&gl); + if (globme) + globfree (&gl); #ifndef NO_ARCHIVES if (arname) Index: tests/scripts/functions/wildcard =================================================================== RCS file: /sources/make/make/tests/scripts/functions/wildcard,v retrieving revision 1.6 retrieving revision 1.7 diff -u -p -u -r1.6 -r1.7 --- tests/scripts/functions/wildcard 13 Jun 2009 21:21:49 -0000 1.6 +++ tests/scripts/functions/wildcard 7 May 2011 14:36:11 -0000 1.7 @@ -88,4 +88,16 @@ all: ; @echo $(wildcard xz--y*.7) !, '', "\n"); +# TEST #5: wildcard used to verify file existence + +touch('xxx.yyy'); + +run_make_test(q!exists: ; @echo file=$(wildcard xxx.yyy)!, + '', "file=xxx.yyy\n"); + +unlink('xxx.yyy'); + +run_make_test(q!exists: ; @echo file=$(wildcard xxx.yyy)!, + '', "file=\n"); + 1; ++++++ make-library-search-path.diff ++++++ make searches for -lmoo targets in /lib and /usr/lib after mangling them with .LIBPATTERNS into libmoo.so This patch extends to teh search path to /lib64/ and /usr/lib64 --- remake.c 2001/12/11 15:59:03 1.1 +++ remake.c 2001/12/11 16:01:01 @@ -1252,6 +1252,8 @@ static char *dirs[] = { #ifndef _AMIGA + "/lib64", + "/usr/lib64", "/lib", "/usr/lib", #endif ++++++ make-parallel-build.patch ++++++ References: http://savannah.gnu.org/bugs/?30653 Upstream: yes; backported to openSUSE (dimstar(a)opensuse.org) diff -u make-3.82-orig/remake.c make-3.82/remake.c --- make-3.82-orig/remake.c 2010-07-13 03:20:42.000000000 +0200 +++ make-3.82/remake.c 2012-03-21 12:47:52.000000000 +0100 @@ -301,7 +301,7 @@ /* Check for the case where a target has been tried and failed but the diagnostics hasn't been issued. If we need the diagnostics then we will have to continue. */ - if (!(f->updated && f->update_status > 0 && !f->dontcare && f->no_diag)) + if (!(f->updated && f->update_status > 0 && !f->dontcare && f->no_diag) && f->command_state!=cs_not_started ) { DBF (DB_VERBOSE, _("Pruning file `%s'.\n")); return f->command_state == cs_finished ? f->update_status : 0; @@ -614,6 +614,12 @@ d->file->dontcare = file->dontcare; } + /* We may have already encountered this file earlier in the same + * pass before we knew we'd be updating this target. In that + * case calling update_file now would result in the file being + * inappropriately pruned so we toggle the considered bit back + * off first. */ + d->file->considered = !considered; dep_status |= update_file (d->file, depth); ++++++ make-savannah-bug30612-handling_of_archives.diff ++++++ Index: ChangeLog =================================================================== RCS file: /sources/make/make/ChangeLog,v retrieving revision 2.419 retrieving revision 2.420 diff -u -p -u -p -r2.419 -r2.420 --- ChangeLog 10 Aug 2010 07:35:34 -0000 2.419 +++ ChangeLog 14 Aug 2010 02:50:14 -0000 2.420 @@ -1,3 +1,17 @@ +2010-08-13 Paul Smith <psmith(a)gnu.org> + + * NEWS: Accidentally forgot to back out the sorted wildcard + enhancement in 3.82, so update NEWS. + Also add NEWS about the error check for explicit and pattern + targets in the same rule, added to 3.82. + + * main.c (main): Add "oneshell" to $(.FEATURES) (forgot to add + this in 3.82!) + + * read.c (parse_file_seq): Fix various errors parsing archives + with multiple objects in the parenthesis, as well as wildcards. + Fixes Savannah bug #30612. + 2010-08-10 Paul Smith <psmith(a)gnu.org> * main.c (main): Expand MAKEFLAGS before adding it to the Index: NEWS =================================================================== RCS file: /sources/make/make/NEWS,v retrieving revision 2.109 retrieving revision 2.110 diff -u -p -u -p -r2.109 -r2.110 --- NEWS 28 Jul 2010 05:39:50 -0000 2.109 +++ NEWS 14 Aug 2010 02:50:14 -0000 2.110 @@ -18,14 +18,6 @@ http://sv.gnu.org/bugs/index.php?group=m * Compiling GNU make now requires a conforming ISO C 1989 compiler and standard runtime library. -* WARNING: Future backward-incompatibility! - Wildcards are not documented as returning sorted values, but up to and - including this release the results have been sorted and some makefiles are - apparently depending on that. In the next release of GNU make, for - performance reasons, we may remove that sorting. If your makefiles - require sorted results from wildcard expansions, use the $(sort ...) - function to request it explicitly. - * WARNING: Backward-incompatibility! The POSIX standard for make was changed in the 2008 version in a fundamentally incompatible way: make is required to invoke the shell as if @@ -42,6 +34,21 @@ http://sv.gnu.org/bugs/index.php?group=m existing targets were provided in $?). * WARNING: Backward-incompatibility! + Wildcards were not documented as returning sorted values, but the results + have been sorted up until this release.. If your makefiles require sorted + results from wildcard expansions, use the $(sort ...) function to request + it explicitly. + +* WARNING: Backward-incompatibility! + In previous versions of make it was acceptable to list one or more explicit + targets followed by one or more pattern targets in the same rule and it + worked "as expected". However, this was not documented as acceptable and if + you listed any explicit targets AFTER the pattern targets, the entire rule + would be mis-parsed. This release removes this ability completely: make + will generate an error message if you mix explicit and pattern targets in + the same rule. + +* WARNING: Backward-incompatibility! As a result of parser enhancements, three backward-compatibility issues exist: first, a prerequisite containing an "=" cannot be escaped with a backslash any longer. You must create a variable containing an "=" and Index: main.c =================================================================== RCS file: /sources/make/make/main.c,v retrieving revision 1.244 retrieving revision 1.245 diff -u -p -u -p -r1.244 -r1.245 --- main.c 10 Aug 2010 07:35:34 -0000 1.244 +++ main.c 14 Aug 2010 02:50:14 -0000 1.245 @@ -1138,7 +1138,7 @@ main (int argc, char **argv, char **envp a macro and some compilers (MSVC) don't like conditionals in macros. */ { const char *features = "target-specific order-only second-expansion" - " else-if shortest-stem undefine" + " else-if shortest-stem undefine oneshell" #ifndef NO_ARCHIVES " archives" #endif Index: read.c =================================================================== RCS file: /sources/make/make/read.c,v retrieving revision 1.193 retrieving revision 1.194 diff -u -p -u -p -r1.193 -r1.194 --- read.c 13 Jul 2010 01:20:42 -0000 1.193 +++ read.c 14 Aug 2010 02:50:14 -0000 1.194 @@ -3028,7 +3028,7 @@ parse_file_seq (char **stringp, unsigned { /* This looks like the first element in an open archive group. A valid group MUST have ')' as the last character. */ - const char *e = p + nlen; + const char *e = p; do { e = next_token (e); @@ -3084,19 +3084,19 @@ parse_file_seq (char **stringp, unsigned Go to the next item in the string. */ if (flags & PARSEFS_NOGLOB) { - NEWELT (concat (2, prefix, tp)); + NEWELT (concat (2, prefix, tmpbuf)); continue; } /* If we get here we know we're doing glob expansion. TP is a string in tmpbuf. NLEN is no longer used. We may need to do more work: after this NAME will be set. */ - name = tp; + name = tmpbuf; /* Expand tilde if applicable. */ - if (tp[0] == '~') + if (tmpbuf[0] == '~') { - tildep = tilde_expand (tp); + tildep = tilde_expand (tmpbuf); if (tildep != 0) name = tildep; } @@ -3152,7 +3152,10 @@ parse_file_seq (char **stringp, unsigned else { /* We got a chain of items. Attach them. */ - (*newp)->next = found; + if (*newp) + (*newp)->next = found; + else + *newp = found; /* Find and set the new end. Massage names if necessary. */ while (1) Index: tests/ChangeLog =================================================================== RCS file: /sources/make/make/tests/ChangeLog,v retrieving revision 1.150 retrieving revision 1.151 diff -u -p -u -p -r1.150 -r1.151 --- tests/ChangeLog 10 Aug 2010 07:35:34 -0000 1.150 +++ tests/ChangeLog 14 Aug 2010 02:50:14 -0000 1.151 @@ -1,3 +1,11 @@ +2010-08-13 Paul Smith <psmith(a)gnu.org> + + * scripts/features/archives: New regression tests for archive + support. Test for fix to Savannah bug #30612. + + * run_make_tests.pl (set_more_defaults): Set a %FEATURES hash to + the features available in $(.FEATURES). + 2010-08-10 Paul Smith <psmith(a)gnu.org> * scripts/features/reinvoke: Ensure command line variable settings Index: tests/run_make_tests.pl =================================================================== RCS file: /sources/make/make/tests/run_make_tests.pl,v retrieving revision 1.32 retrieving revision 1.33 diff -u -p -u -p -r1.32 -r1.33 --- tests/run_make_tests.pl 13 Jul 2010 01:20:43 -0000 1.32 +++ tests/run_make_tests.pl 14 Aug 2010 02:50:14 -0000 1.33 @@ -29,6 +29,7 @@ # You should have received a copy of the GNU General Public License along with # this program. If not, see <http://www.gnu.org/licenses/>. +%FEATURES = (); $valgrind = 0; # invoke make with valgrind $valgrind_args = ''; @@ -367,6 +368,8 @@ sub set_more_defaults $parallel_jobs = 1; } + %FEATURES = map { $_ => 1 } split /\s+/, `sh -c "echo '\\\$(info \\\$(.FEATURES))' | $make_path -f- 2>/dev/null"`; + # Set up for valgrind, if requested. if ($valgrind) { Index: tests/scripts/features/archives =================================================================== RCS file: tests/scripts/features/archives diff -N tests/scripts/features/archives --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ tests/scripts/features/archives 14 Aug 2010 02:50:14 -0000 1.1 @@ -0,0 +1,42 @@ +# -*-mode: perl-*- + +$description = "Test GNU make's archive management features."; + +$details = "\ +This only works on systems that support it."; + +# If this instance of make doesn't support archives, skip it +exists $FEATURES{archives} or return -1; + +# Create some .o files to work with +utouch(-60, qw(a1.o a2.o a3.o)); + +# Very simple +run_make_test('all: libxx.a(a1.o)', + '', "ar rv libxx.a a1.o\nar: creating libxx.a\na - a1.o\n"); + +# Multiple .o's. Add a new one to the existing library +run_make_test('all: libxx.a(a1.o a2.o)', + '', "ar rv libxx.a a2.o\na - a2.o\n"); + +# Touch one of the .o's so it's rebuilt +utouch(-40, 'a1.o'); +run_make_test(undef, '', "ar rv libxx.a a1.o\nr - a1.o\n"); + +# Use wildcards +run_make_test('all: libxx.a(*.o)', + '', "#MAKE#: Nothing to be done for `all'.\n"); + +# Touch one of the .o's so it's rebuilt +utouch(-30, 'a1.o'); +run_make_test(undef, '', "ar rv libxx.a a1.o\nr - a1.o\n"); + +# Use both wildcards and simple names +utouch(-50, 'a2.o'); +run_make_test('all: libxx.a(a3.o *.o)', '', + "ar rv libxx.a a3.o\na - a3.o\nar rv libxx.a a2.o\nr - a2.o\n"); + +rmfiles(qw(a1.o a2.o a3.o libxx.a)); + +# This tells the test driver that the perl test script executed properly. +1; ++++++ make-savannah-bug30723-expand_makeflags_before_reexec.diff ++++++ Index: ChangeLog =================================================================== RCS file: /sources/make/make/ChangeLog,v retrieving revision 2.418 retrieving revision 2.419 diff -u -p -u -p -r2.418 -r2.419 --- ChangeLog 7 Aug 2010 08:55:17 -0000 2.418 +++ ChangeLog 10 Aug 2010 07:35:34 -0000 2.419 @@ -1,3 +1,8 @@ +2010-08-10 Paul Smith <psmith(a)gnu.org> + + * main.c (main): Expand MAKEFLAGS before adding it to the + environment when re-exec'ing. Fixes Savannah bug #30723. + 2010-07-28 Paul Smith <psmith(a)gnu.org> Version 3.82 released. Index: main.c =================================================================== RCS file: /sources/make/make/main.c,v retrieving revision 1.243 retrieving revision 1.244 diff -u -p -u -p -r1.243 -r1.244 --- main.c 19 Jul 2010 07:10:53 -0000 1.243 +++ main.c 10 Aug 2010 07:35:34 -0000 1.244 @@ -2093,7 +2093,7 @@ main (int argc, char **argv, char **envp const char *pv = define_makeflags (1, 1); char *p = alloca (sizeof ("MAKEFLAGS=") + strlen (pv) + 1); sprintf (p, "MAKEFLAGS=%s", pv); - putenv (p); + putenv (allocated_variable_expand (p)); } if (ISDB (DB_BASIC)) Index: tests/ChangeLog =================================================================== RCS file: /sources/make/make/tests/ChangeLog,v retrieving revision 1.149 retrieving revision 1.150 diff -u -p -u -p -r1.149 -r1.150 --- tests/ChangeLog 28 Jul 2010 05:39:50 -0000 1.149 +++ tests/ChangeLog 10 Aug 2010 07:35:34 -0000 1.150 @@ -1,3 +1,8 @@ +2010-08-10 Paul Smith <psmith(a)gnu.org> + + * scripts/features/reinvoke: Ensure command line variable settings + are preserved across make re-exec. Tests Savannah bug #30723. + 2010-07-28 Paul Smith <psmith(a)gnu.org> * scripts/targets/POSIX: Compatibility issues with Solaris (and Index: tests/scripts/features/reinvoke =================================================================== RCS file: /sources/make/make/tests/scripts/features/reinvoke,v retrieving revision 1.7 retrieving revision 1.8 diff -u -p -u -p -r1.7 -r1.8 --- tests/scripts/features/reinvoke 27 Jun 2005 22:18:47 -0000 1.7 +++ tests/scripts/features/reinvoke 10 Aug 2010 07:35:34 -0000 1.8 @@ -57,9 +57,24 @@ include $(F)', # Now try with the file we're not updating being the actual file we're # including: this and the previous one test different parts of the code. -run_make_test(undef, "F=b", "[ -f b ] || echo >> b\nhello\n") +run_make_test(undef, 'F=b', "[ -f b ] || echo >> b\nhello\n") &rmfiles('a','b','c'); +# Ensure command line variables are preserved properly across re-exec +# Tests for Savannah bug #30723 + +run_make_test(' +ifdef RECURSE +-include foo30723 +endif +recurse: ; @$(MAKE) -f $(MAKEFILE_LIST) RECURSE=1 test +test: ; @echo F.O=$(F.O) +foo30723: ; @touch $@ +', + '--no-print-directory F.O=bar', "F.O=bar\n"); + +unlink('foo30723'); + # This tells the test driver that the perl test script executed properly. 1; ++++++ make-slowdown-parallelism.diff ++++++ Index: tests/scripts/features/double_colon =================================================================== --- tests/scripts/features/double_colon.orig +++ tests/scripts/features/double_colon @@ -23,7 +23,7 @@ all: baz foo:: f1.h ; @echo foo FIRST foo:: f2.h ; @echo foo SECOND -bar:: ; @echo aaa; sleep 1; echo aaa done +bar:: ; @echo aaa; sleep 4; echo aaa done bar:: ; @echo bbb baz:: ; @echo aaa Index: tests/scripts/features/parallelism =================================================================== --- tests/scripts/features/parallelism.orig +++ tests/scripts/features/parallelism @@ -27,9 +27,9 @@ else { run_make_test(" all : def_1 def_2 def_3 -def_1 : ; \@echo ONE; $sleep_command 3 ; echo TWO -def_2 : ; \@$sleep_command 2 ; echo THREE -def_3 : ; \@$sleep_command 1 ; echo FOUR", +def_1 : ; \@echo ONE; $sleep_command 12 ; echo TWO +def_2 : ; \@$sleep_command 8 ; echo THREE +def_3 : ; \@$sleep_command 4 ; echo FOUR", '-j4', "ONE\nFOUR\nTHREE\nTWO"); # Test parallelism with included files. Here we sleep/echo while @@ -38,8 +38,8 @@ def_3 : ; \@$sleep_command 1 ; echo FOUR run_make_test(" all: 1 2; \@echo success -include 1.inc 2.inc -1.inc: ; \@echo ONE.inc; $sleep_command 2; echo TWO.inc; echo '1: ; \@echo ONE; $sleep_command 2; echo TWO' > \$\@ -2.inc: ; \@$sleep_command 1; echo THREE.inc; echo '2: ; \@$sleep_command 1; echo THREE' > \$\@", +1.inc: ; \@echo ONE.inc; $sleep_command 8; echo TWO.inc; echo '1: ; \@echo ONE; $sleep_command 8; echo TWO' > \$\@ +2.inc: ; \@$sleep_command 4; echo THREE.inc; echo '2: ; \@$sleep_command 4; echo THREE' > \$\@", "-j4", "ONE.inc\nTHREE.inc\nTWO.inc\nONE\nTHREE\nTWO\nsuccess\n"); @@ -57,8 +57,8 @@ ifeq (\$(INC),yes) -include 1.inc 2.inc endif -1.inc: ; \@echo ONE.inc; $sleep_command 2; echo TWO.inc; echo '1: ; \@echo ONE; $sleep_command 2; echo TWO' > \$\@ -2.inc: ; \@$sleep_command 1; echo THREE.inc; echo '2: ; \@$sleep_command 1; echo THREE' > \$\@", +1.inc: ; \@echo ONE.inc; $sleep_command 8; echo TWO.inc; echo '1: ; \@echo ONE; $sleep_command 8; echo TWO' > \$\@ +2.inc: ; \@$sleep_command 4; echo THREE.inc; echo '2: ; \@$sleep_command 4; echo THREE' > \$\@", "-j4", "ONE.inc\nTHREE.inc\nTWO.inc\nONE\nTHREE\nTWO\nsuccess\n"); @@ -74,37 +74,37 @@ rmfiles(qw(1.inc 2.inc)); run_make_test(" export HI = \$(shell \$(\$\@.CMD)) first.CMD = echo hi -second.CMD = $sleep_command 4; echo hi +second.CMD = $sleep_command 16; echo hi .PHONY: all first second all: first second -first second: ; \@echo \$\@; $sleep_command 1; echo \$\@", - '-j2', "first\nfirst\nsecond\nsecond", 0, 7); +first second: ; \@echo \$\@; $sleep_command 4; echo \$\@", + '-j2', "first\nfirst\nsecond\nsecond", 0, 28); # Michael Matz <matz(a)suse.de> reported a bug where if make is running in # parallel without -k and two jobs die in a row, but not too close to each # other, then make will quit without waiting for the rest of the jobs to die. run_make_test(" -.PHONY: all fail.1 fail.2 fail.3 ok -all: fail.1 ok fail.2 fail.3 +.PHONY: all fail.3 fail.6 fail.9 ok +all: fail.3 ok fail.6 fail.9 -fail.1 fail.2 fail.3: +fail.3 fail.6 fail.9: \@sleep \$(patsubst fail.%,%,\$\@) \@echo Fail \@exit 1 ok: - \@sleep 4 + \@sleep 12 \@echo Ok done", '-rR -j5', 'Fail -#MAKE#: *** [fail.1] Error 1 +#MAKE#: *** [fail.3] Error 1 #MAKE#: *** Waiting for unfinished jobs.... Fail -#MAKE#: *** [fail.2] Error 1 +#MAKE#: *** [fail.6] Error 1 Fail -#MAKE#: *** [fail.3] Error 1 +#MAKE#: *** [fail.9] Error 1 Ok done', 512); Index: tests/scripts/options/dash-l =================================================================== --- tests/scripts/options/dash-l.orig +++ tests/scripts/options/dash-l @@ -25,7 +25,7 @@ SHELL = /bin/sh define test if [ ! -f test-file ]; then \ - echo >> test-file; sleep 2; rm -f test-file; \ + echo >> test-file; sleep 8; rm -f test-file; \ else \ echo $@ FAILED; \ fi @@ -46,7 +46,7 @@ $mkoptions = "-l 0.0001"; $mkoptions .= " -j 4" if ($parallel_jobs); # We have to wait longer than the default (5s). -&run_make_with_options($makefile, $mkoptions, &get_logfile, 0, 8); +&run_make_with_options($makefile, $mkoptions, &get_logfile, 0, 32); $slurp = &read_file_into_string (&get_logfile(1)); if ($slurp !~ /cannot enforce load limit/) { Index: tests/test_driver.pl =================================================================== --- tests/test_driver.pl.orig +++ tests/test_driver.pl @@ -52,7 +52,7 @@ $test_passed = 1; # Timeout in seconds. If the test takes longer than this we'll fail it. -$test_timeout = 5; +$test_timeout = 20; # Path to Perl $perl_name = $^X; -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit make for openSUSE:12.1:Update
by root＠hilbert.suse.de 26 Mar '13

26 Mar '13

Hello community, here is the log from the commit of package make for openSUSE:12.1:Update checked in at 2013-03-26 17:15:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.1:Update/make (Old) and /work/SRC/openSUSE:12.1:Update/.make.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "make", Maintainer is "" Changes: -------- New Changes file: NO CHANGES FILE!!! New: ---- _link ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ _link ++++++ <link package='make.1471' cicount='copy' /> -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit make.1471 for openSUSE:12.1:Update
by root＠hilbert.suse.de 26 Mar '13

26 Mar '13

Hello community, here is the log from the commit of package make.1471 for openSUSE:12.1:Update checked in at 2013-03-26 17:15:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.1:Update/make.1471 (Old) and /work/SRC/openSUSE:12.1:Update/.make.1471.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "make.1471", Maintainer is "" Changes: -------- New Changes file: --- /dev/null 2013-02-26 18:15:11.936010755 +0100 +++ /work/SRC/openSUSE:12.1:Update/.make.1471.new/make.changes 2013-03-26 17:15:47.000000000 +0100 @@ -0,0 +1,274 @@ +------------------------------------------------------------------- +Wed Mar 20 22:22:57 UTC 2013 - jengelh(a)inai.de + +- Add make-parallel-build.patch from openSUSE:12.3/make + (bnc#810657) + +------------------------------------------------------------------- +Tue Oct 11 22:37:40 CEST 2011 - mhrusecky(a)suse.cz + +- reverting previous change (qemu binfmt was fixed) + +------------------------------------------------------------------- +Fri Sep 30 13:03:23 CEST 2011 - mhrusecky(a)suse.cz + +- using full ar path in tests on arm (fixes build) + +------------------------------------------------------------------- +Tue Apr 19 15:22:27 UTC 2011 - mhopf(a)novell.com + +- make-fix_whitespace_tokenization.diff + Fix Savannah bug #33125 (bnc #681108): + Memory corruption during build of android build system. + +------------------------------------------------------------------- +Tue Sep 7 17:22:32 UTC 2010 - mhopf(a)novell.com + +- make-savannah-bug30612-handling_of_archives.diff + Fix Savannah bug #30612: handling of archive references with >1 object.. + Add oneshell to $(.FEATURES). + Fix the NEWS file to be accurate. +- make-savannah-bug30723-expand_makeflags_before_reexec.diff + Fix Savannah bug #30723: expand MAKEFLAGS before we re-exec after rebuilding + makefiles. + +------------------------------------------------------------------- +Mon Aug 30 17:37:23 UTC 2010 - mhopf(a)novell.com + +- Disable some inherrently broken test cases. + +------------------------------------------------------------------- +Mon Aug 23 13:39:12 UTC 2010 - mhopf(a)novell.com + +- Update to 3.82 + - Bug fixes + - Backwards Incompatibilities: + - Makefiles with .POSIX target: shells called with -e + - $? contains prerequisites even if not existent + - Prerequisite with '=' cannot be backslash escaped any more + (use variable with '=' instead) + - Variable names may not contain whitespaces any more + - Mixture of explicit and pattern targets didn't always fail + - Pattern specific rules application order changed + - Library search behavior now compatible with standard linker + - New features + - --eval=STRING: Evaluate makefile syntax string before makefile + - Variable .RECIPEPREFIX: Exchange TAB character + - Variable .SHELLFLAGS: Options passed to shells + - Target .ONESHELL: Single instance of shell for recipe + - Modifier private: Suppresses inheritance of variables + - Directive undefine: Undefine variable + - Changed features + - Multiple modifiers for variables allowed now. + - Directive define: Allow variable assignment operator. +- Nuke memory-hog-2.diff which didn't apply since 3.81 +- Addapt make-slowdown-parallelism.diff to new parallelization tests +- Separate make checks into %checks section + +------------------------------------------------------------------- +Mon Jun 28 06:38:35 UTC 2010 - jengelh(a)medozas.de + +- use %_smp_mflags + +------------------------------------------------------------------- +Mon May 24 17:16:41 UTC 2010 - coolo(a)novell.com + +- fix test case + +------------------------------------------------------------------- +Fri Jan 8 17:33:04 CET 2010 - ro(a)suse.de + +- enable parallel build + +------------------------------------------------------------------- +Mon May 14 17:46:30 CEST 2007 - coolo(a)suse.de + +- use %find_lang + +------------------------------------------------------------------- +Tue Oct 31 12:48:35 CET 2006 - mhopf(a)suse.de + +- Reducing race probability in test case features/parallelism even more. + +------------------------------------------------------------------- +Wed Jun 7 12:20:28 CEST 2006 - mhopf(a)suse.de + +- Improving occasional build failures due to races in test cases. + +------------------------------------------------------------------- +Mon May 29 14:28:37 CEST 2006 - mhopf(a)suse.de + +- Update to 3.81 + - Bug fixes + - New functions: lastword, abspath, realpath, info, flavor, or, and + - New variables: .INCLUDE_DIRS, .FEATURES, .DEFAULT_GOAL, MAKE_RESTARTS, $| + - Some new features + - More POSIX compatibility +- memory-hog-2.diff doesn't apply any longer + +------------------------------------------------------------------- +Wed Feb 1 20:29:39 CET 2006 - kssingvo(a)suse.de + +- fix for memory-hog.diff (bugzilla#147229) + +------------------------------------------------------------------- +Wed Feb 1 18:15:14 CET 2006 - kssingvo(a)suse.de + +- disabled memory-hog.diff due to crashes (bugzilla#147229) + +------------------------------------------------------------------- +Wed Jan 25 21:30:30 CET 2006 - mls(a)suse.de + +- converted neededforbuild to BuildRequires + +------------------------------------------------------------------- +Thu Jan 19 14:36:00 CET 2006 - aj(a)suse.de + +- Reduce memory usage. + +------------------------------------------------------------------- +Fri Jan 9 16:16:49 CET 2004 - adrian(a)suse.de + +- do not strip binaries during install + +------------------------------------------------------------------- +Tue Sep 30 18:56:18 CEST 2003 - stepan(a)suse.de + +- fix "virtual memory exhausted" bug (backport from mainline) + +------------------------------------------------------------------- +Thu Apr 24 12:20:23 CEST 2003 - ro(a)suse.de + +- fix install_info --delete call and move from preun to postun + +------------------------------------------------------------------- +Wed Apr 16 16:20:30 CEST 2003 - coolo(a)suse.de + +- use BuildRoot + +------------------------------------------------------------------- +Fri Feb 7 02:03:03 CET 2003 - ro(a)suse.de + +- added install_info macros + +------------------------------------------------------------------- +Mon Dec 30 16:57:22 CET 2002 - aj(a)suse.de + +- Update to version 3.80: + - number of bug fixes + - new features as mentioned in the NEWS file: + * New functions $(value ...), $(eval ...) + * New feature: order-only prerequesites. + * Argument to ifdef can now be a variable. + * new option --always-make + +------------------------------------------------------------------- +Tue Sep 17 18:43:14 CEST 2002 - ro(a)suse.de + +- removed bogus self-provides + +------------------------------------------------------------------- +Thu May 23 15:39:17 CEST 2002 - meissner(a)suse.de + +- Made %_lib fix generic, do not use ifarch. + +------------------------------------------------------------------- +Mon Apr 22 14:43:25 CEST 2002 - meissner(a)suse.de + +- x86_64 needs /*/lib64 as search path too. + +------------------------------------------------------------------- +Fri Apr 19 14:55:23 CEST 2002 - ke(a)suse.de + +- Update German translation from + http://www.iro.umontreal.ca/contrib/po/teams/PO/de/ [# 15851]. + +------------------------------------------------------------------- +Tue Dec 11 17:19:45 CET 2001 - froh(a)suse.de + +- s390x, sparc64 and ia64: extended the 'Dynamic Library Search' + default path to search /lib64 and /usr/lib64 as well. + +------------------------------------------------------------------- +Wed Nov 28 18:11:47 CET 2001 - fehr(a)suse.de + +- add mo-files for translations of messages + +------------------------------------------------------------------- ++++ 77 more lines (skipped) ++++ between /dev/null ++++ and /work/SRC/openSUSE:12.1:Update/.make.1471.new/make.changes New: ---- make-3.82.tar.bz2 make-disable-broken-tests.diff make-fix_whitespace_tokenization.diff make-library-search-path.diff make-parallel-build.patch make-savannah-bug30612-handling_of_archives.diff make-savannah-bug30723-expand_makeflags_before_reexec.diff make-slowdown-parallelism.diff make.changes make.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ make.spec ++++++ # # spec file for package make # # Copyright (c) 2013 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 # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # Name: make Url: http://www.gnu.org/software/make/make.html Provides: gmake PreReq: %install_info_prereq Version: 3.82 Release: 0 Summary: GNU make License: GPL-2.0+ Group: Development/Tools/Building 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 Patch7: make-parallel-build.patch Patch64: make-library-search-path.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %description The GNU make command with extensive documentation. %prep %setup %patch2 %patch3 -p1 %patch4 %patch5 %patch6 -p1 %patch -P 7 -p1 if [ %_lib == lib64 ]; then %patch64 fi %build CFLAGS=$RPM_OPT_FLAGS \ ./configure --prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info make %{?_smp_mflags} %check make check %install make DESTDIR=$RPM_BUILD_ROOT install ln -s make $RPM_BUILD_ROOT/usr/bin/gmake %find_lang %name %files -f %name.lang %defattr(-,root,root) /usr/bin/make /usr/bin/gmake %doc /usr/share/info/make.info-*.gz %doc /usr/share/info/make.info.gz %doc /usr/share/man/man1/make.1.gz %clean rm -rf $RPM_BUILD_ROOT %post %install_info --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz %postun %install_info_delete --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz %changelog ++++++ make-disable-broken-tests.diff ++++++ Index: make-3.82/tests/scripts/targets/SECONDARY =================================================================== --- make-3.82.orig/tests/scripts/targets/SECONDARY +++ make-3.82/tests/scripts/targets/SECONDARY @@ -121,69 +121,73 @@ all: version2', unlink('version2'); -# TEST #9 -- Savannah bug #15919 -# The original fix for this bug caused a new bug, shown here. - -touch(qw(1.a 2.a)); - -run_make_test(' -%.c : %.b ; cp $< $@ -%.b : %.a ; cp $< $@ -all : 1.c 2.c', '-rR -j', -'cp 1.a 1.b -cp 2.a 2.b -cp 1.b 1.c -cp 2.b 2.c -rm 1.b 2.b'); - -unlink(qw(1.a 2.a 1.c 2.c)); - -# TEST #10 -- Savannah bug #15919 -touch('test.0'); -run_make_test(' -.SECONDARY : test.1 test.2 test.3 - -test : test.4 - -%.4 : %.int %.3 ; touch $@ - -%.int : %.3 %.2 ; touch $@ - -%.3 : | %.2 ; touch $@ - -%.2 : %.1 ; touch $@ - -%.1 : %.0 ; touch $@', '-rR -j 2', -'touch test.1 -touch test.2 -touch test.3 -touch test.int -touch test.4 -rm test.int'); - -# After a touch of test.0 it should give the same output, except we don't need -# to rebuild test.3 (order-only) -sleep(1); -touch('test.0'); -run_make_test(undef, '-rR -j 2', -'touch test.1 -touch test.2 -touch test.int -touch test.4 -rm test.int'); - -# With both test.0 and test.3 updated it should still build everything except -# test.3 -sleep(1); -touch('test.0', 'test.3'); -run_make_test(undef, '-rR -j 2', -'touch test.1 -touch test.2 -touch test.int -touch test.4 -rm test.int'); - -unlink(qw(test.0 test.1 test.2 test.3 test.4)); +# All these tests don't reliably work under high load conditions. +# Heck, I had two different failures on my workstation, and it's +# perfectly clear that ordering can differ. - mhopf + +# # TEST #9 -- Savannah bug #15919 +# # The original fix for this bug caused a new bug, shown here. +# +# touch(qw(1.a 2.a)); +# +# run_make_test(' +# %.c : %.b ; cp $< $@ +# %.b : %.a ; cp $< $@ +# all : 1.c 2.c', '-rR -j', +# 'cp 1.a 1.b +# cp 2.a 2.b +# cp 1.b 1.c +# cp 2.b 2.c +# rm 1.b 2.b'); +# +# unlink(qw(1.a 2.a 1.c 2.c)); +# +# # TEST #10 -- Savannah bug #15919 +# touch('test.0'); +# run_make_test(' +# .SECONDARY : test.1 test.2 test.3 +# +# test : test.4 +# +# %.4 : %.int %.3 ; touch $@ +# +# %.int : %.3 %.2 ; touch $@ +# +# %.3 : | %.2 ; touch $@ +# +# %.2 : %.1 ; touch $@ +# +# %.1 : %.0 ; touch $@', '-rR -j 2', +# 'touch test.1 +# touch test.2 +# touch test.3 +# touch test.int +# touch test.4 +# rm test.int'); +# +# # After a touch of test.0 it should give the same output, except we don't need +# # to rebuild test.3 (order-only) +# sleep(1); +# touch('test.0'); +# run_make_test(undef, '-rR -j 2', +# 'touch test.1 +# touch test.2 +# touch test.int +# touch test.4 +# rm test.int'); +# +# # With both test.0 and test.3 updated it should still build everything except +# # test.3 +# sleep(1); +# touch('test.0', 'test.3'); +# run_make_test(undef, '-rR -j 2', +# 'touch test.1 +# touch test.2 +# touch test.int +# touch test.4 +# rm test.int'); +# +# unlink(qw(test.0 test.1 test.2 test.3 test.4)); # This tells the test driver that the perl test script executed properly. 1; ++++++ 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 *)); ++++++ make-library-search-path.diff ++++++ make searches for -lmoo targets in /lib and /usr/lib after mangling them with .LIBPATTERNS into libmoo.so This patch extends to teh search path to /lib64/ and /usr/lib64 --- remake.c 2001/12/11 15:59:03 1.1 +++ remake.c 2001/12/11 16:01:01 @@ -1252,6 +1252,8 @@ static char *dirs[] = { #ifndef _AMIGA + "/lib64", + "/usr/lib64", "/lib", "/usr/lib", #endif ++++++ make-parallel-build.patch ++++++ References: http://savannah.gnu.org/bugs/?30653 Upstream: yes; backported to openSUSE (dimstar(a)opensuse.org) diff -u make-3.82-orig/remake.c make-3.82/remake.c --- make-3.82-orig/remake.c 2010-07-13 03:20:42.000000000 +0200 +++ make-3.82/remake.c 2012-03-21 12:47:52.000000000 +0100 @@ -301,7 +301,7 @@ /* Check for the case where a target has been tried and failed but the diagnostics hasn't been issued. If we need the diagnostics then we will have to continue. */ - if (!(f->updated && f->update_status > 0 && !f->dontcare && f->no_diag)) + if (!(f->updated && f->update_status > 0 && !f->dontcare && f->no_diag) && f->command_state!=cs_not_started ) { DBF (DB_VERBOSE, _("Pruning file `%s'.\n")); return f->command_state == cs_finished ? f->update_status : 0; @@ -614,6 +614,12 @@ d->file->dontcare = file->dontcare; } + /* We may have already encountered this file earlier in the same + * pass before we knew we'd be updating this target. In that + * case calling update_file now would result in the file being + * inappropriately pruned so we toggle the considered bit back + * off first. */ + d->file->considered = !considered; dep_status |= update_file (d->file, depth); ++++++ make-savannah-bug30612-handling_of_archives.diff ++++++ Index: ChangeLog =================================================================== RCS file: /sources/make/make/ChangeLog,v retrieving revision 2.419 retrieving revision 2.420 diff -u -p -u -p -r2.419 -r2.420 --- ChangeLog 10 Aug 2010 07:35:34 -0000 2.419 +++ ChangeLog 14 Aug 2010 02:50:14 -0000 2.420 @@ -1,3 +1,17 @@ +2010-08-13 Paul Smith <psmith(a)gnu.org> + + * NEWS: Accidentally forgot to back out the sorted wildcard + enhancement in 3.82, so update NEWS. + Also add NEWS about the error check for explicit and pattern + targets in the same rule, added to 3.82. + + * main.c (main): Add "oneshell" to $(.FEATURES) (forgot to add + this in 3.82!) + + * read.c (parse_file_seq): Fix various errors parsing archives + with multiple objects in the parenthesis, as well as wildcards. + Fixes Savannah bug #30612. + 2010-08-10 Paul Smith <psmith(a)gnu.org> * main.c (main): Expand MAKEFLAGS before adding it to the Index: NEWS =================================================================== RCS file: /sources/make/make/NEWS,v retrieving revision 2.109 retrieving revision 2.110 diff -u -p -u -p -r2.109 -r2.110 --- NEWS 28 Jul 2010 05:39:50 -0000 2.109 +++ NEWS 14 Aug 2010 02:50:14 -0000 2.110 @@ -18,14 +18,6 @@ http://sv.gnu.org/bugs/index.php?group=m * Compiling GNU make now requires a conforming ISO C 1989 compiler and standard runtime library. -* WARNING: Future backward-incompatibility! - Wildcards are not documented as returning sorted values, but up to and - including this release the results have been sorted and some makefiles are - apparently depending on that. In the next release of GNU make, for - performance reasons, we may remove that sorting. If your makefiles - require sorted results from wildcard expansions, use the $(sort ...) - function to request it explicitly. - * WARNING: Backward-incompatibility! The POSIX standard for make was changed in the 2008 version in a fundamentally incompatible way: make is required to invoke the shell as if @@ -42,6 +34,21 @@ http://sv.gnu.org/bugs/index.php?group=m existing targets were provided in $?). * WARNING: Backward-incompatibility! + Wildcards were not documented as returning sorted values, but the results + have been sorted up until this release.. If your makefiles require sorted + results from wildcard expansions, use the $(sort ...) function to request + it explicitly. + +* WARNING: Backward-incompatibility! + In previous versions of make it was acceptable to list one or more explicit + targets followed by one or more pattern targets in the same rule and it + worked "as expected". However, this was not documented as acceptable and if + you listed any explicit targets AFTER the pattern targets, the entire rule + would be mis-parsed. This release removes this ability completely: make + will generate an error message if you mix explicit and pattern targets in + the same rule. + +* WARNING: Backward-incompatibility! As a result of parser enhancements, three backward-compatibility issues exist: first, a prerequisite containing an "=" cannot be escaped with a backslash any longer. You must create a variable containing an "=" and Index: main.c =================================================================== RCS file: /sources/make/make/main.c,v retrieving revision 1.244 retrieving revision 1.245 diff -u -p -u -p -r1.244 -r1.245 --- main.c 10 Aug 2010 07:35:34 -0000 1.244 +++ main.c 14 Aug 2010 02:50:14 -0000 1.245 @@ -1138,7 +1138,7 @@ main (int argc, char **argv, char **envp a macro and some compilers (MSVC) don't like conditionals in macros. */ { const char *features = "target-specific order-only second-expansion" - " else-if shortest-stem undefine" + " else-if shortest-stem undefine oneshell" #ifndef NO_ARCHIVES " archives" #endif Index: read.c =================================================================== RCS file: /sources/make/make/read.c,v retrieving revision 1.193 retrieving revision 1.194 diff -u -p -u -p -r1.193 -r1.194 --- read.c 13 Jul 2010 01:20:42 -0000 1.193 +++ read.c 14 Aug 2010 02:50:14 -0000 1.194 @@ -3028,7 +3028,7 @@ parse_file_seq (char **stringp, unsigned { /* This looks like the first element in an open archive group. A valid group MUST have ')' as the last character. */ - const char *e = p + nlen; + const char *e = p; do { e = next_token (e); @@ -3084,19 +3084,19 @@ parse_file_seq (char **stringp, unsigned Go to the next item in the string. */ if (flags & PARSEFS_NOGLOB) { - NEWELT (concat (2, prefix, tp)); + NEWELT (concat (2, prefix, tmpbuf)); continue; } /* If we get here we know we're doing glob expansion. TP is a string in tmpbuf. NLEN is no longer used. We may need to do more work: after this NAME will be set. */ - name = tp; + name = tmpbuf; /* Expand tilde if applicable. */ - if (tp[0] == '~') + if (tmpbuf[0] == '~') { - tildep = tilde_expand (tp); + tildep = tilde_expand (tmpbuf); if (tildep != 0) name = tildep; } @@ -3152,7 +3152,10 @@ parse_file_seq (char **stringp, unsigned else { /* We got a chain of items. Attach them. */ - (*newp)->next = found; + if (*newp) + (*newp)->next = found; + else + *newp = found; /* Find and set the new end. Massage names if necessary. */ while (1) Index: tests/ChangeLog =================================================================== RCS file: /sources/make/make/tests/ChangeLog,v retrieving revision 1.150 retrieving revision 1.151 diff -u -p -u -p -r1.150 -r1.151 --- tests/ChangeLog 10 Aug 2010 07:35:34 -0000 1.150 +++ tests/ChangeLog 14 Aug 2010 02:50:14 -0000 1.151 @@ -1,3 +1,11 @@ +2010-08-13 Paul Smith <psmith(a)gnu.org> + + * scripts/features/archives: New regression tests for archive + support. Test for fix to Savannah bug #30612. + + * run_make_tests.pl (set_more_defaults): Set a %FEATURES hash to + the features available in $(.FEATURES). + 2010-08-10 Paul Smith <psmith(a)gnu.org> * scripts/features/reinvoke: Ensure command line variable settings Index: tests/run_make_tests.pl =================================================================== RCS file: /sources/make/make/tests/run_make_tests.pl,v retrieving revision 1.32 retrieving revision 1.33 diff -u -p -u -p -r1.32 -r1.33 --- tests/run_make_tests.pl 13 Jul 2010 01:20:43 -0000 1.32 +++ tests/run_make_tests.pl 14 Aug 2010 02:50:14 -0000 1.33 @@ -29,6 +29,7 @@ # You should have received a copy of the GNU General Public License along with # this program. If not, see <http://www.gnu.org/licenses/>. +%FEATURES = (); $valgrind = 0; # invoke make with valgrind $valgrind_args = ''; @@ -367,6 +368,8 @@ sub set_more_defaults $parallel_jobs = 1; } + %FEATURES = map { $_ => 1 } split /\s+/, `sh -c "echo '\\\$(info \\\$(.FEATURES))' | $make_path -f- 2>/dev/null"`; + # Set up for valgrind, if requested. if ($valgrind) { Index: tests/scripts/features/archives =================================================================== RCS file: tests/scripts/features/archives diff -N tests/scripts/features/archives --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ tests/scripts/features/archives 14 Aug 2010 02:50:14 -0000 1.1 @@ -0,0 +1,42 @@ +# -*-mode: perl-*- + +$description = "Test GNU make's archive management features."; + +$details = "\ +This only works on systems that support it."; + +# If this instance of make doesn't support archives, skip it +exists $FEATURES{archives} or return -1; + +# Create some .o files to work with +utouch(-60, qw(a1.o a2.o a3.o)); + +# Very simple +run_make_test('all: libxx.a(a1.o)', + '', "ar rv libxx.a a1.o\nar: creating libxx.a\na - a1.o\n"); + +# Multiple .o's. Add a new one to the existing library +run_make_test('all: libxx.a(a1.o a2.o)', + '', "ar rv libxx.a a2.o\na - a2.o\n"); + +# Touch one of the .o's so it's rebuilt +utouch(-40, 'a1.o'); +run_make_test(undef, '', "ar rv libxx.a a1.o\nr - a1.o\n"); + +# Use wildcards +run_make_test('all: libxx.a(*.o)', + '', "#MAKE#: Nothing to be done for `all'.\n"); + +# Touch one of the .o's so it's rebuilt +utouch(-30, 'a1.o'); +run_make_test(undef, '', "ar rv libxx.a a1.o\nr - a1.o\n"); + +# Use both wildcards and simple names +utouch(-50, 'a2.o'); +run_make_test('all: libxx.a(a3.o *.o)', '', + "ar rv libxx.a a3.o\na - a3.o\nar rv libxx.a a2.o\nr - a2.o\n"); + +rmfiles(qw(a1.o a2.o a3.o libxx.a)); + +# This tells the test driver that the perl test script executed properly. +1; ++++++ make-savannah-bug30723-expand_makeflags_before_reexec.diff ++++++ Index: ChangeLog =================================================================== RCS file: /sources/make/make/ChangeLog,v retrieving revision 2.418 retrieving revision 2.419 diff -u -p -u -p -r2.418 -r2.419 --- ChangeLog 7 Aug 2010 08:55:17 -0000 2.418 +++ ChangeLog 10 Aug 2010 07:35:34 -0000 2.419 @@ -1,3 +1,8 @@ +2010-08-10 Paul Smith <psmith(a)gnu.org> + + * main.c (main): Expand MAKEFLAGS before adding it to the + environment when re-exec'ing. Fixes Savannah bug #30723. + 2010-07-28 Paul Smith <psmith(a)gnu.org> Version 3.82 released. Index: main.c =================================================================== RCS file: /sources/make/make/main.c,v retrieving revision 1.243 retrieving revision 1.244 diff -u -p -u -p -r1.243 -r1.244 --- main.c 19 Jul 2010 07:10:53 -0000 1.243 +++ main.c 10 Aug 2010 07:35:34 -0000 1.244 @@ -2093,7 +2093,7 @@ main (int argc, char **argv, char **envp const char *pv = define_makeflags (1, 1); char *p = alloca (sizeof ("MAKEFLAGS=") + strlen (pv) + 1); sprintf (p, "MAKEFLAGS=%s", pv); - putenv (p); + putenv (allocated_variable_expand (p)); } if (ISDB (DB_BASIC)) Index: tests/ChangeLog =================================================================== RCS file: /sources/make/make/tests/ChangeLog,v retrieving revision 1.149 retrieving revision 1.150 diff -u -p -u -p -r1.149 -r1.150 --- tests/ChangeLog 28 Jul 2010 05:39:50 -0000 1.149 +++ tests/ChangeLog 10 Aug 2010 07:35:34 -0000 1.150 @@ -1,3 +1,8 @@ +2010-08-10 Paul Smith <psmith(a)gnu.org> + + * scripts/features/reinvoke: Ensure command line variable settings + are preserved across make re-exec. Tests Savannah bug #30723. + 2010-07-28 Paul Smith <psmith(a)gnu.org> * scripts/targets/POSIX: Compatibility issues with Solaris (and Index: tests/scripts/features/reinvoke =================================================================== RCS file: /sources/make/make/tests/scripts/features/reinvoke,v retrieving revision 1.7 retrieving revision 1.8 diff -u -p -u -p -r1.7 -r1.8 --- tests/scripts/features/reinvoke 27 Jun 2005 22:18:47 -0000 1.7 +++ tests/scripts/features/reinvoke 10 Aug 2010 07:35:34 -0000 1.8 @@ -57,9 +57,24 @@ include $(F)', # Now try with the file we're not updating being the actual file we're # including: this and the previous one test different parts of the code. -run_make_test(undef, "F=b", "[ -f b ] || echo >> b\nhello\n") +run_make_test(undef, 'F=b', "[ -f b ] || echo >> b\nhello\n") &rmfiles('a','b','c'); +# Ensure command line variables are preserved properly across re-exec +# Tests for Savannah bug #30723 + +run_make_test(' +ifdef RECURSE +-include foo30723 +endif +recurse: ; @$(MAKE) -f $(MAKEFILE_LIST) RECURSE=1 test +test: ; @echo F.O=$(F.O) +foo30723: ; @touch $@ +', + '--no-print-directory F.O=bar', "F.O=bar\n"); + +unlink('foo30723'); + # This tells the test driver that the perl test script executed properly. 1; ++++++ make-slowdown-parallelism.diff ++++++ Index: tests/scripts/features/double_colon =================================================================== --- tests/scripts/features/double_colon.orig +++ tests/scripts/features/double_colon @@ -23,7 +23,7 @@ all: baz foo:: f1.h ; @echo foo FIRST foo:: f2.h ; @echo foo SECOND -bar:: ; @echo aaa; sleep 1; echo aaa done +bar:: ; @echo aaa; sleep 4; echo aaa done bar:: ; @echo bbb baz:: ; @echo aaa Index: tests/scripts/features/parallelism =================================================================== --- tests/scripts/features/parallelism.orig +++ tests/scripts/features/parallelism @@ -27,9 +27,9 @@ else { run_make_test(" all : def_1 def_2 def_3 -def_1 : ; \@echo ONE; $sleep_command 3 ; echo TWO -def_2 : ; \@$sleep_command 2 ; echo THREE -def_3 : ; \@$sleep_command 1 ; echo FOUR", +def_1 : ; \@echo ONE; $sleep_command 12 ; echo TWO +def_2 : ; \@$sleep_command 8 ; echo THREE +def_3 : ; \@$sleep_command 4 ; echo FOUR", '-j4', "ONE\nFOUR\nTHREE\nTWO"); # Test parallelism with included files. Here we sleep/echo while @@ -38,8 +38,8 @@ def_3 : ; \@$sleep_command 1 ; echo FOUR run_make_test(" all: 1 2; \@echo success -include 1.inc 2.inc -1.inc: ; \@echo ONE.inc; $sleep_command 2; echo TWO.inc; echo '1: ; \@echo ONE; $sleep_command 2; echo TWO' > \$\@ -2.inc: ; \@$sleep_command 1; echo THREE.inc; echo '2: ; \@$sleep_command 1; echo THREE' > \$\@", +1.inc: ; \@echo ONE.inc; $sleep_command 8; echo TWO.inc; echo '1: ; \@echo ONE; $sleep_command 8; echo TWO' > \$\@ +2.inc: ; \@$sleep_command 4; echo THREE.inc; echo '2: ; \@$sleep_command 4; echo THREE' > \$\@", "-j4", "ONE.inc\nTHREE.inc\nTWO.inc\nONE\nTHREE\nTWO\nsuccess\n"); @@ -57,8 +57,8 @@ ifeq (\$(INC),yes) -include 1.inc 2.inc endif -1.inc: ; \@echo ONE.inc; $sleep_command 2; echo TWO.inc; echo '1: ; \@echo ONE; $sleep_command 2; echo TWO' > \$\@ -2.inc: ; \@$sleep_command 1; echo THREE.inc; echo '2: ; \@$sleep_command 1; echo THREE' > \$\@", +1.inc: ; \@echo ONE.inc; $sleep_command 8; echo TWO.inc; echo '1: ; \@echo ONE; $sleep_command 8; echo TWO' > \$\@ +2.inc: ; \@$sleep_command 4; echo THREE.inc; echo '2: ; \@$sleep_command 4; echo THREE' > \$\@", "-j4", "ONE.inc\nTHREE.inc\nTWO.inc\nONE\nTHREE\nTWO\nsuccess\n"); @@ -74,37 +74,37 @@ rmfiles(qw(1.inc 2.inc)); run_make_test(" export HI = \$(shell \$(\$\@.CMD)) first.CMD = echo hi -second.CMD = $sleep_command 4; echo hi +second.CMD = $sleep_command 16; echo hi .PHONY: all first second all: first second -first second: ; \@echo \$\@; $sleep_command 1; echo \$\@", - '-j2', "first\nfirst\nsecond\nsecond", 0, 7); +first second: ; \@echo \$\@; $sleep_command 4; echo \$\@", + '-j2', "first\nfirst\nsecond\nsecond", 0, 28); # Michael Matz <matz(a)suse.de> reported a bug where if make is running in # parallel without -k and two jobs die in a row, but not too close to each # other, then make will quit without waiting for the rest of the jobs to die. run_make_test(" -.PHONY: all fail.1 fail.2 fail.3 ok -all: fail.1 ok fail.2 fail.3 +.PHONY: all fail.3 fail.6 fail.9 ok +all: fail.3 ok fail.6 fail.9 -fail.1 fail.2 fail.3: +fail.3 fail.6 fail.9: \@sleep \$(patsubst fail.%,%,\$\@) \@echo Fail \@exit 1 ok: - \@sleep 4 + \@sleep 12 \@echo Ok done", '-rR -j5', 'Fail -#MAKE#: *** [fail.1] Error 1 +#MAKE#: *** [fail.3] Error 1 #MAKE#: *** Waiting for unfinished jobs.... Fail -#MAKE#: *** [fail.2] Error 1 +#MAKE#: *** [fail.6] Error 1 Fail -#MAKE#: *** [fail.3] Error 1 +#MAKE#: *** [fail.9] Error 1 Ok done', 512); Index: tests/scripts/options/dash-l =================================================================== --- tests/scripts/options/dash-l.orig +++ tests/scripts/options/dash-l @@ -25,7 +25,7 @@ SHELL = /bin/sh define test if [ ! -f test-file ]; then \ - echo >> test-file; sleep 2; rm -f test-file; \ + echo >> test-file; sleep 8; rm -f test-file; \ else \ echo $@ FAILED; \ fi @@ -46,7 +46,7 @@ $mkoptions = "-l 0.0001"; $mkoptions .= " -j 4" if ($parallel_jobs); # We have to wait longer than the default (5s). -&run_make_with_options($makefile, $mkoptions, &get_logfile, 0, 8); +&run_make_with_options($makefile, $mkoptions, &get_logfile, 0, 32); $slurp = &read_file_into_string (&get_logfile(1)); if ($slurp !~ /cannot enforce load limit/) { Index: tests/test_driver.pl =================================================================== --- tests/test_driver.pl.orig +++ tests/test_driver.pl @@ -52,7 +52,7 @@ $test_passed = 1; # Timeout in seconds. If the test takes longer than this we'll fail it. -$test_timeout = 5; +$test_timeout = 20; # Path to Perl $perl_name = $^X; -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit patchinfo.1468 for openSUSE:12.3:Update
by root＠hilbert.suse.de 26 Mar '13

26 Mar '13

Hello community, here is the log from the commit of package patchinfo.1468 for openSUSE:12.3:Update checked in at 2013-03-26 17:11:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.3:Update/patchinfo.1468 (Old) and /work/SRC/openSUSE:12.3:Update/.patchinfo.1468.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "patchinfo.1468", Maintainer is "" Changes: -------- New Changes file: NO CHANGES FILE!!! New: ---- _patchinfo ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ _patchinfo ++++++ <patchinfo> <packager>keichwa</packager> <category>recommended</category> <rating>moderate</rating> <summary>release-notes-openSUSE: Update to 12.3.7</summary> <description>This update fixes the following issues for release-notes-openSUSE: - Enable 'ar' again (but for HTML only) - New entries: The proprietary NVIDIA driver requires users to have access to /dev/nvidia* devices (bnc#809163) - Updated translations</description> <issue tracker="bnc" id="809163">Default and new users no longer been added to 'video' group</issue> </patchinfo> -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit release-notes-openSUSE for openSUSE:12.3:Update
by root＠hilbert.suse.de 26 Mar '13

26 Mar '13

Hello community, here is the log from the commit of package release-notes-openSUSE for openSUSE:12.3:Update checked in at 2013-03-26 17:11:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.3:Update/release-notes-openSUSE (Old) and /work/SRC/openSUSE:12.3:Update/.release-notes-openSUSE.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "release-notes-openSUSE", Maintainer is "ke(a)suse.com" Changes: -------- New Changes file: NO CHANGES FILE!!! ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ _link ++++++ --- /var/tmp/diff_new_pack.kH5H2x/_old 2013-03-26 17:11:43.000000000 +0100 +++ /var/tmp/diff_new_pack.kH5H2x/_new 2013-03-26 17:11:43.000000000 +0100 @@ -1 +1 @@ -<link package='release-notes-openSUSE.1438' cicount='copy' /> +<link package='release-notes-openSUSE.1468' cicount='copy' /> -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libyui-ncurses for openSUSE:Factory
by root＠hilbert.suse.de 26 Mar '13

26 Mar '13

Hello community, here is the log from the commit of package libyui-ncurses for openSUSE:Factory checked in at 2013-03-26 16:13:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libyui-ncurses (Old) and /work/SRC/openSUSE:Factory/.libyui-ncurses.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libyui-ncurses", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/libyui-ncurses/libyui-ncurses.changes 2013-02-21 15:04:10.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libyui-ncurses.new/libyui-ncurses.changes 2013-03-26 16:13:17.000000000 +0100 @@ -1,0 +2,7 @@ +Tue Mar 26 14:39:09 CET 2013 - gs(a)suse.de + +- NCCheckBoxFrame: handle option `invertAutoEnable correctly, + (bug-fix for authentication problem in iscsi-client bnc #805407) +- V 2.43.4 + +------------------------------------------------------------------- Old: ---- libyui-ncurses-2.43.3.tar.bz2 New: ---- libyui-ncurses-2.43.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libyui-ncurses-doc.spec ++++++ --- /var/tmp/diff_new_pack.o7rjaM/_old 2013-03-26 16:13:18.000000000 +0100 +++ /var/tmp/diff_new_pack.o7rjaM/_new 2013-03-26 16:13:18.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package libyui-ncurses (Version 2.43.3) +# spec file for package libyui-ncurses (Version 2.43.4) # # Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -16,7 +16,7 @@ # Name: libyui-ncurses-doc -Version: 2.43.3 +Version: 2.43.4 Release: 0 License: LGPL-2.1 or LGPL-3.0 Source: libyui-ncurses-%{version}.tar.bz2 ++++++ libyui-ncurses.spec ++++++ --- /var/tmp/diff_new_pack.o7rjaM/_old 2013-03-26 16:13:18.000000000 +0100 +++ /var/tmp/diff_new_pack.o7rjaM/_new 2013-03-26 16:13:18.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package libyui-ncurses (Version 2.43.3) +# spec file for package libyui-ncurses (Version 2.43.4) # # Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -17,7 +17,7 @@ # norootforbuild Name: libyui-ncurses -Version: 2.43.3 +Version: 2.43.4 Release: 0 License: LGPL-2.1 or LGPL-3.0 Source: libyui-ncurses-%{version}.tar.bz2 ++++++ libyui-ncurses-2.43.3.tar.bz2 -> libyui-ncurses-2.43.4.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-ncurses-2.43.3/ChangeLog new/libyui-ncurses-2.43.4/ChangeLog --- old/libyui-ncurses-2.43.3/ChangeLog 2013-02-21 09:43:20.000000000 +0100 +++ new/libyui-ncurses-2.43.4/ChangeLog 2013-03-26 14:43:20.000000000 +0100 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Tue Mar 26 14:39:09 CET 2013 - gs(a)suse.de + +- NCCheckBoxFrame: handle option `invertAutoEnable correctly, + (bug-fix for authentication problem in iscsi-client bnc #805407) +- V 2.43.4 + +------------------------------------------------------------------- Thu Feb 21 09:32:10 CET 2013 - gs(a)suse.de - NCRichText: bug-fix for text in <pre> tags, patch description is diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-ncurses-2.43.3/VERSION.cmake new/libyui-ncurses-2.43.4/VERSION.cmake --- old/libyui-ncurses-2.43.3/VERSION.cmake 2013-02-21 09:43:20.000000000 +0100 +++ new/libyui-ncurses-2.43.4/VERSION.cmake 2013-03-26 14:43:20.000000000 +0100 @@ -1,6 +1,6 @@ SET( VERSION_MAJOR "2" ) SET( VERSION_MINOR "43" ) -SET( VERSION_PATCH "3" ) +SET( VERSION_PATCH "4" ) SET( VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}${GIT_SHA1_VERSION}" ) ##### This is need for the libyui core, ONLY. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-ncurses-2.43.3/src/NCCheckBoxFrame.cc new/libyui-ncurses-2.43.4/src/NCCheckBoxFrame.cc --- old/libyui-ncurses-2.43.3/src/NCCheckBoxFrame.cc 2013-02-21 09:43:20.000000000 +0100 +++ new/libyui-ncurses-2.43.4/src/NCCheckBoxFrame.cc 2013-03-26 14:43:20.000000000 +0100 @@ -41,12 +41,9 @@ setLabel( YCheckBoxFrame::label() ); hotlabel = &label; - if ( invertAutoEnable() ) - setValue( !checked ); - else - setValue( checked ); + setValue( checked ); - // setEnabled() is called in wRedraw() + // setEnabled( getValue() ); is called in wRedraw() } @@ -112,9 +109,15 @@ { enabled = frame->getValue(); + // invert value if required + if ( frame->invertAutoEnable() ) + enabled = !enabled; + + // despite of frame->getValue(), don't enable child widgets if state + // of frame is NC::WSdisabeled if ( frame->GetState() == NC::WSdisabeled ) enabled = false; - + break; } } @@ -125,7 +128,7 @@ { YWidget::setEnabled( do_bv ); bool do_it = do_bv; - + for ( tnode<NCWidget*> * c = this->Next(); c && c->IsDescendantOf( this ); c = c->Next() ) @@ -180,20 +183,10 @@ win->bkgdset( style.plain ); win->printw( 0, 1, "[ ] " ); - if ( !invertAutoEnable() ) - { - if ( getValue() ) - win->printw( 0, 2, "%c", 'x' ); - else - win->printw( 0, 2, "%c", ' ' ); - } + if ( getValue() ) + win->printw( 0, 2, "%c", 'x' ); else - { - if ( getValue() ) - win->printw( 0, 2, "%c", ' ' ); - else - win->printw( 0, 2, "%c", 'x' ); - } + win->printw( 0, 2, "%c", ' ' ); if ( autoEnable() ) setEnabled( getValue() ); -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit haveged for openSUSE:Factory
by root＠hilbert.suse.de 26 Mar '13

26 Mar '13

Hello community, here is the log from the commit of package haveged for openSUSE:Factory checked in at 2013-03-26 16:13:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/haveged (Old) and /work/SRC/openSUSE:Factory/.haveged.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "haveged", Maintainer is "MVyskocil(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/haveged/haveged.changes 2013-02-08 07:09:30.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.haveged.new/haveged.changes 2013-03-26 16:13:11.000000000 +0100 @@ -1,0 +2,12 @@ +Tue Mar 26 14:19:46 UTC 2013 - mvyskocil(a)suse.com + +- add autoconf to BuildRequires +- explain the need for autoreconf +- tag haveged-ppc.patch + +------------------------------------------------------------------- +Wed Mar 20 23:28:42 UTC 2013 - crrodriguez(a)opensuse.org + +- Remove all sysvinit compatibility. + +------------------------------------------------------------------- Old: ---- haveged.init ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ haveged.spec ++++++ --- /var/tmp/diff_new_pack.okx2V3/_old 2013-03-26 16:13:12.000000000 +0100 +++ /var/tmp/diff_new_pack.okx2V3/_new 2013-03-26 16:13:12.000000000 +0100 @@ -24,23 +24,15 @@ Group: System/Daemons Url: http://www.issihosts.com/haveged/ Source0: http://www.issihosts.com/haveged/%{name}-%{version}.tar.gz -Source1: %{name}.init Source2: %{name}.service +#PATCH-FIX-OPENSUSE: mvyskocil: sent upstream Patch0: haveged-ppc.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: automake -Requires(pre): %insserv_prereq -%if 0%{suse_version} >= 1140 -Requires(pre): sysvinit(syslog) -%endif -Requires(post): grep util-linux Enhances: openssl gpg2 php5 apache2 openvpn smtp_daemon -%{!?_initddir: %global _initddir /etc/init.d} -%if 0%{?suse_version} > 1140 -BuildRequires: systemd +BuildRequires: autoconf +BuildRequires: libtool +BuildRequires: pkgconfig(systemd) %{?systemd_requires} -%define have_systemd 1 -%endif %description The haveged daemon feeds the linux entropy pool with random @@ -72,12 +64,11 @@ %patch0 -p1 %build -%if 0%{?suse_version} < 1220 +# mvyskocil: needed because of haveged-ppc.patch autoreconf -fiv -%endif export CFLAGS="%optflags -fpie" export LDFLAGS="-Wl,-z,relro,-z,now -pie" -%configure \ +%configure --disable-static \ --enable-nistest=yes \ --enable-daemon=yes \ --enable-clock_gettime=yes @@ -97,42 +88,23 @@ %install %makeinstall -%{__install} -D -m0755 %{S:1} %{buildroot}%{_initddir}/%{name} -%{__mkdir_p} %{buildroot}%{_sbindir} -%{__ln_s} -f %{_sysconfdir}/init.d/%{name} %{buildroot}%{_sbindir}/rc%{name} - -%if 0%{?have_systemd} %{__install} -D -m0644 %{S:2} %{buildroot}%{_unitdir}/%{name}.service -%endif %{__rm} -f %{buildroot}%{_libdir}/libhavege.*a %clean %{?buildroot:%__rm -rf "%{buildroot}"} %post -# do not enable on condition here, let YAST, kiwi or the user do it. -%{fillup_and_insserv -f %{name}} -%if 0%{?have_systemd} %service_add_post %{name}.service -%endif %postun -%restart_on_update %{name} -%{insserv_cleanup} -%if 0%{?have_systemd} %service_del_postun %{name}.service -%endif %pre -%if 0%{?have_systemd} %service_add_pre %{name}.service -%endif %preun -%stop_on_removal %{name} -%if 0%{?have_systemd} %service_del_preun %{name}.service -%endif %post -n libhavege1 -p /sbin/ldconfig @@ -141,13 +113,9 @@ %files %defattr(-,root,root) %doc COPYING -%{_sbindir}/rc%{name} %{_sbindir}/%{name} -%config %{_initddir}/%{name} %doc %{_mandir}/man8/%{name}.8* -%if 0%{?have_systemd} %{_unitdir}/%{name}.service -%endif %files devel %doc COPYING -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit fastjar for openSUSE:Factory
by root＠hilbert.suse.de 26 Mar '13

26 Mar '13

Hello community, here is the log from the commit of package fastjar for openSUSE:Factory checked in at 2013-03-26 16:13:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/fastjar (Old) and /work/SRC/openSUSE:Factory/.fastjar.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "fastjar", Maintainer is "bnc-team-java(a)forge.provo.novell.com" Changes: -------- --- /work/SRC/openSUSE:Factory/fastjar/fastjar.changes 2011-09-23 01:57:23.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.fastjar.new/fastjar.changes 2013-03-26 16:13:02.000000000 +0100 @@ -1,0 +2,6 @@ +Tue Mar 26 13:15:44 UTC 2013 - mmeister(a)suse.com + +- Added url as source. + Please see http://en.opensuse.org/SourceUrls + +------------------------------------------------------------------- Old: ---- fastjar-0.98.tar.bz2 New: ---- fastjar-0.98.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ fastjar.spec ++++++ --- /var/tmp/diff_new_pack.L0m7gt/_old 2013-03-26 16:13:03.000000000 +0100 +++ /var/tmp/diff_new_pack.L0m7gt/_new 2013-03-26 16:13:03.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package fastjar (Version 0.98) +# spec file for package fastjar # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 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 @@ -15,17 +15,18 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: fastjar BuildRequires: zlib-devel -License: GPL-2.0+ -Group: Development/Languages/Java Provides: libgcj:/usr/bin/fastjar PreReq: %install_info_prereq Version: 0.98 -Release: 2 +Release: 0 Summary: The fastjar Java package archiver +License: GPL-2.0+ +Group: Development/Languages/Java Url: http://savannah.nongnu.org/projects/fastjar/ -Source: fastjar-%{version}.tar.bz2 +Source: http://download.savannah.gnu.org/releases/%{name}/%{name}-%{version}.tar.gz Patch0: fastjar-0.98-fix.patch Patch1: fastjar-0.98-directory-traversal.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0