Update to jdk-11.0.3+7

Also remove desktop file for non-existing policytool

3 files changed, 15 insertions, 27 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5562d5d8552d..d06c0bd8e1ee 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = jdk11-adoptopenjdk
 	pkgdesc = OpenJDK Java 11 development kit (AdoptOpenJDK build)
-	pkgver = 11.0.2.u9
+	pkgver = 11.0.3.u7
 	pkgrel = 1
 	url = https://adoptopenjdk.net/
 	install = install_jdk11-adoptopenjdk.sh
@@ -16,18 +16,18 @@ pkgbase = jdk11-adoptopenjdk
 	optdepends = gtk3: for the Gtk+ 3 look and feel
 	provides = java-runtime-headless=11
 	provides = java-runtime-headless-openjdk=11
-	provides = jre11-openjdk-headless=11.0.2.u9
-	provides = jre-openjdk-headless=11.0.2.u9
+	provides = jre11-openjdk-headless=11.0.3.u7
+	provides = jre-openjdk-headless=11.0.3.u7
 	provides = java-runtime=11
 	provides = java-runtime-openjdk=11
-	provides = jre11-openjdk=11.0.2.u9
-	provides = jre-openjdk=11.0.2.u9
+	provides = jre11-openjdk=11.0.3.u7
+	provides = jre-openjdk=11.0.3.u7
 	provides = java-environment=11
 	provides = java-environment-openjdk=11
-	provides = jdk11-openjdk=11.0.2.u9
-	provides = jdk-openjdk=11.0.2.u9
-	provides = openjdk11-src=11.0.2.u9
-	provides = openjdk-src=11.0.2.u9
+	provides = jdk11-openjdk=11.0.3.u7
+	provides = jdk-openjdk=11.0.3.u7
+	provides = openjdk11-src=11.0.3.u7
+	provides = openjdk-src=11.0.3.u7
 	backup = etc/jdk11-adoptopenjdk/net.properties
 	backup = etc/jdk11-adoptopenjdk/logging.properties
 	backup = etc/jdk11-adoptopenjdk/security/java.security
@@ -42,15 +42,13 @@ pkgbase = jdk11-adoptopenjdk
 	backup = etc/jdk11-adoptopenjdk/management/jmxremote.access
 	backup = etc/jdk11-adoptopenjdk/management/jmxremote.password.template
 	backup = etc/jdk11-adoptopenjdk/sound.properties
-	source = https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.2%2B9/OpenJDK11U-jdk_x64_linux_hotspot_11.0.2_9.tar.gz
+	source = https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.3%2B7/OpenJDK11U-jdk_x64_linux_hotspot_11.0.3_7.tar.gz
 	source = freedesktop-java.desktop
 	source = freedesktop-jconsole.desktop
-	source = freedesktop-policytool.desktop
 	source = freedesktop-jshell.desktop
-	sha256sums = d02089d834f7702ac1a9776d8d0d13ee174d0656cf036c6b68b9ffb71a6f610e
+	sha256sums = 23cded2b43261016f0f246c85c8948d4a9b7f2d44988f75dad69723a7a526094
 	sha256sums = 734aab5e8fca5360fd996142a0c0ff23434da56f83c21b26cfbcbf31556230eb
 	sha256sums = 53b7da18785675438d1d7cfa776be419a313c11049c48f791c7426224fe51025
-	sha256sums = a0cca82e4ebe103d90399911164c17bee61022c67633f55b83d2fc9de15ccd68
 	sha256sums = bc4305c5870fa8e050c0a2cbc629a8f84e366200b436429c789038596a4259f6
 
 pkgname = jdk11-adoptopenjdk
diff --git a/PKGBUILD b/PKGBUILD
index 6469ee99b9b7..5e1e293d22d0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,8 +9,8 @@
 
 _majorver=11
 _minorver=0
-_securityver=2
-_updatever=9
+_securityver=3
+_updatever=7
 pkgrel=1
 pkgver=${_majorver}.${_minorver}.${_securityver}.u${_updatever}
 _tag_ver=${_majorver}.${_minorver}.${_securityver}+${_updatever}
@@ -57,12 +57,10 @@ install=install_jdk11-adoptopenjdk.sh
 source=(https://github.com/AdoptOpenJDK/openjdk${_majorver}-binaries/releases/download/jdk-${_tag_ver/+/%2B}/OpenJDK${_majorver}U-jdk_x64_linux_hotspot_${_tag_ver/+/_}.tar.gz
         freedesktop-java.desktop
         freedesktop-jconsole.desktop
-        freedesktop-policytool.desktop
         freedesktop-jshell.desktop)
-sha256sums=('d02089d834f7702ac1a9776d8d0d13ee174d0656cf036c6b68b9ffb71a6f610e'
+sha256sums=('23cded2b43261016f0f246c85c8948d4a9b7f2d44988f75dad69723a7a526094'
             '734aab5e8fca5360fd996142a0c0ff23434da56f83c21b26cfbcbf31556230eb'
             '53b7da18785675438d1d7cfa776be419a313c11049c48f791c7426224fe51025'
-            'a0cca82e4ebe103d90399911164c17bee61022c67633f55b83d2fc9de15ccd68'
             'bc4305c5870fa8e050c0a2cbc629a8f84e366200b436429c789038596a4259f6')
 
 _jvmdir=/usr/lib/jvm/java-${_majorver}-adoptopenjdk
@@ -97,7 +95,7 @@ package() {
   ln -sf /etc/ssl/certs/java/cacerts lib/security/cacerts
 
   # Desktop files
-  for f in jconsole policytool java jshell; do
+  for f in jconsole java jshell; do
     install -Dm 644 \
       "${srcdir}/freedesktop-${f}.desktop" \
       "${pkgdir}/usr/share/applications/${f}-${pkgname}.desktop"
diff --git a/freedesktop-policytool.desktop b/freedesktop-policytool.desktop
deleted file mode 100644
index 7a56f593b360..000000000000
--- a/freedesktop-policytool.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Name=AdoptOpenJDK Java 11 Policy Tool
-Comment=AdoptOpenJDK Java 11 Policy Tool
-Keywords=java;security;policytool
-Exec=/usr/lib/jvm/java-11-adoptopenjdk/bin/policytool
-Terminal=false
-Type=Application
-Categories=Settings;