Version bump #86358.

(Portage version: 2.0.51.20-r5)

4 files changed, 288 insertions, 2 deletions

diff --git a/dev-libs/openssl/ChangeLog b/dev-libs/openssl/ChangeLog
index 08d7c159bd4e..909a1ab4daf5 100644
--- a/dev-libs/openssl/ChangeLog
+++ b/dev-libs/openssl/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/openssl
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/ChangeLog,v 1.110 2005/04/20 17:24:19 solar Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/ChangeLog,v 1.111 2005/05/01 06:35:23 vapier Exp $
+
+*openssl-0.9.7g (01 May 2005)
+
+  01 May 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/openssl-0.9.7g-no-fips.patch, +openssl-0.9.7g.ebuild:
+  Version bump #86358.
 
   20 Apr 2005; <solar@gentoo.org> openssl-0.9.7e-r1.ebuild:
   - clean out patent or otherwise encumbered code when USE=bindist is set
diff --git a/dev-libs/openssl/files/digest-openssl-0.9.7g b/dev-libs/openssl/files/digest-openssl-0.9.7g
new file mode 100644
index 000000000000..e0a96520a0b0
--- /dev/null
+++ b/dev-libs/openssl/files/digest-openssl-0.9.7g
@@ -0,0 +1,2 @@
+MD5 991615f73338a571b6a1be7d74906934 openssl-0.9.7g.tar.gz 3132217
+MD5 1b63bfdca1c37837dddde9f1623498f9 openssl-0.9.6m.tar.gz 2184918
diff --git a/dev-libs/openssl/files/openssl-0.9.7g-no-fips.patch b/dev-libs/openssl/files/openssl-0.9.7g-no-fips.patch
new file mode 100644
index 000000000000..fb4917e2d45d
--- /dev/null
+++ b/dev-libs/openssl/files/openssl-0.9.7g-no-fips.patch
@@ -0,0 +1,12 @@
+--- openssl-0.9.7e/Makefile.org
++++ openssl-0.9.7e/Makefile.org
+@@ -176,8 +176,8 @@
+ # we might set SHLIB_MARK to '$(SHARED_LIBS)'.
+ SHLIB_MARK=
+ 
+-DIRS=   crypto fips ssl $(SHLIB_MARK) sigs apps test tools
++DIRS=   crypto ssl $(SHLIB_MARK) sigs apps test tools
+ SHLIBDIRS= crypto ssl
+ 
+ # dirs in crypto to build
+ SDIRS=  objects \
diff --git a/dev-libs/openssl/openssl-0.9.7g.ebuild b/dev-libs/openssl/openssl-0.9.7g.ebuild
new file mode 100644
index 000000000000..3456b38db815
--- /dev/null
+++ b/dev-libs/openssl/openssl-0.9.7g.ebuild
@@ -0,0 +1,266 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-0.9.7g.ebuild,v 1.1 2005/05/01 06:35:23 vapier Exp $
+
+inherit eutils flag-o-matic toolchain-funcs
+
+OLD_096_P="${PN}-0.9.6m"
+
+DESCRIPTION="Toolkit for SSL v2/v3 and TLS v1"
+HOMEPAGE="http://www.openssl.org/"
+SRC_URI="mirror://openssl/source/${P}.tar.gz
+	mirror://openssl/source/${OLD_096_P}.tar.gz"
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="-*" # seems to cause segfaults with openssh ...
+IUSE="emacs test bindist"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	sys-apps/diffutils
+	>=dev-lang/perl-5
+	!test? ( sys-devel/bc )"
+
+S=${WORKDIR}
+
+src_unpack() {
+	unpack ${A}
+
+	# openssl-0.9.7
+	cd ${WORKDIR}/${P}
+
+	epatch ${FILESDIR}/${PN}-0.9.7e-gentoo.patch
+	epatch ${FILESDIR}/${PN}-0.9.7-hppa-fix-detection.patch
+	epatch ${FILESDIR}/${PN}-0.9.7-alpha-default-gcc.patch
+	epatch ${FILESDIR}/${PN}-0.9.7g-no-fips.patch
+
+	case $(gcc-version) in
+		3.2)
+			filter-flags -fprefetch-loop-arrays -freduce-all-givs -funroll-loop
+		;;
+		3.4 | 3.3 )
+			filter-flags -fprefetch-loop-arrays -freduce-all-givs -funroll-loops
+			[[ ${ARCH} == "ppc" ||  ${ARCH} == "ppc64" ]] && append-flags -fno-strict-aliasing
+			# <robbat2@gentoo.org> (14 Feb 2004)
+			# bug #69550 openssl breaks in some cases.
+			[[ ${ARCH} == "x86" ]] && append-flags -Wa,--noexecstack
+		;;
+	esac
+
+	# replace CFLAGS
+	OLDIFS=$IFS
+	IFS=$'\n'
+	for a in $( grep -n -e "^\"linux-" Configure ); do
+		LINE=$( echo $a | awk -F: '{print $1}' )
+		CUR_CFLAGS=$( echo $a | awk -F: '{print $3}' )
+		# for ppc64 I have to be careful given current toolchain issues
+		if [[ ${ARCH} != "ppc64" ]]; then
+			NEW_CFLAGS="$( echo $CUR_CFLAGS | sed -r -e "s|-O[23]||" -e "s:-fomit-frame-pointer::" -e "s:-mcpu=[-a-z0-9]+::" -e "s:-m486::" ) $CFLAGS"
+		else
+			NEW_CFLAGS="$( echo $CUR_CFLAGS | sed -r -e "s|-O[23]||" -e "s:-fomit-frame-pointer::" -e "s:-mcpu=[-a-z0-9]+::" -e "s:-m486::" ) "
+
+		fi
+
+		sed -i "${LINE}s:$CUR_CFLAGS:$NEW_CFLAGS:" Configure \
+		|| die "sed failed"
+	done
+	IFS=$OLDIFS
+
+	if [ "$(get_libdir)" != "lib" ] ; then
+		# using a library directory other than lib requires some magic
+		sed -i \
+			-e "s+\(\$(INSTALL_PREFIX)\$(INSTALLTOP)\)/lib+\1/$(get_libdir)+g" \
+			-e "s+libdir=\$\${exec_prefix}/lib+libdir=\$\${exec_prefix}/$(get_libdir)+g" \
+			Makefile.org \
+			|| die "sed failed"
+		./config --test-sanity || die "sanity failed"
+	fi
+
+	# 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 \
+				|| die "sed failed"
+		;;
+		hppa)
+			# Tells to compile a static version of openssl
+			sed -i -e \
+				's!^"linux-parisc"\(.*\)::BN\(.*\)::!"linux-parisc"\1:-ldl:BN\2::::::::::dlfcn:linux-shared:-fPIC::.so.\\$(SHLIB_MAJOR).\\$(SHLIB_MINOR)!' \
+				Configure \
+				|| die "sed failed"
+			# Fix detection of parisc running 64 bit kernel
+			sed -i -e 's/parisc-\*-linux2/parisc\*-\*-linux2/' config \
+			|| die "sed failed"
+		esac
+
+		# replace CFLAGS
+		OLDIFS=$IFS
+		IFS=$'\n'
+		for a in $( grep -n -e "^\"linux-" Configure ); do
+	  		LINE=$( echo $a | awk -F: '{print $1}' )
+	  		CUR_CFLAGS=$( echo $a | awk -F: '{print $3}' )
+	  		NEW_CFLAGS="$( echo $CUR_CFLAGS | sed -r -e "s|-O[23]||" -e "s/-fomit-frame-pointer//" -e "s/-mcpu=[-a-z0-9]+//" -e "s/-m486//" ) $CFLAGS"
+	  		sed -i "${LINE}s/$CUR_CFLAGS/$NEW_CFLAGS/" Configure \
+			|| die "sed failed"
+		done
+		IFS=$OLDIFS
+	}
+}
+
+src_compile() {
+	# openssl-0.9.7
+	cd ${WORKDIR}/${P}
+
+	# Clean out patent-or-otherwise-encumbered code.
+	# MDC-2: 4,908,861 13/03/2007
+	# IDEA:  5,214,703 25/05/2010
+	# RC5:   5,724,428 03/03/2015
+	# EC:    ????????? ??/??/2015
+	use bindist && conf_options="no-idea no-rc5 no-mdc2 -no-ec"
+
+	# Build correctly for mips, mips64, & mipsel
+	if use mips; then
+		if [[ ${CHOST/mipsel} != ${CHOST} ]] ; then
+			mipsarch="linux-mipsel"
+		else
+			mipsarch="linux-mips"
+		fi
+
+		./Configure ${mipsarch} ${conf_options} --prefix=/usr --openssldir=/etc/ssl \
+			shared threads || die
+	elif use ppc64; then
+		./Configure linux-ppc64 ${conf_options} --prefix=/usr --openssldir=/etc/ssl \
+			shared threads || die
+	# force sparcv8 on sparc32 profile
+	elif [ "$PROFILE_ARCH" = "sparc" ]; then
+		./Configure linux-sparcv8 ${conf_options} --prefix=/usr --openssldir=/etc/ssl \
+			shared threads || die
+	elif [ "${ABI}" = "sparc64" ]; then
+		./Configure linux64-sparcv9 ${conf_options} --prefix=/usr --openssldir=/etc/ssl \
+			shared threads || die
+	else
+		./config ${conf_options} --prefix=/usr --openssldir=/etc/ssl shared threads \
+			|| die "config failed"
+	fi
+
+	einfo "Compiling ${P}"
+	make CC="$(tc-getCC)" all || die "make all failed"
+
+	# openssl-0.9.6
+	test -f ${ROOT}/usr/lib/libssl.so.0.9.6 && {
+		cd ${WORKDIR}/${OLD_096_P}
+
+		# force sparcv8 on sparc32 profile
+		if [ "$PROFILE_ARCH" = "sparc" ]; then
+			SSH_TARGET="linux-sparcv8"
+		elif [ "`uname -m`" = "parisc" -o "`uname -m`" = "parisc64" ]; then
+			SSH_TARGET="linux-parisc"
+		elif use mips; then
+			if [ "`echo ${CHOST} | grep "mipsel"`" ]; then
+				SSH_TARGET="linux-mipsel"
+			else
+				SSH_TARGET="linux-mips"
+			fi
+		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 CC="$(tc-getCC)" all || die
+	}
+}
+
+src_test() {
+	cd ${WORKDIR}/${P}
+	make test || die "make test failed"
+
+	# openssl-0.9.6
+	test -f ${ROOT}/usr/lib/libssl.so.0.9.6 && {
+		cd ${WORKDIR}/${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 NEWS README
+	dodoc doc/*.txt
+	dohtml doc/*
+
+	if use emacs ; then
+		insinto /usr/share/emacs/site-lisp
+		doins doc/c-indentation.el
+	fi
+
+	# 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
+
+	# These man pages with other packages so rename them
+	cd "${D}"/usr/share/man
+	for m in man1/passwd.1 man3/rand.3 man3/err.3 ; do
+		d=${m%%/*} ; m=${m##*/}
+		mv ${d}/{,ssl-}${m}
+		ln -s ssl-${m} ${d}/openssl-${m}
+	done
+
+	# openssl-0.9.6
+	test -f ${ROOT}/usr/lib/libssl.so.0.9.6 && {
+		cd ${WORKDIR}/${OLD_096_P}
+		make || die
+		dolib.so ${WORKDIR}/${OLD_096_P}/libcrypto.so.0.9.6||die "libcrypto.so.0.9.6 not found"
+		dolib.so ${WORKDIR}/${OLD_096_P}/libssl.so.0.9.6|| die "libssl.so.0.9.6 not found"
+	}
+	fperms a+x /usr/$(get_libdir)/pkgconfig #34088
+}
+
+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"
+	}
+}