December 2006 - openSUSE Commits - openSUSE Mailing Lists

commit m4
by root＠suse.de 06 Dec '06

06 Dec '06

Hello community, here is the log from the commit of package m4 checked in at Wed Dec 6 12:03:03 CET 2006. -------- --- m4/m4.changes 2006-08-26 09:21:14.000000000 +0200 +++ /mounts/work_src_done/STABLE/m4/m4.changes 2006-12-04 11:13:33.000000000 +0100 @@ -1,0 +2,86 @@ +Mon Dec 4 11:13:03 CET 2006 - schwab(a)suse.de + +- Update to m4 1.4.8. + * The `divert' macro and `-H'/`--hashsize' command line option no longer + cause a core dump when handed extra large values. Also, `divert' now + uses memory proportional to the number of diversions in use, rather than + to the maximum diversion number encountered, so that large diversion + numbers are less likely to exhaust system memory; and is no longer + limited by the maximum number of file descriptors. + * The `--help' and `--version' command line options now consistently + override all earlier options. For example, `m4 --debugfile=trace + --help' now no longer accidentally creates an empty file `trace'. + * The `-L'/`--nesting-limit' command line option can now be set to 0 + to remove the default limit of 1024. However, it is still possible that + heavily nested input can cause abrupt program termination due to stack + overflow. + * Problems encountered when writing to standard error, such as with the + `errprint' macro, now always cause a non-zero exit status. + * Warnings and errors issued during macro expansion are now consistently + reported at the line where the macro name was detected, rather than + where the close parenthesis resides. Text wrapped by `m4wrap' now + remembers the location that was in effect when m4wrap was invoked, + rather than changing to line 0 and the empty string for a file. The + macros `__line__' and `__file__' now work correctly even as the last + token in an included file. + * The `builtin' and `indir' macros now transparently handle builtin + tokens generated by `defn'. + * When diversions created by the `divert' macro collect enough text that + M4 must use temporary files, the environment variable $TMPDIR is now + consulted, and a better effort is made to clean up those files in the + event of a fatal signal. + * The `mkstemp' builtin is added with the same GNU semantics as `maketemp', + based on the recommendation of POSIX to deprecate the POSIX semantics of + `maketemp' as inherently insecure. In GNU mode (no -G supplied on the + command line), `maketemp' silently retains the secure GNU semantics, but + a future release of M4 will change this to emit a warning. In + traditional mode (m4 -G), `maketemp' now uses the POSIX-mandated insecure + semantics, and issues a warning that you should convert your script to + use `mkstemp' instead. Additionally, `mkstemp' and `maketemp' are now + well-defined even if the template argument does not end in six `X' + characters. + * The manual has been improved, including a new section on a composite + macro `foreach'. + * The `changecom' and `changequote' macros now treat an empty second + argument the same as if it were missing, rather than using the empty + string and making it impossible to end a comment or quote. + * The `translit' macro now operates in linear instead of quadratic time, + and is now eight-bit clean. + * The `-D', `-U', `-s', and `-t' command line options now take effect + after any files encountered earlier on the command line, rather than up + front, as is done in traditional implementations and required by POSIX. + +------------------------------------------------------------------- +Mon Sep 25 15:39:25 CEST 2006 - schwab(a)suse.de + +- Update to m4 1.4.6. + * Fix regression from 1.4.5 in handling a file that ends in a macro + expansion without arguments instead of a newline. + * The define and pushdef macros now warn when the first argument is not + a string, rather than silently doing nothing. + * Standard input can now be read more than once, as in 'm4 - file -', and + is not closed until all wrapped text is handled. This makes a + difference when stdin is not a regular file, and also fixes bugs when + using the syscmd or esyscmd macros from wrapped text. + * When standard input is a seekable file, the m4exit, syscmd, and esyscmd + macros now restore the current position to the next unread byte rather + than discarding an arbitrary amount of buffered data. + * SysV command-line compatibility is no longer a goal of GNU M4; the + focus will be instead on POSIX compatibility. This release continues to + support previous usage, but adds warnings in areas which will allow a + future version of GNU M4 to use its own extensions without being tied to + the SysV command line interface. + * The no-op compatibility command line options -B, -N, -S, -T, and + --diversions may be withdrawn or assigned new meanings in future + releases, so they now issue a warning if used. + * A new command line option -i replaces the compatibility -e as the + short spelling of --interactive, for consistency with other GNU tools; a + warning is issued if the old spelling is used, and it may be assigned new + meaning in future releases. + * A new command line option --debugfile replaces the options -o and + --error-output as the preferred spelling. The old options were + misleading in their names and inconsistent with other GNU tools; they are + still silently accepted, but no longer documented in --help, and may be + assigned new meanings in future releases. + +------------------------------------------------------------------- @@ -5,35 +91,35 @@ -* Fix buffer overruns in regexp and patsubst macros when handed a trailing - backslash in the replacement text, or when handling \n substitutions - beyond the number of  groups. -* Fix memory leak in regexp, patsubst, and changeword macros. -* The format macro now understands %F, %g, and %G. -* When loading frozen files, m4 now exits with status 63 if version - mismatch is detected. -* Fix bugs that occurred when invoked with stdout or stderr closed, - and detect write failures to stdout or to the target of the - debugfile macro. In particular, the syscmd and esyscmd macros can - no longer interfere with the debug stream or diversions. -* The m4exit macro now converts values outside the range 0-255 to 1. -* It is now an error if a command-line input file ends in the middle of a - comment, matching the behavior of mid-string and mid-argument - collection. -* The dnl macro now warns if end of file is encountered instead of a - newline. -* The error message when end of file is encountered now uses the file and - line where the dangling construct started, rather than `NONE:0:'. -* The debugmode and __file__ macros, and the -s/--synclines option, now - show what directory a file was found in when the -I/--include option or - M4PATH variable had an effect. -* The changequote and changecom macros now work with 8-bit characters, and - quotes and comments that begin with `(' are properly recognized - following a word. -* The new macro __program__ is added, which allows the input file to issue - an error message that resembles messages from m4. Warning and error - messages have been reformatted to comply with GNU Coding Standards. -* The errprint, m4wrap, and shift macros are now recognized only with - arguments. -* The index, substr, translit, regexp, and patsubst macros now produce - output when given only one argument, but still warn about a missing - second argument. -* The patsubst macro now reliably finds zero-length matches at the end - of a string. + * Fix buffer overruns in regexp and patsubst macros when handed a trailing + backslash in the replacement text, or when handling \n substitutions + beyond the number of  groups. + * Fix memory leak in regexp, patsubst, and changeword macros. + * The format macro now understands %F, %g, and %G. + * When loading frozen files, m4 now exits with status 63 if version + mismatch is detected. + * Fix bugs that occurred when invoked with stdout or stderr closed, + and detect write failures to stdout or to the target of the + debugfile macro. In particular, the syscmd and esyscmd macros can + no longer interfere with the debug stream or diversions. + * The m4exit macro now converts values outside the range 0-255 to 1. + * It is now an error if a command-line input file ends in the middle of a + comment, matching the behavior of mid-string and mid-argument + collection. + * The dnl macro now warns if end of file is encountered instead of a + newline. + * The error message when end of file is encountered now uses the file and + line where the dangling construct started, rather than `NONE:0:'. + * The debugmode and __file__ macros, and the -s/--synclines option, now + show what directory a file was found in when the -I/--include option or + M4PATH variable had an effect. + * The changequote and changecom macros now work with 8-bit characters, and + quotes and comments that begin with `(' are properly recognized + following a word. + * The new macro __program__ is added, which allows the input file to issue + an error message that resembles messages from m4. Warning and error + messages have been reformatted to comply with GNU Coding Standards. + * The errprint, m4wrap, and shift macros are now recognized only with + arguments. + * The index, substr, translit, regexp, and patsubst macros now produce + output when given only one argument, but still warn about a missing + second argument. + * The patsubst macro now reliably finds zero-length matches at the end + of a string. @@ -45,65 +131,65 @@ -* Fix sysval on BeOS, OS/2, and other systems that store exit status - in the low-order byte. Additionally, on Unix platforms, if syscmd was - terminated by a signal, sysval now displays the signal number shifted - left by eight bits, to match traditional m4 implementations. -* The maketemp macro is no longer subject to platform limitations (such as - 26 or 32 max files from a given template). -* Frozen files now require that the first directive be V (version), to - better diagnose version mismatch. Additionally, if the F directive - (builtin function) names an unknown builtin that existed in the m4 that - froze the file but not in the current m4 (for example, changeword), the - warning is deferred until an attempt is made to actually use the - builtin. This allows downgrading from beta m4-1.4o to stable m4-1.4.5 - without breaking autoconf. -* The format and indir macros are now recognized only with arguments. -* The eval macro no longer crashes on x86 architectures when dividing the - minimum integer by -1. -* On systems with ecvt and fcvt, format no longer truncates trailing - zeroes on integers printed with %.0f. On systems without these - functions, format is no longer subject to a buffer overflow that - permitted arbitrary code execution. -* On native Windows builds, the macro __windows__ is provided instead of - __unix__. Likewise, on OS/2 builds, the macro __os2__ is provided. This - allows input files to determine when syscmd might behave differently. -* Fix bug in 1.4.3 patch to use \n line-endings that did not work for - cygwin. -* When given the empty string or 0, undivert is now documented as a no-op - rather than closing stdout, warning about a non-existent file, or trying - to read a directory as a file. -* Many documentation improvements. Also, the manual is now distributed - under FDL 1.2, rather than a stricter verbatim-only license. -* Raise the -L (--nesting-limit) command line option limit from 250 to - 1024. -* The decr, incr, divert, m4exit, and substr macros treat an empty number - as 0, issue a warning, and expand as normal; rather than issuing an error - and expanding to the empty string. -* The eval macro now treats an empty radix argument as 10, handles radix 1, - and treats the width argument as number of digits excluding the sign, - for compatibility with other m4 implementations. -* The ifdef, divert, m4exit, substr, and translit macros now correctly - ignore extra arguments. -* The popdef and undefine macros now correctly accept multiple arguments. -* Although changeword is on its last leg, if enabled, it now reverts to the - default (faster) regexp when passed the empty string. -* The regexp and substr macros now warn and ignore a trailing backslash in - the replacement, and warn on \n for n larger than the number of - sub-expressions in the regexp. -* Fix a recursive push_string crashing bug, which affected changequote of - three or more characters on some compilers. -* Use automake to fix build portability issues. -* Fix a recursive m4wrap crashing bug. -* Fix a 1 in 2**32 hash crashing bug. -* Tracing a macro by name is now persistent, even if the macro is - subsequently undefined or redefined. The traceon and traceoff macros no - longer warn about undefined symbols. This solves a crash when using - indir on an undefined macro traced with the -t option, as well as an - incorrect result of ifdef. Furthermore, tracing is no longer transferred - with builtins, solving the bug of "m4 -tm4_eval" failing to give trace - output on the input "define(`m4_eval',defn(`eval'))m4_eval(1)". -* Fix a crash when a macro is undefined while collecting its arguments, by - always using the definition that was in effect before argument - collection. This behavior matches the C pre-processor, and means that - the sequence "define(`f',`1')f(define(`f',`2'))f" is now documented to - result in "12", rather than the previously undocumented "22". -* Update the regex engine to fix several bugs. -* Fix a potential crash on machines where char is signed. + * Fix sysval on BeOS, OS/2, and other systems that store exit status + in the low-order byte. Additionally, on Unix platforms, if syscmd was + terminated by a signal, sysval now displays the signal number shifted + left by eight bits, to match traditional m4 implementations. + * The maketemp macro is no longer subject to platform limitations (such as + 26 or 32 max files from a given template). + * Frozen files now require that the first directive be V (version), to + better diagnose version mismatch. Additionally, if the F directive + (builtin function) names an unknown builtin that existed in the m4 that + froze the file but not in the current m4 (for example, changeword), the + warning is deferred until an attempt is made to actually use the + builtin. This allows downgrading from beta m4-1.4o to stable m4-1.4.5 + without breaking autoconf. + * The format and indir macros are now recognized only with arguments. + * The eval macro no longer crashes on x86 architectures when dividing the + minimum integer by -1. + * On systems with ecvt and fcvt, format no longer truncates trailing + zeroes on integers printed with %.0f. On systems without these + functions, format is no longer subject to a buffer overflow that + permitted arbitrary code execution. + * On native Windows builds, the macro __windows__ is provided instead of + __unix__. Likewise, on OS/2 builds, the macro __os2__ is provided. This + allows input files to determine when syscmd might behave differently. + * Fix bug in 1.4.3 patch to use \n line-endings that did not work for + cygwin. + * When given the empty string or 0, undivert is now documented as a no-op + rather than closing stdout, warning about a non-existent file, or trying + to read a directory as a file. + * Many documentation improvements. Also, the manual is now distributed + under FDL 1.2, rather than a stricter verbatim-only license. + * Raise the -L (--nesting-limit) command line option limit from 250 to + 1024. + * The decr, incr, divert, m4exit, and substr macros treat an empty number + as 0, issue a warning, and expand as normal; rather than issuing an error + and expanding to the empty string. + * The eval macro now treats an empty radix argument as 10, handles radix 1, + and treats the width argument as number of digits excluding the sign, + for compatibility with other m4 implementations. + * The ifdef, divert, m4exit, substr, and translit macros now correctly + ignore extra arguments. + * The popdef and undefine macros now correctly accept multiple arguments. + * Although changeword is on its last leg, if enabled, it now reverts to the + default (faster) regexp when passed the empty string. + * The regexp and substr macros now warn and ignore a trailing backslash in + the replacement, and warn on \n for n larger than the number of + sub-expressions in the regexp. + * Fix a recursive push_string crashing bug, which affected changequote of + three or more characters on some compilers. + * Use automake to fix build portability issues. + * Fix a recursive m4wrap crashing bug. + * Fix a 1 in 2**32 hash crashing bug. + * Tracing a macro by name is now persistent, even if the macro is + subsequently undefined or redefined. The traceon and traceoff macros no + longer warn about undefined symbols. This solves a crash when using + indir on an undefined macro traced with the -t option, as well as an + incorrect result of ifdef. Furthermore, tracing is no longer transferred + with builtins, solving the bug of "m4 -tm4_eval" failing to give trace + output on the input "define(`m4_eval',defn(`eval'))m4_eval(1)". + * Fix a crash when a macro is undefined while collecting its arguments, by + always using the definition that was in effect before argument + collection. This behavior matches the C pre-processor, and means that + the sequence "define(`f',`1')f(define(`f',`2'))f" is now documented to + result in "12", rather than the previously undocumented "22". + * Update the regex engine to fix several bugs. + * Fix a potential crash on machines where char is signed. Old: ---- m4-1.4.6.tar.bz2 New: ---- m4-1.4.8.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ m4.spec ++++++ --- /var/tmp/diff_new_pack.YO0UPf/_old 2006-12-06 12:02:43.000000000 +0100 +++ /var/tmp/diff_new_pack.YO0UPf/_new 2006-12-06 12:02:43.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package m4 (Version 1.4.6) +# spec file for package m4 (Version 1.4.8) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,17 +11,16 @@ # norootforbuild Name: m4 -License: GPL +License: GNU General Public License (GPL) Group: Development/Languages/Other Provides: base:/usr/bin/m4 Autoreqprov: on PreReq: %{install_info_prereq} -Version: 1.4.6 +Version: 1.4.8 Release: 1 Summary: GNU m4 URL: http://www.gnu.org/software/m4/ Source: ftp://ftp.gnu.org/pub/gnu/m4/m4-%{version}.tar.bz2 -#Patch: m4-%{version}.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -35,7 +34,6 @@ %prep %setup -#%patch %build ./configure CFLAGS="$RPM_OPT_FLAGS" --without-included-regex \ @@ -60,6 +58,86 @@ %{_mandir}/*/* %changelog -n m4 +* Mon Dec 04 2006 - schwab(a)suse.de +- Update to m4 1.4.8. + * The `divert' macro and `-H'/`--hashsize' command line option no longer + cause a core dump when handed extra large values. Also, `divert' now + uses memory proportional to the number of diversions in use, rather than + to the maximum diversion number encountered, so that large diversion + numbers are less likely to exhaust system memory; and is no longer + limited by the maximum number of file descriptors. + * The `--help' and `--version' command line options now consistently + override all earlier options. For example, `m4 --debugfile=trace + --help' now no longer accidentally creates an empty file `trace'. + * The `-L'/`--nesting-limit' command line option can now be set to 0 + to remove the default limit of 1024. However, it is still possible that + heavily nested input can cause abrupt program termination due to stack + overflow. + * Problems encountered when writing to standard error, such as with the + `errprint' macro, now always cause a non-zero exit status. + * Warnings and errors issued during macro expansion are now consistently + reported at the line where the macro name was detected, rather than + where the close parenthesis resides. Text wrapped by `m4wrap' now + remembers the location that was in effect when m4wrap was invoked, + rather than changing to line 0 and the empty string for a file. The + macros `__line__' and `__file__' now work correctly even as the last + token in an included file. + * The `builtin' and `indir' macros now transparently handle builtin + tokens generated by `defn'. + * When diversions created by the `divert' macro collect enough text that + M4 must use temporary files, the environment variable $TMPDIR is now + consulted, and a better effort is made to clean up those files in the + event of a fatal signal. + * The `mkstemp' builtin is added with the same GNU semantics as `maketemp', + based on the recommendation of POSIX to deprecate the POSIX semantics of + `maketemp' as inherently insecure. In GNU mode (no -G supplied on the + command line), `maketemp' silently retains the secure GNU semantics, but + a future release of M4 will change this to emit a warning. In + traditional mode (m4 -G), `maketemp' now uses the POSIX-mandated insecure + semantics, and issues a warning that you should convert your script to + use `mkstemp' instead. Additionally, `mkstemp' and `maketemp' are now + well-defined even if the template argument does not end in six `X' + characters. + * The manual has been improved, including a new section on a composite + macro `foreach'. + * The `changecom' and `changequote' macros now treat an empty second + argument the same as if it were missing, rather than using the empty + string and making it impossible to end a comment or quote. + * The `translit' macro now operates in linear instead of quadratic time, + and is now eight-bit clean. + * The `-D', `-U', `-s', and `-t' command line options now take effect + after any files encountered earlier on the command line, rather than up + front, as is done in traditional implementations and required by POSIX. +* Mon Sep 25 2006 - schwab(a)suse.de +- Update to m4 1.4.6. + * Fix regression from 1.4.5 in handling a file that ends in a macro + expansion without arguments instead of a newline. + * The define and pushdef macros now warn when the first argument is not + a string, rather than silently doing nothing. + * Standard input can now be read more than once, as in 'm4 - file -', and + is not closed until all wrapped text is handled. This makes a + difference when stdin is not a regular file, and also fixes bugs when + using the syscmd or esyscmd macros from wrapped text. + * When standard input is a seekable file, the m4exit, syscmd, and esyscmd + macros now restore the current position to the next unread byte rather + than discarding an arbitrary amount of buffered data. + * SysV command-line compatibility is no longer a goal of GNU M4; the + focus will be instead on POSIX compatibility. This release continues to + support previous usage, but adds warnings in areas which will allow a + future version of GNU M4 to use its own extensions without being tied to + the SysV command line interface. + * The no-op compatibility command line options -B, -N, -S, -T, and + --diversions may be withdrawn or assigned new meanings in future + releases, so they now issue a warning if used. + * A new command line option -i replaces the compatibility -e as the + short spelling of --interactive, for consistency with other GNU tools; a + warning is issued if the old spelling is used, and it may be assigned new + meaning in future releases. + * A new command line option --debugfile replaces the options -o and + --error-output as the preferred spelling. The old options were + misleading in their names and inconsistent with other GNU tools; they are + still silently accepted, but no longer documented in --help, and may be + assigned new meanings in future releases. * Sat Aug 26 2006 - schwab(a)suse.de - Update to m4 1.4.6. * Fix buffer overruns in regexp and patsubst macros when handed a trailing ++++++ m4-1.4.6.tar.bz2 -> m4-1.4.8.tar.bz2 ++++++ ++++ 43057 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit hal-resmgr
by root＠suse.de 06 Dec '06

06 Dec '06

Hello community, here is the log from the commit of package hal-resmgr checked in at Wed Dec 6 12:02:37 CET 2006. -------- --- hal-resmgr/hal-resmgr.changes 2006-11-14 12:52:21.000000000 +0100 +++ /mounts/work_src_done/STABLE/hal-resmgr/hal-resmgr.changes 2006-11-29 14:57:14.000000000 +0100 @@ -1,0 +2,5 @@ +Wed Nov 29 14:56:46 CET 2006 - lnussel(a)suse.de + +- properly quote user names that contain spaces (#223664) + +------------------------------------------------------------------- New: ---- hal-resmgr-r126.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hal-resmgr.spec ++++++ --- /var/tmp/diff_new_pack.WQ2FvA/_old 2006-12-06 12:02:33.000000000 +0100 +++ /var/tmp/diff_new_pack.WQ2FvA/_new 2006-12-06 12:02:33.000000000 +0100 @@ -15,7 +15,7 @@ License: GNU General Public License (GPL), Other License(s), see package Group: System/Daemons Version: 0.1_SVNr124 -Release: 1 +Release: 5 Summary: Install ACLs on device nodes Source: %{name}-%{version}.tar.bz2 Source1: rchal-resmgr @@ -23,6 +23,7 @@ PreReq: %insserv_prereq %fillup_prereq Provides: resmgr:/etc/hotplug/usb/desktopdev Requires: resmgr +Patch: hal-resmgr-r126.diff %description hal-resmgr hooks into hald and resmgr in order to install file system @@ -36,6 +37,7 @@ %prep %setup -q +%patch %build make CFLAGS="%{optflags}" @@ -59,6 +61,8 @@ %{_libdir}/hal/scripts/hal-resmgr-revoke %changelog -n hal-resmgr +* Wed Nov 29 2006 - lnussel(a)suse.de +- properly quote user names that contain spaces (#223664) * Tue Nov 14 2006 - lnussel(a)suse.de - add support for v4l and dvb devices (fate #300558) * Mon Nov 13 2006 - lnussel(a)suse.de ++++++ hal-resmgr-r126.diff ++++++ ------------------------------------------------------------------------ r126 | lnussel | 2006-11-29 00:39:16 +0100 (Mi, 29 Nov 2006) | 2 lines properly quote user names that contain spaces (#223664) ------------------------------------------------------------------------ Index: resmgr.conf =================================================================== --- resmgr.conf (revision 125) +++ resmgr.conf (revision 126) @@ -1,2 +1,2 @@ -ongrant desktop run /bin/sh -c "/usr/sbin/hal-resmgr --grant=$RES_USER" -onrevoke desktop run /bin/sh -c "/usr/sbin/hal-resmgr --revoke=$RES_USER" +ongrant desktop run /bin/sh -c "/usr/sbin/hal-resmgr --grant=\"$RES_USER\"" +onrevoke desktop run /bin/sh -c "/usr/sbin/hal-resmgr --revoke=\"$RES_USER\"" # vim: syntax=diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit gdb
by root＠suse.de 06 Dec '06

06 Dec '06

Hello community, here is the log from the commit of package gdb checked in at Wed Dec 6 12:02:28 CET 2006. -------- --- gdb/gdb.changes 2006-10-28 00:25:56.000000000 +0200 +++ /mounts/work_src_done/STABLE/gdb/gdb.changes 2006-12-02 21:39:37.000000000 +0100 @@ -1,0 +2,50 @@ +Sat Dec 2 21:38:33 CET 2006 - schwab(a)suse.de + +- Update to gdb 6.5.90. + * New targets + Xtensa xtensa-elf + Cell Broadband Engine SPU spu-elf + * GDB can now be configured as a cross-debugger targeting native Windows + (mingw32) or Cygwin. It can communicate with a remote debugging stub + running on a Windows system over TCP/IP to debug Windows programs. + * The GDB remote stub, gdbserver, has been updated to support Windows and + Cygwin debugging. Both single-threaded and multi-threaded programs are + supported. + * The "set trust-readonly-sections" command works again. This command was + broken in GDB 6.3, 6.4, and 6.5. + * Support for GNU/Linux Thread Local Storage (TLS, per-thread variables) no + longer requires symbolic debug information (e.g. DWARF-2). + * New commands + set substitute-path + unset substitute-path + show substitute-path + Manage a list of substitution rules that GDB uses to rewrite the name + of the directories where the sources are located. This can be useful + for instance when the sources were moved to a different location + between compilation and debugging. + set trace-commands + show trace-commands + Print each CLI command as it is executed. Each command is prefixed with + a number of `+' symbols representing the nesting depth. + The source command now has a `-v' option to enable the same feature. + * REMOVED features + The ARM Demon monitor support (RDP protocol, "target rdp"). + Kernel Object Display, an embedded debugging feature which only worked with + an obsolete version of Cisco IOS. + The 'set download-write-size' and 'show download-write-size' commands. + * New remote packets + qSupported: + Tell a stub about GDB client features, and request remote target features. + The first feature implemented is PacketSize, which allows the target to + specify the size of packets it can handle - to minimize the number of + packets required and improve performance when connected to a remote + target. + qXfer:auxv:read: + Fetch an OS auxilliary vector from the remote stub. This packet is a + more efficient replacement for qPart:auxv:read. + * Removed remote packets + qPart:auxv:read: + This packet has been replaced by qXfer:auxv:read. Only GDB 6.4 and 6.5 + used it, and only gdbserver implemented it. + +------------------------------------------------------------------- Old: ---- add-symbol-file-command.diff detach-command.diff gdb-6.5.tar.bz2 gnu-hash.diff New: ---- gdb-6.5.90.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gdb.spec ++++++ --- /var/tmp/diff_new_pack.iPhCeI/_old 2006-12-06 12:02:16.000000000 +0100 +++ /var/tmp/diff_new_pack.iPhCeI/_new 2006-12-06 12:02:16.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package gdb (Version 6.5) +# spec file for package gdb (Version 6.5.90) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -16,12 +16,12 @@ BuildRequires: libunwind-devel %endif URL: http://www.gnu.org/software/gdb/ -License: GNU General Public License (GPL) - all versions +License: GNU General Public License (GPL) Group: Development/Tools/Debuggers Autoreqprov: on PreReq: %{install_info_prereq} -Version: 6.5 -Release: 21 +Version: 6.5.90 +Release: 1 Summary: The GNU Debugger Source: gdb-%{version}.tar.bz2 Patch1: gdb-misc.patch @@ -32,14 +32,11 @@ Patch7: ppc-dwarf2-cfi.patch Patch8: pie-relocate.diff Patch9: mst-solib-trampoline.diff -Patch10: gnu-hash.diff Patch11: loader_break.diff Patch12: ppc-long-double.diff Patch13: lr-frame-offset.diff Patch14: ppc64-fdesc.diff Patch15: solib-extract-address.diff -Patch16: add-symbol-file-command.diff -Patch17: detach-command.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -76,7 +73,6 @@ %patch7 %patch8 %patch9 -%patch10 cd gdb %patch11 cd .. @@ -84,8 +80,6 @@ %patch13 -p1 %patch14 %patch15 -%patch16 -%patch17 %build CFLAGS="$RPM_OPT_FLAGS" \ @@ -107,8 +101,6 @@ make install-gdb install-info-gdb DESTDIR="$RPM_BUILD_ROOT" echo '#!/bin/sh exec gdb --tui "$@"' > $RPM_BUILD_ROOT%{_bindir}/gdbtui -rm -f $RPM_BUILD_ROOT%{_bindir}/run -rm -f $RPM_BUILD_ROOT%{_mandir}/man1/run.1 %clean rm -rf $RPM_BUILD_ROOT @@ -143,6 +135,53 @@ %endif %changelog -n gdb +* Sat Dec 02 2006 - schwab(a)suse.de +- Update to gdb 6.5.90. + * New targets + Xtensa xtensa-elf + Cell Broadband Engine SPU spu-elf + * GDB can now be configured as a cross-debugger targeting native Windows + (mingw32) or Cygwin. It can communicate with a remote debugging stub + running on a Windows system over TCP/IP to debug Windows programs. + * The GDB remote stub, gdbserver, has been updated to support Windows and + Cygwin debugging. Both single-threaded and multi-threaded programs are + supported. + * The "set trust-readonly-sections" command works again. This command was + broken in GDB 6.3, 6.4, and 6.5. + * Support for GNU/Linux Thread Local Storage (TLS, per-thread variables) no + longer requires symbolic debug information (e.g. DWARF-2). + * New commands + set substitute-path + unset substitute-path + show substitute-path + Manage a list of substitution rules that GDB uses to rewrite the name + of the directories where the sources are located. This can be useful + for instance when the sources were moved to a different location + between compilation and debugging. + set trace-commands + show trace-commands + Print each CLI command as it is executed. Each command is prefixed with + a number of `+' symbols representing the nesting depth. + The source command now has a `-v' option to enable the same feature. + * REMOVED features + The ARM Demon monitor support (RDP protocol, "target rdp"). + Kernel Object Display, an embedded debugging feature which only worked with + an obsolete version of Cisco IOS. + The 'set download-write-size' and 'show download-write-size' commands. + * New remote packets + qSupported: + Tell a stub about GDB client features, and request remote target features. + The first feature implemented is PacketSize, which allows the target to + specify the size of packets it can handle - to minimize the number of + packets required and improve performance when connected to a remote + target. + qXfer:auxv:read: + Fetch an OS auxilliary vector from the remote stub. This packet is a + more efficient replacement for qPart:auxv:read. + * Removed remote packets + qPart:auxv:read: + This packet has been replaced by qXfer:auxv:read. Only GDB 6.4 and 6.5 + used it, and only gdbserver implemented it. * Sat Oct 28 2006 - schwab(a)suse.de - Rename detach-fork to detach fork. * Tue Oct 24 2006 - schwab(a)suse.de ++++++ gdb-6.5.tar.bz2 -> gdb-6.5.90.tar.bz2 ++++++ gdb/gdb-6.5.tar.bz2 /mounts/work_src_done/STABLE/gdb/gdb-6.5.90.tar.bz2 differ: char 11, line 1 ++++++ mst-solib-trampoline.diff ++++++ --- /var/tmp/diff_new_pack.iPhCeI/_old 2006-12-06 12:02:16.000000000 +0100 +++ /var/tmp/diff_new_pack.iPhCeI/_new 2006-12-06 12:02:16.000000000 +0100 @@ -1,11 +1,11 @@ ---- gdb/minsyms.c.~1.45.~ 2006-01-09 18:20:59.000000000 +0100 -+++ gdb/minsyms.c 2006-05-22 13:19:48.000000000 +0200 -@@ -486,6 +486,8 @@ lookup_minimal_symbol_by_pc_section (COR - don't fill the bfd_section member, so don't - throw away symbols on those platforms. */ - && SYMBOL_BFD_SECTION (&msymbol[hi]) != NULL -+ /* Don't ignore symbols for solib trampolines. */ -+ && MSYMBOL_TYPE (&msymbol[hi]) != mst_solib_trampoline - && SYMBOL_BFD_SECTION (&msymbol[hi]) != section) - --hi; - +--- gdb/minsyms.c ++++ gdb/minsyms.c +@@ -490,6 +490,8 @@ + don't fill the bfd_section member, so don't + throw away symbols on those platforms. */ + && SYMBOL_BFD_SECTION (&msymbol[hi]) != NULL ++ /* Don't ignore symbols for solib trampolines. */ ++ && MSYMBOL_TYPE (&msymbol[hi]) != mst_solib_trampoline + && (!matching_bfd_sections + (SYMBOL_BFD_SECTION (&msymbol[hi]), section))) + { ++++++ pie-relocate.diff ++++++ --- /var/tmp/diff_new_pack.iPhCeI/_old 2006-12-06 12:02:16.000000000 +0100 +++ /var/tmp/diff_new_pack.iPhCeI/_new 2006-12-06 12:02:16.000000000 +0100 @@ -1,16 +1,15 @@ --- gdb/Makefile.in +++ gdb/Makefile.in -@@ -2401,7 +2401,8 @@ - objfiles.o: objfiles.c $(defs_h) $(bfd_h) $(symtab_h) $(symfile_h) \ +@@ -2444,7 +2444,7 @@ $(objfiles_h) $(gdb_stabs_h) $(target_h) $(bcache_h) $(mdebugread_h) \ $(gdb_assert_h) $(gdb_stat_h) $(gdb_obstack_h) $(gdb_string_h) \ -- $(hashtab_h) $(breakpoint_h) $(block_h) $(dictionary_h) $(source_h) -+ $(hashtab_h) $(breakpoint_h) $(block_h) $(dictionary_h) $(source_h) \ -+ $(auxv_h) $(elf_common_h) + $(hashtab_h) $(breakpoint_h) $(block_h) $(dictionary_h) $(source_h) \ +- $(parser_defs_h) $(expression_h) ++ $(parser_defs_h) $(expression_h) $(auxv_h) $(elf_common_h) observer.o: observer.c $(defs_h) $(observer_h) $(command_h) $(gdbcmd_h) \ $(observer_inc) obsd-tdep.o: obsd-tdep.c $(defs_h) $(frame_h) $(symtab_h) $(obsd_tdep_h) -@@ -2624,9 +2625,9 @@ +@@ -2663,9 +2663,9 @@ $(bcache_h) $(regcache_h) solib-svr4.o: solib-svr4.c $(defs_h) $(elf_external_h) $(elf_common_h) \ $(elf_mips_h) $(symtab_h) $(bfd_h) $(symfile_h) $(objfiles_h) \ @@ -22,26 +21,26 @@ sol-thread.o: sol-thread.c $(defs_h) $(gdbthread_h) $(target_h) \ $(inferior_h) $(gdb_stat_h) $(gdbcmd_h) $(gdbcore_h) $(regcache_h) \ $(solib_h) $(symfile_h) $(gdb_string_h) $(gregset_h) -@@ -2724,7 +2725,7 @@ +@@ -2773,7 +2773,7 @@ $(objfiles_h) $(source_h) $(gdbcmd_h) $(breakpoint_h) $(language_h) \ $(complaints_h) $(demangle_h) $(inferior_h) $(filenames_h) \ $(gdb_stabs_h) $(gdb_obstack_h) $(completer_h) $(bcache_h) \ - $(hashtab_h) $(readline_h) $(gdb_assert_h) $(block_h) \ + $(hashtab_h) $(readline_h) $(gdb_assert_h) $(block_h) $(varobj_h) \ - $(gdb_string_h) $(gdb_stat_h) $(observer_h) $(exec_h) + $(gdb_string_h) $(gdb_stat_h) $(observer_h) $(exec_h) \ + $(parser_defs_h) symfile-mem.o: symfile-mem.c $(defs_h) $(symtab_h) $(gdbcore_h) \ - $(objfiles_h) $(exceptions_h) $(gdbcmd_h) $(target_h) $(value_h) \ --- gdb/breakpoint.c +++ gdb/breakpoint.c -@@ -3804,6 +3804,7 @@ - b->number, +@@ -3810,6 +3810,7 @@ + printf_filtered ("%s%s ", ((b->enable_state == bp_disabled || b->enable_state == bp_shlib_disabled || + b->enable_state == bp_startup_disabled || b->enable_state == bp_call_disabled) - ? " (disabled)" + ? " (disabled)" : b->enable_state == bp_permanent -@@ -4481,6 +4482,60 @@ +@@ -4487,6 +4488,60 @@ } } @@ -102,7 +101,7 @@ static void solib_load_unload_1 (char *hookname, int tempflag, char *dll_pathname, char *cond_string, enum bptype bp_kind) -@@ -6827,6 +6882,7 @@ +@@ -6833,6 +6888,7 @@ && !b->loc->duplicate && b->enable_state != bp_disabled && b->enable_state != bp_shlib_disabled @@ -110,7 +109,7 @@ && !b->pending && b->enable_state != bp_call_disabled) { -@@ -7042,7 +7098,8 @@ +@@ -7048,7 +7104,8 @@ break; save_enable = b->enable_state; @@ -145,7 +144,7 @@ extern void create_solib_unload_event_breakpoint (char *, int, --- gdb/dwarf2read.c +++ gdb/dwarf2read.c -@@ -1207,7 +1207,7 @@ +@@ -1221,7 +1221,7 @@ else dwarf2_per_objfile->loc_buffer = NULL; @@ -167,7 +166,7 @@ mainline = 0; --- gdb/infrun.c +++ gdb/infrun.c -@@ -2183,6 +2183,11 @@ +@@ -2203,6 +2203,11 @@ code segments in shared libraries might be mapped in now. */ re_enable_breakpoints_in_shlibs (); @@ -181,7 +180,7 @@ and place breakpoints in initializer routines for --- gdb/objfiles.c +++ gdb/objfiles.c -@@ -46,6 +46,8 @@ +@@ -49,6 +49,8 @@ #include "block.h" #include "dictionary.h" #include "source.h" @@ -190,7 +189,7 @@ /* Prototypes for local functions */ -@@ -258,7 +260,16 @@ +@@ -261,7 +263,16 @@ CORE_ADDR entry_point_address (void) { @@ -226,7 +225,7 @@ static struct link_map_offsets *svr4_fetch_link_map_offsets (void); static int svr4_have_link_map_offsets (void); -@@ -265,8 +267,6 @@ +@@ -278,8 +280,6 @@ /* Local function prototypes */ @@ -235,7 +234,7 @@ static CORE_ADDR bfd_lookup_symbol (bfd *, char *, flagword); /* -@@ -391,17 +391,29 @@ +@@ -404,17 +404,29 @@ gdb_byte *buf; gdb_byte *bufend; int arch_size; @@ -266,7 +265,7 @@ return 0; /* Find the DT_DEBUG entry in the the .dynamic section. -@@ -718,9 +730,55 @@ +@@ -763,9 +775,55 @@ does have a name, so we can no longer use a missing name to decide when to ignore it. */ if (IGNORE_FIRST_LINK_MAP_ENTRY (new) && ldsomap == 0) @@ -323,7 +322,7 @@ int errcode; char *buffer; -@@ -738,10 +796,8 @@ +@@ -783,10 +841,8 @@ strcpy (new->so_original_name, new->so_name); } @@ -336,7 +335,7 @@ free_so (new); else { -@@ -834,24 +890,6 @@ +@@ -882,24 +938,6 @@ return 0; } @@ -361,7 +360,7 @@ /* Return 1 if PC lies in the dynamic symbol resolution code of the SVR4 run time loader. */ static CORE_ADDR interp_text_sect_low; -@@ -1323,6 +1361,8 @@ +@@ -1384,6 +1422,8 @@ while (stop_signal != TARGET_SIGNAL_TRAP); stop_soon = NO_STOP_QUIETLY; #endif /* defined(_SCO_DS) */ @@ -372,7 +371,7 @@ static void --- gdb/solib.c +++ gdb/solib.c -@@ -392,15 +392,37 @@ +@@ -396,15 +396,37 @@ /* Have we already loaded this shared object? */ ALL_OBJFILES (so->objfile) { @@ -413,7 +412,7 @@ free_section_addr_info (sap); return (1); -@@ -576,28 +598,7 @@ +@@ -585,28 +607,7 @@ /* Fill in the rest of each of the `struct so_list' nodes. */ for (i = inferior; i; i = i->next) { @@ -443,8 +442,8 @@ /* Notify any observer that the shared object has been loaded now that we've added it to GDB's tables. */ -@@ -606,6 +607,39 @@ - } +@@ -702,6 +703,39 @@ + } } +void @@ -481,7 +480,7 @@ +} + - /* GLOBAL FUNCTION + /* --- gdb/solist.h +++ gdb/solist.h @@ -518,15 +517,15 @@ reinit_frame_cache (); --- gdb/symfile.c +++ gdb/symfile.c -@@ -51,6 +51,7 @@ +@@ -49,6 +49,7 @@ + #include "readline/readline.h" + #include "gdb_assert.h" #include "block.h" ++#include "varobj.h" #include "observer.h" #include "exec.h" -+#include "varobj.h" - - #include <sys/types.h> - #include <fcntl.h> -@@ -659,7 +660,7 @@ + #include "parser-defs.h" +@@ -660,7 +661,7 @@ /* Now either addrs or offsets is non-zero. */ @@ -535,7 +534,7 @@ { /* We will modify the main symbol table, make sure that all its users will be cleaned up if an error occurs during symbol reading. */ -@@ -687,7 +688,7 @@ +@@ -688,7 +689,7 @@ We no longer warn if the lowest section is not a text segment (as happens for the PA64 port. */ @@ -544,7 +543,7 @@ { asection *lower_sect; asection *sect; -@@ -856,14 +857,14 @@ +@@ -857,14 +858,14 @@ /* If this is the main symbol file we have to clean up all users of the old main symbol file. Otherwise it is sufficient to fixup all the breakpoints that may have been redefined by this symbol file. */ @@ -561,7 +560,7 @@ { breakpoint_re_set (); } -@@ -909,7 +910,7 @@ +@@ -910,7 +911,7 @@ interactively wiping out any existing symbols. */ if ((have_full_symbols () || have_partial_symbols ()) @@ -570,7 +569,7 @@ && from_tty && !query ("Load new symbol table from \"%s\"? ", name)) error (_("Not confirmed.")); -@@ -1090,6 +1091,11 @@ +@@ -1091,6 +1092,11 @@ symfile_objfile->name) : !query (_("Discard symbol table? ")))) error (_("Not confirmed.")); @@ -582,7 +581,7 @@ free_all_objfiles (); /* solib descriptors may have handles to objfiles. Since their -@@ -2155,6 +2161,8 @@ +@@ -2205,6 +2211,8 @@ /* Discard cleanups as symbol reading was successful. */ discard_cleanups (old_cleanups); @@ -591,14 +590,14 @@ /* If the mtime has changed between the time we set new_modtime and now, we *want* this to be out of date, so don't call stat again now. */ -@@ -2530,6 +2538,7 @@ +@@ -2580,6 +2588,7 @@ clear_pc_function_cache (); if (deprecated_target_new_objfile_hook) deprecated_target_new_objfile_hook (NULL); + varobj_refresh (); - } - static void + /* Clear globals which might have pointed into a removed objfile. + FIXME: It's not clear which of these are supposed to persist --- gdb/varobj.c +++ gdb/varobj.c @@ -870,6 +870,58 @@ ++++++ warn.patch ++++++ --- /var/tmp/diff_new_pack.iPhCeI/_old 2006-12-06 12:02:16.000000000 +0100 +++ /var/tmp/diff_new_pack.iPhCeI/_new 2006-12-06 12:02:16.000000000 +0100 @@ -1,6 +1,6 @@ --- gdb/remote.c +++ gdb/remote.c -@@ -864,8 +864,8 @@ +@@ -966,8 +966,8 @@ static int use_threadextra_query; /* Tokens for use by the asynchronous signal handlers for SIGINT. */ @@ -11,15 +11,15 @@ /* These are pointers to hook functions that may be set in order to modify resume/wait behavior for a particular architecture. */ -@@ -2523,11 +2523,9 @@ +@@ -2843,11 +2843,9 @@ { signal (SIGINT, handle_sigint); if (sigint_remote_twice_token) -- delete_async_signal_handler ((struct async_signal_handler **) +- delete_async_signal_handler ((struct async_signal_handler **) - &sigint_remote_twice_token); + delete_async_signal_handler (&sigint_remote_twice_token); if (sigint_remote_token) -- delete_async_signal_handler ((struct async_signal_handler **) +- delete_async_signal_handler ((struct async_signal_handler **) - &sigint_remote_token); + delete_async_signal_handler (&sigint_remote_token); } @@ -232,10 +232,10 @@ { --- sim/common/gentmap.c +++ sim/common/gentmap.c -@@ -1,6 +1,7 @@ - /* Generate targ-vals.h and targ-map.c. */ +@@ -2,6 +2,7 @@ #include <stdio.h> + #include <stdlib.h> +#include <string.h> struct tdefs { @@ -255,7 +255,7 @@ typedef struct _trace_option_descriptor { --- sim/ppc/ppc-instructions +++ sim/ppc/ppc-instructions -@@ -3946,7 +3946,7 @@ +@@ -3958,7 +3958,7 @@ *603e:PPC_UNIT_FPU, PPC_UNIT_FPU, 2, 4, 0 *604: PPC_UNIT_FPU, PPC_UNIT_FPU, 1, 3, 0 FPSCR_BEGIN; @@ -264,7 +264,7 @@ /* compute the multiply */ if (is_invalid_operation(processor, cia, *frA, *frC, -@@ -3954,7 +3954,7 @@ +@@ -3966,7 +3966,7 @@ 0, /*single?*/ 0) /*negate?*/) { invalid_arithemetic_operation(processor, cia, @@ -273,7 +273,7 @@ 0, /*instruction_is_frsp*/ 0, /*instruction_is_convert_to_64bit*/ 0, /*instruction_is_convert_to_32bit*/ -@@ -3962,16 +3962,16 @@ +@@ -3974,16 +3974,16 @@ } else { /*HACK!*/ @@ -293,7 +293,7 @@ 0, /*instruction_is_frsp*/ 0, /*instruction_is_convert_to_64bit*/ 0, /*instruction_is_convert_to_32bit*/ -@@ -3979,7 +3979,7 @@ +@@ -3991,7 +3991,7 @@ } else { /*HACK!*/ @@ -302,7 +302,7 @@ *(double*)frT = s; } FPSCR_END(Rc); -@@ -3991,7 +3991,7 @@ +@@ -4003,7 +4003,7 @@ *603e:PPC_UNIT_FPU, PPC_UNIT_FPU, 1, 3, 0 *604: PPC_UNIT_FPU, PPC_UNIT_FPU, 1, 3, 0 FPSCR_BEGIN; @@ -311,7 +311,7 @@ /* compute the multiply */ if (is_invalid_operation(processor, cia, *frA, *frC, -@@ -3999,7 +3999,7 @@ +@@ -4011,7 +4011,7 @@ 1, /*single?*/ 0) /*negate?*/) { invalid_arithemetic_operation(processor, cia, @@ -320,7 +320,7 @@ 0, /*instruction_is_frsp*/ 0, /*instruction_is_convert_to_64bit*/ 0, /*instruction_is_convert_to_32bit*/ -@@ -4007,16 +4007,16 @@ +@@ -4019,16 +4019,16 @@ } else { /*HACK!*/ @@ -340,7 +340,7 @@ 0, /*instruction_is_frsp*/ 0, /*instruction_is_convert_to_64bit*/ 0, /*instruction_is_convert_to_32bit*/ -@@ -4024,7 +4024,7 @@ +@@ -4036,7 +4036,7 @@ } else { /*HACK!*/ @@ -349,7 +349,7 @@ *(double*)frT = (double)s; } FPSCR_END(Rc); -@@ -4036,7 +4036,7 @@ +@@ -4048,7 +4048,7 @@ *603e:PPC_UNIT_FPU, PPC_UNIT_FPU, 2, 4, 0 *604: PPC_UNIT_FPU, PPC_UNIT_FPU, 1, 3, 0 FPSCR_BEGIN; @@ -358,7 +358,7 @@ /* compute the multiply */ if (is_invalid_operation(processor, cia, *frA, *frC, -@@ -4044,7 +4044,7 @@ +@@ -4056,7 +4056,7 @@ 0, /*single?*/ 0) /*negate?*/) { invalid_arithemetic_operation(processor, cia, @@ -367,7 +367,7 @@ 0, /*instruction_is_frsp*/ 0, /*instruction_is_convert_to_64bit*/ 0, /*instruction_is_convert_to_32bit*/ -@@ -4052,16 +4052,16 @@ +@@ -4064,16 +4064,16 @@ } else { /*HACK!*/ @@ -387,7 +387,7 @@ 0, /*instruction_is_frsp*/ 0, /*instruction_is_convert_to_64bit*/ 0, /*instruction_is_convert_to_32bit*/ -@@ -4069,7 +4069,7 @@ +@@ -4081,7 +4081,7 @@ } else { /*HACK!*/ @@ -396,7 +396,7 @@ *(double*)frT = s; } FPSCR_END(Rc); -@@ -4081,7 +4081,7 @@ +@@ -4093,7 +4093,7 @@ *603e:PPC_UNIT_FPU, PPC_UNIT_FPU, 1, 3, 0 *604: PPC_UNIT_FPU, PPC_UNIT_FPU, 1, 3, 0 FPSCR_BEGIN; @@ -405,7 +405,7 @@ /* compute the multiply */ if (is_invalid_operation(processor, cia, *frA, *frC, -@@ -4089,7 +4089,7 @@ +@@ -4101,7 +4101,7 @@ 1, /*single?*/ 0) /*negate?*/) { invalid_arithemetic_operation(processor, cia, @@ -414,7 +414,7 @@ 0, /*instruction_is_frsp*/ 0, /*instruction_is_convert_to_64bit*/ 0, /*instruction_is_convert_to_32bit*/ -@@ -4097,16 +4097,16 @@ +@@ -4109,16 +4109,16 @@ } else { /*HACK!*/ @@ -434,7 +434,7 @@ 0, /*instruction_is_frsp*/ 0, /*instruction_is_convert_to_64bit*/ 0, /*instruction_is_convert_to_32bit*/ -@@ -4114,7 +4114,7 @@ +@@ -4126,7 +4126,7 @@ } else { /*HACK!*/ @@ -443,7 +443,7 @@ *(double*)frT = (double)s; } FPSCR_END(Rc); -@@ -4126,7 +4126,7 @@ +@@ -4138,7 +4138,7 @@ *603e:PPC_UNIT_FPU, PPC_UNIT_FPU, 2, 4, 0 *604: PPC_UNIT_FPU, PPC_UNIT_FPU, 1, 3, 0 FPSCR_BEGIN; @@ -452,7 +452,7 @@ /* compute the multiply */ if (is_invalid_operation(processor, cia, *frA, *frC, -@@ -4134,7 +4134,7 @@ +@@ -4146,7 +4146,7 @@ 0, /*single?*/ 0) /*negate?*/) { invalid_arithemetic_operation(processor, cia, @@ -461,7 +461,7 @@ 0, /*instruction_is_frsp*/ 0, /*instruction_is_convert_to_64bit*/ 0, /*instruction_is_convert_to_32bit*/ -@@ -4142,16 +4142,16 @@ +@@ -4154,16 +4154,16 @@ } else { /*HACK!*/ @@ -481,7 +481,7 @@ 0, /*instruction_is_frsp*/ 0, /*instruction_is_convert_to_64bit*/ 0, /*instruction_is_convert_to_32bit*/ -@@ -4159,7 +4159,7 @@ +@@ -4171,7 +4171,7 @@ } else { /*HACK!*/ @@ -490,7 +490,7 @@ *(double*)frT = s; } FPSCR_END(Rc); -@@ -4171,7 +4171,7 @@ +@@ -4183,7 +4183,7 @@ *603e:PPC_UNIT_FPU, PPC_UNIT_FPU, 1, 3, 0 *604: PPC_UNIT_FPU, PPC_UNIT_FPU, 1, 3, 0 FPSCR_BEGIN; @@ -499,7 +499,7 @@ /* compute the multiply */ if (is_invalid_operation(processor, cia, *frA, *frC, -@@ -4179,7 +4179,7 @@ +@@ -4191,7 +4191,7 @@ 1, /*single?*/ 0) /*negate?*/) { invalid_arithemetic_operation(processor, cia, @@ -508,7 +508,7 @@ 0, /*instruction_is_frsp*/ 0, /*instruction_is_convert_to_64bit*/ 0, /*instruction_is_convert_to_32bit*/ -@@ -4187,16 +4187,16 @@ +@@ -4199,16 +4199,16 @@ } else { /*HACK!*/ @@ -528,7 +528,7 @@ 0, /*instruction_is_frsp*/ 0, /*instruction_is_convert_to_64bit*/ 0, /*instruction_is_convert_to_32bit*/ -@@ -4204,7 +4204,7 @@ +@@ -4216,7 +4216,7 @@ } else { /*HACK!*/ @@ -537,7 +537,7 @@ *(double*)frT = (double)s; } FPSCR_END(Rc); -@@ -4216,7 +4216,7 @@ +@@ -4228,7 +4228,7 @@ *603e:PPC_UNIT_FPU, PPC_UNIT_FPU, 2, 4, 0 *604: PPC_UNIT_FPU, PPC_UNIT_FPU, 1, 3, 0 FPSCR_BEGIN; @@ -546,7 +546,7 @@ /* compute the multiply */ if (is_invalid_operation(processor, cia, *frA, *frC, -@@ -4224,7 +4224,7 @@ +@@ -4236,7 +4236,7 @@ 0, /*single?*/ 0) /*negate?*/) { invalid_arithemetic_operation(processor, cia, @@ -555,7 +555,7 @@ 0, /*instruction_is_frsp*/ 0, /*instruction_is_convert_to_64bit*/ 0, /*instruction_is_convert_to_32bit*/ -@@ -4232,16 +4232,16 @@ +@@ -4244,16 +4244,16 @@ } else { /*HACK!*/ @@ -575,7 +575,7 @@ 0, /*instruction_is_frsp*/ 0, /*instruction_is_convert_to_64bit*/ 0, /*instruction_is_convert_to_32bit*/ -@@ -4249,7 +4249,7 @@ +@@ -4261,7 +4261,7 @@ } else { /*HACK!*/ @@ -584,7 +584,7 @@ *(double*)frT = s; } FPSCR_END(Rc); -@@ -4261,7 +4261,7 @@ +@@ -4273,7 +4273,7 @@ *603e:PPC_UNIT_FPU, PPC_UNIT_FPU, 1, 3, 0 *604: PPC_UNIT_FPU, PPC_UNIT_FPU, 1, 3, 0 FPSCR_BEGIN; @@ -593,7 +593,7 @@ /* compute the multiply */ if (is_invalid_operation(processor, cia, *frA, *frC, -@@ -4269,7 +4269,7 @@ +@@ -4281,7 +4281,7 @@ 1, /*single?*/ 0) /*negate?*/) { invalid_arithemetic_operation(processor, cia, @@ -602,7 +602,7 @@ 0, /*instruction_is_frsp*/ 0, /*instruction_is_convert_to_64bit*/ 0, /*instruction_is_convert_to_32bit*/ -@@ -4277,16 +4277,16 @@ +@@ -4289,16 +4289,16 @@ } else { /*HACK!*/ @@ -622,7 +622,7 @@ 0, /*instruction_is_frsp*/ 0, /*instruction_is_convert_to_64bit*/ 0, /*instruction_is_convert_to_32bit*/ -@@ -4294,7 +4294,7 @@ +@@ -4306,7 +4306,7 @@ } else { /*HACK!*/ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit file
by root＠suse.de 06 Dec '06

06 Dec '06

Hello community, here is the log from the commit of package file checked in at Wed Dec 6 12:02:11 CET 2006. -------- --- file/file.changes 2006-06-12 15:17:24.000000000 +0200 +++ /mounts/work_src_done/STABLE/file/file.changes 2006-11-23 17:15:35.000000000 +0100 @@ -1,0 +2,11 @@ +Thu Nov 23 17:15:17 CET 2006 - werner(a)suse.de + +- Initialize variable in elf patch + +------------------------------------------------------------------- +Wed Nov 22 16:14:33 CET 2006 - werner(a)suse.de + +- Update to new file 4.18 + * Includes most of our extensions (elf, fifo, softmagic) + +------------------------------------------------------------------- Old: ---- file-4.09-misc.dif file-4.17-elf.dif file-4.17-fifo.dif file-4.17-intstr.dif file-4.17.dif file-4.17.tar.bz2 New: ---- file-4.18-elf.dif file-4.18-misc.dif file-4.18-printf.dif file-4.18.dif file-4.18.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ file.spec ++++++ --- /var/tmp/diff_new_pack.L7Df6X/_old 2006-12-06 11:59:17.000000000 +0100 +++ /var/tmp/diff_new_pack.L7Df6X/_new 2006-12-06 11:59:17.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package file (Version 4.17) +# spec file for package file (Version 4.18) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -15,25 +15,24 @@ License: Other uncritical OpenSource License, Other License(s), see package Group: Productivity/File utilities Autoreqprov: on -Version: 4.17 +Version: 4.18 Release: 3 Summary: A Tool to Determine File Types Source: ftp://ftp.astron.com/pub/file/file-%{version}.tar.bz2 Patch: file-%{version}.dif -Patch1: file-4.09-misc.dif -Patch2: file-4.06-exec.dif -Patch3: file-4.06-autoconf.dif -Patch4: file-4.03-tex.dif -Patch5: file-selinux.dif -Patch6: file-4.12-pcp.dif -Patch22: file-4.16-mips.dif -Patch42: file-4.17-fifo.dif -Patch43: file-4.13-netware.diff -Patch44: file-4.13-cracklib.dif -Patch45: file-4.16-ssd.dif -Patch46: file-4.16-xen.dif -Patch50: file-4.17-intstr.dif -Patch51: file-4.17-elf.dif +Patch1: file-4.18-misc.dif +Patch2: file-4.12-pcp.dif +Patch3: file-4.06-exec.dif +Patch4: file-4.06-autoconf.dif +Patch5: file-4.03-tex.dif +Patch6: file-selinux.dif +Patch7: file-4.13-netware.diff +Patch8: file-4.13-cracklib.dif +Patch9: file-4.16-ssd.dif +Patch10: file-4.16-xen.dif +Patch11: file-4.18-elf.dif +Patch12: file-4.18-printf.dif +Patch20: file-4.16-mips.dif BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -69,22 +68,21 @@ %prep %setup -q -%patch50 -p0 -b .intstr -%patch51 -p0 -b .elf.dif %patch1 -p0 -b .misc -%patch2 -p0 -b .exec -%patch3 -p0 -b .conf -%patch4 -p0 -b .tex -%patch5 -p0 -b .policy -%patch6 -p0 -b .pcp +%patch2 -p0 -b .pcp +%patch3 -p0 -b .exec +%patch4 -p0 -b .conf +%patch5 -p0 -b .tex +%patch6 -p0 -b .policy +%patch7 -p0 -b .ntwr +%patch8 -p0 -b .crlib +%patch9 -p0 -b .pm +%patch10 -p0 -b .xen +%patch11 -p0 -b .elf.dif +%patch12 -p0 -b .printf %ifarch mips -%patch22 -p0 -s .mips +%patch20 -p0 -s .mips %endif -%patch42 -p0 -b .fifo -%patch43 -p0 -b .netware -%patch44 -p0 -b .cracklib -%patch45 -p0 -b .pm -%patch46 -p0 -b .xen %patch %build @@ -144,6 +142,11 @@ %attr(644,root,root) %{_mandir}/man3/libmagic.3.gz %changelog -n file +* Thu Nov 23 2006 - werner(a)suse.de +- Initialize variable in elf patch +* Wed Nov 22 2006 - werner(a)suse.de +- Update to new file 4.18 + * Includes most of our extensions (elf, fifo, softmagic) * Mon Jun 12 2006 - werner(a)suse.de - Reenable file to display process name from a core dump (#183685) * Mon Mar 27 2006 - werner(a)suse.de ++++++ file-4.17-elf.dif -> file-4.18-elf.dif ++++++ --- file/file-4.17-elf.dif 2006-06-12 15:16:35.000000000 +0200 +++ /mounts/work_src_done/STABLE/file/file-4.18-elf.dif 2006-11-23 17:14:40.000000000 +0100 @@ -1,89 +1,6 @@ --- src/readelf.c -+++ src/readelf.c 2006-06-12 15:15:12.000000000 +0200 -@@ -189,15 +189,16 @@ - #ifdef ELFCORE - size_t prpsoffsets32[] = { - 8, /* FreeBSD */ -- 28, /* Linux 2.0.36 */ -- 32, /* Linux (I forget which kernel version) */ -+ 28, /* Linux 2.0.36 (short name) */ -+ 44, /* Linux (path name) */ - 84, /* SunOS 5.x */ - }; - - size_t prpsoffsets64[] = { - 16, /* FreeBSD, 64-bit */ -- 40, /* Linux (tested on core from 2.4.x) */ -- 120, /* SunOS 5.x, 64-bit */ -+ 40, /* Linux (tested on core from 2.4.x, short name) */ -+ 56, /* Linux (path name) */ -+ 120, /* SunOS 5.x, 64-bit */ - }; - - #define NOFFSETS32 (sizeof prpsoffsets32 / sizeof prpsoffsets32[0]) -@@ -247,8 +248,15 @@ - size_t offset; - unsigned char nbuf[BUFSIZ]; - ssize_t bufsize; -+ off_t savedoffset; -+ struct stat st; - int flags = 0; - -+ if (fstat(fd, &st) < 0) { -+ file_badread(ms); -+ return -1; -+ } -+ - if (size != xph_sizeof) { - if (file_printf(ms, ", corrupted program header size") == -1) - return -1; -@@ -259,7 +267,7 @@ - * Loop through all the program headers. - */ - for ( ; num; num--) { -- if (lseek(fd, off, SEEK_SET) == (off_t)-1) { -+ if ((savedoffset = lseek(fd, off, SEEK_SET)) == (off_t)-1) { - file_badseek(ms); - return -1; - } -@@ -267,6 +275,15 @@ - file_badread(ms); - return -1; - } -+ -+ if (xph_offset > st.st_size) { -+ if (lseek(fd, savedoffset, SEEK_SET) == (off_t)-1) { -+ file_badseek(ms); -+ return -1; -+ } -+ continue; -+ } -+ - off += size; - if (xph_type != PT_NOTE) - continue; -@@ -321,7 +338,7 @@ - /* - * We're out of note headers. - */ -- return offset; -+ return (offset >= size) ? offset : size; - } - - if (namesz & 0x80000000) { -@@ -349,7 +366,10 @@ - - offset = ELF_ALIGN(doff + descsz); - if (doff + descsz > size) { -- return offset; -+ /* -+ * We're past the end of the buffer. -+ */ -+ return (offset >= size) ? offset : size; - } - - if (namesz == 4 && strcmp((char *)&nbuf[noff], "GNU") == 0 && -@@ -588,7 +608,7 @@ ++++ src/readelf.c 2006-11-22 15:54:30.000000000 +0100 +@@ -621,7 +621,7 @@ core: default: if (xnh_type == NT_PRPSINFO) { @@ -92,7 +9,7 @@ unsigned char c; /* * Extract the program name. We assume -@@ -600,7 +620,9 @@ +@@ -633,7 +633,9 @@ core: * If the characters aren't all printable, * reject it. */ @@ -103,79 +20,3 @@ size_t reloffset = prpsoffsets(i); size_t noffset = doff + reloffset; for (j = 0; j < 16; j++, noffset++, -@@ -762,13 +784,20 @@ - int bufsize; - size_t offset, align; - off_t savedoffset; -+ struct stat st; - int flags = 0; - -+ if (fstat(fd, &st) < 0) { -+ file_badread(ms); -+ return -1; -+ } -+ - if (size != xph_sizeof) { - if (file_printf(ms, ", corrupted program header size") == -1) - return -1; - return 0; - } -+ - if (lseek(fd, off, SEEK_SET) == (off_t)-1) { - file_badseek(ms); - return -1; -@@ -783,6 +812,13 @@ - file_badseek(ms); - return -1; - } -+ if (xph_offset > st.st_size) { -+ if (lseek(fd, savedoffset, SEEK_SET) == (off_t)-1) { -+ file_badseek(ms); -+ return -1; -+ } -+ continue; -+ } - - switch (xph_type) { - case PT_DYNAMIC: -@@ -843,8 +879,13 @@ - size_t nbytes) - { - union { -+#if defined(__s390x__) || defined(__powerpc64__) - int32_t l; - char c[sizeof (int32_t)]; -+#else -+ long l; -+ char c[sizeof (long)]; -+#endif - } u; - int class; - int swap; -@@ -867,7 +908,7 @@ - return 0; - - -- class = buf[4]; -+ class = buf[EI_CLASS]; - - if (class == ELFCLASS32) { - Elf32_Ehdr elfhdr; -@@ -877,7 +918,7 @@ - - u.l = 1; - (void) memcpy(&elfhdr, buf, sizeof elfhdr); -- swap = (u.c[sizeof(int32_t) - 1] + 1) != elfhdr.e_ident[5]; -+ swap = (u.c[sizeof(int32_t) - 1] + 1) != elfhdr.e_ident[EI_DATA]; - - if (getu16(swap, elfhdr.e_type) == ET_CORE) { - #ifdef ELFCORE -@@ -915,7 +956,7 @@ - - u.l = 1; - (void) memcpy(&elfhdr, buf, sizeof elfhdr); -- swap = (u.c[sizeof(int32_t) - 1] + 1) != elfhdr.e_ident[5]; -+ swap = (u.c[sizeof(int32_t) - 1] + 1) != elfhdr.e_ident[EI_DATA]; - - if (getu16(swap, elfhdr.e_type) == ET_CORE) { - #ifdef ELFCORE ++++++ file-4.09-misc.dif -> file-4.18-misc.dif ++++++ --- file/file-4.09-misc.dif 2006-03-24 14:46:55.000000000 +0100 +++ /mounts/work_src_done/STABLE/file/file-4.18-misc.dif 2006-11-22 15:50:07.000000000 +0100 @@ -1,6 +1,6 @@ --- magic/Magdir/audio +++ magic/Magdir/audio 2003-12-08 17:50:33.000000000 +0100 -@@ -72,13 +72,13 @@ +@@ -96,13 +96,13 @@ # Real Audio (Magic .ra\0375) 0 belong 0x2e7261fd RealAudio sound file @@ -14,7 +14,7 @@ -#0 string MTM MultiTracker Module sound file +#0 string MTM MultiTracker Module sound data #0 string if Composer 669 Module sound data - 0 string JN Composer 669 Module sound data (extended format) + #0 string JN Composer 669 Module sound data (extended format) 0 string MAS_U ULT(imate) Module sound data --- magic/Magdir/bsdi +++ magic/Magdir/bsdi 2003-12-08 17:50:03.000000000 +0100 @@ -53,7 +53,7 @@ 0 string/b #!\ /usr/local/tcsh Tenex C shell script text executable 0 string/b #!\ /usr/local/bin/tcsh Tenex C shell script text executable -@@ -34,6 +35,8 @@ +@@ -35,6 +36,8 @@ # bash shell magic, from Peter Tobias (tobias(a)server.et-inf.fho-emden.de) 0 string/b #!\ /bin/bash Bourne-Again shell script text executable @@ -64,8 +64,8 @@ # using env --- magic/Magdir/mach +++ magic/Magdir/mach 2003-12-08 17:50:03.000000000 +0100 -@@ -37,7 +37,7 @@ - >4 belong 11 hp pa-risc +@@ -74,7 +74,7 @@ + >4 belong 11 hppa >4 belong 12 acorn >4 belong 13 m88k ->4 belong 14 sparc @@ -75,7 +75,7 @@ >4 belong 17 rs6000 --- magic/Magdir/msdos +++ magic/Magdir/msdos 2005-07-25 15:24:04.000000000 +0200 -@@ -241,7 +241,7 @@ +@@ -248,7 +248,7 @@ # a few unknown ZIP sfxes, no idea if they are needed or if they are # already captured by the generic patterns above @@ -117,8 +117,8 @@ >32 belong !0 (signal %d) --- magic/Magdir/sun -+++ magic/Magdir/sun 2003-12-08 17:50:03.000000000 +0100 -@@ -5,18 +5,18 @@ ++++ magic/Magdir/sun 2006-11-22 15:49:20.000000000 +0100 +@@ -5,7 +5,7 @@ # Values for big-endian Sun (MC680x0, SPARC) binaries on pre-5.x # releases. (5.x uses ELF.) # @@ -127,14 +127,16 @@ >0 byte &0x80 >>20 belong <4096 shared library >>20 belong =4096 dynamically linked executable - >>20 belong >4096 dynamically linked executable +@@ -13,12 +13,12 @@ >0 byte ^0x80 executable >16 belong >0 not stripped + -0 belong&077777777 0600410 sparc pure +0 belong&077777777 0600410 SPARC pure >0 byte &0x80 dynamically linked executable >0 byte ^0x80 executable >16 belong >0 not stripped + -0 belong&077777777 0600407 sparc +0 belong&077777777 0600407 SPARC >0 byte &0x80 dynamically linked executable ++++++ file-4.18-printf.dif ++++++ --- src/apprentice.c +++ src/apprentice.c 2006-11-22 16:09:57.000000000 +0000 @@ -886,8 +886,16 @@ quad = 1; /*FALLTHROUGH*/ case FILE_FMT_NUM: + if (*ptr == '#') + ptr++; + if (*ptr == ' ') + ptr++; if (*ptr == '-') ptr++; + if (*ptr == '+') + ptr++; + if (*ptr == '\'') + ptr++; if (*ptr == '.') ptr++; while (isdigit((unsigned char)*ptr)) ptr++; @@ -907,6 +915,7 @@ case 'i': case 'd': case 'u': + case 'o': case 'x': case 'X': return 0; @@ -921,12 +930,16 @@ case 'i': case 'd': case 'u': + case 'o': case 'x': case 'X': return 0; default: return -1; } + case 'o': + case 'x': + case 'X': case 'd': return 0; default: @@ -937,6 +950,7 @@ case 'c': case 'd': case 'u': + case 'o': case 'x': case 'X': return 0; ++++++ file-4.09-misc.dif -> file-4.18.dif ++++++ --- file/file-4.09-misc.dif 2006-03-24 14:46:55.000000000 +0100 +++ /mounts/work_src_done/STABLE/file/file-4.18.dif 2006-11-22 16:03:03.000000000 +0100 @@ -1,142 +1,440 @@ ---- magic/Magdir/audio -+++ magic/Magdir/audio 2003-12-08 17:50:33.000000000 +0100 -@@ -72,13 +72,13 @@ - - # Real Audio (Magic .ra\0375) - 0 belong 0x2e7261fd RealAudio sound file --0 string .RMF RealMedia file -+0 string .RMF\0\0\0 RealMedia file - - # MTM/669/FAR/S3M/ULT/XM format checking [Aaron Eppert, aeppert(a)dialin.ind.net] - # Oct 31, 1995 - # fixed by <doj(a)cubic.org> 2003-06-24 - # Too short... --#0 string MTM MultiTracker Module sound file -+#0 string MTM MultiTracker Module sound data - #0 string if Composer 669 Module sound data - 0 string JN Composer 669 Module sound data (extended format) - 0 string MAS_U ULT(imate) Module sound data ---- magic/Magdir/bsdi -+++ magic/Magdir/bsdi 2003-12-08 17:50:03.000000000 +0100 -@@ -19,7 +19,7 @@ - >32 byte 0x6a (uses shared libs) - - # same as in SunOS 4.x, except for static shared libraries --0 belong&077777777 0600413 sparc demand paged -+0 belong&077777777 0600413 SPARC demand paged - >0 byte &0x80 - >>20 belong <4096 shared library - >>20 belong =4096 dynamically linked executable -@@ -28,13 +28,13 @@ - >16 belong >0 not stripped - >36 belong 0xb4100001 (uses shared libs) - --0 belong&077777777 0600410 sparc pure -+0 belong&077777777 0600410 SPARC pure - >0 byte &0x80 dynamically linked executable - >0 byte ^0x80 executable - >16 belong >0 not stripped - >36 belong 0xb4100001 (uses shared libs) - --0 belong&077777777 0600407 sparc -+0 belong&077777777 0600407 SPARC - >0 byte &0x80 dynamically linked executable - >0 byte ^0x80 executable - >16 belong >0 not stripped ---- magic/Magdir/commands -+++ magic/Magdir/commands 2003-12-08 17:50:03.000000000 +0100 -@@ -8,6 +8,7 @@ - # korn shell magic, sent by George Wu, gwu(a)clyde.att.com - 0 string/b #!\ /bin/ksh Korn shell script text executable - 0 string/b #!\ /bin/tcsh Tenex C shell script text executable -+0 string/b #!\ /usr/bin/tcsh Tenex C shell script text executable - 0 string/b #!\ /usr/local/tcsh Tenex C shell script text executable - 0 string/b #!\ /usr/local/bin/tcsh Tenex C shell script text executable - -@@ -34,6 +35,8 @@ - - # bash shell magic, from Peter Tobias (tobias(a)server.et-inf.fho-emden.de) - 0 string/b #!\ /bin/bash Bourne-Again shell script text executable -+0 string/b #!\ /usr/bin/bash Bourne-Again shell script text executable -+0 string/b #!\ /usr/local/bash Bourne-Again shell script text executable - 0 string/b #!\ /usr/local/bin/bash Bourne-Again shell script text executable - - # using env ---- magic/Magdir/mach -+++ magic/Magdir/mach 2003-12-08 17:50:03.000000000 +0100 -@@ -37,7 +37,7 @@ - >4 belong 11 hp pa-risc - >4 belong 12 acorn - >4 belong 13 m88k -->4 belong 14 sparc -+>4 belong 14 SPARC - >4 belong 15 i860-big - >4 belong 16 i860 - >4 belong 17 rs6000 ---- magic/Magdir/msdos -+++ magic/Magdir/msdos 2005-07-25 15:24:04.000000000 +0200 -@@ -241,7 +241,7 @@ - - # a few unknown ZIP sfxes, no idea if they are needed or if they are - # already captured by the generic patterns above -->122 string Windows\ self-extracting\ ZIP \b, ZIP self-extracting archive -+>0x7a string Windows\ self-extracting\ ZIP \b, ZIP self-extracting archive - >(8.s*16) search/0x20 PKSFX \b, ZIP self-extracting archive (PKZIP) - # TODO: how to add this? >FileSize-34 string Windows\ Self-Installing\ Executable \b, ZIP self-extracting archive +--- .pkgextract ++++ .pkgextract 2006-03-27 13:29:19.000000000 +0200 +@@ -0,0 +1,11 @@ ++patch -p0 -s --suffix=.misc < ../file-4.18-misc.dif ++patch -p0 -s --suffix=.pcp < ../file-4.12-pcp.dif ++patch -p0 -s --suffix=.exec < ../file-4.06-exec.dif ++patch -p0 -s --suffix=.conf < ../file-4.06-autoconf.dif ++patch -p0 -s --suffix=.tex < ../file-4.03-tex.dif ++patch -p0 -s --suffix=.policy < ../file-selinux.dif ++patch -p0 -s --suffix=.ntwr < ../file-4.13-netware.diff ++patch -p0 -s --suffix=.crlib< ../file-4.13-cracklib.dif ++patch -p0 -s --suffix=.pm < ../file-4.16-ssd.dif ++patch -p0 -s --suffix=.xen < ../file-4.16-xen.dif ++patch -p0 -s --suffix=.elf < ../file-4.18-elf.dif +--- magic/Header ++++ magic/Header 2006-03-27 13:29:19.000000000 +0200 +@@ -1,5 +1,7 @@ + # Magic + # Magic data for file(1) command. +-# Machine-generated from src/cmd/file/magdir/*; edit there only! +-# Format is described in magic(files), where: +-# files is 5 on V7 and BSD, 4 on SV, and ?? in the SVID. ++# Format is described in magic(5). ++# ++# Note: If you have edited this file you may run `file -C' ++# to make a pre-compiled magic.mgc for faster execution ++# +--- magic/Makefile.am ++++ magic/Makefile.am 2006-03-27 13:29:19.000000000 +0200 +@@ -38,7 +38,6 @@ Magdir/amanda \ + Magdir/amigaos \ + Magdir/animation \ + Magdir/apl \ +-Magdir/apple \ + Magdir/applix \ + Magdir/archive \ + Magdir/asterix \ +@@ -83,7 +82,6 @@ Magdir/encore \ + Magdir/epoc \ + Magdir/esri \ + Magdir/fcs \ +-Magdir/filesystems \ + Magdir/flash \ + Magdir/fonts \ + Magdir/frame \ +@@ -109,14 +107,14 @@ Magdir/island \ + Magdir/ispell \ + Magdir/java \ + Magdir/jpeg \ ++Magdir/linux \ ++Magdir/filesystems \ + Magdir/karma \ + Magdir/lecter \ + Magdir/lex \ + Magdir/lif \ +-Magdir/linux \ + Magdir/lisp \ + Magdir/mach \ +-Magdir/macintosh \ + Magdir/magic \ + Magdir/mail.news \ + Magdir/maple \ +@@ -130,11 +128,11 @@ Magdir/misctools \ + Magdir/mkid \ + Magdir/mlssa \ + Magdir/mmdf \ +-Magdir/modem \ ++Magdir/msad \ + Magdir/motorola \ + Magdir/msdos \ ++Magdir/modem \ + Magdir/msvc \ +-Magdir/mup \ + Magdir/natinst \ + Magdir/ncr \ + Magdir/netbsd \ +@@ -169,6 +167,8 @@ Magdir/pyramid \ + Magdir/python \ + Magdir/revision \ + Magdir/riff \ ++Magdir/apple \ ++Magdir/macintosh \ + Magdir/rpm \ + Magdir/rtf \ + Magdir/sc \ +--- magic/Magdir/elf ++++ magic/Magdir/elf 2006-11-22 15:57:15.000000000 +0100 +@@ -92,7 +92,7 @@ + >>18 leshort 47 Renesas H8/300H, + >>18 leshort 48 Renesas H8S, + >>18 leshort 49 Renesas H8/500, +->>18 leshort 50 IA-64, ++>>18 leshort 50 IA-64 (Intel 64 bit architecture), + >>18 leshort 51 Stanford MIPS-X, + >>18 leshort 52 Motorola Coldfire, + >>18 leshort 53 Motorola M68HC12, +@@ -184,7 +184,7 @@ + >>18 beshort 47 Renesas H8/300H, + >>18 beshort 48 Renesas H8S, + >>18 beshort 49 Renesas H8/500, +->>18 beshort 50 IA-64, ++>>18 beshort 50 IA-64 (Intel 64 bit architecture), + >>18 beshort 51 Stanford MIPS-X, + >>18 beshort 52 Motorola Coldfire, + >>18 beshort 53 Motorola M68HC12, +--- magic/Magdir/linux ++++ magic/Magdir/linux 2006-03-27 13:29:19.000000000 +0200 +@@ -82,21 +82,43 @@ + # and Nicolás Lichtmaier <nick(a)debian.org> + # All known start with: b8 c0 07 8e d8 b8 00 90 8e c0 b9 00 01 29 f6 29 + # Linux kernel boot images (i386 arch) (Wolfram Kleff) +-514 string HdrS Linux kernel +->510 leshort 0xAA55 x86 boot executable +->>518 leshort >=0x200 +->>529 byte 0 zImage, +->>>529 byte 1 bzImage, +->>>(526.s+0x200) string >\0 version %s, +->>498 leshort 1 RO-rootFS, +->>498 leshort 0 RW-rootFS, +->>508 leshort >0 root_dev 0x%X, +->>502 leshort >0 swap_dev 0x%X, +->>504 leshort >0 RAMdisksize %u KB, +->>506 leshort 0xFFFF Normal VGA +->>506 leshort 0xFFFE Extended VGA +->>506 leshort 0xFFFD Prompt for Videomode +->>506 leshort >0 Video mode %d ++514 string HdrS Linux ++>510 leshort 0xAA55 \b/x86 Kernel ++>510 leshort <0xAA55 Kernel ++>510 leshort >0xAA55 Kernel ++>518 leshort 0x0105 \b, Setup Version 0x105, zImage ++>518 leshort >0x0105 \b, Setup Version %#hx ++>>529 byte 0 \b, zImage ++>>529 byte 1 \b, bzImage ++>>>(526.s+0x205) byte 32 ++>>>>(526.s+0x200) string >\0 \b, Version %5.5s ++>>>(526.s+0x206) byte 32 ++>>>>(526.s+0x200) string >\0 \b, Version %6.6s ++>>>(526.s+0x207) byte 32 ++>>>>(526.s+0x200) string >\0 \b, Version %7.7s ++>>>(526.s+0x205) byte 45 ++>>>>(526.s+0x200) string >\0 \b, Version %5.5s ++>>>(526.s+0x206) byte 45 ++>>>>(526.s+0x200) string >\0 \b, Version %6.6s ++>>>(526.s+0x207) byte 45 ++>>>>(526.s+0x200) string >\0 \b, Version %7.7s ++>>>(526.s+0x208) byte 45 ++>>>>(526.s+0x200) string >\0 \b, Version %8.8s ++>>>(526.s+0x209) byte 45 ++>>>>(526.s+0x200) string >\0 \b, Version %9.9s ++>>>(526.s+0x20a) byte 45 ++>>>>(526.s+0x200) string >\0 \b, Version %10.10s ++>>>(526.s+0x20b) byte 45 ++>>>>(526.s+0x200) string >\0 \b, Version %11.11s ++>>498 leshort 1 \b, RO-rootFS ++>>498 leshort 0 \b, RW-rootFS ++>>508 leshort >0 \b, root_dev 0x%X ++>>502 leshort >0 \b, swap_dev 0x%X ++>>504 leshort >0 \b, RAMdisksize %u KB ++>>506 leshort 0xFFFF \b, Normal VGA ++>>506 leshort 0xFFFE \b, Extended VGA ++>>506 leshort 0xFFFD \b, Prompt for Videomode ++>>506 leshort >0 \b, Video mode %d + # This also matches new kernels, which were caught above by "HdrS". + 0 belong 0xb8c0078e Linux kernel + >0x1e3 string Loading version 1.3.79 or older +--- magic/Magdir/modem ++++ magic/Magdir/modem 2006-03-27 13:29:19.000000000 +0200 +@@ -2,9 +2,9 @@ + # modem: file(1) magic for modem programs # ---- magic/Magdir/netbsd -+++ magic/Magdir/netbsd 2003-12-08 17:50:03.000000000 +0100 -@@ -101,25 +101,25 @@ - 0 belong&0377777777 045200507 a.out NetBSD/powerpc core - >12 string >\0 from '%s' - --0 belong&0377777777 042400413 a.out NetBSD/sparc demand paged -+0 belong&0377777777 042400413 a.out NetBSD/SPARC demand paged - >0 byte &0x80 - >>20 belong <8192 shared library - >>20 belong =8192 dynamically linked executable - >>20 belong >8192 dynamically linked executable - >0 byte ^0x80 executable - >16 belong >0 not stripped --0 belong&0377777777 042400410 a.out NetBSD/sparc pure -+0 belong&0377777777 042400410 a.out NetBSD/SPARC pure - >0 byte &0x80 dynamically linked executable - >0 byte ^0x80 executable - >16 belong >0 not stripped --0 belong&0377777777 042400407 a.out NetBSD/sparc -+0 belong&0377777777 042400407 a.out NetBSD/SPARC - >0 byte &0x80 dynamically linked executable - >0 byte ^0x80 - >>0 byte &0x40 position independent - >>20 belong !0 executable - >>20 belong =0 object file - >16 belong >0 not stripped --0 belong&0377777777 042400507 a.out NetBSD/sparc core -+0 belong&0377777777 042400507 a.out NetBSD/SPARC core - >12 string >\0 from '%s' - >32 belong !0 (signal %d) - ---- magic/Magdir/sun -+++ magic/Magdir/sun 2003-12-08 17:50:03.000000000 +0100 -@@ -5,18 +5,18 @@ - # Values for big-endian Sun (MC680x0, SPARC) binaries on pre-5.x - # releases. (5.x uses ELF.) - # --0 belong&077777777 0600413 sparc demand paged -+0 belong&077777777 0600413 SPARC demand paged - >0 byte &0x80 - >>20 belong <4096 shared library - >>20 belong =4096 dynamically linked executable - >>20 belong >4096 dynamically linked executable - >0 byte ^0x80 executable - >16 belong >0 not stripped --0 belong&077777777 0600410 sparc pure -+0 belong&077777777 0600410 SPARC pure - >0 byte &0x80 dynamically linked executable - >0 byte ^0x80 executable - >16 belong >0 not stripped --0 belong&077777777 0600407 sparc -+0 belong&077777777 0600407 SPARC - >0 byte &0x80 dynamically linked executable - >0 byte ^0x80 executable - >16 belong >0 not stripped + # From: Florian La Roche <florian(a)knorke.saar.de> +-4 string Research, Digifax-G3-File +->29 byte 1 , fine resolution +->29 byte 0 , normal resolution ++1 string PC\ Research,\ Inc Digifax-G3-File ++>29 byte 1 \b, fine resolution ++>29 byte 0 \b, normal resolution + + 0 short 0x0100 raw G3 data, byte-padded + 0 short 0x1400 raw G3 data +--- magic/Magdir/msad ++++ magic/Magdir/msad 2006-03-27 13:29:19.000000000 +0200 +@@ -0,0 +1,5 @@ ++#------------------------------------------------------------------------------ ++# msad: file(1) magic for msad ++# Microsoft visual C ++# This must precede the heuristic for raw G3 data ++4 string Standard\ Jet\ DB Microsoft Access Database +--- magic/Magdir/msdos ++++ magic/Magdir/msdos 2006-11-22 16:01:01.000000000 +0100 +@@ -62,6 +62,7 @@ + >>&0 leshort 0x290 PA-RISC + >>&18 leshort&0x0100 >0 32-bit + >>&18 leshort&0x1000 >0 system file ++>>&228 lelong >0 \b, Mono/.Net assembly + >>&0xf4 search/0x140 \x0\x40\x1\x0 + >>>(&0.l+(4)) string MSCF \b, WinHKI CAB self-extracting archive + +@@ -86,7 +87,7 @@ + >>>>(0x3c.l+4) leshort 0x290 PA-RISC + >>>>(0x3c.l+22) leshort&0x0100 >0 32-bit + >>>>(0x3c.l+22) leshort&0x1000 >0 system file +->>>>(0x3c.l+232) lelong >0 Mono/.Net assembly ++>>>>(0x3c.l+232) lelong >0 \b, Mono/.Net assembly + + >>>>(0x3c.l+0xf8) string UPX0 \b, UPX compressed + >>>>(0x3c.l+0xf8) search/0x140 PEC2 \b, PECompact2 compressed +@@ -472,6 +473,13 @@ + # Acroread or something files wrongly identified as G3 .pfm + # these have the form \000 \001 any? \002 \000 \000 + # or \000 \001 any? \022 \000 \000 ++0 belong&0xffff00ff 0x00010012 PFM data ++>4 string \000\000 ++>6 string >\060 - %s ++ ++0 belong&0xffff00ff 0x00010002 PFM data ++>4 string \000\000 ++>6 string >\060 - %s + #0 string \000\001 pfm? + #>3 string \022\000\000Copyright\ yes + #>3 string \002\000\000Copyright\ yes +--- src/Makefile.am ++++ src/Makefile.am 2006-03-27 13:29:19.000000000 +0200 +@@ -1,4 +1,4 @@ +-MAGIC = $(pkgdatadir)/magic ++MAGIC = $(sysconfdir)/magic:$(pkgdatadir)/magic + lib_LTLIBRARIES = libmagic.la + include_HEADERS = magic.h + EXTRA_DIST = test.c +--- src/dcore.c ++++ src/dcore.c 2006-03-27 13:29:19.000000000 +0200 +@@ -0,0 +1,207 @@ ++/* ++ * Show goo about ELF core files ++ * Jeremy Fitzhardinge <jeremy(a)zip.com.au> 1996 ++ */ ++#include <unistd.h> ++#include <fcntl.h> ++#include <stdlib.h> ++#include <stdio.h> ++#include <sys/types.h> ++#include <string.h> ++#if defined __GLIBC__ && __GLIBC__ >= 2 ++#include <elf.h> ++#include <sys/procfs.h> ++# ifndef NT_PRFPREG ++# define NT_PRFPREG 2 ++# endif ++# ifndef NT_TASKSTRUCT ++# define NT_TASKSTRUCT 4 ++# endif ++#else ++#include <linux/elf.h> ++#include <linux/elfcore.h> ++#endif ++ ++static void fperror(const char *str) ++{ ++ perror(str); ++ exit(1); ++} ++ ++static size_t myread(int fd, void *buf, size_t sz) ++{ ++ size_t ret; ++ ++ if ((ret = read(fd, buf, sz)) != sz) ++ fperror("read failed"); ++ return ret; ++} ++ ++static void print_prstatus(const prstatus_t *pr) ++{ ++ unsigned i; ++ static const char *regs[] = { "ebx", "ecx", "edx", "esi", "edi", "ebp", ++ "eax", "ds", "es", "fs", "gs", ++ "orig_eax", "eip", "cs", ++ "efl", "uesp", "ss"}; ++ ++ printf(" pid=%d ppid=%d pgrp=%d sid=%d\n", ++ pr->pr_pid, pr->pr_ppid, pr->pr_pgrp, pr->pr_sid); ++ for(i = 0; i < NGREG; i++) ++ { ++ unsigned long val = pr->pr_reg[i]; ++ printf(" %-2u %-5s=%08lx %lu\n", i, regs[i], val, val); ++ } ++} ++ ++static void print_prpsinfo(const prpsinfo_t *ps) ++{ ++ printf(" uid=%d gid=%d\n", ps->pr_uid, ps->pr_gid); ++ printf(" comm=%s\n", ps->pr_fname); ++ printf(" psargs=%s\n", ps->pr_psargs); ++} ++ ++#define roundup(x, y) ((((x)+((y)-1))/(y))*(y)) ++ ++static void do_note(int fd, Elf32_Phdr *phdr) ++{ ++ off_t here = lseek(fd, 0, SEEK_CUR); ++ int size = phdr->p_filesz; ++ char *raw = alloca(size), *end; ++ end = raw+size; ++ ++ lseek(fd, phdr->p_offset, SEEK_SET); ++ myread(fd, raw, size); ++ ++ while(raw < end) ++ { ++ Elf32_Nhdr *note = (Elf32_Nhdr *)raw; ++ const char *str; ++ const char *name, *desc; ++ ++ raw += sizeof(*note); ++ name = raw; ++ raw += roundup(note->n_namesz, sizeof(long)); ++ desc = raw; ++ raw += roundup(note->n_descsz, sizeof(long)); ++ ++ printf(" name=%.*s", (int)note->n_namesz, name); ++ ++ if(strncmp(name, "CORE", note->n_namesz) != 0) ++ { ++ printf("\n"); ++ continue; ++ } ++ ++ switch(note->n_type) ++ { ++#define X(x) case x: str = #x; break; ++ X(NT_PRSTATUS); ++ X(NT_PRFPREG); ++ X(NT_PRPSINFO); ++ X(NT_TASKSTRUCT); ++#undef X ++ default: ++ str = "???"; ++ } ++ printf(" n_type=%s n_descsz=%ld\n", ++ str, note->n_descsz); ++ switch(note->n_type) ++ { ++ case NT_PRSTATUS: ++ print_prstatus((prstatus_t *)desc); ++ break; ++ case NT_PRPSINFO: ++ print_prpsinfo((prpsinfo_t *)desc); ++ break; ++ } ++ } ++ lseek(fd, here, SEEK_SET); ++} ++ ++int main(int argc, char *argv[]) ++{ ++ int fd; ++ Elf32_Ehdr elf; ++ int i; ++ ++ if (argc != 2) ++ { ++ fprintf(stderr, "Usage: %s corefile\n", argv[0]); ++ exit(1); ++ } ++ ++ if ((fd = open(argv[1], O_RDONLY)) == -1) ++ fperror("open of core"); ++ ++ myread(fd, &elf, sizeof(elf)); ++ ++ if (memcmp(ELFMAG, elf.e_ident, SELFMAG) != 0) ++ printf("bad magic\n"); ++ ++ if (elf.e_ident[EI_CLASS] != ELFCLASS32) ++ printf("wrong class\n"); ++ ++ if (elf.e_ident[EI_DATA] != ELFDATA2LSB) ++ printf("wrong endianess\n"); ++ ++ if (elf.e_ident[EI_VERSION] != EV_CURRENT) ++ printf("wrong version\n"); ++ ++ { ++ const char *str; ++ switch(elf.e_type) ++ { ++#define C(x) case ET_##x: str = #x; break; ++ C(NONE); ++ C(REL); ++ C(EXEC); ++ C(DYN); ++ C(CORE); ++#undef C ++ default: str = "???"; break; ++ } ++ printf("elf file type ET_%s\n", str); ++ } ++ ++ if (elf.e_machine != EM_386 && elf.e_machine != EM_486) ++ printf("not i386 or i486\n"); ++ ++ if (elf.e_ehsize != sizeof(elf)) ++ printf("wrong header size\n"); ++ ++ if (elf.e_phentsize != sizeof(Elf32_Phdr)) ++ printf("wrong phdr size\n"); ++ ++ if (lseek(fd, elf.e_phoff, SEEK_SET) != (off_t)elf.e_phoff) ++ fperror("lseek to phdr failed\n"); ++ ++ for(i = 0; i < elf.e_phnum; i++) ++ { ++ Elf32_Phdr phdr; ++ const char *str; ++ ++ myread(fd, &phdr, sizeof(phdr)); ++ switch(phdr.p_type) ++ { ++#define C(x) case PT_##x: str = #x; break; ++ C(NULL); ++ C(LOAD); ++ C(DYNAMIC); ++ C(INTERP); ++ C(NOTE); ++ C(SHLIB); ++ C(PHDR); ++#undef C ++ default: ++ str = "???"; break; ++ } ++ printf("type PT_%s off=%ld vaddr=%lx filesz=%ld flags=%lx\n", ++ str, phdr.p_offset, phdr.p_vaddr, phdr.p_filesz, ++ (unsigned long)phdr.p_flags); ++ if (phdr.p_type == PT_NOTE) ++ do_note(fd, &phdr); ++ } ++ exit(0); ++} ++ ++++++ file-4.17.tar.bz2 -> file-4.18.tar.bz2 ++++++ ++++ 10746 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit coreutils
by root＠suse.de 06 Dec '06

06 Dec '06

Hello community, here is the log from the commit of package coreutils checked in at Wed Dec 6 12:02:08 CET 2006. -------- --- coreutils/coreutils.changes 2006-12-02 21:00:50.000000000 +0100 +++ /mounts/work_src_done/STABLE/coreutils/coreutils.changes 2006-12-06 11:59:08.000000000 +0100 @@ -16,0 +17,14 @@ +Mon Nov 20 11:34:05 CET 2006 - schwab(a)suse.de + +- Update to coreutils 6.5. + ** Bug fixes + du (and the other fts clients: chmod, chgrp, chown) would exit early + when encountering an inaccessible directory on a system with native + openat support (i.e., linux-2.6.16 or newer along with glibc-2.4 + or newer). This bug was introduced with the switch to gnulib's + openat-based variant of fts, for coreutils-6.0. + "ln --backup f f" now produces a sensible diagnostic + ** New features + rm accepts a new option: --one-file-system + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ coreutils.spec ++++++ --- /var/tmp/diff_new_pack.Py68hd/_old 2006-12-06 11:59:21.000000000 +0100 +++ /var/tmp/diff_new_pack.Py68hd/_new 2006-12-06 11:59:21.000000000 +0100 @@ -21,7 +21,7 @@ Autoreqprov: on PreReq: %{install_info_prereq} Version: 6.6 -Release: 1 +Release: 2 Summary: GNU Core Utilities Source: coreutils-%{version}.tar.bz2 Source1: su.pamd @@ -181,6 +181,17 @@ Now, du (and the other fts clients: chmod, chgrp, chown) honor a trailing slash in the name of a symlink-to-directory even on Solaris 9, by working around its buggy fstatat implementation. +* Mon Nov 20 2006 - schwab(a)suse.de +- Update to coreutils 6.5. + ** Bug fixes + du (and the other fts clients: chmod, chgrp, chown) would exit early + when encountering an inaccessible directory on a system with native + openat support (i.e., linux-2.6.16 or newer along with glibc-2.4 + or newer). This bug was introduced with the switch to gnulib's + openat-based variant of fts, for coreutils-6.0. + "ln --backup f f" now produces a sensible diagnostic + ** New features + rm accepts a new option: --one-file-system * Mon Oct 23 2006 - schwab(a)suse.de - Update to coreutils 6.4. ** Bug fixes ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit coreutils
by root＠suse.de 06 Dec '06

06 Dec '06

Hello community, here is the log from the commit of package coreutils checked in at Wed Dec 6 11:59:12 CET 2006. -------- --- coreutils/coreutils.changes 2006-10-23 10:59:29.000000000 +0200 +++ /mounts/work_src_done/STABLE/coreutils/coreutils.changes 2006-12-02 21:00:50.000000000 +0100 @@ -1,0 +2,15 @@ +Wed Nov 22 16:16:52 CET 2006 - schwab(a)suse.de + +- Update to coreutils 6.6. + ** Bug fixes + ls would segfault (dereference a NULL pointer) for a file with a + nameless group or owner. This bug was introduced in coreutils-6.5. + A bug in the latest official m4/gettext.m4 (from gettext-0.15) + made configure fail to detect gettext support, due to the unusual + way in which coreutils uses AM_GNU_GETTEXT. + ** Improved robustness + Now, du (and the other fts clients: chmod, chgrp, chown) honor a + trailing slash in the name of a symlink-to-directory even on + Solaris 9, by working around its buggy fstatat implementation. + +------------------------------------------------------------------- @@ -6 +20,0 @@ - @@ -11 +24,0 @@ - @@ -14 +26,0 @@ - Old: ---- coreutils-6.4.diff coreutils-6.4.tar.bz2 New: ---- coreutils-6.6.diff coreutils-6.6.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ coreutils.spec ++++++ --- /var/tmp/diff_new_pack.08YZJL/_old 2006-12-06 11:57:17.000000000 +0100 +++ /var/tmp/diff_new_pack.08YZJL/_new 2006-12-06 11:57:17.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package coreutils (Version 6.4) +# spec file for package coreutils (Version 6.6) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -13,14 +13,14 @@ Name: coreutils BuildRequires: help2man libacl-devel pam-devel URL: http://www.gnu.org/software/coreutils/ -License: GNU General Public License (GPL) - all versions +License: GNU General Public License (GPL) Group: System/Base Provides: fileutil fileutils sh-utils sh_utils shellutl stat textutil textutils textutl txtutils Obsoletes: fileutil fileutils sh-utils sh_utils stat textutil textutils Obsoletes: libselinux <= 1.23.11-3 libselinux-32bit >= 9 libselinux-64bit = 9 libselinux-x86 = 9 Autoreqprov: on PreReq: %{install_info_prereq} -Version: 6.4 +Version: 6.6 Release: 1 Summary: GNU Core Utilities Source: coreutils-%{version}.tar.bz2 @@ -169,6 +169,18 @@ %dir %{_prefix}/share/locale/*/LC_TIME %changelog -n coreutils +* Wed Nov 22 2006 - schwab(a)suse.de +- Update to coreutils 6.6. + ** Bug fixes + ls would segfault (dereference a NULL pointer) for a file with a + nameless group or owner. This bug was introduced in coreutils-6.5. + A bug in the latest official m4/gettext.m4 (from gettext-0.15) + made configure fail to detect gettext support, due to the unusual + way in which coreutils uses AM_GNU_GETTEXT. + ** Improved robustness + Now, du (and the other fts clients: chmod, chgrp, chown) honor a + trailing slash in the name of a symlink-to-directory even on + Solaris 9, by working around its buggy fstatat implementation. * Mon Oct 23 2006 - schwab(a)suse.de - Update to coreutils 6.4. ** Bug fixes ++++++ coreutils-5.3.0-i18n-0.1.patch ++++++ --- /var/tmp/diff_new_pack.08YZJL/_old 2006-12-06 11:57:17.000000000 +0100 +++ /var/tmp/diff_new_pack.08YZJL/_new 2006-12-06 11:57:17.000000000 +0100 @@ -1,5 +1,5 @@ ---- coreutils-5.90/lib/linebuffer.h -+++ coreutils-5.90/lib/linebuffer.h +--- coreutils-6.5/lib/linebuffer.h ++++ coreutils-6.5/lib/linebuffer.h @@ -22,6 +22,11 @@ # include <stdio.h> @@ -22,8 +22,8 @@ }; /* Initialize linebuffer LINEBUFFER for use. */ ---- coreutils-5.90/src/cut.c -+++ coreutils-5.90/src/cut.c +--- coreutils-6.5/src/cut.c ++++ coreutils-6.5/src/cut.c @@ -29,6 +29,12 @@ #include <assert.h> #include <getopt.h> @@ -615,8 +615,8 @@ } if (optind == argc) ---- coreutils-5.90/src/expand.c -+++ coreutils-5.90/src/expand.c +--- coreutils-6.5/src/expand.c ++++ coreutils-6.5/src/expand.c @@ -38,11 +38,31 @@ #include <stdio.h> #include <getopt.h> @@ -649,7 +649,7 @@ /* The official name of this program (e.g., no `g' prefix). */ #define PROGRAM_NAME "expand" -@@ -346,9 +366,12 @@ +@@ -347,9 +367,12 @@ } else { @@ -664,8 +664,8 @@ + } } - convert &= convert_entire_line | ISBLANK (c); -@@ -364,6 +387,165 @@ + convert &= convert_entire_line | !! isblank (c); +@@ -365,6 +388,165 @@ } } @@ -831,7 +831,7 @@ int main (int argc, char **argv) { -@@ -428,7 +610,12 @@ +@@ -429,7 +611,12 @@ file_list = (optind < argc ? &argv[optind] : stdin_argv); @@ -845,8 +845,8 @@ if (have_read_stdin && fclose (stdin) != 0) error (EXIT_FAILURE, errno, "-"); ---- coreutils-5.90/src/fold.c -+++ coreutils-5.90/src/fold.c +--- coreutils-6.5/src/fold.c ++++ coreutils-6.5/src/fold.c @@ -23,6 +23,19 @@ #include <getopt.h> #include <sys/types.h> @@ -970,7 +970,7 @@ - Return true if successful. */ - -static bool --fold_file (char *filename, size_t width) +-fold_file (char const *filename, size_t width) +static int +fold_text (FILE *istream, size_t width) { @@ -1008,7 +1008,7 @@ + +#if HAVE_MBRTOWC +static void -+fold_multibyte_text (FILE *istream, int width) ++fold_multibyte_text (FILE *istream, size_t width) +{ + int i; + char buf[MB_LEN_MAX + BUFSIZ]; /* For spooling a read byte sequence. */ @@ -1204,7 +1204,7 @@ + Return true if successful. */ + +static bool -+fold_file (char *filename, int width) ++fold_file (char const *filename, size_t width) +{ + FILE *istream; + int saved_errno; @@ -1262,8 +1262,8 @@ break; case 's': /* Break at word boundaries. */ ---- coreutils-5.90/src/join.c -+++ coreutils-5.90/src/join.c +--- coreutils-6.5/src/join.c ++++ coreutils-6.5/src/join.c @@ -23,6 +23,16 @@ #include <sys/types.h> #include <getopt.h> @@ -1309,7 +1309,7 @@ static struct option const longopts[] = { -@@ -206,10 +224,10 @@ +@@ -199,10 +217,10 @@ if (ptr == lim) return; @@ -1322,7 +1322,7 @@ extract_field (line, ptr, sep - ptr); } else -@@ -236,6 +254,133 @@ +@@ -229,6 +247,133 @@ extract_field (line, ptr, lim - ptr); } @@ -1456,7 +1456,7 @@ /* Read a line from FP into LINE and split it into fields. Return true if successful. */ -@@ -256,7 +401,13 @@ +@@ -249,7 +394,13 @@ line->nfields_allocated = 0; line->nfields = 0; line->fields = NULL; @@ -1471,7 +1471,7 @@ return true; } -@@ -310,56 +461,115 @@ +@@ -303,56 +454,115 @@ keycmp (struct line const *line1, struct line const *line2) { /* Start of field to compare in each file. */ @@ -1609,7 +1609,7 @@ } /* Print field N of LINE if it exists and is nonempty, otherwise -@@ -388,7 +598,8 @@ +@@ -381,7 +591,8 @@ prjoin (struct line const *line1, struct line const *line2) { const struct outlist *outlist; @@ -1619,7 +1619,7 @@ outlist = outlist_head.next; if (outlist) -@@ -423,7 +634,7 @@ +@@ -416,7 +627,7 @@ o = o->next; if (o == NULL) break; @@ -1628,7 +1628,7 @@ } putchar ('\n'); } -@@ -441,23 +652,23 @@ +@@ -434,23 +645,23 @@ prfield (join_field_1, line1); for (i = 0; i < join_field_1 && i < line1->nfields; ++i) { @@ -1656,7 +1656,7 @@ prfield (i, line2); } putchar ('\n'); -@@ -869,20 +1080,40 @@ +@@ -862,20 +1073,40 @@ case 't': { @@ -1702,8 +1702,8 @@ } break; ---- coreutils-5.90/src/pr.c -+++ coreutils-5.90/src/pr.c +--- coreutils-6.5/src/pr.c ++++ coreutils-6.5/src/pr.c @@ -313,6 +313,32 @@ #include <getopt.h> @@ -2433,8 +2433,8 @@ /* We've just printed some files and need to clean up things before looking for more options and printing the next batch of files. ---- coreutils-5.90/src/sort.c -+++ coreutils-5.90/src/sort.c +--- coreutils-6.5/src/sort.c ++++ coreutils-6.5/src/sort.c @@ -26,6 +26,19 @@ #include <getopt.h> #include <sys/types.h> @@ -2455,7 +2455,7 @@ #include "system.h" #include "error.h" #include "hard-locale.h" -@@ -47,6 +60,17 @@ +@@ -50,6 +63,17 @@ # define getrlimit(Resource, Rlp) (-1) #endif @@ -2473,7 +2473,7 @@ /* The official name of this program (e.g., no `g' prefix). */ #define PROGRAM_NAME "sort" -@@ -95,14 +119,38 @@ +@@ -98,14 +122,38 @@ /* Thousands separator; if -1, then there isn't one. */ static int thousands_sep; @@ -2513,7 +2513,7 @@ /* The kind of blanks for '-b' to skip in various options. */ enum blanktype { bl_start, bl_end, bl_both }; -@@ -239,13 +287,11 @@ +@@ -243,13 +291,11 @@ they were read if all keys compare equal. */ static bool stable; @@ -2531,7 +2531,7 @@ /* Flag to remove consecutive duplicate lines from the output. Only the last of a sequence of equal lines will be output. */ -@@ -392,6 +438,43 @@ +@@ -408,6 +454,43 @@ static struct tempnode *volatile temphead; static struct tempnode *volatile *temptail = &temphead; @@ -2575,7 +2575,7 @@ /* Clean up any remaining temporary files. */ static void -@@ -545,7 +628,7 @@ +@@ -561,7 +644,7 @@ free (node); } @@ -2584,8 +2584,8 @@ static int struct_month_cmp (const void *m1, const void *m2) -@@ -572,7 +655,7 @@ - fold_toupper[i] = (ISLOWER (i) ? toupper (i) : i); +@@ -588,7 +671,7 @@ + fold_toupper[i] = toupper (i); } -#if HAVE_NL_LANGINFO @@ -2593,7 +2593,7 @@ /* If we're not in the "C" locale, read different names for months. */ if (hard_LC_TIME) { -@@ -598,6 +681,71 @@ +@@ -614,6 +697,71 @@ #endif } @@ -2665,7 +2665,7 @@ /* Specify the amount of main memory to use when sorting. */ static void specify_sort_size (char const *s) -@@ -808,7 +956,7 @@ +@@ -824,7 +972,7 @@ by KEY in LINE. */ static char * @@ -2674,7 +2674,7 @@ { char *ptr = line->text, *lim = ptr + line->length - 1; size_t sword = key->sword; -@@ -818,10 +966,10 @@ +@@ -834,10 +982,10 @@ /* The leading field separator itself is included in a field when -t is absent. */ @@ -2687,7 +2687,7 @@ ++ptr; if (ptr < lim) ++ptr; -@@ -849,11 +997,70 @@ +@@ -865,11 +1013,70 @@ return ptr; } @@ -2759,7 +2759,7 @@ { char *ptr = line->text, *lim = ptr + line->length - 1; size_t eword = key->eword, echar = key->echar; -@@ -866,10 +1073,10 @@ +@@ -882,10 +1089,10 @@ `beginning' is the first character following the delimiting TAB. Otherwise, leave PTR pointing at the first `blank' character after the preceding field. */ @@ -2772,7 +2772,7 @@ ++ptr; if (ptr < lim && (eword | echar)) ++ptr; -@@ -915,7 +1122,7 @@ +@@ -931,7 +1138,7 @@ */ /* Make LIM point to the end of (one byte past) the current field. */ @@ -2781,7 +2781,7 @@ { char *newlim; newlim = memchr (ptr, tab, lim - ptr); -@@ -951,6 +1158,107 @@ +@@ -967,6 +1174,107 @@ return ptr; } @@ -2889,7 +2889,7 @@ /* Fill BUF reading from FP, moving buf->left bytes from the end of buf->buf to the beginning first. If EOF is reached and the file wasn't terminated by a newline, supply one. Set up BUF's line -@@ -1033,8 +1341,22 @@ +@@ -1049,8 +1357,22 @@ else { if (key->skipsblanks) @@ -2914,7 +2914,7 @@ line->keybeg = line_start; } } -@@ -1084,15 +1406,59 @@ +@@ -1100,15 +1422,59 @@ /* FIXME: maybe add option to try expensive FP conversion only if A and B can't be compared more cheaply/accurately. */ @@ -2981,7 +2981,7 @@ return 1; /* Sort numbers in the usual way, where -0 == +0. Put NaNs after -@@ -1110,7 +1476,7 @@ +@@ -1126,7 +1492,7 @@ Return 0 if the name in S is not recognized. */ static int @@ -2990,8 +2990,8 @@ { size_t lo = 0; size_t hi = MONTHS_PER_YEAR; -@@ -1152,11 +1518,79 @@ - return 0; +@@ -1281,11 +1647,79 @@ + return diff; } +#if HAVE_MBRTOWC @@ -3071,7 +3071,7 @@ { struct keyfield const *key = keylist; -@@ -1320,12 +1754,189 @@ +@@ -1452,12 +1886,189 @@ return 0; @@ -3263,7 +3263,7 @@ /* Compare two lines A and B, returning negative, zero, or positive depending on whether A compares less than, equal to, or greater than B. */ -@@ -2074,6 +2685,11 @@ +@@ -2253,6 +2864,11 @@ break; case 'M': key->month = true; @@ -3275,7 +3275,7 @@ break; case 'n': key->numeric = true; -@@ -2124,7 +2740,7 @@ +@@ -2309,7 +2925,7 @@ atexit (close_stdout); hard_LC_COLLATE = hard_locale (LC_COLLATE); @@ -3284,7 +3284,7 @@ hard_LC_TIME = hard_locale (LC_TIME); #endif -@@ -2137,14 +2753,40 @@ +@@ -2322,14 +2938,40 @@ add support for multibyte decimal points. */ decimal_point = to_uchar (locale->decimal_point[0]); if (! decimal_point || locale->decimal_point[1]) @@ -3327,7 +3327,7 @@ have_read_stdin = false; inittables (); -@@ -2346,13 +2988,32 @@ +@@ -2544,13 +3186,32 @@ case 't': { @@ -3364,7 +3364,7 @@ else { /* Provoke with `sort -txx'. Complain about -@@ -2363,9 +3024,12 @@ +@@ -2561,9 +3222,12 @@ quote (optarg)); } } @@ -3378,8 +3378,8 @@ } break; ---- coreutils-5.90/src/unexpand.c -+++ coreutils-5.90/src/unexpand.c +--- coreutils-6.5/src/unexpand.c ++++ coreutils-6.5/src/unexpand.c @@ -39,11 +39,34 @@ #include <stdio.h> #include <getopt.h> @@ -3415,7 +3415,7 @@ /* The official name of this program (e.g., no `g' prefix). */ #define PROGRAM_NAME "unexpand" -@@ -454,6 +477,237 @@ +@@ -453,6 +476,237 @@ } } @@ -3653,7 +3653,7 @@ int main (int argc, char **argv) { -@@ -532,7 +786,12 @@ +@@ -531,7 +785,12 @@ file_list = (optind < argc ? &argv[optind] : stdin_argv); @@ -3667,8 +3667,8 @@ if (have_read_stdin && fclose (stdin) != 0) error (EXIT_FAILURE, errno, "-"); ---- coreutils-5.90/src/uniq.c -+++ coreutils-5.90/src/uniq.c +--- coreutils-6.5/src/uniq.c ++++ coreutils-6.5/src/uniq.c @@ -23,6 +23,16 @@ #include <getopt.h> #include <sys/types.h> ++++++ coreutils-6.4.diff -> coreutils-6.6.diff ++++++ --- coreutils/coreutils-6.4.diff 2006-09-18 11:51:27.000000000 +0200 +++ /mounts/work_src_done/STABLE/coreutils/coreutils-6.6.diff 2006-11-22 16:15:54.000000000 +0100 @@ -18,7 +18,7 @@ @command{date}: Print or set system date and time -@@ -12178,8 +12174,6 @@ +@@ -12190,8 +12186,6 @@ @menu * date invocation:: Print or set system date and time. * uname invocation:: Print system information. @@ -27,7 +27,7 @@ @end menu -@@ -12937,55 +12931,6 @@ +@@ -12949,55 +12943,6 @@ @exitstatus @@ -731,7 +731,7 @@ #ifdef SYSLOG_SUCCESS --- src/system.h +++ src/system.h -@@ -184,7 +184,7 @@ +@@ -173,7 +173,7 @@ # define DEV_BSIZE BBSIZE #endif #ifndef DEV_BSIZE @@ -742,7 +742,7 @@ /* Extract or fake data from a `struct stat'. --- tests/help-version +++ tests/help-version -@@ -185,7 +185,7 @@ +@@ -190,7 +190,7 @@ for i in $all_programs; do # Skip these. @@ -751,8 +751,8 @@ rm -rf $tmp_in $tmp_in2 $tmp_dir $tmp_out echo > $tmp_in ---- tests/mv/setup -+++ tests/mv/setup +--- tests/other-fs-tmpdir ++++ tests/other-fs-tmpdir @@ -44,6 +44,8 @@ fi ++++++ coreutils-6.4.tar.bz2 -> coreutils-6.6.tar.bz2 ++++++ ++++ 59844 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit binutils
by root＠suse.de 06 Dec '06

06 Dec '06

Hello community, here is the log from the commit of package binutils checked in at Wed Dec 6 11:58:18 CET 2006. -------- --- binutils/binutils.changes 2006-10-16 19:24:52.000000000 +0200 +++ /mounts/work_src_done/STABLE/binutils/binutils.changes 2006-12-04 14:09:43.000000000 +0100 @@ -1,0 +2,10 @@ +Mon Dec 4 14:09:23 CET 2006 - schwab(a)suse.de + +- Update to binutils 2.17.50.0.5. + 1. Update from binutils 2006 1201. + 2. Fix "objcopy --only-keep-debug" crash. PR 3609. + 3. Fix various ARM ELF bugs. + 4. Fix various xtensa bugs. + 5. Update x86 disassembler. + +------------------------------------------------------------------- @@ -4 +14 @@ -- Fix overflow in addend_compare [#211596]. +- Fix overflow in addend_compare [#209807]. cross-alpha-binutils.changes: same change cross-arm-binutils.changes: same change cross-avr-binutils.changes: same change cross-hppa-binutils.changes: same change cross-i386-binutils.changes: same change cross-ia64-binutils.changes: same change cross-mips-binutils.changes: same change cross-ppc-binutils.changes: same change cross-ppc64-binutils.changes: same change cross-s390-binutils.changes: same change cross-s390x-binutils.changes: same change cross-sparc-binutils.changes: same change cross-x86_64-binutils.changes: same change Old: ---- addend-compare.diff binutils-2.17.50.0.5.tar.bz2 dw-at-ranges.diff pr210331.diff string-comma-len.diff New: ---- binutils-2.17.50.0.8.tar.bz2 hjl-patches.diff ld-elfvsb.diff subsegs.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ binutils.spec ++++++ --- /var/tmp/diff_new_pack.piMygQ/_old 2006-12-06 11:57:38.000000000 +0100 +++ /var/tmp/diff_new_pack.piMygQ/_new 2006-12-06 11:57:38.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package binutils (Version 2.17.50.0.5) +# spec file for package binutils (Version 2.17.50.0.8) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -21,7 +21,7 @@ # # handle test suite failures # -%ifarch alpha armv4l hppa mips ppc64 sparc sparc64 +%ifarch alpha armv4l hppa mips sparc sparc64 %define make_check_handling true %else %define make_check_handling false @@ -41,15 +41,15 @@ # # URL: http://www.gnu.org/software/binutils/ -License: GNU General Public License (GPL) - all versions, GNU Library General Public License v. 2.0 and 2.1 (LGPL) +License: GNU General Public License (GPL), GNU Library General Public License v. 2.0 and 2.1 (LGPL) Group: Development/Tools/Building PreReq: %{install_info_prereq} %if "%name" == "binutils" Obsoletes: binuti_o %endif Autoreqprov: on -Version: 2.17.50.0.5 -Release: 10 +Version: 2.17.50.0.8 +Release: 1 Summary: GNU Binutils Source: ftp://ftp.kernel.org/pub/linux/devel/binutils/binutils-%{version}.tar.bz2 Source1: pre_checkin.sh @@ -64,14 +64,13 @@ Patch7: ld-dtags.diff Patch8: ld-relro.diff Patch9: testsuite.diff -Patch10: string-comma-len.diff -Patch11: pr210331.diff -Patch12: dw-at-ranges.diff -Patch13: addend-compare.diff +Patch10: subsegs.diff +Patch11: ld-elfvsb.diff Patch16: s390-pic-dso.diff Patch17: suse-bdirect.diff Patch18: suse-dynsort.diff Patch19: suse-hashvals.diff +Patch42: hjl-patches.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %if "%{name}" != "binutils" %define _prefix /opt/cross @@ -84,9 +83,6 @@ size, strings, and strip. These utilities are needed whenever you want to compile a program or kernel. -This version has been compiled by SUSE with the corresponding C -library. It is not designed for cross-compiling to other architectures. - Authors: @@ -154,6 +150,7 @@ echo "make check will return with %{make_check_handling} in case of testsuite failures." %setup -q -n binutils-%{version} %if !%{test_vanilla} +%patch42 # Apply H.J.Lu's patches test -f patches/README && sh patches/README @@ -161,11 +158,7 @@ %patch %patch1 %patch2 -# -# experimental stuff not for the older distris -%if %suse_version > 820 %patch3 -%endif %patch4 %patch5 %patch6 @@ -173,10 +166,8 @@ %patch8 %patch9 %patch10 -%patch16 %patch11 -%patch12 -%patch13 +%patch16 %patch17 -p1 %patch18 -p1 %patch19 -p1 @@ -356,8 +347,15 @@ %endif %changelog -n binutils +* Mon Dec 04 2006 - schwab(a)suse.de +- Update to binutils 2.17.50.0.5. + 1. Update from binutils 2006 1201. + 2. Fix "objcopy --only-keep-debug" crash. PR 3609. + 3. Fix various ARM ELF bugs. + 4. Fix various xtensa bugs. + 5. Update x86 disassembler. * Mon Oct 16 2006 - schwab(a)suse.de -- Fix overflow in addend_compare [#211596]. +- Fix overflow in addend_compare [#209807]. * Fri Oct 13 2006 - schwab(a)suse.de - Update last change. * Tue Oct 10 2006 - schwab(a)suse.de ++++++ cross-alpha-binutils.spec ++++++ --- /var/tmp/diff_new_pack.piMygQ/_old 2006-12-06 11:57:38.000000000 +0100 +++ /var/tmp/diff_new_pack.piMygQ/_new 2006-12-06 11:57:38.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package cross-alpha-binutils (Version 2.17.50.0.5) +# spec file for package cross-alpha-binutils (Version 2.17.50.0.8) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -21,7 +21,7 @@ # # handle test suite failures # -%ifarch alpha armv4l hppa mips ppc64 sparc sparc64 +%ifarch alpha armv4l hppa mips sparc sparc64 %define make_check_handling true %else %define make_check_handling false @@ -41,15 +41,15 @@ # # URL: http://www.gnu.org/software/binutils/ -License: Other License(s), see package +License: GNU General Public License (GPL), GNU Library General Public License v. 2.0 and 2.1 (LGPL) Group: Development/Tools/Building PreReq: %{install_info_prereq} %if "%name" == "binutils" Obsoletes: binuti_o %endif Autoreqprov: on -Version: 2.17.50.0.5 -Release: 10 +Version: 2.17.50.0.8 +Release: 1 Summary: GNU binutils for Cross-Development to ARM Processors Source: ftp://ftp.kernel.org/pub/linux/devel/binutils/binutils-%{version}.tar.bz2 Source1: pre_checkin.sh @@ -64,14 +64,13 @@ Patch7: ld-dtags.diff Patch8: ld-relro.diff Patch9: testsuite.diff -Patch10: string-comma-len.diff -Patch11: pr210331.diff -Patch12: dw-at-ranges.diff -Patch13: addend-compare.diff +Patch10: subsegs.diff +Patch11: ld-elfvsb.diff Patch16: s390-pic-dso.diff Patch17: suse-bdirect.diff Patch18: suse-dynsort.diff Patch19: suse-hashvals.diff +Patch42: hjl-patches.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %if "%{name}" != "binutils" %define _prefix /opt/cross @@ -156,6 +155,7 @@ echo "make check will return with %{make_check_handling} in case of testsuite failures." %setup -q -n binutils-%{version} %if !%{test_vanilla} +%patch42 # Apply H.J.Lu's patches test -f patches/README && sh patches/README @@ -163,11 +163,7 @@ %patch %patch1 %patch2 -# -# experimental stuff not for the older distris -%if %suse_version > 820 %patch3 -%endif %patch4 %patch5 %patch6 @@ -175,10 +171,8 @@ %patch8 %patch9 %patch10 -%patch16 %patch11 -%patch12 -%patch13 +%patch16 %patch17 -p1 %patch18 -p1 %patch19 -p1 @@ -358,8 +352,15 @@ %endif %changelog -n cross-alpha-binutils +* Mon Dec 04 2006 - schwab(a)suse.de +- Update to binutils 2.17.50.0.5. + 1. Update from binutils 2006 1201. + 2. Fix "objcopy --only-keep-debug" crash. PR 3609. + 3. Fix various ARM ELF bugs. + 4. Fix various xtensa bugs. + 5. Update x86 disassembler. * Mon Oct 16 2006 - schwab(a)suse.de -- Fix overflow in addend_compare [#211596]. +- Fix overflow in addend_compare [#209807]. * Fri Oct 13 2006 - schwab(a)suse.de - Update last change. * Tue Oct 10 2006 - schwab(a)suse.de ++++++ cross-arm-binutils.spec ++++++ --- /var/tmp/diff_new_pack.piMygQ/_old 2006-12-06 11:57:38.000000000 +0100 +++ /var/tmp/diff_new_pack.piMygQ/_new 2006-12-06 11:57:38.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package cross-arm-binutils (Version 2.17.50.0.5) +# spec file for package cross-arm-binutils (Version 2.17.50.0.8) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -21,7 +21,7 @@ # # handle test suite failures # -%ifarch alpha armv4l hppa mips ppc64 sparc sparc64 +%ifarch alpha armv4l hppa mips sparc sparc64 %define make_check_handling true %else %define make_check_handling false @@ -41,15 +41,15 @@ # # URL: http://www.gnu.org/software/binutils/ -License: GNU General Public License (GPL) - all versions, GNU Library General Public License v. 2.0 and 2.1 (LGPL) +License: GNU General Public License (GPL), GNU Library General Public License v. 2.0 and 2.1 (LGPL) Group: Development/Tools/Building PreReq: %{install_info_prereq} %if "%name" == "binutils" Obsoletes: binuti_o %endif Autoreqprov: on -Version: 2.17.50.0.5 -Release: 10 +Version: 2.17.50.0.8 +Release: 1 Summary: GNU binutils for Cross-Development to ARM Processors Source: ftp://ftp.kernel.org/pub/linux/devel/binutils/binutils-%{version}.tar.bz2 Source1: pre_checkin.sh @@ -64,14 +64,13 @@ Patch7: ld-dtags.diff Patch8: ld-relro.diff Patch9: testsuite.diff -Patch10: string-comma-len.diff -Patch11: pr210331.diff -Patch12: dw-at-ranges.diff -Patch13: addend-compare.diff +Patch10: subsegs.diff +Patch11: ld-elfvsb.diff Patch16: s390-pic-dso.diff Patch17: suse-bdirect.diff Patch18: suse-dynsort.diff Patch19: suse-hashvals.diff +Patch42: hjl-patches.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %if "%{name}" != "binutils" %define _prefix /opt/cross @@ -156,6 +155,7 @@ echo "make check will return with %{make_check_handling} in case of testsuite failures." %setup -q -n binutils-%{version} %if !%{test_vanilla} +%patch42 # Apply H.J.Lu's patches test -f patches/README && sh patches/README @@ -163,11 +163,7 @@ %patch %patch1 %patch2 -# -# experimental stuff not for the older distris -%if %suse_version > 820 %patch3 -%endif %patch4 %patch5 %patch6 @@ -175,10 +171,8 @@ %patch8 %patch9 %patch10 -%patch16 %patch11 -%patch12 -%patch13 +%patch16 %patch17 -p1 %patch18 -p1 %patch19 -p1 @@ -358,8 +352,15 @@ %endif %changelog -n cross-arm-binutils +* Mon Dec 04 2006 - schwab(a)suse.de +- Update to binutils 2.17.50.0.5. + 1. Update from binutils 2006 1201. + 2. Fix "objcopy --only-keep-debug" crash. PR 3609. + 3. Fix various ARM ELF bugs. + 4. Fix various xtensa bugs. + 5. Update x86 disassembler. * Mon Oct 16 2006 - schwab(a)suse.de -- Fix overflow in addend_compare [#211596]. +- Fix overflow in addend_compare [#209807]. * Fri Oct 13 2006 - schwab(a)suse.de - Update last change. * Tue Oct 10 2006 - schwab(a)suse.de ++++++ cross-avr-binutils.spec ++++++ --- /var/tmp/diff_new_pack.piMygQ/_old 2006-12-06 11:57:38.000000000 +0100 +++ /var/tmp/diff_new_pack.piMygQ/_new 2006-12-06 11:57:38.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package cross-avr-binutils (Version 2.17.50.0.5) +# spec file for package cross-avr-binutils (Version 2.17.50.0.8) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -21,7 +21,7 @@ # # handle test suite failures # -%ifarch alpha armv4l hppa mips ppc64 sparc sparc64 +%ifarch alpha armv4l hppa mips sparc sparc64 %define make_check_handling true %else %define make_check_handling false @@ -41,15 +41,15 @@ # # URL: http://www.gnu.org/software/binutils/ -License: Other License(s), see package +License: GNU General Public License (GPL), GNU Library General Public License v. 2.0 and 2.1 (LGPL) Group: Development/Tools/Building PreReq: %{install_info_prereq} %if "%name" == "binutils" Obsoletes: binuti_o %endif Autoreqprov: on -Version: 2.17.50.0.5 -Release: 10 +Version: 2.17.50.0.8 +Release: 1 Summary: GNU Binutils Source: ftp://ftp.kernel.org/pub/linux/devel/binutils/binutils-%{version}.tar.bz2 Source1: pre_checkin.sh @@ -64,14 +64,13 @@ Patch7: ld-dtags.diff Patch8: ld-relro.diff Patch9: testsuite.diff -Patch10: string-comma-len.diff -Patch11: pr210331.diff -Patch12: dw-at-ranges.diff -Patch13: addend-compare.diff +Patch10: subsegs.diff +Patch11: ld-elfvsb.diff Patch16: s390-pic-dso.diff Patch17: suse-bdirect.diff Patch18: suse-dynsort.diff Patch19: suse-hashvals.diff +Patch42: hjl-patches.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %if "%{name}" != "binutils" %define _prefix /opt/cross @@ -156,6 +155,7 @@ echo "make check will return with %{make_check_handling} in case of testsuite failures." %setup -q -n binutils-%{version} %if !%{test_vanilla} +%patch42 # Apply H.J.Lu's patches test -f patches/README && sh patches/README @@ -163,11 +163,7 @@ %patch %patch1 %patch2 -# -# experimental stuff not for the older distris -%if %suse_version > 820 %patch3 -%endif %patch4 %patch5 %patch6 @@ -175,10 +171,8 @@ %patch8 %patch9 %patch10 -%patch16 %patch11 -%patch12 -%patch13 +%patch16 %patch17 -p1 %patch18 -p1 %patch19 -p1 @@ -358,8 +352,15 @@ %endif %changelog -n cross-avr-binutils +* Mon Dec 04 2006 - schwab(a)suse.de +- Update to binutils 2.17.50.0.5. + 1. Update from binutils 2006 1201. + 2. Fix "objcopy --only-keep-debug" crash. PR 3609. + 3. Fix various ARM ELF bugs. + 4. Fix various xtensa bugs. + 5. Update x86 disassembler. * Mon Oct 16 2006 - schwab(a)suse.de -- Fix overflow in addend_compare [#211596]. +- Fix overflow in addend_compare [#209807]. * Fri Oct 13 2006 - schwab(a)suse.de - Update last change. * Tue Oct 10 2006 - schwab(a)suse.de ++++++ cross-hppa-binutils.spec ++++++ --- /var/tmp/diff_new_pack.piMygQ/_old 2006-12-06 11:57:38.000000000 +0100 +++ /var/tmp/diff_new_pack.piMygQ/_new 2006-12-06 11:57:38.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package cross-hppa-binutils (Version 2.17.50.0.5) +# spec file for package cross-hppa-binutils (Version 2.17.50.0.8) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -21,7 +21,7 @@ # # handle test suite failures # -%ifarch alpha armv4l hppa mips ppc64 sparc sparc64 +%ifarch alpha armv4l hppa mips sparc sparc64 %define make_check_handling true %else %define make_check_handling false @@ -41,15 +41,15 @@ # # URL: http://www.gnu.org/software/binutils/ -License: Other License(s), see package, X11/MIT +License: GNU General Public License (GPL), GNU Library General Public License v. 2.0 and 2.1 (LGPL) Group: Development/Tools/Building PreReq: %{install_info_prereq} %if "%name" == "binutils" Obsoletes: binuti_o %endif Autoreqprov: on -Version: 2.17.50.0.5 -Release: 10 +Version: 2.17.50.0.8 +Release: 1 Summary: GNU binutils for Cross-Development to HPPA Processors Source: ftp://ftp.kernel.org/pub/linux/devel/binutils/binutils-%{version}.tar.bz2 Source1: pre_checkin.sh @@ -64,14 +64,13 @@ Patch7: ld-dtags.diff Patch8: ld-relro.diff Patch9: testsuite.diff -Patch10: string-comma-len.diff -Patch11: pr210331.diff -Patch12: dw-at-ranges.diff -Patch13: addend-compare.diff +Patch10: subsegs.diff +Patch11: ld-elfvsb.diff Patch16: s390-pic-dso.diff Patch17: suse-bdirect.diff Patch18: suse-dynsort.diff Patch19: suse-hashvals.diff +Patch42: hjl-patches.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %if "%{name}" != "binutils" %define _prefix /opt/cross @@ -156,6 +155,7 @@ echo "make check will return with %{make_check_handling} in case of testsuite failures." %setup -q -n binutils-%{version} %if !%{test_vanilla} +%patch42 # Apply H.J.Lu's patches test -f patches/README && sh patches/README @@ -163,11 +163,7 @@ %patch %patch1 %patch2 -# -# experimental stuff not for the older distris -%if %suse_version > 820 %patch3 -%endif %patch4 %patch5 %patch6 @@ -175,10 +171,8 @@ %patch8 %patch9 %patch10 -%patch16 %patch11 -%patch12 -%patch13 +%patch16 %patch17 -p1 %patch18 -p1 %patch19 -p1 @@ -358,8 +352,15 @@ %endif %changelog -n cross-hppa-binutils +* Mon Dec 04 2006 - schwab(a)suse.de +- Update to binutils 2.17.50.0.5. + 1. Update from binutils 2006 1201. + 2. Fix "objcopy --only-keep-debug" crash. PR 3609. + 3. Fix various ARM ELF bugs. + 4. Fix various xtensa bugs. + 5. Update x86 disassembler. * Mon Oct 16 2006 - schwab(a)suse.de -- Fix overflow in addend_compare [#211596]. +- Fix overflow in addend_compare [#209807]. * Fri Oct 13 2006 - schwab(a)suse.de - Update last change. * Tue Oct 10 2006 - schwab(a)suse.de cross-i386-binutils.spec: same change cross-ia64-binutils.spec: same change cross-mips-binutils.spec: same change ++++++ cross-ppc-binutils.spec ++++++ --- /var/tmp/diff_new_pack.piMygQ/_old 2006-12-06 11:57:39.000000000 +0100 +++ /var/tmp/diff_new_pack.piMygQ/_new 2006-12-06 11:57:39.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package cross-ppc-binutils (Version 2.17.50.0.5) +# spec file for package cross-ppc-binutils (Version 2.17.50.0.8) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -21,7 +21,7 @@ # # handle test suite failures # -%ifarch alpha armv4l hppa mips ppc64 sparc sparc64 +%ifarch alpha armv4l hppa mips sparc sparc64 %define make_check_handling true %else %define make_check_handling false @@ -41,15 +41,15 @@ # # URL: http://www.gnu.org/software/binutils/ -License: GNU General Public License (GPL) - all versions, GNU Library General Public License v. 2.0 and 2.1 (LGPL) +License: GNU General Public License (GPL), GNU Library General Public License v. 2.0 and 2.1 (LGPL) Group: Development/Tools/Building PreReq: %{install_info_prereq} %if "%name" == "binutils" Obsoletes: binuti_o %endif Autoreqprov: on -Version: 2.17.50.0.5 -Release: 10 +Version: 2.17.50.0.8 +Release: 1 Summary: GNU binutils for Cross-Development to PowerPC Processors Source: ftp://ftp.kernel.org/pub/linux/devel/binutils/binutils-%{version}.tar.bz2 Source1: pre_checkin.sh @@ -64,14 +64,13 @@ Patch7: ld-dtags.diff Patch8: ld-relro.diff Patch9: testsuite.diff -Patch10: string-comma-len.diff -Patch11: pr210331.diff -Patch12: dw-at-ranges.diff -Patch13: addend-compare.diff +Patch10: subsegs.diff +Patch11: ld-elfvsb.diff Patch16: s390-pic-dso.diff Patch17: suse-bdirect.diff Patch18: suse-dynsort.diff Patch19: suse-hashvals.diff +Patch42: hjl-patches.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %if "%{name}" != "binutils" %define _prefix /opt/cross @@ -156,6 +155,7 @@ echo "make check will return with %{make_check_handling} in case of testsuite failures." %setup -q -n binutils-%{version} %if !%{test_vanilla} +%patch42 # Apply H.J.Lu's patches test -f patches/README && sh patches/README @@ -163,11 +163,7 @@ %patch %patch1 %patch2 -# -# experimental stuff not for the older distris -%if %suse_version > 820 %patch3 -%endif %patch4 %patch5 %patch6 @@ -175,10 +171,8 @@ %patch8 %patch9 %patch10 -%patch16 %patch11 -%patch12 -%patch13 +%patch16 %patch17 -p1 %patch18 -p1 %patch19 -p1 @@ -358,8 +352,15 @@ %endif %changelog -n cross-ppc-binutils +* Mon Dec 04 2006 - schwab(a)suse.de +- Update to binutils 2.17.50.0.5. + 1. Update from binutils 2006 1201. + 2. Fix "objcopy --only-keep-debug" crash. PR 3609. + 3. Fix various ARM ELF bugs. + 4. Fix various xtensa bugs. + 5. Update x86 disassembler. * Mon Oct 16 2006 - schwab(a)suse.de -- Fix overflow in addend_compare [#211596]. +- Fix overflow in addend_compare [#209807]. * Fri Oct 13 2006 - schwab(a)suse.de - Update last change. * Tue Oct 10 2006 - schwab(a)suse.de cross-ppc64-binutils.spec: same change cross-s390-binutils.spec: same change cross-s390x-binutils.spec: same change ++++++ cross-sparc-binutils.spec ++++++ --- /var/tmp/diff_new_pack.piMygQ/_old 2006-12-06 11:57:39.000000000 +0100 +++ /var/tmp/diff_new_pack.piMygQ/_new 2006-12-06 11:57:39.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package cross-sparc-binutils (Version 2.17.50.0.5) +# spec file for package cross-sparc-binutils (Version 2.17.50.0.8) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -21,7 +21,7 @@ # # handle test suite failures # -%ifarch alpha armv4l hppa mips ppc64 sparc sparc64 +%ifarch alpha armv4l hppa mips sparc sparc64 %define make_check_handling true %else %define make_check_handling false @@ -41,15 +41,15 @@ # # URL: http://www.gnu.org/software/binutils/ -License: Other License(s), see package, X11/MIT +License: GNU General Public License (GPL), GNU Library General Public License v. 2.0 and 2.1 (LGPL) Group: Development/Tools/Building PreReq: %{install_info_prereq} %if "%name" == "binutils" Obsoletes: binuti_o %endif Autoreqprov: on -Version: 2.17.50.0.5 -Release: 10 +Version: 2.17.50.0.8 +Release: 1 Summary: GNU binutils for Cross-Development to SPARC Processors Source: ftp://ftp.kernel.org/pub/linux/devel/binutils/binutils-%{version}.tar.bz2 Source1: pre_checkin.sh @@ -64,14 +64,13 @@ Patch7: ld-dtags.diff Patch8: ld-relro.diff Patch9: testsuite.diff -Patch10: string-comma-len.diff -Patch11: pr210331.diff -Patch12: dw-at-ranges.diff -Patch13: addend-compare.diff +Patch10: subsegs.diff +Patch11: ld-elfvsb.diff Patch16: s390-pic-dso.diff Patch17: suse-bdirect.diff Patch18: suse-dynsort.diff Patch19: suse-hashvals.diff +Patch42: hjl-patches.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %if "%{name}" != "binutils" %define _prefix /opt/cross @@ -156,6 +155,7 @@ echo "make check will return with %{make_check_handling} in case of testsuite failures." %setup -q -n binutils-%{version} %if !%{test_vanilla} +%patch42 # Apply H.J.Lu's patches test -f patches/README && sh patches/README @@ -163,11 +163,7 @@ %patch %patch1 %patch2 -# -# experimental stuff not for the older distris -%if %suse_version > 820 %patch3 -%endif %patch4 %patch5 %patch6 @@ -175,10 +171,8 @@ %patch8 %patch9 %patch10 -%patch16 %patch11 -%patch12 -%patch13 +%patch16 %patch17 -p1 %patch18 -p1 %patch19 -p1 @@ -358,8 +352,15 @@ %endif %changelog -n cross-sparc-binutils +* Mon Dec 04 2006 - schwab(a)suse.de +- Update to binutils 2.17.50.0.5. + 1. Update from binutils 2006 1201. + 2. Fix "objcopy --only-keep-debug" crash. PR 3609. + 3. Fix various ARM ELF bugs. + 4. Fix various xtensa bugs. + 5. Update x86 disassembler. * Mon Oct 16 2006 - schwab(a)suse.de -- Fix overflow in addend_compare [#211596]. +- Fix overflow in addend_compare [#209807]. * Fri Oct 13 2006 - schwab(a)suse.de - Update last change. * Tue Oct 10 2006 - schwab(a)suse.de cross-x86_64-binutils.spec: same change ++++++ binutils-2.17.50.0.5.tar.bz2 -> binutils-2.17.50.0.8.tar.bz2 ++++++ binutils/binutils-2.17.50.0.5.tar.bz2 /mounts/work_src_done/STABLE/binutils/binutils-2.17.50.0.8.tar.bz2 differ: char 11, line 1 ++++++ hjl-patches.diff ++++++ --- patches/README +++ patches/README @@ -18,7 +18,6 @@ patch -p0 -b --suffix .relink < $dir/libtool-relink-1.patch && patch -p0 -b --suffix .ref_addr < $dir/bfd-ref_addr-5.patch && patch -p1 -b --suffix .indirect < $dir/binutils-indirect-1.patch && -patch -p1 -b --suffix .relro < $dir/binutils-tls-relro-5.patch && true [ $? = 0 ] || exit 1 find -name "*.orig" | xargs rm -fv ++++++ ld-elfvsb.diff ++++++ >From nobody Tue Dec 5 10:54:14 2006 From: Alan Modra <amodra(a)bigpond.net.au> Subject: Re: [PATCH] ld-elfvsb FAILs on powerpc64 To: Jakub Jelinek <jakub(a)redhat.com> Cc: Andreas Schwab <schwab(a)suse.de>, binutils(a)sourceware.org Date: Tue, 5 Dec 2006 11:59:27 +1030 Mail-Followup-To: Jakub Jelinek <jakub(a)redhat.com>, Andreas Schwab <schwab(a)suse.de>, binutils(a)sourceware.org On Mon, Dec 04, 2006 at 11:46:13PM +0100, Jakub Jelinek wrote: > On Tue, Dec 05, 2006 at 08:28:58AM +1030, Alan Modra wrote: > > On Mon, Dec 04, 2006 at 06:29:27PM +0100, Andreas Schwab wrote: > > > The following tests always fail on powerpc64: > > > > Huh? They don't fail for me. To test ppc64, I configure using > > See > http://sources.redhat.com/ml/binutils/2004-08/msg00016.html > http://sources.redhat.com/ml/binutils/2004-08/msg00030.html > I'm using that patch ever since and haven't seen those failures anymore. Hmm. I was using a 3.4.5 based compiler. I tried with mainline gcc and got the failures, plus some other problems. I'm applying Jakub's patch along with a comment, and moving shared_data to sh2.c for the same reason Jakub moved overriddenvar. 2006-12-05 Jakub Jelinek <jakub(a)redhat.com> Alan Modra <amodra(a)bigpond.net.au> * ld-elfvsb/sh1.c (overriddenvar, shlib_overriddencall2, shared_data): If !SHARED, move to... * ld-elfvsb/sh2.c: ... here. * ld-elfvsb/elfvsb.exp: Add -DSHARED to compiler options when building with $picflag. Index: ld/testsuite/ld-elfvsb/elfvsb.exp =================================================================== RCS file: /cvs/src/src/ld/testsuite/ld-elfvsb/elfvsb.exp,v retrieving revision 1.29 diff -u -p -r1.29 elfvsb.exp --- ld/testsuite/ld-elfvsb/elfvsb.exp 12 May 2005 07:32:06 -0000 1.29 +++ ld/testsuite/ld-elfvsb/elfvsb.exp 5 Dec 2006 01:20:22 -0000 @@ -315,8 +315,8 @@ proc visibility_run {visibility} { # Now compile the code using -fpic. - if { ![ld_compile "$CC -g $CFLAGS $SHCFLAG $VSBCFLAG $picflag" $srcdir/$subdir/sh1.c $tmpdir/sh1p.o] - || ![ld_compile "$CC -g $CFLAGS $SHCFLAG $VSBCFLAG $picflag" $srcdir/$subdir/sh2.c $tmpdir/sh2p.o] } { + if { ![ld_compile "$CC -g $CFLAGS $SHCFLAG $VSBCFLAG -DSHARED $picflag" $srcdir/$subdir/sh1.c $tmpdir/sh1p.o] + || ![ld_compile "$CC -g $CFLAGS $SHCFLAG $VSBCFLAG -DSHARED $picflag" $srcdir/$subdir/sh2.c $tmpdir/sh2p.o] } { unresolved "visibility ($visibility)" } else { if { [ string match $visibility "protected" ] @@ -337,7 +337,7 @@ proc visibility_run {visibility} { } # Now do the same tests again, but this time compile main.c PIC. - if ![ld_compile "$CC -g $CFLAGS $SHCFLAG $VSBCFLAG $picflag" $srcdir/$subdir/main.c $tmpdir/mainp.o] { + if ![ld_compile "$CC -g $CFLAGS $SHCFLAG $VSBCFLAG -DSHARED $picflag" $srcdir/$subdir/main.c $tmpdir/mainp.o] { unresolved "visibility ($visibility) (PIC main, non PIC so)" unresolved "visibility ($visibility) (PIC main)" } else { @@ -446,7 +446,7 @@ if { ![ld_compile "$CC -g $CFLAGS" $srcd if { ![ld_compile "$CC -g $CFLAGS" $srcdir/$subdir/test.c tmpdir/test.o] } { unresolved "weak hidden symbol" } else { - if { ![ld_compile "$CC -g $CFLAGS $picflag" $srcdir/$subdir/sh3.c tmpdir/sh3.o] } { + if { ![ld_compile "$CC -g $CFLAGS -DSHARED $picflag" $srcdir/$subdir/sh3.c tmpdir/sh3.o] } { unresolved "weak hidden symbol" } else { if ![ld_simple_link $ld tmpdir/sh3.so "-shared tmpdir/sh3.o"] { Index: ld/testsuite/ld-elfvsb/sh1.c =================================================================== RCS file: /cvs/src/src/ld/testsuite/ld-elfvsb/sh1.c,v retrieving revision 1.7 diff -u -p -r1.7 sh1.c --- ld/testsuite/ld-elfvsb/sh1.c 5 May 2003 05:46:53 -0000 1.7 +++ ld/testsuite/ld-elfvsb/sh1.c 5 Dec 2006 01:20:22 -0000 @@ -13,7 +13,15 @@ extern int mainvar; /* This variable is defined in the shared library, and overridden by the main program. */ #ifndef XCOFF_TEST +#ifdef SHARED +/* SHARED is defined if we are compiling with -fpic/-fPIC. */ int overriddenvar = -1; +#else +/* Without -fpic, newer versions of gcc assume that we are not + compiling for a shared library, and thus that overriddenvar is + local. */ +extern int overriddenvar; +#endif #endif /* This variable is defined in the shared library. */ @@ -76,12 +84,14 @@ shlib_shlibcall2 () return shlib_overriddencall2 (); } +#ifdef SHARED int shlib_overriddencall2 () { return 7; } #endif +#endif /* This function calls a function defined by the main program. */ @@ -385,7 +395,11 @@ shlib_visibility_checkweak () #endif #ifdef PROTECTED_TEST +#ifdef SHARED int shared_data = 100; +#else +extern int shared_data; +#endif int * shared_data_p () Index: ld/testsuite/ld-elfvsb/sh2.c =================================================================== RCS file: /cvs/src/src/ld/testsuite/ld-elfvsb/sh2.c,v retrieving revision 1.3 diff -u -p -r1.3 sh2.c --- ld/testsuite/ld-elfvsb/sh2.c 28 Apr 2003 03:31:36 -0000 1.3 +++ ld/testsuite/ld-elfvsb/sh2.c 5 Dec 2006 01:20:22 -0000 @@ -44,3 +44,18 @@ visibility_func_weak () return 2; } #endif + +#ifndef SHARED +# ifndef XCOFF_TEST +int overriddenvar = -1; + +int +shlib_overriddencall2 () +{ + return 7; +} +# endif +# ifdef PROTECTED_TEST +int shared_data = 100; +# endif +#endif -- Alan Modra IBM OzLabs - Linux Technology Centre ++++++ subsegs.diff ++++++ >From nobody Mon Dec 4 14:08:56 2006 From: Jakub Jelinek <jakub(a)redhat.com> Subject: [PATCH] Initialize frch_cfi_data (PR gas/3607) To: binutils(a)sources.redhat.com Date: Sat, 2 Dec 2006 09:24:16 +0100 Reply-To: Jakub Jelinek <jakub(a)redhat.com> Hi! I haven't noticed new frchain objects aren't cleared when created, sorry. Committed as obvious. 2006-12-02 Jakub Jelinek <jakub(a)redhat.com> PR gas/3607 * subsegs.c (subseg_set_rest): Clear frch_cfi_data field. --- gas/subsegs.c.jj 2006-05-04 01:52:15.000000000 +0200 +++ gas/subsegs.c 2006-12-02 08:46:15.000000000 +0100 @@ -117,6 +117,7 @@ subseg_set_rest (segT seg, subsegT subse #endif newP->frch_frag_now = frag_alloc (&newP->frch_obstack); newP->frch_frag_now->fr_type = rs_fill; + newP->frch_cfi_data = NULL; newP->frch_root = newP->frch_last = newP->frch_frag_now; Jakub ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit bash
by root＠suse.de 06 Dec '06

06 Dec '06

Hello community, here is the log from the commit of package bash checked in at Wed Dec 6 11:55:18 CET 2006. -------- --- bash/bash.changes 2006-11-17 15:09:23.000000000 +0100 +++ /mounts/work_src_done/STABLE/bash/bash.changes 2006-11-22 17:29:20.000000000 +0100 @@ -6,0 +7,5 @@ +Tue Nov 14 11:50:32 CET 2006 - werner(a)suse.de + +- Update to bash 3.2 patch level 5 + +------------------------------------------------------------------- Old: ---- bash-2.05-2.4.4.patch bash-3.1-patches.tar.bz2 bash-3.1-printf.patch bash-3.1-wcschr.dif bash-3.1.dif bash-3.1.tar.bz2 readline-5.0-conf.patch readline-5.0-wrap.patch readline-5.1-patches.tar.bz2 readline-5.1-random.patch readline-5.1.dif readline-5.1.tar.bz2 New: ---- bash-3.2-2.4.4.patch bash-3.2-patches.tar.bz2 bash-3.2-printf.patch bash-3.2-wcschr.dif bash-3.2.dif bash-3.2.tar.bz2 readline-5.2-conf.patch readline-5.2-patches.tar.bz2 readline-5.2-wrap.patch readline-5.2.dif readline-5.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ bash.spec ++++++ --- /var/tmp/diff_new_pack.SseReg/_old 2006-12-06 11:49:13.000000000 +0100 +++ /var/tmp/diff_new_pack.SseReg/_new 2006-12-06 11:49:13.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package bash (Version 3.1) +# spec file for package bash (Version 3.2) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -13,12 +13,12 @@ Name: bash License: GNU General Public License (GPL) Group: System/Shells -Requires: readline >= 5.1 +Requires: readline >= 5.2 Autoreqprov: on -Version: 3.1 -Release: 52 -%define bash_vers 3.1 -%define rl_vers 5.1 +Version: 3.2 +Release: 1 +%define bash_vers 3.2 +%define rl_vers 5.2 Summary: The GNU Bourne-Again Shell URL: http://www.gnu.org/software/bash/bash.html Source0: bash-%{bash_vers}.tar.bz2 @@ -29,7 +29,7 @@ Patch0: bash-%{bash_vers}.dif Patch1: bash-2.03-manual.patch Patch2: bash-2.05a-security.patch -Patch3: bash-2.05-2.4.4.patch +Patch3: bash-3.2-2.4.4.patch Patch4: bash-3.1-directory.patch Patch5: bash-3.0-evalexp.patch Patch6: bash-3.0-warn-locale.patch @@ -37,14 +37,13 @@ Patch8: bash-3.0-decl.patch Patch9: bash-3.1-random.patch Patch10: bash-3.1-extended_quote.patch -Patch11: bash-3.1-wcschr.dif -Patch12: bash-3.1-printf.patch +Patch11: bash-3.2-wcschr.dif +Patch12: bash-3.2-printf.patch Patch13: bash-3.1-loadables.dif Patch20: readline-%{rl_vers}.dif Patch21: readline-4.3-input.dif -Patch22: readline-5.0-wrap.patch -Patch23: readline-5.0-conf.patch -Patch24: readline-5.1-random.patch +Patch22: readline-5.2-wrap.patch +Patch23: readline-5.2-conf.patch Patch30: readline-5.1-destdir.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -66,8 +65,8 @@ Summary: The Readline Library Group: System/Libraries Provides: bash:/lib/libreadline.so.5 -Version: 5.1 -Release: 52 +Version: 5.2 +Release: 1 Autoreqprov: on %description -n readline @@ -86,8 +85,8 @@ Summary: Include Files and Libraries mandatory for Development. Group: Development/Libraries/C and C++ Provides: bash:/usr/lib/libreadline.a -Version: 5.1 -Release: 52 +Version: 5.2 +Release: 1 Requires: readline = %{version}-%{release}, %{_libdir}/libncurses.so Autoreqprov: on @@ -105,6 +104,7 @@ %prep %setup -n bash-%{bash_vers} -b1 -b2 -b3 for p in ../bash-%{bash_vers}-patches/*; do + test -e $p || break echo Patch $p patch -s -p0 < $p done @@ -123,12 +123,7 @@ %patch12 -p0 -b .printf %patch13 -p0 -b .plugins for p in ../readline-%{rl_vers}-patches/*; do - case "${p##*/}" in - readline51-00[234]) - echo ${p##*/} is already included in bash31-patches - continue - ;; - esac + test -e $p || break echo Patch $p patch -d lib/readline/ -s -p0 < $p done @@ -136,17 +131,16 @@ %patch21 -p0 -b .zerotty %patch22 -p0 -b .wrap %patch23 -p0 -b .conf -%patch24 -p0 -b .random %patch0 -p0 cd ../readline-%{rl_vers} for p in ../readline-%{rl_vers}-patches/*; do + test -e $p || break echo Patch $p patch -s -p0 < $p done %patch21 -p2 -b .zerotty %patch22 -p2 -b .wrap %patch23 -p2 -b .conf -%patch24 -p2 -b .random %patch30 -p0 -b .destdir %patch20 -p0 @@ -308,8 +302,7 @@ %doc %{_mandir}/man1/bashbug.1.gz %doc %{_mandir}/man1/rbash.1.gz %doc %{_defaultdocdir}/bash/ -/usr/share/locale/en(a)boldquot/LC_MESSAGES/bash.mo -/usr/share/locale/en(a)quot/LC_MESSAGES/bash.mo +/usr/share/locale/*/LC_MESSAGES/bash.mo %files -n readline %defattr(-,root,root) @@ -332,6 +325,8 @@ %changelog -n bash * Fri Nov 17 2006 - werner(a)suse.de - Remove /usr/bin/bash (#206000) +* Tue Nov 14 2006 - werner(a)suse.de +- Update to bash 3.2 patch level 5 * Wed Sep 27 2006 - werner(a)suse.de - Use PIE to make a shared bash binary - Make the bash modules build for testing ++++++ bash-2.05-2.4.4.patch -> bash-3.2-2.4.4.patch ++++++ --- bash/bash-2.05-2.4.4.patch 2002-09-27 11:27:42.000000000 +0200 +++ /mounts/work_src_done/STABLE/bash/bash-3.2-2.4.4.patch 2006-11-14 11:31:37.000000000 +0100 @@ -1,6 +1,28 @@ +--- array.c ++++ array.c 2006-11-14 10:54:22.000000000 +0100 +@@ -724,7 +724,7 @@ char *s, *sep; + * To make a running version, compile -DTEST_ARRAY and link with: + * xmalloc.o syntax.o lib/malloc/libmalloc.a lib/sh/libsh.a + */ +-int interrupt_immediately = 0; ++volatile sig_atomic_t interrupt_immediately = 0; + + int + signal_is_trapped(s) +--- hashlib.c ++++ hashlib.c 2006-11-14 10:54:36.000000000 +0100 +@@ -381,7 +381,7 @@ hash_pstats (table, name) + + HASH_TABLE *table, *ntable; + +-int interrupt_immediately = 0; ++volatile sig_atomic_t interrupt_immediately = 0; + + int + signal_is_trapped (s) --- jobs.c -+++ jobs.c Wed May 2 18:20:31 2001 -@@ -1166,6 +1166,15 @@ ++++ jobs.c 2001-05-02 18:20:31.000000000 +0200 +@@ -1701,6 +1701,15 @@ make_child (command, async_p) pid_t mypid; mypid = getpid (); @@ -17,8 +39,8 @@ /* Close default_buffered_input if it's > 0. We don't close it if it's 0 because that's the file descriptor used when redirecting input, --- quit.h -+++ quit.h Wed May 2 17:38:34 2001 -@@ -21,8 +21,12 @@ ++++ quit.h 2006-11-14 10:43:18.000000000 +0100 +@@ -21,9 +21,13 @@ #if !defined (_QUIT_H_) #define _QUIT_H_ @@ -27,28 +49,82 @@ +#undef __need_sig_atomic_t + /* Non-zero means SIGINT has already ocurred. */ --extern int interrupt_state; +-extern volatile int interrupt_state; +-extern volatile int terminating_signal; +extern volatile sig_atomic_t interrupt_state; ++extern volatile sig_atomic_t terminating_signal; - extern void throw_to_top_level (); - + /* Macro to call a great deal. SIGINT just sets the interrupt_state variable. + When it is safe, put QUIT in the code, and the "interrupt" will take --- sig.c -+++ sig.c Wed May 2 17:36:17 2001 -@@ -57,7 +57,7 @@ - extern int interactive, interactive_shell, login_shell, startup_state; ++++ sig.c 2006-11-14 10:53:51.000000000 +0100 +@@ -59,13 +59,13 @@ extern int loop_level, continuing, break + extern int parse_and_execute_level, shell_initialized; /* Non-zero after SIGINT. */ --int interrupt_state; +-volatile int interrupt_state = 0; +volatile sig_atomic_t interrupt_state = 0; + /* Non-zero after SIGWINCH */ +-volatile int sigwinch_received = 0; ++volatile sig_atomic_t sigwinch_received = 0; + + /* Set to the value of any terminating signal received. */ +-volatile int terminating_signal = 0; ++volatile sig_atomic_t terminating_signal = 0; + /* The environment at the top-level R-E loop. We use this in the case of error return. */ -@@ -69,7 +69,7 @@ +@@ -77,10 +77,10 @@ sigset_t top_level_mask; #endif /* JOB_CONTROL */ /* When non-zero, we throw_to_top_level (). */ -int interrupt_immediately = 0; +volatile sig_atomic_t interrupt_immediately = 0; - static void initialize_shell_signals (); + /* When non-zero, we call the terminating signal handler immediately. */ +-int terminate_immediately = 0; ++volatile sig_atomic_t terminate_immediately = 0; + + #if defined (SIGWINCH) + static SigHandler *old_winch = (SigHandler *)SIG_DFL; +--- sig.h ++++ sig.h 2006-11-14 10:49:32.000000000 +0100 +@@ -108,11 +108,15 @@ do { \ + + #endif /* JOB_CONTROL */ + ++#define __need_sig_atomic_t ++#include <signal.h> ++#undef __need_sig_atomic_t ++ + /* Extern variables */ +-extern volatile int sigwinch_received; ++extern volatile sig_atomic_t sigwinch_received; + +-extern int interrupt_immediately; +-extern int terminate_immediately; ++extern volatile sig_atomic_t interrupt_immediately; ++extern volatile sig_atomic_t terminate_immediately; + + /* Functions from sig.c. */ + extern sighandler termsig_sighandler __P((int)); +--- examples/loadables/tee.c ++++ examples/loadables/tee.c 2006-11-14 11:31:29.000000000 +0100 +@@ -17,6 +17,7 @@ + #include "bashansi.h" + + #include <stdio.h> ++#include <signal.h> + #include <errno.h> + + #include "builtins.h" +@@ -37,7 +38,7 @@ static FLIST *tee_flist; + + #define TEE_BUFSIZE 8192 + +-extern int interrupt_immediately; ++extern volatile sig_atomic_t interrupt_immediately; + + extern char *strerror (); ++++++ bash-3.1-patches.tar.bz2 -> bash-3.2-patches.tar.bz2 ++++++ ++++ 2132 lines of diff (skipped) ++++++ bash-3.1-printf.patch -> bash-3.2-printf.patch ++++++ --- bash/bash-3.1-printf.patch 2006-07-27 17:11:44.000000000 +0200 +++ /mounts/work_src_done/STABLE/bash/bash-3.2-printf.patch 2006-11-14 11:16:56.000000000 +0100 @@ -8,19 +8,7 @@ #include "../bashtypes.h" -@@ -132,6 +133,11 @@ extern int errno; - vbuf = 0; \ - } \ - fflush (stdout); \ -+ if (ferror (stdout)) \ -+ { \ -+ clearerr (stdout); \ -+ return (EXECUTION_FAILURE); \ -+ } \ - return (value); \ - } \ - while (0) -@@ -487,12 +493,20 @@ printf_builtin (list) +@@ -501,12 +502,20 @@ printf_builtin (list) case 'A': #endif { ++++++ bash-3.1-wcschr.dif -> bash-3.2-wcschr.dif ++++++ --- bash/bash-3.1-wcschr.dif 2006-05-31 19:06:52.000000000 +0200 +++ /mounts/work_src_done/STABLE/bash/bash-3.2-wcschr.dif 2006-11-13 17:43:36.000000000 +0100 @@ -1,12 +1,9 @@ --- subst.c -+++ subst.c 2006-05-31 16:59:58.000000000 +0000 -@@ -946,8 +946,9 @@ - len = mbstowcs (wcharlist, charlist, 0); - if (len == -1) ++++ subst.c 2006-11-13 17:42:38.000000000 +0100 +@@ -950,6 +950,7 @@ string_extract_verbatim (string, slen, s len = 0; -- wcharlist = xmalloc ((sizeof (wchar_t) * len) + 1); -+ wcharlist = xmalloc ((sizeof (wchar_t)) * (len + 1)); - mbstowcs (wcharlist, charlist, len); + wcharlist = (wchar_t *)xmalloc (sizeof (wchar_t) * (len + 1)); + mbstowcs (wcharlist, charlist, len + 1); + wcharlist[len] = (wchar_t)0; } ++++++ bash-3.1-wcschr.dif -> bash-3.2.dif ++++++ --- bash/bash-3.1-wcschr.dif 2006-05-31 19:06:52.000000000 +0200 +++ /mounts/work_src_done/STABLE/bash/bash-3.2.dif 2006-11-14 11:03:00.000000000 +0100 @@ -1,13 +1,232 @@ +--- .pkgextract ++++ .pkgextract 2006-03-27 14:15:25.000000000 +0200 +@@ -0,0 +1,16 @@ ++tar Oxfj ../bash-3.2-patches.tar.bz2 | patch -p0 -s ++patch -p0 -s --suffix=".manual" < ../bash-2.03-manual.patch ++patch -p0 -s --suffix=".security" < ../bash-2.05a-security.patch ++patch -p0 -s --suffix=".2.4.4" < ../bash-3.2-2.4.4.patch ++patch -p0 -s --suffix=".directory"< ../bash-3.1-directory.patch ++patch -p0 -s --suffix=".evalexp" < ../bash-3.0-evalexp.patch ++patch -p0 -s --suffix=".warnlc" < ../bash-3.0-warn-locale.patch ++patch -p0 -s --suffix=".nfs_redir"< ../bash-3.0-nfs_redir.patch ++patch -p0 -s --suffix=".decl" < ../bash-3.0-decl.patch ++patch -p1 -s --suffix=".random2" < ../bash-3.1-random.patch ++patch -p0 -s --suffix=".equote" < ../bash-3.1-extended_quote.patch ++patch -p0 -s --suffix=".wcschr" < ../bash-3.2-wcschr.dif ++patch -p0 -s --suffix=".loadable" < ../bash-3.1-loadables.dif ++patch -p0 -s --suffix=".zerotty" < ../readline-4.3-input.dif ++patch -p0 -s --suffix=".wrap" < ../readline-5.2-wrap.patch ++patch -p0 -s --suffix=".conf" < ../readline-5.2-conf.patch +--- config-top.h ++++ config-top.h 2006-03-27 14:15:25.000000000 +0200 +@@ -52,14 +52,14 @@ + /* The default value of the PATH variable. */ + #ifndef DEFAULT_PATH_VALUE + #define DEFAULT_PATH_VALUE \ +- "/usr/gnu/bin:/usr/local/bin:/bin:/usr/bin:." ++ "/usr/local/bin:/bin:/usr/bin:/usr/X11R6/bin:." + #endif + + /* The value for PATH when invoking `command -p'. This is only used when + the Posix.2 confstr () function, or CS_PATH define are not present. */ + #ifndef STANDARD_UTILS_PATH + #define STANDARD_UTILS_PATH \ +- "/bin:/usr/bin:/sbin:/usr/sbin:/etc:/usr/etc" ++ "/bin:/usr/bin:/sbin:/usr/sbin" + #endif + + /* Default primary and secondary prompt strings. */ +@@ -73,14 +73,14 @@ + #define KSH_COMPATIBLE_SELECT + + /* System-wide .bashrc file for interactive shells. */ +-/* #define SYS_BASHRC "/etc/bash.bashrc" */ ++#define SYS_BASHRC "/etc/bash.bashrc" + + /* System-wide .bash_logout for login shells. */ +-/* #define SYS_BASH_LOGOUT "/etc/bash.bash_logout" */ ++#define SYS_BASH_LOGOUT "/etc/bash.bash_logout" + + /* Define this to make non-interactive shells begun with argv[0][0] == '-' + run the startup files when not in posix mode. */ +-/* #define NON_INTERACTIVE_LOGIN_SHELLS */ ++#define NON_INTERACTIVE_LOGIN_SHELLS + + /* Define this if you want bash to try to check whether it's being run by + sshd and source the .bashrc if so (like the rshd behavior). */ +--- general.h ++++ general.h 2006-03-27 14:15:25.000000000 +0200 +@@ -21,10 +21,13 @@ + #if !defined (_GENERAL_H_) + #define _GENERAL_H_ + ++#include <time.h> ++#include <sys/types.h> + #include "stdc.h" + + #include "bashtypes.h" + #include "chartypes.h" ++#include "bashline.h" + + #if defined (HAVE_SYS_RESOURCE_H) && defined (RLIMTYPE) + # if defined (HAVE_SYS_TIME_H) +--- jobs.c ++++ jobs.c 2006-03-27 14:15:25.000000000 +0200 +@@ -197,10 +197,10 @@ int previous_job = NO_JOB; + #endif + + /* Last child made by the shell. */ +-pid_t last_made_pid = NO_PID; ++volatile pid_t last_made_pid = NO_PID; + + /* Pid of the last asynchronous child. */ +-pid_t last_asynchronous_pid = NO_PID; ++volatile pid_t last_asynchronous_pid = NO_PID; + + /* The pipeline currently being built. */ + PROCESS *the_pipeline = (PROCESS *)NULL; +@@ -213,7 +213,7 @@ int already_making_children = 0; + + /* If this is non-zero, $LINES and $COLUMNS are reset after every process + exits from get_tty_state(). */ +-int check_window_size; ++int check_window_size = 1; + + /* Functions local to this file. */ + +--- jobs.h ++++ jobs.h 2006-03-27 14:15:25.000000000 +0200 +@@ -162,7 +162,7 @@ extern pid_t fork (), getpid (), getpgrp + extern struct jobstats js; + + extern pid_t original_pgrp, shell_pgrp, pipeline_pgrp; +-extern pid_t last_made_pid, last_asynchronous_pid; ++extern volatile pid_t last_made_pid, last_asynchronous_pid; + extern int asynchronous_notification; + + extern JOB **jobs; +--- parse.y ++++ parse.y 2006-03-27 14:15:25.000000000 +0200 +@@ -1182,7 +1182,7 @@ input_file_descriptor () + + #if defined (READLINE) + char *current_readline_prompt = (char *)NULL; +-char *current_readline_line = (char *)NULL; ++unsigned char *current_readline_line = (unsigned char *)NULL; + int current_readline_line_index = 0; + + static int +--- shell.c ++++ shell.c 2006-03-27 14:15:25.000000000 +0200 +@@ -460,7 +460,7 @@ main (argc, argv, env) + if (dump_translatable_strings) + read_but_dont_execute = 1; + +- if (running_setuid && privileged_mode == 0) ++ if (running_setuid && privileged_mode == 0 /* && act_like_sh == 0 */) + disable_priv_mode (); + + /* Need to get the argument to a -c option processed in the --- subst.c -+++ subst.c 2006-05-31 16:59:58.000000000 +0000 -@@ -946,8 +946,9 @@ - len = mbstowcs (wcharlist, charlist, 0); - if (len == -1) - len = 0; -- wcharlist = xmalloc ((sizeof (wchar_t) * len) + 1); -+ wcharlist = xmalloc ((sizeof (wchar_t)) * (len + 1)); - mbstowcs (wcharlist, charlist, len); -+ wcharlist[len] = (wchar_t)0; - } ++++ subst.c 2006-03-27 14:15:25.000000000 +0200 +@@ -2707,6 +2707,7 @@ call_expand_word_internal (w, q, i, c, e + last_command_exit_value = EXECUTION_FAILURE; + exp_jump_to_top_level ((result == &expand_word_error) ? DISCARD : FORCE_EOF); + /* NOTREACHED */ ++ return NULL; /* make stupid compiler happy */ + } + else + return (result); +--- variables.c ++++ variables.c 2006-03-27 14:15:25.000000000 +0200 +@@ -1191,8 +1191,10 @@ assign_random (self, value, unused) + arrayind_t unused; + { + sbrand (strtoul (value, (char **)NULL, 10)); ++#if !defined(linux) + if (subshell_environment) + seeded_subshell = 1; ++#endif + return (self); + } + +--- builtins/shopt.def ++++ builtins/shopt.def 2006-03-27 14:15:25.000000000 +0200 +@@ -252,9 +252,9 @@ reset_shopt_options () + allow_null_glob_expansion = glob_dot_filenames = 0; + cdable_vars = mail_warning = 0; + no_exit_on_failed_exec = print_shift_error = 0; +- check_hashed_filenames = cdspelling = expand_aliases = check_window_size = 0; ++ check_hashed_filenames = cdspelling = expand_aliases = 0; + +- source_uses_path = promptvars = 1; ++ check_window_size = source_uses_path = promptvars = 1; + + #if defined (EXTENDED_GLOB) + extended_glob = 0; +--- doc/Makefile.in ++++ doc/Makefile.in 2006-03-27 14:15:25.000000000 +0200 +@@ -141,7 +141,7 @@ BASHREF_FILES = $(srcdir)/bashref.texi $ + ${RM} $@ + -${DVIPS} $< + +-all: ps info dvi text html ++all: info html + nodvi: ps info text html + + PSFILES = bash.ps bashbug.ps article.ps builtins.ps rbash.ps +--- doc/bash.1 ++++ doc/bash.1 2006-03-27 14:15:25.000000000 +0200 +@@ -4370,8 +4370,8 @@ file (the \fIinputrc\fP file). + The name of this file is taken from the value of the + .SM + .B INPUTRC +-variable. If that variable is unset, the default is +-.IR ~/.inputrc . ++environment variable. If that variable is unset, readline will read both ++.IR /etc/inputrc " and " ~/.inputrc . + When a program which uses the readline library starts up, the + initialization file is read, and the key bindings and variables + are set. +@@ -8816,6 +8816,9 @@ The individual login shell cleanup file, + .TP + .FN ~/.inputrc + Individual \fIreadline\fP initialization file ++.TP ++.FN /etc/inputrc ++System \fBreadline\fP initialization file + .PD + .SH AUTHORS + Brian Fox, Free Software Foundation +--- support/rlvers.sh ++++ support/rlvers.sh 2006-03-27 14:15:25.000000000 +0200 +@@ -27,10 +27,10 @@ TDIR=$TMPDIR/rlvers + + # defaults + CC=cc +-RL_LIBDIR=/usr/local/lib +-RL_INCDIR=/usr/local/include ++RL_LIBDIR=/lib ++RL_INCDIR=/usr/include + +-TERMCAP_LIB="-ltermcap" ++TERMCAP_LIB="-lncurses" + + # cannot rely on the presence of getopts + while [ $# -gt 0 ]; do +--- support/shobj-conf ++++ support/shobj-conf 2006-09-22 16:11:58.000000000 +0200 +@@ -108,10 +108,11 @@ sunos5*|solaris2*) + linux*-*|gnu*-*|k*bsd*-gnu-*) + SHOBJ_CFLAGS=-fPIC + SHOBJ_LD='${CC}' +- SHOBJ_LDFLAGS='-shared -Wl,-soname,$@' ++ SHOBJ_LDFLAGS='-shared' + +- SHLIB_XLDFLAGS='-Wl,-rpath,$(libdir) -Wl,-soname,`basename $@ $(SHLIB_MINOR)`' ++ SHLIB_XLDFLAGS='-Wl,-rpath-link,$(libdir) -Wl,-soname,`basename $@ $(SHLIB_MINOR)`' + SHLIB_LIBVERSION='$(SHLIB_LIBSUFF).$(SHLIB_MAJOR)$(SHLIB_MINOR)' ++ SHLIB_LIBS=-lncurses + ;; - if (wcschr (wcharlist, wc)) + freebsd2* | netbsd*) ++++++ bash-3.1-patches.tar.bz2 -> bash-3.2.tar.bz2 ++++++ ++++ 335706 lines of diff (skipped) ++++++ readline-5.0-conf.patch -> readline-5.2-conf.patch ++++++ --- bash/readline-5.0-conf.patch 2006-09-14 17:58:54.000000000 +0200 +++ /mounts/work_src_done/STABLE/bash/readline-5.2-conf.patch 2006-11-14 11:19:34.000000000 +0100 @@ -1,6 +1,6 @@ --- lib/readline/bind.c -+++ lib/readline/bind.c 2006-09-14 17:58:06.000000000 +0200 -@@ -723,6 +723,9 @@ rl_function_of_keyseq (keyseq, map, type ++++ lib/readline/bind.c 2006-11-13 17:20:23.000000000 +0100 +@@ -752,6 +752,9 @@ rl_function_of_keyseq (keyseq, map, type /* The last key bindings file read. */ static char *last_readline_init_file = (char *)NULL; @@ -10,7 +10,7 @@ /* The file we're currently reading key bindings from. */ static const char *current_readline_init_file; static int current_readline_init_include_level; -@@ -786,11 +789,14 @@ rl_re_read_init_file (count, ignore) +@@ -815,11 +818,14 @@ rl_re_read_init_file (count, ignore) return r; } @@ -23,55 +23,53 @@ 2. the value of the shell variable `INPUTRC' - 3. ~/.inputrc + 3. /etc/inputrc and ~/.inputrc + 4. /etc/inputrc If the file existed and could be opened and read, 0 is returned, otherwise errno is returned. */ - int -@@ -802,13 +808,43 @@ rl_read_init_file (filename) - { - filename = last_readline_init_file; - if (filename == 0) -- filename = sh_get_env_value ("INPUTRC"); -+ { -+ filename = sh_get_env_value ("INPUTRC"); -+ if (filename && !strncmp(SYSTEM_INPUTRC, filename, strlen(SYSTEM_INPUTRC))) -+ { -+ struct stat st; -+ char *default_inputrc = tilde_expand(DEFAULT_INPUTRC); -+ -+ if ((stat(default_inputrc, &st) == 0)) -+ { -+ filename = DEFAULT_INPUTRC; -+ read_system_init_file = 1; -+ } -+ else -+ read_system_init_file = 0; -+ -+ free(default_inputrc); -+ } -+ else -+ read_system_init_file = 1; -+ } - if (filename == 0) -+ { - filename = DEFAULT_INPUTRC; +@@ -831,16 +837,37 @@ rl_read_init_file (filename) + if (filename == 0) + filename = last_readline_init_file; + if (filename == 0) +- filename = sh_get_env_value ("INPUTRC"); ++ { ++ filename = sh_get_env_value ("INPUTRC"); ++ if (filename && !strncmp(SYS_INPUTRC, filename, strlen(SYS_INPUTRC))) ++ { ++ struct stat st; ++ char *default_inputrc = tilde_expand(DEFAULT_INPUTRC); ++ ++ if ((stat(default_inputrc, &st) == 0)) ++ { ++ filename = DEFAULT_INPUTRC; ++ read_system_init_file = 1; ++ } ++ else ++ read_system_init_file = 0; ++ ++ free(default_inputrc); ++ } ++ else + read_system_init_file = 1; -+ } ++ } + if (filename == 0 || *filename == 0) + { + filename = DEFAULT_INPUTRC; +- /* Try to read DEFAULT_INPUTRC; fall back to SYS_INPUTRC on failure */ +- if (_rl_read_init_file (filename, 0) == 0) +- return 0; +- filename = SYS_INPUTRC; ++ read_system_init_file = 1; } - if (*filename == 0) -+ { - filename = DEFAULT_INPUTRC; -+ read_system_init_file = 1; -+ } -+ + sv_bell_style(sh_get_env_value("DEFAULT_BELL_STYLE")); + + if (read_system_init_file) -+ _rl_read_init_file (SYSTEM_INPUTRC, 1); - ++ _rl_read_init_file (SYS_INPUTRC, 1); ++ #if defined (__MSDOS__) if (_rl_read_init_file (filename, 0) == 0) -@@ -1319,7 +1355,14 @@ rl_parse_and_bind (string) + return 0; +@@ -1350,7 +1377,14 @@ rl_parse_and_bind (string) rl_macro_bind (seq, &funname[1], _rl_keymap); } else @@ -87,7 +85,7 @@ free (seq); return 0; -@@ -1456,7 +1499,6 @@ typedef int _rl_sv_func_t PARAMS((const +@@ -1487,7 +1521,6 @@ typedef int _rl_sv_func_t PARAMS((const #define V_INT 2 /* Forward declarations */ @@ -96,29 +94,25 @@ static int sv_compquery PARAMS((const char *)); static int sv_editmode PARAMS((const char *)); --- lib/readline/rlconf.h -+++ lib/readline/rlconf.h 2006-03-22 16:23:22.000000000 +0100 -@@ -35,10 +35,11 @@ ++++ lib/readline/rlconf.h 2006-11-13 17:21:26.000000000 +0100 +@@ -35,7 +35,7 @@ #define HANDLE_SIGNALS /* Ugly but working hack for binding prefix meta. */ -#define PREFIX_META_HACK +#undef PREFIX_META_HACK - /* The final, last-ditch effort file name for an init file. */ + /* The next-to-last-ditch effort file name for a user-specific init file. */ #define DEFAULT_INPUTRC "~/.inputrc" -+#define SYSTEM_INPUTRC "/etc/inputrc" - - /* If defined, expand tabs to spaces. */ - #define DISPLAY_TABS --- lib/readline/doc/rluser.texi -+++ lib/readline/doc/rluser.texi 2006-03-22 14:18:33.000000000 +0100 -@@ -336,7 +336,8 @@ file is taken from the value of the shel - @ifclear BashFeatures - file is taken from the value of the environment variable @env{INPUTRC}. If ++++ lib/readline/doc/rluser.texi 2006-11-13 17:23:56.000000000 +0100 +@@ -338,7 +338,8 @@ file is taken from the value of the envi @end ifclear --that variable is unset, the default is @file{~/.inputrc}. -+that variable is unset, Readline will read both @file{/etc/inputrc} and -+(a)file{~/.inputrc}. + that variable is unset, the default is @file{~/.inputrc}. If that + file does not exist or cannot be read, the ultimate default is +-@file{/etc/inputrc}. ++@file{/etc/inputrc}. If both @file{~/.inputrc} and @file{/etc/inputrc} ++exist Readline will read first @file{/etc/inputrc} and then @file{~/.inputrc}. When a program which uses the Readline library starts up, the init file is read, and the key bindings are set. ++++++ readline-5.1-patches.tar.bz2 -> readline-5.2-patches.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/readline-5.1-patches/readline51-001 new/readline-5.2-patches/readline51-001 --- old/readline-5.1-patches/readline51-001 2005-12-21 22:49:00.000000000 +0100 +++ new/readline-5.2-patches/readline51-001 1970-01-01 01:00:00.000000000 +0100 @@ -1,77 +0,0 @@ - READLINE PATCH REPORT - ===================== - -Readline-Release: 5.1 -Patch-ID: readline51-001 - -Bug-Reported-by: Andreas Schwab <schwab(a)suse.de> -Bug-Reference-ID: <20051213141916.4014A394BFABD(a)sykes.suse.de> -Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2005-12/msg00038.html - -Bug-Description: - -A problem with the readline callback interface can result in segmentation -faults when using the delete-char function via a multiple-key sequence. -Two consecutive calls to delete-char will crash the application calling -readline. - -Patch: - -*** ../readline-5.1/readline.c Mon Jul 4 22:29:35 2005 ---- readline.c Tue Dec 20 17:38:29 2005 -*************** -*** 715,719 **** - rl_dispatching = 1; - RL_SETSTATE(RL_STATE_DISPATCHING); -! r = (*map[key].function)(rl_numeric_arg * rl_arg_sign, key); - RL_UNSETSTATE(RL_STATE_DISPATCHING); - rl_dispatching = 0; ---- 715,719 ---- - rl_dispatching = 1; - RL_SETSTATE(RL_STATE_DISPATCHING); -! (*map[key].function)(rl_numeric_arg * rl_arg_sign, key); - RL_UNSETSTATE(RL_STATE_DISPATCHING); - rl_dispatching = 0; -*** ../readline-5.1/text.c Sat Sep 24 19:06:07 2005 ---- text.c Tue Dec 20 17:38:26 2005 -*************** -*** 1072,1077 **** - int count, key; - { -- int r; -- - if (count < 0) - return (_rl_rubout_char (-count, key)); ---- 1072,1075 ---- -*************** -*** 1091,1097 **** - rl_forward_byte (count, key); - -! r = rl_kill_text (orig_point, rl_point); - rl_point = orig_point; -- return r; - } - else ---- 1089,1094 ---- - rl_forward_byte (count, key); - -! rl_kill_text (orig_point, rl_point); - rl_point = orig_point; - } - else -*************** -*** 1100,1105 **** - - new_point = MB_NEXTCHAR (rl_line_buffer, rl_point, 1, MB_FIND_NONZERO); -! return (rl_delete_text (rl_point, new_point)); - } - } - ---- 1097,1103 ---- - - new_point = MB_NEXTCHAR (rl_line_buffer, rl_point, 1, MB_FIND_NONZERO); -! rl_delete_text (rl_point, new_point); - } -+ return 0; - } - diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/readline-5.1-patches/readline51-002 new/readline-5.2-patches/readline51-002 --- old/readline-5.1-patches/readline51-002 2006-02-04 18:06:00.000000000 +0100 +++ new/readline-5.2-patches/readline51-002 1970-01-01 01:00:00.000000000 +0100 @@ -1,43 +0,0 @@ - READLINE PATCH REPORT - ===================== - -Readline-Release: 5.1 -Patch-ID: readline51-002 - -Bug-Reported-by: Mike Frysinger <vapier(a)gentoo.org> -Bug-Reference-ID: <200601120613.11907.vapier(a)gentoo.org> -Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2006-01/msg00045.html - -Bug-Description: - -Under some circumstances, Readline can use an incorrect setting for the flag -that indicates whether or not the terminal can auto-wrap, resulting in line- -wrapping errors. - -Patch: - -*** ../readline-5.1/terminal.c Sat Nov 12 20:46:54 2005 ---- terminal.c Tue Jan 31 10:57:54 2006 -*************** -*** 123,127 **** - - /* Non-zero means the terminal can auto-wrap lines. */ -! int _rl_term_autowrap; - - /* Non-zero means that this terminal has a meta key. */ ---- 126,130 ---- - - /* Non-zero means the terminal can auto-wrap lines. */ -! int _rl_term_autowrap = -1; - - /* Non-zero means that this terminal has a meta key. */ -*************** -*** 275,278 **** ---- 278,284 ---- - int rows, cols; - { -+ if (_rl_term_autowrap == -1) -+ _rl_init_terminal_io (rl_terminal_name); -+ - if (rows > 0) - _rl_screenheight = rows; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/readline-5.1-patches/readline51-003 new/readline-5.2-patches/readline51-003 --- old/readline-5.1-patches/readline51-003 2006-03-16 14:14:00.000000000 +0100 +++ new/readline-5.2-patches/readline51-003 1970-01-01 01:00:00.000000000 +0100 @@ -1,29 +0,0 @@ - READLINE PATCH REPORT - ===================== - -Readline-Release: 5.1 -Patch-ID: readline51-003 - -Bug-Reported-by: Bob Rossi <bob(a)brasko.net> -Bug-Reference-ID: <43F60606.80708(a)case.edu> -Bug-Reference-URL: - -Bug-Description: - -In some cases, readline will reference freed memory when attempting to -display a portion of the prompt. - -Patch: - -*** ../readline-5.1/readline.c Tue Dec 20 17:38:29 2005 ---- readline.c Fri Feb 17 22:54:22 2006 -*************** -*** 282,287 **** ---- 282,288 ---- - { - FREE (rl_prompt); - rl_prompt = prompt ? savestring (prompt) : (char *)NULL; -+ rl_display_prompt = rl_prompt ? rl_prompt : ""; - - rl_visible_prompt_length = rl_expand_prompt (rl_prompt); - return 0; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/readline-5.1-patches/readline51-004 new/readline-5.2-patches/readline51-004 --- old/readline-5.1-patches/readline51-004 2006-03-16 14:15:00.000000000 +0100 +++ new/readline-5.2-patches/readline51-004 1970-01-01 01:00:00.000000000 +0100 @@ -1,90 +0,0 @@ - READLINE PATCH REPORT - ===================== - -Readline-Release: 5.1 -Patch-ID: readline51-004 - -Bug-Reported-by: Mike Stroyan <mike.stroyan(a)hp.com> -Bug-Reference-ID: <20060203191607.GC27614@localhost> -Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2006-02/msg00004.html - -Bug-Description: - -The displayed search prompt is corrupted when using non-incremental -searches in vi and emacs mode if the prompt contains non-printing -characters or spans multiple lines. The prompt is expanded more than -once; the second time without the escape sequences that protect non- -printing characters from the length calculations. - -Patch: - -*** ../readline-5.1-patched/display.c Wed Nov 30 14:05:02 2005 ---- display.c Sat Feb 18 12:14:58 2006 -*************** -*** 1983,1993 **** - int pchar; - { - int len; -! char *pmt; - - rl_save_prompt (); - -! if (saved_local_prompt == 0) - { - len = (rl_prompt && *rl_prompt) ? strlen (rl_prompt) : 0; - pmt = (char *)xmalloc (len + 2); ---- 1998,2012 ---- - int pchar; - { - int len; -! char *pmt, *p; - - rl_save_prompt (); - -! /* We've saved the prompt, and can do anything with the various prompt -! strings we need before they're restored. We want the unexpanded -! portion of the prompt string after any final newline. */ -! p = rl_prompt ? strrchr (rl_prompt, '\n') : 0; -! if (p == 0) - { - len = (rl_prompt && *rl_prompt) ? strlen (rl_prompt) : 0; - pmt = (char *)xmalloc (len + 2); -*************** -*** 1998,2016 **** - } - else - { -! len = *saved_local_prompt ? strlen (saved_local_prompt) : 0; - pmt = (char *)xmalloc (len + 2); - if (len) -! strcpy (pmt, saved_local_prompt); - pmt[len] = pchar; - pmt[len+1] = '\0'; -! local_prompt = savestring (pmt); -! prompt_last_invisible = saved_last_invisible; -! prompt_visible_length = saved_visible_length + 1; -! } - - prompt_physical_chars = saved_physical_chars + 1; -- - return pmt; - } - ---- 2017,2033 ---- - } - else - { -! p++; -! len = strlen (p); - pmt = (char *)xmalloc (len + 2); - if (len) -! strcpy (pmt, p); - pmt[len] = pchar; - pmt[len+1] = '\0'; -! } - -+ /* will be overwritten by expand_prompt, called from rl_message */ - prompt_physical_chars = saved_physical_chars + 1; - return pmt; - } - ++++++ readline-5.0-wrap.patch -> readline-5.2-wrap.patch ++++++ --- bash/readline-5.0-wrap.patch 2005-04-19 17:14:17.000000000 +0200 +++ /mounts/work_src_done/STABLE/bash/readline-5.2-wrap.patch 2006-11-13 17:29:32.000000000 +0100 @@ -1,17 +1,14 @@ ---- lib/readline/display.c 2005-01-18 12:34:39.489668286 +0000 -+++ lib/readline/display.c 2005-01-18 12:35:29.127187527 +0000 -@@ -622,10 +622,11 @@ - +--- lib/readline/display.c ++++ lib/readline/display.c 2006-11-13 16:55:24.000000000 +0100 +@@ -665,7 +665,10 @@ inv_lbreaks[++newlines] = temp; #if defined (HANDLE_MULTIBYTE) -- lpos -= _rl_col_width (local_prompt, n0, num); --#else -- lpos -= _rl_screenwidth; -+ if (local_prompt) -+ lpos -= _rl_col_width (local_prompt, n0, num); -+ else + if (MB_CUR_MAX > 1 && rl_byte_oriented == 0) +- lpos -= _rl_col_width (local_prompt, n0, num); ++ { ++ if (local_prompt_len > 0) ++ lpos -= _rl_col_width (local_prompt, n0, num); ++ } + else #endif -+ lpos -= _rl_screenwidth; - } - - prompt_last_screen_line = newlines; + lpos -= _rl_screenwidth; ++++++ readline-5.1.dif -> readline-5.2.dif ++++++ --- bash/readline-5.1.dif 2006-09-22 16:18:12.000000000 +0200 +++ /mounts/work_src_done/STABLE/bash/readline-5.2.dif 2006-11-13 17:34:05.000000000 +0100 @@ -1,10 +1,10 @@ --- .pkgextract +++ .pkgextract 2005-12-09 17:09:26.000000000 +0100 @@ -0,0 +1,5 @@ ++#tar Oxfj ../readline-5.2-patches.tar.bz2 | patch -p0 -s +patch -p2 -s --suffix=".zerotty" < ../readline-4.3-input.dif -+patch -p2 -s --suffix=".wrap" < ../readline-5.0-wrap.patch -+patch -p2 -s --suffix=".conf" < ../readline-5.0-conf.patch -+patch -p2 -s --suffix=".random" < ../readline-5.1-random.patch ++patch -p2 -s --suffix=".wrap" < ../readline-5.2-wrap.patch ++patch -p2 -s --suffix=".conf" < ../readline-5.2-conf.patch +patch -p0 -s --suffix=".destdir" < ../readline-5.1-destdir.patch --- Makefile.in +++ Makefile.in 2005-12-09 17:09:26.000000000 +0100 @@ -28,20 +28,6 @@ fi ) uninstall-doc: ---- bind.c -+++ bind.c 2005-12-09 17:09:26.000000000 +0100 -@@ -370,7 +370,10 @@ rl_generic_bind (type, keyseq, data, map - - ic = uc; - if (ic < 0 || ic >= KEYMAP_SIZE) -- return -1; -+ { -+ free (keys); -+ return -1; -+ } - - if (META_CHAR (ic) && _rl_convert_meta_chars_to_ascii) - { --- complete.c +++ complete.c 2005-12-09 17:11:19.000000000 +0100 @@ -428,7 +428,7 @@ get_y_or_n (for_pager) @@ -62,7 +48,7 @@ { scan = rl_line_buffer[rl_point]; -@@ -1813,7 +1813,7 @@ rl_completion_matches (text, entry_funct +@@ -1802,7 +1802,7 @@ rl_completion_matches (text, entry_funct match_list = (char **)xmalloc ((match_list_size + 1) * sizeof (char *)); match_list[1] = (char *)NULL; @@ -71,7 +57,7 @@ { if (matches + 1 == match_list_size) match_list = (char **)xrealloc -@@ -1864,7 +1864,7 @@ rl_username_completion_function (text, s +@@ -1853,7 +1853,7 @@ rl_username_completion_function (text, s } #if defined (HAVE_GETPWENT) @@ -82,7 +68,7 @@ if (namelen == 0 || (STREQN (username, entry->pw_name, namelen))) --- readline.c +++ readline.c 2005-12-09 17:09:26.000000000 +0100 -@@ -715,7 +715,11 @@ _rl_dispatch_subseq (key, map, got_subse +@@ -735,7 +735,11 @@ _rl_dispatch_subseq (key, map, got_subse { /* Special case rl_do_lowercase_version (). */ if (func == rl_do_lowercase_version) @@ -118,19 +104,23 @@ info: $(INFOOBJ) --- doc/readline.3 -+++ doc/readline.3 2005-12-09 17:09:26.000000000 +0100 -@@ -114,8 +114,8 @@ Readline is customized by putting comman - file (the \fIinputrc\fP file). - The name of this file is taken from the value of the - .B INPUTRC --environment variable. If that variable is unset, the default is --.IR ~/.inputrc . -+environment variable. If that variable is unset, readline will read both -+.IR /etc/inputrc " and " ~/.inputrc . ++++ doc/readline.3 2006-11-13 17:33:27.000000000 +0100 +@@ -118,6 +118,14 @@ environment variable. If that variable + .IR ~/.inputrc . + If that file does not exist or cannot be read, the ultimate default is + .IR /etc/inputrc . ++If both files ++.I ~/.inputrc ++and ++.I /etc/inputrc ++exist readline will read first ++.I /etc/inputrc ++and then ++.IR ~/.inputrc . When a program which uses the readline library starts up, the init file is read, and the key bindings and variables are set. There are only a few basic constructs allowed in the -@@ -1266,6 +1266,9 @@ VI Command Mode functions +@@ -1270,6 +1278,9 @@ VI Command Mode functions .TP .FN ~/.inputrc Individual \fBreadline\fP initialization file ++++++ readline-5.1-patches.tar.bz2 -> readline-5.2.tar.bz2 ++++++ ++++ 127926 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit autoconf
by root＠suse.de 06 Dec '06

06 Dec '06

Hello community, here is the log from the commit of package autoconf checked in at Wed Dec 6 11:49:08 CET 2006. -------- --- autoconf/autoconf-el.changes 2006-08-02 16:01:59.000000000 +0200 +++ /mounts/work_src_done/STABLE/autoconf/autoconf-el.changes 2006-12-04 11:14:32.000000000 +0100 @@ -1,0 +2,7 @@ +Mon Dec 4 11:14:02 CET 2006 - schwab(a)suse.de + +- Update to autoconf 2.61. + ** New macros AC_C_FLEXIBLE_ARRAY_MEMBER, AC_C_VARARRAYS. + ** AC_ARG_ENABLE and AC_ARG_WITH now allow '.' in feature and package names. + +------------------------------------------------------------------- autoconf.changes: same change Old: ---- autoconf-2.60.diff autoconf-2.60.tar.bz2 New: ---- autoconf-2.61.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ autoconf-el.spec ++++++ --- /var/tmp/diff_new_pack.X8eBwc/_old 2006-12-06 11:48:49.000000000 +0100 +++ /var/tmp/diff_new_pack.X8eBwc/_new 2006-12-06 11:48:49.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package autoconf-el (Version 2.60) +# spec file for package autoconf-el (Version 2.61) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -12,16 +12,15 @@ Name: autoconf-el BuildRequires: emacs-nox -License: GPL +License: GNU General Public License (GPL) Group: Productivity/Editors/Emacs Autoreqprov: on -Version: 2.60 +Version: 2.61 Release: 1 Summary: Emacs mode for editing GNU Autoconf scripts URL: http://www.gnu.org/software/autoconf BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: autoconf-%{version}.tar.bz2 -Patch: autoconf-%{version}.diff NoSource: 0 BuildArch: noarch Enhances: emacs @@ -37,7 +36,6 @@ %prep %setup -n autoconf-%{version} -%patch %build %{suse_update_config -f config} @@ -71,6 +69,10 @@ %{site_lisp}/*.elc %changelog -n autoconf-el +* Mon Dec 04 2006 - schwab(a)suse.de +- Update to autoconf 2.61. + ** New macros AC_C_FLEXIBLE_ARRAY_MEMBER, AC_C_VARARRAYS. + ** AC_ARG_ENABLE and AC_ARG_WITH now allow '.' in feature and package names. * Wed Aug 02 2006 - schwab(a)suse.de - Split off autoconf-el. * Thu Jul 20 2006 - schwab(a)suse.de ++++++ autoconf.spec ++++++ --- /var/tmp/diff_new_pack.X8eBwc/_old 2006-12-06 11:48:49.000000000 +0100 +++ /var/tmp/diff_new_pack.X8eBwc/_new 2006-12-06 11:48:49.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package autoconf (Version 2.60) +# spec file for package autoconf (Version 2.61) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -12,18 +12,17 @@ Name: autoconf BuildRequires: help2man -License: GPL +License: GNU General Public License (GPL) Group: Development/Tools/Building +URL: http://www.gnu.org/software/autoconf Autoreqprov: on Requires: m4 = %(rpm -q --qf=%%{VERSION} m4) PreReq: %{install_info_prereq} -Version: 2.60 -Release: 3 +Version: 2.61 +Release: 1 Summary: A GNU Tool for Automatically Configuring Source Code -URL: http://www.gnu.org/software/autoconf -BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: autoconf-%{version}.tar.bz2 -Patch: autoconf-%{version}.diff +BuildRoot: %{_tmppath}/%{name}-%{version}-build %description GNU Autoconf is a tool for configuring source code and makefiles. Using @@ -47,7 +46,6 @@ %prep %setup -%patch %build %{suse_update_config -f config} @@ -77,6 +75,10 @@ %doc %{_mandir}/man1/*.gz %changelog -n autoconf +* Mon Dec 04 2006 - schwab(a)suse.de +- Update to autoconf 2.61. + ** New macros AC_C_FLEXIBLE_ARRAY_MEMBER, AC_C_VARARRAYS. + ** AC_ARG_ENABLE and AC_ARG_WITH now allow '.' in feature and package names. * Wed Aug 02 2006 - schwab(a)suse.de - Split off autoconf-el. * Thu Jul 20 2006 - schwab(a)suse.de ++++++ autoconf-2.60.tar.bz2 -> autoconf-2.61.tar.bz2 ++++++ ++++ 39622 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit gzip
by root＠suse.de 06 Dec '06

06 Dec '06

Hello community, here is the log from the commit of package gzip checked in at Wed Dec 6 11:48:44 CET 2006. -------- --- gzip/gzip.changes 2006-09-13 11:26:29.000000000 +0200 +++ /mounts/work_src_done/STABLE/gzip/gzip.changes 2006-12-04 13:09:22.000000000 +0100 @@ -1,0 +2,18 @@ +Mon Dec 4 13:08:18 CET 2006 - schwab(a)suse.de + +- Update to gzip 1.3.6. + * Fix some race conditions in setting file time stamps, permissions, and owner. + * Fix some race conditions in signal handling. + * When gzip exits due to a signal, it exits with the signal's status, not 1. + * gzip now restores file time stamps to the resolution supported by the + time-setting primitives of the operating system, typically 1 microsecond. + Formerly it restored them only to the nearest second. + * gzip -r no longer attempts to reset the last-access times of directories + it reads, as this messes up when other processes are reading the directories. + * The options --version and --help now work on all gzip-installed executables, + and now use a format similar to other GNU programs. + * The manual is now distributed under the terms of the GNU Free + Documentation License without invariant sections or cover texts. + * Port to current versions of Autoconf, Automake, and Gnulib. + +------------------------------------------------------------------- Old: ---- gzip-1.3.5-codecleanup.patch gzip-1.3.5-tempfile.patch gzip-1.3.5-zmore.patch gzip-1.3.5.patch gzip-1.3.5.tar.bz2 traversal.diff ungzip.diff zgrep.patch New: ---- gzip-1.3.6.tar.gz tempfile.diff zgrep.diff zmore.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gzip.spec ++++++ --- /var/tmp/diff_new_pack.YfDJ1c/_old 2006-12-06 11:48:05.000000000 +0100 +++ /var/tmp/diff_new_pack.YfDJ1c/_new 2006-12-06 11:48:05.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package gzip (Version 1.3.5) +# spec file for package gzip (Version 1.3.6) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -13,23 +13,19 @@ Name: gzip %define do_profiling 0 URL: http://www.gzip.org/ -License: GPL +License: GNU General Public License (GPL) Group: Productivity/Archiving/Compression Autoreqprov: on PreReq: %{install_info_prereq} -Version: 1.3.5 -Release: 163 +Version: 1.3.6 +Release: 1 Summary: GNU Zip Compression Utilities -Source: %{name}-%{version}.tar.bz2 -Patch: gzip-1.3.5.patch -Patch1: gzip-1.3.5-tempfile.patch -Patch2: gzip-1.3.5-codecleanup.patch -Patch3: zgrep.patch -Patch4: gzip-1.3.5-zmore.patch -Patch5: traversal.diff -Patch6: non-exec-stack.diff -Patch7: http://rsync.samba.org/ftp/unpacked/rsync/patches/gzip-rsyncable.diff -Patch8: ungzip.diff +Source: %{name}-%{version}.tar.gz +Patch: zgrep.diff +Patch1: tempfile.diff +Patch2: zmore.diff +Patch3: non-exec-stack.diff +Patch4: http://rsync.samba.org/ftp/unpacked/rsync/patches/gzip-rsyncable.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -51,32 +47,27 @@ %patch1 %patch2 %patch3 -%patch4 -%patch5 -%patch6 -%patch7 -p1 -%patch8 +%patch4 -p1 %build -export CFLAGS="$RPM_OPT_FLAGS \ +CFLAGS="$RPM_OPT_FLAGS -fomit-frame-pointer \ %ifarch %{ix86} - -mcpu=pentiumpro \ +-mcpu=pentiumpro \ %endif --fomit-frame-pointer -fno-strength-reduce \ -W -Wall -Wno-unused-parameter -Wstrict-prototypes -Wpointer-arith" -./configure --prefix=%{_prefix} --infodir=%{_infodir} --mandir=%{_mandir} +./configure CFLAGS="$CFLAGS" \ + --prefix=%{_prefix} --infodir=%{_infodir} --mandir=%{_mandir} %if %{do_profiling} make CFLAGS="$CFLAGS -fprofile-arcs" for i in 1 2 3 4 5 6 7 8 9 do - time ./gzip -$i < texinfo.tex > texinfo.tex.gz - ./gzip --test texinfo.tex.gz - ./gzip -d < texinfo.tex.gz > texinfo.test$i - diff texinfo.tex texinfo.test$i - time ./gzip -$i < /bin/bash > bash.gz - ./gzip --test bash.gz - ./gzip -d < bash.gz > bash.test$i - cmp /bin/bash bash.test$i + for f in build-aux/texinfo.tex /bin/bash; do + basef=${f##*/} + time ./gzip -$i < $f > $basef.gz + ./gzip --test $basef.gz + ./gzip -d < $basef.gz > $basef.test$i + cmp $f $basef.test$i + done done make clean make CFLAGS="$CFLAGS -fbranch-probabilities" @@ -85,20 +76,16 @@ %endif for i in 1 2 3 4 5 6 7 8 9 do - time ./gzip -$i < texinfo.tex > texinfo.tex.gz - ./gzip --test texinfo.tex.gz - ./gzip -d < texinfo.tex.gz > texinfo.test$i - diff texinfo.tex texinfo.test$i - time ./gzip -$i < /bin/bash > bash.gz - ./gzip --test bash.gz - ./gzip -d < bash.gz > bash.test$i - cmp /bin/bash bash.test$i + for f in build-aux/texinfo.tex /bin/bash; do + basef=${f##*/} + time ./gzip -$i < $f > $basef.gz + ./gzip --test $basef.gz + ./gzip -d < $basef.gz > $basef.test$i + cmp $f $basef.test$i + done done -ls -l texinfo.test? -ls -l bash.test? %install -rm -rf $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT install mkdir -p $RPM_BUILD_ROOT/bin mv $RPM_BUILD_ROOT/usr/bin/gzip $RPM_BUILD_ROOT/bin/ @@ -124,6 +111,21 @@ %install_info_delete --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz %changelog -n gzip +* Mon Dec 04 2006 - schwab(a)suse.de +- Update to gzip 1.3.6. + * Fix some race conditions in setting file time stamps, permissions, and owner. + * Fix some race conditions in signal handling. + * When gzip exits due to a signal, it exits with the signal's status, not 1. + * gzip now restores file time stamps to the resolution supported by the + time-setting primitives of the operating system, typically 1 microsecond. + Formerly it restored them only to the nearest second. + * gzip -r no longer attempts to reset the last-access times of directories + it reads, as this messes up when other processes are reading the directories. + * The options --version and --help now work on all gzip-installed executables, + and now use a format similar to other GNU programs. + * The manual is now distributed under the terms of the GNU Free + Documentation License without invariant sections or cover texts. + * Port to current versions of Autoconf, Automake, and Gnulib. * Wed Sep 13 2006 - schwab(a)suse.de - Verify hash tables when unpacking [#202365]. * Mon Mar 13 2006 - schwab(a)suse.de @@ -152,13 +154,13 @@ - Make sure we have no hardlinks from /bin to /usr/bin [Bug #29522] * Tue Jun 17 2003 - pthomas(a)suse.de - Update to 1.3.5 -- gzip now removes any output symlink before writing output file. -- zgrep etc. scripts now port to POSIX 1003.1-2001 hosts. -- zforce no longer assumes 14-byte file name length limit. -- zless is now implemented using less and LESSOPEN, not zmore and PAGER. -- assembly-language speedups reenabled; were mistakenly disabled in 1.3. -- Less output is lost when decompressing a truncated file. -- zgrep now supports --, -H, -h, -L, -l, -C, -d, -m and their long + - gzip now removes any output symlink before writing output file. + - zgrep etc. scripts now port to POSIX 1003.1-2001 hosts. + - zforce no longer assumes 14-byte file name length limit. + - zless is now implemented using less and LESSOPEN, not zmore and PAGER. + - assembly-language speedups reenabled; were mistakenly disabled in 1.3. + - Less output is lost when decompressing a truncated file. + - zgrep now supports --, -H, -h, -L, -l, -C, -d, -m and their long equivalents. * Wed Jun 04 2003 - jh(a)suse.de - Enable profile feedback ++++++ gzip-rsyncable.diff ++++++ --- /var/tmp/diff_new_pack.YfDJ1c/_old 2006-12-06 11:48:05.000000000 +0100 +++ /var/tmp/diff_new_pack.YfDJ1c/_new 2006-12-06 11:48:05.000000000 +0100 @@ -4,9 +4,10 @@ tried out in the default gzip for Debian Sarge, and may go into the upstream gzip at somepoint in the not-too-distant future. ---- gzip-1.3.5/deflate.c 1999-10-07 23:46:28 -0700 -+++ rsyncable/deflate.c 2005-02-05 09:40:33 -0800 -@@ -122,6 +122,14 @@ +================================================================================ +--- gzip-1.3.6/deflate.c ++++ gzip-1.3.6/deflate.c +@@ -135,6 +135,14 @@ #endif /* Matches of length 3 are discarded if their distance exceeds TOO_FAR */ @@ -21,7 +22,7 @@ /* =========================================================================== * Local data used by the "longest match" routines. */ -@@ -203,6 +211,8 @@ +@@ -216,6 +224,8 @@ unsigned near good_match; /* Use a faster search when the previous match is longer than this */ @@ -30,7 +31,7 @@ /* Values for max_lazy_match, good_match and max_chain_length, depending on * the desired pack level (0..9). The values given below have been tuned to -@@ -301,6 +311,10 @@ +@@ -314,6 +324,10 @@ #endif /* prev will be initialized on the fly */ @@ -41,7 +42,7 @@ /* Set the default configuration parameters: */ max_lazy_match = configuration_table[pack_level].max_lazy; -@@ -537,6 +551,8 @@ +@@ -550,6 +564,8 @@ memcpy((char*)window, (char*)window+WSIZE, (unsigned)WSIZE); match_start -= WSIZE; strstart -= WSIZE; /* we now have strstart >= MAX_DIST: */ @@ -50,7 +51,7 @@ block_start -= (long) WSIZE; -@@ -564,13 +580,46 @@ +@@ -577,13 +593,46 @@ } } @@ -98,7 +99,7 @@ /* =========================================================================== * Processes a new input file and return its compressed length. This -@@ -581,7 +630,7 @@ +@@ -594,7 +643,7 @@ local off_t deflate_fast() { IPos hash_head; /* head of the hash chain */ @@ -107,7 +108,7 @@ unsigned match_length = 0; /* length of best match */ prev_length = MIN_MATCH-1; -@@ -610,6 +659,7 @@ +@@ -623,6 +672,7 @@ lookahead -= match_length; @@ -115,22 +116,22 @@ /* Insert new strings in the hash table only if the match length * is not too large. This saves time but degrades compression. */ -@@ -638,9 +688,14 @@ +@@ -651,9 +701,14 @@ /* No match, output a literal byte */ Tracevv((stderr,"%c",window[strstart])); flush = ct_tally (0, window[strstart]); -+ RSYNC_ROLL(strstart, 1); ++ RSYNC_ROLL(strstart, 1); lookahead--; - strstart++; + strstart++; } -+ if (rsync && strstart > rsync_chunk_end) { -+ rsync_chunk_end = 0xFFFFFFFFUL; -+ flush = 2; -+ } ++ if (rsync && strstart > rsync_chunk_end) { ++ rsync_chunk_end = 0xFFFFFFFFUL; ++ flush = 2; ++ } if (flush) FLUSH_BLOCK(0), block_start = strstart; /* Make sure that we always have enough lookahead, except -@@ -713,6 +768,7 @@ +@@ -726,6 +781,7 @@ */ lookahead -= prev_length-1; prev_length -= 2; @@ -138,7 +139,7 @@ do { strstart++; INSERT_STRING(strstart, hash_head); -@@ -725,24 +781,39 @@ +@@ -738,24 +794,39 @@ match_available = 0; match_length = MIN_MATCH-1; strstart++; @@ -182,9 +183,26 @@ strstart++; lookahead--; } ---- gzip-1.3.5/gzip.c 2002-09-28 00:38:43 -0700 -+++ rsyncable/gzip.c 2005-02-05 09:40:33 -0800 -@@ -256,6 +256,7 @@ +--- gzip-1.3.6/doc/gzip.texi ++++ gzip-1.3.6/doc/gzip.texi +@@ -328,6 +328,14 @@ + into the directory and compress all the files it finds there (or + decompress them in the case of @code{gunzip}). + ++@item --rsyncable ++While compressing, synchronize the output occasionally based on the ++input. This increases size by less than 1 percent most cases, but ++means that the @code{rsync} program can take advantage of similarities ++in the uncompressed input when syncronizing two files compressed with ++this flag. @code{gunzip} cannot tell the difference between a ++compressed file created with this option, and one created without it. ++ + @item --suffix @var{suf} + @itemx -S @var{suf} + Use suffix @samp{@var{suf}} instead of @samp{.gz}. Any suffix can be +--- gzip-1.3.6/gzip.c ++++ gzip-1.3.6/gzip.c +@@ -218,6 +218,7 @@ unsigned insize; /* valid bytes in inbuf */ unsigned inptr; /* index of next byte to be processed in inbuf */ unsigned outcnt; /* bytes in output buffer */ @@ -192,7 +210,7 @@ struct option longopts[] = { -@@ -285,6 +286,7 @@ +@@ -247,6 +248,7 @@ {"best", 0, 0, '9'}, /* compress better */ {"lzw", 0, 0, 'Z'}, /* make output compatible with old compress */ {"bits", 1, 0, 'b'}, /* max number of bits per code (implies -Z) */ @@ -200,27 +218,9 @@ { 0, 0, 0, 0 } }; -@@ -365,6 +367,7 @@ - " -Z --lzw produce output compatible with old compress", - " -b --bits maxbits max number of bits per code (implies -Z)", - #endif -+ " --rsyncable Make rsync-friendly archive", - " file... files to (de)compress. If none given, use standard input.", - "Report bugs to <bug-gzip(a)gnu.org>.", - 0}; -@@ -543,6 +546,9 @@ - #else - recursive = 1; break; - #endif -+ case 'R': -+ rsync = 1; break; -+ - case 'S': - #ifdef NO_MULTIPLE_DOTS - if (*optarg == '.') optarg++; ---- gzip-1.3.5/gzip.h 2001-09-30 23:53:41 -0700 -+++ rsyncable/gzip.h 2005-02-05 09:40:33 -0800 -@@ -133,6 +133,7 @@ +--- gzip-1.3.6/gzip.h ++++ gzip-1.3.6/gzip.h +@@ -155,6 +155,7 @@ extern unsigned insize; /* valid bytes in inbuf */ extern unsigned inptr; /* index of next byte to be processed in inbuf */ extern unsigned outcnt; /* bytes in output buffer */ @@ -228,7 +228,7 @@ extern off_t bytes_in; /* number of input bytes */ extern off_t bytes_out; /* number of output bytes */ -@@ -281,7 +282,7 @@ +@@ -303,7 +304,7 @@ /* in trees.c */ void ct_init OF((ush *attr, int *method)); int ct_tally OF((int dist, int lc)); @@ -237,26 +237,9 @@ /* in bits.c */ void bi_init OF((file_t zipfile)); ---- gzip-1.3.5/gzip.texi 2002-09-29 23:57:29 -0700 -+++ rsyncable/gzip.texi 2005-02-05 09:40:33 -0800 -@@ -334,6 +334,14 @@ - into the directory and compress all the files it finds there (or - decompress them in the case of @code{gunzip}). - -+@item --rsyncable -+While compressing, synchronize the output occasionally based on the -+input. This increases size by less than 1 percent most cases, but -+means that the @code{rsync} program can take advantage of similarities -+in the uncompressed input when syncronizing two files compressed with -+this flag. @code{gunzip} cannot tell the difference between a -+compressed file created with this option, and one created without it. -+ - @item --suffix @var{suf} - @itemx -S @var{suf} - Use suffix @samp{@var{suf}} instead of @samp{.gz}. Any suffix can be ---- gzip-1.3.5/trees.c 1999-10-05 22:00:00 -0700 -+++ rsyncable/trees.c 2005-02-05 09:40:33 -0800 -@@ -46,12 +46,13 @@ +--- gzip-1.3.6/trees.c ++++ gzip-1.3.6/trees.c +@@ -59,12 +59,13 @@ * void ct_tally (int dist, int lc); * Save the match info and tally the frequency counts. * @@ -274,7 +257,7 @@ #include <config.h> #include <ctype.h> -@@ -847,9 +848,10 @@ +@@ -860,9 +861,10 @@ * trees or store, and output the encoded block to the zip file. This function * returns the total compressed length for the file so far. */ @@ -286,7 +269,7 @@ int eof; /* true if this is the last block for a file */ { ulg opt_lenb, static_lenb; /* opt_len and static_len in bytes */ -@@ -941,6 +943,10 @@ +@@ -955,6 +957,10 @@ Assert (input_len == bytes_in, "bad input size"); bi_windup(); compressed_len += 7; /* align on byte boundary */ ++++++ non-exec-stack.diff ++++++ --- /var/tmp/diff_new_pack.YfDJ1c/_old 2006-12-06 11:48:05.000000000 +0100 +++ /var/tmp/diff_new_pack.YfDJ1c/_new 2006-12-06 11:48:05.000000000 +0100 @@ -1,11 +1,7 @@ ---- match.c -+++ match.c -@@ -44,6 +44,8 @@ - */ - - .file "match.S" +--- lib/match.c ++++ lib/match.c +@@ -770,3 +770,4 @@ + # endif /* __ia64__ */ + #endif /* mc68000 || mc68020 */ + #endif /* i386 || _I386 */ + .section .note.GNU-stack,"",@progbits -+ .previous - - #define MAX_MATCH 258 - #define MAX_MATCH2 $128 /* MAX_MATCH/2-1 */ ++++++ tempfile.diff ++++++ --- gzexe.in +++ gzexe.in @@ -67,7 +67,10 @@ esac done -tmp=gz$$ +tmp=`mktemp /tmp/gz.XXXXXX` || { + echo 'cannot create temporary file' >&2 + exit 1 +} trap "rm -f $tmp; exit 1" 1 2 3 5 10 13 15 set -C @@ -137,6 +140,8 @@ umask 77 if (tempfile --version) >/dev/null 2>&1 then gztmp=`tempfile -p gztmp` || exit +elif (mktemp -V) >/dev/null 2>&1 +then gztmp=`mktemp -t gztmp.XXXXXXXX` || exit else gztmp=/tmp/gztmp$$ fi if tail +$skip "$0" | "BINDIR"/gzip -cd > "$gztmp"; then --- zdiff.in +++ zdiff.in @@ -59,12 +59,12 @@ case "$2" in *[-.]gz* | *[-.][zZ] | *.t[ga]z) F=`echo "$2" | sed 's|.*/||;s|[-.][zZtga]*||'` - set -C - trap 'rm -f /tmp/"$F".$$; exit 2' HUP INT PIPE TERM 0 - gzip -cdfq -- "$2" > /tmp/"$F".$$ || exit - gzip -cdfq -- "$1" | $comp $OPTIONS - /tmp/"$F".$$ + TF=`/bin/mktemp -t "$F".XXXXXXXX` || exit 1 + trap 'rm -f "$TF"; exit 2' HUP INT PIPE TERM 0 + gzip -cdfq -- "$2" > "$TF" || exit + gzip -cdfq -- "$1" | $comp $OPTIONS - "$TF" STAT="$?" - /bin/rm -f /tmp/"$F".$$ || STAT=2 + /bin/rm -f "$TF" || STAT=2 trap - HUP INT PIPE TERM 0 exit $STAT;; --- znew.in +++ znew.in @@ -56,8 +56,9 @@ # block is the disk block size (best guess, need not be exact) warn="(does not preserve modes and timestamp)" -tmp=/tmp/zfoo.$$ -set -C +dtmp=`mktemp -d -t znew.XXXXXXXX` || exit +trap 'rm -rf $dtmp' HUP INT PIPE TERM 0 +tmp=$dtmp/znew echo hi > $tmp || exit if test -z "`(${CPMOD-cpmod} $tmp $tmp) 2>&1`"; then cpmod=${CPMOD-cpmod} @@ -73,7 +74,8 @@ # check if GZIP env. variable uses -S or --suffix gzip -q $tmp ext=`echo $tmp* | sed "s|$tmp||"` -rm -f $tmp* +rm -f $dtmp +trap - HUP INT PIPE TERM 0 if test -z "$ext"; then echo znew: error determining gzip extension exit 1 ++++++ zgrep.diff ++++++ --- zgrep.in +++ zgrep.in @@ -102,13 +102,36 @@ fi if test $# -eq 0; then - gzip -cdfq | $grep $opt "$pat" - exit $? + if type -p dd > /dev/null 2>&1 && + type -p mimencode > /dev/null 2>&1 && + type -p file > /dev/null 2>&1 + then + uncompress=gzip + x=`dd bs=20 count=1 2> /dev/null | mimencode -b` + case `echo -n $x | mimencode -u -b | file -b -` in + bzip2*) + uncompress=bzip2 + ;; + esac + (echo -n $x | mimencode -u -b; cat -) | $uncompress -cdfq | $grep $opt "$pat" + exit $? + else + gzip -cdfq | $grep $opt "$pat" + exit $? + fi fi res=0 for i do - gzip -cdfq -- "$i" | + case $i in + *.bz2) + uncompress=bzip2 + ;; + *) + uncompress=gzip + ;; + esac + $uncompress -cdfq "$i" | if test $files_with_matches -eq 1; then $grep $opt "$pat" > /dev/null && printf '%s\n' "$i" elif test $files_without_matches -eq 1; then @@ -116,6 +139,7 @@ elif test $with_filename -eq 0 && { test $# -eq 1 || test $no_filename -eq 1; }; then $grep $opt "$pat" else + i=`printf '%s\n' "$i" | sed 's/[\|&]/\\\\&/g'` if test $with_filename -eq 1; then sed_script="s|^[^:]*:|${i}:|" else ++++++ zmore.diff ++++++ --- zmore.in +++ zmore.in @@ -52,11 +52,33 @@ trap 'stty $ncb echo 2>/dev/null; exit' 0 2 3 5 10 13 15 fi +opt= +pager () +{ + eval ${PAGER-more} \$opt + cat > /dev/null +} + +while :; do + case $1 in + --) + shift + break + ;; + [-+]*) + opt="$opt $1" + shift + ;; + *) + break + ;; + esac +done if test $# = 0; then if test -t 0; then echo "$usage" else - gzip -cdfq | eval ${PAGER-more} + gzip -cdfq | pager fi else FIRST=1 @@ -80,7 +102,7 @@ fi if test "$ANS" != 's'; then echo "------> $FILE <------" - gzip -cdfq -- "$FILE" | eval ${PAGER-more} + gzip -cdfq -- "$FILE" | pager fi if test -t 1; then FIRST=0 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0