Upgpkg: 9u0

4 files changed, 71 insertions, 85 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 02d8f51ef451..6306b7bbb1c7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,12 +1,11 @@
 pkgbase = jre
-	pkgdesc = Oracle Java Runtime Environment
-	pkgver = 8u144
+	pkgdesc = Oracle Java Runtime Environment Snapshot
+	pkgver = 9u0
 	pkgrel = 1
 	url = http://www.oracle.com/technetwork/java/javase/downloads/index.html
 	install = jre.install
-	arch = i686
 	arch = x86_64
-	license = custom
+	license = custom:Oracle
 	depends = ca-certificates-java
 	depends = hicolor-icon-theme
 	depends = java-runtime-common
@@ -14,36 +13,28 @@ pkgbase = jre
 	depends = xdg-utils
 	optdepends = alsa-lib: for basic sound support
 	optdepends = gtk2: for Gtk+ look and feel (desktop)
-	provides = java-runtime=8
-	provides = java-runtime-headless=8
-	provides = java-web-start=8
-	provides = java-runtime-jre=8
-	provides = java-runtime-headless-jre=8
-	provides = java-web-start-jre=8
-	provides = java-openjfx=8
-	backup = etc/java-jre8/amd64/jvm.cfg
-	backup = etc/java-jre8/images/cursors/cursors.properties
-	backup = etc/java-jre8/management/jmxremote.access
-	backup = etc/java-jre8/management/management.properties
-	backup = etc/java-jre8/security/java.policy
-	backup = etc/java-jre8/security/java.security
-	backup = etc/java-jre8/security/javaws.policy
-	backup = etc/java-jre8/content-types.properties
-	backup = etc/java-jre8/flavormap.properties
-	backup = etc/java-jre8/fontconfig.properties.src
-	backup = etc/java-jre8/logging.properties
-	backup = etc/java-jre8/net.properties
-	backup = etc/java-jre8/psfont.properties.ja
-	backup = etc/java-jre8/psfontj2d.properties
-	backup = etc/java-jre8/sound.properties
-	source = http://download.oracle.com/otn-pub/java/jce/8/jce_policy-8.zip
-	source = policytool-jre8.desktop
-	md5sums = b3c7031bc65c28c2340302065e7d00d3
-	md5sums = 762729fa0faba8ff2b5a29c249c95079
-	source_i686 = http://download.oracle.com/otn-pub/java/jdk/8u144-b01/090f390dda5b47b9b721c7dfaa008135/jre-8u144-linux-i586.tar.gz
-	md5sums_i686 = 794e74d0395124337809dcc225c80411
-	source_x86_64 = http://download.oracle.com/otn-pub/java/jdk/8u144-b01/090f390dda5b47b9b721c7dfaa008135/jre-8u144-linux-x64.tar.gz
-	md5sums_x86_64 = e3808f24d0f588b0c313fa18b50683c6
+	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
+	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+181/jre-9_linux-x64_bin.tar.gz
+	source = policytool-jre9.desktop
+	sha256sums = abf54b9905850851ae5de10db1d664ca0625c79ccd505c5e3fc62f6d969424a2
+	sha256sums = de76dfab62f38b061fe3c99053451ed0d1b9971e892c44e7b893c604607e5694
 
 pkgname = jre
 
diff --git a/PKGBUILD b/PKGBUILD
index a3bd639a26dc..b72faaa2e963 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,18 +1,16 @@
 # Maintainer: Det <nimetonmaili g-mail>
-# Contributors: Charles Ghislain, Guillaume ALAUX, Daniel J Griffiths, Jason Chu, Geoffroy Carrier,
-#               Army, kfgz, Thomas Dziedzic, Dan Serban, jjacky, EasySly
 
 pkgname=jre
-_major=8
-_minor=144
-_build=b01
-_hash=090f390dda5b47b9b721c7dfaa008135
+_major=9
+_minor=0
+_build=181
 pkgver=${_major}u${_minor}
 pkgrel=1
-pkgdesc="Oracle Java Runtime Environment"
-arch=('i686' 'x86_64')
-url=http://www.oracle.com/technetwork/java/javase/downloads/index.html
-license=('custom')
+pkgdesc="Oracle Java Runtime Environment Snapshot"
+#arch=('i686' 'x86_64')
+arch=('x86_64')
+url="http://www.oracle.com/technetwork/java/javase/downloads/index.html"
+license=('custom:Oracle')
 depends=('ca-certificates-java' 'hicolor-icon-theme' 'java-runtime-common' 'nss' 'xdg-utils')
 optdepends=('alsa-lib: for basic sound support'
             'gtk2: for Gtk+ look and feel (desktop)')
@@ -25,36 +23,31 @@ DLAGENTS=('http::/usr/bin/curl -fLC - --retry 3 --retry-delay 3 -b oraclelicense
 _jname=${pkgname}${_major}
 _jvmdir=/usr/lib/jvm/java-$_major-$pkgname/jre
 
-backup=("etc/java-$_jname/amd64/jvm.cfg"
-        "etc/java-$_jname/images/cursors/cursors.properties"
-        "etc/java-$_jname/management/jmxremote.access"
+backup=("etc/java-$_jname/management/jmxremote.access"
         "etc/java-$_jname/management/management.properties"
         "etc/java-$_jname/security/java.policy"
         "etc/java-$_jname/security/java.security"
         "etc/java-$_jname/security/javaws.policy"
-        "etc/java-$_jname/content-types.properties"
-        "etc/java-$_jname/flavormap.properties"
         "etc/java-$_jname/fontconfig.properties.src"
         "etc/java-$_jname/logging.properties"
         "etc/java-$_jname/net.properties"
         "etc/java-$_jname/psfont.properties.ja"
         "etc/java-$_jname/psfontj2d.properties"
         "etc/java-$_jname/sound.properties")
-[[ $CARCH = i686 ]] && backup[0]="etc/java-$_jname/i386/jvm.cfg"
 install=$pkgname.install
-source=("http://download.oracle.com/otn-pub/java/jce/$_major/jce_policy-$_major.zip"
+source=("http://download.oracle.com/otn-pub/java/jdk/${_major}+${_build}/${pkgname}-${_major}_linux-x64_bin.tar.gz"
         "policytool-$_jname.desktop")
-source_i686=("http://download.oracle.com/otn-pub/java/jdk/$pkgver-$_build/$_hash/$pkgname-$pkgver-linux-i586.tar.gz")
-source_x86_64=("http://download.oracle.com/otn-pub/java/jdk/$pkgver-$_build/$_hash/$pkgname-$pkgver-linux-x64.tar.gz")
-md5sums=('b3c7031bc65c28c2340302065e7d00d3'
-         '762729fa0faba8ff2b5a29c249c95079')
-md5sums_i686=('794e74d0395124337809dcc225c80411')
-md5sums_x86_64=('e3808f24d0f588b0c313fa18b50683c6')
+#source_i686=("http://download.oracle.com/otn-pub/java/jdk/$pkgver-$_build/$_hash/$pkgname-$pkgver-linux-i586.tar.gz")
+#source_x86_64=("http://download.oracle.com/otn-pub/java/jdk/$pkgver-$_build/$_hash/$pkgname-$pkgver-linux-x64.tar.gz")
+sha256sums=('abf54b9905850851ae5de10db1d664ca0625c79ccd505c5e3fc62f6d969424a2'
+            'de76dfab62f38b061fe3c99053451ed0d1b9971e892c44e7b893c604607e5694')
+#sha256sums_i686=('5eab48ae34b1b2bb6ae3050fd12fdc31f9f5ed736aa406a03ac932ae6e24025c')
+#sha256sums_x86_64=('69a4e792953127c0827255e64a925cf1fb2e75e7ad1fe0dc07004fd46ed3d890')
 ## Alternative mirror, if your local one is throttled:
 #source_x86_64=("http://ftp.wsisiz.edu.pl/pub/pc/pozyteczne%20oprogramowanie/java/$pkgname-$pkgver-linux-x64.gz")
 
 package() {
-    cd ${pkgname}1.${_major}.0_${_minor}
+    cd $pkgname-$_major
 
     msg2 "Creating directory structure..."
     install -d "$pkgdir"/etc/.java/.systemPrefs
@@ -63,13 +56,11 @@ package() {
     install -d "$pkgdir"/usr/share/licenses/java$_major-$pkgname
 
     msg2 "Removing redundancies..."
-    rm -r lib/desktop/icons/HighContrast/
-    rm -r lib/desktop/icons/HighContrastInverse/
-    rm -r lib/desktop/icons/LowContrast/
+    rm -r lib/desktop/icons/HighContrast
+    rm -r lib/desktop/icons/HighContrastInverse
+    rm -r lib/desktop/icons/LowContrast
     rm    lib/fontconfig.*.bfc
     rm    lib/fontconfig.*.properties.src
-    rm    man/ja
-    rm -r plugin/
 
     msg2 "Moving contents..."
     mv * "$pkgdir"/$_jvmdir
@@ -83,8 +74,11 @@ package() {
         rename -- "." "-$_jname." $i
     done
 
-    # Fix .desktop paths
-    sed -e "s|Exec=|Exec=$_jvmdir/bin/|" \
+    # Fix .desktop's
+    sed -e '/JavaWS/!s|Name=Java|Name=Java '"$_major"'|' \
+        -e "s|Name=JavaWS|Name=JavaWS $_major|" \
+        -e "s|Comment=Java|Comment=Java $_major|" \
+        -e "s|Exec=|Exec=$_jvmdir/bin/|" \
         -e "s|.png|-$_jname.png|" \
     -i lib/desktop/applications/*
 
@@ -92,14 +86,26 @@ package() {
     mv lib/desktop/* "$pkgdir"/usr/share/
     install -m644 "$srcdir"/*.desktop "$pkgdir"/usr/share/applications/
 
+    # Move confs to /etc and link back to /usr: /usr/lib/jvm/java-$_jname/conf -> /etc
+    for old_usr_path in $(find conf/ -type f); do
+        # New location
+        new_etc_path="/etc/java-$_jname/${old_usr_path/conf\/}"
+
+        # Move /link
+        install -Dm644 "$old_usr_path" "$pkgdir/$new_etc_path"
+        ln -sf "$new_etc_path" "$old_usr_path"
+    done
+
     # Move confs to /etc and link back to /usr: /usr/lib/jvm/java-$_jname/lib -> /etc
     for new_etc_path in ${backup[@]}; do
         # Old location
         old_usr_path="lib/${new_etc_path#*$_jname/}"
 
-        # Move
-        install -Dm644 "$old_usr_path" "$pkgdir/$new_etc_path"
-        ln -sf "/$new_etc_path" "$old_usr_path"
+        # Move/link
+        if [[ -f $old_usr_path ]]; then
+            install -Dm644 "$old_usr_path" "$pkgdir/$new_etc_path"
+            ln -sf "/$new_etc_path" "$old_usr_path"
+        fi
     done
 
     # Link NPAPI plugin
@@ -111,27 +117,16 @@ package() {
     # Replace JKS keystore with 'ca-certificates-java'
     ln -sf /etc/ssl/certs/java/cacerts lib/security/cacerts
 
-    # Suffix man pages
-    for i in $(find man/ -type f); do
-        mv "$i" "${i/.1}-$_jname.1"
-    done
-
-    # Move man pages
-    mv man/ja_JP.UTF-8/ man/ja
-    mv man/ "$pkgdir"/usr/share
-
     # Move/link licenses
-    mv COPYRIGHT LICENSE README *.txt "$pkgdir"/usr/share/licenses/java$_major-$pkgname/
+    mv legal/ "$pkgdir"/usr/share/licenses/java$_major-$pkgname/
     ln -sf /usr/share/licenses/java$_major-$pkgname/ "$pkgdir"/usr/share/licenses/$pkgname
 
-    msg2 "Installing Java Cryptography Extension (JCE) Unlimited Strength Jurisdiction Policy Files..."
+    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
-    install -m644 "$srcdir"/UnlimitedJCEPolicyJDK$_major/*.jar lib/security/
-    install -Dm644 "$srcdir"/UnlimitedJCEPolicyJDK$_major/README.txt \
-                   "$pkgdir"/usr/share/doc/$pkgname/README_-_Java_JCE_Unlimited_Strength.txt
+    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:
diff --git a/jre.install b/jre.install
index 0d0957a329c5..6fefc8833cc7 100644
--- a/jre.install
+++ b/jre.install
@@ -1,4 +1,4 @@
-THIS_JAVA='java-8-jre/jre'
+THIS_JAVA='java-9-jre/jre'
 NAME='JRE'
 
 all_off="$(tput sgr0)"
diff --git a/policytool-jre8.desktop b/policytool-jre9.desktop
index a79f4209a2b2..50ea3b979de5 100644
--- a/policytool-jre8.desktop
+++ b/policytool-jre9.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
-Exec=/usr/lib/jvm/java-8-jre/jre/bin/policytool
-Icon=sun-java-jre8
+Exec=/usr/lib/jvm/java-9-jre/jre/bin/policytool
+Icon=sun-java-jre9
 Name=Java Policy Settings
 StartupNotify=true
 Terminal=false