development/openjdk7: Updated for version 7u271.

Signed-off-by: Dave Woodfall <dave@slackbuilds.org>

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

2 files changed, 41 insertions, 62 deletions

diff --git a/development/openjdk7/openjdk7.SlackBuild b/development/openjdk7/openjdk7.SlackBuild
index f968de4e94804..b10729d6a7a95 100644
--- a/development/openjdk7/openjdk7.SlackBuild
+++ b/development/openjdk7/openjdk7.SlackBuild
@@ -22,13 +22,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-PRGNAM=openjdk7
-VERSION=${VERSION:-7u251}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
+function createPatchedJdkArchive() {
 
-function createSBoPatch() {
-	cat << EOF > ${ICEDTEA}/patches/boot/optional.patch
+	mkdir -p ${SBO_PATCH_DIR} && cd ${SBO_PATCH_DIR}
+	tar xvf "${CWD}/jdk.tar.bz2"
+	cd jdk-*
+
+	cat << EOF | patch -d ./src/share/classes/sun/security/util Optional.java
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/util/Optional.java openjdk-boot/jdk/src/share/classes/sun/security/util/Optional.java
 --- openjdk-boot.orig/jdk/src/share/classes/sun/security/util/Optional.java	2019-10-20 11:57:14.258731932 +0300
 +++ openjdk-boot/jdk/src/share/classes/sun/security/util/Optional.java	2019-10-20 11:59:48.600721516 +0300
@@ -42,47 +42,23 @@ diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/util/Optional.jav
      }
  
 EOF
+
+	cd ..
+	tar -cvjSf jdk.tar.bz2 jdk-*
 }
 
-function activateSBoPatch() {
-	cat << EOF | patch -d ${ICEDTEA} Makefile.in
---- Makefile.in.orig	2019-10-20 12:55:58.715494084 +0300
-+++ Makefile.in.new	2019-10-20 13:05:27.236455717 +0300
-@@ -154,7 +154,8 @@
- @USE_NON_NSS_CURVES_FALSE@am__append_14 = patches/rh1022017.patch
- @DISABLE_BOOTSTRAP_TOOLS_FALSE@am__append_15 = \\
- @DISABLE_BOOTSTRAP_TOOLS_FALSE@	patches/boot/bootstrap-tools.patch \\
--@DISABLE_BOOTSTRAP_TOOLS_FALSE@	patches/boot/ant-javac.patch
-+@DISABLE_BOOTSTRAP_TOOLS_FALSE@	patches/boot/ant-javac.patch \\
-+@DISABLE_BOOTSTRAP_TOOLS_FALSE@	patches/boot/optional.patch
- 
- @LACKS_COM_SUN_MIRROR_TYPE_TYPEMIRROR_TRUE@am__append_16 = \\
- @LACKS_COM_SUN_MIRROR_TYPE_TYPEMIRROR_TRUE@	patches/boot/jaxws-langtools-dependency.patch
-EOF
+function fixJdkArchiveChecksum() {
+	local newChecksum=$(sha256sum "${SBO_PATCH_DIR}/jdk.tar.bz2" | awk '{print $1}')
 
-	cat << EOF | patch -d ${ICEDTEA} Makefile.am
---- Makefile.am.orig	2019-10-20 12:56:24.622492335 +0300
-+++ Makefile.am	2019-10-20 13:18:31.666402780 +0300
-@@ -453,7 +453,8 @@
- if !DISABLE_BOOTSTRAP_TOOLS
- ICEDTEA_BOOT_PATCHES += \\
- 	patches/boot/bootstrap-tools.patch \\
--	patches/boot/ant-javac.patch
-+	patches/boot/ant-javac.patch \\
-+	patches/boot/optional.patch
- endif
- 
- if LACKS_COM_SUN_MIRROR_TYPE_TYPEMIRROR
-EOF
-
-	(
-		cd ${ICEDTEA}
-		aclocal
-	)
+	sed -r -i "s/^(\s*JDK_SHA256SUM\s*=\s*).*$/\1${newChecksum}/" Makefile
 }
 
+PRGNAM=openjdk7
+VERSION=${VERSION:-7u271}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
 DVER=1.7.0_$(printf $VERSION | cut -du -f2)
-ICEDTEA=icedtea-2.6.21
+ICEDTEA=icedtea-2.6.23
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -95,6 +71,7 @@ fi
 CWD="$(pwd)"
 TMP=${TMP:-/tmp/SBo}
 BUILD_DIR=$TMP/$PRGNAM
+SBO_PATCH_DIR="${BUILD_DIR}/jdk-archive-patch"
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
@@ -112,13 +89,13 @@ set -e
 
 rm -rf $BUILD_DIR $PKG
 mkdir -p $TMP $BUILD_DIR $PKG $OUTPUT
+
+(createPatchedJdkArchive)
+
 cd $BUILD_DIR
 
 tar -xvf $CWD/${ICEDTEA}.tar.xz
 
-createSBoPatch
-activateSBoPatch
-
 mkdir icedtea-build
 cd icedtea-build
 
@@ -144,10 +121,12 @@ $(
     --with-corba-src-zip="$CWD/corba.tar.bz2" \
     --with-jaxp-src-zip="$CWD/jaxp.tar.bz2" \
     --with-jaxws-src-zip="$CWD/jaxws.tar.bz2" \
-    --with-jdk-src-zip="$CWD/jdk.tar.bz2" \
+    --with-jdk-src-zip="${SBO_PATCH_DIR}/jdk.tar.bz2" \
     --with-langtools-src-zip="$CWD/langtools.tar.bz2" \
     --with-hotspot-src-zip="$CWD/hotspot.tar.bz2"
 
+fixJdkArchiveChecksum
+
 JAVA_HOME=${BOOT_JAVA} PATH=${BOOT_JAVA}/bin:$PATH LOG=trace make
 
 cd $PKG
diff --git a/development/openjdk7/openjdk7.info b/development/openjdk7/openjdk7.info
index df6c8a90c979c..70b49e855da04 100644
--- a/development/openjdk7/openjdk7.info
+++ b/development/openjdk7/openjdk7.info
@@ -1,22 +1,22 @@
 PRGNAM="openjdk7"
-VERSION="7u251"
+VERSION="7u271"
 HOMEPAGE="http://openjdk.java.net"
-DOWNLOAD="http://icedtea.classpath.org/download/source/icedtea-2.6.21.tar.xz \
-          http://icedtea.classpath.org/download/drops/icedtea7/2.6.21/openjdk.tar.bz2 \
-          http://icedtea.classpath.org/download/drops/icedtea7/2.6.21/corba.tar.bz2 \
-          http://icedtea.classpath.org/download/drops/icedtea7/2.6.21/jaxp.tar.bz2 \
-          http://icedtea.classpath.org/download/drops/icedtea7/2.6.21/jaxws.tar.bz2 \
-          http://icedtea.classpath.org/download/drops/icedtea7/2.6.21/jdk.tar.bz2 \
-          http://icedtea.classpath.org/download/drops/icedtea7/2.6.21/langtools.tar.bz2 \
-          http://icedtea.classpath.org/download/drops/icedtea7/2.6.21/hotspot.tar.bz2"
-MD5SUM="5daabd69cce803fb8c464feac38086cc \
-  403342ef777c579cc1451e235e6fb028 \
-  f7b5466277edd1a0ed4944c47a966cea \
-  f65ae3ddd00ab6bfc54a7d7b002f5f01 \
-  63c05316146d1de745129f196c203b11 \
-  3b65b3a9fcbd14f692c7d5cf8b5b47e3 \
-  5536ea0fcdac7522e8a61632109e0f3e \
-  88a439cd650821b217f17f0df452c00b"
+DOWNLOAD="http://icedtea.classpath.org/download/source/icedtea-2.6.23.tar.xz \
+          http://icedtea.classpath.org/download/drops/icedtea7/2.6.23/openjdk.tar.bz2 \
+          http://icedtea.classpath.org/download/drops/icedtea7/2.6.23/corba.tar.bz2 \
+          http://icedtea.classpath.org/download/drops/icedtea7/2.6.23/jaxp.tar.bz2 \
+          http://icedtea.classpath.org/download/drops/icedtea7/2.6.23/jaxws.tar.bz2 \
+          http://icedtea.classpath.org/download/drops/icedtea7/2.6.23/jdk.tar.bz2 \
+          http://icedtea.classpath.org/download/drops/icedtea7/2.6.23/langtools.tar.bz2 \
+          http://icedtea.classpath.org/download/drops/icedtea7/2.6.23/hotspot.tar.bz2"
+MD5SUM="b18cc58b81bdd59f91b961b9430952a6 \
+  69969330d95c9ba4f0088b645958ed1c \
+  bb1270b47c365d2a5757868d43fb30e7 \
+  a8e3b94c09a0a873101322bcf2723507 \
+  9c50dc5e69395dccda60a549c2fac06f \
+  cf1fe157b63e83dc5b8e6f7b134dd5a6 \
+  43166317dfb730ee074d7c42d0181649 \
+  4d77e2dfa55e15eb5602b53ba8ab49ff"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="apache-ant"