[bigtop] branch master updated: BIGTOP-3410. Fix bigtop-tomcat build failure due to downloading problem. (#677)

[se...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

sekikn pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/bigtop.git


The following commit(s) were added to refs/heads/master by this push:
     new 2c3ae35  BIGTOP-3410. Fix bigtop-tomcat build failure due to downloading problem. (#677)
2c3ae35 is described below

commit 2c3ae35a0e9cde207523abac327285201349276a
Author: Kengo Seki <se...@apache.org>
AuthorDate: Wed Sep 23 12:56:52 2020 +0900

    BIGTOP-3410. Fix bigtop-tomcat build failure due to downloading problem. (#677)
---
 ...0-4ced1c0b246339eda067637d6b873b07d37e9e9d.diff | 21 +++++++++++++++
 ...1-211a2b049e04ccbe4d411b7a7eff65ffdeace27d.diff | 31 ++++++++++++++++++++++
 .../src/rpm/bigtop-tomcat/SPECS/bigtop-tomcat.spec |  3 +++
 3 files changed, 55 insertions(+)

diff --git a/bigtop-packages/src/common/bigtop-tomcat/patch0-4ced1c0b246339eda067637d6b873b07d37e9e9d.diff b/bigtop-packages/src/common/bigtop-tomcat/patch0-4ced1c0b246339eda067637d6b873b07d37e9e9d.diff
new file mode 100644
index 0000000..9a3affb
--- /dev/null
+++ b/bigtop-packages/src/common/bigtop-tomcat/patch0-4ced1c0b246339eda067637d6b873b07d37e9e9d.diff
@@ -0,0 +1,21 @@
+diff --git a/build.properties.default b/build.properties.default
+index 565eb53603..57ec1c65ff 100644
+--- a/build.properties.default
++++ b/build.properties.default
+@@ -145,13 +145,13 @@ jdt.loc.1=http://archive.eclipse.org/eclipse/downloads/drops4/${jdt.release}/ecj
+ jdt.loc.2=http://download.eclipse.org/eclipse/downloads/drops4/${jdt.release}/ecj-${jdt.version}.jar
+ 
+ # ----- Tomcat native library -----
+-tomcat-native.version=1.2.24
++tomcat-native.version=1.2.25
+ tomcat-native.src.checksum.enabled=true
+ tomcat-native.src.checksum.algorithm=SHA-512
+-tomcat-native.src.checksum.value=5dae151a60f8bd5a9a29d63eca838c77174426025ee65a826f0698943494dd3656d50bcd417e220a926b9ce111ea167043d4b806264030e951873d06767b3d6f
++tomcat-native.src.checksum.value=e121c0a18c51b5f952833df44c3a0add1f9a6e1b61e300abbafa0bc7e8f32296e64c9f81e9ad7389c1bd24abc40739e4726a56158d08e33b7ef00e5fa8a1d33d
+ tomcat-native.win.checksum.enabled=true
+ tomcat-native.win.checksum.algorithm=SHA-512
+-tomcat-native.win.checksum.value=c2d581f1f602dce61abc36370ce485c805b90863301555fc3d44362b655f34f950d0096fad22895374086f33d4505792c27f83fe35d4aeb87a08215bea8ae74a
++tomcat-native.win.checksum.value=0171a7ff3db708c2051e1f7a188286c5174091e208e1822c3027dd7aa415562c94be8d397a61bbe57bf9ee40ab52e1b346123fb7f2b170a43c60e8596eb65618
+ tomcat-native.home=${base.path}/tomcat-native-${tomcat-native.version}
+ tomcat-native.tar.gz=${tomcat-native.home}/tomcat-native.tar.gz
+ tomcat-native.loc.1=${base-tomcat.loc.1}/tomcat-connectors/native/${tomcat-native.version}/source/tomcat-native-${tomcat-native.version}-src.tar.gz
diff --git a/bigtop-packages/src/common/bigtop-tomcat/patch1-211a2b049e04ccbe4d411b7a7eff65ffdeace27d.diff b/bigtop-packages/src/common/bigtop-tomcat/patch1-211a2b049e04ccbe4d411b7a7eff65ffdeace27d.diff
new file mode 100644
index 0000000..0911a8f
--- /dev/null
+++ b/bigtop-packages/src/common/bigtop-tomcat/patch1-211a2b049e04ccbe4d411b7a7eff65ffdeace27d.diff
@@ -0,0 +1,31 @@
+diff --git a/build.properties.default b/build.properties.default
+index 0d70217f69..e506f8e840 100644
+--- a/build.properties.default
++++ b/build.properties.default
+@@ -179,20 +179,20 @@ nsis.nsdialogs.dll=${nsis.home}/Plugins/${nsis.arch.dir}nsDialogs.dll
+ nsis.loc=${base-sf.loc}/nsis/nsis-${nsis.version}.zip
+ 
+ # ----- Commons Daemon, version 1.2.0 or later -----
+-commons-daemon.version=1.2.2
++commons-daemon.version=1.2.3
+ 
+-# checksum for commons-daemon-1.2.1-bin.tar.gz
++# checksum for commons-daemon-1.2.3-bin.tar.gz
+ commons-daemon.bin.checksum.enabled=true
+ commons-daemon.bin.checksum.algorithm=SHA-512
+-commons-daemon.bin.checksum.value=f9fb917aaf398f61c42796eb4168664e076f81bc3fae82790eb39c723f03a1e7cbc2304161938d8d8993b7fbb718214b94740dbf9679f6ef93e85b5a2e861761
++commons-daemon.bin.checksum.value=0d7ced8f5d6fd3e8781146ee47c37046c6ccd2f364138f89d137eea5f0255e1b2afae5faf7005164c077087cb08203fd44478d5c14c57c7df449feb324443447
+ 
+-# checksums for commons-daemon-1.2.1-native-src.tar.gz, commons-daemon-1.2.1-bin-windows.zip
++# checksums for commons-daemon-1.2.3-native-src.tar.gz, commons-daemon-1.2.3-bin-windows.zip
+ commons-daemon.native.src.checksum.enabled=true
+ commons-daemon.native.src.checksum.algorithm=SHA-512
+-commons-daemon.native.src.checksum.value=45ad856a8a6b024e80905cfac5a741a57ab86479ecd65adab9641f5444d3a2362bb13d1ea38ec3db5eb89d30c29f2f6d3b0e48cbf2f60c081c4df2451acd1ab4
++commons-daemon.native.src.checksum.value=5f223ee3c133f673fe698f575d7cfb15f27fbbb8acf2e6db292e0e1690a20d636b35312187aa1091b315062f2434788eec9cde167e2ae1d7e673ebdd2ddb41f6
+ commons-daemon.native.win.checksum.enabled=true
+ commons-daemon.native.win.checksum.algorithm=SHA-512
+-commons-daemon.native.win.checksum.value=16e7a6fc5bc83ada3bcf9e10cc69ef21400dc019d1f2be00caec0bce72c3bc5a7c72116878e12b4851a15bb473c0948a9c14e1a86b6addcefa6c20638dbcc88c
++commons-daemon.native.win.checksum.value=c79ee31a367addc5d49db474aabe084cebcd4f7f0f0f9ddc7999c02d4de5cd6ace6d5f55a230f399cfaaf780179b6f9808739efc7500b18c27cdb963daaef8d5
+ 
+ commons-daemon.home=${base.path}/commons-daemon-${commons-daemon.version}
+ commons-daemon.jar=${commons-daemon.home}/commons-daemon-${commons-daemon.version}.jar
diff --git a/bigtop-packages/src/rpm/bigtop-tomcat/SPECS/bigtop-tomcat.spec b/bigtop-packages/src/rpm/bigtop-tomcat/SPECS/bigtop-tomcat.spec
index 1f4392b..09248af 100644
--- a/bigtop-packages/src/rpm/bigtop-tomcat/SPECS/bigtop-tomcat.spec
+++ b/bigtop-packages/src/rpm/bigtop-tomcat/SPECS/bigtop-tomcat.spec
@@ -32,6 +32,7 @@ License: ASL 2.0
 Source0: apache-tomcat-%{bigtop_tomcat_base_version}.tar.gz
 Source1: do-component-build
 Source2: install_tomcat.sh
+#BIGTOP_PATCH_FILES
 Requires: bigtop-utils >= 0.7
 
 %description 
@@ -41,6 +42,8 @@ Java Servlet and JavaServer Pages technologies.
 %prep
 %setup -n apache-tomcat-%{bigtop_tomcat_base_version}-src
 
+#BIGTOP_PATCH_COMMANDS
+
 %build
 bash %{SOURCE1}