Hello community, here is the log from the commit of package coreutils for openSUSE:Factory checked in at 2013-04-26 07:55:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/coreutils (Old) and /work/SRC/openSUSE:Factory/.coreutils.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "coreutils", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/coreutils/coreutils-testsuite.changes 2013-03-30 14:55:24.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.coreutils.new/coreutils-testsuite.changes 2013-04-26 07:55:57.000000000 +0200 @@ -2 +2,6 @@ -Thu Mar 21 11:55:32 UTC 2013 - [email protected] +Thu Apr 4 23:25:17 UTC 2013 - [email protected] + +- Fix source url for coreutils-testsuite. + +------------------------------------------------------------------- +Thu Mar 21 11:55:13 UTC 2013 - [email protected] @@ -5,0 +11,405 @@ + +------------------------------------------------------------------- +Thu Mar 21 11:54:05 UTC 2013 - [email protected] + +- Fix multibyte issue in unexpand (rh#821262) + (coreutils-i18n.patch: patch by Roman Kollár <[email protected]>) + +- Fix cut to terminate mbdelim string + + Otherwise, cut might do an unbounded strdup of the delimiter string + in i18n mode (https://bugzilla.redhat.com/show_bug.cgi?id=911929) + (coreutils-i18n.patch, from Mark Wielaard <[email protected]>) + +- Add su(1) again + + Now, su(1) will be provided via a symlink trick + to the file installed with a ".core" suffix. + By this, we can upgrade to 8.21 without having to wait + for a util-linux version providing it. + + * coreutils-su.patch: Add cumulative su patch from previous Base:System + version 8.17, ported to 8.21 build structure. This supersedes the + following partial patches: + coreutils-8.6-compile-su-with-fpie.diff, + coreutils-8.6-honor-settings-in-etc-default-su-resp-etc-login.defs.diff, + coreutils-8.6-log-all-su-attempts.diff, + coreutils-8.6-make-sure-sbin-resp-usr-sbin-are-in-PATH.diff, + coreutils-8.6-pam-support-for-su.diff, + coreutils-8.6-set-sane-default-path.diff, + coreutils-8.6-update-man-page-for-pam.diff, + coreutils-bnc#697897-setsid.patch. + + * pam, pam-devel: Add as requirements, also during build. + * coreutils.spec (%description): Clarify that su is included although removed + upstreams. + (%install): Install su+kill files with suffix ".core". + (%post): Move setting permissions on su from %posttrans to %install. + (%posttrans): Create symlinks to files with ".core" suffix unless already + existing. + +- Install kill(1) with the same symlink trick. + +- Remove now-obsolete patches and files: + + * coreutils-8.17.de.po.xz: + * coreutils-8.17.tar.xz: + Remove sources + translation of previous version + + * coreutils-acl-nofollow.patch: + * coreutils-basename_documentation.patch: + * coreutils-cp-corrupt-fragmented-sparse.patch: + * coreutils-df-always-hide-rootfs.patch: + * coreutils-skip-du-slink-test.patch: + Fixed upstream. + + * coreutils-getaddrinfo.patch: + * coreutils-misc.patch: + * coreutils-no_silent-rule.patch: + Remove test and build related patches. + + * coreutils-ptr_int_casts.patch: + Remove because merged into coreutils-i18n.patch. + +- Add files: + + * coreutils-8.21.tar.xz: + Add tarball of the new upstream version + * coreutils-8.21.de.po.xz: + Add language file. + +- Update patches: + + * coreutils-i18n.patch + Merge some Fedora changes to keep the i18n patch like theirs. + Fix and cleanup sort's multibyte test with incorporated test data. + + * coreutils-remove_hostname_documentation.patch + +- Add patch to build 'timeout' as PIE (OBS requires it). + This patch actually was included in one of the old su patches. + + * new patch name: coreutils-build-timeout-as-pie.patch + +- Temporary disable some questionable patches (by commenting in the spec file): + + * coreutils-gl_printf_safe.patch + * coreutils-8.9-singlethreaded-sort.patch + +- Change build / spec file: + + * Bump version from 8.17 to 8.21. + * Fix macro invocation in "Provides" for stat. + * Remove ancient "Obsoletes" entries. + * Remove/add the above removed/added sources and patches. + * Temporarily comment the code for statically linking LIB_GMP + (as it does not work). + * Remove -Wall from CFLAGS as it is already included in OBS' default options. + * Remove the --without-included-regex option to use + coreutils' regex implementation. + * Remove custom gl_cv_func_printf_directive_n and gl_cv_func_isnanl_works. + * Touch "man/*.x" to force the rebuild of the man pages. + * Make sort's multi-byte test script executable in %check section. + * Hardcode package name for "%find_lang" and "%files lang -f" lines. + * In the %files section, add the COPYING and THANKS files. + Furthermore, fix the path to the LC_TIME files. + * Change package description to accomodate to added programs + (hostid, nproc, realpath, stdbuf, truncate) + and mention the hacky installation of programs to move (kill, su). + + +- Update to 8.21 (2013-02-14) [stable] + + ** New programs + + numfmt: reformat numbers + + ** New features + + df now accepts the --output[=FIELD_LIST] option to define the list of columns + to include in the output, or all available columns if the FIELD_LIST is + omitted. Note this enables df to output both block and inode fields together. + + du now accepts the --threshold=SIZE option to restrict the output to entries + with such a minimum SIZE (or a maximum SIZE if it is negative). + du recognizes -t SIZE as equivalent, for compatibility with FreeBSD. + + ** Bug fixes + + cp --no-preserve=mode now no longer exits non-zero. + [bug introduced in coreutils-8.20] + + cut with a range like "N-" no longer allocates N/8 bytes. That buffer + would never be used, and allocation failure could cause cut to fail. + [bug introduced in coreutils-8.10] + + cut no longer accepts the invalid range 0-, which made it print empty lines. + Instead, cut now fails and emits an appropriate diagnostic. + [This bug was present in "the beginning".] + + cut now handles overlapping to-EOL ranges properly. Before, it would + interpret "-b2-,3-" like "-b3-". Now it's treated like "-b2-". + [This bug was present in "the beginning".] + + cut no longer prints extraneous delimiters when a to-EOL range subsumes + another range. Before, "echo 123|cut --output-delim=: -b2-,3" would print + "2:3". Now it prints "23". [bug introduced in 5.3.0] + + cut -f no longer inspects input line N+1 before fully outputting line N, + which avoids delayed output for intermittent input. + [bug introduced in TEXTUTILS-1_8b] + + factor no longer loops infinitely on 32 bit powerpc or sparc systems. + [bug introduced in coreutils-8.20] + + install -m M SOURCE DEST no longer has a race condition where DEST's + permissions are temporarily derived from SOURCE instead of from M. + + pr -n no longer crashes when passed values >= 32. Also, line numbers are + consistently padded with spaces, rather than with zeros for certain widths. + [bug introduced in TEXTUTILS-1_22i] + + seq -w ensures that for numbers input in scientific notation, + the output numbers are properly aligned and of the correct width. + [This bug was present in "the beginning".] + + seq -w ensures correct alignment when the step value includes a precision + while the start value does not, and the number sequence narrows. + [This bug was present in "the beginning".] + + seq -s no longer prints an erroneous newline after the first number, and + outputs a newline after the last number rather than a trailing separator. + Also seq no longer ignores a specified step value when the end value is 1. + [bugs introduced in coreutils-8.20] + + timeout now ensures that blocking of ALRM signals is not inherited from + its parent, which would cause timeouts to be ignored. + [the bug dates back to the initial implementation] + + ** Changes in behavior + + df --total now prints '-' into the target column (mount point) of the + summary line, accommodating the --output option where the target field + can be in any column. If there is no source column, then df prints + 'total' in the target column. + + df now properly outputs file system information with bind mounts present on + the system by skipping duplicate entries (identified by the device number). + Consequently, df also elides the early-boot pseudo file system type "rootfs". + ++++ 216 more lines (skipped) ++++ between /work/SRC/openSUSE:Factory/coreutils/coreutils-testsuite.changes ++++ and /work/SRC/openSUSE:Factory/.coreutils.new/coreutils-testsuite.changes --- /work/SRC/openSUSE:Factory/coreutils/coreutils.changes 2013-03-30 14:55:24.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.coreutils.new/coreutils.changes 2013-04-26 07:55:57.000000000 +0200 @@ -1,0 +2,5 @@ +Thu Apr 4 23:25:17 UTC 2013 - [email protected] + +- Fix source url for coreutils-testsuite. + +------------------------------------------------------------------- @@ -5,0 +11,405 @@ + +------------------------------------------------------------------- +Thu Mar 21 11:54:05 UTC 2013 - [email protected] + +- Fix multibyte issue in unexpand (rh#821262) + (coreutils-i18n.patch: patch by Roman Kollár <[email protected]>) + +- Fix cut to terminate mbdelim string + + Otherwise, cut might do an unbounded strdup of the delimiter string + in i18n mode (https://bugzilla.redhat.com/show_bug.cgi?id=911929) + (coreutils-i18n.patch, from Mark Wielaard <[email protected]>) + +- Add su(1) again + + Now, su(1) will be provided via a symlink trick + to the file installed with a ".core" suffix. + By this, we can upgrade to 8.21 without having to wait + for a util-linux version providing it. + + * coreutils-su.patch: Add cumulative su patch from previous Base:System + version 8.17, ported to 8.21 build structure. This supersedes the + following partial patches: + coreutils-8.6-compile-su-with-fpie.diff, + coreutils-8.6-honor-settings-in-etc-default-su-resp-etc-login.defs.diff, + coreutils-8.6-log-all-su-attempts.diff, + coreutils-8.6-make-sure-sbin-resp-usr-sbin-are-in-PATH.diff, + coreutils-8.6-pam-support-for-su.diff, + coreutils-8.6-set-sane-default-path.diff, + coreutils-8.6-update-man-page-for-pam.diff, + coreutils-bnc#697897-setsid.patch. + + * pam, pam-devel: Add as requirements, also during build. + * coreutils.spec (%description): Clarify that su is included although removed + upstreams. + (%install): Install su+kill files with suffix ".core". + (%post): Move setting permissions on su from %posttrans to %install. + (%posttrans): Create symlinks to files with ".core" suffix unless already + existing. + +- Install kill(1) with the same symlink trick. + +- Remove now-obsolete patches and files: + + * coreutils-8.17.de.po.xz: + * coreutils-8.17.tar.xz: + Remove sources + translation of previous version + + * coreutils-acl-nofollow.patch: + * coreutils-basename_documentation.patch: + * coreutils-cp-corrupt-fragmented-sparse.patch: + * coreutils-df-always-hide-rootfs.patch: + * coreutils-skip-du-slink-test.patch: + Fixed upstream. + + * coreutils-getaddrinfo.patch: + * coreutils-misc.patch: + * coreutils-no_silent-rule.patch: + Remove test and build related patches. + + * coreutils-ptr_int_casts.patch: + Remove because merged into coreutils-i18n.patch. + +- Add files: + + * coreutils-8.21.tar.xz: + Add tarball of the new upstream version + * coreutils-8.21.de.po.xz: + Add language file. + +- Update patches: + + * coreutils-i18n.patch + Merge some Fedora changes to keep the i18n patch like theirs. + Fix and cleanup sort's multibyte test with incorporated test data. + + * coreutils-remove_hostname_documentation.patch + +- Add patch to build 'timeout' as PIE (OBS requires it). + This patch actually was included in one of the old su patches. + + * new patch name: coreutils-build-timeout-as-pie.patch + +- Temporary disable some questionable patches (by commenting in the spec file): + + * coreutils-gl_printf_safe.patch + * coreutils-8.9-singlethreaded-sort.patch + +- Change build / spec file: + + * Bump version from 8.17 to 8.21. + * Fix macro invocation in "Provides" for stat. + * Remove ancient "Obsoletes" entries. + * Remove/add the above removed/added sources and patches. + * Temporarily comment the code for statically linking LIB_GMP + (as it does not work). + * Remove -Wall from CFLAGS as it is already included in OBS' default options. + * Remove the --without-included-regex option to use + coreutils' regex implementation. + * Remove custom gl_cv_func_printf_directive_n and gl_cv_func_isnanl_works. + * Touch "man/*.x" to force the rebuild of the man pages. + * Make sort's multi-byte test script executable in %check section. + * Hardcode package name for "%find_lang" and "%files lang -f" lines. + * In the %files section, add the COPYING and THANKS files. + Furthermore, fix the path to the LC_TIME files. + * Change package description to accomodate to added programs + (hostid, nproc, realpath, stdbuf, truncate) + and mention the hacky installation of programs to move (kill, su). + + +- Update to 8.21 (2013-02-14) [stable] + + ** New programs + + numfmt: reformat numbers + + ** New features + + df now accepts the --output[=FIELD_LIST] option to define the list of columns + to include in the output, or all available columns if the FIELD_LIST is + omitted. Note this enables df to output both block and inode fields together. + + du now accepts the --threshold=SIZE option to restrict the output to entries + with such a minimum SIZE (or a maximum SIZE if it is negative). + du recognizes -t SIZE as equivalent, for compatibility with FreeBSD. + + ** Bug fixes + + cp --no-preserve=mode now no longer exits non-zero. + [bug introduced in coreutils-8.20] + + cut with a range like "N-" no longer allocates N/8 bytes. That buffer + would never be used, and allocation failure could cause cut to fail. + [bug introduced in coreutils-8.10] + + cut no longer accepts the invalid range 0-, which made it print empty lines. + Instead, cut now fails and emits an appropriate diagnostic. + [This bug was present in "the beginning".] + + cut now handles overlapping to-EOL ranges properly. Before, it would + interpret "-b2-,3-" like "-b3-". Now it's treated like "-b2-". + [This bug was present in "the beginning".] + + cut no longer prints extraneous delimiters when a to-EOL range subsumes + another range. Before, "echo 123|cut --output-delim=: -b2-,3" would print + "2:3". Now it prints "23". [bug introduced in 5.3.0] + + cut -f no longer inspects input line N+1 before fully outputting line N, + which avoids delayed output for intermittent input. + [bug introduced in TEXTUTILS-1_8b] + + factor no longer loops infinitely on 32 bit powerpc or sparc systems. + [bug introduced in coreutils-8.20] + + install -m M SOURCE DEST no longer has a race condition where DEST's + permissions are temporarily derived from SOURCE instead of from M. + + pr -n no longer crashes when passed values >= 32. Also, line numbers are + consistently padded with spaces, rather than with zeros for certain widths. + [bug introduced in TEXTUTILS-1_22i] + + seq -w ensures that for numbers input in scientific notation, + the output numbers are properly aligned and of the correct width. + [This bug was present in "the beginning".] + + seq -w ensures correct alignment when the step value includes a precision + while the start value does not, and the number sequence narrows. + [This bug was present in "the beginning".] + + seq -s no longer prints an erroneous newline after the first number, and + outputs a newline after the last number rather than a trailing separator. + Also seq no longer ignores a specified step value when the end value is 1. + [bugs introduced in coreutils-8.20] + + timeout now ensures that blocking of ALRM signals is not inherited from + its parent, which would cause timeouts to be ignored. + [the bug dates back to the initial implementation] + + ** Changes in behavior + + df --total now prints '-' into the target column (mount point) of the + summary line, accommodating the --output option where the target field + can be in any column. If there is no source column, then df prints + 'total' in the target column. + + df now properly outputs file system information with bind mounts present on + the system by skipping duplicate entries (identified by the device number). + Consequently, df also elides the early-boot pseudo file system type "rootfs". + + nl no longer supports the --page-increment option, which has been + deprecated since coreutils-7.5. Use --line-increment instead. ++++ 214 more lines (skipped) ++++ between /work/SRC/openSUSE:Factory/coreutils/coreutils.changes ++++ and /work/SRC/openSUSE:Factory/.coreutils.new/coreutils.changes Old: ---- coreutils-8.17.de.po.xz coreutils-8.17.tar.xz coreutils-8.6-compile-su-with-fpie.diff coreutils-8.6-honor-settings-in-etc-default-su-resp-etc-login.defs.diff coreutils-8.6-log-all-su-attempts.diff coreutils-8.6-make-sure-sbin-resp-usr-sbin-are-in-PATH.diff coreutils-8.6-pam-support-for-su.diff coreutils-8.6-set-sane-default-path.diff coreutils-8.6-update-man-page-for-pam.diff coreutils-acl-nofollow.patch coreutils-basename_documentation.patch coreutils-bnc#697897-setsid.patch coreutils-cp-corrupt-fragmented-sparse.patch coreutils-df-always-hide-rootfs.patch coreutils-getaddrinfo.patch coreutils-misc.patch coreutils-no_silent-rule.patch coreutils-ptr_int_casts.patch coreutils-skip-du-slink-test.patch New: ---- coreutils-8.21.de.po.xz coreutils-8.21.tar.xz coreutils-build-timeout-as-pie.patch coreutils-su.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ coreutils-testsuite.spec ++++++ --- /var/tmp/diff_new_pack.mVGbaR/_old 2013-04-26 07:56:29.000000000 +0200 +++ /var/tmp/diff_new_pack.mVGbaR/_new 2013-04-26 07:56:29.000000000 +0200 @@ -20,6 +20,10 @@ Summary: GNU Core Utilities License: GPL-3.0+ Group: System/Base +Url: http://www.gnu.org/software/coreutils/ +Version: 8.21 +Release: 0 + BuildRequires: automake BuildRequires: gmp-devel BuildRequires: help2man @@ -27,8 +31,8 @@ BuildRequires: libcap-devel BuildRequires: libselinux-devel BuildRequires: makeinfo -BuildRequires: pam-devel BuildRequires: perl +BuildRequires: xz %if "%{name}" == "coreutils-testsuite" BuildRequires: acl BuildRequires: gdb @@ -37,110 +41,100 @@ BuildRequires: strace BuildRequires: valgrind %endif -BuildRequires: xz -Url: http://www.gnu.org/software/coreutils/ -Version: 8.17 -Release: 0 + +Provides: %{name} = %{version} +%if "%{name}" == "coreutils" Provides: fileutils = %{version} Provides: mktemp = %{version} Provides: sh-utils = %{version} -Provides: stat = %version} +Provides: stat = %{version} Provides: textutils = %{version} -Obsoletes: fileutils < %{version} -Obsoletes: libselinux <= 1.23.11-3 -Obsoletes: libselinux-32bit = 9 -Obsoletes: libselinux-64bit = 9 -Obsoletes: libselinux-x86 = 9 -Obsoletes: mktemp < %{version} -Obsoletes: sh-utils < %{version} -Obsoletes: stat < %version} -Obsoletes: textutils < %{version} -PreReq: %{install_info_prereq} +%endif + +%if "%{name}" == "coreutils" Recommends: %{name}-lang = %version +%endif + +# Needed for su. +BuildRequires: pam-devel Requires: pam >= 1.1.1.90 + +# this will create a cycle, broken up randomly - coreutils is just +# too core to have other prerequisites. +#PreReq: permissions +PreReq: %{install_info_prereq} + +BuildRoot: %{_tmppath}/%{name}-%{version}-build + +%if "%{name}" == "coreutils" +# For upgrading you now just need to increase the version, remove the old +# tarballs, then run osc service localrun download_files, osc addremove, +# osc vc and osc ci and you are done. +Source: http://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.xz +%else +# In "coreutils-testsuite", we use the version controlled file from "coreutils". +# otherwise that file would be downloaded twice during the above mentioned +# upgrade procedure. Source: coreutils-%{version}.tar.xz +%endif + Source1: su.pamd Source2: su.default Source3: baselibs.conf Source4: coreutils-%{version}.de.po.xz -Patch0: coreutils-misc.patch + Patch1: coreutils-remove_hostname_documentation.patch -Patch2: coreutils-gl_printf_safe.patch -#Remove the bogus coreutils version from the i18n patch name +#Patch2: coreutils-gl_printf_safe.patch Patch4: coreutils-i18n.patch Patch8: coreutils-sysinfo.patch Patch16: coreutils-invalid-ids.patch -Patch20: coreutils-8.6-pam-support-for-su.diff -Patch21: coreutils-8.6-update-man-page-for-pam.diff -Patch22: coreutils-8.6-log-all-su-attempts.diff -Patch23: coreutils-8.6-set-sane-default-path.diff -Patch24: coreutils-8.6-honor-settings-in-etc-default-su-resp-etc-login.defs.diff -Patch25: coreutils-8.6-make-sure-sbin-resp-usr-sbin-are-in-PATH.diff # -Patch30: coreutils-8.6-compile-su-with-fpie.diff -Patch31: coreutils-getaddrinfo.patch -Patch32: coreutils-ptr_int_casts.patch -Patch33: coreutils-8.9-singlethreaded-sort.patch -Patch34: coreutils-acl-nofollow.patch -Patch36: coreutils-basename_documentation.patch -Patch37: coreutils-bnc#697897-setsid.patch -Patch38: coreutils-cp-corrupt-fragmented-sparse.patch -Patch39: coreutils-no_silent-rule.patch -Patch40: coreutils-df-always-hide-rootfs.patch -Patch41: coreutils-skip-du-slink-test.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-build -# this will create a cycle, broken up randomly - coreutils is just too core to have other -# prerequires -#PreReq: permissions +#Patch33: coreutils-8.9-singlethreaded-sort.patch + +# OBS / RPMLINT require /usr/bin/timeout to be built with the -fpie option. +Patch100: coreutils-build-timeout-as-pie.patch +Patch101: coreutils-su.patch # ================================================ %description -Basic file, shell, and text manipulation utilities. The package -contains the following programs: +These are the GNU core utilities. This package is the union of +the GNU fileutils, sh-utils, and textutils packages. -[ arch base64 basename cat chcon chgrp chmod chown chroot cksum comm cp -csplit cut date dd df dir dircolors dirname du echo env expand expr -factor false fmt fold groups head id install join kill link ln logname -ls md5sum mkdir mkfifo mknod mktemp mv nice nl nohup od paste pathchk -pinky pr printenv printf ptx pwd readlink rm rmdir runcon seq sha1sum -sha224sum sha256sum sha384sum sha512sum shred shuf sleep sort split -stat stty su sum sync tac tail tee test timeout touch tr true tsort tty -uname unexpand uniq unlink uptime users vdir wc who whoami yes + [ arch base64 basename cat chcon chgrp chmod chown chroot cksum comm cp + csplit cut date dd df dir dircolors dirname du echo env expand expr + factor false fmt fold groups head hostid id install join + link ln logname ls md5sum mkdir mkfifo mknod mktemp mv nice nl nohup + nproc numfmt od paste pathchk pinky pr printenv printf ptx pwd readlink + realpath rm rmdir runcon seq sha1sum sha224sum sha256sum sha384sum sha512sum + shred shuf sleep sort split stat stdbuf stty sum sync tac tail tee test + timeout touch tr true truncate tsort tty uname unexpand uniq unlink + uptime users vdir wc who whoami yes + +As su(1) and kill(1) have been moved from coreutils to util-linux upstreams, +this package provides compatibility symlinks to the old coreutils versions +of both programs. This is needed until there's a newer version of the +receiving util-linux package available which comes with the new binaries. # ================================================ %lang_package %prep %setup -q -n coreutils-%{version} %patch4 -%patch0 %patch1 -%patch2 +#%%if 0%%{suse_version} > 1200 +#%%patch2 +#%%endif %patch8 %patch16 -%patch20 -%patch21 -%patch22 -p1 -%patch23 -p1 -%patch24 -%patch25 -%patch30 -%patch31 -%patch32 -%patch33 -%patch34 -%patch36 -%patch37 -%patch38 -%if 0%{suse_version} < 1200 -%patch39 -%endif -%patch40 -p1 -%patch41 -p1 +# +#%%patch33 +%patch100 +%patch101 xz -dc %{S:4} >po/de.po -# We need to statically link to gmp, otherwise we have a build loop -sed -i s,'$(LIB_GMP)',%{_libdir}/libgmp.a,g src/Makefile.am +#???## We need to statically link to gmp, otherwise we have a build loop +#???#sed -i s,'$(LIB_GMP)',%%{_libdir}/libgmp.a,g Makefile.in # ================================================ %build @@ -148,71 +142,121 @@ AUTOPOINT=true autoreconf -fi %endif export CFLAGS="%optflags" -%configure --libexecdir=%{_libdir} --without-included-regex \ - --enable-install-program=arch,su \ - gl_cv_func_printf_directive_n=yes \ - gl_cv_func_isnanl_works=yes \ - DEFAULT_POSIX2_VERSION=200112 alternative=199209 +%configure --libexecdir=%{_libdir} \ + --enable-install-program=arch \ + DEFAULT_POSIX2_VERSION=200112 \ + alternative=199209 make -C po update-po -make %{?_smp_mflags} V=1 + +# Regenerate manpages +touch man/*.x + +make all %{?_smp_mflags} V=1 # ================================================ %check %if "%{name}" == "coreutils-testsuite" + # Make our multi-byte test for sort executable + chmod a+x tests/misc/sort-mb-tests.sh + # Avoid parallel make, because otherwise some timeout based tests like # rm/ext3-perf may fail due to high CPU or IO load. - make check-very-expensive - install -d -m 755 %{buildroot}%{_docdir}/%{name} - xz -c tests/test-suite.log > %{buildroot}%{_docdir}/%{name}/test-suite.log.xz + make check-very-expensive \ + && install -d -m 755 %{buildroot}%{_docdir}/%{name} \ + && xz -c tests/test-suite.log \ + > %{buildroot}%{_docdir}/%{name}/test-suite.log.xz %endif # ================================================ %install %if "%{name}" == "coreutils" %makeinstall pkglibexecdir=%{_libdir}/%{name} -test -f %{buildroot}%{_bindir}/su || \ - install src/su %{buildroot}%{_bindir}/su + +# === TRICKERY - PART 1/3 === +# trickery to make the move of su and kill to util-linux as easy as possible +# this all needs to go when util-linux 2.22 has been checked in and +# everything has settled. 15.10.2012 [email protected] +# Install su and kill with a ".core" suffix. + +install -d -m 755 %{buildroot}/etc/pam.d +install -m 644 %{S:1} %{buildroot}/etc/pam.d/su.core +install -m 644 %{S:1} %{buildroot}/etc/pam.d/su-l.core + +install -d -m 755 %{buildroot}/etc/default +install -m 644 %{S:2} %{buildroot}/etc/default/su.core + +install -s -m 755 src/su %{buildroot}%{_bindir}/su.core +install -m 644 man/su.1 %{buildroot}%{_mandir}/man1/su.core.1 +rm -f %{buildroot}%{_mandir}/man1/su.1 + +# kill is still part of coreutils, so rename it (stripped). +install -s -m 755 %{buildroot}%{_bindir}/kill %{buildroot}%{_bindir}/kill.core +rm -f %{buildroot}%{_bindir}/kill +mv -v %{buildroot}%{_mandir}/man1/kill.1 %{buildroot}%{_mandir}/man1/kill.core.1 + #UsrMerge install -d %{buildroot}/bin -for i in arch basename cat chgrp chmod chown cp date dd df echo false kill ln ls mkdir mknod mktemp mv pwd rm rmdir sleep sort stat stty su sync touch true uname readlink md5sum +for i in arch basename cat chgrp chmod chown cp date dd df echo \ + false ln ls mkdir mknod mktemp mv pwd rm rmdir sleep sort stat \ + stty sync touch true uname readlink md5sum do ln -sf %{_bindir}/$i %{buildroot}/bin/$i done #EndUsrMerge -install -d -m 755 %{buildroot}/etc/pam.d -install -m 644 %{S:1} %{buildroot}/etc/pam.d/su -install -m 644 %{S:1} %{buildroot}/etc/pam.d/su-l -install -d -m 755 %{buildroot}/etc/default -install -m 644 %{S:2} %{buildroot}/etc/default/su echo '.so man1/test.1' > %{buildroot}/%{_mandir}/man1/\[.1 %find_lang coreutils %endif # ================================================ %post +%if "%{name}" == "coreutils" %install_info --info-dir=%{_infodir} %{_infodir}/coreutils.info.gz + # may fail if permissions is not there, but there is no way around that -%set_permissions %{_bindir}/su +%set_permissions %{_bindir}/su.core +%endif + +# ================================================ +%posttrans +%if "%{name}" == "coreutils" +# === TRICKERY - PART 2/3 === +# If the files are missing after installation, then create links to the +# saved ones (with suffix .core). +if [ ! -r %{_bindir}/su -a -e %{_bindir}/su.core ]; then + echo "%{_bindir}/su does not exist, setting compat symlink to %{_bindir}/su.core" + ln -svf %{_bindir}/su.core %{_bindir}/su + ln -svf %{_bindir}/kill.core %{_bindir}/kill + ln -svf %{_bindir}/su.core /bin/su + ln -svf %{_bindir}/kill.core /bin/kill + ln -svf /etc/pam.d/su.core /etc/pam.d/su + ln -svf /etc/pam.d/su-l.core /etc/pam.d/su-l + ln -svf /etc/default/su.core /etc/default/su + # man pages are already zipped at that point. + mv -vf %{_mandir}/man1/kill.core.1.gz %{_mandir}/man1/kill.1.gz + mv -vf %{_mandir}/man1/su.core.1.gz %{_mandir}/man1/su.1.gz +fi +%endif # ================================================ %postun +%if "%{name}" == "coreutils" %install_info_delete --info-dir=%{_infodir} %{_infodir}/coreutils.info.gz +%endif # ================================================ %verifyscript -%verify_permissions -e %{_bindir}/su +%if "%{name}" == "coreutils" +%verify_permissions -e %{_bindir}/su.core +%endif # ================================================ %files %if "%{name}" == "coreutils" %defattr(-,root,root) -%doc README NEWS -%config %{_sysconfdir}/pam.d/su -%config %{_sysconfdir}/pam.d/su-l -%config(noreplace) %{_sysconfdir}/default/su -%attr(4755,root,root) %{_bindir}/su +%doc COPYING NEWS README THANKS +%attr(4755,root,root) %{_bindir}/su.core %{_bindir}/* #UsrMerge /bin/* @@ -220,7 +264,11 @@ %{_libdir}/%{name} %doc %{_infodir}/coreutils.info*.gz %doc %{_mandir}/man1/*.1.gz -%dir %{_prefix}/share/locale/*/LC_TIME +%dir %{_datadir}/locale/*/LC_TIME +# === TRICKERY - PART 3/3 === +%config /etc/default/su.core +%config /etc/pam.d/su-l.core +%config /etc/pam.d/su.core %files lang -f coreutils.lang %defattr(-,root,root) ++++++ coreutils.spec ++++++ --- /var/tmp/diff_new_pack.mVGbaR/_old 2013-04-26 07:56:29.000000000 +0200 +++ /var/tmp/diff_new_pack.mVGbaR/_new 2013-04-26 07:56:29.000000000 +0200 @@ -20,6 +20,10 @@ Summary: GNU Core Utilities License: GPL-3.0+ Group: System/Base +Url: http://www.gnu.org/software/coreutils/ +Version: 8.21 +Release: 0 + BuildRequires: automake BuildRequires: gmp-devel BuildRequires: help2man @@ -27,8 +31,8 @@ BuildRequires: libcap-devel BuildRequires: libselinux-devel BuildRequires: makeinfo -BuildRequires: pam-devel BuildRequires: perl +BuildRequires: xz %if "%{name}" == "coreutils-testsuite" BuildRequires: acl BuildRequires: gdb @@ -37,110 +41,100 @@ BuildRequires: strace BuildRequires: valgrind %endif -BuildRequires: xz -Url: http://www.gnu.org/software/coreutils/ -Version: 8.17 -Release: 0 + +Provides: %{name} = %{version} +%if "%{name}" == "coreutils" Provides: fileutils = %{version} Provides: mktemp = %{version} Provides: sh-utils = %{version} -Provides: stat = %version} +Provides: stat = %{version} Provides: textutils = %{version} -Obsoletes: fileutils < %{version} -Obsoletes: libselinux <= 1.23.11-3 -Obsoletes: libselinux-32bit = 9 -Obsoletes: libselinux-64bit = 9 -Obsoletes: libselinux-x86 = 9 -Obsoletes: mktemp < %{version} -Obsoletes: sh-utils < %{version} -Obsoletes: stat < %version} -Obsoletes: textutils < %{version} -PreReq: %{install_info_prereq} +%endif + +%if "%{name}" == "coreutils" Recommends: %{name}-lang = %version +%endif + +# Needed for su. +BuildRequires: pam-devel Requires: pam >= 1.1.1.90 + +# this will create a cycle, broken up randomly - coreutils is just +# too core to have other prerequisites. +#PreReq: permissions +PreReq: %{install_info_prereq} + +BuildRoot: %{_tmppath}/%{name}-%{version}-build + +%if "%{name}" == "coreutils" +# For upgrading you now just need to increase the version, remove the old +# tarballs, then run osc service localrun download_files, osc addremove, +# osc vc and osc ci and you are done. Source: http://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.xz +%else +# In "coreutils-testsuite", we use the version controlled file from "coreutils". +# otherwise that file would be downloaded twice during the above mentioned +# upgrade procedure. +Source: coreutils-%{version}.tar.xz +%endif + Source1: su.pamd Source2: su.default Source3: baselibs.conf Source4: coreutils-%{version}.de.po.xz -Patch0: coreutils-misc.patch + Patch1: coreutils-remove_hostname_documentation.patch -Patch2: coreutils-gl_printf_safe.patch -#Remove the bogus coreutils version from the i18n patch name +#Patch2: coreutils-gl_printf_safe.patch Patch4: coreutils-i18n.patch Patch8: coreutils-sysinfo.patch Patch16: coreutils-invalid-ids.patch -Patch20: coreutils-8.6-pam-support-for-su.diff -Patch21: coreutils-8.6-update-man-page-for-pam.diff -Patch22: coreutils-8.6-log-all-su-attempts.diff -Patch23: coreutils-8.6-set-sane-default-path.diff -Patch24: coreutils-8.6-honor-settings-in-etc-default-su-resp-etc-login.defs.diff -Patch25: coreutils-8.6-make-sure-sbin-resp-usr-sbin-are-in-PATH.diff # -Patch30: coreutils-8.6-compile-su-with-fpie.diff -Patch31: coreutils-getaddrinfo.patch -Patch32: coreutils-ptr_int_casts.patch -Patch33: coreutils-8.9-singlethreaded-sort.patch -Patch34: coreutils-acl-nofollow.patch -Patch36: coreutils-basename_documentation.patch -Patch37: coreutils-bnc#697897-setsid.patch -Patch38: coreutils-cp-corrupt-fragmented-sparse.patch -Patch39: coreutils-no_silent-rule.patch -Patch40: coreutils-df-always-hide-rootfs.patch -Patch41: coreutils-skip-du-slink-test.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-build -# this will create a cycle, broken up randomly - coreutils is just too core to have other -# prerequires -#PreReq: permissions +#Patch33: coreutils-8.9-singlethreaded-sort.patch + +# OBS / RPMLINT require /usr/bin/timeout to be built with the -fpie option. +Patch100: coreutils-build-timeout-as-pie.patch +Patch101: coreutils-su.patch # ================================================ %description -Basic file, shell, and text manipulation utilities. The package -contains the following programs: +These are the GNU core utilities. This package is the union of +the GNU fileutils, sh-utils, and textutils packages. -[ arch base64 basename cat chcon chgrp chmod chown chroot cksum comm cp -csplit cut date dd df dir dircolors dirname du echo env expand expr -factor false fmt fold groups head id install join kill link ln logname -ls md5sum mkdir mkfifo mknod mktemp mv nice nl nohup od paste pathchk -pinky pr printenv printf ptx pwd readlink rm rmdir runcon seq sha1sum -sha224sum sha256sum sha384sum sha512sum shred shuf sleep sort split -stat stty su sum sync tac tail tee test timeout touch tr true tsort tty -uname unexpand uniq unlink uptime users vdir wc who whoami yes + [ arch base64 basename cat chcon chgrp chmod chown chroot cksum comm cp + csplit cut date dd df dir dircolors dirname du echo env expand expr + factor false fmt fold groups head hostid id install join + link ln logname ls md5sum mkdir mkfifo mknod mktemp mv nice nl nohup + nproc numfmt od paste pathchk pinky pr printenv printf ptx pwd readlink + realpath rm rmdir runcon seq sha1sum sha224sum sha256sum sha384sum sha512sum + shred shuf sleep sort split stat stdbuf stty sum sync tac tail tee test + timeout touch tr true truncate tsort tty uname unexpand uniq unlink + uptime users vdir wc who whoami yes + +As su(1) and kill(1) have been moved from coreutils to util-linux upstreams, +this package provides compatibility symlinks to the old coreutils versions +of both programs. This is needed until there's a newer version of the +receiving util-linux package available which comes with the new binaries. # ================================================ %lang_package %prep %setup -q -n coreutils-%{version} %patch4 -%patch0 %patch1 -%patch2 +#%%if 0%%{suse_version} > 1200 +#%%patch2 +#%%endif %patch8 %patch16 -%patch20 -%patch21 -%patch22 -p1 -%patch23 -p1 -%patch24 -%patch25 -%patch30 -%patch31 -%patch32 -%patch33 -%patch34 -%patch36 -%patch37 -%patch38 -%if 0%{suse_version} < 1200 -%patch39 -%endif -%patch40 -p1 -%patch41 -p1 +# +#%%patch33 +%patch100 +%patch101 xz -dc %{S:4} >po/de.po -# We need to statically link to gmp, otherwise we have a build loop -sed -i s,'$(LIB_GMP)',%{_libdir}/libgmp.a,g src/Makefile.am +#???## We need to statically link to gmp, otherwise we have a build loop +#???#sed -i s,'$(LIB_GMP)',%%{_libdir}/libgmp.a,g Makefile.in # ================================================ %build @@ -148,71 +142,121 @@ AUTOPOINT=true autoreconf -fi %endif export CFLAGS="%optflags" -%configure --libexecdir=%{_libdir} --without-included-regex \ - --enable-install-program=arch,su \ - gl_cv_func_printf_directive_n=yes \ - gl_cv_func_isnanl_works=yes \ - DEFAULT_POSIX2_VERSION=200112 alternative=199209 +%configure --libexecdir=%{_libdir} \ + --enable-install-program=arch \ + DEFAULT_POSIX2_VERSION=200112 \ + alternative=199209 make -C po update-po -make %{?_smp_mflags} V=1 + +# Regenerate manpages +touch man/*.x + +make all %{?_smp_mflags} V=1 # ================================================ %check %if "%{name}" == "coreutils-testsuite" + # Make our multi-byte test for sort executable + chmod a+x tests/misc/sort-mb-tests.sh + # Avoid parallel make, because otherwise some timeout based tests like # rm/ext3-perf may fail due to high CPU or IO load. - make check-very-expensive - install -d -m 755 %{buildroot}%{_docdir}/%{name} - xz -c tests/test-suite.log > %{buildroot}%{_docdir}/%{name}/test-suite.log.xz + make check-very-expensive \ + && install -d -m 755 %{buildroot}%{_docdir}/%{name} \ + && xz -c tests/test-suite.log \ + > %{buildroot}%{_docdir}/%{name}/test-suite.log.xz %endif # ================================================ %install %if "%{name}" == "coreutils" %makeinstall pkglibexecdir=%{_libdir}/%{name} -test -f %{buildroot}%{_bindir}/su || \ - install src/su %{buildroot}%{_bindir}/su + +# === TRICKERY - PART 1/3 === +# trickery to make the move of su and kill to util-linux as easy as possible +# this all needs to go when util-linux 2.22 has been checked in and +# everything has settled. 15.10.2012 [email protected] +# Install su and kill with a ".core" suffix. + +install -d -m 755 %{buildroot}/etc/pam.d +install -m 644 %{S:1} %{buildroot}/etc/pam.d/su.core +install -m 644 %{S:1} %{buildroot}/etc/pam.d/su-l.core + +install -d -m 755 %{buildroot}/etc/default +install -m 644 %{S:2} %{buildroot}/etc/default/su.core + +install -s -m 755 src/su %{buildroot}%{_bindir}/su.core +install -m 644 man/su.1 %{buildroot}%{_mandir}/man1/su.core.1 +rm -f %{buildroot}%{_mandir}/man1/su.1 + +# kill is still part of coreutils, so rename it (stripped). +install -s -m 755 %{buildroot}%{_bindir}/kill %{buildroot}%{_bindir}/kill.core +rm -f %{buildroot}%{_bindir}/kill +mv -v %{buildroot}%{_mandir}/man1/kill.1 %{buildroot}%{_mandir}/man1/kill.core.1 + #UsrMerge install -d %{buildroot}/bin -for i in arch basename cat chgrp chmod chown cp date dd df echo false kill ln ls mkdir mknod mktemp mv pwd rm rmdir sleep sort stat stty su sync touch true uname readlink md5sum +for i in arch basename cat chgrp chmod chown cp date dd df echo \ + false ln ls mkdir mknod mktemp mv pwd rm rmdir sleep sort stat \ + stty sync touch true uname readlink md5sum do ln -sf %{_bindir}/$i %{buildroot}/bin/$i done #EndUsrMerge -install -d -m 755 %{buildroot}/etc/pam.d -install -m 644 %{S:1} %{buildroot}/etc/pam.d/su -install -m 644 %{S:1} %{buildroot}/etc/pam.d/su-l -install -d -m 755 %{buildroot}/etc/default -install -m 644 %{S:2} %{buildroot}/etc/default/su echo '.so man1/test.1' > %{buildroot}/%{_mandir}/man1/\[.1 %find_lang coreutils %endif # ================================================ %post +%if "%{name}" == "coreutils" %install_info --info-dir=%{_infodir} %{_infodir}/coreutils.info.gz + # may fail if permissions is not there, but there is no way around that -%set_permissions %{_bindir}/su +%set_permissions %{_bindir}/su.core +%endif + +# ================================================ +%posttrans +%if "%{name}" == "coreutils" +# === TRICKERY - PART 2/3 === +# If the files are missing after installation, then create links to the +# saved ones (with suffix .core). +if [ ! -r %{_bindir}/su -a -e %{_bindir}/su.core ]; then + echo "%{_bindir}/su does not exist, setting compat symlink to %{_bindir}/su.core" + ln -svf %{_bindir}/su.core %{_bindir}/su + ln -svf %{_bindir}/kill.core %{_bindir}/kill + ln -svf %{_bindir}/su.core /bin/su + ln -svf %{_bindir}/kill.core /bin/kill + ln -svf /etc/pam.d/su.core /etc/pam.d/su + ln -svf /etc/pam.d/su-l.core /etc/pam.d/su-l + ln -svf /etc/default/su.core /etc/default/su + # man pages are already zipped at that point. + mv -vf %{_mandir}/man1/kill.core.1.gz %{_mandir}/man1/kill.1.gz + mv -vf %{_mandir}/man1/su.core.1.gz %{_mandir}/man1/su.1.gz +fi +%endif # ================================================ %postun +%if "%{name}" == "coreutils" %install_info_delete --info-dir=%{_infodir} %{_infodir}/coreutils.info.gz +%endif # ================================================ %verifyscript -%verify_permissions -e %{_bindir}/su +%if "%{name}" == "coreutils" +%verify_permissions -e %{_bindir}/su.core +%endif # ================================================ %files %if "%{name}" == "coreutils" %defattr(-,root,root) -%doc README NEWS -%config %{_sysconfdir}/pam.d/su -%config %{_sysconfdir}/pam.d/su-l -%config(noreplace) %{_sysconfdir}/default/su -%attr(4755,root,root) %{_bindir}/su +%doc COPYING NEWS README THANKS +%attr(4755,root,root) %{_bindir}/su.core %{_bindir}/* #UsrMerge /bin/* @@ -220,7 +264,11 @@ %{_libdir}/%{name} %doc %{_infodir}/coreutils.info*.gz %doc %{_mandir}/man1/*.1.gz -%dir %{_prefix}/share/locale/*/LC_TIME +%dir %{_datadir}/locale/*/LC_TIME +# === TRICKERY - PART 3/3 === +%config /etc/default/su.core +%config /etc/pam.d/su-l.core +%config /etc/pam.d/su.core %files lang -f coreutils.lang %defattr(-,root,root) ++++++ coreutils-8.17.tar.xz -> coreutils-8.21.tar.xz ++++++ ++++ 589617 lines of diff (skipped) ++++++ coreutils-build-timeout-as-pie.patch ++++++ >From d1a49cccf99373293a88f5bce74857d5bb813e46 Mon Sep 17 00:00:00 2001 From: Bernhard Voelker <[email protected]> Date: Thu, 10 Jan 2013 09:21:22 +0200 Subject: build timeout as PIE The OBS requires /usr/bin/timeout to be built as an position independent executable (PIE). This is enforced via RPMLINT. * src/local.mk (AM_CFLAGS): Add -fpie option. (timeout_CFLAGS): Likewise. (timeout_LDFLAGS): Add -pie option. --- src/local.mk | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) Index: src/local.mk =================================================================== --- src/local.mk.orig +++ src/local.mk @@ -17,7 +17,7 @@ ## along with this program. If not, see <http://www.gnu.org/licenses/>. # FIXME: once lib/ and gnulib-tests/ are also converted, hoist to Makefile.am -AM_CFLAGS = $(WERROR_CFLAGS) +AM_CFLAGS = $(WERROR_CFLAGS) -fpie # The list of all programs (separated in different variables to express # the how and when they should be installed) is defined in this makefile @@ -266,6 +266,9 @@ src_factor_LDADD += $(LIB_GMP) # for getloadavg src_uptime_LDADD += $(GETLOADAVG_LIBS) +src_timeout_CFLAGS = -fpie +src_timeout_LDFLAGS = -pie + # for various ACL functions copy_ldadd += $(LIB_ACL) src_ls_LDADD += $(LIB_ACL) ++++++ coreutils-i18n.patch ++++++ ++++ 1354 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/coreutils/coreutils-i18n.patch ++++ and /work/SRC/openSUSE:Factory/.coreutils.new/coreutils-i18n.patch ++++++ coreutils-remove_hostname_documentation.patch ++++++ --- /var/tmp/diff_new_pack.mVGbaR/_old 2013-04-26 07:56:34.000000000 +0200 +++ /var/tmp/diff_new_pack.mVGbaR/_new 2013-04-26 07:56:34.000000000 +0200 @@ -17,9 +17,9 @@ -* System context:: date arch nproc uname hostname hostid uptime +* System context:: date arch nproc uname hostid uptime * SELinux context:: chcon runcon - * Modified command invocation:: chroot env nice nohup stdbuf su timeout + * Modified command invocation:: chroot env nice nohup stdbuf timeout * Process control:: kill -@@ -416,7 +415,6 @@ System context +@@ -419,7 +418,6 @@ System context * date invocation:: Print or set system date and time * nproc invocation:: Print the number of processors * uname invocation:: Print system information @@ -27,7 +27,7 @@ * hostid invocation:: Print numeric host identifier * uptime invocation:: Print system uptime and load -@@ -14145,7 +14143,6 @@ information. +@@ -14626,7 +14624,6 @@ information. * arch invocation:: Print machine hardware name. * nproc invocation:: Print the number of processors. * uname invocation:: Print system information. @@ -35,7 +35,7 @@ * hostid invocation:: Print numeric host identifier. * uptime invocation:: Print system uptime and load. @end menu -@@ -14932,15 +14929,6 @@ easily available, as is the case with Li +@@ -15448,15 +15445,6 @@ easily available, as is the case with Li Print the machine hardware name (sometimes called the hardware class or hardware type). @@ -51,7 +51,7 @@ @item -p @itemx --processor @opindex -p -@@ -14994,30 +14982,6 @@ Print the kernel version. +@@ -15510,30 +15498,6 @@ Print the kernel version. @exitstatus @@ -82,29 +82,3 @@ @node hostid invocation @section @command{hostid}: Print numeric host identifier -Index: man/Makefile.am -=================================================================== ---- man/Makefile.am.orig -+++ man/Makefile.am -@@ -199,7 +199,7 @@ check-x-vs-1: - @PATH=../src$(PATH_SEPARATOR)$$PATH; export PATH; \ - t=$@-t; \ - (cd $(srcdir) && ls -1 *.x) | sed 's/\.x$$//' | $(ASSORT) > $$t;\ -- (echo $(dist_man1_MANS) $(NO_INSTALL_PROGS_DEFAULT) \ -+ (echo $(dist_man1_MANS) $(NO_INSTALL_PROGS_DEFAULT) hostid \ - | tr -s ' ' '\n' | sed 's/\.1$$//') \ - | $(ASSORT) -u | diff - $$t || { rm $$t; exit 1; }; \ - rm $$t -Index: man/Makefile.in -=================================================================== ---- man/Makefile.in.orig -+++ man/Makefile.in -@@ -2065,7 +2065,7 @@ check-x-vs-1: - @PATH=../src$(PATH_SEPARATOR)$$PATH; export PATH; \ - t=$@-t; \ - (cd $(srcdir) && ls -1 *.x) | sed 's/\.x$$//' | $(ASSORT) > $$t;\ -- (echo $(dist_man1_MANS) $(NO_INSTALL_PROGS_DEFAULT) \ -+ (echo $(dist_man1_MANS) $(NO_INSTALL_PROGS_DEFAULT) hostid \ - | tr -s ' ' '\n' | sed 's/\.1$$//') \ - | $(ASSORT) -u | diff - $$t || { rm $$t; exit 1; }; \ - rm $$t ++++++ coreutils-su.patch ++++++ ++++ 1664 lines (skipped) -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
