package/security/libgpg-error/hotfix.patch

   1 # --- T2-COPYRIGHT-NOTE-BEGIN ---
   2 # This copyright note is auto-generated by scripts/Create-CopyPatch.
   3 #
   4 # T2 SDE: package/*/libgpg-error/hotfix.patch
   5 # Copyright (C) 2021 The T2 SDE Project
   6 #
   7 # More information can be found in the files COPYING and README.
   8 #
   9 # This patch file is dual-licensed. It is available under the license the
  10 # patched project is licensed under, as long as it is an OpenSource license
  11 # as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
  12 # of the GNU General Public License as published by the Free Software
  13 # Foundation; either version 2 of the License, or (at your option) any later
  14 # version.
  15 # --- T2-COPYRIGHT-NOTE-END ---
  16
  17 --- libgpg-error-1.42/src/gen-lock-obj.sh       2021-03-04 11:05:29.000000000 +0100
  18 +++ libgpg-error-1.41/src/gen-lock-obj.sh       2020-05-29 14:27:14.000000000 +0200
  19 @@ -2,7 +2,7 @@
  20  #
  21  # gen-lock-obj.sh - Build tool to construct the lock object.
  22  #
  23 -# Copyright (C) 2020, 2021  g10 Code GmbH
  24 +# Copyright (C) 2020 g10 Code GmbH
  25  #
  26  # This file is part of libgpg-error.
  27  #
  28 @@ -38,29 +38,6 @@
  29  #     AWK=gawk ./gen-lock-obj.sh
  30  #
  31
  32 -if test -n `echo -n`; then
  33 -    ECHO_C='\c'
  34 -    ECHO_N=''
  35 -else
  36 -    ECHO_C=''
  37 -    ECHO_N='-n'
  38 -fi
  39 -
  40 -if test "$1" = --disable-threads; then
  41 -    cat <<EOF
  42 -## lock-obj-pub.$host.h - NO LOCK SUPPORT
  43 -## File created by gen-lock-obj.sh - DO NOT EDIT
  44 -## To be included by mkheader into gpg-error.h
  45 -
  46 -/* Dummy object - no locking available.  */
  47 -typedef struct
  48 -{
  49 -  long _vers;
  50 -} gpgrt_lock_t;
  51 -
  52 -#define GPGRT_LOCK_INITIALIZER {-1}
  53 -EOF
  54 -else
  55  AWK_VERSION_OUTPUT=$($AWK 'BEGIN { print PROCINFO["version"] }')
  56  if test -n "$AWK_VERSION_OUTPUT"; then
  57      # It's GNU awk, which supports PROCINFO.
  58 @@ -107,21 +84,20 @@
  59  #     USE_LONG_DOUBLE_FOR_ALIGNMENT
  60  #
  61
  62 -echo ${ECHO_N} "#define GPGRT_LOCK_INITIALIZER {$LOCK_ABI_VERSION,{{${ECHO_C}"
  63 +echo -n "#define GPGRT_LOCK_INITIALIZER {$LOCK_ABI_VERSION,{{"
  64
  65  i=0
  66  while test "$i" -lt $ac_mtx_size; do
  67      if test "$i" -ne 0 -a "$(( $i % 8 ))" -eq 0; then
  68          echo ' \'
  69 -        echo ${ECHO_N} "                                    ${ECHO_C}"
  70 +        echo -n "                                    "
  71      fi
  72 -    echo ${ECHO_N} "0${ECHO_C}"
  73 +    echo -n '0'
  74      if test "$i" -lt $(($ac_mtx_size - 1)); then
  75 -        echo ${ECHO_N} ",${ECHO_C}"
  76 +        echo -n ','
  77      fi
  78      i=$(( i + 1 ))
  79  done
  80 -fi
  81
  82  cat <<'EOF'
  83  }}}