Upgrade to Apache 1.3.12 and mod_ssl 2.6.0.

12 files changed, 21 insertions, 24 deletions

diff --git a/www/mod_php3/Makefile b/www/mod_php3/Makefile
index bab9b52577e5..8dca180c319b 100644
--- a/www/mod_php3/Makefile
+++ b/www/mod_php3/Makefile
@@ -41,16 +41,13 @@ MASTER_SITES=	http://www.apache.org/dist/ \
 		ftp://ftp.fu-berlin.de/unix/security/mod_ssl/
 DISTFILES=	apache_${VERSION_APACHE}.tar.gz php-${VERSION_PHP}.tar.gz
 
-PATCH_SITES=	http://www.apache.org/info/css-security/
-PATCHFILES=	apache_1.3.11_css_patch.txt
-
 MAINTAINER=	dirk@FreeBSD.org
 
 Y2K=		http://www.php.net/y2k.php3
 
 PHP_DISTDIR=	distributions
 
-VERSION_APACHE=	1.3.11
+VERSION_APACHE=	1.3.12
 VERSION_PHP=	3.0.14
 
 USE_PERL5=	yes
diff --git a/www/mod_php3/distinfo b/www/mod_php3/distinfo
index 22b08c71d412..cfce7e13c545 100644
--- a/www/mod_php3/distinfo
+++ b/www/mod_php3/distinfo
@@ -1,4 +1,3 @@
-MD5 (apache_1.3.11.tar.gz) = 8e0e4c9b410d4d4c4f5832fc0662b9e1
-MD5 (apache_1.3.11_css_patch.txt) = 71e31be23012752ffd898f6345c344be
+MD5 (apache_1.3.12.tar.gz) = de3ccff384b0d4ab94c3251cb85d49d2
 MD5 (php-3.0.14.tar.gz) = 62b4e5f0452446febc5b5702e6a2aef6
-MD5 (mod_ssl-2.5.0-1.3.11.tar.gz) = 0d630dd536e2cdc6885368c79b45766f
+MD5 (mod_ssl-2.6.0-1.3.12.tar.gz) = 6c8fb068e48bf9cca5df5c2e9347e047
diff --git a/www/mod_php3/pkg-plist b/www/mod_php3/pkg-plist
index 0185c0628259..3d75706cc579 100644
--- a/www/mod_php3/pkg-plist
+++ b/www/mod_php3/pkg-plist
@@ -103,9 +103,12 @@ share/apache/htdocs/index.html.en
 share/apache/htdocs/index.html.es
 share/apache/htdocs/index.html.fr
 share/apache/htdocs/index.html.it
+share/apache/htdocs/index.html.ja.jis
 share/apache/htdocs/index.html.lu
 share/apache/htdocs/index.html.nl
+share/apache/htdocs/index.html.po.iso-pl
 share/apache/htdocs/index.html.pt
+share/apache/htdocs/index.html.pt-br
 share/apache/htdocs/index.html.se
 share/apache/htdocs/manual/LICENSE
 share/apache/htdocs/manual/bind.html
diff --git a/www/mod_php3/scripts/configure.php b/www/mod_php3/scripts/configure.php
index 65752d828152..860e7429cf78 100644
--- a/www/mod_php3/scripts/configure.php
+++ b/www/mod_php3/scripts/configure.php
@@ -136,7 +136,7 @@ USE_OPENSSL=	RSA
 BUILD_DEPENDS+=	mm-config:\${PORTSDIR}/devel/mm \\
 		\${PREFIX}/lib/libmm.a:\${PORTSDIR}/devel/mm
 
-VERSION_MODSSL=	2.5.0
+VERSION_MODSSL=	2.6.0
 
 CONFIGURE_ARGS+=--enable-module=ssl \\
 		--enable-module=define
diff --git a/www/mod_php4/Makefile b/www/mod_php4/Makefile
index db674f72bb83..6561281b8fbe 100644
--- a/www/mod_php4/Makefile
+++ b/www/mod_php4/Makefile
@@ -40,9 +40,6 @@ MASTER_SITES=	http://www.apache.org/dist/ \
 		ftp://ftp.fu-berlin.de/unix/security/mod_ssl/
 DISTFILES=	apache_${VERSION_APACHE}.tar.gz php-${VERSION_PHP}.tar.gz
 
-PATCH_SITES=	http://www.apache.org/info/css-security/
-PATCHFILES=	apache_1.3.11_css_patch.txt
-
 MAINTAINER=	dirk@FreeBSD.org
 
 BROKEN=		"PHP-${VERSION_PHP} is beta. Beware the bugs. Enter at your own risk!"
@@ -51,7 +48,7 @@ Y2K=		http://www.php.net/y2k.php3
 
 PHP_DISTDIR=	version4/downloads
 
-VERSION_APACHE=	1.3.11
+VERSION_APACHE=	1.3.12
 VERSION_PHP=	4.0b3
 
 NO_LATEST_LINK=	yes
diff --git a/www/mod_php4/distinfo b/www/mod_php4/distinfo
index f8c95aa39fa8..f2fb86c001f9 100644
--- a/www/mod_php4/distinfo
+++ b/www/mod_php4/distinfo
@@ -1,5 +1,4 @@
-MD5 (apache_1.3.11.tar.gz) = 8e0e4c9b410d4d4c4f5832fc0662b9e1
-MD5 (apache_1.3.11_css_patch.txt) = 71e31be23012752ffd898f6345c344be
+MD5 (apache_1.3.12.tar.gz) = de3ccff384b0d4ab94c3251cb85d49d2
 MD5 (php-4.0b3.tar.gz) = f794d1650923cecbce261ab57ed42d04
-MD5 (mod_ssl-2.5.0-1.3.11.tar.gz) = 0d630dd536e2cdc6885368c79b45766f
+MD5 (mod_ssl-2.6.0-1.3.12.tar.gz) = 6c8fb068e48bf9cca5df5c2e9347e047
 MD5 (php4_snmp.c.diff) = f20420b92b4d206f8ec40d2d1c7c5d55
diff --git a/www/mod_php4/pkg-plist b/www/mod_php4/pkg-plist
index 965c5f265e81..71e539b7a23b 100644
--- a/www/mod_php4/pkg-plist
+++ b/www/mod_php4/pkg-plist
@@ -103,9 +103,12 @@ share/apache/htdocs/index.html.en
 share/apache/htdocs/index.html.es
 share/apache/htdocs/index.html.fr
 share/apache/htdocs/index.html.it
+share/apache/htdocs/index.html.ja.jis
 share/apache/htdocs/index.html.lu
 share/apache/htdocs/index.html.nl
+share/apache/htdocs/index.html.po.iso-pl
 share/apache/htdocs/index.html.pt
+share/apache/htdocs/index.html.pt-br
 share/apache/htdocs/index.html.se
 share/apache/htdocs/manual/LICENSE
 share/apache/htdocs/manual/bind.html
diff --git a/www/mod_php4/scripts/configure.php b/www/mod_php4/scripts/configure.php
index 7cc83d96a4c8..f290e02821d6 100644
--- a/www/mod_php4/scripts/configure.php
+++ b/www/mod_php4/scripts/configure.php
@@ -142,7 +142,7 @@ USE_OPENSSL=	RSA
 BUILD_DEPENDS+=	mm-config:\${PORTSDIR}/devel/mm \\
 		\${PREFIX}/lib/libmm.a:\${PORTSDIR}/devel/mm
 
-VERSION_MODSSL=	2.5.0
+VERSION_MODSSL=	2.6.0
 
 CONFIGURE_ARGS+=--enable-module=ssl \\
 		--enable-module=define
diff --git a/www/mod_php5/Makefile b/www/mod_php5/Makefile
index db674f72bb83..6561281b8fbe 100644
--- a/www/mod_php5/Makefile
+++ b/www/mod_php5/Makefile
@@ -40,9 +40,6 @@ MASTER_SITES=	http://www.apache.org/dist/ \
 		ftp://ftp.fu-berlin.de/unix/security/mod_ssl/
 DISTFILES=	apache_${VERSION_APACHE}.tar.gz php-${VERSION_PHP}.tar.gz
 
-PATCH_SITES=	http://www.apache.org/info/css-security/
-PATCHFILES=	apache_1.3.11_css_patch.txt
-
 MAINTAINER=	dirk@FreeBSD.org
 
 BROKEN=		"PHP-${VERSION_PHP} is beta. Beware the bugs. Enter at your own risk!"
@@ -51,7 +48,7 @@ Y2K=		http://www.php.net/y2k.php3
 
 PHP_DISTDIR=	version4/downloads
 
-VERSION_APACHE=	1.3.11
+VERSION_APACHE=	1.3.12
 VERSION_PHP=	4.0b3
 
 NO_LATEST_LINK=	yes
diff --git a/www/mod_php5/distinfo b/www/mod_php5/distinfo
index f8c95aa39fa8..f2fb86c001f9 100644
--- a/www/mod_php5/distinfo
+++ b/www/mod_php5/distinfo
@@ -1,5 +1,4 @@
-MD5 (apache_1.3.11.tar.gz) = 8e0e4c9b410d4d4c4f5832fc0662b9e1
-MD5 (apache_1.3.11_css_patch.txt) = 71e31be23012752ffd898f6345c344be
+MD5 (apache_1.3.12.tar.gz) = de3ccff384b0d4ab94c3251cb85d49d2
 MD5 (php-4.0b3.tar.gz) = f794d1650923cecbce261ab57ed42d04
-MD5 (mod_ssl-2.5.0-1.3.11.tar.gz) = 0d630dd536e2cdc6885368c79b45766f
+MD5 (mod_ssl-2.6.0-1.3.12.tar.gz) = 6c8fb068e48bf9cca5df5c2e9347e047
 MD5 (php4_snmp.c.diff) = f20420b92b4d206f8ec40d2d1c7c5d55
diff --git a/www/mod_php5/pkg-plist b/www/mod_php5/pkg-plist
index 965c5f265e81..71e539b7a23b 100644
--- a/www/mod_php5/pkg-plist
+++ b/www/mod_php5/pkg-plist
@@ -103,9 +103,12 @@ share/apache/htdocs/index.html.en
 share/apache/htdocs/index.html.es
 share/apache/htdocs/index.html.fr
 share/apache/htdocs/index.html.it
+share/apache/htdocs/index.html.ja.jis
 share/apache/htdocs/index.html.lu
 share/apache/htdocs/index.html.nl
+share/apache/htdocs/index.html.po.iso-pl
 share/apache/htdocs/index.html.pt
+share/apache/htdocs/index.html.pt-br
 share/apache/htdocs/index.html.se
 share/apache/htdocs/manual/LICENSE
 share/apache/htdocs/manual/bind.html
diff --git a/www/mod_php5/scripts/configure.php b/www/mod_php5/scripts/configure.php
index 7cc83d96a4c8..f290e02821d6 100644
--- a/www/mod_php5/scripts/configure.php
+++ b/www/mod_php5/scripts/configure.php
@@ -142,7 +142,7 @@ USE_OPENSSL=	RSA
 BUILD_DEPENDS+=	mm-config:\${PORTSDIR}/devel/mm \\
 		\${PREFIX}/lib/libmm.a:\${PORTSDIR}/devel/mm
 
-VERSION_MODSSL=	2.5.0
+VERSION_MODSSL=	2.6.0
 
 CONFIGURE_ARGS+=--enable-module=ssl \\
 		--enable-module=define