From 1e3277e4b3b4294b572be21ce0055792426bacbc Mon Sep 17 00:00:00 2001
From: Sutou Kouhei <kou@clear-code.com>
Date: Sat, 10 Oct 2020 06:45:26 +0900
Subject: [PATCH 1/3] [C++][Flight] Disable -Werror carefully

If we replace "-Werror" with "", "-Werror=SOMETHING" is
"=SOMETHING". "=SOMETHING" always causes build error because
"=SOMETHING" is treated as an input file.

For example, CentOS 8 RPM build uses "-Werror=format-security".
---
 cpp/src/arrow/flight/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cpp/src/arrow/flight/CMakeLists.txt b/cpp/src/arrow/flight/CMakeLists.txt
index 9d0f8614dd7..1a1ebe91c8c 100644
--- a/cpp/src/arrow/flight/CMakeLists.txt
+++ b/cpp/src/arrow/flight/CMakeLists.txt
@@ -65,7 +65,7 @@ add_custom_target(flight_grpc_gen ALL DEPENDS ${FLIGHT_GENERATED_PROTO_FILES})
 # way to pass -isystem $GRPC_INCLUDE_DIR instead of -I$GRPC_INCLUDE_DIR
 set(CMAKE_CXX_FLAGS_BACKUP "${CMAKE_CXX_FLAGS}")
 string(REPLACE "/WX" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
-string(REPLACE "-Werror" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
+string(REPLACE "-Werror " " " CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
 
 # Probe the version of gRPC being used to see if it supports disabling server
 # verification when using TLS.

From 953af85d06849db05f95953ce98400e309017cfb Mon Sep 17 00:00:00 2001
From: Sutou Kouhei <kou@clear-code.com>
Date: Sat, 10 Oct 2020 19:00:59 +0900
Subject: [PATCH 2/3] Disable S3 because it's fragile on GitHub Actions and
 Travis CI

---
 dev/tasks/linux-packages/apache-arrow/yum/arrow.spec.in | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/dev/tasks/linux-packages/apache-arrow/yum/arrow.spec.in b/dev/tasks/linux-packages/apache-arrow/yum/arrow.spec.in
index 61db8853818..7a44bfd388d 100644
--- a/dev/tasks/linux-packages/apache-arrow/yum/arrow.spec.in
+++ b/dev/tasks/linux-packages/apache-arrow/yum/arrow.spec.in
@@ -40,7 +40,10 @@
 %define use_gandiva (%{_centos_ver} >= 8 && %{_arch} != "aarch64")
 %define use_ninja (%{_centos_ver} >= 8)
 %define use_parquet (%{_centos_ver} >= 7)
-%define use_s3 (%{_centos_ver} >= 8)
+# TODO: Enable this. This works on local but is fragile on GitHub Actions and
+# Travis CI.
+# %define use_s3 (%{_centos_ver} >= 8)
+%define use_s3 0
 
 %define use_glib (%{_centos_ver} >= 7)
 %define use_meson (%{_centos_ver} >= 8)

From 20a2949814ce921b9d8996bf94d7a9bcd3952241 Mon Sep 17 00:00:00 2001
From: Sutou Kouhei <kou@clear-code.com>
Date: Sat, 10 Oct 2020 20:06:42 +0900
Subject: [PATCH 3/3] Fix shell redirect syntax

---
 cpp/build-support/run-test.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cpp/build-support/run-test.sh b/cpp/build-support/run-test.sh
index 32a7ab90f8e..1cda600d154 100755
--- a/cpp/build-support/run-test.sh
+++ b/cpp/build-support/run-test.sh
@@ -96,7 +96,7 @@ function run_test() {
   # even when retries are successful.
   rm -f $XMLFILE
 
-  $TEST_EXECUTABLE "$@" 2>&1 $LOGFILE.raw
+  $TEST_EXECUTABLE "$@" > $LOGFILE.raw 2>&1
   STATUS=$?
   cat $LOGFILE.raw \
     | ${PYTHON:-python} $ROOT/build-support/asan_symbolize.py \