Rebase Remove-bashisms-from-runtime-scripts.patch

Signed-off-by: Ritesh Raj Sarraf <ritesh.sarraf@collabora.com>

debian/patches/apertis/Remove-bashisms-from-runtime-scripts.patch

@@ -13,17 +13,15 @@ Signed-off-by: Denis Pynkin <denis.pynkin@collabora.com>
  timezone/tzselect.ksh |  2 +-
  2 files changed, 16 insertions(+), 16 deletions(-)
 
-diff --git a/elf/ldd.bash.in b/elf/ldd.bash.in
-index be9e28b8..6015d4db 100644
 --- a/elf/ldd.bash.in
 +++ b/elf/ldd.bash.in
 @@ -1,4 +1,4 @@
--#! @BASH@
-+#! /bin/sh
- # Copyright (C) 1996-2020 Free Software Foundation, Inc.
+-#!/bin/bash
++#!/bin/sh
+ # Copyright (C) 1996-2022 Free Software Foundation, Inc.
  # This file is part of the GNU C Library.
  
-@@ -35,16 +35,16 @@ while test $# -gt 0; do
+@@ -35,16 +35,16 @@
    case "$1" in
    --vers | --versi | --versio | --version)
      echo 'ldd @PKGVERSION@@VERSION@'
@@ -31,7 +29,7 @@ index be9e28b8..6015d4db 100644
 +    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.
- " "2020"
+ " "2022"
 -    printf $"Written by %s and %s.
 +    printf "Written by %s and %s.
  " "Roland McGrath" "Ulrich Drepper"
@@ -43,7 +41,7 @@ index be9e28b8..6015d4db 100644
        --help              print this help and exit
        --version           print version information and exit
    -d, --data-relocs       process data relocations
-@@ -52,7 +52,7 @@ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+@@ -52,7 +52,7 @@
    -u, --unused            print unused direct dependencies
    -v, --verbose           print all information
  "
@@ -52,7 +50,7 @@ index be9e28b8..6015d4db 100644
        "@REPORT_BUGS_TO@"
      exit 0
      ;;
-@@ -77,15 +77,15 @@ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+@@ -77,15 +77,15 @@
      shift
      ;;
    --v | --ve | --ver)
@@ -71,7 +69,7 @@ index be9e28b8..6015d4db 100644
      exit 1
      ;;
    *)
-@@ -121,8 +121,8 @@ try_trace() (
+@@ -121,8 +121,8 @@
  
  case $# in
  0)
@@ -82,7 +80,7 @@ index be9e28b8..6015d4db 100644
    exit 1
    ;;
  1)
-@@ -144,10 +144,10 @@ for file do
+@@ -144,10 +144,10 @@
       ;;
    esac
    if test ! -e "$file"; then
@@ -95,7 +93,7 @@ index be9e28b8..6015d4db 100644
      result=1
    elif test -r "$file"; then
      RTLD=
-@@ -168,7 +168,7 @@ for file do
+@@ -168,7 +168,7 @@
      1)
        # This can be a non-ELF binary or no binary at all.
        nonelf "$file" || {
@@ -104,7 +102,7 @@ index be9e28b8..6015d4db 100644
  	result=1
        }
        ;;
-@@ -176,12 +176,12 @@ for file do
+@@ -176,12 +176,12 @@
        try_trace "$RTLD" "$file" || result=1
        ;;
      *)
@@ -119,8 +117,6 @@ index be9e28b8..6015d4db 100644
      result=1
    fi
  done
-diff --git a/timezone/tzselect.ksh b/timezone/tzselect.ksh
-index 18fce27e..cc08efb0 100755
 --- a/timezone/tzselect.ksh
 +++ b/timezone/tzselect.ksh
 @@ -1,4 +1,4 @@
@@ -129,6 +125,3 @@ index 18fce27e..cc08efb0 100755
  # Ask the user about the time zone, and output the resulting TZ value to stdout.
  # Interact with the user via stderr and stdin.
  
--- 
-2.20.1
-