Version bump for old-style configuration. Fixes bug 109895

(Portage version: 2.0.53)

4 files changed, 90 insertions, 1 deletions

diff --git a/net-www/mod_ssl/ChangeLog b/net-www/mod_ssl/ChangeLog
index d32d496dfdc3..0de631767cd1 100644
--- a/net-www/mod_ssl/ChangeLog
+++ b/net-www/mod_ssl/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-www/mod_ssl
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mod_ssl/ChangeLog,v 1.98 2005/12/13 23:28:33 vericgar Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mod_ssl/ChangeLog,v 1.99 2005/12/14 04:44:00 vericgar Exp $
+
+*mod_ssl-2.8.25-r1 (14 Dec 2005)
+
+  14 Dec 2005; Michael Stewart <vericgar@gentoo.org>
+  +mod_ssl-2.8.25-r1.ebuild:
+  Version bump for old-style configuration. Fixes bug 109895
 
 *mod_ssl-2.8.25-r10 (13 Dec 2005)
 
diff --git a/net-www/mod_ssl/Manifest b/net-www/mod_ssl/Manifest
index 5c560d8d8c87..ffc2c3c95ee6 100644
--- a/net-www/mod_ssl/Manifest
+++ b/net-www/mod_ssl/Manifest
@@ -10,6 +10,7 @@ MD5 54cbf53816f2c9c80600ea9f37ab02ba files/digest-mod_ssl-2.8.22 73
 MD5 54cbf53816f2c9c80600ea9f37ab02ba files/digest-mod_ssl-2.8.22-r1 73
 MD5 a68a0b56a629886ec3ebd08bfb0f638c files/digest-mod_ssl-2.8.24 73
 MD5 a68a0b56a629886ec3ebd08bfb0f638c files/digest-mod_ssl-2.8.24-r1 73
+MD5 df803a8e5ad1a29ae5a6996fbfdde70c files/digest-mod_ssl-2.8.25-r1 73
 MD5 df803a8e5ad1a29ae5a6996fbfdde70c files/digest-mod_ssl-2.8.25-r10 73
 MD5 dd92adba34e6b36ef6fd2750869e1a18 files/gentestcrt.sh 8801
 MD5 71ac46d211c8aa42c7a5e51c6165862a files/mod_ssl.conf 2460
@@ -24,4 +25,5 @@ MD5 aa8f74dc6a49b8646a307d4844fd0dfb mod_ssl-2.8.22-r1.ebuild 1782
 MD5 d20c6eee687d0fca4397f828e34092dc mod_ssl-2.8.22.ebuild 2316
 MD5 e3e145c5f8c0c0b2d3e63a0528100b4d mod_ssl-2.8.24-r1.ebuild 1779
 MD5 a4d234acd0fdfc01177ded213518dced mod_ssl-2.8.24.ebuild 2315
+MD5 31720c763667e02db65732b4735dace4 mod_ssl-2.8.25-r1.ebuild 2325
 MD5 afd59899fac965c3a98a7253a11d6b72 mod_ssl-2.8.25-r10.ebuild 1791
diff --git a/net-www/mod_ssl/files/digest-mod_ssl-2.8.25-r1 b/net-www/mod_ssl/files/digest-mod_ssl-2.8.25-r1
new file mode 100644
index 000000000000..f646305b8db6
--- /dev/null
+++ b/net-www/mod_ssl/files/digest-mod_ssl-2.8.25-r1
@@ -0,0 +1 @@
+MD5 1ef2a6cb47573444779b2fd10502514b mod_ssl-2.8.25-1.3.34.tar.gz 820352
diff --git a/net-www/mod_ssl/mod_ssl-2.8.25-r1.ebuild b/net-www/mod_ssl/mod_ssl-2.8.25-r1.ebuild
new file mode 100644
index 000000000000..ad42d6156025
--- /dev/null
+++ b/net-www/mod_ssl/mod_ssl-2.8.25-r1.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2005 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.25-r1.ebuild,v 1.1 2005/12/14 04:44:00 vericgar Exp $
+
+MY_P=${P}-1.3.34
+S=${WORKDIR}/${MY_P}
+DESCRIPTION="An SSL module for the Apache 1.3 Web server"
+HOMEPAGE="http://www.modssl.org/"
+SRC_URI="http://www.modssl.org/source/${MY_P}.tar.gz"
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE=""
+
+DEPEND="=net-www/apache-1.3.34*
+		>=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 -pPR 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
+}