From 1c25aa826b08ed1fea326fda7c5f3f27efb88897 Mon Sep 17 00:00:00 2001
From: Paul Menzel <pmenzel@molgen.mpg.de>
Date: Mon, 11 Dec 2017 10:49:45 +0100
Subject: [PATCH] Revert "Merge pull request #531 from
 mariux64/update-java-from-8u141-to-9.0.1"

This reverts commit 215784b77786656ce763ee2bd2d5cb36a6782817, reversing
changes made to 69eadc31902206b0f7786b72d22c09c116a83238.

It was decided, that this update is too early, and Java 9 should be put
under `/pkg`.
---
 java.be0 | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/java.be0 b/java.be0
index 0d4ce2a6f..ffa398e27 100755
--- a/java.be0
+++ b/java.be0
@@ -1,20 +1,25 @@
 #!/bin/env beesh
 
-# BEE_VERSION java-9.0.1-0
+# BEE_VERSION java-1.8.0_141-0
 
 # http://www.oracle.com/technetwork/java/javase/downloads/index.html
 
 
-SRCURL[0]="file:///src/mariux/download/jdk-${PKGVERSION}_linux-x64_bin.tar.gz"
+SRCURL[0]="file:///src/mariux/download/jdk-8u${PKGEXTRAVERSION}-linux-x64.tar.gz"
+#SRCURL[1]="/src/mariux/download/UnlimitedJCEPolicyJDK7.zip"
 
 PATCHURL[0]=""
 
 BEE_EXTRACT_STRIP=0
 
+mee_patch() {
+    unzip /src/mariux/download/jce_policy-8.zip
+}
+
 mee_install() {
     mkdir -p ${D}/usr/local/bin
 
-    mv ${S}/jdk-${PKGVERSION} ${D}/usr/local/java
+    mv ${S}/jdk${PKGFULLVERSION} ${D}/usr/local/java
 
     for i in $(ls ${D}/usr/local/java/bin) ; do
         ln -s /usr/local/java/bin/${i} ${D}/usr/local/bin/${i}
@@ -23,3 +28,10 @@ mee_install() {
     mkdir -p ${D}/usr/lib/mozilla/plugins
     ln -s /usr/local/java/jre/lib/amd64/libnpjp2.so ${D}/usr/lib/mozilla/plugins/libnpjp2.so
 }
+
+mee_install_post() {
+    cp -v \
+    ${S}/UnlimitedJCEPolicyJDK8/US_export_policy.jar \
+    ${S}/UnlimitedJCEPolicyJDK8/local_policy.jar \
+    ${D}/usr/local/java/jre/lib/security/
+}