Updated to version 15

This is a now a split package with both jdk and jre for easier
maintenance.

7 files changed, 181 insertions, 52 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7fa8f07cf90a..c9c148cdb1da 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,30 +1,60 @@
 pkgbase = jdk
-	pkgdesc = Oracle Java Development Kit
-	pkgver = 14.0.2
+	pkgdesc = Oracle Java
+	pkgver = 15
 	pkgrel = 1
 	url = https://www.oracle.com/java/
-	install = jdk.install
 	arch = x86_64
 	license = custom
-	depends = java-environment-common
-	depends = jre>=14
-	depends = jre<15
-	depends = zlib
-	depends = hicolor-icon-theme
-	provides = java-environment=14
-	provides = java-environment-jdk=14
-	source = https://download.oracle.com/otn-pub/java/jdk/14.0.2+12/205943a0976c4ed48cb16f1043c5c647/jdk-14.0.2_linux-x64_bin.tar.gz
+	source = https://download.oracle.com/otn-pub/java/jdk/15+36/779bf45e88a44cbd9ea6621d33e33db1/jdk-15_linux-x64_bin.tar.gz
 	source = java.desktop
 	source = jconsole.desktop
 	source = jshell.desktop
 	source = java_16.png
 	source = java_48.png
-	sha256sums = cb811a86926cc0f529d16bec7bd2e25fb73e75125bbd1775cdb9a96998593dde
-	sha256sums = 4b38647428fc576f423197104a5721c0a07c825196dad426359c78fd19d1f823
-	sha256sums = b517c7883a81a9951b3b1ddae0427619212808324482b5f02a9b7810328c2ce6
-	sha256sums = 3061d6d325067b6a0e7f900ee699322741b53fd6da200209844edc54530e2bef
+	sha256sums = 300538e0c227c268f14957294d5c44abb5e7e476debc9d07e8d892c417ac8f0d
+	sha256sums = 15a35fe1ef4c672ca56489d0a1aaa23f260dfc58dfad3b64f73accdf5dd3a174
+	sha256sums = 8dde78d1da7d22daebb7067ff29d3ad92c267b2b2b0369ee28e418816adcca8b
+	sha256sums = 419d7b48f3267ce6a8dd969f6ae45411be42f3e123bc344b26e29201319df632
 	sha256sums = d27fec1d74f7a3081c3d175ed184d15383666dc7f02cc0f7126f11549879c6ed
 	sha256sums = 7cf8ca096e6d6e425b3434446b0835537d0fc7fe64b3ccba7a55f7bd86c7e176
 
+pkgname = jre
+	pkgdesc = Oracle Java Runtime Environment
+	install = jre.install
+	depends = java-runtime-common
+	depends = ca-certificates-utils
+	depends = freetype2
+	depends = libxtst
+	depends = libxrender
+	depends = libnet
+	optdepends = alsa-lib: for basic sound support
+	provides = java-runtime=15
+	provides = java-runtime-headless=15
+	provides = java-runtime-jre=15
+	provides = java-runtime-headless-jre=15
+	backup = etc/java-jdk/management/jmxremote.access
+	backup = etc/java-jdk/management/jmxremote.password.template
+	backup = etc/java-jdk/management/management.properties
+	backup = etc/java-jdk/security/policy/limited/default_US_export.policy
+	backup = etc/java-jdk/security/policy/limited/default_local.policy
+	backup = etc/java-jdk/security/policy/limited/exempt_local.policy
+	backup = etc/java-jdk/security/policy/unlimited/default_US_export.policy
+	backup = etc/java-jdk/security/policy/unlimited/default_local.policy
+	backup = etc/java-jdk/security/policy/README.txt
+	backup = etc/java-jdk/security/java.policy
+	backup = etc/java-jdk/security/java.security
+	backup = etc/java-jdk/logging.properties
+	backup = etc/java-jdk/net.properties
+	backup = etc/java-jdk/sound.properties
+
 pkgname = jdk
+	pkgdesc = Oracle Java Development Kit
+	install = jdk.install
+	depends = java-environment-common
+	depends = jre>=15
+	depends = jre<16
+	depends = zlib
+	depends = hicolor-icon-theme
+	provides = java-environment=15
+	provides = java-environment-jdk=15
 
diff --git a/PKGBUILD b/PKGBUILD
index 254c4583a69e..3f71bf927ffc 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,38 +1,102 @@
 # Maintainer : Daniel Bermond <dbermond@archlinux.org>
 # Contributor: Det <nimetonmaili g-mail>
 
-pkgname=jdk
-pkgver=14.0.2
-_build=12
-_hash=205943a0976c4ed48cb16f1043c5c647
+pkgbase=jdk
+pkgname=('jre' 'jdk')
+pkgver=15
+_build=36
+_hash=779bf45e88a44cbd9ea6621d33e33db1
 _majver="${pkgver%%.*}"
 _next="$((_majver + 1))"
 pkgrel=1
-pkgdesc='Oracle Java Development Kit'
+pkgdesc='Oracle Java'
 arch=('x86_64')
 url='https://www.oracle.com/java/'
 license=('custom')
-depends=('java-environment-common' "jre>=${_majver}" "jre<${_next}" 'zlib' 'hicolor-icon-theme')
-provides=("java-environment=${_majver}" "java-environment-jdk=${_majver}")
-install="${pkgname}.install"
-source=("https://download.oracle.com/otn-pub/java/jdk/${pkgver}+${_build}/${_hash}/${pkgname}-${pkgver}_linux-x64_bin.tar.gz"
+source=("https://download.oracle.com/otn-pub/java/jdk/${pkgver}+${_build}/${_hash}/jdk-${pkgver}_linux-x64_bin.tar.gz"
         'java.desktop'
         'jconsole.desktop'
         'jshell.desktop'
         'java_16.png'
         'java_48.png')
-sha256sums=('cb811a86926cc0f529d16bec7bd2e25fb73e75125bbd1775cdb9a96998593dde'
-            '4b38647428fc576f423197104a5721c0a07c825196dad426359c78fd19d1f823'
-            'b517c7883a81a9951b3b1ddae0427619212808324482b5f02a9b7810328c2ce6'
-            '3061d6d325067b6a0e7f900ee699322741b53fd6da200209844edc54530e2bef'
+sha256sums=('300538e0c227c268f14957294d5c44abb5e7e476debc9d07e8d892c417ac8f0d'
+            '15a35fe1ef4c672ca56489d0a1aaa23f260dfc58dfad3b64f73accdf5dd3a174'
+            '8dde78d1da7d22daebb7067ff29d3ad92c267b2b2b0369ee28e418816adcca8b'
+            '419d7b48f3267ce6a8dd969f6ae45411be42f3e123bc344b26e29201319df632'
             'd27fec1d74f7a3081c3d175ed184d15383666dc7f02cc0f7126f11549879c6ed'
             '7cf8ca096e6d6e425b3434446b0835537d0fc7fe64b3ccba7a55f7bd86c7e176')
-            
+
 DLAGENTS=('https::/usr/bin/curl -fLC - --retry 3 --retry-delay 3 -b oraclelicense=a -o %o %u')
 
-package() {
+package_jre() {
+    pkgdesc='Oracle Java Runtime Environment'
+    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}")
+    backup=("etc/java-${pkgbase}/management/jmxremote.access"
+            "etc/java-${pkgbase}/management/jmxremote.password.template"
+            "etc/java-${pkgbase}/management/management.properties"
+            "etc/java-${pkgbase}/security/policy/limited/default_US_export.policy"
+            "etc/java-${pkgbase}/security/policy/limited/default_local.policy"
+            "etc/java-${pkgbase}/security/policy/limited/exempt_local.policy"
+            "etc/java-${pkgbase}/security/policy/unlimited/default_US_export.policy"
+            "etc/java-${pkgbase}/security/policy/unlimited/default_local.policy"
+            "etc/java-${pkgbase}/security/policy/README.txt"
+            "etc/java-${pkgbase}/security/java.policy"
+            "etc/java-${pkgbase}/security/java.security"
+            "etc/java-${pkgbase}/logging.properties"
+            "etc/java-${pkgbase}/net.properties"
+            "etc/java-${pkgbase}/sound.properties")
+    install=jre.install
+    
     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-${pkgbase}"
+    ln -s "../../../../etc/java-${pkgbase}" "${pkgdir}/${_jvmdir}/conf"
     
+    # bin
+    install -D -m755 bin/{java,jpackage,jrunscript} -t "${pkgdir}/${_jvmdir}/bin"
+    install -D -m755 bin/{keytool,rmid,rmiregistry}     -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}
+    
+    # man pages
+    local _file
+    for _file in man/man1/{java,jpackage,jrunscript,keytool,rmid,rmiregistry}.1
+    do
+        install -D -m644 "$_file" "${pkgdir}/usr/share/${_file%.1}-jdk${_majver}.1"
+    done
+    
+    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-${pkgname}"
+    ln -s "../../../share/licenses/${pkgname}" "${pkgdir}/${_jvmdir}/legal"
+}
+
+package_jdk() {
+    pkgdesc='Oracle Java Development Kit'
+    depends=('java-environment-common' "jre>=${_majver}" "jre<${_next}" 'zlib' 'hicolor-icon-theme')
+    provides=("java-environment=${_majver}" "java-environment-jdk=${_majver}")
+    install=jdk.install
+    
+    cd "jdk-${pkgver}"
     local _jvmdir="/usr/lib/jvm/java-${_majver}-${pkgname}"
     
     install -d -m755 "${pkgdir}/${_jvmdir}"
@@ -40,7 +104,7 @@ package() {
     
     # bin
     cp -a bin "${pkgdir}/${_jvmdir}"
-    rm "${pkgdir}/${_jvmdir}/bin/"{java,jjs,jpackage,jrunscript,keytool,rmid,rmiregistry}
+    rm "${pkgdir}/${_jvmdir}/bin/"{java,jpackage,jrunscript,keytool,rmid,rmiregistry}
     
     # libs
     install -D -m644 lib/ct.sym       -t "${pkgdir}/${_jvmdir}/lib"
@@ -54,11 +118,11 @@ package() {
     install -D -m644 lib/src.zip -t "${pkgdir}/${_jvmdir}/lib"
     
     # desktop and icons
-    install -D -m644 "${srcdir}/java.desktop"     "${pkgdir}/usr/share/applications/java-java${_majver}-jdk.desktop"
-    install -D -m644 "${srcdir}/jconsole.desktop" "${pkgdir}/usr/share/applications/jconsole-java${_majver}-jdk.desktop"
-    install -D -m644 "${srcdir}/jshell.desktop"   "${pkgdir}/usr/share/applications/jshell-java${_majver}-jdk.desktop"
-    install -D -m644 "${srcdir}/java_16.png" "${pkgdir}/usr/share/icons/hicolor/16x16/apps/java${_majver}-jdk.png"
-    install -D -m644 "${srcdir}/java_48.png" "${pkgdir}/usr/share/icons/hicolor/48x48/apps/java${_majver}-jdk.png"
+    install -D -m644 "${srcdir}/java.desktop"     "${pkgdir}/usr/share/applications/java-java-jdk.desktop"
+    install -D -m644 "${srcdir}/jconsole.desktop" "${pkgdir}/usr/share/applications/jconsole-java-jdk.desktop"
+    install -D -m644 "${srcdir}/jshell.desktop"   "${pkgdir}/usr/share/applications/jshell-java-jdk.desktop"
+    install -D -m644 "${srcdir}/java_16.png" "${pkgdir}/usr/share/icons/hicolor/16x16/apps/java-jdk.png"
+    install -D -m644 "${srcdir}/java_48.png" "${pkgdir}/usr/share/icons/hicolor/48x48/apps/java-jdk.png"
     
     # man pages
     local _file
@@ -66,9 +130,9 @@ package() {
     do
         install -D -m644 "$_file" "${pkgdir}/usr/share/${_file%.1}-jdk${_majver}.1"
     done < <(find man/man1 -type f -print0)
-    rm "${pkgdir}/usr/share/man/man1/"{java,jjs,jpackage,jrunscript,keytool,rmid,rmiregistry}-jdk"${_majver}".1
+    rm "${pkgdir}/usr/share/man/man1/"{java,jpackage,jrunscript,keytool,rmid,rmiregistry}-jdk"${_majver}".1
     
     # legal/licenses
     cp -a legal/* "${pkgdir}/usr/share/licenses/${pkgname}"
-    ln -s "$pkgname" "${pkgdir}/usr/share/licenses/java${_majver}-${pkgname}"
+    ln -s "$pkgname" "${pkgdir}/usr/share/licenses/java-${pkgname}"
 }
diff --git a/java.desktop b/java.desktop
index 49de0e4f32e4..d7af1d9509e5 100644
--- a/java.desktop
+++ b/java.desktop
@@ -1,10 +1,10 @@
 [Desktop Entry]
-Name=Oracle Java 14 Runtime
-Comment=Oracle Java 14 Runtime
+Name=Oracle Java 15 Runtime
+Comment=Oracle Java 15 Runtime
 Keywords=java;runtime
-Exec=/usr/lib/jvm/java-14-jdk/bin/java -jar
+Exec=/usr/lib/jvm/java-15-jdk/bin/java -jar
 Terminal=false
 Type=Application
-Icon=java14-jdk
+Icon=java-jdk
 MimeType=application/x-java-archive;application/java-archive;application/x-jar;
 NoDisplay=true
diff --git a/jconsole.desktop b/jconsole.desktop
index fdbd534ad8cf..caae7b0256c6 100644
--- a/jconsole.desktop
+++ b/jconsole.desktop
@@ -1,9 +1,9 @@
 [Desktop Entry]
-Name=Oracle Java 14 Console
-Comment=Oracle Java 14 Monitoring and Management Console
+Name=Oracle Java 15 Console
+Comment=Oracle Java 15 Monitoring and Management Console
 Keywords=java;console;monitoring
-Exec=/usr/lib/jvm/java-14-jdk/bin/jconsole
+Exec=/usr/lib/jvm/java-15-jdk/bin/jconsole
 Terminal=false
 Type=Application
-Icon=java14-jdk
+Icon=java-jdk
 Categories=Application;System;
diff --git a/jdk.install b/jdk.install
index 8fdeedcb65d1..1e128c1fcb9d 100644
--- a/jdk.install
+++ b/jdk.install
@@ -1,4 +1,4 @@
-THIS_JDK='java-14-jdk'
+THIS_JDK='java-15-jdk'
 
 fix_default() {
   if [ ! -x /usr/bin/java ]; then
@@ -42,7 +42,7 @@ post_upgrade() {
 
 pre_remove() {
   if [ "x$(fix_default)" = "x${THIS_JDK}" ]; then
-    # Check JRE14 is still available
+    # Check JRE15 is still available
     if [ -x /usr/lib/jvm/${THIS_JDK}/bin/java ]; then
       /usr/bin/archlinux-java unset
     fi
diff --git a/jre.install b/jre.install
new file mode 100644
index 000000000000..53652fcb59fd
--- /dev/null
+++ b/jre.install
@@ -0,0 +1,35 @@
+THIS_JRE='java-15-jdk'
+
+fix_default() {
+  if [ ! -x /usr/bin/java ]; then
+    /usr/bin/archlinux-java unset
+    echo ""
+  else
+    /usr/bin/archlinux-java get
+  fi
+}
+
+post_install() {
+  default=$(fix_default)
+  case ${default} in
+    "")
+      /usr/bin/archlinux-java set ${THIS_JRE}
+      ;;
+    ${THIS_JRE})
+      # Nothing
+      ;;
+    *)
+      echo "Default Java environment is already set to '${default}'"
+      echo "See 'archlinux-java help' to change it."
+      ;;
+  esac
+  
+  echo "When you use a non-reparenting window manager,"
+  echo "set _JAVA_AWT_WM_NONREPARENTING=1 in /etc/profile.d/jre.sh"
+}
+
+post_upgrade() {
+  if [ -z "$(fix_default)" ]; then
+    /usr/bin/archlinux-java set ${THIS_JRE}
+  fi
+}
diff --git a/jshell.desktop b/jshell.desktop
index 4a943cde4f5b..e918724e24be 100644
--- a/jshell.desktop
+++ b/jshell.desktop
@@ -1,9 +1,9 @@
 [Desktop Entry]
-Name=Oracle Java 14 Shell
-Comment=Oracle Java 14 Shell
+Name=Oracle Java 15 Shell
+Comment=Oracle Java 15 Shell
 Keywords=java;shell
-Exec=/usr/lib/jvm/java-14-jdk/bin/jshell
+Exec=/usr/lib/jvm/java-15-jdk/bin/jshell
 Terminal=true
 Type=Application
-Icon=java14-jdk
+Icon=java-jdk
 Categories=Application;System;