security update

5 files changed, 266 insertions, 3 deletions

diff --git a/dev-libs/openssl/Manifest b/dev-libs/openssl/Manifest
index e0b330423a58..94e54edb37ea 100644
--- a/dev-libs/openssl/Manifest
+++ b/dev-libs/openssl/Manifest
@@ -1,9 +1,9 @@
-MD5 f28735bdc1d60271aec11a2653e112e5 openssl-0.9.7c.ebuild 4790
-MD5 122f63fa942a3874d461e927ae39c79a openssl-0.9.6k.ebuild 2610
+MD5 cb0b955348ad3ffaf7bdaf5c22286852 openssl-0.9.7c.ebuild 4785
+MD5 857d7bcc66f7c8046a9b185bae1e74cf openssl-0.9.6k.ebuild 2608
 MD5 7c732dae05a3589d0fef59bb8e29a6de openssl-0.9.6i-r2.ebuild 2934
 MD5 f110bafc5ab22d7c5529adddca5c9312 openssl-0.9.7b-r3.ebuild 4790
 MD5 9ec1d0cf71fb5fab0dfd0d8b409fcc9c openssl-0.9.7b.ebuild 3326
-MD5 140456851aa5bf23a8ac17230ae5818d ChangeLog 8761
+MD5 250a462f47aead4788118a588dd479fe ChangeLog 8760
 MD5 6180da7e10d5902dfff7b5a04900836d openssl-0.9.6j.ebuild 2610
 MD5 e4af813471d470d25fb77231d324ad1c files/digest-openssl-0.9.6k 67
 MD5 a5a379391dfaaef98e4fe4198ff2ed2c files/openssl-0.9.6i-blinding.patch 1717
diff --git a/dev-libs/openssl/files/digest-openssl-0.9.6k b/dev-libs/openssl/files/digest-openssl-0.9.6k
new file mode 100644
index 000000000000..86e5198e9d5b
--- /dev/null
+++ b/dev-libs/openssl/files/digest-openssl-0.9.6k
@@ -0,0 +1 @@
+MD5 dee92f648a02e4a7db0507ab3d0769c6 openssl-0.9.6k.tar.gz 2183608
diff --git a/dev-libs/openssl/files/digest-openssl-0.9.7c b/dev-libs/openssl/files/digest-openssl-0.9.7c
new file mode 100644
index 000000000000..390dae8813f5
--- /dev/null
+++ b/dev-libs/openssl/files/digest-openssl-0.9.7c
@@ -0,0 +1,2 @@
+MD5 c54fb36218adaaaba01ef733cd88c8ec openssl-0.9.7c.tar.gz 2791797
+MD5 dee92f648a02e4a7db0507ab3d0769c6 openssl-0.9.6k.tar.gz 2183608
diff --git a/dev-libs/openssl/openssl-0.9.6k.ebuild b/dev-libs/openssl/openssl-0.9.6k.ebuild
new file mode 100644
index 000000000000..5a677ffd5778
--- /dev/null
+++ b/dev-libs/openssl/openssl-0.9.6k.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-0.9.6k.ebuild,v 1.1 2003/09/30 15:03:20 aliz Exp $
+
+inherit eutils
+
+S=${WORKDIR}/${P}
+DESCRIPTION="Toolkit for SSL v2/v3 and TLS v1"
+SRC_URI="mirror://openssl/source/${P}.tar.gz"
+HOMEPAGE="http://www.openssl.org/"
+
+RDEPEND="virtual/glibc"
+DEPEND="${RDEPEND} >=dev-lang/perl-5"
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~alpha ~sparc ~mips ~hppa ~arm"
+IUSE=""
+
+if [ "$PROFILE_ARCH" = "sparc" -a "`uname -m`" = "sparc64" ]; then
+	SSH_TARGET="linux-sparcv8"
+fi
+
+if [ "`uname -m`" = "parisc64" ]; then
+	SSH_TARGET="linux-parisc"
+fi
+
+case $CHOST in
+	alphaev56*|alphaev6*) SSH_TARGET="linux-alpha+bwx-${CC:-gcc}" ;;
+	alpha*)               SSH_TARGET="linux-alpha-${CC:-gcc}" ;;
+esac
+
+src_unpack() {
+	unpack ${A} ; cd ${S}
+
+	epatch ${FILESDIR}/${PN}-0.9.6i-gentoo.diff
+
+	if [ "${ARCH}" = "mips" ]
+	then
+		cd ${S}
+		epatch ${FILESDIR}/openssl-0.9.6-mips.diff
+	fi
+
+	if [ "${ARCH}" = "arm" ]; then
+		# patch linker to add -ldl or things linking aginst libcrypto fail
+		sed -e \
+			's!^"linux-elf-arm"\(.*\)::BN\(.*\)!"linux-elf-arm"\1:-ldl:BN\2!' \
+			Configure > Configure.orig
+	elif [ "${ARCH}" = "hppa" ]; then
+		sed -e \
+		's!^"linux-parisc"\(.*\)::BN\(.*\)::!"linux-parisc"\1:-ldl:BN\2::::::::::dlfcn:linux-shared:-fPIC::.so.\\$(SHLIB_MAJOR).\\$(SHLIB_MINOR)!' \
+			Configure > Configure.orig
+	else
+		cp Configure Configure.orig
+	fi
+	sed -e "s/-O3/$CFLAGS/" -e "s/-m486//" Configure.orig > Configure
+}
+
+src_compile() {
+	if [ ${SSH_TARGET} ]; then
+		einfo "Forcing ${SSH_TARGET} compile"
+		./Configure ${SSH_TARGET} --prefix=/usr \
+			--openssldir=/etc/ssl shared threads || die
+	else
+		./config --prefix=/usr --openssldir=/etc/ssl shared threads || die
+	fi
+	# i think parallel make has problems
+	make all || die
+
+}
+
+src_install() {
+	make INSTALL_PREFIX=${D} MANDIR=/usr/share/man install || die
+	dodoc CHANGES* FAQ LICENSE NEWS README
+	dodoc doc/*.txt
+	dohtml doc/*
+	insinto /usr/share/emacs/site-lisp
+	doins doc/c-indentation.el
+
+	# The man pages rand.3 and passwd.1 conflict with other packages
+	# Rename them to ssl-* and also make a symlink from openssl-* to ssl-*
+	cd ${D}/usr/share/man/man1
+	mv passwd.1 ssl-passwd.1
+	ln -sf ssl-passwd.1 openssl-passwd.1
+	cd ${D}/usr/share/man/man3
+	mv rand.3 ssl-rand.3
+	ln -sf ssl-rand.3 openssl-rand.3
+
+	# create the certs directory.  Previous openssl builds
+	# would need to create /usr/lib/ssl/certs but this looks
+	# to be the more FHS compliant setup... -raker
+	dodir /etc/ssl/certs
+
+}
+
diff --git a/dev-libs/openssl/openssl-0.9.7c.ebuild b/dev-libs/openssl/openssl-0.9.7c.ebuild
new file mode 100644
index 000000000000..7e934732161b
--- /dev/null
+++ b/dev-libs/openssl/openssl-0.9.7c.ebuild
@@ -0,0 +1,166 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-0.9.7c.ebuild,v 1.1 2003/09/30 15:03:20 aliz Exp $
+
+inherit eutils flag-o-matic gcc
+
+if [ "$( gcc-version )" == "3.3" ]; then
+	filter-flags "-fprefetch-loop-arrays"
+fi
+
+OLD_096_P="${PN}-0.9.6k"
+
+S="${WORKDIR}"
+DESCRIPTION="Toolkit for SSL v2/v3 and TLS v1"
+SRC_URI="mirror://openssl/source/${P}.tar.gz
+	mirror://openssl/source/${OLD_096_P}.tar.gz"
+HOMEPAGE="http://www.openssl.org/"
+
+RDEPEND="virtual/glibc"
+DEPEND="${RDEPEND}
+	>=dev-lang/perl-5
+	>=sys-apps/sed-4"
+LICENSE="as-is"
+SLOT="0"
+
+KEYWORDS="~x86 ~ppc ~alpha ~sparc ~mips ~hppa ~arm ia64"
+
+src_unpack() {
+	unpack ${A}
+
+	# openssl-0.9.7
+	cd ${WORKDIR}/${P}
+
+	epatch ${FILESDIR}/${P}-gentoo.diff
+
+	if [ "${ARCH}" = "hppa" ]; then
+	sed -i -e \
+	's!^"linux-parisc"\(.*\)::BN\(.*\)::!"linux-parisc"\1:-ldl:BN\2::::::::::dlfcn:linux-shared:-fPIC::.so.\\$(SHLIB_MAJOR).\\$(SHLIB_MINOR)!' \
+		Configure
+	fi
+	if [ "${ARCH}" = "alpha" -a "${CC}" != "ccc" ]; then
+	# ccc compiled openssl will break things linked against
+	# a gcc compiled openssl, the configure will automatically detect 
+	# ccc and use it, so stop that if user hasnt asked for it.
+		sed -i -e \
+			's!CC=ccc!CC=gcc!' config
+	fi
+
+	sed -i -e "s/-O3/$CFLAGS/" -e "s/-m486//" Configure
+
+	# openssl-0.9.6
+	test -f ${ROOT}/usr/lib/libssl.so.0.9.6 && {
+		cd ${WORKDIR}/${OLD_096_P}
+
+	        epatch ${FILESDIR}/${OLD_096_P}-gentoo.diff
+
+		case ${ARCH} in
+		mips)
+			epatch ${FILESDIR}/openssl-0.9.6-mips.diff
+		;;
+		arm)
+			# patch linker to add -ldl or things linking aginst libcrypto fail
+			sed -i -e \
+				's!^"linux-elf-arm"\(.*\)::BN\(.*\)!"linux-elf-arm"\1:-ldl:BN\2!' \
+				Configure
+		;;
+		hppa)
+			sed -i -e \
+				's!^"linux-parisc"\(.*\)::BN\(.*\)::!"linux-parisc"\1:-ldl:BN\2::::::::::dlfcn:linux-shared:-fPIC::.so.\\$(SHLIB_MAJOR).\\$(SHLIB_MINOR)!' \
+				Configure
+		esac
+
+		sed -i -e "s/-O3/$CFLAGS/" -e "s/-m486//" Configure
+	}
+}
+
+src_compile() {
+	# openssl-0.9.7
+	cd ${WORKDIR}/${P}
+	./config --prefix=/usr --openssldir=/etc/ssl shared threads || die
+	einfo "Compiling ${P}"
+	make all || die
+
+	# openssl-0.9.6
+	test -f ${ROOT}/usr/lib/libssl.so.0.9.6 && {
+		cd ${WORKDIR}/${OLD_096_P}
+
+		if [ "$PROFILE_ARCH" = "sparc" -a "`uname -m`" = "sparc64" ]; then
+			SSH_TARGET="linux-sparcv8"
+		elif [ "`uname -m`" = "parisc64" ]; then
+			SSH_TARGET="linux-parisc"
+		fi
+
+		case ${CHOST} in
+		alphaev56*|alphaev6*)
+			SSH_TARGET="linux-alpha+bwx-${CC:-gcc}"
+		;;
+		alpha*)
+			SSH_TARGET="linux-alpha-${CC:-gcc}" ;;
+		esac
+
+		if [ ${SSH_TARGET} ]; then
+			einfo "Forcing ${SSH_TARGET} compile"
+			./Configure ${SSH_TARGET} --prefix=/usr \
+				--openssldir=/etc/ssl shared threads || die
+		else
+			./config --prefix=/usr --openssldir=/etc/ssl shared threads || die
+		fi
+
+		einfo "Compiling ${OLD_096_P}"
+		make all || die
+	}
+}
+
+src_install() {
+	# openssl-0.9.7
+	cd ${WORKDIR}/${P}
+	make INSTALL_PREFIX=${D} MANDIR=/usr/share/man install || die
+	dodoc CHANGES* FAQ LICENSE NEWS README
+	dodoc doc/*.txt
+	dohtml doc/*
+	insinto /usr/share/emacs/site-lisp
+	doins doc/c-indentation.el
+
+	# create the certs directory.  Previous openssl builds
+	# would need to create /usr/lib/ssl/certs but this looks
+	# to be the more FHS compliant setup... -raker
+	insinto /etc/ssl/certs
+	doins certs/*.pem
+	OPENSSL=${D}/usr/bin/openssl /usr/bin/perl tools/c_rehash ${D}/etc/ssl/certs
+
+	# The man pages rand.3 and passwd.1 conflict with other packages
+	# Rename them to ssl-* and also make a symlink from openssl-* to ssl-*
+	cd ${D}/usr/share/man/man1
+	mv passwd.1 ssl-passwd.1
+	ln -sf ssl-passwd.1 openssl-passwd.1
+	cd ${D}/usr/share/man/man3
+	mv rand.3 ssl-rand.3
+	ln -sf ssl-rand.3 openssl-rand.3
+
+	# openssl-0.9.6
+	test -f ${ROOT}/usr/lib/libssl.so.0.9.6 && {
+		dolib.so ${WORKDIR}/${OLD_096_P}/libcrypto.so.0.9.6
+		dolib.so ${WORKDIR}/${OLD_096_P}/libssl.so.0.9.6
+	}
+}
+
+pkg_postinst() {
+	local BN_H="${ROOT}$(gcc-config -L)/include/openssl/bn.h"
+	# Breaks things one some boxen, bug #13795.  The problem is that
+	# if we have a 'gcc fixed' version in $(gcc-config -L) from 0.9.6,
+	# then breaks as it was defined as 'int BN_mod(...)' and in 0.9.7 it
+	# is a define with BN_div(...) - <azarah@gentoo.org> (24 Sep 2003)
+	if [ -f "${BN_H}" ] && [ -n "$(grep '^int[[:space:]]*BN_mod(' "${BN_H}")" ]
+	then
+		rm -f "${BN_H}"
+	fi
+
+	test -f ${ROOT}/usr/lib/libssl.so.0.9.6 && {
+		einfo "You can now re-compile all packages that are linked against"
+		einfo "OpenSSL 0.9.6 by using revdep-rebuild from gentoolkit:"
+		einfo "# revdep-rebuild --soname libssl.so.0.9.6"
+		einfo "# revdep-rebuild --soname libcrypto.so.0.9.6"
+		einfo "After this, you can delete /usr/lib/libssl.so.0.9.6 and /usr/lib/libcrypto.so.0.9.6"
+	}
+}