Revision: 139971 https://trac.macports.org/changeset/139971 Author: ionic@macports.org Date: 2015-09-04 12:35:32 -0700 (Fri, 04 Sep 2015) Log Message: ----------- stunnel: update to 5.23. Patch provided by maintainer. Update patchfile. Fixes: #48746. Modified Paths: -------------- trunk/dports/security/stunnel/Portfile Added Paths: ----------- trunk/dports/security/stunnel/files/patch-tools-openssl.cnf.diff Removed Paths: ------------- trunk/dports/security/stunnel/files/patch-tools-stunnel.cnf Modified: trunk/dports/security/stunnel/Portfile =================================================================== --- trunk/dports/security/stunnel/Portfile 2015-09-04 19:23:57 UTC (rev 139970) +++ trunk/dports/security/stunnel/Portfile 2015-09-04 19:35:32 UTC (rev 139971) @@ -4,7 +4,7 @@ PortSystem 1.0 name stunnel -version 5.22 +version 5.23 set major [lindex [split ${version} .] 0] categories security net platforms darwin @@ -25,13 +25,13 @@ http://mirrors.zerg.biz/stunnel/archive/${major}.x/ \ ftp://ftp.stunnel.org/stunnel/ -checksums rmd160 5b684407b7db985cfba3f6bbb10c03883e56c07a \ - sha256 8ad628a6948153cdb2044283f6988384a30585ea7e14778c2ee616a6678cb83f +checksums rmd160 7eef7bfe5f4bcabc3f97295a60c466b52d27077f \ + sha256 0fc4a702afd2e857bae8ad1f39c51546eb282c3d0ff4f4d55d62aece7328ddea depends_lib path:lib/libssl.dylib:openssl patchfiles patch-configure \ - patch-tools-stunnel.cnf + patch-tools-openssl.cnf.diff configure.args --disable-libwrap \ --with-ssl=${prefix} Copied: trunk/dports/security/stunnel/files/patch-tools-openssl.cnf.diff (from rev 139969, trunk/dports/security/stunnel/files/patch-tools-stunnel.cnf) =================================================================== --- trunk/dports/security/stunnel/files/patch-tools-openssl.cnf.diff (rev 0) +++ trunk/dports/security/stunnel/files/patch-tools-openssl.cnf.diff 2015-09-04 19:35:32 UTC (rev 139971) @@ -0,0 +1,55 @@ +--- tools/openssl.cnf.orig 2015-09-02 05:54:02.000000000 -0500 ++++ tools/openssl.cnf 2015-09-02 05:57:03.000000000 -0500 +@@ -9,6 +9,7 @@ + default_md = sha1 + x509_extensions = stunnel_extensions + distinguished_name = stunnel_dn ++prompt = no + + [ stunnel_extensions ] + nsCertType = server +@@ -18,25 +19,27 @@ + nsComment = "stunnel self-signed certificate" + + [ stunnel_dn ] +-countryName = Country Name (2 letter code) +-countryName_default = PL +-countryName_min = 2 +-countryName_max = 2 ++# 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 + +-stateOrProvinceName = State or Province Name (full name) +-stateOrProvinceName_default = Mazovia Province ++# 0.commonName = Common Name (FQDN of your server) ++# 0.commonName_default = localhost + +-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 ++CN = localhost + + # To create a certificate for more than one name uncomment: + # 1.commonName = DNS alias of your server Deleted: trunk/dports/security/stunnel/files/patch-tools-stunnel.cnf =================================================================== --- trunk/dports/security/stunnel/files/patch-tools-stunnel.cnf 2015-09-04 19:23:57 UTC (rev 139970) +++ trunk/dports/security/stunnel/files/patch-tools-stunnel.cnf 2015-09-04 19:35:32 UTC (rev 139971) @@ -1,37 +0,0 @@ ---- tools/stunnel.cnf.orig 2014-04-09 10:18:10.000000000 +0200 -+++ tools/stunnel.cnf 2014-04-09 10:21:28.000000000 +0200 -@@ -9,6 +9,7 @@ - default_md = sha1 - x509_extensions = stunnel_extensions - distinguished_name = stunnel_dn -+prompt = no - - [ stunnel_extensions ] - nsCertType = server -@@ -18,25 +19,7 @@ - nsComment = "stunnel self-signed certificate" - - [ stunnel_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 -+CN = localhost - - # To create a certificate for more than one name uncomment: - # 1.commonName = DNS alias of your server