From e405792bba1d545ef33dfa300539ba7f5caf7992 Mon Sep 17 00:00:00 2001
From: Trevor Wennblom
Date: Sat, 4 Feb 2012 02:24:54 -0600
Subject: stunnel 4.52

Signed-off-by: Jack Nagel <jacknagel@gmail.com>
---
 Library/Formula/stunnel.rb | 113 ++++++++++++++++++++++++++++++---------------
 1 file changed, 77 insertions(+), 36 deletions(-)

(limited to 'Library/Formula')

diff --git a/Library/Formula/stunnel.rb b/Library/Formula/stunnel.rb
index c923e98cc..5f01376e1 100644
--- a/Library/Formula/stunnel.rb
+++ b/Library/Formula/stunnel.rb
@@ -1,11 +1,12 @@
 require 'formula'
 
 class Stunnel < Formula
-  url 'ftp://ftp.stunnel.org/stunnel/archive/4.x/stunnel-4.50.tar.gz'
+  url 'ftp://ftp.stunnel.org/stunnel/archive/4.x/stunnel-4.52.tar.gz'
   homepage 'http://www.stunnel.org/'
-  md5 'd68b4565294496a8bdf23c728a679f53'
+  md5 'f5e713dda0e8efa659f372832ecd0c2c'
 
   # This patch installs a bogus .pem in lieu of interactive cert generation.
+  # - additionally stripping carriage-returns
   def patches
     DATA
   end
@@ -35,41 +36,81 @@ end
 
 __END__
 diff --git a/tools/stunnel.cnf b/tools/stunnel.cnf
-index 0c00347..d011421 100644
+index d8c3174..5ad26e0 100644
 --- a/tools/stunnel.cnf
 +++ b/tools/stunnel.cnf
-@@ -5,27 +5,15 @@ default_bits                    = 2048
- encrypt_key                     = no
- distinguished_name              = req_dn
- x509_extensions                 = cert_type
+@@ -1,42 +1,30 @@
+-# OpenSSL configuration file to create a server certificate
+-# by Michal Trojnara 1998-2012
+-
+-[ req ]
+-# the default key length is secure and quite fast - do not change it
+-default_bits                    = 2048
+-# comment out the next line to protect the private key with a passphrase
+-encrypt_key                     = no
+-distinguished_name              = req_dn
+-x509_extensions                 = cert_type
+-
+-[ req_dn ]
+-countryName = Country Name (2 letter code)
+-countryName_default             = PL
+-countryName_min                 = 2
+-countryName_max                 = 2
+-
+-stateOrProvinceName             = State or Province Name (full name)
+-stateOrProvinceName_default     = Mazovia Province
+-
+-localityName                    = Locality Name (eg, city)
+-localityName_default            = Warsaw
+-
+-organizationName                = Organization Name (eg, company)
+-organizationName_default        = Stunnel Developers
+-
+-organizationalUnitName          = Organizational Unit Name (eg, section)
+-organizationalUnitName_default  = Provisional CA
+-
+-0.commonName                    = Common Name (FQDN of your server)
+-0.commonName_default            = localhost
+-
+-# To create a certificate for more than one name uncomment:
+-# 1.commonName                  = DNS alias of your server
+-# 2.commonName                  = DNS alias of your server
+-# ...
+-# See http://home.netscape.com/eng/security/ssl_2.0_certificate.html
+-# to see how Netscape understands commonName.
+-
+-[ cert_type ]
+-nsCertType                      = server
+-
++# OpenSSL configuration file to create a server certificate
++# by Michal Trojnara 1998-2012
++
++[ req ]
++# the default key length is secure and quite fast - do not change it
++default_bits                    = 2048
++# comment out the next line to protect the private key with a passphrase
++encrypt_key                     = no
++distinguished_name              = req_dn
++x509_extensions                 = cert_type
 +prompt                          = no
-
- [ req_dn ]
--countryName = Country Name (2 letter code)
--countryName_default             = PL
--countryName_min                 = 2
--countryName_max                 = 2
--
--stateOrProvinceName             = State or Province Name (full name)
--stateOrProvinceName_default     = Mazovia Province
--
--localityName                    = Locality Name (eg, city)
--localityName_default            = Warsaw
--
--organizationName                = Organization Name (eg, company)
--organizationName_default        = Stunnel Developers
--
--organizationalUnitName          = Organizational Unit Name (eg, section)
--organizationalUnitName_default  = Provisional CA
--
--0.commonName                    = Common Name (FQDN of your server)
--0.commonName_default            = localhost
++
++[ req_dn ]
 +countryName                     = PL
-+stateOrProvinceName              = Mazovia Province
-+localityName                     = Warsaw
-+organizationName                 = Stunnel Developers
-+organizationalUnitName           = Provisional CA
-+0.commonName                     = localhost
-
- # To create a certificate for more than one name uncomment:
- # 1.commonName                  = DNS alias of your server
++stateOrProvinceName             = Mazovia Province
++localityName                    = Warsaw
++organizationName                = Stunnel Developers
++organizationalUnitName          = Provisional CA
++0.commonName                    = localhost
++
++# To create a certificate for more than one name uncomment:
++# 1.commonName                  = DNS alias of your server
++# 2.commonName                  = DNS alias of your server
++# ...
++# See http://home.netscape.com/eng/security/ssl_2.0_certificate.html
++# to see how Netscape understands commonName.
++
++[ cert_type ]
++nsCertType                      = server
++
+--
+1.7.9
-- 
cgit v1.2.3