autu: Update to 11.0.3-1

3 files changed, 113 insertions, 64 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e045eb221379..6efd617aa2a5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,9 @@
+# Generated by mksrcinfo v8
+# Tue May 14 03:37:36 UTC 2019
 pkgbase = jre11
-	pkgdesc = Oracle Java Runtime Environment
-	pkgver = 11.0.2
-	pkgrel = 3
+	pkgdesc = Oracle Java 11 Development Kit
+	pkgver = 11.0.3
+	pkgrel = 1
 	url = https://www.oracle.com/java/
 	install = jre11.install
 	arch = x86_64
@@ -17,7 +19,7 @@ pkgbase = jre11
 	provides = java-runtime-headless=11
 	provides = java-runtime-jre=11
 	provides = java-runtime-headless-jre=11
-	provides = jre=11.0.2
+	provides = jre=11.0.3
 	backup = etc/java11-jre/management/jmxremote.access
 	backup = etc/java11-jre/management/jmxremote.password.template
 	backup = etc/java11-jre/management/management.properties
@@ -32,8 +34,12 @@ pkgbase = jre11
 	backup = etc/java11-jre/logging.properties
 	backup = etc/java11-jre/net.properties
 	backup = etc/java11-jre/sound.properties
-	source = https://download.oracle.com/otn-pub/java/jdk/11.0.2+9/f51449fcd52f4d52b93a989c5c56ed3c/jdk-11.0.2_linux-x64_bin.tar.gz
-	sha256sums = 7b4fd8ffcf53e9ff699d964a80e4abf9706b5bdb5644a765c2b96f99e3a2cdc8
+	source = manual://jdk-11.0.3_linux-x64_bin.tar.gz
+	source = readme.sh
+	md5sums = 6d5fd10897d65e053bb69ed9a032211a
+	md5sums = 4dda444d58a4d78ca6357228adbde8a2
+	sha256sums = d50908ea53c2ad154a797aa0930eafb7813247dae13d9d891116df889814ebf3
+	sha256sums = d1b4b3161614d7620365a0528a86f7eec543de30ee756b1ad2dabd386e84f734
 
 pkgname = jre11
 
diff --git a/PKGBUILD b/PKGBUILD
index 18cb66d27859..ba242968b9f6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,71 +1,99 @@
-# Maintainer : Daniel Bermond < gmail-com: danielbermond >
+# Maintainer:  Chris Severance aur.severach AatT spamgourmet.com
+# Contributor: Daniel Bermond < gmail-com: danielbermond >
 # Contributor: Det <nimetonmaili g-mail>
 
-pkgname=jre11
-pkgver=11.0.2
-_build=9
-_hash=f51449fcd52f4d52b93a989c5c56ed3c
-_majver="${pkgver%%.*}"
-pkgrel=3
-pkgdesc='Oracle Java Runtime Environment'
+# TODO: invalid symlink /usr/lib/jvm/java-11-jdk/conf
+
+set -u
+pkgname='jre11'
+pkgver='11.0.3'; _build='12'; _hash='37f5e150db5247ab9333b11c1dddcd30'
+_major="${pkgver%%.*}"
+pkgrel='1'
+pkgdesc="Oracle Java ${_major} Development Kit"
 arch=('x86_64')
 url='https://www.oracle.com/java/'
 license=('custom')
 depends=('java-runtime-common' 'ca-certificates-utils' 'freetype2' 'libxtst'
          'libxrender' 'libnet')
 optdepends=('alsa-lib: for basic sound support')
-provides=("java-runtime=${_majver}" "java-runtime-headless=${_majver}"
-          "java-runtime-jre=${_majver}" "java-runtime-headless-jre=${_majver}" "jre=${pkgver}")
-backup=("etc/java${_majver}-jre/management/jmxremote.access"
-        "etc/java${_majver}-jre/management/jmxremote.password.template"
-        "etc/java${_majver}-jre/management/management.properties"
-        "etc/java${_majver}-jre/security/policy/limited/default_US_export.policy"
-        "etc/java${_majver}-jre/security/policy/limited/default_local.policy"
-        "etc/java${_majver}-jre/security/policy/limited/exempt_local.policy"
-        "etc/java${_majver}-jre/security/policy/unlimited/default_US_export.policy"
-        "etc/java${_majver}-jre/security/policy/unlimited/default_local.policy"
-        "etc/java${_majver}-jre/security/policy/README.txt"
-        "etc/java${_majver}-jre/security/java.policy"
-        "etc/java${_majver}-jre/security/java.security"
-        "etc/java${_majver}-jre/logging.properties"
-        "etc/java${_majver}-jre/net.properties"
-        "etc/java${_majver}-jre/sound.properties")
+provides=("java-runtime=${_major}" "java-runtime-headless=${_major}"
+          "java-runtime-jre=${_major}" "java-runtime-headless-jre=${_major}" "jre=${pkgver}")
+backup=("etc/java${_major}-jre/management/jmxremote.access"
+        "etc/java${_major}-jre/management/jmxremote.password.template"
+        "etc/java${_major}-jre/management/management.properties"
+        "etc/java${_major}-jre/security/policy/limited/default_US_export.policy"
+        "etc/java${_major}-jre/security/policy/limited/default_local.policy"
+        "etc/java${_major}-jre/security/policy/limited/exempt_local.policy"
+        "etc/java${_major}-jre/security/policy/unlimited/default_US_export.policy"
+        "etc/java${_major}-jre/security/policy/unlimited/default_local.policy"
+        "etc/java${_major}-jre/security/policy/README.txt"
+        "etc/java${_major}-jre/security/java.policy"
+        "etc/java${_major}-jre/security/java.security"
+        "etc/java${_major}-jre/logging.properties"
+        "etc/java${_major}-jre/net.properties"
+        "etc/java${_major}-jre/sound.properties")
 install="${pkgname}.install"
-source=("https://download.oracle.com/otn-pub/java/jdk/${pkgver}+${_build}/${_hash}/jdk-${pkgver}_linux-x64_bin.tar.gz")
-sha256sums=('7b4fd8ffcf53e9ff699d964a80e4abf9706b5bdb5644a765c2b96f99e3a2cdc8')
+_srcfil="jdk-${pkgver}_linux-x64_bin.tar.gz"
+source=(
+  "https://download.oracle.com/otn-pub/java/jdk/${pkgver}+${_build}/${_hash}/${_srcfil}"
+  'readme.sh'
+)
+# from oracle-sqldeveloper
+DLAGENTS+=("manual::${startdir:-}/readme.sh %o %u")
+source[0]="manual://${_srcfil}"
+if [ -s ~/"Downloads/${_srcfil}" ] && [ ! -e "${_srcfil}" ]; then
+  if type msg > /dev/null 2>&1; then
+    set +u
+    msg "Scooping files from ~/Downloads"
+    msg2 "${_srcfil}"
+    set -u
+    ln -sr ~/"Downloads/${_srcfil}"
+  fi
+fi
+unset _srcfil
+md5sums=('6d5fd10897d65e053bb69ed9a032211a'
+         '4dda444d58a4d78ca6357228adbde8a2')
+sha256sums=('d50908ea53c2ad154a797aa0930eafb7813247dae13d9d891116df889814ebf3'
+            'd1b4b3161614d7620365a0528a86f7eec543de30ee756b1ad2dabd386e84f734')
+
+PKGEXT='.pkg.tar.gz' # much faster than .xz
 
-DLAGENTS=('https::/usr/bin/curl -fLC - --retry 3 --retry-delay 3 -b oraclelicense=a -o %o %u')
+DLAGENTS=("${DLAGENTS[@]// -gqb \"\"/ -gq}")
+DLAGENTS=("${DLAGENTS[@]//curl -/curl -b 'oraclelicense=a' -}")
 
 package() {
-    cd "jdk-${pkgver}"
-    
-    local _jvmdir="/usr/lib/jvm/java-${_majver}-jdk"
-    
-    install -d -m755 "${pkgdir}/etc"
-    install -d -m755 "${pkgdir}/${_jvmdir}"
-    install -d -m755 "${pkgdir}/usr/share/licenses/${pkgname}"
-    
-    # conf
-    cp -a conf "${pkgdir}/etc/java${_majver}-jre"
-    ln -s "../../../../etc/java${_majver}-${pkgname}" "${pkgdir}/${_jvmdir}/conf"
-    
-    # bin
-    install -D -m755 bin/{java,jjs,jrunscript,keytool,pack200} -t "${pkgdir}/${_jvmdir}/bin"
-    install -D -m755 bin/{rmid,rmiregistry,unpack200}          -t "${pkgdir}/${_jvmdir}/bin"
-    
-    # libs
-    cp -a lib "${pkgdir}/${_jvmdir}"
-    rm -r "${pkgdir}/${_jvmdir}/lib/jfr"
-    rm "${pkgdir}/${_jvmdir}/lib/"{ct.sym,libattach.so,libsaproc.so,src.zip}
-    
-    install -D -m644 release -t "${pkgdir}/${_jvmdir}"
-    
-    # replace JKS keystore with ca-certificates-utils
-    rm "${pkgdir}${_jvmdir}/lib/security/cacerts"
-    ln -s /etc/ssl/certs/java/cacerts "${pkgdir}${_jvmdir}/lib/security/cacerts"
-    
-    # legal/licenses
-    cp -a legal/* "${pkgdir}/usr/share/licenses/${pkgname}"
-    ln -s "$pkgname" "${pkgdir}/usr/share/licenses/java${_majver}-${pkgname}"
-    ln -s "../../../share/licenses/${pkgname}" "${pkgdir}/${_jvmdir}/legal"
+  set -u
+  cd "jdk-${pkgver}"
+
+  local _jvmdir="/usr/lib/jvm/java-${_major}-jdk"
+
+  install -d -m755 "${pkgdir}/etc"
+  install -d -m755 "${pkgdir}/${_jvmdir}"
+  install -d -m755 "${pkgdir}/usr/share/licenses/${pkgname}"
+
+  # conf
+  cp -a 'conf' "${pkgdir}/etc/java${_major}-jre"
+  ln -s "../../../../etc/java${_major}-${pkgname}" "${pkgdir}/${_jvmdir}/conf"
+
+  # bin
+  install -D -m755 bin/{java,jjs,jrunscript,keytool,pack200} -t "${pkgdir}/${_jvmdir}/bin"
+  install -D -m755 bin/{rmid,rmiregistry,unpack200}          -t "${pkgdir}/${_jvmdir}/bin"
+
+  # libs
+  cp -a 'lib' "${pkgdir}/${_jvmdir}"
+  rm -r "${pkgdir}/${_jvmdir}/lib/jfr"
+  rm "${pkgdir}/${_jvmdir}/lib/"{ct.sym,libattach.so,libsaproc.so,src.zip}
+
+  install -D -m644 'release' -t "${pkgdir}/${_jvmdir}"
+
+  # replace JKS keystore with ca-certificates-utils
+  rm "${pkgdir}${_jvmdir}/lib/security/cacerts"
+  ln -s '/etc/ssl/certs/java/cacerts' "${pkgdir}${_jvmdir}/lib/security/cacerts"
+
+  # legal/licenses
+  cp -a legal/* "${pkgdir}/usr/share/licenses/${pkgname}"
+  ln -s "${pkgname}" "${pkgdir}/usr/share/licenses/java${_major}-${pkgname}"
+  ln -s "../../../share/licenses/${pkgname}" "${pkgdir}/${_jvmdir}/legal"
+  set +u
 }
+set +u
diff --git a/readme.sh b/readme.sh
new file mode 100755
index 000000000000..b9aaf2237f82
--- /dev/null
+++ b/readme.sh
@@ -0,0 +1,15 @@
+#!/usr/bin/bash
+
+echo 'The source file for this package needs to be downloaded manually'
+echo 'since it requires a login and is not redistributable.'
+echo 'Please visit'
+echo '  https://www.oracle.com/technetwork/java/javase/downloads/'
+echo '  Java SE ... JDK, Download v'
+echo 'and download'
+echo " ${1%.part}"
+echo 'to your ~/Downloads folder or in with the PKGBUILD.'
+echo ''
+echo 'Please do not post alternate sources. They are not legal. Advertising'
+echo 'will get them taken down by Oracle or too much traffic. Keep it a'
+echo 'secret.'
+exit 1