Updated to version 14

3 files changed, 30 insertions, 46 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4d8178e2379e..8c17538061c1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = jre
 	pkgdesc = Oracle Java Runtime Environment
-	pkgver = 13.0.2
+	pkgver = 14
 	pkgrel = 1
 	url = https://www.oracle.com/java/
 	install = jre.install
@@ -13,26 +13,26 @@ pkgbase = jre
 	depends = libxrender
 	depends = libnet
 	optdepends = alsa-lib: for basic sound support
-	provides = java-runtime=13
-	provides = java-runtime-headless=13
-	provides = java-runtime-jre=13
-	provides = java-runtime-headless-jre=13
-	backup = etc/java13-jre/management/jmxremote.access
-	backup = etc/java13-jre/management/jmxremote.password.template
-	backup = etc/java13-jre/management/management.properties
-	backup = etc/java13-jre/security/policy/limited/default_US_export.policy
-	backup = etc/java13-jre/security/policy/limited/default_local.policy
-	backup = etc/java13-jre/security/policy/limited/exempt_local.policy
-	backup = etc/java13-jre/security/policy/unlimited/default_US_export.policy
-	backup = etc/java13-jre/security/policy/unlimited/default_local.policy
-	backup = etc/java13-jre/security/policy/README.txt
-	backup = etc/java13-jre/security/java.policy
-	backup = etc/java13-jre/security/java.security
-	backup = etc/java13-jre/logging.properties
-	backup = etc/java13-jre/net.properties
-	backup = etc/java13-jre/sound.properties
-	source = https://download.oracle.com/otn-pub/java/jdk/13.0.2+8/d4173c853231432d94f001e99d882ca7/jdk-13.0.2_linux-x64_bin.tar.gz
-	sha256sums = e2214a723d611b4a781641061a24ca6024f2c57dbd9f75ca9d857cad87d9475f
+	provides = java-runtime=14
+	provides = java-runtime-headless=14
+	provides = java-runtime-jre=14
+	provides = java-runtime-headless-jre=14
+	backup = etc/java14-jre/management/jmxremote.access
+	backup = etc/java14-jre/management/jmxremote.password.template
+	backup = etc/java14-jre/management/management.properties
+	backup = etc/java14-jre/security/policy/limited/default_US_export.policy
+	backup = etc/java14-jre/security/policy/limited/default_local.policy
+	backup = etc/java14-jre/security/policy/limited/exempt_local.policy
+	backup = etc/java14-jre/security/policy/unlimited/default_US_export.policy
+	backup = etc/java14-jre/security/policy/unlimited/default_local.policy
+	backup = etc/java14-jre/security/policy/README.txt
+	backup = etc/java14-jre/security/java.policy
+	backup = etc/java14-jre/security/java.security
+	backup = etc/java14-jre/logging.properties
+	backup = etc/java14-jre/net.properties
+	backup = etc/java14-jre/sound.properties
+	source = https://download.oracle.com/otn-pub/java/jdk/14+36/076bab302c7b4508975440c56f6cc26a/jdk-14_linux-x64_bin.tar.gz
+	sha256sums = 4639bbaecc9cc606f1a4b99fda1efcaefcbf57a7025b3828b095093a6c866afd
 
 pkgname = jre
 
diff --git a/PKGBUILD b/PKGBUILD
index 86b22afda17d..01cbf9ecefe5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,10 +1,10 @@
-# Maintainer : Daniel Bermond < gmail-com: danielbermond >
+# Maintainer : Daniel Bermond <dbermond@archlinux.org>
 # Contributor: Det <nimetonmaili g-mail>
 
 pkgname=jre
-pkgver=13.0.2
-_build=8
-_hash=d4173c853231432d94f001e99d882ca7
+pkgver=14
+_build=36
+_hash=076bab302c7b4508975440c56f6cc26a
 _majver="${pkgver%%.*}"
 pkgrel=1
 pkgdesc='Oracle Java Runtime Environment'
@@ -32,7 +32,7 @@ backup=("etc/java${_majver}-${pkgname}/management/jmxremote.access"
         "etc/java${_majver}-${pkgname}/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=('e2214a723d611b4a781641061a24ca6024f2c57dbd9f75ca9d857cad87d9475f')
+sha256sums=('4639bbaecc9cc606f1a4b99fda1efcaefcbf57a7025b3828b095093a6c866afd')
 
 DLAGENTS=('https::/usr/bin/curl -fLC - --retry 3 --retry-delay 3 -b oraclelicense=a -o %o %u')
 
@@ -50,8 +50,8 @@ package() {
     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"
+    install -D -m755 bin/{java,jjs,jpackage,jrunscript} -t "${pkgdir}/${_jvmdir}/bin"
+    install -D -m755 bin/{keytool,rmid,rmiregistry}     -t "${pkgdir}/${_jvmdir}/bin"
     
     # libs
     cp -a lib "${pkgdir}/${_jvmdir}"
@@ -60,7 +60,7 @@ package() {
     
     # man pages
     local _file
-    for _file in man/man1/{java,jjs,jrunscript,keytool,pack200,rmid,rmiregistry,unpack200}.1
+    for _file in man/man1/{java,jjs,jpackage,jrunscript,keytool,rmid,rmiregistry}.1
     do
         install -D -m644 "$_file" "${pkgdir}/usr/share/${_file%.1}-jdk${_majver}.1"
     done
diff --git a/jre.install b/jre.install
index dd959e635d3f..dcd0b1bb2cca 100644
--- a/jre.install
+++ b/jre.install
@@ -1,4 +1,4 @@
-THIS_JRE='java-13-jdk'
+THIS_JRE='java-14-jdk'
 
 fix_default() {
   if [ ! -x /usr/bin/java ]; then
@@ -26,26 +26,10 @@ post_install() {
   
   echo "When you use a non-reparenting window manager,"
   echo "set _JAVA_AWT_WM_NONREPARENTING=1 in /etc/profile.d/jre.sh"
-
-  if [ ! -f /etc/ssl/certs/java/cacerts ]; then
-     /usr/bin/update-ca-trust
-  fi
 }
 
 post_upgrade() {
   if [ -z "$(fix_default)" ]; then
     /usr/bin/archlinux-java set ${THIS_JRE}
   fi
-
-  if [ ! -f /etc/ssl/certs/java/cacerts ]; then
-    /usr/bin/update-ca-trust
-  fi
-}
-
-pre_remove() {
-  default=$(fix_default)
-  if [ "x${default}" = "x${THIS_JRE}" ]; then
-    /usr/bin/archlinux-java unset
-    echo "No Java environment is set as default anymore"
-  fi
 }