Upgpkg: 9u0

7 files changed, 102 insertions, 124 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9df5514f3ba4..7b6d2e1a12ca 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,12 +1,11 @@
 pkgbase = jdk
-	pkgdesc = Oracle Java Development Kit
-	pkgver = 8u144
+	pkgdesc = Oracle Java Development Kit Snapshot
+	pkgver = 9u0
 	pkgrel = 1
 	url = http://www.oracle.com/technetwork/java/javase/downloads/index.html
 	install = jdk.install
-	arch = i686
 	arch = x86_64
-	license = custom
+	license = custom:Oracle
 	depends = ca-certificates-java
 	depends = hicolor-icon-theme
 	depends = java-environment-common
@@ -16,45 +15,37 @@ pkgbase = jdk
 	optdepends = alsa-lib: for basic sound support
 	optdepends = eclipse-java: to use "Oracle Java Mission Control" plugins in Eclipse
 	optdepends = gtk2: for Gtk+ look and feel (desktop)
-	provides = java-runtime=8
-	provides = java-runtime-headless=8
-	provides = java-web-start=8
-	provides = java-environment=8
-	provides = java-runtime-jre=8
-	provides = java-runtime-headless-jre=8
-	provides = java-web-start-jre=8
-	provides = java-environment-jdk=8
-	provides = java-openjfx=8
+	provides = java-runtime=9
+	provides = java-runtime-headless=9
+	provides = java-web-start=9
+	provides = java-environment=9
+	provides = java-runtime-jre=9
+	provides = java-runtime-headless-jre=9
+	provides = java-web-start-jre=9
+	provides = java-environment-jdk=9
+	provides = java-openjfx=9
 	options = !strip
-	backup = etc/java-jdk8/amd64/jvm.cfg
-	backup = etc/java-jdk8/images/cursors/cursors.properties
-	backup = etc/java-jdk8/management/jmxremote.access
-	backup = etc/java-jdk8/management/management.properties
-	backup = etc/java-jdk8/security/java.policy
-	backup = etc/java-jdk8/security/java.security
-	backup = etc/java-jdk8/security/javaws.policy
-	backup = etc/java-jdk8/content-types.properties
-	backup = etc/java-jdk8/flavormap.properties
-	backup = etc/java-jdk8/fontconfig.properties.src
-	backup = etc/java-jdk8/logging.properties
-	backup = etc/java-jdk8/net.properties
-	backup = etc/java-jdk8/psfont.properties.ja
-	backup = etc/java-jdk8/psfontj2d.properties
-	backup = etc/java-jdk8/sound.properties
-	source = http://download.oracle.com/otn-pub/java/jce/8/jce_policy-8.zip
-	source = jconsole-jdk8.desktop
-	source = jmc-jdk8.desktop
-	source = jvisualvm-jdk8.desktop
-	source = policytool-jdk8.desktop
-	md5sums = b3c7031bc65c28c2340302065e7d00d3
-	md5sums = b4f0da18e03f7a9623cb073b65dde6c1
-	md5sums = 8f0ebcead2aecad67fbd12ef8ced1503
-	md5sums = a4a21b064ff9f3c3f3fdb95edf5ac6f3
-	md5sums = 98245ddb13914a74f0cc5a028fffddca
-	source_i686 = http://download.oracle.com/otn-pub/java/jdk/8u144-b01/090f390dda5b47b9b721c7dfaa008135/jdk-8u144-linux-i586.tar.gz
-	md5sums_i686 = 13d771707f326b02e2497c99e0a2ca37
-	source_x86_64 = http://download.oracle.com/otn-pub/java/jdk/8u144-b01/090f390dda5b47b9b721c7dfaa008135/jdk-8u144-linux-x64.tar.gz
-	md5sums_x86_64 = 2d59a3add1f213cd249a67684d4aeb83
+	backup = etc/java-jdk9/management/jmxremote.access
+	backup = etc/java-jdk9/management/management.properties
+	backup = etc/java-jdk9/security/java.policy
+	backup = etc/java-jdk9/security/java.security
+	backup = etc/java-jdk9/security/javaws.policy
+	backup = etc/java-jdk9/fontconfig.properties.src
+	backup = etc/java-jdk9/logging.properties
+	backup = etc/java-jdk9/net.properties
+	backup = etc/java-jdk9/psfont.properties.ja
+	backup = etc/java-jdk9/psfontj2d.properties
+	backup = etc/java-jdk9/sound.properties
+	source = http://download.oracle.com/otn-pub/java/jdk/9+181/jdk-9_linux-x64_bin.tar.gz
+	source = jconsole-jdk9.desktop
+	source = jmc-jdk9.desktop
+	source = jvisualvm-jdk9.desktop
+	source = policytool-jdk9.desktop
+	sha256sums = 1c6d783a54fcc0673ed1f8c5e8650b1d8977ca3e856a03fba0090198e0f16f6d
+	sha256sums = 100fd0162a4be04371d9d53121bd511aeb0a230475497a8c19ed0cff20915efc
+	sha256sums = e4059de8ec0dee1a5eabd1d67a053509aa0009ba6e08739b11140c26f2fcc55a
+	sha256sums = 1f74cc627bd6a934681fe2d453058c21794d1435205c501f7fecdaf2c94f5485
+	sha256sums = ff6684d7d5c26cc805e6f3918284a95b48223db4f37956f35a344373a2931aa4
 
 pkgname = jdk
 
diff --git a/PKGBUILD b/PKGBUILD
index e85271eaf37e..5007a9b1eda1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,17 +1,16 @@
 # Maintainer: Det <nimetonmaili g-mail>
-# Based on jre: https://aur.archlinux.org/packages/jre/
 
 pkgname=jdk
-_major=8
-_minor=144
-_build=b01
-_hash=090f390dda5b47b9b721c7dfaa008135
+_major=9
+_minor=0
+_build=181
 pkgver=${_major}u${_minor}
 pkgrel=1
-pkgdesc="Oracle Java Development Kit"
-arch=('i686' 'x86_64')
-url=http://www.oracle.com/technetwork/java/javase/downloads/index.html
-license=('custom')
+pkgdesc="Oracle Java Development Kit 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-environment-common' 'java-runtime-common' 'nss' 'xdg-utils')
 optdepends=('alsa-lib: for basic sound support'
             'eclipse-java: to use "Oracle Java Mission Control" plugins in Eclipse'
@@ -24,44 +23,39 @@ provides=("java-runtime=$_major" "java-runtime-headless=$_major" "java-web-start
 DLAGENTS=('http::/usr/bin/curl -fLC - --retry 3 --retry-delay 3 -b oraclelicense=a -o %o %u')
 _jname=${pkgname}${_major}
 _jvmdir=/usr/lib/jvm/java-$_major-$pkgname
-
-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"
 options=('!strip') # JDK debug-symbols
 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"
         "jconsole-$_jname.desktop"
         "jmc-$_jname.desktop"
         "jvisualvm-$_jname.desktop"
         "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'
-         'b4f0da18e03f7a9623cb073b65dde6c1'
-         '8f0ebcead2aecad67fbd12ef8ced1503'
-         'a4a21b064ff9f3c3f3fdb95edf5ac6f3'
-         '98245ddb13914a74f0cc5a028fffddca')
-md5sums_i686=('13d771707f326b02e2497c99e0a2ca37')
-md5sums_x86_64=('2d59a3add1f213cd249a67684d4aeb83')
+#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=('1c6d783a54fcc0673ed1f8c5e8650b1d8977ca3e856a03fba0090198e0f16f6d'
+            '100fd0162a4be04371d9d53121bd511aeb0a230475497a8c19ed0cff20915efc'
+            'e4059de8ec0dee1a5eabd1d67a053509aa0009ba6e08739b11140c26f2fcc55a'
+            '1f74cc627bd6a934681fe2d453058c21794d1435205c501f7fecdaf2c94f5485'
+            'ff6684d7d5c26cc805e6f3918284a95b48223db4f37956f35a344373a2931aa4')
+#sha256sums_i686=('ba0c77644ece024cdb933571d79f0f035e91a9c9ab70de9c82446c9fbd000c97')
+#sha256sums_x86_64=('2ef49c97ddcd5e0de20226eea4cca7b0d7de63ddec80eff8291513f6474ca0dc')
 ## 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
@@ -70,20 +64,11 @@ package() {
     install -d "$pkgdir"/usr/share/licenses/java$_major-$pkgname
 
     msg2 "Removing redundancies..."
-    rm    db/bin/*.bat
-    rm    db/3RDPARTY
-    rm    db/LICENSE
-    rm -r jre/lib/desktop/icons/HighContrast/
-    rm -r jre/lib/desktop/icons/HighContrastInverse/
-    rm -r jre/lib/desktop/icons/LowContrast/
-    rm    jre/lib/fontconfig.*.bfc
-    rm    jre/lib/fontconfig.*.properties.src
-    rm -r jre/plugin/
-    rm    jre/*.txt
-    rm    jre/COPYRIGHT
-    rm    jre/LICENSE
-    rm    jre/README
-    rm    man/ja
+    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
 
     msg2 "Moving contents..."
     mv * "$pkgdir"/$_jvmdir
@@ -91,66 +76,68 @@ package() {
     # Cd to the new playground
     cd "$pkgdir"/$_jvmdir
 
-    msg2 "Fixing directory structure..."
-    # Replace duplicate binaries in bin/ with links to jre/bin/
-    for i in $(ls jre/bin/); do
-        ln -sf "$_jvmdir/jre/bin/$i" "bin/$i"
-    done
+    # Create a placeholder 'jre' link
+    ln -s . jre
 
+    msg2 "Fixing directory structure..."
     # Suffix .desktops + icons (sun-java.png -> sun-java-$_jname.png)
-    for i in $(find jre/lib/desktop/ -type f); do
+    for i in $(find lib/desktop/ -type f); do
         rename -- "." "-$_jname." $i
     done
 
-    # Fix .desktop paths
-    sed -e "s|Exec=|Exec=$_jvmdir/jre/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 jre/lib/desktop/applications/*
+    -i lib/desktop/applications/*
 
     # Move .desktops + icons to /usr/share
-    mv jre/lib/desktop/* "$pkgdir"/usr/share/
+    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/jre/lib -> /etc
+    # 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="jre/lib/${new_etc_path#*$_jname/}"
+        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
     case "$CARCH" in
-        i686)   ln -sf $_jvmdir/jre/lib/i386/libnpjp2.so  "$pkgdir"/usr/lib/mozilla/plugins/libnpjp2-$_jname.so ;;
-        x86_64) ln -sf $_jvmdir/jre/lib/amd64/libnpjp2.so "$pkgdir"/usr/lib/mozilla/plugins/libnpjp2-$_jname.so ;;
+        i686)   ln -sf $_jvmdir/lib/i386/libnpjp2.so  "$pkgdir"/usr/lib/mozilla/plugins/libnpjp2-$_jname.so ;;
+        x86_64) ln -sf $_jvmdir/lib/amd64/libnpjp2.so "$pkgdir"/usr/lib/mozilla/plugins/libnpjp2-$_jname.so ;;
     esac
 
     # Replace JKS keystore with 'ca-certificates-java'
-    ln -sf /etc/ssl/certs/java/cacerts jre/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
+    ln -sf /etc/ssl/certs/java/cacerts lib/security/cacerts
 
     # Move/link licenses
-    mv db/NOTICE COPYRIGHT LICENSE *.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 jre/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/jconsole-jdk8.desktop b/jconsole-jdk9.desktop
index ee4f02b436b3..8df3672915c0 100644
--- a/jconsole-jdk8.desktop
+++ b/jconsole-jdk9.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
-Exec=/usr/lib/jvm/java-8-jdk/bin/jconsole
-Icon=sun-java-jdk8
+Exec=/usr/lib/jvm/java-9-jdk/bin/jconsole
+Icon=sun-java-jdk9
 Name=Java Monitoring and Management Console
 StartupNotify=true
 Terminal=false
diff --git a/jdk.install b/jdk.install
index fa8e3bbf8171..8ec9c28c84cc 100644
--- a/jdk.install
+++ b/jdk.install
@@ -1,4 +1,4 @@
-THIS_JAVA='java-8-jdk'
+THIS_JAVA='java-9-jdk'
 NAME='JDK'
 
 all_off="$(tput sgr0)"
diff --git a/jmc-jdk8.desktop b/jmc-jdk9.desktop
index b28e16dc100a..ceb74b02e46a 100644
--- a/jmc-jdk8.desktop
+++ b/jmc-jdk9.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
-Exec=/usr/lib/jvm/java-8-jdk/bin/jmc
-Icon=sun-java-jdk8
+Exec=/usr/lib/jvm/java-9-jdk/bin/jmc
+Icon=sun-java-jdk9
 Name=Java Mission Control
 StartupNotify=true
 Terminal=false
diff --git a/jvisualvm-jdk8.desktop b/jvisualvm-jdk9.desktop
index 5b294811e568..745ab8005da8 100644
--- a/jvisualvm-jdk8.desktop
+++ b/jvisualvm-jdk9.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
-Exec=/usr/lib/jvm/java-8-jdk/bin/jvisualvm
+Exec=/usr/lib/jvm/java-9-jdk/bin/jvisualvm
 GenericName=Java Monitoring and Performance Monitoring Tool
-Icon=sun-java-jdk8
+Icon=sun-java-jdk9
 Name=Java VisualVM
 StartupNotify=true
 Terminal=false
diff --git a/policytool-jdk8.desktop b/policytool-jdk9.desktop
index 0b037ee45beb..61e57cfdeb80 100644
--- a/policytool-jdk8.desktop
+++ b/policytool-jdk9.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
-Exec=/usr/lib/jvm/java-8-jdk/jre/bin/policytool
-Icon=sun-java-jdk8
+Exec=/usr/lib/jvm/java-9-jdk/bin/policytool
+Icon=sun-java-jdk9
 Name=Java Policy Settings
 StartupNotify=true
 Terminal=false