Attachment #121655 for bug #164675

View | Details | Raw Unified | Return to bug 164675
Collapse All | Expand All

Lines 8-14 Link Here

(-)Makefile (-1 / +1 lines)
8	#	8	#
9		9
10	PORTNAME= apache	10	PORTNAME= apache
11	PORTVERSION= 2.2.21	11	PORTVERSION= 2.2.22
12	#PORTREVISION= 1	12	#PORTREVISION= 1
13	CATEGORIES= www	13	CATEGORIES= www
14	MASTER_SITES= ${MASTER_SITE_APACHE_HTTPD}	14	MASTER_SITES= ${MASTER_SITE_APACHE_HTTPD}

Lines 102-108 Link Here

(-)Makefile.doc (-2 / +2 lines)
102	MAKE_ENV+= NOPORTDOCS=yes	102	MAKE_ENV+= NOPORTDOCS=yes
103	.endif	103	.endif
104		104
105	MAN1= dbmmanage.1 htdigest.1 htpasswd.1 htdbm.1	105	MAN1= ab.1 apxs.1 dbmmanage.1 htdbm.1 htdigest.1 htpasswd.1 httxt2dbm.1 logresolve.1
106	MAN8= ab.8 apachectl.8 apxs.8 httpd.8 logresolve.8 rotatelogs.8 suexec.8 htcacheclean.8	106	MAN8= apachectl.8 htcacheclean.8 httpd.8 rotatelogs.8 suexec.8
107		107
108	PORTDOCS= * #don't blame me ;-)	108	PORTDOCS= * #don't blame me ;-)

Lines 1-2 Link Here

(-)distinfo (-2 / +2 lines)
1	SHA256 (apache22/httpd-2.2.21.tar.bz2) = 18d5591fe48cfbac44fc20316036ffe17456df60bc3a2aaad238d56c6445577f	1	SHA256 (apache22/httpd-2.2.22.tar.bz2) = dcdc9f1dc722f84798caf69d69dca78daa5e09a4269060045aeca7e4f44cb231
2	SIZE (apache22/httpd-2.2.21.tar.bz2) = 5324905	2	SIZE (apache22/httpd-2.2.22.tar.bz2) = 5378934

Lines 96-105 Link Here

(-)files/patch-Makefile.in (-2 / +2 lines)
96	@test -d $(DESTDIR)$(manualdir) \|\| $(MKINSTALLDIRS) $(DESTDIR)$(manualdir)	96	@test -d $(DESTDIR)$(manualdir) \|\| $(MKINSTALLDIRS) $(DESTDIR)$(manualdir)
97	- @cp -p $(top_srcdir)/docs/man/*.1 $(DESTDIR)$(mandir)/man1	97	- @cp -p $(top_srcdir)/docs/man/*.1 $(DESTDIR)$(mandir)/man1
98	- @cp -p $(top_srcdir)/docs/man/*.8 $(DESTDIR)$(mandir)/man8	98	- @cp -p $(top_srcdir)/docs/man/*.8 $(DESTDIR)$(mandir)/man8
99	+ for i in dbmmanage htdbm htdigest htpasswd; do \	99	+ for i in ab apxs dbmmanage htdbm htdigest htpasswd httxt2dbm logresolve; do \
100	+ ${INSTALL_MAN} $(top_srcdir)/docs/man/$$i.1 $(DESTDIR)$(mandir)/man1; \	100	+ ${INSTALL_MAN} $(top_srcdir)/docs/man/$$i.1 $(DESTDIR)$(mandir)/man1; \
101	+ done	101	+ done
102	+ for i in ab apachectl apxs htcacheclean httpd logresolve rotatelogs suexec; do \	102	+ for i in apachectl htcacheclean httpd rotatelogs suexec; do \
103	+ ${INSTALL_MAN} $(top_srcdir)/docs/man/$$i.8 $(DESTDIR)$(mandir)/man8; \	103	+ ${INSTALL_MAN} $(top_srcdir)/docs/man/$$i.8 $(DESTDIR)$(mandir)/man8; \
104	+ done	104	+ done
105	+.if !defined(NOPORTDOCS)	105	+.if !defined(NOPORTDOCS)




--- ./docs/conf/extra/httpd-ssl.conf.in.orig	2012-01-31 15:16:43.000000000 -0800
+++ ./docs/conf/extra/httpd-ssl.conf.in	2012-01-31 15:17:47.000000000 -0800
@@ -77,8 +77,8 @@
 DocumentRoot "@exp_htdocsdir@"
 ServerName www.example.com:@@SSLPort@@
 ServerAdmin you@example.com
-ErrorLog "@exp_logfiledir@/error_log"
-TransferLog "@exp_logfiledir@/access_log"
+ErrorLog "@exp_logfiledir@/httpd-error_log"
+TransferLog "@exp_logfiledir@/httpd-access_log"
 
 #   SSL Engine Switch:
 #   Enable/Disable SSL for this virtual host.
@@ -243,7 +243,7 @@
 
+#   SSL Protocol support:
+#   List the protocol versions which clients are allowed to
+#   connect with. Disable SSLv2 by default (cf. RFC 6176).
+SSLProtocol all -SSLv2
+
 #   SSL Cipher Suite:
 #   List the ciphers that the client is permitted to negotiate.
 #   See the mod_ssl documentation for a complete list.
-SSLCipherSuite ALL:!ADH:!EXPORT56:RC4+RSA:+HIGH:+MEDIUM:+LOW:+SSLv2:+EXP:+eNULL
+SSLCipherSuite HIGH:MEDIUM:!aNULL:!MD5
+
+#   Speed-optimized SSL Cipher configuration:
+#   If speed is your main concern (on busy HTTPS servers e.g.),
+#   you might want to force clients to specific, performance
+#   optimized ciphers. In this case, prepend those ciphers
+#   to the SSLCipherSuite list, and enable SSLHonorCipherOrder.
+#   Caveat: by giving precedence to RC4-SHA and AES128-SHA
+#   (as in the example below), most connections will no longer
+#   have perfect forward secrecy - if the server's key is
+#   compromised, captures of past or future traffic must be
+#   considered compromised, too.
+#SSLCipherSuite RC4-SHA:AES128-SHA:HIGH:MEDIUM:!aNULL:!MD5
+#SSLHonorCipherOrder on 
 
 #   Server Certificate:
 #   Point SSLCertificateFile at a PEM encoded certificate.  If
@@ -218,14 +236,14 @@
 #   Similarly, one has to force some clients to use HTTP/1.0 to workaround
 #   their broken HTTP/1.1 implementation. Use variables "downgrade-1.0" and
 #   "force-response-1.0" for this.
-BrowserMatch ".*MSIE.*" \
+BrowserMatch "MSIE [2-5]" \
          nokeepalive ssl-unclean-shutdown \
          downgrade-1.0 force-response-1.0
 
 #   Per-Server Logging:
 #   The home of a custom SSL log file. Use this when you want a
 #   compact non-error SSL logfile on a virtual host basis.
-CustomLog "@exp_logfiledir@/ssl_request_log" \
+CustomLog "@exp_logfiledir@/httpd-ssl_request_log" \
           "%t %h %{SSL_PROTOCOL}x %{SSL_CIPHER}x \"%r\" %b"
 
 </VirtualHost>

Return to bug 164675

Lines 1-58 Link Here

(-)files/patch-docs__conf__extra__httpd-ssl.conf.in (-43 / +7 lines)
1	--- ./docs/conf/extra/httpd-ssl.conf.in.orig 2008-02-04 23:00:07.000000000 +0000	1	--- ./docs/conf/extra/httpd-ssl.conf.in.orig 2012-01-31 15:16:43.000000000 -0800
2	+++ ./docs/conf/extra/httpd-ssl.conf.in 2012-01-23 23:20:06.446390870 +0000	2	+++ ./docs/conf/extra/httpd-ssl.conf.in 2012-01-31 15:17:47.000000000 -0800
3	@@ -77,17 +77,35 @@	3	@@ -77,8 +77,8 @@
4	DocumentRoot "@exp_htdocsdir@"	4	DocumentRoot "@exp_htdocsdir@"
5	ServerName www.example.com:@@SSLPort@@	5	ServerName www.example.com:@@SSLPort@@
6	ServerAdmin you@example.com	6	ServerAdmin you@example.com
7	-ErrorLog "@exp_logfiledir@/error_log"	7	-ErrorLog "@exp_logfiledir@/error_log"
8	-TransferLog "@exp_logfiledir@/access_log"	8	-TransferLog "@exp_logfiledir@/access_log"
9	+ErrorLog "@exp_logfiledir@/httpd-error.log"	9	+ErrorLog "@exp_logfiledir@/httpd-error_log"
10	+TransferLog "@exp_logfiledir@/httpd-access.log"	10	+TransferLog "@exp_logfiledir@/httpd-access_log"
11		11
12	# SSL Engine Switch:	12	# SSL Engine Switch:
13	# Enable/Disable SSL for this virtual host.	13	# Enable/Disable SSL for this virtual host.
14	SSLEngine on	14	@@ -243,7 +243,7 @@
15
16	+# SSL Protocol support:
17	+# List the protocol versions which clients are allowed to
18	+# connect with. Disable SSLv2 by default (cf. RFC 6176).
19	+SSLProtocol all -SSLv2
20	+
21	# SSL Cipher Suite:
22	# List the ciphers that the client is permitted to negotiate.
23	# See the mod_ssl documentation for a complete list.
24	-SSLCipherSuite ALL:!ADH:!EXPORT56:RC4+RSA:+HIGH:+MEDIUM:+LOW:+SSLv2:+EXP:+eNULL
25	+SSLCipherSuite HIGH:MEDIUM:!aNULL:!MD5
26	+
27	+# Speed-optimized SSL Cipher configuration:
28	+# If speed is your main concern (on busy HTTPS servers e.g.),
29	+# you might want to force clients to specific, performance
30	+# optimized ciphers. In this case, prepend those ciphers
31	+# to the SSLCipherSuite list, and enable SSLHonorCipherOrder.
32	+# Caveat: by giving precedence to RC4-SHA and AES128-SHA
33	+# (as in the example below), most connections will no longer
34	+# have perfect forward secrecy - if the server's key is
35	+# compromised, captures of past or future traffic must be
36	+# considered compromised, too.
37	+#SSLCipherSuite RC4-SHA:AES128-SHA:HIGH:MEDIUM:!aNULL:!MD5
38	+#SSLHonorCipherOrder on
39
40	# Server Certificate:
41	# Point SSLCertificateFile at a PEM encoded certificate. If
42	@@ -218,14 +236,14 @@
43	# Similarly, one has to force some clients to use HTTP/1.0 to workaround
44	# their broken HTTP/1.1 implementation. Use variables "downgrade-1.0" and
45	# "force-response-1.0" for this.
46	-BrowserMatch ".MSIE." \
47	+BrowserMatch "MSIE [2-5]" \
48	nokeepalive ssl-unclean-shutdown \
49	downgrade-1.0 force-response-1.0
50
51	# Per-Server Logging:	15	# Per-Server Logging:
52	# The home of a custom SSL log file. Use this when you want a	16	# The home of a custom SSL log file. Use this when you want a
53	# compact non-error SSL logfile on a virtual host basis.	17	# compact non-error SSL logfile on a virtual host basis.
54	-CustomLog "@exp_logfiledir@/ssl_request_log" \	18	-CustomLog "@exp_logfiledir@/ssl_request_log" \
55	+CustomLog "@exp_logfiledir@/httpd-ssl_request.log" \	19	+CustomLog "@exp_logfiledir@/httpd-ssl_request_log" \
56	"%t %h %{SSL_PROTOCOL}x %{SSL_CIPHER}x \"%r\" %b"	20	"%t %h %{SSL_PROTOCOL}x %{SSL_CIPHER}x \"%r\" %b"
57		21
58	</VirtualHost>	22	</VirtualHost>