diffstat for coreutils_8.20-3 coreutils_8.20-3ubuntu5endless1 coreutils-8.20/debian/changelog | 230 ++++++++++++++ coreutils-8.20/debian/control | 3 coreutils-8.20/debian/patches/00list | 3 coreutils-8.20/debian/rules | 24 + coreutils-8.20/debian/tests/upstream | 475 ++++++++++++++---------------- debian/patches/80_fedora_sysinfo.dpatch | 75 ++++ debian/patches/99_arm64_longlong.dpatch | 43 ++ debian/patches/99_powerpc_longlong.dpatch | 19 + 8 files changed, 630 insertions(+), 242 deletions(-) diff -u coreutils-8.20/debian/rules coreutils-8.20/debian/rules --- coreutils-8.20/debian/rules +++ coreutils-8.20/debian/rules @@ -31,6 +31,11 @@ CFLAGS += -mieee endif +ifneq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE)) + cross_build := yes + CROSS_CONFIGURE_FLAGS = --cache-file=./config.cache +endif + # programs to include/not include ifeq ($(DEB_HOST_ARCH_OS),hurd) BUILDPROG_OPTS := --enable-install-program=su,arch @@ -49,12 +54,19 @@ configure-stamp: dh_testdir +ifeq ($(cross_build),yes) + ( \ + echo 'fu_cv_sys_stat_statfs2_bsize=yes'; \ + echo 'gl_cv_func_working_mkstemp=yes'; \ + ) > config.cache +endif CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" \ LDFLAGS='$(LDFLAGS)' ./configure \ --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE) \ --prefix=/usr -v \ --libexecdir=/usr/lib \ --infodir=/usr/share/info --mandir=/usr/share/man \ + --disable-silent-rules \ $(BUILDPROG_OPTS) echo configured > configure-stamp @@ -62,12 +74,18 @@ build: patch configure build-stamp build-stamp: dh_testdir +ifeq ($(cross_build),yes) + touch man/*.1 + $(MAKE) src/make-prime-list CC=gcc + $(MAKE) EXTRA_MANS= +else $(MAKE) ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS))) ifeq (,$(findstring mips,$(DEB_BUILD_ARCH))) $(MAKE) check VERBOSE=yes endif endif +endif # cross build echo built > build-stamp clean: unpatch clean1 @@ -97,7 +115,11 @@ dh_clean -k dh_installdirs +ifeq ($(cross_build),yes) + $(MAKE) install DESTDIR=$(CURDIR)/$(d) EXTRA_MANS= +else $(MAKE) install DESTDIR=$(CURDIR)/$(d) +endif # some things go in root rather than usr for f in $(BIN_PROGS); do \ @@ -109,7 +131,7 @@ ln -s /usr/share/man/man1/md5sum.1 $(d)/usr/share/man/man1/md5sum.textutils.1 ifneq ($(DEB_HOST_ARCH_OS),hurd) # touch used to be in /usr/bin, don't break scripts - ln -s /bin/touch $(d)/usr/bin/touch + #ln -s /bin/touch $(d)/usr/bin/touch endif # remove stuff provided by other packages diff -u coreutils-8.20/debian/changelog coreutils-8.20/debian/changelog --- coreutils-8.20/debian/changelog +++ coreutils-8.20/debian/changelog @@ -1,3 +1,54 @@ +coreutils (8.20-3ubuntu5endless1) master; urgency=medium + + * debian/rules: + - Comment out /usr/bin/touch symlink as it conflicts with a merged + /usr system. The symlink is only for backwards compatibility not + needed on Endless. + [endlessm/eos-shell#4905] + + -- Dan Nicholson Tue, 26 May 2015 10:55:27 -0700 + +coreutils (8.20-3ubuntu5) raring; urgency=low + + * Backport from gmp upstream: + - (aarch64): Make add_ssaaaa and sub_ddmmss actually work. + + -- Colin Watson Thu, 17 Jan 2013 04:21:35 +0000 + +coreutils (8.20-3ubuntu4) raring; urgency=low + + * Configure with --disable-silent-rules. + * Let it cross build: + - Preseed some autoconf tests. + - Build make-prime-list with the build compiler. + - Don't rebuild the man pages. + + -- Matthias Klose Wed, 12 Dec 2012 18:38:55 +0100 + +coreutils (8.20-3ubuntu3) raring; urgency=low + + * debian/tests/upstream: Adjust for changed test layout in 8.20. + + -- Martin Pitt Fri, 30 Nov 2012 22:08:22 +0100 + +coreutils (8.20-3ubuntu2) raring; urgency=low + + * Avoid PPC64 instructions unless _LP64 is defined. + * Revert build-dependency from gettext:any to gettext, now that gettext is + Multi-Arch: foreign. + + -- Colin Watson Thu, 29 Nov 2012 14:32:40 +0000 + +coreutils (8.20-3ubuntu1) raring; urgency=low + + * Resynchronise with Debian. Remaining changes: + - Make 'uname -i -p' return the real processor/hardware, instead of + unknown. + - Build-depend on gettext:any instead of on gettext, so that apt-get can + properly resolve build-dependencies on the tool when cross-building. + + -- Colin Watson Wed, 28 Nov 2012 03:03:42 +0000 + coreutils (8.20-3) unstable; urgency=low * actually include autopkgtest changes @@ -38,6 +89,75 @@ -- Jonathan Nieder Mon, 10 Sep 2012 22:02:19 -0700 +coreutils (8.13-3.2ubuntu7) raring; urgency=low + + * Backport require_valgrind_ so that tests work better. + * Make valgrind failures non-fatal; we don't have sufficiently accurate + suppressions for linker startup issues on all architectures. However, + do still run those tests and check for corrupted output. + * Don't build-depend on valgrind on armhf, as it apparently breaks there. + + -- Colin Watson Fri, 09 Nov 2012 10:01:28 +0000 + +coreutils (8.13-3.2ubuntu6) raring; urgency=low + + * Backport upstream patch to avoid data-corrupting free-memory-read in + cp/mv/install when dealing with a very fragmented and sparse input file + on certain filesystems (LP: #1073514). + * Build-depend on valgrind in order to be able to run the test for the + above fix. + * Fix 99_sort_-u_data_loss.dpatch so that the added test is actually run. + + -- Colin Watson Thu, 08 Nov 2012 16:24:07 +0000 + +coreutils (8.13-3.2ubuntu5) raring; urgency=low + + * debian/tests/upstream: Drop the three tests that fail with "skipped test: + this shell lacks ulimit support" in our test environment. + + -- Martin Pitt Thu, 08 Nov 2012 06:01:55 +0100 + +coreutils (8.13-3.2ubuntu4) raring; urgency=low + + [ Paul Larson ] + * Fix debian/tests/upstream: Make the test script count the number of test + failures, declare them at the end of the test run, and exit with the + number of failed tests. (LP: #1075612) + + [ Martin Pitt ] + * debian/tests/upstream: Drop du/bigtime test, does not work in our test + environment. + + -- Martin Pitt Wed, 07 Nov 2012 15:51:30 +0100 + +coreutils (8.13-3.2ubuntu3) raring; urgency=low + + * Add debian/tests/: autopkgtest for running a subset of the upstream tests + against the system installed binaries. The other upstream tests need a + built tree, and are run during package build. (LP: #1073445) + * Add 01_gnulib-gets.dpatch: Avoid assuming that gets is declared in bundled + gnulib. Backported from upstream gnulib SVN to fix FTBFS. + + -- Martin Pitt Tue, 06 Nov 2012 13:21:20 +0100 + +coreutils (8.13-3.2ubuntu2) quantal; urgency=low + + * Update config.guess,sub for aarch64 + + -- Wookey Mon, 01 Oct 2012 15:41:06 +0100 + +coreutils (8.13-3.2ubuntu1) quantal; urgency=low + + * Resynchronise with Debian. Remaining changes: + - [80] Make 'uname -i -p' return the real processor/hardware, instead of + unknown. + - Build-depend on gettext:any instead of on gettext, so that apt-get can + properly resolve build-dependencies on the tool when cross-building. + * Backport upstream patches to fix data-loss and free-memory read bugs in + 'sort -u' (LP: #1038468). + + -- Colin Watson Mon, 10 Sep 2012 14:07:50 +0100 + coreutils (8.13-3.2) unstable; urgency=low * Non-maintainer upload. @@ -58,6 +178,34 @@ -- Steve Langasek Wed, 02 May 2012 02:27:43 +0000 +coreutils (8.13-3.1ubuntu1) quantal; urgency=low + + * Merge from Debian unstable, remaining changes: + - [80] Make 'uname -i -p' return the real processor/hardware, instead of + unknown. + - Build-depend on gettext:any instead of on gettext, so that apt-get can + properly resolve build-dependencies on the tool when cross-building. + * Incorporate changes from Debian NMU to DELAYED/5-days: + - Don't declare separate build-arch/build-indep targets when they just + fall through to the same common build rule, since they don't have + correct target dependencies themselves. Closes: #670481. + - Enable hardening build flags. Thanks to Moritz Muehlenhoff for the + patch. Closes: #653743. + - debian/patches/99_Werror-format-string.dpatch: fix the gnulib test + suite so that it doesn't fail to build with hardening flags on. + - Mark coreutils Multi-Arch: foreign. Thanks to Colin Watson. + Closes: #649397. + - debian/patches/99_tests-misc-sort-continue-Port-to-Fedora-15.dpatch: + cherry-pick from upstream to fix a build failure whenever the build + system happens to be holding an fd open, as happens when running in + certain environments (e.g., Lucas's test rebuild farm, or + bzr-builddeb). Closes: #669555. + * Dropped changes, superseded by the above NMU: + - Filter out -Werror=format-security from CFLAGS when building tests, to + avoid a build failure in gnulib-tests/test-xvasprintf.c. + + -- Steve Langasek Tue, 01 May 2012 22:07:44 -0700 + coreutils (8.13-3.1) unstable; urgency=low * Non-maintainer upload. @@ -67,6 +215,29 @@ -- Jakub Wilk Wed, 29 Feb 2012 00:11:27 +0100 +coreutils (8.13-3ubuntu3) precise; urgency=low + + * Build-depend on gettext:any instead of on gettext, so that apt-get can + properly resolve build-dependencies on the tool when cross-building. + + -- Steve Langasek Sat, 31 Mar 2012 14:54:13 -0700 + +coreutils (8.13-3ubuntu2) precise; urgency=low + + * Mark coreutils Multi-Arch: foreign. + + -- Colin Watson Sun, 20 Nov 2011 17:21:08 +0000 + +coreutils (8.13-3ubuntu1) precise; urgency=low + + * Resynchronise with Debian. Remaining changes: + - [80] Make 'uname -i -p' return the real processor/hardware, instead of + unknown. + * Filter out -Werror=format-security from CFLAGS when building tests, to + avoid a build failure in gnulib-tests/test-xvasprintf.c. + + -- Colin Watson Tue, 18 Oct 2011 10:59:14 +0100 + coreutils (8.13-3) unstable; urgency=low * revert previous change to -mlong-double-64 @@ -98,6 +269,51 @@ -- Michael Stone Mon, 12 Sep 2011 17:21:19 -0400 +coreutils (8.5-1ubuntu6) natty; urgency=low + + * Backport from upstream (Jim Meyering): + - tail: avoid new diagnostic when applying -f to a pipe on linux-2.6.38. + + -- Colin Watson Wed, 23 Feb 2011 13:06:43 +0000 + +coreutils (8.5-1ubuntu5) natty; urgency=low + + * debian/patches/80_fedora_sysinfo.dpatch: make 'uname -i -p' return the + real processor/hardware, instead of unknown. Patch cherry-picked from + Fedora 12 (original: coreutils-4.5.3-sysinfo.patch, from the + coreutils-7.6-5.src.rpm). LP: #470550. + + -- C de-Avillez Tue, 10 Nov 2009 12:38:24 -0600 + +coreutils (8.5-1ubuntu4) natty; urgency=low + + * No-change upload to drop upstream changelog, and build with natty + toolchain. + + -- Martin Pitt Fri, 03 Dec 2010 08:40:09 +0100 + +coreutils (8.5-1ubuntu3) maverick; urgency=low + + * Maybe test that the package builds first before uploading; dpatch is a + picky one, isn't it? + + -- Steve Langasek Fri, 11 Jun 2010 06:49:02 +0000 + +coreutils (8.5-1ubuntu2) maverick; urgency=low + + [ John Rigby ] + * debian/patches/99_stat_prototype_for_linkat.dpatch: Add missing header + include for stat() prototype. LP: #591968. + + -- Steve Langasek Fri, 11 Jun 2010 06:03:58 +0000 + +coreutils (8.5-1ubuntu1) maverick; urgency=low + + * Merge from Debian unstable, remaining changes: + - debian/rules: Do not install dangling LC_TIME symlinks + + -- Steve Langasek Mon, 07 Jun 2010 01:41:56 +0000 + coreutils (8.5-1) unstable; urgency=low * New upstream version @@ -194,6 +410,20 @@ -- Michael Stone Wed, 02 Sep 2009 20:50:02 -0400 +coreutils (7.4-2ubuntu2) lucid; urgency=low + + * rebuild rest of main for armel armv7/thumb2 optimization; + UbuntuSpec:mobile-lucid-arm-gcc-v7-thumb2 + + -- Alexander Sack Fri, 05 Mar 2010 04:06:08 +0100 + +coreutils (7.4-2ubuntu1) karmic; urgency=low + + * debian/rules: Do not install dangling LC_TIME symlinks, they are not + needed. (LP: #42293) + + -- Martin Pitt Tue, 06 Oct 2009 12:22:48 +0200 + coreutils (7.4-2) unstable; urgency=low * move mktemp to /bin instead of /usr/bin (Closes: #531842) diff -u coreutils-8.20/debian/control coreutils-8.20/debian/control --- coreutils-8.20/debian/control +++ coreutils-8.20/debian/control @@ -1,5 +1,6 @@ Source: coreutils -Maintainer: Michael Stone +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Michael Stone Section: utils Priority: required Standards-Version: 3.9.4.0 diff -u coreutils-8.20/debian/patches/00list coreutils-8.20/debian/patches/00list --- coreutils-8.20/debian/patches/00list +++ coreutils-8.20/debian/patches/00list @@ -4,6 +4,9 @@ +80_fedora_sysinfo 85_timer_settime 99_kfbsd_fstat_patch 99_kill_test-xvasprintf_empty_arg 99_kill_df_total-unprocessed_test 99_hppa_longlong 99_factor_long_long +99_powerpc_longlong +99_arm64_longlong diff -u coreutils-8.20/debian/tests/upstream coreutils-8.20/debian/tests/upstream --- coreutils-8.20/debian/tests/upstream +++ coreutils-8.20/debian/tests/upstream @@ -10,250 +10,245 @@ unset LANGUAGE export LC_ALL=C fails=0 -cd tests for test in \ - chmod/c-option \ - chmod/equals \ - chmod/equal-x \ - chmod/inaccessible \ - chmod/octal \ - chmod/setgid \ - chmod/silent \ - chmod/thru-dangling \ - chmod/umask-x \ - chmod/usage \ - chown/deref \ - chown/separator \ - cp/abuse \ - cp/backup-1 \ - cp/backup-dir \ - cp/backup-is-src \ - cp/cp-deref \ - cp/cp-HL \ - cp/cp-i \ - cp/cp-mv-backup \ - cp/cp-parents \ - cp/deref-slink \ - cp/dir-rm-dest \ - cp/dir-slash \ - cp/dir-vs-file \ - cp/existing-perm-dir \ - cp/file-perm-race \ - cp/into-self \ - cp/link \ - cp/link-no-deref \ - cp/link-preserve \ - cp/link-symlink \ - cp/no-deref-link1 \ - cp/no-deref-link2 \ - cp/no-deref-link3 \ - cp/parent-perm \ - cp/parent-perm-race \ - cp/preserve-2 \ - cp/preserve-link \ - cp/proc-short-read \ - cp/proc-zero-len \ - cp/reflink-perm \ - cp/r-vs-symlink \ - cp/same-file \ - cp/slink-2-slink \ - cp/special-f \ - cp/src-base-dot \ - cp/symlink-slash \ - cp/thru-dangling \ - dd/misc \ - dd/nocache \ - dd/not-rewound \ - dd/reblock \ - dd/skip-seek2 \ - dd/stderr \ - dd/unblock-sync \ - du/basic \ - du/deref \ - du/deref-args \ - du/exclude \ - du/files0-from-dir \ - du/hard-link \ - du/long-sloop \ - du/max-depth \ - du/no-deref \ - du/one-file-system \ - du/restore-wd \ - du/slash \ - du/slink \ - du/trailing-slash \ - du/two-args \ - install/trap \ - ln/backup-1 \ - ln/hard-backup \ - ln/hard-to-sym \ - ln/sf-1 \ - ln/slash-decorated-nonexistent-dest \ - ln/target-1 \ - ls/abmon-align \ - ls/color-clear-to-eol \ - ls/color-dtype-dir \ - ls/color-norm \ - ls/dangle \ - ls/dired \ - ls/file-type \ - ls/follow-slink \ - ls/infloop \ - ls/inode \ - ls/m-option \ - ls/multihardlink \ - ls/no-arg \ - ls/proc-selinux-segfault \ - ls/readdir-mountpoint-inode \ - ls/recursive \ - ls/rt-1 \ - ls/stat-dtype \ - ls/stat-free-symlinks \ - ls/stat-vs-dirent \ - ls/symlink-slash \ - ls/x-option \ - misc/cat-proc \ - misc/chcon-fail \ - misc/chroot-fail \ - misc/csplit \ - misc/csplit-1000 \ - misc/date-sec \ - misc/df \ - misc/df-P \ - misc/env-null \ - misc/false-status \ - misc/fmt-long-line \ - misc/head-c \ - misc/head-pos \ - misc/id-groups \ - misc/invalid-opt \ - misc/ls-time \ - misc/md5sum-parallel \ - misc/mknod \ - misc/nice \ - misc/nice-fail \ - misc/nl \ - misc/nproc-avail \ - misc/nproc-positive \ - misc/od-float \ - misc/od-multiple-t \ - misc/od-N \ - misc/od-x8 \ - misc/printenv \ - misc/printf-hex \ - misc/ptx-overrun \ - misc/pwd-option \ - misc/runcon-no-reorder \ - misc/shred-exact \ - misc/shred-passes \ - misc/sort-compress \ - misc/sort-debug-keys \ - misc/sort-debug-warn \ - misc/sort-month \ - misc/sort-rand \ - misc/sort-unique \ - misc/sort-version \ - misc/stat-fmt \ - misc/stat-hyphen \ - misc/stat-mount \ - misc/stat-nanoseconds \ - misc/stat-slash \ - misc/sum-sysv \ - misc/tee \ - misc/tee-dash \ - misc/timeout \ - misc/timeout-group \ - misc/tr-case-class \ - misc/truncate-dangling-symlink \ - misc/truncate-dir-fail \ - misc/truncate-fifo \ - misc/truncate-no-create-missing \ - misc/truncate-parameters \ - misc/truncate-relative \ - misc/uniq-perf \ - misc/wc-files0 \ - misc/wc-parallel \ - mkdir/p-1 \ - mkdir/p-2 \ - mkdir/parents \ - mkdir/perm \ - mkdir/p-slashdot \ - mkdir/p-thru-slink \ - mkdir/p-v \ - mkdir/special-1 \ - mkdir/t-slash \ - mv/atomic \ - mv/atomic2 \ - mv/backup-dir \ - mv/diag \ - mv/dir2dir \ - mv/dir-file \ - mv/force \ - mv/hard-4 \ - mv/hard-verbose \ - mv/i-4 \ - mv/i-5 \ - mv/i-link-no \ - mv/into-self \ - mv/into-self-3 \ - mv/into-self-4 \ - mv/mv-n \ - mv/no-target-dir \ - mv/trailing-slash \ - mv/update \ - readlink/rl-1 \ - rm/dangling-symlink \ - rm/deep-1 \ - rmdir/fail-perm \ - rmdir/ignore \ - rm/dir-nonrecur \ - rm/dir-no-w \ - rmdir/t-slash \ - rm/dot-rel \ - rm/f-1 \ - rm/i-1 \ - rm/i-no-r \ - rm/interactive-always \ - rm/interactive-once \ - rm/ir-1 \ - rm/one-file-system2 \ - rm/r-1 \ - rm/r-2 \ - rm/r-3 \ - rm/r-4 \ - rm/readdir-bug \ - rm/sunos-1 \ - rm/v-slash \ - split/b-chunk \ - split/filter \ - split/l-chunk \ - split/lines \ - split/suffix-length \ - tail-2/follow-stdin \ - tail-2/F-vs-rename \ - tail-2/infloop-1 \ - tail-2/inotify-hash-abuse \ - tail-2/inotify-hash-abuse2 \ - tail-2/pipe-f \ - tail-2/pipe-f2 \ - tail-2/proc-ksyms \ - tail-2/start-middle \ - tail-2/tail-n0f \ - tail-2/wait \ - touch/60-seconds \ - touch/dangling-symlink \ - touch/dir-1 \ - touch/empty-file \ - touch/fifo \ - touch/no-create-missing \ - touch/no-rights \ - touch/obsolescent \ - touch/relative \ - touch/trailing-slash \ + chmod/c-option.sh \ + chmod/equals.sh \ + chmod/equal-x.sh \ + chmod/inaccessible.sh \ + chmod/octal.sh \ + chmod/setgid.sh \ + chmod/silent.sh \ + chmod/thru-dangling.sh \ + chmod/umask-x.sh \ + chmod/usage.sh \ + chown/deref.sh \ + chown/separator.sh \ + cp/abuse.sh \ + cp/backup-1.sh \ + cp/backup-dir.sh \ + cp/backup-is-src.sh \ + cp/cp-deref.sh \ + cp/cp-HL.sh \ + cp/cp-i.sh \ + cp/cp-mv-backup.sh \ + cp/cp-parents.sh \ + cp/deref-slink.sh \ + cp/dir-rm-dest.sh \ + cp/dir-slash.sh \ + cp/dir-vs-file.sh \ + cp/existing-perm-dir.sh \ + cp/file-perm-race.sh \ + cp/into-self.sh \ + cp/link.sh \ + cp/link-no-deref.sh \ + cp/link-preserve.sh \ + cp/link-symlink.sh \ + cp/no-deref-link1.sh \ + cp/no-deref-link2.sh \ + cp/no-deref-link3.sh \ + cp/parent-perm.sh \ + cp/parent-perm-race.sh \ + cp/preserve-2.sh \ + cp/preserve-link.sh \ + cp/proc-short-read.sh \ + cp/proc-zero-len.sh \ + cp/reflink-perm.sh \ + cp/r-vs-symlink.sh \ + cp/same-file.sh \ + cp/slink-2-slink.sh \ + cp/special-f.sh \ + cp/src-base-dot.sh \ + cp/symlink-slash.sh \ + cp/thru-dangling.sh \ + dd/misc.sh \ + dd/nocache.sh \ + dd/not-rewound.sh \ + dd/reblock.sh \ + dd/skip-seek2.sh \ + dd/stderr.sh \ + dd/unblock-sync.sh \ + df/df-P.sh \ + du/basic.sh \ + du/deref.sh \ + du/deref-args.sh \ + du/exclude.sh \ + du/files0-from-dir.sh \ + du/hard-link.sh \ + du/long-sloop.sh \ + du/max-depth.sh \ + du/no-deref.sh \ + du/restore-wd.sh \ + du/slash.sh \ + du/slink.sh \ + du/trailing-slash.sh \ + du/two-args.sh \ + install/trap.sh \ + ln/backup-1.sh \ + ln/hard-backup.sh \ + ln/hard-to-sym.sh \ + ln/sf-1.sh \ + ln/slash-decorated-nonexistent-dest.sh \ + ln/target-1.sh \ + ls/abmon-align.sh \ + ls/color-clear-to-eol.sh \ + ls/color-dtype-dir.sh \ + ls/color-norm.sh \ + ls/dangle.sh \ + ls/dired.sh \ + ls/file-type.sh \ + ls/follow-slink.sh \ + ls/infloop.sh \ + ls/inode.sh \ + ls/m-option.sh \ + ls/multihardlink.sh \ + ls/no-arg.sh \ + ls/proc-selinux-segfault.sh \ + ls/readdir-mountpoint-inode.sh \ + ls/recursive.sh \ + ls/rt-1.sh \ + ls/stat-dtype.sh \ + ls/stat-free-symlinks.sh \ + ls/stat-vs-dirent.sh \ + ls/symlink-slash.sh \ + ls/x-option.sh \ + misc/cat-proc.sh \ + misc/chcon-fail.sh \ + misc/chroot-fail.sh \ + misc/csplit.sh \ + misc/csplit-1000.sh \ + misc/date-sec.sh \ + misc/env-null.sh \ + misc/false-status.sh \ + misc/head-c.sh \ + misc/head-pos.sh \ + misc/id-groups.sh \ + misc/ls-time.sh \ + misc/md5sum-parallel.sh \ + misc/mknod.sh \ + misc/nice.sh \ + misc/nice-fail.sh \ + misc/nl.sh \ + misc/nproc-avail.sh \ + misc/nproc-positive.sh \ + misc/od-float.sh \ + misc/od-multiple-t.sh \ + misc/od-N.sh \ + misc/od-x8.sh \ + misc/printenv.sh \ + misc/printf-hex.sh \ + misc/ptx-overrun.sh \ + misc/pwd-option.sh \ + misc/runcon-no-reorder.sh \ + misc/shred-exact.sh \ + misc/shred-passes.sh \ + misc/sort-compress.sh \ + misc/sort-debug-keys.sh \ + misc/sort-debug-warn.sh \ + misc/sort-month.sh \ + misc/sort-rand.sh \ + misc/sort-unique.sh \ + misc/sort-version.sh \ + misc/stat-fmt.sh \ + misc/stat-hyphen.sh \ + misc/stat-mount.sh \ + misc/stat-nanoseconds.sh \ + misc/stat-slash.sh \ + misc/sum-sysv.sh \ + misc/tee.sh \ + misc/tee-dash.sh \ + misc/timeout.sh \ + misc/tr-case-class.sh \ + misc/truncate-dangling-symlink.sh \ + misc/truncate-dir-fail.sh \ + misc/truncate-fifo.sh \ + misc/truncate-no-create-missing.sh \ + misc/truncate-parameters.sh \ + misc/truncate-relative.sh \ + misc/uniq-perf.sh \ + misc/wc-files0.sh \ + misc/wc-parallel.sh \ + mkdir/p-1.sh \ + mkdir/p-2.sh \ + mkdir/parents.sh \ + mkdir/perm.sh \ + mkdir/p-slashdot.sh \ + mkdir/p-thru-slink.sh \ + mkdir/p-v.sh \ + mkdir/special-1.sh \ + mkdir/t-slash.sh \ + mv/atomic.sh \ + mv/atomic2.sh \ + mv/backup-dir.sh \ + mv/diag.sh \ + mv/dir2dir.sh \ + mv/dir-file.sh \ + mv/force.sh \ + mv/hard-4.sh \ + mv/hard-verbose.sh \ + mv/i-4.sh \ + mv/i-5.sh \ + mv/i-link-no.sh \ + mv/into-self.sh \ + mv/into-self-3.sh \ + mv/into-self-4.sh \ + mv/mv-n.sh \ + mv/no-target-dir.sh \ + mv/trailing-slash.sh \ + mv/update.sh \ + readlink/rl-1.sh \ + rm/dangling-symlink.sh \ + rm/deep-1.sh \ + rmdir/fail-perm.sh \ + rmdir/ignore.sh \ + rm/dir-nonrecur.sh \ + rm/dir-no-w.sh \ + rmdir/t-slash.sh \ + rm/dot-rel.sh \ + rm/f-1.sh \ + rm/i-1.sh \ + rm/i-no-r.sh \ + rm/interactive-always.sh \ + rm/interactive-once.sh \ + rm/ir-1.sh \ + rm/one-file-system2.sh \ + rm/r-1.sh \ + rm/r-2.sh \ + rm/r-3.sh \ + rm/r-4.sh \ + rm/readdir-bug.sh \ + rm/sunos-1.sh \ + rm/v-slash.sh \ + split/b-chunk.sh \ + split/filter.sh \ + split/l-chunk.sh \ + split/lines.sh \ + split/suffix-length.sh \ + tail-2/follow-stdin.sh \ + tail-2/F-vs-rename.sh \ + tail-2/infloop-1.sh \ + tail-2/inotify-hash-abuse.sh \ + tail-2/inotify-hash-abuse2.sh \ + tail-2/pipe-f.sh \ + tail-2/pipe-f2.sh \ + tail-2/proc-ksyms.sh \ + tail-2/start-middle.sh \ + tail-2/tail-n0f.sh \ + tail-2/wait.sh \ + touch/60-seconds.sh \ + touch/dangling-symlink.sh \ + touch/dir-1.sh \ + touch/empty-file.sh \ + touch/fifo.sh \ + touch/no-create-missing.sh \ + touch/no-rights.sh \ + touch/obsolescent.sh \ + touch/relative.sh \ + touch/trailing-slash.sh \ ; do echo "$test" - OUT=$($test 2>&1) || { fails=$((fails+1)); echo "FAIL:"; echo "$OUT"; } + chmod a+x "tests/$test" + OUT=$(tests/$test 2>&1) || { fails=$((fails+1)); echo "FAIL:"; echo "$OUT"; } done echo $fails tests failed only in patch2: unchanged: --- coreutils-8.20.orig/debian/patches/80_fedora_sysinfo.dpatch +++ coreutils-8.20/debian/patches/80_fedora_sysinfo.dpatch @@ -0,0 +1,75 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run + +@DPATCH@ +--- a/src/uname.c ++++ b/src/uname.c +@@ -258,7 +258,7 @@ + int + main (int argc, char **argv) + { +- static char const unknown[] = "unknown"; ++ static char unknown[] = "unknown"; + + /* Mask indicating which elements to print. */ + unsigned int toprint = 0; +@@ -299,13 +299,35 @@ + + if (toprint & PRINT_PROCESSOR) + { +- char const *element = unknown; ++ char *element = unknown; + #if HAVE_SYSINFO && defined SI_ARCHITECTURE + { + static char processor[257]; + if (0 <= sysinfo (SI_ARCHITECTURE, processor, sizeof processor)) + element = processor; + } ++#else ++ { ++ struct utsname u; ++ uname(&u); ++ element = u.machine; ++#ifdef linux ++ if(!strcmp(element, "i686")) { /* Check for Athlon */ ++ char cinfo[1024]; ++ FILE *f=fopen("/proc/cpuinfo", "r"); ++ if(f) { ++ while(fgets(cinfo, 1024, f)) { ++ if(!strncmp(cinfo, "vendor_id", 9)) { ++ if(strstr(cinfo, "AuthenticAMD")) ++ element="athlon"; ++ break; ++ } ++ } ++ fclose(f); ++ } ++ } ++#endif ++ } + #endif + #ifdef UNAME_PROCESSOR + if (element == unknown) +@@ -343,7 +365,7 @@ + + if (toprint & PRINT_HARDWARE_PLATFORM) + { +- char const *element = unknown; ++ char *element = unknown; + #if HAVE_SYSINFO && defined SI_PLATFORM + { + static char hardware_platform[257]; +@@ -351,6 +373,14 @@ + hardware_platform, sizeof hardware_platform)) + element = hardware_platform; + } ++#else ++ { ++ struct utsname u; ++ uname(&u); ++ element = u.machine; ++ if(strlen(element)==4 && element[0]=='i' && element[2]=='8' && element[3]=='6') ++ element[1]='3'; ++ } + #endif + #ifdef UNAME_HARDWARE_PLATFORM + if (element == unknown) only in patch2: unchanged: --- coreutils-8.20.orig/debian/patches/99_arm64_longlong.dpatch +++ coreutils-8.20/debian/patches/99_arm64_longlong.dpatch @@ -0,0 +1,43 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 99_arm64_longlong.dpatch by Colin Watson +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: (aarch64): Make add_ssaaaa and sub_ddmmss actually work. +## DP: Author: Torbjorn Granlund +## DP: Origin: upstream, http://gmplib.org:8000/gmp/rev/187b7b1646ee + +@DPATCH@ +diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' coreutils-8.20~/src/longlong.h coreutils-8.20/src/longlong.h +--- coreutils-8.20~/src/longlong.h 2013-01-17 04:05:16.000000000 +0000 ++++ coreutils-8.20/src/longlong.h 2013-01-17 04:05:46.000000000 +0000 +@@ -530,23 +530,16 @@ + #endif /* __arm__ */ + + #if defined (__aarch64__) && W_TYPE_SIZE == 64 ++/* FIXME: Extend the immediate range for the low word by using both ++ ADDS and SUBS, since they set carry in the same way. */ + #define add_ssaaaa(sh, sl, ah, al, bh, bl) \ +- __asm__ ("adds\t%1, %4, %5\n\tadc\t%0, %2, %3" \ ++ __asm__ ("adds\t%1, %x4, %5\n\tadc\t%0, %x2, %x3" \ + : "=r" (sh), "=&r" (sl) \ +- : "r" (ah), "rZ" (bh), "%r" (al), "rI" (bl) __CLOBBER_CC) ++ : "rZ" (ah), "rZ" (bh), "%r" (al), "rI" (bl) __CLOBBER_CC) + #define sub_ddmmss(sh, sl, ah, al, bh, bl) \ +- do { \ +- if (__builtin_constant_p (bl)) \ +- { \ +- __asm__ ("subs\t%1, %4, %5\n\tsbc\t%0, %2, %3" \ +- : "=r" (sh), "=&r" (sl) \ +- : "r" (ah), "r" (bh), "r" (al), "rI" (bl) __CLOBBER_CC); \ +- } \ +- else /* only bh might be a constant */ \ +- __asm__ ("subs\t%1, %4, %5\n\tsbc\t%0, %2, %3" \ +- : "=r" (sh), "=&r" (sl) \ +- : "r" (ah), "rZ" (bh), "r" (al), "rI" (bl) __CLOBBER_CC);\ +- } while (0) ++ __asm__ ("subs\t%1, %x4, %5\n\tsbc\t%0, %x2, %x3" \ ++ : "=r,r" (sh), "=&r,&r" (sl) \ ++ : "rZ,rZ" (ah), "rZ,rZ" (bh), "r,Z" (al), "rI,r" (bl) __CLOBBER_CC) + #define umul_ppmm(ph, pl, m0, m1) \ + do { \ + UDItype __m0 = (m0), __m1 = (m1); \ only in patch2: unchanged: --- coreutils-8.20.orig/debian/patches/99_powerpc_longlong.dpatch +++ coreutils-8.20/debian/patches/99_powerpc_longlong.dpatch @@ -0,0 +1,19 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 99_powerpc_longlong.dpatch by Colin Watson +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Avoid PPC64 instructions unless _LP64 is defined. + +@DPATCH@ +diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' coreutils-8.20~/src/longlong.h coreutils-8.20/src/longlong.h +--- coreutils-8.20~/src/longlong.h 2012-11-29 14:25:07.000000000 +0000 ++++ coreutils-8.20/src/longlong.h 2012-11-29 14:26:40.000000000 +0000 +@@ -1398,7 +1398,7 @@ + + /* We should test _IBMR2 here when we add assembly support for the system + vendor compilers. */ +-#if HAVE_HOST_CPU_FAMILY_powerpc && W_TYPE_SIZE == 64 ++#if HAVE_HOST_CPU_FAMILY_powerpc && W_TYPE_SIZE == 64 && defined (_LP64) + #if !defined (_LONG_LONG_LIMB) + /* _LONG_LONG_LIMB is ABI=mode32 where adde operates on 32-bit values. So + use adde etc only when not _LONG_LONG_LIMB. */