Upgpkg: 10

4 files changed, 32 insertions, 39 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0401e1d65fbd..b5e95c3d0f4f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = jre
 	pkgdesc = Oracle Java Runtime Environment
-	pkgver = 9.0.4
+	pkgver = 10
 	pkgrel = 1
 	url = http://www.oracle.com/technetwork/java/javase/downloads/index.html
 	install = jre.install
@@ -13,29 +13,29 @@ pkgbase = jre
 	depends = xdg-utils
 	optdepends = alsa-lib: for basic sound support
 	optdepends = gtk2: for Gtk+ look and feel (desktop)
-	provides = java-runtime=9
-	provides = java-runtime-headless=9
-	provides = java-web-start=9
-	provides = java-runtime-jre=9
-	provides = java-runtime-headless-jre=9
-	provides = java-web-start-jre=9
-	provides = java-openjfx=9
-	conflicts = java-runtime-jre=9
-	backup = etc/java-jre9/management/jmxremote.access
-	backup = etc/java-jre9/management/management.properties
-	backup = etc/java-jre9/security/java.policy
-	backup = etc/java-jre9/security/java.security
-	backup = etc/java-jre9/security/javaws.policy
-	backup = etc/java-jre9/fontconfig.properties.src
-	backup = etc/java-jre9/logging.properties
-	backup = etc/java-jre9/net.properties
-	backup = etc/java-jre9/psfont.properties.ja
-	backup = etc/java-jre9/psfontj2d.properties
-	backup = etc/java-jre9/sound.properties
-	source = http://download.oracle.com/otn-pub/java/jdk/9.0.4+11/c2514751926b4512b076cc82f959763f/jre-9.0.4_linux-x64_bin.tar.gz
-	source = policytool-jre9.desktop
-	sha256sums = 331d6560ba0eadd6266e082e1a3ccd26777c48db881be07cb496805cd301d705
-	sha256sums = de76dfab62f38b061fe3c99053451ed0d1b9971e892c44e7b893c604607e5694
+	provides = java-runtime=10
+	provides = java-runtime-headless=10
+	provides = java-web-start=10
+	provides = java-runtime-jre=10
+	provides = java-runtime-headless-jre=10
+	provides = java-web-start-jre=10
+	provides = java-openjfx=10
+	conflicts = java-runtime-jre=10
+	backup = etc/java-jre10/management/jmxremote.access
+	backup = etc/java-jre10/management/management.properties
+	backup = etc/java-jre10/security/java.policy
+	backup = etc/java-jre10/security/java.security
+	backup = etc/java-jre10/security/javaws.policy
+	backup = etc/java-jre10/fontconfig.properties.src
+	backup = etc/java-jre10/logging.properties
+	backup = etc/java-jre10/net.properties
+	backup = etc/java-jre10/psfont.properties.ja
+	backup = etc/java-jre10/psfontj2d.properties
+	backup = etc/java-jre10/sound.properties
+	source = http://download.oracle.com/otn-pub/java/jdk/10+46/76eac37278c24557a3c4199677f19b62/jre-10_linux-x64_bin.tar.gz
+	source = policytool-jre10.desktop
+	sha256sums = 9c147ae25aceccf5bc2c9a878d0e7e5885b21ffbd861db6f8241d10915e38ab2
+	sha256sums = 175bf53f43aa42bcf719b9d08d6cbc926fb6e3fbdf2eea7a8090c1750a285a7f
 
 pkgname = jre
 
diff --git a/PKGBUILD b/PKGBUILD
index 7081493991a0..a000cc8aa590 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,10 +1,10 @@
 # Maintainer: Det <nimetonmaili g-mail>
 
 pkgname=jre
-pkgver=9.0.4
+pkgver=10
 _major=${pkgver/.*}
-_build=11
-_hash=c2514751926b4512b076cc82f959763f
+_build=46
+_hash=76eac37278c24557a3c4199677f19b62
 pkgrel=1
 pkgdesc="Oracle Java Runtime Environment"
 arch=('x86_64')
@@ -37,8 +37,8 @@ backup=("etc/java-$_jname/management/jmxremote.access"
 install=$pkgname.install
 source=("http://download.oracle.com/otn-pub/java/jdk/${pkgver}+${_build}/${_hash}/${pkgname}-${pkgver}_linux-x64_bin.tar.gz"
         "policytool-$_jname.desktop")
-sha256sums=('331d6560ba0eadd6266e082e1a3ccd26777c48db881be07cb496805cd301d705'
-            'de76dfab62f38b061fe3c99053451ed0d1b9971e892c44e7b893c604607e5694')
+sha256sums=('9c147ae25aceccf5bc2c9a878d0e7e5885b21ffbd861db6f8241d10915e38ab2'
+            '175bf53f43aa42bcf719b9d08d6cbc926fb6e3fbdf2eea7a8090c1750a285a7f')
 
 package() {
     cd $pkgname-$pkgver
@@ -118,13 +118,6 @@ package() {
     mv legal/ "$pkgdir"/usr/share/licenses/java$_major-$pkgname/
     ln -sf /usr/share/licenses/java$_major-$pkgname/ "$pkgdir"/usr/share/licenses/$pkgname
 
-    # msg2 "Enabling Java Cryptography Extension (JCE) Unlimited Strength Jurisdiction Policy..."
-    # # Replace default "strong", but limited, cryptography to get an "unlimited strength" one for
-    # # things like 256-bit AES. Enabled by default in OpenJDK:
-    # # - http://suhothayan.blogspot.com/2012/05/how-to-install-java-cryptography.html
-    # # - http://www.eyrie.org/~eagle/notes/debian/jce-policy.html
-    # sed -i "s/crypto.policy=limited/crypto.policy=unlimited/" "$pkgdir"/etc/java-$_jname/security/java.security
-
     msg2 "Enabling copy+paste in unsigned applets..."
     # Copy/paste from system clipboard to unsigned Java applets has been disabled since 6u24:
     # - https://blogs.oracle.com/kyle/entry/copy_and_paste_in_java
diff --git a/jre.install b/jre.install
index 2b84f54c2ad2..402495189bed 100644
--- a/jre.install
+++ b/jre.install
@@ -1,4 +1,4 @@
-THIS_JAVA='java-9-jre/jre'
+THIS_JAVA='java-10-jre/jre'
 NAME='JRE'
 
 all_off="$(tput sgr0)"
diff --git a/policytool-jre9.desktop b/policytool-jre10.desktop
index 50ea3b979de5..578043c1844d 100644
--- a/policytool-jre9.desktop
+++ b/policytool-jre10.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
-Exec=/usr/lib/jvm/java-9-jre/jre/bin/policytool
-Icon=sun-java-jre9
+Exec=/usr/lib/jvm/java-10-jre/jre/bin/policytool
+Icon=sun-java-jre10
 Name=Java Policy Settings
 StartupNotify=true
 Terminal=false