Clean up mod_ssl (broken by my apache cleaning).

Package-Manager: portage-2.0.53

10 files changed, 28 insertions, 338 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/Manifest b/net-www/mod_ssl/Manifest
index 0cdd9c592d4c..0f7f973e842d 100644
--- a/net-www/mod_ssl/Manifest
+++ b/net-www/mod_ssl/Manifest
@@ -1,29 +1,31 @@
-MD5 b13422d5795241d5522a57e106f1fa7f ChangeLog 12709
-MD5 7272d8b6d09e3e301b6a08aa9c912eb0 metadata.xml 226
-MD5 689454ca8d62950ecf564edecbd53bce mod_ssl-2.8.17.ebuild 2188
-MD5 165b6fc422fa8cfe8274e7d327106ee6 mod_ssl-2.8.18.ebuild 2188
-MD5 a1be8865e0380c9442ee291bb42612a6 mod_ssl-2.8.19.ebuild 2290
-MD5 a08fbd11fea8e23f25a5179a1f505cf9 mod_ssl-2.8.20.ebuild 2289
-MD5 1fb97ef85892952b8379de0a12c639af mod_ssl-2.8.21.ebuild 2300
-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 e2f3345eb076d372ca960dda31fcd297 mod_ssl-2.8.25-r1.ebuild 2321
-MD5 f84c53a5abc0de9cc33538a56d01917d mod_ssl-2.8.25-r10.ebuild 1780
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 e62ffe82495afd6bb052508744e77da7 ChangeLog 12910
 MD5 515630b3e53faa458b8ec7a0e73bef55 files/10_mod_ssl.conf 2859
 MD5 959a0125c23ead91b0071f4ffc54e9bc files/default-ssl.conf 7653
-MD5 9ba9eb8eced950cd59cb8dadd090f908 files/digest-mod_ssl-2.8.17 73
-MD5 f53031df0c0d1a5bd75a9151d0810e9e files/digest-mod_ssl-2.8.18 73
-MD5 89239995d079a1bd9abc580e2264c71b files/digest-mod_ssl-2.8.19 73
-MD5 dd87f058ab62ac5c5da4b03713e9184a files/digest-mod_ssl-2.8.20 73
 MD5 289c880e2ff1c2de91eda32e7e486085 files/digest-mod_ssl-2.8.21 73
 MD5 54cbf53816f2c9c80600ea9f37ab02ba files/digest-mod_ssl-2.8.22 73
 MD5 54cbf53816f2c9c80600ea9f37ab02ba files/digest-mod_ssl-2.8.22-r1 73
-MD5 dd92adba34e6b36ef6fd2750869e1a18 files/gentestcrt.sh 8801
-MD5 71ac46d211c8aa42c7a5e51c6165862a files/mod_ssl.conf 2460
-MD5 8270779f233bc311118f53ebce7338e7 files/ssl.default-vhost.conf 6985
 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
+MD5 8270779f233bc311118f53ebce7338e7 files/ssl.default-vhost.conf 6985
+MD5 7272d8b6d09e3e301b6a08aa9c912eb0 metadata.xml 226
+MD5 1fb97ef85892952b8379de0a12c639af mod_ssl-2.8.21.ebuild 2300
+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 e2f3345eb076d372ca960dda31fcd297 mod_ssl-2.8.25-r1.ebuild 2321
+MD5 f84c53a5abc0de9cc33538a56d01917d mod_ssl-2.8.25-r10.ebuild 1780
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDx3rrugEuf3OQ0akRAouAAJ9iHvhnr51MCWpUYIlIkG6/mZvQ7ACcDmFa
+yAjQZLLyXpvHCoKHHtXgeGg=
+=FAFl
+-----END PGP SIGNATURE-----
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
-}