Update to 8u291

1 files changed, 56 insertions, 56 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 07d9f9bbb15b..e99809442d04 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,4 @@
-# Maintainer: Felix Golatofski <contact@xdfr.de>
-# Contributor: Franck Lucien Duriez <franck.lucien.duriez@gmail.com>
-# Contributor: Det <nimetonmaili g-mail>
-# Based on the x86_64 jdk8 package
+# Maintainer: Ben Westover <kwestover.kw@gmail.com>
 
 set -u
 _pkgname='jdk'
@@ -11,20 +8,23 @@ pkgname="${_pkgname}${_major}-arm"
 #_minor='221'; _build='b11'; _hash='230deb18db3e4014bb8e3e8324f81b43'
 #_minor='231'; _build='b11'; _hash='5b13a193868b4bf28bcb45c792fce896'
 #_minor='241'; _build='b07'; _hash='1f5b5a70bf22433b84d0e960903adac8'
-_minor='251'; _build='b08'; _hash='3d5a2bb8f8d4428bbe94aed7ec7ae784'
+#_minor='251'; _build='b08'; _hash='3d5a2bb8f8d4428bbe94aed7ec7ae784'
+#_minor='261'; _build='b12'; _hash='a4634525489241b9a9e1aa73d9e118e6'
+#_minor='271'; _build='b09'; _hash='61ae65e088624f5aaa0b1d2d801acb16'
+#_minor='281'; _build='b09'; _hash='89d678f2be164786b292527658ca1605'
+_minor='291'; _build='b10'; _hash='d7fc238d0cbf4b0dac67be84580cfb4b'
 pkgver="${_major}u${_minor}"
-pkgrel=1
-pkgdesc="Oracle Java ${_major} Development Kit for ARM32"
-pkgdesc+=' LTS'
-arch=('armv7h')
+pkgrel='1'
+pkgdesc="Oracle Java ${_major} Development Kit LTS for ARM"
+arch=('armv7h' 'aarch64')
 url='https://www.oracle.com/technetwork/java/javase/downloads/index.html'
 license=('custom:Oracle')
 depends=('ca-certificates-java' 'hicolor-icon-theme' 'java-runtime-common' 'nss' 'xdg-utils')
 depends+=('java-environment-common')
 optdepends=(
   'alsa-lib: for basic sound support'
-  'eclipse-java: to use "Oracle Java Mission Control" plugins in Eclipse'
   'gtk2: for Gtk+ look and feel (desktop)'
+  'eclipse-java: to use "Oracle Java Mission Control" plugins in Eclipse'
 )
 makedepends=('awk')
 provides=(
@@ -35,8 +35,8 @@ provides=(
   "java-runtime-headless-jre=${_major}"
   "java-web-start-jre=${_major}"
   "java-openjfx=${_major}"
-  "java-environment-jdk=${_major}"
   "java-environment=${_major}"
+  "java-environment-jdk=${_major}"
 )
 
 # Variables
@@ -44,14 +44,21 @@ provides=(
 _jname="${_pkgname}${_major}"
 _jvmdir="/usr/lib/jvm/java-${_major}-${_pkgname}"
 
+if [ "$CARCH" = "aarch64" ]; then
+  _srcfil="${_pkgname}-${pkgver}-linux-${CARCH}.tar.gz"
+  _arch="aarch64"
+else
+  _srcfil="${_pkgname}-${pkgver}-linux-arm32-vlp-hflt.tar.gz"
+  _arch="arm"
+fi
+
 backup=(
-  "etc/java-${_jname}/amd64/jvm.cfg"
+  "etc/java-${_jname}/${_arch}/jvm.cfg"
   "etc/java-${_jname}/images/cursors/cursors.properties"
   "etc/java-${_jname}/management/jmxremote.access"
   "etc/java-${_jname}/management/management.properties"
   "etc/java-${_jname}/security/java.policy"
   "etc/java-${_jname}/security/java.security"
-  "etc/java-${_jname}/security/javaws.policy"
   "etc/java-${_jname}/content-types.properties"
   "etc/java-${_jname}/flavormap.properties"
   "etc/java-${_jname}/fontconfig.properties.src"
@@ -63,20 +70,19 @@ backup=(
 )
 options=('!strip') # JDK debug-symbols
 install="${pkgname}.install"
-_srcfil="${_pkgname}-${pkgver}-linux-arm32-vfp-hflt.tar.gz"
 source=(
-  "https://download.oracle.com/otn-pub/java/jce/${_major}/jce_policy-${_major}.zip"
-  "https://download.oracle.com/otn-pub/java/jdk/${pkgver}-${_build}/${_hash}/${_srcfil}"
   "jconsole-${_jname}.desktop"
   "jmc-${_jname}.desktop"
   "jvisualvm-${_jname}.desktop"
   "policytool-${_jname}.desktop"
-  'readme.sh'
+  "readme.sh"
 )
+source_aarch64=("https://download.oracle.com/otn-pub/java/jdk/${pkgver}-${_build}/${_hash}/${_srcfil}")
+source_armv7h=("https://download.oracle.com/otn-pub/java/jdk/${pkgver}-${_build}/${_hash}/${_srcfil}")
 # from oracle-sqldeveloper
-if ! :; then
-DLAGENTS+=("manual::${startdir:-}/readme.sh %o %u")
-source[1]="manual://${_srcfil}"
+if :; then
+DLAGENTS+=("manual::${startdir:-}/readme.sh ${url} %o %u")
+source[0]="manual://${_srcfil}"
 if [ ! -z "${HOME:-}" ]; then # block mksrcinfo
   XDG_DOWNLOAD_DIR="$(xdg-user-dir DOWNLOAD 2>/dev/null)" || :
   if [ -z "${XDG_DOWNLOAD_DIR}" ]; then
@@ -96,23 +102,41 @@ unset _srcfil
 unset XDG_DOWNLOAD_DIR
 fi
 
-md5sums=('b3c7031bc65c28c2340302065e7d00d3'
-         '6d2c09eced1c83379117ab59e564c75c'
-         '8a66f50efdc867ffd6a27168bc93b210'
-         '1cbde70639abd98db4bace284dbf2bc4'
-         'f0b39865361437f3778ecbe6ffbc0a06'
-         '89704501aff8efe859c31968d8d168e6'
-         '51c8839211cc53f09c9b11a8e28ed1ef')
+sha256sums=('SKIP'
+            '8f865b52946a9ab98556c56306c7e70ae7aa432b4d005c70df0bba9d2c3111b1'
+            '144e6651fcea08d95f3148d3a8ad17deb93fec4dd9236d37d27d7c648230b870'
+            '635433e9c78ff58af65c316232ac9907d289a324428923788ea0f82ae7f8083b'
+            '4c9d5ab69494b3d0d8b166fd5552aa7d587f44f804cec9e2990842ebcd1c8e1d')
+sha256sums_aarch64=('bb5b6c64183aa6bbf96d80fcd43fd01f259754f9ca2906546e1e3c4773999187')
+sha256sums_armv7h=('9a28e6dd42786c50c1ecb71194dafd65aaa148fcf6a620e6da54495f42e3ff2c')
 
-PKGEXT='.pkg.tar.gz' # much faster than .xz
+#PKGEXT='.pkg.tar.zst' # gz is much faster than .xz, zst is much faster than gz
 ## Alternative mirror, if your local one is throttled:
 ## Posting new sites does no good. They get taken down by the admin
 ## from too much traffic or complaints from Oracle.
-#source[1]=???
+#source[0]=???
 
 DLAGENTS=("${DLAGENTS[@]// -gqb \"\"/ -gq}")
 DLAGENTS=("${DLAGENTS[@]//curl -/curl -b 'oraclelicense=a' -}")
 
+# https://bugs.openjdk.java.net/browse/JDK-8170157
+# 2020-06-19 jce_policy-8.zip/UnlimitedJCEPolicyJDK8/README.txt
+if [ "${_minor}" -lt 161 ]; then
+  source+=("https://download.oracle.com/otn-pub/java/jce/${_major}/jce_policy-${_major}.zip")
+  _opt_JCE=1
+else
+  _opt_JCE=0
+fi
+
+if ! :; then
+  for _d in "${!DLAGENTS[@]}"; do
+    case "${DLAGENTS[${_d}]}" in
+    'https::'*) DLAGENTS["${_d}"]='https::/usr/bin/wget --no-cookies --header Cookie:oraclelicense=a --no-glob --no-config --continue --tries=3 --waitretry=3 -O %o %u';;
+    esac
+  done
+  makedepends+=('wget')
+fi
+
 package() {
   set -u
   cd "${_pkgname}1.${_major}.0_${_minor}"
@@ -125,16 +149,13 @@ package() {
 
   set +u; msg2 'Removing redundancies...'; set -u
   pushd 'jre' > /dev/null
-  rm -r 'lib/desktop/icons/HighContrast/'
-  rm -r 'lib/desktop/icons/HighContrastInverse/'
-  rm -r 'lib/desktop/icons/LowContrast/'
   rm    lib/fontconfig.*.bfc
   rm    lib/fontconfig.*.properties.src
   rm    *.txt
   rm    'COPYRIGHT'
   rm    'LICENSE'
   rm    'README'
-  rm -r 'plugin/'
+  rm    'Welcome.html'
   popd > /dev/null
   rm    'man/ja'
 
@@ -151,26 +172,6 @@ package() {
     ln -sf "${_jvmdir}/jre/bin/${_i##*/}" "bin/${_i##*/}"
   done
 
-  # Suffix .desktops + icons (sun-java.png -> sun-java-${_jname}.png)
-  local _i
-  for _i in $(find 'jre/lib/desktop/' -type 'f'); do
-    rename -- '.' "-${_jname}." "${_i}"
-  done
-
-  # Fix .desktop paths
-  sed -e "s|Exec=|Exec=${_jvmdir}/jre/bin/|" \
-      -e "s|.png|-${_jname}.png|" \
-    -i 'jre/lib/desktop/applications'/*
-
-  # Move .desktops + icons to /usr/share
-  mv 'jre/lib/desktop'/* "${pkgdir}/usr/share/"
-  install -m644 "${srcdir}"/*.desktop -t "${pkgdir}/usr/share/applications/"
-
-  # Enable context menu launch (Austcool)
-  sed -e 's:^NoDisplay=true:#&:g' \
-      -e 's:^Exec=/usr.*$:& -F:g' \
-    -i "${pkgdir}/usr/share/applications/sun-java-jdk8.desktop"
-
   # Move confs to /etc and link back to /usr: /usr/lib/jvm/java-${_jname}/jre/lib -> /etc
   local _new_etc_path
   for _new_etc_path in "${backup[@]}"; do
@@ -182,9 +183,6 @@ package() {
     ln -sf "/${_new_etc_path}" "${_old_usr_path}"
   done
 
-  # Link NPAPI plugin
-  ln -s "${_jvmdir}/jre/lib/amd64/libnpjp2.so" "${pkgdir}/usr/lib/mozilla/plugins/libnpjp2-${_jname}.so"
-
   # Replace JKS keystore with 'ca-certificates-java'
   ln -sf '/etc/ssl/certs/java/cacerts' 'jre/lib/security/cacerts'
 
@@ -201,6 +199,7 @@ package() {
   mv 'COPYRIGHT' 'LICENSE' *.txt "${pkgdir}/usr/share/licenses/java${_major}-${_pkgname}/"
   ln -s "/usr/share/licenses/java${_major}-${_pkgname}/" "${pkgdir}/usr/share/licenses/${pkgname}"
 
+if [ "${_opt_JCE}" -ne 0 ]; then
   set +u; msg2 'Installing Java Cryptography Extension (JCE) Unlimited Strength Jurisdiction Policy Files...'; set -u
   # Replace default "strong", but limited, cryptography to get an "unlimited strength" one for
   # things like 256-bit AES. Enabled by default in OpenJDK:
@@ -209,6 +208,7 @@ package() {
   install -m644 "${srcdir}/UnlimitedJCEPolicyJDK${_major}"/*.jar 'jre/lib/security/'
   install -Dm644 "${srcdir}/UnlimitedJCEPolicyJDK${_major}/README.txt" \
                  "${pkgdir}/usr/share/doc/${_pkgname}/README_-_Java_JCE_Unlimited_Strength.txt"
+fi
 
   set +u; msg2 'Enabling copy+paste in unsigned applets...'; set -u
   # Copy/paste from system clipboard to unsigned Java applets has been disabled since 6u24: