7163771 sha1 should not be used in userland-fetch and userland component/*/Makefile
7164671 BUILD_TOOLS should point to on11update-tools now
--- docs/conf/extra/httpd-ssl.conf.in Wed Jan 4 12:10:40 2012
+++ docs/conf/extra/httpd-ssl.conf.in Mon Feb 27 07:09:48 2012
@@ -22,11 +22,16 @@
# Manual for more details.
#
#SSLRandomSeed startup file:/dev/random 512
-#SSLRandomSeed startup file:/dev/urandom 512
+SSLRandomSeed startup file:/dev/urandom 512
#SSLRandomSeed connect file:/dev/random 512
-#SSLRandomSeed connect file:/dev/urandom 512
+SSLRandomSeed connect file:/dev/urandom 512
+#
+# Enable Solaris crypto framework
+#
+SSLCryptoDevice pkcs11
+
#
# When we also provide SSL we have to listen to the
# standard HTTP port (see above) and to the HTTPS port
@@ -75,7 +80,7 @@
# General setup for the virtual host
DocumentRoot "@exp_htdocsdir@"
-ServerName www.example.com:@@SSLPort@@
+ServerName 127.0.0.1:@@SSLPort@@
ServerAdmin [email protected]
ErrorLog "@exp_logfiledir@/error_log"
TransferLog "@exp_logfiledir@/access_log"