[Pkg-fedora-ds-maintainers] [libapache2-mod-nss] 142/156: update paths

[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 7777f25dd661f047cae25cfc5551fa3eaecf5683
Author: Timo Aaltonen <tjaalton at ubuntu.com>
Date:   Wed Jul 2 09:44:34 2014 +0300

    update paths
---
 debian/changelog                  |  7 +++++++
 debian/libapache2-mod-nss.dirs    |  2 +-
 debian/patches/mod_nss-conf.patch | 40 +++++++++++++++++++--------------------
 3 files changed, 28 insertions(+), 21 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c054c5f..fe6374b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libapache2-mod-nss (1.0.8-5) UNRELEASED; urgency=medium
+
+  * mod_nss-conf.patch: Updated paths, use /etc/apache2/nssdb.
+  * dirs: Create /etc/apache2/nssdb instead.
+
+ -- Timo Aaltonen <tjaalton at ubuntu.com>  Wed, 02 Jul 2014 09:43:00 +0300
+
 libapache2-mod-nss (1.0.8-4) unstable; urgency=medium
 
   * mod_nss-clientauth.patch:
diff --git a/debian/libapache2-mod-nss.dirs b/debian/libapache2-mod-nss.dirs
index c793d52..323fda5 100644
--- a/debian/libapache2-mod-nss.dirs
+++ b/debian/libapache2-mod-nss.dirs
@@ -1 +1 @@
-etc/libapache2-mod-nss
+etc/apache2/nssdb
diff --git a/debian/patches/mod_nss-conf.patch b/debian/patches/mod_nss-conf.patch
index b89ec23..affc6c6 100644
--- a/debian/patches/mod_nss-conf.patch
+++ b/debian/patches/mod_nss-conf.patch
@@ -4,7 +4,7 @@
  # consult the online docs. You have been warned.  
  #
  
-+LoadModule nss_module modules/libmodnss.so
++LoadModule nss_module modules/mod_nss.so
 +
  #
  # When we also provide SSL we have to listen to the 
@@ -45,26 +45,26 @@
  # LogLevel is not inherited from httpd.conf.
 -#ErrorLog @apache_prefix@/logs/error_log
 -#TransferLog @apache_prefix@/logs/access_log
-+ErrorLog @apache_prefix@/logs/error_log
-+TransferLog @apache_prefix@/logs/access_log
++ErrorLog /var/log/apache2/error_log
++TransferLog /var/log/apache2/access_log
  LogLevel warn
  
  #   SSL Engine Switch:
-#@@ -113,7 +115,7 @@
-# #   The NSS security database directory that holds the certificates and
-# #   keys. The database consists of 3 files: cert8.db, key3.db and secmod.db.
-# #   Provide the directory that these files exist.
-#-NSSCertificateDatabase @apache_conf@
-#+NSSCertificateDatabase /etc/httpd/alias
-# 
-# #   Database Prefix:
-# #   In order to be able to store multiple NSS databases in one directory
-#@@ -189,7 +191,7 @@
-# <Files ~ "\.(cgi|shtml|phtml|php3?)$">
-#     NSSOptions +StdEnvVars
-# </Files>
-#-<Directory "@apache_prefix@/cgi-bin">
-#+<Directory "/var/www/cgi-bin">
-#     NSSOptions +StdEnvVars
-# </Directory>
+@@ -113,7 +115,7 @@
+ #   The NSS security database directory that holds the certificates and
+ #   keys. The database consists of 3 files: cert8.db, key3.db and secmod.db.
+ #   Provide the directory that these files exist.
+-NSSCertificateDatabase @apache_conf@
++NSSCertificateDatabase /etc/apache2/nssdb
+ 
+ #   Database Prefix:
+ #   In order to be able to store multiple NSS databases in one directory
+@@ -189,7 +191,7 @@
+ <Files ~ "\.(cgi|shtml|phtml|php3?)$">
+     NSSOptions +StdEnvVars
+ </Files>
+-<Directory "@apache_prefix@/cgi-bin">
++<Directory "/usr/lib/cgi-bin">
+     NSSOptions +StdEnvVars
+ </Directory>
  

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