From 81113446e6c0944729d91c6ea3db7457b041795d Mon Sep 17 00:00:00 2001
From: Dirk Meyer <dinoex@FreeBSD.org>
Date: Tue, 15 Apr 2008 11:50:10 +0000
Subject: - Security update to 1.3.41+ssl_1.59 Security: CVE-2008-0555

- fix objformat
PR:		120105
---
 www/apache13-ssl/Makefile  |  7 +++++--
 www/apache13-ssl/distinfo  | 12 ++++++------
 www/apache13-ssl/pkg-plist |  2 +-
 3 files changed, 12 insertions(+), 9 deletions(-)

(limited to 'www/apache13-ssl')

diff --git a/www/apache13-ssl/Makefile b/www/apache13-ssl/Makefile
index 78d66be72bfd..8d61248a506e 100644
--- a/www/apache13-ssl/Makefile
+++ b/www/apache13-ssl/Makefile
@@ -31,8 +31,8 @@ CONFLICTS=	apache+mod_ssl-1.* apache+mod_ssl+ipv6-1.* apache+mod_ssl+modsnmp-1.*
 		caudium-devel-1.* caudium10-1.* caudium12-* \
 		ru-apache+mod_ssl-1.* ru-apache-1.*
 
-APACHE_VERSION=		1.3.37
-APACHE_SSL_VERSION=	1.57
+APACHE_VERSION=		1.3.41
+APACHE_SSL_VERSION=	1.59
 USE_OPENSSL=		yes
 USE_PERL5=		yes
 HAS_CONFIGURE=		yes
@@ -102,6 +102,9 @@ post-patch:
 	@${PATCH} ${PATCH_ARGS} < ${FILESDIR}/post-patch-conf:httpd.conf-dist
 	@${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
 		${FILESDIR}/apache.sh > ${WRKDIR}/apache.sh
+	@${REINPLACE_CMD} -e 's|echo aout|echo elf|' \
+		${WRKSRC}/src/Configure
+
 post-install:
 	@${ECHO_CMD} ""
 	@${ECHO_CMD} "SSL is disabled by default"
diff --git a/www/apache13-ssl/distinfo b/www/apache13-ssl/distinfo
index 28dc60f621c1..c9b4e5ee6168 100644
--- a/www/apache13-ssl/distinfo
+++ b/www/apache13-ssl/distinfo
@@ -1,6 +1,6 @@
-MD5 (apache_1.3.37.tar.gz) = b278f0969a9ccadeb781316e79e3520f
-SHA256 (apache_1.3.37.tar.gz) = 9f27889bfbf418b987a892160e52fd217d66391df2870f3ecac877ef565c4bfc
-SIZE (apache_1.3.37.tar.gz) = 2665370
-MD5 (apache_1.3.37+ssl_1.57.tar.gz) = 3fc7a553ede7cda3cfa3247139e32a51
-SHA256 (apache_1.3.37+ssl_1.57.tar.gz) = 42e51fc453bbf510fc3d0b7e1c2dd529ad7593ee2a13eb80e12a7e1cfa8cd9b5
-SIZE (apache_1.3.37+ssl_1.57.tar.gz) = 57593
+MD5 (apache_1.3.41.tar.gz) = f7f00b635243f03a787ca9f4d4c85651
+SHA256 (apache_1.3.41.tar.gz) = 4b016d3998f822af7a1a515e9626590f5473a4dd5c3e8466f20a6a86a2a63adc
+SIZE (apache_1.3.41.tar.gz) = 2483180
+MD5 (apache_1.3.41+ssl_1.59.tar.gz) = 42b1bc1be558a05336043b700597e2e9
+SHA256 (apache_1.3.41+ssl_1.59.tar.gz) = acf6a7cae62338b70f5788bf93fcfe7c3a52be1727b4ec6e6d48e3a51edd29ed
+SIZE (apache_1.3.41+ssl_1.59.tar.gz) = 58499
diff --git a/www/apache13-ssl/pkg-plist b/www/apache13-ssl/pkg-plist
index 2ca0c04f648f..05338fa28690 100644
--- a/www/apache13-ssl/pkg-plist
+++ b/www/apache13-ssl/pkg-plist
@@ -437,6 +437,7 @@ www/data-dist/index.html.zh-tw.big5
 %%PORTDOCS%%%%DOCSDIR%%/windows.html.html
 %%PORTDOCS%%%%DOCSDIR%%/windows.html.ja.jis
 www/icons/README
+www/icons/README.html
 www/icons/a.gif
 www/icons/a.png
 www/icons/alert.black.gif
@@ -561,7 +562,6 @@ www/icons/screw2.gif
 www/icons/screw2.png
 www/icons/script.gif
 www/icons/script.png
-www/icons/small/README.txt
 www/icons/small/back.gif
 www/icons/small/back.png
 www/icons/small/binary.gif
-- 
cgit v1.2.3