summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2013-02-19 04:40:55 +0000
committerZac Medico <zmedico@gentoo.org>2013-02-19 04:40:55 +0000
commite8b3feb2fd972a882efac1c6252fe8d59a545e4c (patch)
treee5b426c84f33d05747e6cd7cdea4d225c53d9482 /dev-libs/openssl
parentAdd ~arm-linux keyword. (diff)
downloadhistorical-e8b3feb2fd972a882efac1c6252fe8d59a545e4c.tar.gz
historical-e8b3feb2fd972a882efac1c6252fe8d59a545e4c.tar.bz2
historical-e8b3feb2fd972a882efac1c6252fe8d59a545e4c.zip
Fix for prefix and add ~arm-linux + ~x86-linux keywords.
Package-Manager: portage-2.2.0_alpha163_p9/cvs/Linux i686 Manifest-Sign-Key: 0xFDE8EF85AE5719A3
Diffstat (limited to 'dev-libs/openssl')
-rw-r--r--dev-libs/openssl/ChangeLog5
-rw-r--r--dev-libs/openssl/Manifest20
-rw-r--r--dev-libs/openssl/openssl-1.0.1d-r1.ebuild29
3 files changed, 24 insertions, 30 deletions
diff --git a/dev-libs/openssl/ChangeLog b/dev-libs/openssl/ChangeLog
index dd54e01250ec..fe69b6fe9f30 100644
--- a/dev-libs/openssl/ChangeLog
+++ b/dev-libs/openssl/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-libs/openssl
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/ChangeLog,v 1.474 2013/02/08 06:29:02 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/ChangeLog,v 1.475 2013/02/19 04:40:52 zmedico Exp $
+
+ 19 Feb 2013; Zac Medico <zmedico@gentoo.org> openssl-1.0.1d-r1.ebuild:
+ Fix for prefix and add ~arm-linux + ~x86-linux keywords.
*openssl-1.0.1d-r1 (08 Feb 2013)
diff --git a/dev-libs/openssl/Manifest b/dev-libs/openssl/Manifest
index d5ce48cea102..bb4927a805fb 100644
--- a/dev-libs/openssl/Manifest
+++ b/dev-libs/openssl/Manifest
@@ -44,24 +44,14 @@ EBUILD openssl-1.0.0j.ebuild 7035 SHA256 8b8cf5082b7eb04abc02fe452a006dad3b2460f
EBUILD openssl-1.0.1a.ebuild 7353 SHA256 16c4eb5096a1fa4410f705701a9a23d0fd6b7b72e6a9b32851f7a464e86eaf82 SHA512 9bf5e13e1b1a348f409f3ad5fadd558433e3a04ad35ebd1a66b4cd4bc20ff023fa30bd465b11b6cbf02a2e8d4ae5ef5aea57e49fe3dc2946518a862755276030 WHIRLPOOL 1eda01d06fbbbfff41e48e44207582e060a01f0e97232fa505bf6af204692f4c0849fddea058b15be21976c2ea9b671aff59b283f817be7617bb542fd7ad9764
EBUILD openssl-1.0.1b.ebuild 7306 SHA256 414dbff1cd86713967999bc756ab11061469fe6d0aa7fd2ab308b3aa9368b9e3 SHA512 2013d56e9d24d0c20057af3e153e2f2a93e19ea9cebeea14e7e4aa4e084940144cc64dd65397220c9eebd6d2b6f1f33929abe02001d321a3f2b33a4fd263828d WHIRLPOOL de8f9895dad84084fa1417eb32da344eaa817a13ea9afd0a32dec28ef07a8558de696c99b7ecf2b210c3a33942441538da470d22640e59113b81bbb9f8365063
EBUILD openssl-1.0.1c.ebuild 7299 SHA256 e78083ec629672b905a57ea7b49c3374b798a1143d5a6c9aee07b39add691152 SHA512 afb2b11e4dbd8934f07b5fa08c024be94e0eb27b25e181a9565480ccaff1d1471cfe309c9a6d8ccbd724ee949cf046ec8f5216c4580e7f3e947017608198b0a4 WHIRLPOOL 1885b2882eb0686bf9584e21bd7976146ed5ac29c564e016c9739035e6537353ce2484a0b21cb2f08248bc4d3891ce13d43d87865a7743708c1bf289f1268b8a
-EBUILD openssl-1.0.1d-r1.ebuild 7299 SHA256 77301a7875c6ea8e7fd321466c91d7e580db2b37e2533ac4f4fae4adc71fe233 SHA512 a1ce3efc3448049102cb6959331b95c05283cfa490080defd063190626e33a78fd2f083c2e8e8a44929beb616570d2d497750c86d83cf12c7e88bb5cfb18776a WHIRLPOOL 5312af6e7bad46fe6e38ab796703ed70254a31697900eb1d78ad16948d6b65208887e9fc9db6be136a9a38f553f1d616999ce2e6228931b2430a428b1c200a64
+EBUILD openssl-1.0.1d-r1.ebuild 7435 SHA256 6b5c0263dfb31931a1f470de4b524e96aca9e3b4109ac2e47f318552d9c823f5 SHA512 39332ceb76a8b353943a13a95ca91190118fbb77741c78ba263df55836dac8fefb60faa45e418a5f1cf4703837f7c1d90bc134f2f0c82bae8ffb3ea594729e58 WHIRLPOOL c5af740f975ef0c843f3549d205279be45a2283f3fea1547d2c4b884d593cbf0b42012be9ca00deab29886a1cda157f24037691d554dbe57e2f0fdd427967fd8
EBUILD openssl-1.0.1d.ebuild 7245 SHA256 e507929d7280d3a0fa8530e809a7cad24ed08d80a300ab7d3f7a9b9ceb2882e2 SHA512 4ffb7f02d88303f6afe6ba3c5d2c287cf6b35fc4efa0530305092cf51ad448b988dc6e11ba1d9345789ed867214e2ace404547f4af497c0998cb9e870eb53bb9 WHIRLPOOL a3de816c75a98e7d021c668e5fbce83fd13f87f7155258e731930e2be91c25c3090e7fa2dfcb1fb3b8b02f726cbefeb614d774ce653bb365616621e700289402
-MISC ChangeLog 71186 SHA256 6a9f254134824f7c8c32a3a92b030ff215d2f14ad70aa6186d273a770c133ffc SHA512 c23ea35ccc3b4a3144ef5113443606db135d61e6c3d5a4ed00b0dbda965ed3601826f4aeb51c17f17eaf7bfbf623d5e0e55153f3820e0fe62d100761ce587dbb WHIRLPOOL 3961196d1d3a1f05a455df0a13ab185297d45c279c73f0c8dffb1bcb5e0bdd470f509de2cffdc9ba703eb91ed52d8cc16570e4e07ef2d8083421543877363e1f
+MISC ChangeLog 71320 SHA256 d7e8ae3b13a932a6cbc55aa67643f8843376a5399b00187b6f1ee075b15e736b SHA512 082737447be4d3df6eb1a0e0f0344220b0b3bd6d913f8880a26eda25c6630a2357f77220bc85247f14e32fbce0127ed2af2f6fba962c5a074c285ceb97d9853f WHIRLPOOL d5ce73ad0a3310d8f97b06ad692ce3a5abbcb012edea12de78a164efd5be50a9df3a81cc9c2534efbe0177b34d94d8b8d610b989219a16ec5892d48d8d7b2123
MISC metadata.xml 374 SHA256 ce29618473c02511695f6767087277e246b2d252ef6e662dbc65e9df44722f5b SHA512 af8240564be62abad18e8f928694ac2836fc445ae186d5ac3b11dae060e5088dbcbbcac625fffe888de1df0e75934cf1484e54c113c00a25a55d57c39563d430 WHIRLPOOL 197464700dbd530c26a50055e98c1008cd1fd6f4f34ba2e9b4070fca6b87201599c3187b5e4689b6360a1311f1de6b96ae6a0050eb9677c648d8eaf28b0880b9
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (GNU/Linux)
-iQIcBAEBCAAGBQJRFJsyAAoJELEHsLL7fEFWCu4QAL0moj7l57I9IAhV9eAhMUX7
-oIV5NyAPe8gEkTOwCjICYVU26ZjImSRUT2D0E7Ezg6HgvSDhQJgcF+dkNvdpNMWV
-squE6avp6IGcAYzB90fbcRXbaeO9pY0Ks69ijXZMj1ElAZDMmGLEtaFJYtoCm3oh
-9TIEsXp9sq/TeOEx8HO0vm4CVgJD+p2TCVdcYBAkUiy5LdLhAVuZ/qnPZH7msN35
-aY+rTtrrVAh/rWSv3HLfTACyXsI7kjX9/03gjgBVlQfr883kGIeKx4j56zlFHdXG
-GfDNZz/4GMZVjJ8Wl7E1RB/ANholFzIM9vYBYZ17ou+jXmboMPrloTK3QSv58QgZ
-ixV8lWevwVrZOxEcvLtPPZmpraiHugmBG2AVrFeB0C2X7w+NeXum3xI/zEK2E4ZV
-jRe/3O7AaKSQ/mqaKifJdY7pRTjshE+BaXEOokSBAsIAQB+2voluGC7jT5vAgSww
-ARbJ9/3iob0gGL8lngqvkhvHhebQk1KH/wA3T5WGXHhOUn03L55d4qiKGUCX8W+C
-nKeMTDj5XwgiWDegA/cJCymF19RE2oTM94OT0+WtKFbniaxMeWky6lWXHTDexduQ
-B6tHJLy5WHpD50j/EjpwoAkuAUo1tluAEJUjakXwjXjfIIyMvtTcabf1UfUEByAI
-ETxDBMrrz7CufnUnFqVr
-=1XeY
+iEYEAREIAAYFAlEjAlYACgkQ/ejvha5XGaPh6ACZAfeWPa6wMK0A/lCpIvaV5pQ8
+DKkAnjVbPKRL1OVUY8ACsLzIR4crBEkN
+=+DKq
-----END PGP SIGNATURE-----
diff --git a/dev-libs/openssl/openssl-1.0.1d-r1.ebuild b/dev-libs/openssl/openssl-1.0.1d-r1.ebuild
index af747e96a3a4..cd51658e391a 100644
--- a/dev-libs/openssl/openssl-1.0.1d-r1.ebuild
+++ b/dev-libs/openssl/openssl-1.0.1d-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-1.0.1d-r1.ebuild,v 1.1 2013/02/08 06:29:02 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-1.0.1d-r1.ebuild,v 1.2 2013/02/19 04:40:52 zmedico Exp $
EAPI="4"
@@ -14,7 +14,7 @@ SRC_URI="mirror://openssl/source/${P}.tar.gz
LICENSE="openssl"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
IUSE="bindist gmp kerberos rfc3779 sse2 static-libs test vanilla zlib"
# Have the sub-libs in RDEPEND with [static-libs] since, logically,
@@ -39,7 +39,8 @@ src_unpack() {
unpack ${P}.tar.gz
SSL_CNF_DIR="/etc/ssl"
sed \
- -e "/^DIR=/s:=.*:=${SSL_CNF_DIR}:" \
+ -e "/^DIR=/s:=.*:=${EPREFIX}${SSL_CNF_DIR}:" \
+ -e "s:SSL_CMD=/usr:SSL_CMD=${EPREFIX}/usr:" \
"${DISTDIR}"/${PN}-c_rehash.sh.${REV} \
> "${WORKDIR}"/c_rehash || die #416717
}
@@ -69,7 +70,7 @@ src_prepare() {
-e '/^MAKEDEPPROG/s:=.*:=$(CC):' \
-e $(has noman FEATURES \
&& echo '/^install:/s:install_docs::' \
- || echo '/^MANDIR=/s:=.*:=/usr/share/man:') \
+ || echo '/^MANDIR=/s:=.*:='${EPREFIX}'/usr/share/man:') \
Makefile.org \
|| die
# show the actual commands in the log
@@ -82,7 +83,7 @@ src_prepare() {
append-flags -fno-strict-aliasing
append-flags $(test-flags-CC -Wa,--noexecstack)
- sed -i '1s,^:$,#!/usr/bin/perl,' Configure #141906
+ sed -i '1s,^:$,#!'${EPREFIX}'/usr/bin/perl,' Configure #141906
./config --test-sanity || die "I AM NOT SANE"
}
@@ -123,8 +124,8 @@ src_configure() {
$(use_ssl kerberos krb5 --with-krb5-flavor=${krb5}) \
$(use_ssl rfc3779) \
$(use_ssl zlib) \
- --prefix=/usr \
- --openssldir=${SSL_CNF_DIR} \
+ --prefix="${EPREFIX}"/usr \
+ --openssldir="${EPREFIX}"${SSL_CNF_DIR} \
--libdir=$(get_libdir) \
shared threads \
|| die
@@ -170,15 +171,15 @@ src_install() {
# build system: the static archives are built as PIC all the time.
# Only way around this would be to manually configure+compile openssl
# twice; once with shared lib support enabled and once without.
- use static-libs || rm -f "${D}"/usr/lib*/lib*.a
+ use static-libs || rm -f "${ED}"/usr/lib*/lib*.a
# create the certs directory
dodir ${SSL_CNF_DIR}/certs
- cp -RP certs/* "${D}"${SSL_CNF_DIR}/certs/ || die
- rm -r "${D}"${SSL_CNF_DIR}/certs/{demo,expired}
+ cp -RP certs/* "${ED}"${SSL_CNF_DIR}/certs/ || die
+ rm -r "${ED}"${SSL_CNF_DIR}/certs/{demo,expired}
# Namespace openssl programs to prevent conflicts with other man pages
- cd "${D}"/usr/share/man
+ cd "${ED}"/usr/share/man
local m d s
for m in $(find . -type f | xargs grep -L '#include') ; do
d=${m%/*} ; d=${d#./} ; m=${m##*/}
@@ -200,7 +201,7 @@ src_install() {
[[ -n $(find -L ${d} -type l) ]] && die "broken manpage links found :("
dodir /etc/sandbox.d #254521
- echo 'SANDBOX_PREDICT="/dev/crypto"' > "${D}"/etc/sandbox.d/10openssl
+ echo 'SANDBOX_PREDICT="/dev/crypto"' > "${ED}"/etc/sandbox.d/10openssl
diropts -m0700
keepdir ${SSL_CNF_DIR}/private
@@ -212,8 +213,8 @@ pkg_preinst() {
}
pkg_postinst() {
- ebegin "Running 'c_rehash ${ROOT%/}${SSL_CNF_DIR}/certs/' to rebuild hashes #333069"
- c_rehash "${ROOT%/}${SSL_CNF_DIR}/certs" >/dev/null
+ ebegin "Running 'c_rehash ${EROOT%/}${SSL_CNF_DIR}/certs/' to rebuild hashes #333069"
+ c_rehash "${EROOT%/}${SSL_CNF_DIR}/certs" >/dev/null
eend $?
has_version ${CATEGORY}/${PN}:0.9.8 && return 0