From e91bcaf973d4539f653a3c3bc2a976e6ba473a61 Mon Sep 17 00:00:00 2001
From: Akira Ajisaka <aajisaka@apache.org>
Date: Sat, 30 May 2020 17:13:22 +0900
Subject: [PATCH 1/4] HADOOP-17056. shelldocs fails in hadoop-common.

---
 dev-support/bin/yetus-wrapper | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-support/bin/yetus-wrapper b/dev-support/bin/yetus-wrapper
index b0f71f105d85e..57605d6b2203c 100755
--- a/dev-support/bin/yetus-wrapper
+++ b/dev-support/bin/yetus-wrapper
@@ -161,11 +161,11 @@ if [[ -n "${GPGBIN}" ]]; then
     yetus_error "ERROR: yetus-dl: unable to fetch ${BASEURL}/${TARBALL}.gz.asc"
     exit 1
   fi
-  if ! "${GPGBIN}" --homedir "${HADOOP_PATCHPROCESS}/.gpg" --import "${HADOOP_PATCHPROCESS}/KEYS_YETUS" >/dev/null 2>&1; then
+  if ! "${GPGBIN}" --homedir "${HADOOP_PATCHPROCESS}/.gpg" --import "${HADOOP_PATCHPROCESS}/KEYS_YETUS" ; then
     yetus_error "ERROR: yetus-dl: gpg unable to import ${HADOOP_PATCHPROCESS}/KEYS_YETUS"
     exit 1
   fi
-  if ! "${GPGBIN}" --homedir "${HADOOP_PATCHPROCESS}/.gpg" --verify "${TARBALL}.gz.asc" >/dev/null 2>&1; then
+  if ! "${GPGBIN}" --homedir "${HADOOP_PATCHPROCESS}/.gpg" --verify "${TARBALL}.gz.asc" ; then
      yetus_error "ERROR: yetus-dl: gpg verify of tarball in ${HADOOP_PATCHPROCESS} failed"
      exit 1
    fi

From 27d0df9bb0d9578b6b4031b023abd6c9f0fb48fa Mon Sep 17 00:00:00 2001
From: Akira Ajisaka <aajisaka@apache.org>
Date: Sat, 30 May 2020 17:15:57 +0900
Subject: [PATCH 2/4] Edit hadoop-functions.sh to kick shelldocs

---
 .../hadoop-common/src/main/bin/hadoop-functions.sh               | 1 +
 1 file changed, 1 insertion(+)

diff --git a/hadoop-common-project/hadoop-common/src/main/bin/hadoop-functions.sh b/hadoop-common-project/hadoop-common/src/main/bin/hadoop-functions.sh
index ff9db5fd8dceb..ea0040d23d911 100755
--- a/hadoop-common-project/hadoop-common/src/main/bin/hadoop-functions.sh
+++ b/hadoop-common-project/hadoop-common/src/main/bin/hadoop-functions.sh
@@ -14,6 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+
 # we need to declare this globally as an array, which can only
 # be done outside of a function
 declare -a HADOOP_SUBCMD_USAGE

From 8f27157f47c1d8af7dc9abf247a3de526f6a7727 Mon Sep 17 00:00:00 2001
From: Akira Ajisaka <aajisaka@apache.org>
Date: Mon, 1 Jun 2020 14:23:45 +0900
Subject: [PATCH 3/4] Verbose log

---
 dev-support/bin/yetus-wrapper | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-support/bin/yetus-wrapper b/dev-support/bin/yetus-wrapper
index 57605d6b2203c..3c81f70f57f75 100755
--- a/dev-support/bin/yetus-wrapper
+++ b/dev-support/bin/yetus-wrapper
@@ -161,11 +161,11 @@ if [[ -n "${GPGBIN}" ]]; then
     yetus_error "ERROR: yetus-dl: unable to fetch ${BASEURL}/${TARBALL}.gz.asc"
     exit 1
   fi
-  if ! "${GPGBIN}" --homedir "${HADOOP_PATCHPROCESS}/.gpg" --import "${HADOOP_PATCHPROCESS}/KEYS_YETUS" ; then
+  if ! "${GPGBIN}" --verbose --homedir "${HADOOP_PATCHPROCESS}/.gpg" --import "${HADOOP_PATCHPROCESS}/KEYS_YETUS" ; then
     yetus_error "ERROR: yetus-dl: gpg unable to import ${HADOOP_PATCHPROCESS}/KEYS_YETUS"
     exit 1
   fi
-  if ! "${GPGBIN}" --homedir "${HADOOP_PATCHPROCESS}/.gpg" --verify "${TARBALL}.gz.asc" ; then
+  if ! "${GPGBIN}" --verbose --homedir "${HADOOP_PATCHPROCESS}/.gpg" --verify "${TARBALL}.gz.asc" ; then
      yetus_error "ERROR: yetus-dl: gpg verify of tarball in ${HADOOP_PATCHPROCESS} failed"
      exit 1
    fi

From 9b22338e9c41555badf0ff4fcae580001faa8893 Mon Sep 17 00:00:00 2001
From: Akira Ajisaka <aajisaka@apache.org>
Date: Tue, 2 Jun 2020 14:28:31 +0900
Subject: [PATCH 4/4] Start gpg-agent to check failure logs when launching
 gpg-agent

---
 dev-support/bin/yetus-wrapper | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dev-support/bin/yetus-wrapper b/dev-support/bin/yetus-wrapper
index 3c81f70f57f75..bfd7ff4c57465 100755
--- a/dev-support/bin/yetus-wrapper
+++ b/dev-support/bin/yetus-wrapper
@@ -161,6 +161,7 @@ if [[ -n "${GPGBIN}" ]]; then
     yetus_error "ERROR: yetus-dl: unable to fetch ${BASEURL}/${TARBALL}.gz.asc"
     exit 1
   fi
+  gpg-agent --verbose --homedir "${HADOOP_PATCHPROCESS}/.gpg" --daemon
   if ! "${GPGBIN}" --verbose --homedir "${HADOOP_PATCHPROCESS}/.gpg" --import "${HADOOP_PATCHPROCESS}/KEYS_YETUS" ; then
     yetus_error "ERROR: yetus-dl: gpg unable to import ${HADOOP_PATCHPROCESS}/KEYS_YETUS"
     exit 1