summaryrefslogtreecommitdiffstats
path: root/openjdk
diff options
context:
space:
mode:
author Eric Hameleers <alien@slackware.com>2012-10-18 22:44:44 +0000
committer Eric Hameleers <alien@slackware.com>2012-10-18 22:44:44 +0000
commitcf6c83230578b7afda47c3998d5f80de69de0879 (patch)
tree0e32113a70fe97baaad050014a8ee970e081f1d7 /openjdk
parent3243b109e7d7e50ca10c5c9878074d0a45c13d67 (diff)
downloadasb-cf6c83230578b7afda47c3998d5f80de69de0879.tar.gz
asb-cf6c83230578b7afda47c3998d5f80de69de0879.tar.xz
The jre needs a nss.cfg file too.
Diffstat (limited to 'openjdk')
-rwxr-xr-xopenjdk/build/openjdk.SlackBuild6
1 files changed, 4 insertions, 2 deletions
diff --git a/openjdk/build/openjdk.SlackBuild b/openjdk/build/openjdk.SlackBuild
index 2f8c0d17..81003b10 100755
--- a/openjdk/build/openjdk.SlackBuild
+++ b/openjdk/build/openjdk.SlackBuild
@@ -292,6 +292,9 @@ mv $PKG2/usr/lib${LIBDIRSUFFIX}/java/jre/lib/security/java.policy $PKG2/etc/java
ln -sf /etc/java/java.policy $PKG2/usr/lib${LIBDIRSUFFIX}/java/jre/lib/security/java.policy
mv $PKG2/usr/lib${LIBDIRSUFFIX}/java/jre/lib/security/java.security $PKG2/etc/java/java.security.new
ln -sf /etc/java/java.security $PKG2/usr/lib${LIBDIRSUFFIX}/java/jre/lib/security/java.security
+# Add jdk's nss.cfg file to the jre package (some applications crash otherwise):
+cat $PKG1/usr/lib${LIBDIRSUFFIX}/java/jre/lib/security/nss.cfg | sed -e 's/seamonkey-.*$/seamonkey/' > $PKG2/etc/java/nss.cfg.new
+ln -sf /etc/java/nss.cfg $PKG2/usr/lib${LIBDIRSUFFIX}/java/jre/lib/security/nss.cfg
# NOTE:
# The openjdk does not build a mozilla plugin: install icedtea-web instead.
@@ -308,9 +311,8 @@ ln -sf /etc/java/java.security $PKG2/usr/lib${LIBDIRSUFFIX}/java/jre/lib/securit
mkdir -p $PKG1/install $PKG2/install
cat $CWD/slack-desc.jdk > $PKG1/install/slack-desc
zcat $CWD/doinst.sh.gz > $PKG1/install/doinst.sh
-# The openjre package does not have a nss.cfg:
cat $CWD/slack-desc.jre > $PKG2/install/slack-desc
-zcat $CWD/doinst.sh.gz | grep -v nss.cfg.new > $PKG2/install/doinst.sh
+zcat $CWD/doinst.sh.gz > $PKG2/install/doinst.sh
# Add documentation files:
mkdir -p $PKG1/usr/doc/$PKGNAM1-$VERSION/icedtea