diff options
author | Ed Robinson <ed.robinson@reevoo.com> | 2016-09-22 12:49:18 +0100 |
---|---|---|
committer | Natanael Copa <ncopa@alpinelinux.org> | 2016-10-19 10:52:36 +0200 |
commit | c0c97a7195272f67a1662751d939781c92425cc4 (patch) | |
tree | 55d9b52a86025191515aeffe550f6ccfb6a1da83 | |
parent | 4323fb269efcb6e49031a7b1c36e868408358baa (diff) | |
download | alpine_aports-c0c97a7195272f67a1662751d939781c92425cc4.tar.bz2 alpine_aports-c0c97a7195272f67a1662751d939781c92425cc4.tar.xz alpine_aports-c0c97a7195272f67a1662751d939781c92425cc4.zip |
community/openjdk7: fix cacerts
This is just a backport of 94969c8a556eedeeafb78a33752ab6b6e6f7f892 from openjdk8.
https://github.com/docker-library/openjdk/issues/74
(cherry picked from commit 170b830d22fffe1073f3cfc32a8c08e89b4a6cdd)
-rw-r--r-- | community/openjdk7/APKBUILD | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/community/openjdk7/APKBUILD b/community/openjdk7/APKBUILD index 83568dd55c..d09ba3f8e8 100644 --- a/community/openjdk7/APKBUILD +++ b/community/openjdk7/APKBUILD | |||
@@ -6,12 +6,12 @@ _icedteaver=2.6.7 | |||
6 | # pkgver is <JDK version>.<JDK update> | 6 | # pkgver is <JDK version>.<JDK update> |
7 | # check icedtea JDK when updating | 7 | # check icedtea JDK when updating |
8 | pkgver=7.111.$_icedteaver | 8 | pkgver=7.111.$_icedteaver |
9 | pkgrel=1 | 9 | pkgrel=2 |
10 | pkgdesc="OpenJDK 7 via IcedTea" | 10 | pkgdesc="OpenJDK 7 via IcedTea" |
11 | url="http://icedtea.classpath.org/" | 11 | url="http://icedtea.classpath.org/" |
12 | arch="all" | 12 | arch="all" |
13 | license="GPL2 with Classpath" | 13 | license="GPL2 with Classpath" |
14 | depends="$pkgname-jre" | 14 | depends="$pkgname-jre java-cacerts" |
15 | options="sover-namecheck" | 15 | options="sover-namecheck" |
16 | makedepends="bash findutils tar zip file paxmark gawk util-linux libxslt | 16 | makedepends="bash findutils tar zip file paxmark gawk util-linux libxslt |
17 | autoconf automake linux-headers | 17 | autoconf automake linux-headers |
@@ -183,6 +183,11 @@ package() { | |||
183 | 183 | ||
184 | # pax mark again (due to fakeroot xattr handling bug) | 184 | # pax mark again (due to fakeroot xattr handling bug) |
185 | "$builddir"/pax-mark-vm "$pkgdir"/$INSTALL_BASE | 185 | "$builddir"/pax-mark-vm "$pkgdir"/$INSTALL_BASE |
186 | |||
187 | # symlink to shared java cacerts store | ||
188 | rm -f "$pkgdir"/$INSTALL_BASE/jre/lib/security/cacerts | ||
189 | ln -sf /etc/ssl/certs/java/cacerts \ | ||
190 | "$pkgdir"/$INSTALL_BASE/jre/lib/security/cacerts | ||
186 | } | 191 | } |
187 | 192 | ||
188 | jrelib() { | 193 | jrelib() { |
@@ -202,7 +207,7 @@ jrelib() { | |||
202 | 207 | ||
203 | jrebase() { | 208 | jrebase() { |
204 | pkgdesc="OpenJDK 7 Java Runtime (no GUI support)" | 209 | pkgdesc="OpenJDK 7 Java Runtime (no GUI support)" |
205 | depends="$pkgname-jre-lib java-common" | 210 | depends="$pkgname-jre-lib java-common java-cacerts" |
206 | 211 | ||
207 | mkdir -p "$subpkgdir"/$INSTALL_BASE/bin | 212 | mkdir -p "$subpkgdir"/$INSTALL_BASE/bin |
208 | 213 | ||