oracle-jre: update to 8u162.

Closes: #11047 [via git-merge-pr]
This commit is contained in:
cr6git 2018-01-24 08:13:58 +01:00 committed by Jürgen Buchmüller
parent d5001ff984
commit 9addc9c67b
3 changed files with 24 additions and 21 deletions

View File

@ -21,6 +21,9 @@ do_install() {
rm -rf usr/lib/jvm/jre$ORACLE_JRE_LONG_VERSION rm -rf usr/lib/jvm/jre$ORACLE_JRE_LONG_VERSION
fi fi
mv jre$ORACLE_JRE_LONG_VERSION usr/lib/jvm/jre$ORACLE_JRE_LONG_VERSION || return 1 mv jre$ORACLE_JRE_LONG_VERSION usr/lib/jvm/jre$ORACLE_JRE_LONG_VERSION || return 1
# To set the java alternative to 'oracle-jre'
xbps-alternatives -s oracle-jre
} }
case "${ACTION}" in case "${ACTION}" in

View File

@ -1 +1 @@
export JAVA_HOME=${JAVA_HOME=/usr/lib/jvm/oracle-jre} export JAVA_HOME=/usr/lib/jvm/oracle-jre

View File

@ -1,11 +1,11 @@
# Template file for 'oracle-jre' # Template file for 'oracle-jre'
pkgname=oracle-jre pkgname=oracle-jre
version=8u152 version=8u162
revision=1 revision=1
_longVersion=1.${version%u*}.0_${version#*u} _longVersion=1.${version%u*}.0_${version#*u}
_build=16 _build=12
_tag=aa0333dd3019491ca4f6ddbe78cdb6d0 _tag=0da788060d494f5095bf8624735fa2f1
short_desc="Java Runtime Environment (JRE)" short_desc="Java Runtime Environment (JRE)"
maintainer="Enno Boland <gottox@voidlinux.eu>" maintainer="Enno Boland <gottox@voidlinux.eu>"
@ -22,31 +22,31 @@ case "${XBPS_TARGET_MACHINE}" in
x86_64) x86_64)
_arch=amd64 _arch=amd64
_filename=jre-${version}-linux-x64.tar.gz _filename=jre-${version}-linux-x64.tar.gz
checksum=ed04ffbf8050a69b15f02c51a2cae8e0de9362e7f6fe8995b1c39c613fc20ede checksum=dfa25ebd1f90bf74ad7ba2dacb0e08d884594e733c9a522b58256778031341a4
;; ;;
i686) i686)
_arch=i386 _arch=i386
_filename=jre-${version}-linux-i586.tar.gz _filename=jre-${version}-linux-i586.tar.gz
checksum=1d0c9202fbed3136d46674547b92d467e28b6256dce5d1793c55c284c285a14d checksum=b0752798b28ce6e6bb133070f06fbdbd0a5bbbaf678f6c40a6def5c25e102289
;; ;;
esac esac
alternatives=" alternatives="
java:/usr/bin/java:/usr/lib/jvm/jre${_longVersion}/bin/java java:/usr/bin/java:/usr/lib/jvm/oracle-jre/bin/java
java:/usr/bin/javaws:/usr/lib/jvm/jre${_longVersion}/bin/javaws java:/usr/bin/javaws:/usr/lib/jvm/oracle-jre/bin/javaws
java:/usr/bin/jcontrol:/usr/lib/jvm/jre${_longVersion}/bin/jcontrol java:/usr/bin/jcontrol:/usr/lib/jvm/oracle-jre/bin/jcontrol
java:/usr/bin/jjs:/usr/lib/jvm/jre${_longVersion}/bin/jjs java:/usr/bin/jjs:/usr/lib/jvm/oracle-jre/bin/jjs
java:/usr/bin/keytool:/usr/lib/jvm/jre${_longVersion}/bin/keytool java:/usr/bin/keytool:/usr/lib/jvm/oracle-jre/bin/keytool
java:/usr/bin/orbd:/usr/lib/jvm/jre${_longVersion}/bin/orbd java:/usr/bin/orbd:/usr/lib/jvm/oracle-jre/bin/orbd
java:/usr/bin/pack200:/usr/lib/jvm/jre${_longVersion}/bin/pack200 java:/usr/bin/pack200:/usr/lib/jvm/oracle-jre/bin/pack200
java:/usr/bin/policytool:/usr/lib/jvm/jre${_longVersion}/bin/policytool java:/usr/bin/policytool:/usr/lib/jvm/oracle-jre/bin/policytool
java:/usr/bin/rmid:/usr/lib/jvm/jre${_longVersion}/bin/rmid java:/usr/bin/rmid:/usr/lib/jvm/oracle-jre/bin/rmid
java:/usr/bin/rmiregistry:/usr/lib/jvm/jre${_longVersion}/bin/rmiregistry java:/usr/bin/rmiregistry:/usr/lib/jvm/oracle-jre/bin/rmiregistry
java:/usr/bin/servertool:/usr/lib/jvm/jre${_longVersion}/bin/servertool java:/usr/bin/servertool:/usr/lib/jvm/oracle-jre/bin/servertool
java:/usr/bin/tnameserv:/usr/lib/jvm/jre${_longVersion}/bin/tnameserv java:/usr/bin/tnameserv:/usr/lib/jvm/oracle-jre/bin/tnameserv
java:/usr/bin/unpack200:/usr/lib/jvm/jre${_longVersion}/bin/unpack200 java:/usr/bin/unpack200:/usr/lib/jvm/oracle-jre/bin/unpack200
java-plugin:/usr/lib/mozilla/plugins/libnpjp2.so:/usr/lib/jvm/jre${_longVersion}/lib/$_arch/libnpjp2.so java-plugin:/usr/lib/mozilla/plugins/libnpjp2.so:/usr/lib/jvm/oracle-jre/lib/$_arch/libnpjp2.so
" "
distfiles="http://download.oracle.com/otn-pub/java/jdk/${version}-b${_build}/$_tag/${_filename}" distfiles="http://download.oracle.com/otn-pub/java/jdk/${version}-b${_build}/$_tag/${_filename}"
@ -81,7 +81,7 @@ do_install() {
vlicense LICENSE vlicense LICENSE
vinstall $FILESDIR/java-policy-settings.desktop 644 usr/share/applications vinstall $FILESDIR/java-policy-settings.desktop 644 usr/share/applications
ln -s jre${_longVersion} ${DESTDIR}/usr/lib/jvm/oracle-jre ln -sf jre${_longVersion} ${DESTDIR}/usr/lib/jvm/oracle-jre
for i in 16 20 22 24 32 40 48 64 72 96 128 256 512; do for i in 16 20 22 24 32 40 48 64 72 96 128 256 512; do
vinstall $FILESDIR/oracle-jre-${i}x${i}.png 644 usr/share/icons/hicolor/${i}x${i}/apps oracle-java.png vinstall $FILESDIR/oracle-jre-${i}x${i}.png 644 usr/share/icons/hicolor/${i}x${i}/apps oracle-java.png