- rel 2; conflicts with older openssh server which doesn't have all needed syscalls...

[packages/glibc.git] / glibc-no-bash-nls.patch

diff --git a/glibc-no-bash-nls.patch b/glibc-no-bash-nls.patch
index 29a2f9311755de81957d0612ef0331182ea75e98..6b7214f0718402ee5136282b79beba69754dc415 100644 (file)
--- a/glibc-no-bash-nls.patch
+++ b/glibc-no-bash-nls.patch
@@ -1,9 +1,9 @@
---- glibc-2.10.1/elf/ldd.bash.in       2009-06-08 23:02:27.663745478 +0300
-+++ glibc-2.10.1/elf/ldd.bash.in       2009-06-08 23:04:15.706861781 +0300
+--- glibc-2.31/elf/ldd.bash.in.orig    2020-02-01 12:52:50.000000000 +0100
++++ glibc-2.31/elf/ldd.bash.in 2020-02-01 14:02:07.365985940 +0100
 @@ -1,4 +1,4 @@
 -#! @BASH@
-+#! /bin/sh
- # Copyright (C) 1996-2014 Free Software Foundation, Inc.
++#!/bin/sh
+ # Copyright (C) 1996-2020 Free Software Foundation, Inc.
  # This file is part of the GNU C Library.
  
 @@ -35,16 +35,16 @@
@@ -14,7 +14,7 @@
 +    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.
- " "2014"
+ " "2020"
 -    printf $"Written by %s and %s.
 +    printf "Written by %s and %s.
  " "Roland McGrath" "Ulrich Drepper"
@@ -35,7 +35,7 @@
        "@REPORT_BUGS_TO@"
      exit 0
      ;;
-@@ -79,15 +79,15 @@
+@@ -77,15 +77,15 @@
      shift
      ;;
    --v | --ve | --ver)
@@ -65,7 +65,7 @@
    exit 1
    ;;
  1)
-@@ -147,13 +141,13 @@
+@@ -144,13 +144,13 @@
       ;;
    esac
    if test ! -e "$file"; then
@@ -82,16 +82,16 @@
  warning: you do not have execution permission for" "\`$file'" >&2
      RTLD=
      ret=1
-@@ -182,7 +176,7 @@
+@@ -167,7 +167,7 @@
      1)
        # This can be a non-ELF binary or no binary at all.
        nonelf "$file" || {
--      echo $" not a dynamic executable"
-+      echo "  not a dynamic executable"
+-      echo $" not a dynamic executable" >&2
++      echo "  not a dynamic executable" >&2
        result=1
        }
        ;;
-@@ -190,12 +184,12 @@
+@@ -175,12 +175,12 @@
        try_trace "$RTLD" "$file" || result=1
        ;;
      *)
@@ -106,12 +106,12 @@
      result=1
    fi
  done
---- glibc-2.20/elf/sotruss.sh.orig     2015-01-10 09:10:21.870731775 +0100
-+++ glibc-2.20/elf/sotruss.sh  2015-01-10 09:12:10.734060537 +0100
+--- glibc-2.31/elf/sotruss.sh.orig     2020-02-01 13:38:05.830462075 +0100
++++ glibc-2.31/elf/sotruss.sh  2020-02-01 14:06:25.601253626 +0100
 @@ -1,4 +1,4 @@
 -#! @BASH@
-+#! /bin/sh
- # Copyright (C) 2011-2014 Free Software Foundation, Inc.
++#!/bin/sh
+ # Copyright (C) 2011-2020 Free Software Foundation, Inc.
  # This file is part of the GNU C Library.
  
 @@ -29,7 +29,7 @@
@@ -166,7 +166,7 @@
 +    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.
- " "2014"
+ " "2020"
 -    printf $"Written by %s.\n" "Ulrich Drepper"
 +    printf "Written by %s.\n" "Ulrich Drepper"
      exit 0