Version bump, bug 66807.

4 files changed, 95 insertions, 7 deletions

diff --git a/net-www/mod_ssl/ChangeLog b/net-www/mod_ssl/ChangeLog
index 350c4c7a9df5..a0b8ab8d1f4a 100644
--- a/net-www/mod_ssl/ChangeLog
+++ b/net-www/mod_ssl/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-www/mod_ssl
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mod_ssl/ChangeLog,v 1.50 2004/08/01 14:49:47 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mod_ssl/ChangeLog,v 1.51 2004/10/21 01:48:40 kloeri Exp $
+
+*mod_ssl-2.8.20 (21 Oct 2004)
+
+  21 Oct 2004; Bryan Østergaard <kloeri@gentoo.org> +mod_ssl-2.8.20.ebuild:
+  Version bump, bug 66807.
 
   01 Aug 2004; Guy Martin <gmsoft@gentoo.org> mod_ssl-2.8.19.ebuild:
   Marked stable on hppa.
diff --git a/net-www/mod_ssl/Manifest b/net-www/mod_ssl/Manifest
index c17e3c5c46b3..79a5ac99dfbf 100644
--- a/net-www/mod_ssl/Manifest
+++ b/net-www/mod_ssl/Manifest
@@ -1,11 +1,13 @@
-MD5 222f0b9a1ee4c6c1c4038a064140a1e6 ChangeLog 5983
-MD5 d2da0e45d7e39184d1cb7abbe3879086 metadata.xml 159
-MD5 7f02b177b06559b9aab3444c173343bc mod_ssl-2.8.17.ebuild 2183
 MD5 9eba5451e8883ea7e9cedf5b02c97e62 mod_ssl-2.8.18.ebuild 2183
+MD5 7f02b177b06559b9aab3444c173343bc mod_ssl-2.8.17.ebuild 2183
 MD5 1e2466f680717170d5820cf5c0282a53 mod_ssl-2.8.19.ebuild 2275
+MD5 1a07f972921e78621f20c5de496488c2 ChangeLog 6118
+MD5 d2da0e45d7e39184d1cb7abbe3879086 metadata.xml 159
+MD5 039d11eaea2cf73a6585e177bd8e6ed9 mod_ssl-2.8.20.ebuild 2283
+MD5 8270779f233bc311118f53ebce7338e7 files/ssl.default-vhost.conf 6985
+MD5 e92c5d69747a08ae94986ee6d3b024a2 files/mod_ssl.conf 2451
+MD5 dd92adba34e6b36ef6fd2750869e1a18 files/gentestcrt.sh 8801
 MD5 9ba9eb8eced950cd59cb8dadd090f908 files/digest-mod_ssl-2.8.17 73
 MD5 f53031df0c0d1a5bd75a9151d0810e9e files/digest-mod_ssl-2.8.18 73
-MD5 dd92adba34e6b36ef6fd2750869e1a18 files/gentestcrt.sh 8801
-MD5 e92c5d69747a08ae94986ee6d3b024a2 files/mod_ssl.conf 2451
-MD5 8270779f233bc311118f53ebce7338e7 files/ssl.default-vhost.conf 6985
 MD5 89239995d079a1bd9abc580e2264c71b files/digest-mod_ssl-2.8.19 73
+MD5 dd87f058ab62ac5c5da4b03713e9184a files/digest-mod_ssl-2.8.20 73
diff --git a/net-www/mod_ssl/files/digest-mod_ssl-2.8.20 b/net-www/mod_ssl/files/digest-mod_ssl-2.8.20
new file mode 100644
index 000000000000..aeefce914fe3
--- /dev/null
+++ b/net-www/mod_ssl/files/digest-mod_ssl-2.8.20
@@ -0,0 +1 @@
+MD5 4843881cfa31d6bb1b045d24562be835 mod_ssl-2.8.20-1.3.31.tar.gz 754568
diff --git a/net-www/mod_ssl/mod_ssl-2.8.20.ebuild b/net-www/mod_ssl/mod_ssl-2.8.20.ebuild
new file mode 100644
index 000000000000..ef7329544647
--- /dev/null
+++ b/net-www/mod_ssl/mod_ssl-2.8.20.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-www/mod_ssl/mod_ssl-2.8.20.ebuild,v 1.1 2004/10/21 01:48:40 kloeri 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() {
+	if has_version '=sys-libs/gdbm-1.8.3*' ; then
+	     myconf = "--enable-rule=SSL_SDBM"
+	fi
+
+	SSL_BASE=SYSTEM \
+	./configure \
+		--with-apxs=/usr/sbin/apxs ${myconf} || 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/net-www/${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
+}