Clean up mod_ssl (broken by my apache cleaning).

(Portage version: 2.0.53)

9 files changed, 6 insertions, 318 deletions

diff --git a/net-www/mod_ssl/ChangeLog b/net-www/mod_ssl/ChangeLog
index dc235dcd11ff..f63c15ac469a 100644
--- a/net-www/mod_ssl/ChangeLog
+++ b/net-www/mod_ssl/ChangeLog
@@ -1,6 +1,10 @@
 # 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.106 2005/12/23 07:31:33 corsair Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-www/mod_ssl/ChangeLog,v 1.107 2006/01/13 10:01:53 kloeri Exp $
+
+  13 Jan 2006; Bryan Østergaard <kloeri@gentoo.org -mod_ssl-2.8.17.ebuild,
+  -mod_ssl-2.8.18.ebuild, -mod_ssl-2.8.19.ebuild, -mod_ssl-2.8.20.ebuild:
+  Clean up mod_ssl (broken by my apache cleaning).
 
   23 Dec 2005; Markus Rothe <corsair@gentoo.org> mod_ssl-2.8.25-r10.ebuild:
   Stable on ppc64
diff --git a/net-www/mod_ssl/files/digest-mod_ssl-2.8.17 b/net-www/mod_ssl/files/digest-mod_ssl-2.8.17
deleted file mode 100644
index d352621fa061..000000000000
--- a/net-www/mod_ssl/files/digest-mod_ssl-2.8.17
+++ /dev/null
@@ -1 +0,0 @@
-MD5 6c3f726b336f497793567591717d2a6b mod_ssl-2.8.17-1.3.31.tar.gz 754472
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
deleted file mode 100644
index 8366a3adf70d..000000000000
--- a/net-www/mod_ssl/files/digest-mod_ssl-2.8.18
+++ /dev/null
@@ -1 +0,0 @@
-MD5 4e966d62bb9304fef153b03868756543 mod_ssl-2.8.18-1.3.31.tar.gz 754214
diff --git a/net-www/mod_ssl/files/digest-mod_ssl-2.8.19 b/net-www/mod_ssl/files/digest-mod_ssl-2.8.19
deleted file mode 100644
index 33762abd3d68..000000000000
--- a/net-www/mod_ssl/files/digest-mod_ssl-2.8.19
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ae2becebfec3784f9342932581e1cc9d mod_ssl-2.8.19-1.3.31.tar.gz 754277
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
deleted file mode 100644
index aeefce914fe3..000000000000
--- a/net-www/mod_ssl/files/digest-mod_ssl-2.8.20
+++ /dev/null
@@ -1 +0,0 @@
-MD5 4843881cfa31d6bb1b045d24562be835 mod_ssl-2.8.20-1.3.31.tar.gz 754568
diff --git a/net-www/mod_ssl/mod_ssl-2.8.17.ebuild b/net-www/mod_ssl/mod_ssl-2.8.17.ebuild
deleted file mode 100644
index 5c3f94978e62..000000000000
--- a/net-www/mod_ssl/mod_ssl-2.8.17.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# 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.17.ebuild,v 1.12 2005/10/16 16:23:23 kloeri Exp $
-
-MY_P=${P}-1.3.31
-S=${WORKDIR}/${MY_P}
-DESCRIPTION="An SSL module for the Apache 1.3 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 -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
-}
diff --git a/net-www/mod_ssl/mod_ssl-2.8.18.ebuild b/net-www/mod_ssl/mod_ssl-2.8.18.ebuild
deleted file mode 100644
index f9a9810b81a3..000000000000
--- a/net-www/mod_ssl/mod_ssl-2.8.18.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# 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.18.ebuild,v 1.11 2005/10/16 16:23:23 kloeri Exp $
-
-MY_P=${P}-1.3.31
-S=${WORKDIR}/${MY_P}
-DESCRIPTION="An SSL module for the Apache 1.3 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 -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
-}
diff --git a/net-www/mod_ssl/mod_ssl-2.8.19.ebuild b/net-www/mod_ssl/mod_ssl-2.8.19.ebuild
deleted file mode 100644
index 447ae98c0ae5..000000000000
--- a/net-www/mod_ssl/mod_ssl-2.8.19.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# 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.19.ebuild,v 1.12 2005/10/16 16:23:23 kloeri Exp $
-
-MY_P=${P}-1.3.31
-S=${WORKDIR}/${MY_P}
-DESCRIPTION="An SSL module for the Apache 1.3 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 -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
-}
diff --git a/net-www/mod_ssl/mod_ssl-2.8.20.ebuild b/net-www/mod_ssl/mod_ssl-2.8.20.ebuild
deleted file mode 100644
index de6de39c767b..000000000000
--- a/net-www/mod_ssl/mod_ssl-2.8.20.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# 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.20.ebuild,v 1.4 2005/10/16 16:23:23 kloeri Exp $
-
-MY_P=${P}-1.3.31
-S=${WORKDIR}/${MY_P}
-DESCRIPTION="An SSL module for the Apache 1.3 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 -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
-}