[Pkg-apache-commits] [SCM] The ssl-cert package for Debian branch, master, updated. 579413b054b9135622020ce892bf25adc3044011

[Stefan Fritsch]

The following commit has been merged in the master branch:
commit 1aaab14a3df173a291de3fafa63ea258fb1a8cd8
Author: Stefan Fritsch <sf at sfritsch.de>
Date:   Sat Jun 9 20:30:09 2012 +0200

    if the FQDN is too long, put it in the SubjAltName
    
    ... and use the simple hostname as CN

diff --git a/debian/changelog b/debian/changelog
index 59fd43d..b760a15 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,10 @@ ssl-cert (1.0.29) UNRELEASED; urgency=low
 
   * Add support for subject alternative names. Thanks to Jonas Smedegaard for
     the patch. Closes: #645515
+    (Sorry to all translators for adding a template so close to the freeze.)
+  * For "make-ssl-cert generate-default-snakeoil", if the FQDN is too long,
+    put it in the SubjAltName and use the simple hostname as CN.
+    Closes: #674598
   * Add Catalan translation. Thanks to Innocent De Marchi. Closes: #628373
   * Bump Standards-Version (no changes).
   * Switch VCS to git
diff --git a/make-ssl-cert b/make-ssl-cert
index f7c7bf9..52e0fd2 100755
--- a/make-ssl-cert
+++ b/make-ssl-cert
@@ -44,6 +44,10 @@ make_snakeoil() {
         echo make-ssl-cert: 'make-ssl-cert generate-default-snakeoil --force-overwrite'
         echo make-ssl-cert: again.
     fi
+    if [ ${#HostName} -gt 64 ] ; then
+        AltName="DNS:$HostName"
+        HostName="$(hostname)"
+    fi
 }
 
 create_temporary_cnf() {

-- 
The ssl-cert package for Debian