development/openjdk: Updated for version 7u111b01.

Signed-off-by: David Spencer <idlemoor@slackbuilds.org>

5 files changed, 50 insertions, 62 deletions

diff --git a/development/openjdk/README b/development/openjdk/README
index 8204b9d061..13b5c95c3f 100644
--- a/development/openjdk/README
+++ b/development/openjdk/README
@@ -1,19 +1,10 @@
-OpenJDK is an open source implementation of the Java(TM) 2 Platform Standard
-Edition Development Kit. This package is built with the IcedTea build
-project and includes tools for developing, testing, and running
-programs written in Java.
+OpenJDK 7 is an open source implementation of version 7 of the
+Java Development Kit, Standard Edition. It includes tools for developing,
+testing, and running programs written in Java.
 
 apache-ant is a required dependency and you have to install it before
 you build openjdk. However, you do not need to install Oracle's jdk,
-since it's only a runtime dependency.
-
-This script imports the security certificates also found in Oracle's
-jdk. You can override this behavior by invoking the script like this:
-
-KEYSTORE_NO_IMPORT=YES ./openjdk.SlackBuild
-
-The above line, however, will cause some programs to fail to estab-
-lish secure connections.
+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
@@ -22,15 +13,12 @@ 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.
 
-This script may take a couple of hours to finish and will require
+This script may take a couple of hours to complete and will require
 about 11 GB of disk space for its temporary directory. It defaults to
 "/tmp/SBo" and you may redefine it like this:
 
 TMP=/your/temporary/dir ./openjdk.SlackBuild
 
-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.
+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'.
diff --git a/development/openjdk/cacerts b/development/openjdk/cacerts
index 19d381473a..3c6ae3e526 100644
--- a/development/openjdk/cacerts
+++ b/development/openjdk/cacerts
diff --git a/development/openjdk/openjdk.SlackBuild b/development/openjdk/openjdk.SlackBuild
index 1e38ffeb0d..15aef53db7 100644
--- a/development/openjdk/openjdk.SlackBuild
+++ b/development/openjdk/openjdk.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for OpenJDK
 
-# Copyright 2015 Strahil Yordanov, Sofia, Bulgaria
+# Copyright 2016 Strahil Yordanov, Sofia, Bulgaria
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,12 +23,12 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=openjdk
-VERSION=${VERSION:-7u91b1}
+VERSION=${VERSION:-7u111b01}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 DVER=1.7.0_$(printf $VERSION | cut -du -f2)
-ICEDTEA=icedtea-2.6.2
+ICEDTEA=icedtea-2.6.7
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -40,7 +40,7 @@ fi
 
 CWD="$(pwd)"
 TMP=${TMP:-/tmp/SBo}
-BUILD_DIR=$TMP/openjdk
+BUILD_DIR=$TMP/$PRGNAM
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
@@ -52,6 +52,8 @@ else
   LIBDIRSUFFIX=""
 fi
 
+BOOT_JAVA=/usr/lib${LIBDIRSUFFIX}/jvm
+
 set -e
 
 rm -rf $BUILD_DIR $PKG
@@ -63,17 +65,19 @@ tar -xvf $CWD/${ICEDTEA}.tar.xz
 mkdir icedtea-build
 cd icedtea-build
 
-#Set JAVA_HOME in order to avoid conflictis with other already installed JVMs.
-#Needed for ./make and probably not for ./configure but better be safe.
-JAVA_HOME=/usr/lib${LIBDIRSUFFIX}/jvm PATH=/usr/lib${LIBDIRSUFFIX}/jvm/bin:$PATH \
+# 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 \
-  --with-jdk-home=/usr/lib${LIBDIRSUFFIX}/jvm \
+  --with-jdk-home=${BOOT_JAVA} \
   --disable-docs \
+  --disable-downloading \
   --without-rhino \
   --disable-system-kerberos \
-  --disable-downloading \
   --disable-system-pcsc \
   --disable-system-sctp \
+  --with-cacerts-file="$CWD/cacerts" \
   --with-openjdk-src-zip="$CWD/openjdk.tar.bz2" \
   --with-corba-src-zip="$CWD/corba.tar.bz2" \
   --with-jaxp-src-zip="$CWD/jaxp.tar.bz2" \
@@ -81,17 +85,13 @@ JAVA_HOME=/usr/lib${LIBDIRSUFFIX}/jvm PATH=/usr/lib${LIBDIRSUFFIX}/jvm/bin:$PATH
   --with-jdk-src-zip="$CWD/jdk.tar.bz2" \
   --with-langtools-src-zip="$CWD/langtools.tar.bz2" \
   --with-hotspot-src-zip="$CWD/hotspot.tar.bz2"
-JAVA_HOME=/usr/lib${LIBDIRSUFFIX}/jvm PATH=/usr/lib${LIBDIRSUFFIX}/jvm/bin:$PATH make
+
+JAVA_HOME=${BOOT_JAVA} PATH=${BOOT_JAVA}/bin:$PATH LOG=trace make
 
 cd $PKG
 mkdir -p usr/lib${LIBDIRSUFFIX}
 cd usr/lib${LIBDIRSUFFIX}
-cp -av $BUILD_DIR/icedtea-build/openjdk.build/j2sdk-image/ openjdk
-
-if [ -z "$KEYSTORE_NO_IMPORT" ] ; then
-  #copy some trust/security certificates (can be viewed with keytool, -storepass changeit)
-  cp "$CWD/cacerts" ./openjdk/jre/lib/security
-fi
+cp -av $BUILD_DIR/icedtea-build/openjdk.build/j2sdk-image/ $PRGNAM
 
 chown -R root.root $PKG
 find -L . \
@@ -108,17 +108,17 @@ done
 chmod 755 $PKG/etc/profile.d/*
 
 ( cd $PKG/usr/lib${LIBDIRSUFFIX}
-  ln -sf openjdk ${PRGNAM}${DVER}
+  ln -sf $PRGNAM ${PRGNAM}${DVER}
 )
 
 cd $PKG/usr/lib${LIBDIRSUFFIX}
-    ln -sf ./openjdk/jre/lib/${LIB_ARCH}/server/libjvm.so .
+    ln -sf ./$PRGNAM/jre/lib/${LIB_ARCH}/server/libjvm.so .
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a $PKG/usr/lib${LIBDIRSUFFIX}/openjdk/{THIRD_PARTY_README,LICENSE,ASSEMBLY_EXCEPTION} \
+cp -a $PKG/usr/lib${LIBDIRSUFFIX}/$PRGNAM/{THIRD_PARTY_README,LICENSE,ASSEMBLY_EXCEPTION} \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
diff --git a/development/openjdk/openjdk.info b/development/openjdk/openjdk.info
index ff2b8f7225..2a24ae90a5 100644
--- a/development/openjdk/openjdk.info
+++ b/development/openjdk/openjdk.info
@@ -1,22 +1,22 @@
 PRGNAM="openjdk"
-VERSION="7u91b1"
+VERSION="7u111b01"
 HOMEPAGE="http://openjdk.java.net"
-DOWNLOAD="http://icedtea.classpath.org/download/source/icedtea-2.6.2.tar.xz \
-  http://icedtea.classpath.org/download/drops/icedtea7/2.6.2/openjdk.tar.bz2 \
-  http://icedtea.classpath.org/download/drops/icedtea7/2.6.2/corba.tar.bz2 \
-  http://icedtea.classpath.org/download/drops/icedtea7/2.6.2/jaxp.tar.bz2 \
-  http://icedtea.classpath.org/download/drops/icedtea7/2.6.2/jaxws.tar.bz2 \
-  http://icedtea.classpath.org/download/drops/icedtea7/2.6.2/jdk.tar.bz2 \
-  http://icedtea.classpath.org/download/drops/icedtea7/2.6.2/langtools.tar.bz2 \
-  http://icedtea.classpath.org/download/drops/icedtea7/2.6.2/hotspot.tar.bz2"
-MD5SUM="3932be2adca6ea40abf2cc0ea8a59094 \
-  d63c5b401aaa9ef76d1dbd87943aa387 \
-  500547dc50acde20fad18d0645be89c4 \
-  793fb78b5f51323e31785bb89292182f \
-  131e2f619455e37cea74ca710e6ada6d \
-  6e8061b2b7c22163ab149fb66553eda8 \
-  1cebffc6b56e9efdbe08eff018801cb1 \
-  5ffb731931226fbff870b80a377f6258"
+DOWNLOAD="http://icedtea.classpath.org/download/source/icedtea-2.6.7.tar.xz \
+  http://icedtea.classpath.org/download/drops/icedtea7/2.6.7/openjdk.tar.bz2 \
+  http://icedtea.classpath.org/download/drops/icedtea7/2.6.7/corba.tar.bz2 \
+  http://icedtea.classpath.org/download/drops/icedtea7/2.6.7/jaxp.tar.bz2 \
+  http://icedtea.classpath.org/download/drops/icedtea7/2.6.7/jaxws.tar.bz2 \
+  http://icedtea.classpath.org/download/drops/icedtea7/2.6.7/jdk.tar.bz2 \
+  http://icedtea.classpath.org/download/drops/icedtea7/2.6.7/langtools.tar.bz2 \
+  http://icedtea.classpath.org/download/drops/icedtea7/2.6.7/hotspot.tar.bz2"
+MD5SUM="973d7bea8354e34d31475bae255709fa \
+  fd13f8cdeaa31b71c4cfe131e29f1936 \
+  49387b060090f090313e1aa30ad22c62 \
+  f4aab7046a2ce7d06245da3c9f6f6682 \
+  f5dfc808f7c8ac4cd8c41670881476be \
+  610434e1fd77ee59860ced5a2eafac32 \
+  1a107a57717b0e524eedd5343f67196f \
+  c90b9af0914737c40491109633020cf1"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="apache-ant"
diff --git a/development/openjdk/slack-desc b/development/openjdk/slack-desc
index 17649944a0..39246b71da 100644
--- a/development/openjdk/slack-desc
+++ b/development/openjdk/slack-desc
@@ -6,13 +6,13 @@
 # customary to leave one space after the ':' except on otherwise blank lines.
 
        |-----handy-ruler------------------------------------------------------|
-openjdk: openjdk (Open Implementation of JDK)
+openjdk: openjdk (openjdk7 -- Open Implementation of JDK)
+openjdk:
+openjdk: OpenJDK 7 is an open source implementation of version 7 of the
+openjdk: Java Development Kit, Standard Edition. It includes tools for
+openjdk: developing, testing, and running programs written in Java.
+openjdk:
 openjdk:
-openjdk: OpenJDK is an open source implementation of the Java(TM) 2 Platform 
-openjdk: Standard Edition Development Kit. This package is built using the 
-openjdk: IcedTea build and integration project and includes tools for
-openjdk: developing, testing, and running programs written in the Java
-openjdk: programming language.
 openjdk:
 openjdk:
 openjdk: