Avoid re-expansion in ${sort } CVE-2019-13917 OVE-20190718-0006

[exim.git] / release-process / scripts / sign_exim_packages

diff --git a/release-process/scripts/sign_exim_packages b/release-process/scripts/sign_exim_packages
index a504ea82637cb652013a05b3015ae55e7ab1c6cb..e768409968faa4e113c7db2462a56b9ddd8a7294 100755 (executable)
--- a/release-process/scripts/sign_exim_packages
+++ b/release-process/scripts/sign_exim_packages
@@ -40,24 +40,24 @@ case "${EXIM_KEY:-default}" in
 default|DEFAULT)
        gpg_sign() { ${GPG_COMMAND} --detach-sig --armor "${1:?}" ; }
        ;;
 default|DEFAULT)
        gpg_sign() { ${GPG_COMMAND} --detach-sig --armor "${1:?}" ; }
        ;;

-*) 
+*)

        gpg_sign() { ${GPG_COMMAND} --local-user "${EXIM_KEY}" --detach-sig --armor "${1:?}" ; }
        ;;
 esac
 
 cd_to() { echo "Working in: $1"; cd "$1"; }
 
        gpg_sign() { ${GPG_COMMAND} --local-user "${EXIM_KEY}" --detach-sig --armor "${1:?}" ; }
        ;;
 esac
 
 cd_to() { echo "Working in: $1"; cd "$1"; }
 

-okay=false
-if [ -d ../../release-process ] && [ "${PWD##*/}" = "pkgs" ]; then
-       okay=true # we are in right dir
-elif [ -d release-process ]; then
-       b="$(find . -maxdepth 1 -name 'exim-packaging-*' | sort | tail -n 1)"
-       if [ ".$b" != "." ]; then
-               cd_to "$b/pkgs"
-               okay=true
-       fi
-fi
-if ! $okay; then
+#okay=false
+#if [ -d ../../release-process ] && [ "${PWD##*/}" = "pkgs" ]; then
+#      okay=true # we are in right dir
+#elif [ -d release-process ]; then
+#      b="$(find . -maxdepth 1 -name 'exim-packaging-*' | sort | tail -n 1)"
+#      if [ ".$b" != "." ]; then
+#              cd_to "$b/pkgs"
+#              okay=true
+#      fi
+#fi
+#if ! $okay; then

        if [ -d "${1:?need a directory to look in}" ]; then
                cd_to "$1"
                shift
        if [ -d "${1:?need a directory to look in}" ]; then
                cd_to "$1"
                shift


@@ -65,11 +65,10 @@ if ! $okay; then
                printf "%s: %s\n" >&2 "$(basename "$0")" "where should I be looking"
                exit 1
        fi
                printf "%s: %s\n" >&2 "$(basename "$0")" "where should I be looking"
                exit 1
        fi

-fi
+#fi

 
 # Assumes no whitespace (strictly, $IFS) in filenames, which we're okay with
 set $(find . -name '*.asc' -prune -o -type f -print | cut -c 3- | sort)
 
 # Assumes no whitespace (strictly, $IFS) in filenames, which we're okay with
 set $(find . -name '*.asc' -prune -o -type f -print | cut -c 3- | sort)

-

 for FILE
 do
        echo "Signing: $FILE"
 for FILE
 do
        echo "Signing: $FILE"