Browse code
Update openjdk to 1.8.0.162 - includes security fixes
Change-Id: I547cc92e7b62f3f97145d52cacbebbb4a2bf892b
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/4674
Tested-by: gerrit-photon <photon-checkins@vmware.com>
Reviewed-by: Anish Swaminathan <anishs@vmware.com>
Harish Udaiya Kumar authored on 2018/01/20 09:15:31Showing 3 changed files
- SPECS/cassandra/cassandra.spec
- SPECS/cassandra/fix-building-openjdk-1.8.0.162.patch
- SPECS/openjdk8/openjdk8.spec
| ... | ... |
@@ -3,7 +3,7 @@ |
| 3 | 3 |
Summary: Cassandra is a highly scalable, eventually consistent, distributed, structured key-value store |
| 4 | 4 |
Name: cassandra |
| 5 | 5 |
Version: 3.10 |
| 6 |
-Release: 6%{?dist}
|
|
| 6 |
+Release: 7%{?dist}
|
|
| 7 | 7 |
URL: http://cassandra.apache.org/ |
| 8 | 8 |
License: Apache License, Version 2.0 |
| 9 | 9 |
Group: Applications/System |
| ... | ... |
@@ -13,6 +13,7 @@ Source0: https://repo1.maven.org/maven2/org/apache/cassandra/apache-cassa |
| 13 | 13 |
%define sha1 apache-cassandra=fa2bbeb62f930f5ff6fccee60cfb837d0794633a |
| 14 | 14 |
Source1: cassandra.service |
| 15 | 15 |
Patch0: build-fix.patch |
| 16 |
+Patch1: fix-building-openjdk-1.8.0.162.patch |
|
| 16 | 17 |
BuildRequires: apache-ant |
| 17 | 18 |
BuildRequires: unzip zip |
| 18 | 19 |
BuildRequires: openjdk8 |
| ... | ... |
@@ -25,6 +26,7 @@ Cassandra is a highly scalable, eventually consistent, distributed, structured k |
| 25 | 25 |
%prep |
| 26 | 26 |
%setup -qn apache-%{name}-%{version}-src
|
| 27 | 27 |
%patch0 -p1 |
| 28 |
+%patch1 -p1 |
|
| 28 | 29 |
sed -i 's#\"logback-core\" version=\"1.1.3\"#\"logback-core\" version=\"1.2.0\"#g' build.xml |
| 29 | 30 |
sed -i 's#\"logback-classic\" version=\"1.1.3\"#\"logback-classic\" version=\"1.2.0\"#g' build.xml |
| 30 | 31 |
rm lib/logback-* |
| ... | ... |
@@ -128,6 +130,8 @@ fi |
| 128 | 128 |
%exclude /var/opt/cassandra/build/lib |
| 129 | 129 |
|
| 130 | 130 |
%changelog |
| 131 |
+* Sat Jan 20 2018 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 3.10-7 |
|
| 132 |
+- Add patch to build on openjdk-1.8.0.162 |
|
| 131 | 133 |
* Thu Aug 17 2017 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 3.10-6 |
| 132 | 134 |
- Add SuccessExitStatus to cassandra service file |
| 133 | 135 |
* Thu Aug 10 2017 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 3.10-5 |
| 134 | 136 |
new file mode 100644 |
| ... | ... |
@@ -0,0 +1,25 @@ |
| 0 |
+diff --git a/src/java/org/apache/cassandra/utils/JMXServerUtils.java b/src/java/org/apache/cassandra/utils/JMXServerUtils.java |
|
| 1 |
+index e78ed01746..072f237049 100644 |
|
| 2 |
+--- a/src/java/org/apache/cassandra/utils/JMXServerUtils.java |
|
| 3 |
+@@ -46,6 +46,7 @@ import org.slf4j.LoggerFactory; |
|
| 4 |
+ import com.sun.jmx.remote.internal.RMIExporter; |
|
| 5 |
+ import com.sun.jmx.remote.security.JMXPluggableAuthenticator; |
|
| 6 |
+ import org.apache.cassandra.auth.jmx.AuthenticationProxy; |
|
| 7 |
++import sun.misc.ObjectInputFilter; |
|
| 8 |
+ import sun.rmi.registry.RegistryImpl; |
|
| 9 |
+ import sun.rmi.server.UnicastServerRef2; |
|
| 10 |
+ |
|
| 11 |
+@@ -308,10 +309,10 @@ public class JMXServerUtils |
|
| 12 |
+ // to our custom Registry too. |
|
| 13 |
+ private Remote connectorServer; |
|
| 14 |
+ |
|
| 15 |
+- public Remote exportObject(Remote obj, int port, RMIClientSocketFactory csf, RMIServerSocketFactory ssf) |
|
| 16 |
++ public Remote exportObject(Remote obj, int port, RMIClientSocketFactory csf, RMIServerSocketFactory ssf, ObjectInputFilter filter) |
|
| 17 |
+ throws RemoteException |
|
| 18 |
+ {
|
|
| 19 |
+- Remote remote = new UnicastServerRef2(port, csf, ssf).exportObject(obj, null, true); |
|
| 20 |
++ Remote remote = new UnicastServerRef2(port, csf, ssf, filter).exportObject(obj, null, true); |
|
| 21 |
+ // Keep a reference to the first object exported, the JMXConnectorServer |
|
| 22 |
+ if (connectorServer == null) |
|
| 23 |
+ connectorServer = remote; |
| ... | ... |
@@ -2,15 +2,15 @@ |
| 2 | 2 |
%global security_hardening none |
| 3 | 3 |
Summary: OpenJDK |
| 4 | 4 |
Name: openjdk8 |
| 5 |
-Version: 1.8.0.152 |
|
| 6 |
-Release: 2%{?dist}
|
|
| 5 |
+Version: 1.8.0.162 |
|
| 6 |
+Release: 1%{?dist}
|
|
| 7 | 7 |
License: GNU GPL |
| 8 | 8 |
URL: https://openjdk.java.net |
| 9 | 9 |
Group: Development/Tools |
| 10 | 10 |
Vendor: VMware, Inc. |
| 11 | 11 |
Distribution: Photon |
| 12 |
-Source0: http://www.java.net/download/openjdk/jdk8/promoted/b131/openjdk-%{version}.tar.gz
|
|
| 13 |
-%define sha1 openjdk=bdb67157673789aa2ad368c9e237be7215097fdd |
|
| 12 |
+Source0: http://www.java.net/download/openjdk/jdk8/promoted/b162/openjdk-%{version}.tar.gz
|
|
| 13 |
+%define sha1 openjdk=e639499b4e333ac4a9e0fe530af58a1a63dda32a |
|
| 14 | 14 |
Patch0: Awt_build_headless_only.patch |
| 15 | 15 |
Patch1: check-system-ca-certs.patch |
| 16 | 16 |
BuildRequires: pcre-devel |
| ... | ... |
@@ -237,6 +237,8 @@ rm -rf %{buildroot}/*
|
| 237 | 237 |
%{_libdir}/jvm/OpenJDK-%{version}/src.zip
|
| 238 | 238 |
|
| 239 | 239 |
%changelog |
| 240 |
+* Fri Jan 19 2018 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 1.8.0.162-1 |
|
| 241 |
+- Upgraded to version 1.8.0.162 |
|
| 240 | 242 |
* Thu Dec 21 2017 Alexey Makhalov <amakhalov@vmware.com> 1.8.0.152-2 |
| 241 | 243 |
- Reduce list of published rpms dependencies |
| 242 | 244 |
* Thu Oct 19 2017 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 1.8.0.152-1 |