From 5a64a08baa0a21669756df03b5e4d1fcf24977c8 Mon Sep 17 00:00:00 2001
From: Strahil Yordanov <strahilski@yahoo.com>
Date: Sun, 2 Apr 2017 22:41:09 +0700
Subject: development/openjdk6: Updated for version 6b41.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
---
 development/openjdk6/README              | 14 +++++++++++---
 development/openjdk6/openjdk6.SlackBuild | 13 ++++++-------
 development/openjdk6/openjdk6.info       | 10 +++++-----
 3 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/development/openjdk6/README b/development/openjdk6/README
index e8330c9cb9..482c5ce070 100644
--- a/development/openjdk6/README
+++ b/development/openjdk6/README
@@ -6,9 +6,9 @@ apache-ant is a required dependency and you have to install it before
 you build openjdk6. However, you do not need to install Oracle's jdk,
 since it's only a runtime dependency of apache-ant.
 
-Before installing this package please consider any other jdk's/jre's
-that you have already installed as they may cause conflicts with the
-PATH, JAVA_HOME and MANPATH variables.
+Before installing this package please consider any other jdk's/jre's that you
+have already installed as they may cause conflicts with the PATH, JAVA_HOME
+and MANPATH variables.
 
 After installing the package you will need to logout/reboot your machine
 as it will add new files to the /etc/profile.d folder.
@@ -22,3 +22,11 @@ TMP=/your/temporary/dir ./openjdk6.SlackBuild
 The 'cacerts' binary is a keystore containing CA certificates which
 are used by Java applications. It is taken from the CentOS package
 'ca-certificates-2015.2.4-65.0.1.el6_6.noarch.rpm'.
+
+If you get an error like
+
+Internal compiler error: java.lang.NullPointerException at
+org.eclipse.jdt.internal.compiler.ReadManager.run(ReadManager.java:166)
+
+simply run the build again. This happens early so it shouldn't be that of a
+problem. At least 1 out of 5 runs so far have always succeded.
diff --git a/development/openjdk6/openjdk6.SlackBuild b/development/openjdk6/openjdk6.SlackBuild
index f2aa29fdcb..68159a21fb 100644
--- a/development/openjdk6/openjdk6.SlackBuild
+++ b/development/openjdk6/openjdk6.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for OpenJDK
 
-# Copyright 2016 Strahil Yordanov, Sofia, Bulgaria
+# Copyright 2017 Strahil Yordanov, Sofia, Bulgaria
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,12 +23,13 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=openjdk6
-VERSION=${VERSION:-6b40}
+VERSION=${VERSION:-6b41}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 DVER=1.6.0_${VERSION#6}
-ICEDTEA=icedtea6-1.13.12
+ICEDTEA=icedtea6-1.13.13
+OPENJDK_DATE=04_jan_2017
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -68,19 +69,17 @@ cd icedtea-build
 # Set JAVA_HOME in order to avoid conflictis with other already installed JVMs.
 # cacerts taken from this CentOS package:
 # http://mirror.centos.org/centos/6/os/x86_64/Packages/ca-certificates-2015.2.4-65.0.1.el6_6.noarch.rpm
-JAVA_HOME=${BOOT_JAVA} PATH=${BOOT_JAVA}/bin:$PATH \
-  ../$ICEDTEA/configure \
+JAVA_HOME=${BOOT_JAVA} PATH=${BOOT_JAVA}/bin:$PATH ../$ICEDTEA/configure \
   --with-jdk-home=${BOOT_JAVA} \
   --disable-docs \
   --disable-downloading \
   --without-rhino \
   --disable-system-kerberos \
-  --with-openjdk-src-zip="$CWD/openjdk-6-src-${VERSION#6}-22_aug_2016.tar.xz"
+  --with-openjdk-src-zip="$CWD/openjdk-6-src-${VERSION#6}-${OPENJDK_DATE}.tar.xz"
 
 echo \
   "sed -i '/^ *@Override *$/ d' openjdk/jdk/src/share/classes/javax/management/remote/rmi/RMIJRMPServerImpl.java" \
   >> fsg.sh
-
 JAVA_HOME=${BOOT_JAVA} PATH=${BOOT_JAVA}/bin:$PATH LOG=trace make
 
 cd $PKG
diff --git a/development/openjdk6/openjdk6.info b/development/openjdk6/openjdk6.info
index f10c6ca397..1512f91586 100644
--- a/development/openjdk6/openjdk6.info
+++ b/development/openjdk6/openjdk6.info
@@ -1,10 +1,10 @@
 PRGNAM="openjdk6"
-VERSION="6b40"
+VERSION="6b41"
 HOMEPAGE="http://openjdk.java.net"
-DOWNLOAD="http://icedtea.classpath.org/download/source/icedtea6-1.13.12.tar.xz \
-          https://java.net/downloads/openjdk6/openjdk-6-src-b40-22_aug_2016.tar.xz"
-MD5SUM="f24d4c2f0d0f010b9a80b1ab07edb357 \
-        b5c3ecc432c7d694826207229a78bb8f"
+DOWNLOAD="http://icedtea.classpath.org/download/source/icedtea6-1.13.13.tar.xz \
+  https://java.net/downloads/openjdk6/openjdk-6-src-b41-04_jan_2017.tar.xz"
+MD5SUM="338c09785299e0240bef044464fc3dfc \
+  cee9838d359a9910f98b5c413d381cd1"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="apache-ant"
-- 
cgit v1.2.3