[openjdk-8] 03/06: Add the missing nss.cfg file

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository openjdk-8.

commit 3e36719c5d4cb7aeee479918fbf70280b6d07c16
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Tue Apr 1 10:07:44 2014 +0200

    Add the missing nss.cfg file
---
 debian/nss.cfg | 4 ++++
 debian/rules   | 5 +----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/debian/nss.cfg b/debian/nss.cfg
new file mode 100644
index 0000000..3535a40
--- /dev/null
+++ b/debian/nss.cfg
@@ -0,0 +1,4 @@
+name = NSS
+nssDbMode = noDb
+attributes = compatibility
+handleStartupErrors = ignoreMultipleInitialisation
diff --git a/debian/rules b/debian/rules
index eab751d..f29d466 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1304,10 +1304,7 @@ ifneq (,$(pkg_certs))
 	rm -f $(d)/$(basedir)/jre/lib/security/cacerts
 endif
 
-	grep -v '^nssLibraryDirectory' $(d)/$(basedir)/jre/lib/security/nss.cfg \
-		> $(d)/$(basedir)/jre/lib/security/nss.cfg.new
-	mv -f $(d)/$(basedir)/jre/lib/security/nss.cfg.new \
-		$(d)/$(basedir)/jre/lib/security/nss.cfg
+	cp debian/nss.cfg $(d)/$(basedir)/jre/lib/security/nss.cfg
 
 	: # move config files to $(etcdir) and symlink them.
 	for i in \

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/openjdk-8.git