[arch-commits] Commit in java9-openjdk/trunk (PKGBUILD)

[Guillaume Alaux via arch-commits]

Date: Saturday, February 3, 2018 @ 14:24:22
  Author: guillaume
Revision: 315802

Upstream release 9.0.4+11

Modified:
  java9-openjdk/trunk/PKGBUILD

--+
 PKGBUILD |   35 +++
 1 file changed, 19 insertions(+), 16 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-02-03 14:17:30 UTC (rev 315801)
+++ PKGBUILD2018-02-03 14:24:22 UTC (rev 315802)
@@ -15,12 +15,14 @@
 
 pkgname=('jre9-openjdk-headless' 'jre9-openjdk' 'jdk9-openjdk' 'openjdk9-src' 
'openjdk9-doc')
 _majorver=9
-_updatever=181
+_minorver=0
+_securityver=4
+_updatever=11
 pkgbase=java$_majorver-openjdk
-pkgver=$_majorver.u$_updatever
-_hg_tag="jdk-$_majorver+$_updatever"
+pkgver=$_majorver.$_minorver.$_securityver.u$_updatever
+_hg_tag="jdk-$_majorver.$_minorver.$_securityver+$_updatever"
 _repo_ver=jdk$_java_ver.$_hg_tag
-pkgrel=4
+pkgrel=1
 _pkg_full_ver=$pkgver-$pkgrel
 arch=('x86_64')
 url='http://openjdk.java.net/'
@@ -35,7 +37,7 @@
  # 'libjpeg-turbo' 'giflib' 'libpng' 'lcms2' already pulled
  # 'bash' OpenJDK scripts are explicitly Bash
 checkdepends=()
-_url_src=http://hg.openjdk.java.net/jdk9/jdk9
+_url_src=http://hg.openjdk.java.net/jdk-updates/jdk9u
 source=("jdk9u-${_repo_ver}.tar.gz::$_url_src/archive/$_hg_tag.tar.gz"
 "corba-${_repo_ver}.tar.gz::$_url_src/corba/archive/$_hg_tag.tar.gz"
 
"hotspot-${_repo_ver}.tar.gz::$_url_src/hotspot/archive/$_hg_tag.tar.gz"
@@ -47,14 +49,14 @@
 freedesktop-java.desktop
 freedesktop-jconsole.desktop
 freedesktop-policytool.desktop)
-sha256sums=('02fd41467add2e02e0a4e278c0a2d99a8e2d986b640b66745e23d18dc9e7f230'
-'72c388d71e9610905a1b62e837fd8a277533766c1c47440c5af9c84f57337dbf'
-'1a0e239643c0157b940f3e4a3c545d99d317ba8b28dfdcf5ed2fd49853905602'
-'f963e67c791d96fc7e98126eff8fced4b6d457ea42174a4d51db74cc60cabdc9'
-'7071612b0c3a8e270e90999606fc60b9499a6cc87c872dd6f2e7e4b7e415e34b'
-'5c25d68928300df962ec5a339f8244542e701c79dd80fe04f72e0fa00d6ffc96'
-'f7120270546c7e26a58edfe811005f78f4f90cbf7c35dbad459a516395cc45f1'
-'d6b4f79182fda4abea7bb2c53181aa734a469772db1901c187dea8977885918a'
+sha256sums=('bd8f7d0a945cad70f6321300d1c67e1977104e5e55545cfa2bbac8dd1dc01af9'
+'27092712fa9058f5242e39cee1e7b094b63af14ff373ba432135c0e2ba2fd9cc'
+'50bbfdb27e2ec32cff994dfe2f5e0fca4af003c653ff64c894966ac1ee9864c4'
+'3a9445d9a7d771276095394d7fe5dbdb904c1f32892eb15b96033d51ab856e18'
+'b708aefda1b4ad5f81740e76fc1467cd4f0faaab0c5e73febb46d96ac8f883af'
+'c2c74b04638a98995397bbbd1e0e1f2a709d71ed3fe5188d1fa13bd425604e3d'
+'9e9f87c56af02682eb9426bf94487376090fcb431390e87cbf3a29036fc5cad8'
+'c64c7c51fcca7c8f1dc4705842c1f2d8ad3479b78aa45b37f1dd6cd2ac39dd73'
 '85d32321fb59a89e4f9ab320060597d4ca9d5e23b995c61549a48b41ac908a67'
 'bf197deb003879ed01adc6973a2430a41574f638667a5ecfbb1aad1403897ddc'
 '9394de47b5c38826ab837145816667d96b697998bafec5dd132d39d4846ac70e')
@@ -65,7 +67,8 @@
 esac
 
 _jvmdir=/usr/lib/jvm/java-$_majorver-openjdk
-_imgdir=jdk$_majorver-$_hg_tag/build/linux-$_JARCH-normal-server-release/images
+_jdkdir=jdk${_majorver}u-$_hg_tag
+_imgdir=$_jdkdir/build/linux-$_JARCH-normal-server-release/images
 
 _nonheadless=(lib/libawt_xawt.{so,diz}
   lib/libjawt.{so,diz}
@@ -73,7 +76,7 @@
   lib/libsplashscreen.{so,diz})
 
 prepare() {
-  cd "jdk$_majorver-$_hg_tag"
+  cd $_jdkdir
   for subrepo in corba hotspot jdk jaxws jaxp langtools nashorn
   do
 ln -s ../$subrepo-$_hg_tag $subrepo
@@ -81,7 +84,7 @@
 }
 
 build() {
-  cd "jdk$_majorver-$_hg_tag"
+  cd $_jdkdir
 
   NUM_PROC_OPT=''
   MAKEFLAG_J=$(echo $MAKEFLAGS | sed -En 's/.*-j([0-9]+).*/\1/p')

[arch-commits] Commit in java9-openjdk/trunk (PKGBUILD)

[Guillaume Alaux]

Date: Saturday, October 7, 2017 @ 17:31:30
  Author: guillaume
Revision: 307131

Bump pkgrel to deliver 9.u181-4

Modified:
  java9-openjdk/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-10-07 16:46:51 UTC (rev 307130)
+++ PKGBUILD2017-10-07 17:31:30 UTC (rev 307131)
@@ -20,7 +20,7 @@
 pkgver=$_majorver.u$_updatever
 _hg_tag="jdk-$_majorver+$_updatever"
 _repo_ver=jdk$_java_ver.$_hg_tag
-pkgrel=3
+pkgrel=4
 _pkg_full_ver=$pkgver-$pkgrel
 arch=('i686' 'x86_64')
 url='http://openjdk.java.net/'

[arch-commits] Commit in java9-openjdk/trunk (PKGBUILD)

[Guillaume Alaux]

Date: Saturday, October 7, 2017 @ 16:46:51
  Author: guillaume
Revision: 307130

Fix so file permissions

Modified:
  java9-openjdk/trunk/PKGBUILD

--+
 PKGBUILD |3 +++
 1 file changed, 3 insertions(+)

Modified: PKGBUILD
===
--- PKGBUILD2017-10-07 16:23:28 UTC (rev 307129)
+++ PKGBUILD2017-10-07 16:46:51 UTC (rev 307130)
@@ -130,6 +130,9 @@
 #--disable-javac-server
 
   make images docs
+
+  # https://bugs.openjdk.java.net/browse/JDK-8173610
+  find "../$_imgdir" -iname '*.so' -exec chmod +x {} \;
 }
 
 # check() {

[arch-commits] Commit in java9-openjdk/trunk (PKGBUILD)

[Guillaume Alaux]

Date: Saturday, October 7, 2017 @ 16:23:28
  Author: guillaume
Revision: 307129

Remove debug data

Modified:
  java9-openjdk/trunk/PKGBUILD

--+
 PKGBUILD |6 ++
 1 file changed, 6 insertions(+)

Modified: PKGBUILD
===
--- PKGBUILD2017-10-07 16:16:59 UTC (rev 307128)
+++ PKGBUILD2017-10-07 16:23:28 UTC (rev 307129)
@@ -192,6 +192,8 @@
   # Link JKS keystore from ca-certificates-utils
   rm -f "$pkgdir$_jvmdir/lib/security/cacerts"
   ln -sf /etc/ssl/certs/java/cacerts "$pkgdir$_jvmdir/lib/security/cacerts"
+
+  find "$pkgdir$_jvmdir" -iname '*.diz' -exec rm {} \;
 }
 
 package_jre9-openjdk() {
@@ -214,6 +216,8 @@
   # Licenses
   install -d -m 755 "$pkgdir/usr/share/licenses"
   ln -s $pkgbase "$pkgdir/usr/share/licenses/$pkgname"
+
+  find "$pkgdir$_jvmdir" -iname '*.diz' -exec rm {} \;
 }
 
 package_jdk9-openjdk() {
@@ -270,6 +274,8 @@
   "$srcdir/freedesktop-$f.desktop" \
   "$pkgdir/usr/share/applications/$f-$pkgbase.desktop"
   done
+
+  find "$pkgdir$_jvmdir" -iname '*.diz' -exec rm {} \;
 }
 
 package_openjdk9-src() {

[arch-commits] Commit in java9-openjdk/trunk (PKGBUILD)

[Guillaume Alaux]

Date: Saturday, September 30, 2017 @ 13:50:59
  Author: guillaume
Revision: 306487

Add missing dependency to enable AOT

Modified:
  java9-openjdk/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-09-30 07:40:04 UTC (rev 306486)
+++ PKGBUILD2017-09-30 13:50:59 UTC (rev 306487)
@@ -20,12 +20,13 @@
 pkgver=$_majorver.u$_updatever
 _hg_tag="jdk-$_majorver+$_updatever"
 _repo_ver=jdk$_java_ver.$_hg_tag
-pkgrel=2
+pkgrel=3
 _pkg_full_ver=$pkgver-$pkgrel
 arch=('i686' 'x86_64')
 url='http://openjdk.java.net/'
 license=('custom')
 makedepends=('jdk8-openjdk' 'cpio' 'unzip' 'zip'
+ 'libelf' # required for AOT
  'libcups'
  'libx11' 'libxrender' 'libxtst' 'libxt' # 'libxext' already 
pulled by libxtst
  'alsa-lib'
@@ -32,7 +33,6 @@
  'pandoc' 'graphviz') # to generate full docs (as said in output 
of configure)
  # 'freetype2' already pulled
  # 'libjpeg-turbo' 'giflib' 'libpng' 'lcms2' already pulled
- # 'libelf' required for AOT but already pulled
  # 'bash' OpenJDK scripts are explicitly Bash
 checkdepends=()
 _url_src=http://hg.openjdk.java.net/jdk9/jdk9
@@ -218,7 +218,7 @@
 
 package_jdk9-openjdk() {
   pkgdesc="OpenJDK Java $_majorver development kit"
-  depends=("jre$_majorver-openjdk=$_pkg_full_ver" 'java-environment-common=3' 
'hicolor-icon-theme')
+  depends=("jre$_majorver-openjdk=$_pkg_full_ver" 'java-environment-common=3' 
'hicolor-icon-theme' 'libelf')
   provides=("java-environment=$_majorver" 
"java-environment-openjdk=$_majorver")
   install=install_jdk9-openjdk.sh
 

[arch-commits] Commit in java9-openjdk/trunk (PKGBUILD)

[Guillaume Alaux]

Date: Saturday, September 23, 2017 @ 15:08:33
  Author: guillaume
Revision: 306144

Fix #FS55716 SSL does not work due to keystore being empty

Modified:
  java9-openjdk/trunk/PKGBUILD

--+
 PKGBUILD |6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-09-23 14:47:42 UTC (rev 306143)
+++ PKGBUILD2017-09-23 15:08:33 UTC (rev 306144)
@@ -20,7 +20,7 @@
 pkgver=$_majorver.u$_updatever
 _hg_tag="jdk-$_majorver+$_updatever"
 _repo_ver=jdk$_java_ver.$_hg_tag
-pkgrel=1
+pkgrel=2
 _pkg_full_ver=$pkgver-$pkgrel
 arch=('i686' 'x86_64')
 url='http://openjdk.java.net/'
@@ -188,6 +188,10 @@
 install -D -m 644 $f "$pkgdir/usr/share/${f/\.1/-openjdk9.1}"
   done
   ln -s /usr/share/man "$pkgdir/$_jvmdir/man"
+
+  # Link JKS keystore from ca-certificates-utils
+  rm -f "$pkgdir$_jvmdir/lib/security/cacerts"
+  ln -sf /etc/ssl/certs/java/cacerts "$pkgdir$_jvmdir/lib/security/cacerts"
 }
 
 package_jre9-openjdk() {

[arch-commits] Commit in java9-openjdk/trunk (PKGBUILD)

[Guillaume Alaux]

Date: Friday, September 22, 2017 @ 20:55:52
  Author: guillaume
Revision: 306125

General availability 9.u181

Modified:
  java9-openjdk/trunk/PKGBUILD

--+
 PKGBUILD |   18 +-
 1 file changed, 5 insertions(+), 13 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-09-22 20:51:10 UTC (rev 306124)
+++ PKGBUILD2017-09-22 20:55:52 UTC (rev 306125)
@@ -1,11 +1,5 @@
 # Maintainer: Guillaume ALAUX 
 
-# TODO for production:
-#  - remove pre="ea" from ./configure
-#  - fix pkgver from 9.178 to 9.u01
-#- don't forget to add the "u"
-#- don't forget to use an update version instead of tag
-
 # TODO add test, see about packaging jtreg and using it here
 # TODO see about building with OpenJDK9
 # TODO add javazi
@@ -21,11 +15,10 @@
 
 pkgname=('jre9-openjdk-headless' 'jre9-openjdk' 'jdk9-openjdk' 'openjdk9-src' 
'openjdk9-doc')
 _majorver=9
-_buildver=181
+_updatever=181
 pkgbase=java$_majorver-openjdk
-# FIXME while Early Access, use $_majorver.$_buildver, and when production, 
use $_majorver.u$_updatever (watchout for the "u")
-pkgver=$_majorver.$_buildver
-_hg_tag="jdk-$_majorver+$_buildver"
+pkgver=$_majorver.u$_updatever
+_hg_tag="jdk-$_majorver+$_updatever"
 _repo_ver=jdk$_java_ver.$_hg_tag
 pkgrel=1
 _pkg_full_ver=$pkgver-$pkgrel
@@ -118,10 +111,9 @@
   unset CXXFLAGS
   unset LDFLAGS
 
-  # FIXME remove pre (ie "ea") identifier once going to production
   bash configure \
---with-version-build="$_buildver" \
---with-version-pre="ea" \
+--with-version-build="$_updatever" \
+--with-version-pre="" \
 --with-version-opt="" \
 --with-stdc++lib=dynamic \
 --with-extra-cflags="$_CFLAGS" \

[arch-commits] Commit in java9-openjdk/trunk (PKGBUILD)

[Guillaume Alaux]

Date: Friday, September 22, 2017 @ 14:26:47
  Author: guillaume
Revision: 306094

Update early access to build 181

Modified:
  java9-openjdk/trunk/PKGBUILD

--+
 PKGBUILD |   18 +-
 1 file changed, 9 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-09-22 12:54:27 UTC (rev 306093)
+++ PKGBUILD2017-09-22 14:26:47 UTC (rev 306094)
@@ -21,7 +21,7 @@
 
 pkgname=('jre9-openjdk-headless' 'jre9-openjdk' 'jdk9-openjdk' 'openjdk9-src' 
'openjdk9-doc')
 _majorver=9
-_buildver=179
+_buildver=181
 pkgbase=java$_majorver-openjdk
 # FIXME while Early Access, use $_majorver.$_buildver, and when production, 
use $_majorver.u$_updatever (watchout for the "u")
 pkgver=$_majorver.$_buildver
@@ -54,14 +54,14 @@
 freedesktop-java.desktop
 freedesktop-jconsole.desktop
 freedesktop-policytool.desktop)
-sha256sums=('74ea44fa6d07815c529a0da8b5b9203e4f2d392bfa5eb60c0d302b57130e2a83'
-'50f6168852f57f2b0aa18e8c24f7939cb30f3d8d324e423fedab044cf94bef40'
-'af37fcb4c49c19240793f67a7a611a650649f1492790d74128045613be19f326'
-'f56f08387711b7bfe9e31f18325c361c4b45e957479a685cae5604145b0243d9'
-'03d0168aad12fcc61f90698d6609673f3840473401b89e7454ffd96d8f4f579f'
-'63d6f14dd0d9aeb2f982e254ce3759a29573c227789c5ae9b10fd299f6cc0310'
-'3d39fe61946ef50d07870474bd9fe5766108096585cc806742974a7a5fe2f9e4'
-'126a632806a6897e55ed6ef99ef829da2518ddad674d10953ac449986f54628a'
+sha256sums=('02fd41467add2e02e0a4e278c0a2d99a8e2d986b640b66745e23d18dc9e7f230'
+'72c388d71e9610905a1b62e837fd8a277533766c1c47440c5af9c84f57337dbf'
+'1a0e239643c0157b940f3e4a3c545d99d317ba8b28dfdcf5ed2fd49853905602'
+'f963e67c791d96fc7e98126eff8fced4b6d457ea42174a4d51db74cc60cabdc9'
+'7071612b0c3a8e270e90999606fc60b9499a6cc87c872dd6f2e7e4b7e415e34b'
+'5c25d68928300df962ec5a339f8244542e701c79dd80fe04f72e0fa00d6ffc96'
+'f7120270546c7e26a58edfe811005f78f4f90cbf7c35dbad459a516395cc45f1'
+'d6b4f79182fda4abea7bb2c53181aa734a469772db1901c187dea8977885918a'
 '85d32321fb59a89e4f9ab320060597d4ca9d5e23b995c61549a48b41ac908a67'
 'bf197deb003879ed01adc6973a2430a41574f638667a5ecfbb1aad1403897ddc'
 '9394de47b5c38826ab837145816667d96b697998bafec5dd132d39d4846ac70e')