Version bump, closes #51368.

4 files changed, 88 insertions, 6 deletions

diff --git a/net-www/mod_ssl/ChangeLog b/net-www/mod_ssl/ChangeLog
index 8df03e96c476..a22073df9961 100644
--- a/net-www/mod_ssl/ChangeLog
+++ b/net-www/mod_ssl/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-www/mod_ssl
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mod_ssl/ChangeLog,v 1.33 2004/05/25 14:52:55 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mod_ssl/ChangeLog,v 1.34 2004/05/29 14:17:29 zul Exp $
+
+  29 May 2004; Chuck Short <zul@gentoo.org> :
+  Version bump. Fix for CAN-2004-0488. Closes #51368.
 
   25 May 2004; Guy Martin <gmsoft@gentoo.org> mod_ssl-2.8.17.ebuild:
   Marked stable on hppa.
diff --git a/net-www/mod_ssl/Manifest b/net-www/mod_ssl/Manifest
index 8b2051d89a04..186b52d837d0 100644
--- a/net-www/mod_ssl/Manifest
+++ b/net-www/mod_ssl/Manifest
@@ -1,9 +1,11 @@
-MD5 ae80fdb8f85dd8690994da2ab4a50c6f ChangeLog 4319
+MD5 ce6d0f088446bcfbe71e24bf8766c843 mod_ssl-2.8.18.ebuild 2197
+MD5 1a15ed7e66a2ef99a176d41374557007 mod_ssl-2.8.17.ebuild 2194
+MD5 f0dd8f20140f27752dda16f901d62d9c ChangeLog 4417
 MD5 d2da0e45d7e39184d1cb7abbe3879086 metadata.xml 159
 MD5 d9660a5d5e0e7004669341c99a92e91a mod_ssl-2.8.16.ebuild 2178
-MD5 1a15ed7e66a2ef99a176d41374557007 mod_ssl-2.8.17.ebuild 2194
+MD5 b152e3907373f3239e7b13efbfb3d7c8 files/ssl.default-vhost.conf 6978
+MD5 e451c018a8da27b6842d9224364962a1 files/mod_ssl.conf 2449
+MD5 7cdc6f06443dc935bf836249bc085ecd files/gentestcrt.sh 8799
 MD5 2d40e1b1ed8c3b290e75eda14bcd0948 files/digest-mod_ssl-2.8.16 73
 MD5 9ba9eb8eced950cd59cb8dadd090f908 files/digest-mod_ssl-2.8.17 73
-MD5 7cdc6f06443dc935bf836249bc085ecd files/gentestcrt.sh 8799
-MD5 e451c018a8da27b6842d9224364962a1 files/mod_ssl.conf 2449
-MD5 b152e3907373f3239e7b13efbfb3d7c8 files/ssl.default-vhost.conf 6978
+MD5 f53031df0c0d1a5bd75a9151d0810e9e files/digest-mod_ssl-2.8.18 73
diff --git a/net-www/mod_ssl/files/digest-mod_ssl-2.8.18 b/net-www/mod_ssl/files/digest-mod_ssl-2.8.18
new file mode 100644
index 000000000000..8366a3adf70d
--- /dev/null
+++ b/net-www/mod_ssl/files/digest-mod_ssl-2.8.18
@@ -0,0 +1 @@
+MD5 4e966d62bb9304fef153b03868756543 mod_ssl-2.8.18-1.3.31.tar.gz 754214
diff --git a/net-www/mod_ssl/mod_ssl-2.8.18.ebuild b/net-www/mod_ssl/mod_ssl-2.8.18.ebuild
new file mode 100644
index 000000000000..532d14635355
--- /dev/null
+++ b/net-www/mod_ssl/mod_ssl-2.8.18.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-www/mod_ssl/mod_ssl-2.8.18.ebuild,v 1.1 2004/05/29 14:17:29 zul Exp $
+
+MY_P=${P}-1.3.31
+S=${WORKDIR}/${MY_P}
+DESCRIPTION="An SSL module for the Apache Web server"
+SRC_URI="http://www.modssl.org/source/${MY_P}.tar.gz"
+HOMEPAGE="http://www.modssl.org/"
+
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~mips"
+LICENSE="as-is"
+SLOT="0"
+IUSE=""
+
+DEPEND="=net-www/apache-1.3.31*
+	>=dev-libs/openssl-0.9.6k"
+
+src_unpack() {
+	unpack ${A} ; cd ${S}
+	# proper path to openssl
+	cp pkg.contrib/cca.sh pkg.contrib/cca.sh.orig
+	sed -e 's%^\(openssl=\).*%\1"/usr/bin/openssl"%' \
+		pkg.contrib/cca.sh.orig > pkg.contrib/cca.sh
+}
+
+src_compile() {
+	SSL_BASE=SYSTEM \
+	./configure \
+		--with-apxs=/usr/sbin/apxs || die "bad ./configure"
+	make || die "compile problem"
+}
+
+src_install() {
+	exeinto /usr/lib/apache-extramodules
+	doexe pkg.sslmod/libssl.so
+
+	exeinto /usr/lib/ssl/mod_ssl
+	doexe pkg.contrib/*.sh ${FILESDIR}/gentestcrt.sh
+
+	dodoc ANNOUNCE CHANGES CREDITS LICENSE NEWS README*
+	dodir /usr/share/doc/${PF}/html
+	cp -a pkg.ssldoc/* ${D}/usr/share/doc/${PF}/html
+
+	insinto /etc/apache/conf/vhosts
+	doins ${FILESDIR}/ssl.default-vhost.conf
+
+	insinto /etc/apache/conf/addon-modules
+	doins ${FILESDIR}/mod_ssl.conf
+}
+
+pkg_postinst() {
+	install -d -o root -g root -m0755 ${ROOT}/etc/apache/conf/ssl
+
+	einfo
+	einfo "Execute \"ebuild /var/db/pkg/${CATEGORY}/${PF}/${PF}.ebuild config\""
+	einfo "to have your apache.conf auto-updated for use with this module."
+	einfo "You should then edit your /etc/conf.d/apache file to suit."
+	einfo
+
+	cd ${ROOT}/etc/apache/conf/ssl
+	einfo "Generating self-signed test certificate in /etc/apache/conf/ssl..."
+	einfo "(Ignore any message from the yes command below)"
+	yes "" | ${ROOT}/usr/lib/ssl/mod_ssl/gentestcrt.sh >/dev/null 2>&1
+	einfo
+}
+
+pkg_config() {
+	${ROOT}/usr/sbin/apacheaddmod \
+		${ROOT}/etc/apache/conf/apache.conf \
+		extramodules/libssl.so mod_ssl.c ssl_module \
+		define=SSL addconf=conf/addon-modules/mod_ssl.conf
+
+	echo "Include  conf/vhosts/ssl.default-vhost.conf" \
+		>> ${ROOT}/etc/apache/conf/apache.conf
+}