summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'net-www/mod_ssl')
-rw-r--r--net-www/mod_ssl/ChangeLog9
-rw-r--r--net-www/mod_ssl/Manifest40
-rw-r--r--net-www/mod_ssl/files/digest-mod_ssl-2.8.241
-rw-r--r--net-www/mod_ssl/files/digest-mod_ssl-2.8.24-r11
-rw-r--r--net-www/mod_ssl/mod_ssl-2.8.24-r1.ebuild74
-rw-r--r--net-www/mod_ssl/mod_ssl-2.8.24.ebuild80
6 files changed, 181 insertions, 24 deletions
diff --git a/net-www/mod_ssl/ChangeLog b/net-www/mod_ssl/ChangeLog
index 40fb73e7b711..9be376703078 100644
--- a/net-www/mod_ssl/ChangeLog
+++ b/net-www/mod_ssl/ChangeLog
@@ -1,6 +1,13 @@
# 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.79 2005/07/16 23:40:52 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mod_ssl/ChangeLog,v 1.80 2005/09/10 22:30:23 vericgar Exp $
+
+*mod_ssl-2.8.24-r1 (10 Sep 2005)
+*mod_ssl-2.8.24 (10 Sep 2005)
+
+ 10 Sep 2005; Michael Stewart <vericgar@gentoo.org> +mod_ssl-2.8.24.ebuild,
+ +mod_ssl-2.8.24-r1.ebuild:
+ Security bump to address CAN-2005-2700. Fixes bug 104807
16 Jul 2005; Joseph Jezak <josejx@gentoo.org> mod_ssl-2.8.22.ebuild:
Marked ppc stable for bug #88666.
diff --git a/net-www/mod_ssl/Manifest b/net-www/mod_ssl/Manifest
index 89ad48ed47c3..d978776a59ee 100644
--- a/net-www/mod_ssl/Manifest
+++ b/net-www/mod_ssl/Manifest
@@ -1,31 +1,25 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 bbb586df2f07216912fce9393932984b mod_ssl-2.8.22-r1.ebuild 1780
-MD5 8caaa97021cfd052c33fc36ec9a5458a mod_ssl-2.8.20.ebuild 2289
+MD5 ba252cc54bec64fd91b38fe0380c8cc8 ChangeLog 9170
MD5 0d18f0fe5d603b41b988373892caf195 metadata.xml 226
-MD5 c6e2135048cbccc9899a3131fc60a845 mod_ssl-2.8.19.ebuild 2290
+MD5 5fb666b241c86fff4ddc0880de44be48 mod_ssl-2.8.17.ebuild 2188
MD5 13338aa13b7124ea1609e8560cbaabeb mod_ssl-2.8.18.ebuild 2188
+MD5 c6e2135048cbccc9899a3131fc60a845 mod_ssl-2.8.19.ebuild 2290
+MD5 8caaa97021cfd052c33fc36ec9a5458a mod_ssl-2.8.20.ebuild 2289
MD5 86c74e1d2f258764b5586a33b1bf609a mod_ssl-2.8.21.ebuild 2300
MD5 b349032c6051d3e3ae1bf53f52859a25 mod_ssl-2.8.22.ebuild 2309
-MD5 5fb666b241c86fff4ddc0880de44be48 mod_ssl-2.8.17.ebuild 2188
-MD5 ba252cc54bec64fd91b38fe0380c8cc8 ChangeLog 9170
-MD5 515630b3e53faa458b8ec7a0e73bef55 files/10_mod_ssl.conf 2859
-MD5 959a0125c23ead91b0071f4ffc54e9bc files/default-ssl.conf 7653
+MD5 bbb586df2f07216912fce9393932984b mod_ssl-2.8.22-r1.ebuild 1780
+MD5 c7a13d2b0a098ecaed8fd40c0ce4edb5 mod_ssl-2.8.24.ebuild 2318
+MD5 bbb586df2f07216912fce9393932984b mod_ssl-2.8.24-r1.ebuild 1780
+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-r1 73
-MD5 8270779f233bc311118f53ebce7338e7 files/ssl.default-vhost.conf 6985
-MD5 9ba9eb8eced950cd59cb8dadd090f908 files/digest-mod_ssl-2.8.17 73
-MD5 71ac46d211c8aa42c7a5e51c6165862a files/mod_ssl.conf 2460
MD5 dd92adba34e6b36ef6fd2750869e1a18 files/gentestcrt.sh 8801
+MD5 71ac46d211c8aa42c7a5e51c6165862a files/mod_ssl.conf 2460
+MD5 8270779f233bc311118f53ebce7338e7 files/ssl.default-vhost.conf 6985
+MD5 515630b3e53faa458b8ec7a0e73bef55 files/10_mod_ssl.conf 2859
+MD5 959a0125c23ead91b0071f4ffc54e9bc files/default-ssl.conf 7653
MD5 54cbf53816f2c9c80600ea9f37ab02ba files/digest-mod_ssl-2.8.22 73
-MD5 dd87f058ab62ac5c5da4b03713e9184a files/digest-mod_ssl-2.8.20 73
-MD5 89239995d079a1bd9abc580e2264c71b files/digest-mod_ssl-2.8.19 73
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDAW/YgIKl8Uu19MoRAhUvAJ91o3DYEFngmCTt9d1IPrzHu4wE4ACeM9C9
-eHvVyEctq3jzHAD9fJRz6PM=
-=rFHU
------END PGP SIGNATURE-----
+MD5 54cbf53816f2c9c80600ea9f37ab02ba files/digest-mod_ssl-2.8.22-r1 73
+MD5 a68a0b56a629886ec3ebd08bfb0f638c files/digest-mod_ssl-2.8.24-r1 73
+MD5 a68a0b56a629886ec3ebd08bfb0f638c files/digest-mod_ssl-2.8.24 73
diff --git a/net-www/mod_ssl/files/digest-mod_ssl-2.8.24 b/net-www/mod_ssl/files/digest-mod_ssl-2.8.24
new file mode 100644
index 000000000000..59f8c0f8e97d
--- /dev/null
+++ b/net-www/mod_ssl/files/digest-mod_ssl-2.8.24
@@ -0,0 +1 @@
+MD5 4f28dcf0f090a7dc2ab148e6a503e99a mod_ssl-2.8.24-1.3.33.tar.gz 820292
diff --git a/net-www/mod_ssl/files/digest-mod_ssl-2.8.24-r1 b/net-www/mod_ssl/files/digest-mod_ssl-2.8.24-r1
new file mode 100644
index 000000000000..59f8c0f8e97d
--- /dev/null
+++ b/net-www/mod_ssl/files/digest-mod_ssl-2.8.24-r1
@@ -0,0 +1 @@
+MD5 4f28dcf0f090a7dc2ab148e6a503e99a mod_ssl-2.8.24-1.3.33.tar.gz 820292
diff --git a/net-www/mod_ssl/mod_ssl-2.8.24-r1.ebuild b/net-www/mod_ssl/mod_ssl-2.8.24-r1.ebuild
new file mode 100644
index 000000000000..8b8c48fb0f3b
--- /dev/null
+++ b/net-www/mod_ssl/mod_ssl-2.8.24-r1.ebuild
@@ -0,0 +1,74 @@
+# 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.24-r1.ebuild,v 1.1 2005/09/10 22:30:23 vericgar Exp $
+
+inherit apache-module
+
+MY_P=${P}-1.3.33
+
+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"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+LICENSE="as-is"
+SLOT="0"
+IUSE=""
+
+DEPEND=">=dev-libs/openssl-0.9.6k"
+
+S=${WORKDIR}/${MY_P}
+
+APACHE1_MOD_FILE="${S}/pkg.sslmod/libssl.so"
+APACHE1_MOD_CONF="10_${PN}"
+APACHE1_MOD_DEFINE="SSL"
+
+VHOSTFILE="default-ssl"
+
+DOCFILES="ANNOUNCE CHANGES CREDITS LICENSE NEWS README*"
+
+need_apache1
+
+src_unpack() {
+ unpack ${A} || die
+ cd ${S} || die
+
+ # proper path to openssl
+ sed -i -e 's:^\(openssl=\).*:\1"/usr/bin/openssl":' 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=${APXS1} ${myconf} || die "bad ./configure"
+ make || die "compile problem"
+}
+
+src_install() {
+ apache1_src_install
+
+ insinto ${APACHE1_VHOSTDIR}
+ doins ${FILESDIR}/${VHOSTFILE}.conf
+
+ exeinto /usr/lib/ssl/mod_ssl
+ doexe pkg.contrib/*.sh ${FILESDIR}/gentestcrt.sh
+
+ dodir /usr/share/doc/${PF}/html
+ cp -a pkg.ssldoc/* ${D}/usr/share/doc/${PF}/html
+}
+
+pkg_postinst() {
+ install -d -o root -g root -m0755 ${ROOT}${APACHE1_CONFDIR}/ssl
+
+ apache1_pkg_postinst
+
+ cd ${ROOT}${APACHE1_CONFDIR}/ssl
+ einfo "Generating self-signed test certificate in ${APACHE1_CONFDIR}/ssl..."
+ einfo "(Ignore any message from the yes command below)"
+ yes "" | ${ROOT}/usr/lib/ssl/mod_ssl/gentestcrt.sh >/dev/null 2>&1
+ einfo
+}
diff --git a/net-www/mod_ssl/mod_ssl-2.8.24.ebuild b/net-www/mod_ssl/mod_ssl-2.8.24.ebuild
new file mode 100644
index 000000000000..7b68dbffef3b
--- /dev/null
+++ b/net-www/mod_ssl/mod_ssl-2.8.24.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.24.ebuild,v 1.1 2005/09/10 22:30:23 vericgar Exp $
+
+MY_P=${P}-1.3.33
+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 ~sparc x86"
+IUSE=""
+
+DEPEND="=net-www/apache-1.3.33*
+ >=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
+}