diff options
| -rw-r--r-- | dev-libs/openssl/ChangeLog | 7 | ||||
| -rw-r--r-- | dev-libs/openssl/Manifest | 10 | ||||
| -rw-r--r-- | dev-libs/openssl/files/digest-openssl-0.9.7i | 1 | ||||
| -rw-r--r-- | dev-libs/openssl/openssl-0.9.7i.ebuild | 171 |
4 files changed, 184 insertions, 5 deletions
diff --git a/dev-libs/openssl/ChangeLog b/dev-libs/openssl/ChangeLog index 36e48f299544..3b7e6d85161e 100644 --- a/dev-libs/openssl/ChangeLog +++ b/dev-libs/openssl/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-libs/openssl # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/ChangeLog,v 1.138 2005/10/12 05:20:02 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/ChangeLog,v 1.139 2005/10/16 02:21:10 vapier Exp $ + +*openssl-0.9.7i (16 Oct 2005) + + 16 Oct 2005; Mike Frysinger <vapier@gentoo.org> +openssl-0.9.7i.ebuild: + Version bump. *openssl-0.9.8a (12 Oct 2005) *openssl-0.9.7h (12 Oct 2005) diff --git a/dev-libs/openssl/Manifest b/dev-libs/openssl/Manifest index c0905da941a5..eb60623c82a6 100644 --- a/dev-libs/openssl/Manifest +++ b/dev-libs/openssl/Manifest @@ -1,7 +1,7 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -MD5 80fa5daf53b8c989cb3bc2413dd3c5d8 ChangeLog 22399 +MD5 68894c130cee089df8439579c018953b ChangeLog 22521 MD5 744b358cd3b68b2ca6561c214c541fc0 files/addppc64support.diff 1327 MD5 2e6ed24d513a8f2b1b6f03709ab5ba18 files/digest-openssl-0.9.6m 67 MD5 acab4ad88a6c249a7cde0511a0961a2c files/digest-openssl-0.9.7e-r1 134 @@ -9,6 +9,7 @@ MD5 acab4ad88a6c249a7cde0511a0961a2c files/digest-openssl-0.9.7e-r2 134 MD5 1a7aabb860415c7be612863579d67b4d files/digest-openssl-0.9.7g 67 MD5 1a7aabb860415c7be612863579d67b4d files/digest-openssl-0.9.7g-r1 67 MD5 0b87439b95b8ecda7b7cd59c336625cd files/digest-openssl-0.9.7h 67 +MD5 275256f0f0c2a035cbc2b9ede7a1e21a files/digest-openssl-0.9.7i 67 MD5 592d5a5b643b835123af4a44caffc75e files/digest-openssl-0.9.8 66 MD5 592d5a5b643b835123af4a44caffc75e files/digest-openssl-0.9.8-r1 66 MD5 b8f72a6ed636d44f938a026b12abc7e2 files/digest-openssl-0.9.8a 67 @@ -47,13 +48,14 @@ MD5 8d0cc3c95e7be6bd21e6ea68e1e55971 openssl-0.9.7e-r2.ebuild 8797 MD5 4a6626d9417b73b3cf097f2c7b088e2c openssl-0.9.7g-r1.ebuild 5534 MD5 4ce0d905b32bf15f4fec2b83a07ade33 openssl-0.9.7g.ebuild 5470 MD5 5529efcdf1ed36de4ad475f2c7e29ed8 openssl-0.9.7h.ebuild 5354 +MD5 4a35fa4f00af0e7983e25fe2ff52bea8 openssl-0.9.7i.ebuild 5354 MD5 46e37d3c5d41a3350216b1ebc83b3238 openssl-0.9.8-r1.ebuild 5389 MD5 4a74cf1db0fb48d5569d3903fb4701fd openssl-0.9.8.ebuild 5333 MD5 2232fa718d2c1d6e39af4a343a5b5abb openssl-0.9.8a.ebuild 5333 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.2 (GNU/Linux) -iD8DBQFDTJ19gIKl8Uu19MoRAkD1AJ48tB2mPOXHa3G5jnWAvBb4+wQRVQCfaz9K -mOtJo5PcOwTrwq6qzFXYvwo= -=yqgT +iD8DBQFDUbmfgIKl8Uu19MoRAnRyAJ95Y63e2B7hsgB59BRkvIkIUL/KygCZASk7 +6CNpN9WzLw08dFKy3qAa7GA= +=73sl -----END PGP SIGNATURE----- diff --git a/dev-libs/openssl/files/digest-openssl-0.9.7i b/dev-libs/openssl/files/digest-openssl-0.9.7i new file mode 100644 index 000000000000..ded3436fdcc6 --- /dev/null +++ b/dev-libs/openssl/files/digest-openssl-0.9.7i @@ -0,0 +1 @@ +MD5 f69d82b206ff8bff9d0e721f97380b9e openssl-0.9.7i.tar.gz 3280907 diff --git a/dev-libs/openssl/openssl-0.9.7i.ebuild b/dev-libs/openssl/openssl-0.9.7i.ebuild new file mode 100644 index 000000000000..3f54814733d5 --- /dev/null +++ b/dev-libs/openssl/openssl-0.9.7i.ebuild @@ -0,0 +1,171 @@ +# 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.7i.ebuild,v 1.1 2005/10/16 02:21:10 vapier Exp $ + +inherit eutils flag-o-matic toolchain-funcs + +DESCRIPTION="Toolkit for SSL v2/v3 and TLS v1" +HOMEPAGE="http://www.openssl.org/" +SRC_URI="mirror://openssl/source/${P}.tar.gz" + +LICENSE="openssl" +SLOT="0" +# make sure your arch is ABI compat before adding KEYWORD back in +KEYWORDS="-*" +IUSE="emacs test bindist zlib" + +RDEPEND="" +DEPEND="${RDEPEND} + sys-apps/diffutils + >=dev-lang/perl-5 + test? ( sys-devel/bc )" + +src_unpack() { + unpack ${A} + + cd "${S}" + + epatch "${FILESDIR}"/${PN}-0.9.7g-ppc64.patch + 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 + epatch "${FILESDIR}"/${PN}-0.9.7g-mem-clr-ptr-cast.patch + epatch "${FILESDIR}"/${PN}-0.9.7h-ABI-compat.patch + epatch "${FILESDIR}"/${PN}-0.9.7g-superh.patch + epatch "${FILESDIR}"/${PN}-0.9.7g-amd64-fbsd.patch + + # allow openssl to be cross-compiled + cp "${FILESDIR}"/gentoo.config-0.9.7g gentoo.config || die "cp cross-compile failed" + chmod a+rx gentoo.config + + # Don't build manpages if we don't want them + has noman FEATURES && sed -i '/^install:/s:install_docs::' Makefile.org + + 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 + ;; + esac + append-flags -Wa,--noexecstack + + # 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::") + # ppc64's current toolchain sucks at optimization and will break this package + [[ $(tc-arch) != "ppc64" ]] && NEW_CFLAGS="${NEW_CFLAGS} ${CFLAGS}" + + 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 +} + +src_compile() { + # 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 + local confopts="" + use bindist && confopts="no-idea no-rc5 no-mdc2 -no-ec" + + use zlib && confopts="${confopts} zlib-dynamic" + + local sslout=$(./gentoo.config) + einfo "Use configuration ${sslout}" + + local config="Configure" + [[ -z ${sslout} ]] && config="config" + ./${config} \ + ${sslout} \ + ${confopts} \ + --prefix=/usr \ + --openssldir=/etc/ssl \ + shared threads \ + || die "Configure failed" + + emake \ + CC="$(tc-getCC)" MAKEDEPPROG="$(tc-getCC)" \ + AR="$(tc-getAR) r" \ + RANLIB="$(tc-getRANLIB)" \ + all || die "make all failed" + + # force until we get all the gentoo.config kinks worked out + tc-is-cross-compiler || src_test +} + +src_test() { + # make sure sandbox doesnt die on *BSD + add_predict /dev/crypto + + make test || die "make test failed" +} + +src_install() { + 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 + LD_LIBRARY_PATH="${D}"/usr/$(get_libdir)/ \ + 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 + + 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 + + if [[ -e ${ROOT}/usr/lib/libcrypto.so.0.9.6 ]] ; then + ewarn "You must re-compile all packages that are linked against" + ewarn "OpenSSL 0.9.6 by using revdep-rebuild from gentoolkit:" + ewarn "# revdep-rebuild --soname libssl.so.0.9.6" + ewarn "# revdep-rebuild --soname libcrypto.so.0.9.6" + ewarn "After this, you can delete /usr/lib/libssl.so.0.9.6 and /usr/lib/libcrypto.so.0.9.6" + touch -c "${ROOT}"/usr/lib/lib{crypto,ssl}.so.0.9.6 + fi +} |