Update to jdk-12+33

7 files changed, 66 insertions, 66 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 961a69db122a..5282626923de 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = jdk-adoptopenjdk
-	pkgdesc = OpenJDK Java 11 development kit (AdoptOpenJDK build)
-	pkgver = 11.0.2.u9
+	pkgdesc = OpenJDK Java 12 development kit (AdoptOpenJDK build)
+	pkgver = 12.u33
 	pkgrel = 1
 	url = https://adoptopenjdk.net/
 	install = install_jdk-adoptopenjdk.sh
@@ -14,44 +14,45 @@ pkgbase = jdk-adoptopenjdk
 	depends = alsa-lib
 	optdepends = gtk2: for the Gtk+ 2 look and feel
 	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 = java-runtime=11
-	provides = java-runtime-openjdk=11
-	provides = jre11-openjdk=11.0.2.u9
-	provides = jre-openjdk=11.0.2.u9
-	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
-	backup = etc/jdk-adoptopenjdk/net.properties
+	provides = java-runtime-headless=12
+	provides = java-runtime-headless-openjdk=12
+	provides = jre12-openjdk-headless=12.u33
+	provides = jre-openjdk-headless=12.u33
+	provides = java-runtime=12
+	provides = java-runtime-openjdk=12
+	provides = jre12-openjdk=12.u33
+	provides = jre-openjdk=12.u33
+	provides = java-environment=12
+	provides = java-environment-openjdk=12
+	provides = jdk12-openjdk=12.u33
+	provides = jdk-openjdk=12.u33
+	provides = openjdk12-src=12.u33
+	provides = openjdk-src=12.u33
 	backup = etc/jdk-adoptopenjdk/logging.properties
+	backup = etc/jdk-adoptopenjdk/management/jmxremote.access
+	backup = etc/jdk-adoptopenjdk/management/jmxremote.password.template
+	backup = etc/jdk-adoptopenjdk/management/management.properties
+	backup = etc/jdk-adoptopenjdk/net.properties
+	backup = etc/jdk-adoptopenjdk/sdp/sdp.conf.template
+	backup = etc/jdk-adoptopenjdk/security/java.policy
 	backup = etc/jdk-adoptopenjdk/security/java.security
-	backup = etc/jdk-adoptopenjdk/security/policy/limited/exempt_local.policy
-	backup = etc/jdk-adoptopenjdk/security/policy/limited/default_US_export.policy
 	backup = etc/jdk-adoptopenjdk/security/policy/limited/default_local.policy
-	backup = etc/jdk-adoptopenjdk/security/policy/unlimited/default_US_export.policy
-	backup = etc/jdk-adoptopenjdk/security/policy/unlimited/default_local.policy
+	backup = etc/jdk-adoptopenjdk/security/policy/limited/default_US_export.policy
+	backup = etc/jdk-adoptopenjdk/security/policy/limited/exempt_local.policy
 	backup = etc/jdk-adoptopenjdk/security/policy/README.txt
-	backup = etc/jdk-adoptopenjdk/security/java.policy
-	backup = etc/jdk-adoptopenjdk/management/management.properties
-	backup = etc/jdk-adoptopenjdk/management/jmxremote.access
-	backup = etc/jdk-adoptopenjdk/management/jmxremote.password.template
+	backup = etc/jdk-adoptopenjdk/security/policy/unlimited/default_local.policy
+	backup = etc/jdk-adoptopenjdk/security/policy/unlimited/default_US_export.policy
 	backup = etc/jdk-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/openjdk12-binaries/releases/download/jdk-12%2B33/OpenJDK12U-jdk_x64_linux_hotspot_12_33.tar.gz
 	source = freedesktop-java.desktop
 	source = freedesktop-jconsole.desktop
 	source = freedesktop-policytool.desktop
 	source = freedesktop-jshell.desktop
-	sha256sums = d02089d834f7702ac1a9776d8d0d13ee174d0656cf036c6b68b9ffb71a6f610e
-	sha256sums = 734aab5e8fca5360fd996142a0c0ff23434da56f83c21b26cfbcbf31556230eb
-	sha256sums = 53b7da18785675438d1d7cfa776be419a313c11049c48f791c7426224fe51025
-	sha256sums = a0cca82e4ebe103d90399911164c17bee61022c67633f55b83d2fc9de15ccd68
-	sha256sums = bc4305c5870fa8e050c0a2cbc629a8f84e366200b436429c789038596a4259f6
+	sha256sums = 4739064dc439a05487744cce0ba951cb544ed5e796f6c699646e16c09da5dd6a
+	sha256sums = 9b11bbaf5834748fc9a30cb887c129b32f34a81535dc512ff47b26ae72c91927
+	sha256sums = 16551b98abbd5cbb9da14157df60afd2a608602c6e3734e979d9574e0780f8da
+	sha256sums = 59ecc9542661f169020867cacba7d8e3723a57ab0b6ccd02c5c1a2fbb898a866
+	sha256sums = 7d46b5ffcb2528f039b4534dddeab4b87de92106c25ff17e175570edde52f1c9
 
 pkgname = jdk-adoptopenjdk
 
diff --git a/PKGBUILD b/PKGBUILD
index 1d53c162f639..9b1e77e9e67c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,13 +7,11 @@
 # This PKGBUILD is maintained on github:
 # https://github.com/michaellass/AUR
 
-_majorver=11
-_minorver=0
-_securityver=2
-_updatever=9
+_majorver=12
+_updatever=33
 pkgrel=1
-pkgver=${_majorver}.${_minorver}.${_securityver}.u${_updatever}
-_tag_ver=${_majorver}.${_minorver}.${_securityver}+${_updatever}
+pkgver=${_majorver}.u${_updatever}
+_tag_ver=${_majorver}+${_updatever}
 
 pkgname=jdk-adoptopenjdk
 pkgdesc="OpenJDK Java ${_majorver} development kit (AdoptOpenJDK build)"
@@ -38,19 +36,20 @@ provides=("java-runtime-headless=${_majorver}"
           "jdk-openjdk=${pkgver}"
           "openjdk${_majorver}-src=${pkgver}"
           "openjdk-src=${pkgver}")
-backup=(etc/${pkgname}/net.properties
-        etc/${pkgname}/logging.properties
+backup=(etc/${pkgname}/logging.properties
+        etc/${pkgname}/management/jmxremote.access
+        etc/${pkgname}/management/jmxremote.password.template
+        etc/${pkgname}/management/management.properties
+        etc/${pkgname}/net.properties
+        etc/${pkgname}/sdp/sdp.conf.template
+        etc/${pkgname}/security/java.policy
         etc/${pkgname}/security/java.security
-        etc/${pkgname}/security/policy/limited/exempt_local.policy
-        etc/${pkgname}/security/policy/limited/default_US_export.policy
         etc/${pkgname}/security/policy/limited/default_local.policy
-        etc/${pkgname}/security/policy/unlimited/default_US_export.policy
-        etc/${pkgname}/security/policy/unlimited/default_local.policy
+        etc/${pkgname}/security/policy/limited/default_US_export.policy
+        etc/${pkgname}/security/policy/limited/exempt_local.policy
         etc/${pkgname}/security/policy/README.txt
-        etc/${pkgname}/security/java.policy
-        etc/${pkgname}/management/management.properties
-        etc/${pkgname}/management/jmxremote.access
-        etc/${pkgname}/management/jmxremote.password.template
+        etc/${pkgname}/security/policy/unlimited/default_local.policy
+        etc/${pkgname}/security/policy/unlimited/default_US_export.policy
         etc/${pkgname}/sound.properties)
 install=install_jdk-adoptopenjdk.sh
 
@@ -59,11 +58,11 @@ source=(https://github.com/AdoptOpenJDK/openjdk${_majorver}-binaries/releases/do
         freedesktop-jconsole.desktop
         freedesktop-policytool.desktop
         freedesktop-jshell.desktop)
-sha256sums=('d02089d834f7702ac1a9776d8d0d13ee174d0656cf036c6b68b9ffb71a6f610e'
-            '734aab5e8fca5360fd996142a0c0ff23434da56f83c21b26cfbcbf31556230eb'
-            '53b7da18785675438d1d7cfa776be419a313c11049c48f791c7426224fe51025'
-            'a0cca82e4ebe103d90399911164c17bee61022c67633f55b83d2fc9de15ccd68'
-            'bc4305c5870fa8e050c0a2cbc629a8f84e366200b436429c789038596a4259f6')
+sha256sums=('4739064dc439a05487744cce0ba951cb544ed5e796f6c699646e16c09da5dd6a'
+            '9b11bbaf5834748fc9a30cb887c129b32f34a81535dc512ff47b26ae72c91927'
+            '16551b98abbd5cbb9da14157df60afd2a608602c6e3734e979d9574e0780f8da'
+            '59ecc9542661f169020867cacba7d8e3723a57ab0b6ccd02c5c1a2fbb898a866'
+            '7d46b5ffcb2528f039b4534dddeab4b87de92106c25ff17e175570edde52f1c9')
 
 _jvmdir=/usr/lib/jvm/java-${_majorver}-adoptopenjdk
 _jdkdir=jdk-${_tag_ver}
@@ -86,7 +85,7 @@ package() {
   ln -sf /usr/share/licenses/${pkgname} legal
 
   # Man pages
-  for f in man/man1/* man/ja/man1/* man/ja_JP.UTF-8/man1/*; do
+  for f in man/man1/*; do
     install -Dm 644 "${f}" "${pkgdir}/usr/share/${f/\.1/-adoptopenjdk${_majorver}.1}"
   done
   rm -rf man
diff --git a/freedesktop-java.desktop b/freedesktop-java.desktop
index 337bb9658c4e..f8dc0114ca2f 100644
--- a/freedesktop-java.desktop
+++ b/freedesktop-java.desktop
@@ -1,8 +1,8 @@
 [Desktop Entry]
-Name=AdoptOpenJDK Java 11 Runtime
-Comment=AdoptOpenJDK Java 11 Runtime
+Name=AdoptOpenJDK Java 12 Runtime
+Comment=AdoptOpenJDK Java 12 Runtime
 Keywords=java;runtime
-Exec=/usr/lib/jvm/java-11-adoptopenjdk/bin/java -jar
+Exec=/usr/lib/jvm/java-12-adoptopenjdk/bin/java -jar
 Terminal=false
 Type=Application
 MimeType=application/x-java-archive;application/java-archive;application/x-jar;
diff --git a/freedesktop-jconsole.desktop b/freedesktop-jconsole.desktop
index a42acf6fb6f7..cc6c6dc59c26 100644
--- a/freedesktop-jconsole.desktop
+++ b/freedesktop-jconsole.desktop
@@ -1,8 +1,8 @@
 [Desktop Entry]
-Name=AdoptOpenJDK Java 11 Console
-Comment=AdoptOpenJDK Java 11 Monitoring & Management Console
+Name=AdoptOpenJDK Java 12 Console
+Comment=AdoptOpenJDK Java 12 Monitoring & Management Console
 Keywords=java;console;monitoring
-Exec=/usr/lib/jvm/java-11-adoptopenjdk/bin/jconsole
+Exec=/usr/lib/jvm/java-12-adoptopenjdk/bin/jconsole
 Terminal=false
 Type=Application
 Categories=Application;System;
diff --git a/freedesktop-jshell.desktop b/freedesktop-jshell.desktop
index f0f91bf4f0b2..ab7e859f50aa 100644
--- a/freedesktop-jshell.desktop
+++ b/freedesktop-jshell.desktop
@@ -1,8 +1,8 @@
 [Desktop Entry]
-Name=AdoptOpenJDK Java 11 Shell
-Comment=AdoptOpenJDK Java 11 Shell
+Name=AdoptOpenJDK Java 12 Shell
+Comment=AdoptOpenJDK Java 12 Shell
 Keywords=java;shell
-Exec=/usr/lib/jvm/java-11-adoptopenjdk/bin/jshell
+Exec=/usr/lib/jvm/java-12-adoptopenjdk/bin/jshell
 Terminal=true
 Type=Application
 Categories=Application;System;
diff --git a/freedesktop-policytool.desktop b/freedesktop-policytool.desktop
index 7a56f593b360..8cdff43f0f9b 100644
--- a/freedesktop-policytool.desktop
+++ b/freedesktop-policytool.desktop
@@ -1,8 +1,8 @@
 [Desktop Entry]
-Name=AdoptOpenJDK Java 11 Policy Tool
-Comment=AdoptOpenJDK Java 11 Policy Tool
+Name=AdoptOpenJDK Java 12 Policy Tool
+Comment=AdoptOpenJDK Java 12 Policy Tool
 Keywords=java;security;policytool
-Exec=/usr/lib/jvm/java-11-adoptopenjdk/bin/policytool
+Exec=/usr/lib/jvm/java-12-adoptopenjdk/bin/policytool
 Terminal=false
 Type=Application
 Categories=Settings;
diff --git a/install_jdk-adoptopenjdk.sh b/install_jdk-adoptopenjdk.sh
index eaf25f39354c..a4a3ed95301e 100644
--- a/install_jdk-adoptopenjdk.sh
+++ b/install_jdk-adoptopenjdk.sh
@@ -1,4 +1,4 @@
-THIS_JDK='java-11-adoptopenjdk'
+THIS_JDK='java-12-adoptopenjdk'
 
 fix_default() {
   if [ ! -x /usr/bin/java ]; then