Bump Java to u402.

This includes using new source of tarballs (GitHub).

1 files changed, 13 insertions, 10 deletions

diff --git a/PKGBUILD b/PKGBUILD
index fe89330bd4f3..1ebcdde9e199 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,43 +3,46 @@
 
 pkgname=java8-openjdk-hsdis
 _java_ver=8
-_jdk_update=252
-_jdk_build=09
+_jdk_update=402
+_jdk_build=06
 _binutils_ver=2.34
 pkgver=${_java_ver}.u${_jdk_update}
-_repo_ver=jdk${_java_ver}u${_jdk_update}-b${_jdk_build}
 pkgrel=1
 pkgdesc="Disassembler for HotSpot"
 arch=('i686' 'x86_64')
 url='http://openjdk.java.net/'
 license=('GPL2')
-_url_src=http://hg.openjdk.java.net/jdk8u/jdk8u
-source=(hotspot-${_repo_ver}.tar.gz::${_url_src}/hotspot/archive/${_repo_ver}.tar.gz
+source=(https://github.com/openjdk/jdk${_java_ver}u/archive/refs/tags/jdk${_java_ver}u${_jdk_update}-b${_jdk_build}.tar.gz
         http://ftp.gnu.org/gnu/binutils/binutils-${_binutils_ver}.tar.bz2
         binutils-compat.patch)
-sha256sums=('d9951b6e0c8396a4442d548ca3e585a4e32391c78d3c772f0f57074ab15103cf'
+sha256sums=('8bad7ce8ab8bef779d5cb3d60e04dc676ef840a9f6cf955e4bdb323aa3c0ea79'
             '89f010078b6cf69c23c27897d686055ab89b198dddf819efb0a4f2c38a0b36e6'
             '1ce6f6dccf01aa7172f2a600384244ac7bc91a9cf1bcaa0a9d4e453c775357f5')
 
+_hs_src_root=jdk${_java_ver}u-jdk${_java_ver}u${_jdk_update}-b${_jdk_build}/hotspot
+_hsdis_src_root=${_hs_src_root}/src/share/tools/hsdis
+
 prepare() {
   cd "${srcdir}/binutils-${_binutils_ver}"
 
   # hack! - libiberty configure tests for header files using "$CPP $CPPFLAGS"
   sed -i "/ac_cpp=/s/\$CPPFLAGS/\$CPPFLAGS -O2/" libiberty/configure
 
-  cd "${srcdir}/hotspot-${_repo_ver}/src/share/tools/hsdis"
+  cd "${srcdir}/${_hsdis_src_root}"
   mkdir -p build
   ln -sf "${srcdir}/binutils-${_binutils_ver}" build/binutils
 
   # The upstream is currently stuck with binutils 2.31. This patch provides the
   # compatibility with least recent binutils versions. Remove it once the upstream
   # updates the binutils version in use.
-  cd "${srcdir}/hotspot-${_repo_ver}"
+  #
+  # See also: hotspot/src/share/tools/hsdis/README in JDK source tree.
+  cd "${srcdir}/${_hs_src_root}"
   patch -N -p 1 -i "${srcdir}/binutils-compat.patch"
 }
 
 build() {
-  cd "${srcdir}/hotspot-${_repo_ver}/src/share/tools/hsdis"
+  cd "${srcdir}/${_hsdis_src_root}"
 
   if [ "$CARCH" = "x86_64" ]; then
     mkdir -p build/linux-amd64
@@ -68,7 +71,7 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/hotspot-${_repo_ver}/src/share/tools/hsdis"
+  cd "${srcdir}/${_hsdis_src_root}"
 
   if [ "$CARCH" = "x86_64" ]; then
     install -D -m755 build/linux-amd64/hsdis-amd64.so "${pkgdir}/usr/lib/jvm/java-8-openjdk/jre/lib/amd64/hsdis-amd64.so"