coreutils (8.23-0+dyson1) unstable; urgency=mediumdyson/8.23-0+dyson1

  * New upstream release
  * Applied debian partches:
    63_dd-appenderrors.patch
    72_id_checkngroups.patch
    85_timer_settime.patch
    99_hppa_longlong.patch
    99_kfbsd_fstat_patch.patch

6 files changed, 126 insertions, 0 deletions

diff --git a/debian/patches/63_dd-appenderrors.patch b/debian/patches/63_dd-appenderrors.patch
new file mode 100644
index 00000000..185e37bf
--- /dev/null
+++ b/debian/patches/63_dd-appenderrors.patch
@@ -0,0 +1,17 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+
+@DPATCH@
+Index: b/src/dd.c
+===================================================================
+--- a/src/dd.c
++++ b/src/dd.c
+@@ -1422,6 +1422,9 @@ scanargs (int argc, char *const *argv)
+   if (multiple_bits_set (input_flags & (O_DIRECT | O_NOCACHE))
+       || multiple_bits_set (output_flags & (O_DIRECT | O_NOCACHE)))
+     error (EXIT_FAILURE, 0, _("cannot combine direct and nocache"));
++  if ((output_flags & O_APPEND) &&
++      ((conversions_mask & C_NOTRUNC) != C_NOTRUNC))
++    error (0, 0, _("you probably want conv=notrunc with oflag=append"));
+ 
+   if (input_flags & O_NOCACHE)
+     {
diff --git a/debian/patches/72_id_checkngroups.patch b/debian/patches/72_id_checkngroups.patch
new file mode 100644
index 00000000..15db91bc
--- /dev/null
+++ b/debian/patches/72_id_checkngroups.patch
@@ -0,0 +1,18 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+
+@DPATCH@
+Index: b/src/id.c
+===================================================================
+--- a/src/id.c
++++ b/src/id.c
+@@ -416,6 +416,10 @@ print_full_info (const char *username)
+         ok = false;
+         return;
+       }
++    else if (sysconf(_SC_NGROUPS_MAX) > 0 && n_groups > sysconf(_SC_NGROUPS_MAX))
++      {
++        fprintf (stderr, _("Warning: user %s is in more groups than system's configured maximum.\n"), (username != NULL)?username:"");
++      }
+ 
+     if (n_groups > 0)
+       fputs (_(" groups="), stdout);
diff --git a/debian/patches/85_timer_settime.patch b/debian/patches/85_timer_settime.patch
new file mode 100644
index 00000000..1ac1942d
--- /dev/null
+++ b/debian/patches/85_timer_settime.patch
@@ -0,0 +1,33 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 85_timer_settime.dpatch by  <mstone@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: timeout ignores fractional part of sleep times when timeout is more 
+## DP: than 100000s (approximately 1 day) on kfbsd. prevents failure modes 
+## DP: in libc implementation when timeout approaches max(time_t)
+
+@DPATCH@
+Index: b/src/timeout.c
+===================================================================
+--- a/src/timeout.c
++++ b/src/timeout.c
+@@ -133,6 +133,11 @@ settimeout (double duration, bool warn)
+    resolution provided by alarm().  */
+ 
+ #if HAVE_TIMER_SETTIME
++#ifdef __FreeBSD_kernel__
++if (duration < 100000) {
++#else
++if (true) {
++#endif 
+   struct timespec ts = dtotimespec (duration);
+   struct itimerspec its = { {0, 0}, ts };
+   timer_t timerid;
+@@ -149,6 +154,7 @@ settimeout (double duration, bool warn)
+     }
+   else if (warn && errno != ENOSYS)
+     error (0, errno, _("warning: timer_create"));
++}
+ #endif
+ 
+   unsigned int timeint;
diff --git a/debian/patches/99_hppa_longlong.patch b/debian/patches/99_hppa_longlong.patch
new file mode 100644
index 00000000..91f3b8bf
--- /dev/null
+++ b/debian/patches/99_hppa_longlong.patch
@@ -0,0 +1,26 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 99_hppa_longlong by  <P@draigBrady.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: disable test of zero-len format string
+
+@DPATCH@
+Index: b/src/longlong.h
+===================================================================
+--- a/src/longlong.h
++++ b/src/longlong.h
+@@ -673,7 +673,13 @@ extern UWtype __MPN(udiv_qrnnd) (UWtype
+ /* These macros are for ABI=2.0w.  In ABI=2.0n they can't be used, since GCC
+    (3.2) puts longlong into two adjacent 32-bit registers.  Presumably this
+    is just a case of no direct support for 2.0n but treating it like 1.0. */
+-#if defined (__hppa) && W_TYPE_SIZE == 64 && ! defined (_LONG_LONG_LIMB)
++#if defined (__hppa) && W_TYPE_SIZE == 64 && ! defined (_LONG_LONG_LIMB) \
++  && defined (_PA_RISC2_0) && defined (_LP64)
++/* Note the _PA_RISC2_0 above is to exclude this code from GCC with
++   default -march options which doesn't support these instructions.
++   Also the width check for 'long' is to avoid ilp32 runtimes where
++   GNU/Linux and narrow HP-UX kernels are known to have issues with
++   clobbering of context between the add and add,dc instructions.  */
+ #define add_ssaaaa(sh, sl, ah, al, bh, bl) \
+   __asm__ ("add%I5 %5,%r4,%1\n\tadd,dc %r2,%r3,%0"			\
+ 	   : "=r" (sh), "=&r" (sl)					\
diff --git a/debian/patches/99_kfbsd_fstat_patch.patch b/debian/patches/99_kfbsd_fstat_patch.patch
new file mode 100644
index 00000000..0c348ead
--- /dev/null
+++ b/debian/patches/99_kfbsd_fstat_patch.patch
@@ -0,0 +1,27 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 99_kfbsd_fstat_patch.dpatch by Michael Stone <mstone@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+@DPATCH@
+Index: b/lib/fstatat.c
+===================================================================
+--- a/lib/fstatat.c
++++ b/lib/fstatat.c
+@@ -132,4 +132,15 @@ stat_func (char const *name, struct stat
+ # undef AT_FUNC_POST_FILE_PARAM_DECLS
+ # undef AT_FUNC_POST_FILE_ARGS
+ 
++#ifdef __FreeBSD_kernel__
++
++int __fxstatat(int version, int fd, const char *file, struct stat *st, int flag)
++{
++  typedef int (*tp)(int, const char *, struct stat *, int);
++  volatile tp f = fstatat;
++  return f(fd, file, st, flag);
++}
++
++#endif
++
+ #endif /* !HAVE_FSTATAT */
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 00000000..abcaf193
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,5 @@
+63_dd-appenderrors.patch
+72_id_checkngroups.patch
+85_timer_settime.patch
+99_hppa_longlong.patch
+99_kfbsd_fstat_patch.patch