summaryrefslogtreecommitdiff
path: root/legacy
diff options
context:
space:
mode:
authorA. Wilcox <awilcox@wilcox-tech.com>2020-06-12 23:49:34 +0000
committerA. Wilcox <awilcox@wilcox-tech.com>2020-06-12 23:49:34 +0000
commit4e53c51f591cbd62817c797c10d240c008182ab3 (patch)
tree1daa740f1bb764764e557f913166e6761abb0b86 /legacy
parentabeeb94648332a902cc91c0c2c0333e1ae23b49c (diff)
parent8907c7de87fa709a23ee19e11bd3d5ef6f1f13b3 (diff)
downloadpackages-4e53c51f591cbd62817c797c10d240c008182ab3.tar.gz
packages-4e53c51f591cbd62817c797c10d240c008182ab3.tar.bz2
packages-4e53c51f591cbd62817c797c10d240c008182ab3.tar.xz
packages-4e53c51f591cbd62817c797c10d240c008182ab3.zip
Merge branch 'sec/openjdk8' into 'master'
user/openjdk8: [CVE] bump to 8.252.09 (#269) See merge request adelie/packages!445
Diffstat (limited to 'legacy')
-rw-r--r--legacy/openjdk7/APKBUILD7
1 files changed, 5 insertions, 2 deletions
diff --git a/legacy/openjdk7/APKBUILD b/legacy/openjdk7/APKBUILD
index e87060a19..b94d46452 100644
--- a/legacy/openjdk7/APKBUILD
+++ b/legacy/openjdk7/APKBUILD
@@ -25,6 +25,7 @@ install=""
# upstream binary versions
RHINO_VER=1.7.7.2
+_RHINO_VER=1_7_7_2
ANT_VER=1.9.11
case $CARCH in
@@ -50,6 +51,8 @@ _jrelib="$INSTALL_BASE/jre/lib/$_jarch"
ldpath="$_jrelib:$_jrelib/native_threads:$_jrelib/headless:$_jrelib/server:$_jrelib/jli"
sonameprefix="$pkgname:"
+provides="$pkgname-bootstrap=$pkgver-r$pkgrel"
+
subpackages="$pkgname-jre-lib:jrelib:noarch $pkgname-jre $pkgname-jre-base:jrebase
$pkgname-doc:doc"
@@ -57,7 +60,7 @@ if [ "$BOOTSTRAP" != "no" ]; then
makedepends="$makedepends java-gcj-compat"
BOOTSTRAP_JAVA_HOME=/usr/lib/jvm/java-1.5-gcj/
else
- makedepends="$makedepends $pkgname fastjar"
+ makedepends="$makedepends $pkgname-bootstrap fastjar"
BOOTSTRAP_JAVA_HOME="$INSTALL_BASE"
fi
@@ -73,7 +76,7 @@ source="https://icedtea.classpath.org/download/source/icedtea-$_icedteaver.tar.g
langtools-$_dropsver.tar.bz2::$_dropsurl/langtools.tar.bz2
hotspot-$_dropsver.tar.bz2::$_dropsurl/hotspot.tar.bz2
https://archive.apache.org/dist/ant/binaries/apache-ant-$ANT_VER-bin.tar.gz
- https://github.com/mozilla/rhino/releases/download/Rhino${RHINO_VER//./_}_Release/rhino-$RHINO_VER.zip
+ https://github.com/mozilla/rhino/releases/download/Rhino${_RHINO_VER}_Release/rhino-$RHINO_VER.zip
icedtea-hotspot-musl.patch
icedtea-hotspot-musl-ppc.patch