[Pkg-fedora-ds-maintainers] libapache2-mod-nss: Changes to 'master'

[Timo Aaltonen]

 debian/changelog                     |    8 ++++++++
 debian/libapache2-mod-nss.postinst   |    6 ++++++
 debian/patches/mod_nss-gencert.patch |   18 +++++++++++++++++-
 3 files changed, 31 insertions(+), 1 deletion(-)

New commits:
commit 5179e57f116303094be9aff765f8d7ef5c2451ca
Author: Timo Aaltonen <tjaalton at debian.org>
Date:   Wed Dec 9 12:32:55 2015 +0200

    releasing package libapache2-mod-nss version 1.0.12-2

diff --git a/debian/changelog b/debian/changelog
index 9ff3552..2b3999a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-libapache2-mod-nss (1.0.12-2) UNRELEASED; urgency=medium
+libapache2-mod-nss (1.0.12-2) unstable; urgency=medium
 
   * mod_nss-gencert.patch: Modify to fix comparing the number of
     arguments. (Closes: #803443)
   * postinst: Remove /0 on upgrade if it exists.
 
- -- Timo Aaltonen <tjaalton at debian.org>  Wed, 09 Dec 2015 11:47:01 +0200
+ -- Timo Aaltonen <tjaalton at debian.org>  Wed, 09 Dec 2015 12:32:40 +0200
 
 libapache2-mod-nss (1.0.12-1) unstable; urgency=medium
 

commit cba0a7c006e8a8e1e86dcd267104abecb2829a69
Author: Timo Aaltonen <tjaalton at debian.org>
Date:   Wed Dec 9 12:25:06 2015 +0200

    postinst: Remove /0 on upgrade if it exists.

diff --git a/debian/changelog b/debian/changelog
index 107994a..9ff3552 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ libapache2-mod-nss (1.0.12-2) UNRELEASED; urgency=medium
 
   * mod_nss-gencert.patch: Modify to fix comparing the number of
     arguments. (Closes: #803443)
+  * postinst: Remove /0 on upgrade if it exists.
 
  -- Timo Aaltonen <tjaalton at debian.org>  Wed, 09 Dec 2015 11:47:01 +0200
 
diff --git a/debian/libapache2-mod-nss.postinst b/debian/libapache2-mod-nss.postinst
index c586db3..0d4a89a 100644
--- a/debian/libapache2-mod-nss.postinst
+++ b/debian/libapache2-mod-nss.postinst
@@ -4,6 +4,12 @@ set -e
 CERTDIR=/etc/apache2/nssdb
 
 if [ "$1" = configure ]; then
+    if dpkg --compare-versions "$2" lt-nl "1.0.12-2"; then
+        # buggy gencert created this
+	if [ -f /0 ]; then
+            rm -f /0
+        fi
+    fi
     if [ ! -e $CERTDIR/key3.db ]; then
         /usr/share/libapache2-mod-nss/gencert \
 		$CERTDIR > $CERTDIR/install.log 2>&1

commit feae4d6bc49da5d0c712130b7186962d5e0c44dd
Author: Timo Aaltonen <tjaalton at debian.org>
Date:   Wed Dec 9 11:47:12 2015 +0200

    mod_nss-gencert.patch: Modify to fix comparing the number of arguments. (Closes: #803443)

diff --git a/debian/changelog b/debian/changelog
index 99a6937..107994a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libapache2-mod-nss (1.0.12-2) UNRELEASED; urgency=medium
+
+  * mod_nss-gencert.patch: Modify to fix comparing the number of
+    arguments. (Closes: #803443)
+
+ -- Timo Aaltonen <tjaalton at debian.org>  Wed, 09 Dec 2015 11:47:01 +0200
+
 libapache2-mod-nss (1.0.12-1) unstable; urgency=medium
 
   * New upstream release.
diff --git a/debian/patches/mod_nss-gencert.patch b/debian/patches/mod_nss-gencert.patch
index 0d48c3e..266445f 100644
--- a/debian/patches/mod_nss-gencert.patch
+++ b/debian/patches/mod_nss-gencert.patch
@@ -1,6 +1,13 @@
 --- a/gencert.in
 +++ b/gencert.in
-@@ -92,7 +92,7 @@ else
+@@ -86,13 +86,13 @@ fi
+ DBDIR=$1
+ shift
+ 
+-if [ $# > 0 ]; then
++if [ $# -gt 0 ]; then
+     SNI=$1
+ else
      SNI=0
  fi
  
@@ -19,6 +26,15 @@
  echo "#####################################################################"
  $CERTUTIL -N -d $DBDIR -f $DEST/pw.txt
  
+@@ -256,7 +255,7 @@ $CERTUTIL -A -d $DBDIR -n Server-Cert \
+ 
+ rm $DEST/tmpcert.der
+ 
+-if [ $SNI > 0 ]; then
++if [ $SNI -gt 0 ]; then
+     SNI=`expr $SNI + 1`
+     count=1
+     while test $count -lt $SNI ; do
 @@ -272,8 +271,4 @@ echo "##################################
  rm $DEST/pw.txt
  rm $DEST/noise