diff options
| author | Ed Robinson <ed.robinson@reevoo.com> | 2016-09-22 12:49:18 +0100 |
|---|---|---|
| committer | Jakub Jirutka <jakub@jirutka.cz> | 2016-09-22 23:56:28 +0200 |
| commit | 170b830d22fffe1073f3cfc32a8c08e89b4a6cdd (patch) | |
| tree | c3c4fddc7b274a21221e8cff5222091857673b39 /community/openjdk7 | |
| parent | 8f6e4387fd9ca6b6c266b3b2b0c29b0dea8a275b (diff) | |
| download | aports-170b830d22fffe1073f3cfc32a8c08e89b4a6cdd.tar.bz2 aports-170b830d22fffe1073f3cfc32a8c08e89b4a6cdd.tar.xz | |
community/openjdk7: fix cacerts
This is just a backport of 94969c8a556eedeeafb78a33752ab6b6e6f7f892 from openjdk8.
Diffstat (limited to 'community/openjdk7')
| -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 7ed5f10714..6482e4f62e 100644 --- a/community/openjdk7/APKBUILD +++ b/community/openjdk7/APKBUILD @@ -6,12 +6,12 @@ _icedteaver=2.6.7 # pkgver is <JDK version>.<JDK update> # check icedtea JDK when updating pkgver=7.111.$_icedteaver -pkgrel=1 +pkgrel=2 pkgdesc="OpenJDK 7 via IcedTea" url="http://icedtea.classpath.org/" arch="all" license="GPL2 with Classpath" -depends="$pkgname-jre" +depends="$pkgname-jre java-cacerts" options="sover-namecheck" makedepends="bash findutils tar zip file paxmark gawk util-linux libxslt autoconf automake linux-headers coreutils @@ -184,6 +184,11 @@ package() { # pax mark again (due to fakeroot xattr handling bug) "$builddir"/pax-mark-vm "$pkgdir"/$INSTALL_BASE + + # symlink to shared java cacerts store + rm -f "$pkgdir"/$INSTALL_BASE/jre/lib/security/cacerts + ln -sf /etc/ssl/certs/java/cacerts \ + "$pkgdir"/$INSTALL_BASE/jre/lib/security/cacerts } jrelib() { @@ -203,7 +208,7 @@ jrelib() { jrebase() { pkgdesc="OpenJDK 7 Java Runtime (no GUI support)" - depends="$pkgname-jre-lib java-common" + depends="$pkgname-jre-lib java-common java-cacerts" mkdir -p "$subpkgdir"/$INSTALL_BASE/bin |