[Pkg-fedora-ds-maintainers] [libapache2-mod-nss] 132/156: Move nss_pcache to /usr/libexec

[Timo Aaltonen]

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

tjaalton-guest pushed a commit to branch master
in repository libapache2-mod-nss.

commit 04a38bc1491e7396d220efbbcbf7a9a1b67c45aa
Author: Rob Crittenden <rcritten at redhat.com>
Date:   Thu Feb 20 16:47:38 2014 -0500

    Move nss_pcache to /usr/libexec
---
 migrate.pl  | 3 ++-
 nss.conf.in | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/migrate.pl b/migrate.pl
index 757d85e..ebfc3b5 100755
--- a/migrate.pl
+++ b/migrate.pl
@@ -115,7 +115,8 @@ while (<SSL>) {
 }
 
 if ($passphrase == 0) {
-    print NSS "NSSPassPhraseHelper /usr/sbin/nss_pcache\n";
+    # NOTE:  Located at '/usr/sbin/nss_pcache' prior to 'mod_nss-1.0.9'.
+    print NSS "NSSPassPhraseHelper /usr/libexec/nss_pcache\n";
 }
 
 close(NSS);
diff --git a/nss.conf.in b/nss.conf.in
index 050ce8a..c941ecf 100644
--- a/nss.conf.in
+++ b/nss.conf.in
@@ -40,7 +40,7 @@ NSSPassPhraseDialog  builtin
 #   Pass Phrase Helper:
 #   This helper program stores the token password pins between
 #   restarts of Apache.
-NSSPassPhraseHelper @apache_bin@/nss_pcache
+NSSPassPhraseHelper /usr/libexec/nss_pcache
 
 #   Configure the SSL Session Cache. 
 #   NSSSessionCacheSize is the number of entries in the cache.

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-fedora-ds/libapache2-mod-nss.git