diff options
| -rw-r--r-- | dev-libs/openssl/ChangeLog | 11 | ||||
| -rw-r--r-- | dev-libs/openssl/Manifest | 59 | ||||
| -rw-r--r-- | dev-libs/openssl/files/digest-openssl-0.9.8 | 1 | ||||
| -rw-r--r-- | dev-libs/openssl/files/openssl-0.9.8-make-engines-dir.patch | 10 | ||||
| -rw-r--r-- | dev-libs/openssl/files/openssl-0.9.8-parallel-build.patch | 23 | ||||
| -rw-r--r-- | dev-libs/openssl/files/openssl-0.9.8-ppc64.patch | 11 | ||||
| -rw-r--r-- | dev-libs/openssl/openssl-0.9.8.ebuild | 164 |
7 files changed, 256 insertions, 23 deletions
diff --git a/dev-libs/openssl/ChangeLog b/dev-libs/openssl/ChangeLog index 687bac083229..18e55c1f3917 100644 --- a/dev-libs/openssl/ChangeLog +++ b/dev-libs/openssl/ChangeLog @@ -1,6 +1,15 @@ # 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.125 2005/07/04 10:10:23 hardave Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/ChangeLog,v 1.126 2005/07/05 23:39:24 azarah Exp $ + +*openssl-0.9.8 (05 Jul 2005) + + 05 Jul 2005; Martin Schlemmer <azarah@gentoo.org> + +files/openssl-0.9.8-make-engines-dir.patch, + +files/openssl-0.9.8-parallel-build.patch, + +files/openssl-0.9.8-ppc64.patch, +openssl-0.9.8.ebuild: + Update version. Fix parallel build. Fix new engines not creating install + dir. Fix creating certificates cannot find libcrypt/libssl on new install. 04 Jul 2005; Hardave Riar <hardave@gentoo.org> openssl-0.9.7e-r1.ebuild: Stable on mips. diff --git a/dev-libs/openssl/Manifest b/dev-libs/openssl/Manifest index ddf9153630f7..c37b478e3c9c 100644 --- a/dev-libs/openssl/Manifest +++ b/dev-libs/openssl/Manifest @@ -1,34 +1,49 @@ -MD5 57e40fb58ce828cd25ebce7a24424162 ChangeLog 19736 -MD5 37236013e0d26d43c6bff35a8a48e8ec metadata.xml 220 +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + +MD5 0d2217720540cbf67914a930abf66364 openssl-0.9.7g.ebuild 5177 MD5 685c33f8a3f1980105944ab3c23a346c openssl-0.9.6m.ebuild 3074 -MD5 e59c3cc3221269d3ae08609d821b6b21 openssl-0.9.7c-r1.ebuild 7019 MD5 5b33d1f91cb7d90e4d0d125905b8dfbb openssl-0.9.7d-r2.ebuild 8970 -MD5 83962870a9f649f0cc27b6d5120406d5 openssl-0.9.7e-r1.ebuild 8515 MD5 b006190dcd671619b4028aa5ad2e994c openssl-0.9.7e.ebuild 7842 -MD5 0d2217720540cbf67914a930abf66364 openssl-0.9.7g.ebuild 5177 -MD5 744b358cd3b68b2ca6561c214c541fc0 files/addppc64support.diff 1327 +MD5 864f19b0fe7f583a6291a9459e48e637 ChangeLog 20121 +MD5 3e549d804c0ecb011212165069b2f73e openssl-0.9.8.ebuild 5181 +MD5 e59c3cc3221269d3ae08609d821b6b21 openssl-0.9.7c-r1.ebuild 7019 +MD5 83962870a9f649f0cc27b6d5120406d5 openssl-0.9.7e-r1.ebuild 8515 +MD5 37236013e0d26d43c6bff35a8a48e8ec metadata.xml 220 +MD5 ef2c8d5afa47da8a58e464f43e6ecc67 files/openssl-0.9.7g-mem-clr-ptr-cast.patch 637 MD5 2e6ed24d513a8f2b1b6f03709ab5ba18 files/digest-openssl-0.9.6m 67 -MD5 f8b9ae9e3ed08f964620aa832aec4d0c files/digest-openssl-0.9.7c-r1 134 MD5 897d293325315cdeeb390745ed5cdd1b files/digest-openssl-0.9.7d-r2 134 -MD5 acab4ad88a6c249a7cde0511a0961a2c files/digest-openssl-0.9.7e 134 -MD5 acab4ad88a6c249a7cde0511a0961a2c files/digest-openssl-0.9.7e-r1 134 +MD5 744b358cd3b68b2ca6561c214c541fc0 files/addppc64support.diff 1327 +MD5 82e3908837b5066c7ec907812de8da25 files/openssl-0.9.7e-ptr-casting.patch 440 +MD5 f8b9ae9e3ed08f964620aa832aec4d0c files/digest-openssl-0.9.7c-r1 134 +MD5 91854bcd6c83f040927d490b104bb5a0 files/openssl-0.9.7d-smime.patch 641 +MD5 be045f45d974ec215ec4986c6c7b6ffb files/openssl-0.9.7g-ppc64.patch 856 +MD5 7483d6f0412e857e9063dce4aecf2991 files/openssl-0.9.7d-gentoo.diff 936 +MD5 90fac5947e771433132723442dc90ab0 files/openssl-0.9.7g-no-fips.patch 333 +MD5 e476b45b7b15df41a0e3f06c187201ee files/openssl-0.9.8-parallel-build.patch 649 MD5 1a7aabb860415c7be612863579d67b4d files/digest-openssl-0.9.7g 67 MD5 6fe82157d1370046682f9c3d39a55a18 files/gentoo.config-0.9.7g 3171 -MD5 b901850df9952252974316e78775673b files/openssl-0.9.6-mips.diff 1487 -MD5 cebd09d1819c07b0fab14ad90b0da884 files/openssl-0.9.6m-gentoo.diff 1591 -MD5 f8ff492f66404c732e4661cc4443a2e8 files/openssl-0.9.7-alpha-default-gcc.patch 533 -MD5 bef2724dccc11edf27916526d9c08576 files/openssl-0.9.7-arm-big-endian.patch 1074 +MD5 8c5ab963e60bc0744408eebf48596981 files/openssl-0.9.8-make-engines-dir.patch 461 MD5 4e6c2cbbc1ff9e36ff6d83b6c5356b7c files/openssl-0.9.7-hppa-fix-detection.patch 1718 -MD5 7483d6f0412e857e9063dce4aecf2991 files/openssl-0.9.7c-gentoo.diff 936 -MD5 f804ea4df3b388d22451cde6e9458f2b files/openssl-0.9.7c-tempfile.patch 2178 -MD5 7483d6f0412e857e9063dce4aecf2991 files/openssl-0.9.7d-gentoo.diff 936 -MD5 91854bcd6c83f040927d490b104bb5a0 files/openssl-0.9.7d-smime.patch 641 MD5 f886f4a6a62eb4ec7bc718952d76900d files/openssl-0.9.7e-gentoo.patch 460 +MD5 f804ea4df3b388d22451cde6e9458f2b files/openssl-0.9.7c-tempfile.patch 2178 +MD5 7483d6f0412e857e9063dce4aecf2991 files/openssl-0.9.7c-gentoo.diff 936 +MD5 bef2724dccc11edf27916526d9c08576 files/openssl-0.9.7-arm-big-endian.patch 1074 MD5 53599279769faf50e5247b68d2907b10 files/openssl-0.9.7e-no-fips.patch 1344 -MD5 82e3908837b5066c7ec907812de8da25 files/openssl-0.9.7e-ptr-casting.patch 440 MD5 86106e28e408bdd53dd64ad0ecab7f1d files/openssl-0.9.7e-x86_64-bn-asm.patch 3881 -MD5 257fcbed4f939cd3e0113af18df66a92 files/openssl-0.9.7g-ABI-compat.patch 1880 -MD5 ef2c8d5afa47da8a58e464f43e6ecc67 files/openssl-0.9.7g-mem-clr-ptr-cast.patch 637 -MD5 90fac5947e771433132723442dc90ab0 files/openssl-0.9.7g-no-fips.patch 333 -MD5 be045f45d974ec215ec4986c6c7b6ffb files/openssl-0.9.7g-ppc64.patch 856 +MD5 592d5a5b643b835123af4a44caffc75e files/digest-openssl-0.9.8 66 +MD5 b901850df9952252974316e78775673b files/openssl-0.9.6-mips.diff 1487 MD5 cde67bc688a59d0178f1a6e1bb1db7cf files/openssl-0.9.7g-ptr-casting.patch 714 +MD5 acab4ad88a6c249a7cde0511a0961a2c files/digest-openssl-0.9.7e 134 +MD5 f8ff492f66404c732e4661cc4443a2e8 files/openssl-0.9.7-alpha-default-gcc.patch 533 +MD5 acab4ad88a6c249a7cde0511a0961a2c files/digest-openssl-0.9.7e-r1 134 +MD5 257fcbed4f939cd3e0113af18df66a92 files/openssl-0.9.7g-ABI-compat.patch 1880 +MD5 4a170a962292bdd019fe303ba981e3ab files/openssl-0.9.8-ppc64.patch 1463 +MD5 cebd09d1819c07b0fab14ad90b0da884 files/openssl-0.9.6m-gentoo.diff 1591 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.1 (GNU/Linux) + +iD8DBQFCyxqd1ZcsMnZjRyIRAqbkAJ9VJzT6Z6gUVZWkvf7Ag5uaoteBxQCeO32r +V/ehlDV0j+3K7P6lwk0jFes= +=SFkc +-----END PGP SIGNATURE----- diff --git a/dev-libs/openssl/files/digest-openssl-0.9.8 b/dev-libs/openssl/files/digest-openssl-0.9.8 new file mode 100644 index 000000000000..cbed557bf1ca --- /dev/null +++ b/dev-libs/openssl/files/digest-openssl-0.9.8 @@ -0,0 +1 @@ +MD5 9da21071596a124acde6080552deac16 openssl-0.9.8.tar.gz 3259550 diff --git a/dev-libs/openssl/files/openssl-0.9.8-make-engines-dir.patch b/dev-libs/openssl/files/openssl-0.9.8-make-engines-dir.patch new file mode 100644 index 000000000000..c2a076982f82 --- /dev/null +++ b/dev-libs/openssl/files/openssl-0.9.8-make-engines-dir.patch @@ -0,0 +1,10 @@ +--- openssl-0.9.8/engines/Makefile 2005-07-06 01:19:15.000000000 +0200 ++++ openssl-0.9.8.az/engines/Makefile 2005-07-06 01:20:04.000000000 +0200 +@@ -88,6 +88,7 @@ + @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile... + @if [ -n "$(SHARED_LIBS)" ]; then \ + set -e; \ ++ $(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/lib/engines; \ + for l in $(LIBNAMES); do \ + ( echo installing $$l; \ + if [ "$(PLATFORM)" != "Cygwin" ]; then \ diff --git a/dev-libs/openssl/files/openssl-0.9.8-parallel-build.patch b/dev-libs/openssl/files/openssl-0.9.8-parallel-build.patch new file mode 100644 index 000000000000..396ef09abcfa --- /dev/null +++ b/dev-libs/openssl/files/openssl-0.9.8-parallel-build.patch @@ -0,0 +1,23 @@ +--- openssl-0.9.8/Makefile.org 2005-07-06 01:18:09.000000000 +0200 ++++ openssl-0.9.8.az/Makefile.org 2005-07-06 01:19:02.000000000 +0200 +@@ -208,15 +208,15 @@ + + build_crypto: + @dir=crypto; target=all; $(BUILD_CMD) +-build_ssl: ++build_ssl: build_crypto + @dir=ssl; target=all; $(BUILD_CMD) +-build_engines: ++build_engines: build_crypto + @dir=engines; target=all; $(BUILD_CMD) +-build_apps: ++build_apps: build_libs + @dir=apps; target=all; $(BUILD_CMD) +-build_tests: ++build_tests: build_libs + @dir=test; target=all; $(BUILD_CMD) +-build_tools: ++build_tools: build_libs + @dir=tools; target=all; $(BUILD_CMD) + + all_testapps: build_libs build_testapps diff --git a/dev-libs/openssl/files/openssl-0.9.8-ppc64.patch b/dev-libs/openssl/files/openssl-0.9.8-ppc64.patch new file mode 100644 index 000000000000..511af1958019 --- /dev/null +++ b/dev-libs/openssl/files/openssl-0.9.8-ppc64.patch @@ -0,0 +1,11 @@ +--- openssl-0.9.8/Configure.orig 2005-07-05 23:11:15.000000000 +0200 ++++ openssl-0.9.8/Configure 2005-07-05 23:12:12.000000000 +0200 +@@ -322,7 +322,7 @@ + #### + "linux-generic64","gcc:-DTERMIO -O3 -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", + # -bpowerpc64-linux is transient option, -m64 should be the one to use... +-"linux-ppc64", "gcc:-bpowerpc64-linux -DB_ENDIAN -DTERMIO -O3 -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL::linux_ppc64.o::::::::::dlfcn:linux-shared:-fPIC:-bpowerpc64-linux:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"linux-ppc64", "gcc:-DB_ENDIAN -DTERMIO -O3 -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL::linux_ppc64.o::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", + "linux-ia64", "gcc:-DL_ENDIAN -DTERMIO -O3 -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK:${ia64_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", + "linux-ia64-ecc","ecc:-DL_ENDIAN -DTERMIO -O2 -Wall -no_cpprt::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK:${ia64_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", + "linux-ia64-icc","icc:-DL_ENDIAN -DTERMIO -O2 -Wall -no_cpprt::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK:${ia64_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", diff --git a/dev-libs/openssl/openssl-0.9.8.ebuild b/dev-libs/openssl/openssl-0.9.8.ebuild new file mode 100644 index 000000000000..fca3699be4b6 --- /dev/null +++ b/dev-libs/openssl/openssl-0.9.8.ebuild @@ -0,0 +1,164 @@ +# 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.8.ebuild,v 1.1 2005/07/05 23:39:24 azarah 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" +# ia64 is ABI incompat atm, do not change the KEYWORD +KEYWORDS="~alpha ~amd64 ~arm ~m68k -mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" +IUSE="emacs test bindist" + +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.8-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.8-parallel-build.patch + epatch "${FILESDIR}"/${PN}-0.9.8-make-engines-dir.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 + + 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}' ) + 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 engines/Makefile \ + || 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" + + 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 + src_test +} + +src_test() { + 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 -f ${d}/{,ssl-}${m} + ln -snf 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/$(get_libdir)/libcrypto.so.0.9.7 ]] ; then + ewarn "You must re-compile all packages that are linked against" + ewarn "OpenSSL 0.9.7 by using revdep-rebuild from gentoolkit:" + ewarn "# revdep-rebuild --soname libssl.so.0.9.7" + ewarn "# revdep-rebuild --soname libcrypto.so.0.9.7" + ewarn "After this, you can delete /usr/$(get_libdir)/libssl.so.0.9.7" + ewarn "and /usr/$(get_libdir)/libcrypto.so.0.9.7" + touch -c "${ROOT}"/usr/$(get_libdir)/lib{crypto,ssl}.so.0.9.7 + fi +} |