- rel 5; update base english man pages from man-pages 3.71; the rest of man pages...

[packages/glibc.git] / glibc-posix-sh.patch

diff --git a/glibc-posix-sh.patch b/glibc-posix-sh.patch
index ccf578225edc9e18503923fa878a9436ac864854..01f356f8f65fa6a9b7f5359ab76681d12517d1b7 100644 (file)
--- a/glibc-posix-sh.patch
+++ b/glibc-posix-sh.patch
@@ -3,18 +3,18 @@
 @@ -1,4 +1,4 @@
 -#! @BASH@
 +#! /bin/sh
- # Copyright (C) 1996-2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+ # Copyright (C) 1996-2014 Free Software Foundation, Inc.
  # This file is part of the GNU C Library.
  
-@@ -36,16 +36,16 @@
+@@ -35,16 +35,16 @@
    case "$1" in
    --vers | --versi | --versio | --version)
-     echo 'ldd (GNU libc) @VERSION@'
+     echo 'ldd @PKGVERSION@@VERSION@'
 -    printf $"Copyright (C) %s Free Software Foundation, Inc.
 +    printf "Copyright (C) %s Free Software Foundation, Inc.
  This is free software; see the source for copying conditions.  There is NO
  warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- " "2011"
+ " "2014"
 -    printf $"Written by %s and %s.
 +    printf "Written by %s and %s.
  " "Roland McGrath" "Ulrich Drepper"
@@ -26,15 +26,15 @@
        --help              print this help and exit
        --version           print version information and exit
    -d, --data-relocs       process data relocations
-@@ -53,7 +53,7 @@
+@@ -52,7 +52,7 @@
    -u, --unused            print unused direct dependencies
    -v, --verbose           print all information
  "
--    echo $"For bug reporting instructions, please see:
-+    echo "For bug reporting instructions, please see:
- <http://www.gnu.org/software/libc/bugs.html>.
- "
+-    printf $"For bug reporting instructions, please see:\\n%s.\\n" \
++    printf "For bug reporting instructions, please see:\\n%s.\\n" \
+       "@REPORT_BUGS_TO@"
      exit 0
+     ;;
 @@ -79,15 +79,15 @@
      shift
      ;;
@@ -54,22 +54,7 @@
      exit 1
      ;;
    *)
-@@ -112,20 +112,14 @@
- # environments where the executed program might not have permissions
- # to write to the console/tty.  But only bash 3.x supports the pipefail
- # option, and we don't bother to handle the case for older bash versions.
--if set -o pipefail 2> /dev/null; then
--  try_trace() {
--    eval $add_env '"$@"' | cat
--  }
--else
--  try_trace() {
--    eval $add_env '"$@"'
--  }
--fi
-+try_trace() {
-+  eval $add_env '"$@"'
-+}
+@@ -121,8 +121,8 @@
  
  case $# in
  0)