1. photon
  2. Commit a33575303d1bd2bd4e8c5a661594a5633f536554
Browse code

update openjdk to 1.8.0.102

Change-Id: I6aeda6246a8db9d131b330f021e9bf01de306abd
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/1477
Tested-by: gerrit-photon <photon-checkins@vmware.com>
Reviewed-by: suezzelur <anishs@vmware.com>

ppadmavilasom authored on 2016/10/05 14:12:13
Showing 6 changed files
SPECS/ant-contrib/ant-contrib.spec
History View file @ a335753
... ... 
@@ -1,7 +1,7 @@
1 1 
 Summary:	Ant contrib
2 2 
 Name:		ant-contrib
3 3 
 Version:	1.0b3
4 
-Release:	7%{?dist}
4 
+Release:	8%{?dist}
5 5 
 License:	Apache
6 6 
 URL:		http://ant-contrib.sourceforget.net
7 7 
 Group:		Applications/System
... ... 
@@ -10,7 +10,7 @@ Distribution: 	Photon
10 10 
 BuildArch:      noarch
11 11 
 Source0:	http://dl.bintray.com/vmware/photon_release_1.0_TP1_x86_64/%{name}-%{version}-src.tar.gz
12 12 
 %define sha1 ant-contrib=b28d2bf18656b263611187fa9fbb95cec93d47c8
13 
-Requires: openjre >= 1.8.0.45, apache-ant >= 1.9.6
13 
+Requires: openjre >= 1.8.0.102, apache-ant >= 1.9.6
14 14 
 BuildRequires: openjre >= 1.8.0.45, apache-ant >= 1.9.6
15 15 
 BuildRequires: openjdk >= 1.8.0.45
16 16 
 %define _prefix /var/opt/ant-contrib
... ... 
@@ -23,7 +23,7 @@ The Ant Contrib project is a collection of tasks for Apache Ant.
23 23 
 %setup -n %{name}
24 24 
 %build
25 25 
 ANT_HOME=/var/opt/apache-ant-1.9.6
26 
-export JAVA_HOME=/var/opt/OpenJDK-1.8.0.92-bin
26 
+export JAVA_HOME=/var/opt/OpenJDK-1.8.0.102-bin
27 27 
 mkdir -p -m 700 %{_prefix}
28 28 
 $ANT_HOME/bin/ant -Ddist.dir="%{_prefix}" -Dproject.version="1.0b3" dist
29 29 
 %install
... ... 
@@ -38,6 +38,8 @@ cd %{buildroot}/var/opt && tar xvzf %{_prefix}/ant-contrib-1.0b3-bin.tar.gz --wi
38 38 
 %{_prefix}/lib/*.jar
39 39
40 40 
 %changelog
41 
+*   Tue Oct 04 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 1.0b3-8
42 
+-   Updated JAVA_HOME path to point to latest.
41 43 
 *	Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 1.0b3-7
42 44 
 -	GA - Bump release of all rpms
43 45 
 *   Fri May 20 2016 Divya Thaluru<dthaluru@vmware.com> 1.0b3-6
SPECS/apache-ant/apache-ant.spec
History View file @ a335753
... ... 
@@ -1,7 +1,7 @@
1 1 
 Summary:	Apache Ant
2 2 
 Name:		apache-ant
3 3 
 Version:	1.9.6
4 
-Release:	3%{?dist}
4 
+Release:	4%{?dist}
5 5 
 License:	Apache
6 6 
 URL:		http://ant.apache.org
7 7 
 Group:		Applications/System
... ... 
@@ -14,7 +14,7 @@ Source1:	http://hamcrest.googlecode.com/files/hamcrest-1.3.tar.gz
14 14 
 %define sha1 hamcrest=f0ab4d66186b894a06d89d103c5225cf53697db3
15 15 
 Source2:    http://dl.bintray.com/vmware/photon_sources/1.0/maven-ant-tasks-2.1.3.tar.gz
16 16 
 %define sha1 maven-ant-tasks=f38c0cc7b38007b09638366dbaa4ee902d9c255b
17 
-Requires: openjre >= 1.8.0.45, python2
17 
+Requires: openjre >= 1.8.0.102, python2
18 18 
 BuildRequires: openjre >= 1.8.0.45
19 19 
 BuildRequires: openjdk >= 1.8.0.45
20 20 
 %define _prefix /var/opt/apache-ant-%{version}
... ... 
@@ -36,7 +36,7 @@ cp -v ./hamcrest-1.3/hamcrest-core-1.3.jar ./lib/optional
36 36
37 37 
 mkdir -p -m 700 $ANT_DIST_DIR
38 38
39 
-export JAVA_HOME=/var/opt/OpenJDK-1.8.0.92-bin
39 
+export JAVA_HOME=/var/opt/OpenJDK-1.8.0.102-bin
40 40
41 41 
 ./bootstrap.sh && ./build.sh -Ddist.dir=$ANT_DIST_DIR
42 42
... ... 
@@ -66,6 +66,8 @@ chmod 644 $MAVEN_ANT_TASKS_DIR/*
66 66 
 %{_prefix}/maven-ant-tasks/*
67 67
68 68 
 %changelog
69 
+*   Tue Oct 04 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 1.9.6-4
70 
+-   Updated JAVA_HOME path to point to latest JDK.
69 71 
 *	Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 1.9.6-3
70 72 
 -	GA - Bump release of all rpms
71 73 
 *   Fri May 20 2016 Divya Thaluru <dthaluru@vmware.com> 1.9.6-2
SPECS/apache-maven/apache-maven.spec
History View file @ a335753
... ... 
@@ -1,7 +1,7 @@
1 1 
 Summary:	Apache Maven
2 2 
 Name:		apache-maven
3 3 
 Version:	3.3.9
4 
-Release:	4%{?dist}
4 
+Release:	5%{?dist}
5 5 
 License:	Apache
6 6 
 URL:		http://maven.apache.org
7 7 
 Group:		Applications/System
... ... 
@@ -10,7 +10,7 @@ Distribution: 	Photon
10 10 
 BuildArch:       noarch
11 11 
 Source0:	http://apache.mirrors.lucidnetworks.net//maven/source/%{name}-%{version}-src.tar.gz
12 12 
 %define sha1 apache-maven=1912316078f1f7041dd8cd2580f210d30f898162
13 
-Requires: openjre >= 1.8.0.45
13 
+Requires: openjre >= 1.8.0.102
14 14 
 BuildRequires: openjre >= 1.8.0.45, openjdk >= 1.8.0.45, apache-ant >= 1.9.6, wget >= 1.15
15 15
16 16 
 %define _prefix /var/opt/apache-maven-3.3.9
... ... 
@@ -28,7 +28,7 @@ find . -name build.xml | xargs sed -i 's/timeout="600000"/timeout="1200000"/g'
28 28 
 %build
29 29 
 MAVEN_DIST_DIR=/var/opt/apache-maven-3.3.9
30 30
31 
-export JAVA_HOME=/var/opt/OpenJDK-1.8.0.92-bin
31 
+export JAVA_HOME=/var/opt/OpenJDK-1.8.0.102-bin
32 32 
 export ANT_HOME=/var/opt/apache-ant-1.9.6
33 33 
 export PATH=$PATH:$ANT_HOME/bin
34 34
... ... 
@@ -62,6 +62,8 @@ echo 'export MAVEN_OPTS=-Xms256m' >> %{buildroot}/etc/profile.d/%{name}.sh
62 62 
 %{_prefix}/conf/toolchains.xml
63 63
64 64 
 %changelog
65 
+*   Tue Oct 04 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 3.3.9-5
66 
+-   Updated JAVA_HOME path to point to latest JDK.
65 67 
 *	Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 3.3.9-4
66 68 
 -	GA - Bump release of all rpms
67 69 
 *   Fri May 20 2016 Divya Thaluru <dthaluru@vmware.com> 3.3.9-3
SPECS/commons-daemon/commons-daemon.spec
History View file @ a335753
... ... 
@@ -1,7 +1,7 @@
1 1 
 Summary:	Apache Commons Daemon
2 2 
 Name:		commons-daemon
3 3 
 Version:	1.0.15
4 
-Release:	6%{?dist}
4 
+Release:	7%{?dist}
5 5 
 License:	Apache
6 6 
 URL:		http://commons.apache.org/proper/commons-daemon
7 7 
 Group:		Applications/System
... ... 
@@ -10,7 +10,7 @@ Distribution: 	Photon
10 10 
 BuildArch:      x86_64
11 11 
 Source0:	http://apache.mesi.com.ar//commons/daemon/source/commons-daemon-1.0.15-src.tar.gz
12 12 
 %define sha1 commons-daemon=ca6a448d1d214f714e214b35809a2117568970e3
13 
-Requires: openjre >= 1.8.0.45
13 
+Requires: openjre >= 1.8.0.102
14 14 
 BuildRequires: openjre >= 1.8.0.45, openjdk >= 1.8.0.45, apache-ant >= 1.9.6
15 15
16 16 
 %define _prefix /var/opt/%{name}-%{version}
... ... 
@@ -24,7 +24,7 @@ The JNA package contains libraries for interop from Java to native libraries.
24 24 
 %setup -q -n %{name}-%{version}-src
25 25 
 %build
26 26 
 ANT_HOME=/var/opt/apache-ant-1.9.6
27 
-export JAVA_HOME=/var/opt/OpenJDK-1.8.0.92-bin
27 
+export JAVA_HOME=/var/opt/OpenJDK-1.8.0.102-bin
28 28
29 29 
 $ANT_HOME/bin/ant dist
30 30
... ... 
@@ -58,6 +58,8 @@ chmod -R 755 $DIST_DIR
58 58 
 %{_prefix}/*.jar
59 59
60 60 
 %changelog
61 
+*   Tue Oct 04 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 1.0.15-7
62 
+-   Updated JAVA_HOME path to point to latest JDK.
61 63 
 *	Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 1.0.15-6
62 64 
 -	GA - Bump release of all rpms
63 65 
 *   Fri May 20 2016 Divya Thaluru<dthaluru@vmware.com> 1.0.15-5
SPECS/jna/jna.spec
History View file @ a335753
... ... 
@@ -1,7 +1,7 @@
1 1 
 Summary:	Java Native Access
2 2 
 Name:		jna
3 3 
 Version:	4.2.1
4 
-Release:	4%{?dist}
4 
+Release:	5%{?dist}
5 5 
 License:	Apache
6 6 
 URL:		http://github.com/twall/jna
7 7 
 Group:		Applications/System
... ... 
@@ -10,7 +10,7 @@ Distribution: 	Photon
10 10 
 BuildArch:      x86_64
11 11 
 Source0:	http://dl.bintray.com/vmware/photon_release_1.0_TP1_x86_64/%{name}-%{version}.tar.gz
12 12 
 %define sha1 jna=30a1132f9ca6b3222eccd380a3f4149aa7df3f59
13 
-Requires: openjre >= 1.8.0.45
13 
+Requires: openjre >= 1.8.0.102
14 14 
 BuildRequires: openjre >= 1.8.0.45, openjdk >= 1.8.0.45, apache-ant >= 1.9.6
15 15
16 16 
 %define _prefix /var/opt/jna-4.2.1
... ... 
@@ -31,7 +31,7 @@ Sources for JNA
31 31 
 %setup -q
32 32 
 %build
33 33 
 ANT_HOME=/var/opt/apache-ant-1.9.6
34 
-export JAVA_HOME=/var/opt/OpenJDK-1.8.0.92-bin
34 
+export JAVA_HOME=/var/opt/OpenJDK-1.8.0.102-bin
35 35
36 36 
 #disabling all tests
37 37 
 $ANT_HOME/bin/ant -Dcflags_extra.native=-DNO_JAWT -Dtests.exclude-patterns="**/*.java" -Drelease=true
... ... 
@@ -65,6 +65,8 @@ $ANT_HOME/bin/ant -Ddist=$JNA_DIST_DIR dist -Drelease=true
65 65 
 %{_prefix}/*sources.jar
66 66
67 67 
 %changelog
68 
+*   Tue Oct 04 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 4.2.1-5
69 
+-   Updated JAVA_HOME path to point to latest JDK.
68 70 
 *	Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 4.2.1-4
69 71 
 -	GA - Bump release of all rpms
70 72 
 *   Fri May 20 2016 Divya Thaluru<dthaluru@vmware.com> 4.2.1-3
SPECS/openjdk/openjdk.spec
History View file @ a335753
... ... 
@@ -1,22 +1,22 @@
1 1 
 %define _use_internal_dependency_generator 0
2 2 
 Summary:	OpenJDK
3 3 
 Name:		openjdk
4 
-Version:	1.8.0.92
5 
-Release:	3%{?dist}
4 
+Version:	1.8.0.102
5 
+Release:	1%{?dist}
6 6 
 License:	GNU GPL
7 7 
 URL:		https://openjdk.java.net
8 8 
 Group:		Development/Tools
9 9 
 Vendor:		VMware, Inc.
10 10 
 Distribution:   Photon
11 
-Source0:	http://anduin.linuxfromscratch.org/files/BLFS/OpenJDK-%{version}/OpenJDK-%{version}-x86_64-bin.tar.xz
12 
-%define sha1 OpenJDK=b6bfff08514bdb0fb5b46acd66b8ca884283cecb
11 
+Source0:	http://anduin.linuxfromscratch.org/files/BLFS/OpenJDK/OpenJDK-%{version}-x86_64-bin.tar.xz
12 
+%define sha1 OpenJDK=86e9d71f2ce36f54c9f80c7649cbc9ccaadb487a
13 13 
 Requires:       openjre = %{version}-%{release}
14 14 
 AutoReqProv: 	no
15 15 
 %description
16 16 
 The OpenJDK package installs java class library and javac java compiler.
17 17
18 18 
 %package	-n openjre
19 
-Summary:	Jave runtime environtment
19 
+Summary:	Java runtime environment
20 20 
 AutoReqProv: 	no
21 21 
 %description	-n openjre
22 22 
 It contains the libraries files for Java runtime environment
... ... 
@@ -136,6 +136,9 @@ rm -rf %{buildroot}/*
136 136 
 /var/opt/OpenJDK-%{version}-bin/src.zip
137 137
138 138 
 %changelog
139 
+*       Tue Oct 04 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 1.8.0.102-1
140 
+-       Update to 1.8.0.102, minor fixes in url, spelling.
141 
+-       addresses CVE-2016-3598, CVE-2016-3606, CVE-2016-3610
139 142 
 *       Thu May 26 2016 Divya Thaluru <dthaluru@vmware.com> 1.8.0.92-3
140 143 
 -	Added version constraint to runtime dependencies
141 144 
 *	Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 1.8.0.92-2