[Pkg-fedora-ds-maintainers] [libapache2-mod-nss] 152/156: gencert: Create sqlite-based db's.

[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 cf357695a55cb79cdb8928139e60b16626a27d65
Author: Timo Aaltonen <tjaalton at ubuntu.com>
Date:   Wed Jul 2 15:39:39 2014 +0300

    gencert: Create sqlite-based db's.
---
 debian/changelog                     |  1 +
 debian/patches/mod_nss-gencert.patch | 61 ++++++++++++++++++++++++++++++++++--
 2 files changed, 60 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d8a4fe7..0a34c94 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,7 @@ libapache2-mod-nss (1.0.8+git20140226-1) UNRELEASED; urgency=medium
   * install: Install nss_pcache in /usr/lib/libapache2-mod-nss instead
     of /usr/sbin.
   * rules: Added a gentarball target.
+  * gencert: Create sqlite-based db's.
 
  -- Timo Aaltonen <tjaalton at ubuntu.com>  Wed, 02 Jul 2014 09:43:00 +0300
 
diff --git a/debian/patches/mod_nss-gencert.patch b/debian/patches/mod_nss-gencert.patch
index c2b2f4d..0da316d 100644
--- a/debian/patches/mod_nss-gencert.patch
+++ b/debian/patches/mod_nss-gencert.patch
@@ -1,6 +1,6 @@
 --- a/gencert.in
 +++ b/gencert.in
-@@ -83,12 +83,11 @@ fi
+@@ -83,14 +83,13 @@ fi
  
  DEST=$1
  
@@ -13,8 +13,65 @@
 -echo "is httptest"
 +echo "Generating new server certificate and key database."
  echo "#####################################################################"
- $CERTUTIL -N -d $DEST -f $DEST/pw.txt
+-$CERTUTIL -N -d $DEST -f $DEST/pw.txt
++$CERTUTIL -N -d sql:$DEST -f $DEST/pw.txt
  
+ echo ""
+ echo "#####################################################################"
+@@ -102,7 +101,7 @@ let CERTSERIAL=CERTSERIAL+1
+ # y 10 y  -> basic constraints: CA cert
+ # 5 6 7 9 n  -> SSL, S/MIME, Object signing CA
+ echo -e "5\n9\nn\ny\n10\ny\n5\n6\n7\n9\nn\n" | \
+-$CERTUTIL -S -d $DEST -n cacert \
++$CERTUTIL -S -d sql:$DEST -n cacert \
+             -s "$CA_CERTDN" \
+             -x \
+             -t CTu,CTu,CTu \
+@@ -124,7 +123,7 @@ let CERTSERIAL=CERTSERIAL+1
+ # 0 2 9 n  -> Key usage: Key Encipherment, Digital Signature
+ # 0 9 n  -> SSL Client
+ echo -e "0\n2\n9\nn\n0\n9\nn\n" | \
+-$CERTUTIL -S -d $DEST -n alpha \
++$CERTUTIL -S -d sql:$DEST -n alpha \
+             -s "$ALPHA_CERTDN" \
+             -c cacert \
+             -t u,pu,u \
+@@ -145,7 +144,7 @@ let CERTSERIAL=CERTSERIAL+1
+ # 0 2 9 n  -> Key usage: Key Encipherment, Digital Signature
+ # 0 9 n  -> SSL Client
+ echo -e "0\n2\n9\nn\n0\n9\nn\n" | \
+-$CERTUTIL -S -d $DEST -n beta \
++$CERTUTIL -S -d sql:$DEST -n beta \
+             -s "$BETA_CERTDN" \
+             -c cacert \
+             -t u,pu,u \
+@@ -162,7 +161,7 @@ echo "##################################
+ echo "Generating server certificate request"
+ echo "#####################################################################"
+ (ps -elf; date; netstat -a) > $DEST/noise
+-$CERTUTIL -R -d $DEST \
++$CERTUTIL -R -d sql:$DEST \
+             -s "$SERVER_CERTDN" \
+             -o $DEST/tmpcertreq \
+             -g $KEYSIZE \
+@@ -175,7 +174,7 @@ echo "Generating server certificate"
+ echo "#####################################################################"
+ let CERTSERIAL=CERTSERIAL+1
+ echo -e "2\n9\nn\n1\n9\nn\n" | \
+-$CERTUTIL -C -d $DEST \
++$CERTUTIL -C -d sql:$DEST \
+             -c cacert \
+             -i $DEST/tmpcertreq \
+             -o $DEST/tmpcert.der \
+@@ -191,7 +190,7 @@ echo ""
+ echo "#####################################################################"
+ echo "Importing server certificate into server cert DB"
+ echo "#####################################################################"
+-$CERTUTIL -A -d $DEST -n Server-Cert \
++$CERTUTIL -A -d sql:$DEST -n Server-Cert \
+             -t u,u,u \
+             -i $DEST/tmpcert.der \
+             -f $DEST/pw.txt
 @@ -205,8 +204,4 @@ echo "##################################
  rm $DEST/pw.txt
  rm $DEST/noise

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