--- a/src/pkg/manifests/package:pkg:depot.p5m Fri Nov 14 18:46:51 2014 -0800
+++ b/src/pkg/manifests/package:pkg:depot.p5m Wed Nov 19 08:46:33 2014 -0800
@@ -34,6 +34,7 @@
dir path=etc/pkg/depot/conf.d
file path=etc/pkg/depot/depot.conf.mako
file path=etc/pkg/depot/depot_httpd.conf.mako
+file path=etc/pkg/depot/depot_httpd_ssl_protocol.conf
file path=etc/pkg/depot/depot_index.py pkg.tmp.autopyc=false
dir path=lib
dir path=lib/svc
--- a/src/setup.py Fri Nov 14 18:46:51 2014 -0800
+++ b/src/setup.py Wed Nov 19 08:46:33 2014 -0800
@@ -325,7 +325,7 @@
os.path.join(web_dir, f) for f in files
if f != "Makefile"
]))
- # install same set of files in "en/" in "__LOCALE__/ as well"
+ # install same set of files in "en/" in "__LOCALE__/ as well"
# for localizable file package (regarding themes, install
# theme "oracle.com" only)
if os.path.basename(web_dir) == "en" and \
@@ -370,6 +370,7 @@
'util/apache2/depot/depot.conf.mako',
'util/apache2/depot/depot_httpd.conf.mako',
'util/apache2/depot/depot_index.py',
+ 'util/apache2/depot/depot_httpd_ssl_protocol.conf',
]
depot_log_stubs = [
'util/apache2/depot/logs/access_log',
@@ -840,15 +841,15 @@
print >> sys.stderr, "--------"
missing.close()
print >> sys.stderr, \
-"""Please evaluate whether any of the above file(s) needs localization.
-If so, please add its name to po/POTFILES.in. If not (e.g., it's not
-delivered), please add its name to po/POTFILES.skip.
+"""Please evaluate whether any of the above file(s) needs localization.
+If so, please add its name to po/POTFILES.in. If not (e.g., it's not
+delivered), please add its name to po/POTFILES.skip.
Please be sure to maintain alphabetical ordering in both files."""
sys.exit(1)
if os.path.exists("po/notexist"):
print >> sys.stderr, \
-"""The following files are listed in po/POTFILES.in, but no longer exist
+"""The following files are listed in po/POTFILES.in, but no longer exist
in the workspace:"""
notexist = open("po/notexist", "r")
print >> sys.stderr, "--------"
@@ -967,7 +968,7 @@
else:
# not in French part
print >> fdst, l,
-
+
fsrc.close()
fdst.close()
--- a/src/util/apache2/depot/depot_httpd.conf.mako Fri Nov 14 18:46:51 2014 -0800
+++ b/src/util/apache2/depot/depot_httpd.conf.mako Wed Nov 19 08:46:33 2014 -0800
@@ -315,6 +315,7 @@
SSLRandomSeed startup builtin
SSLRandomSeed connect builtin
SSLSessionCache shmcb:${cache_dir}/ssl_scache(512000)
+Include ${template_dir}/depot_httpd_ssl_protocol.conf
</IfModule>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/util/apache2/depot/depot_httpd_ssl_protocol.conf Wed Nov 19 08:46:33 2014 -0800
@@ -0,0 +1,15 @@
+# This configuration file is used to configure the supported SSL
+# protocols.
+# WARNING: Do not delete this file or change its filename.
+#
+# These are the available protocols:
+# SSLv2, SSLV3, TLSv1, TLSv1.1, TLS1.2, All
+#
+# SSLv2 and SSLv3 are disabled by default for security reasons.
+# If you want to change default settings, please refer to the
+# Apache 2.2 documentation:
+# http://httpd.apache.org/docs/2.2/mod/mod_ssl.html#sslprotocol
+#
+
+SSLProtocol All -SSLv2 -SSLv3
+