Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Mike Frysinger (vapier)" <vapier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-libs/openssl: ChangeLog openssl-1.0.0a.ebuild
Date: Thu, 03 Jun 2010 02:28:37
Message-Id: 20100603022834.8795E2CF37@corvid.gentoo.org
1 vapier 10/06/03 02:28:34
2
3 Modified: ChangeLog
4 Added: openssl-1.0.0a.ebuild
5 Log:
6 Version bump.
7
8 Revision Changes Path
9 1.331 dev-libs/openssl/ChangeLog
10
11 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/openssl/ChangeLog?rev=1.331&view=markup
12 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/openssl/ChangeLog?rev=1.331&content-type=text/plain
13 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/openssl/ChangeLog?r1=1.330&r2=1.331
14
15 Index: ChangeLog
16 ===================================================================
17 RCS file: /var/cvsroot/gentoo-x86/dev-libs/openssl/ChangeLog,v
18 retrieving revision 1.330
19 retrieving revision 1.331
20 diff -u -r1.330 -r1.331
21 --- ChangeLog 11 Apr 2010 20:05:36 -0000 1.330
22 +++ ChangeLog 3 Jun 2010 02:28:34 -0000 1.331
23 @@ -1,6 +1,11 @@
24 # ChangeLog for dev-libs/openssl
25 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
26 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/ChangeLog,v 1.330 2010/04/11 20:05:36 vapier Exp $
27 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/ChangeLog,v 1.331 2010/06/03 02:28:34 vapier Exp $
28 +
29 +*openssl-1.0.0a (03 Jun 2010)
30 +
31 + 03 Jun 2010; Mike Frysinger <vapier@g.o> +openssl-1.0.0a.ebuild:
32 + Version bump.
33
34 11 Apr 2010; Mike Frysinger <vapier@g.o> openssl-0.9.8n.ebuild,
35 openssl-1.0.0.ebuild:
36
37
38
39 1.1 dev-libs/openssl/openssl-1.0.0a.ebuild
40
41 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/openssl/openssl-1.0.0a.ebuild?rev=1.1&view=markup
42 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/openssl/openssl-1.0.0a.ebuild?rev=1.1&content-type=text/plain
43
44 Index: openssl-1.0.0a.ebuild
45 ===================================================================
46 # Copyright 1999-2010 Gentoo Foundation
47 # Distributed under the terms of the GNU General Public License v2
48 # $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-1.0.0a.ebuild,v 1.1 2010/06/03 02:28:34 vapier Exp $
49
50 inherit eutils flag-o-matic toolchain-funcs
51
52 DESCRIPTION="Toolkit for SSL v2/v3 and TLS v1"
53 HOMEPAGE="http://www.openssl.org/"
54 SRC_URI="mirror://openssl/source/${P}.tar.gz"
55
56 LICENSE="openssl"
57 SLOT="0"
58 KEYWORDS=""
59 IUSE="bindist gmp kerberos rfc3779 sse2 test zlib"
60
61 RDEPEND="gmp? ( dev-libs/gmp )
62 zlib? ( sys-libs/zlib )
63 kerberos? ( app-crypt/mit-krb5 )"
64 DEPEND="${RDEPEND}
65 sys-apps/diffutils
66 >=dev-lang/perl-5
67 test? ( sys-devel/bc )"
68 PDEPEND="app-misc/ca-certificates"
69
70 src_unpack() {
71 unpack ${A}
72 cd "${S}"
73
74 epatch "${FILESDIR}"/${PN}-0.9.7e-gentoo.patch
75 #epatch "${FILESDIR}"/${PN}-0.9.8j-parallel-build.patch
76 #epatch "${FILESDIR}"/${PN}-0.9.8b-doc-updates.patch
77 #epatch "${FILESDIR}"/${PN}-0.9.8e-bsd-sparc64.patch
78 #epatch "${FILESDIR}"/${PN}-0.9.8h-ldflags.patch #181438
79 epatch "${FILESDIR}"/${PN}-0.9.8l-binutils.patch #289130
80
81 # disable fips in the build
82 # make sure the man pages are suffixed #302165
83 # don't bother building man pages if they're disabled
84 sed -i \
85 -e '/DIRS/s: fips : :g' \
86 -e '/^MANSUFFIX/s:=.*:=ssl:' \
87 -e '/^MAKEDEPPROG/s:=.*:=$(CC):' \
88 -e $(has noman FEATURES \
89 && echo '/^install:/s:install_docs::' \
90 || echo '/^MANDIR=/s:=.*:=/usr/share/man:') \
91 Makefile{,.org} \
92 || die
93 # show the actual commands in the log
94 sed -i '/^SET_X/s:=.*:=set -x:' Makefile.shared
95
96 # allow openssl to be cross-compiled
97 cp "${FILESDIR}"/gentoo.config-0.9.8 gentoo.config || die "cp cross-compile failed"
98 chmod a+rx gentoo.config
99
100 append-flags -fno-strict-aliasing
101 append-flags -Wa,--noexecstack
102
103 sed -i '1s,^:$,#!/usr/bin/perl,' Configure #141906
104 ./config --test-sanity || die "I AM NOT SANE"
105 }
106
107 src_compile() {
108 unset APPS #197996
109 unset SCRIPTS #312551
110
111 tc-export CC AR RANLIB
112
113 # Clean out patent-or-otherwise-encumbered code
114 # Camellia: Royalty Free http://en.wikipedia.org/wiki/Camellia_(cipher)
115 # IDEA: 5,214,703 25/05/2010 http://en.wikipedia.org/wiki/International_Data_Encryption_Algorithm
116 # EC: ????????? ??/??/2015 http://en.wikipedia.org/wiki/Elliptic_Curve_Cryptography
117 # MDC2: Expired http://en.wikipedia.org/wiki/MDC-2
118 # RC5: 5,724,428 03/03/2015 http://en.wikipedia.org/wiki/RC5
119
120 use_ssl() { use $1 && echo "enable-${2:-$1} ${*:3}" || echo "no-${2:-$1}" ; }
121 echoit() { echo "$@" ; "$@" ; }
122
123 local krb5=$(has_version app-crypt/mit-krb5 && echo "MIT" || echo "Heimdal")
124
125 local sslout=$(./gentoo.config)
126 einfo "Use configuration ${sslout:-(openssl knows best)}"
127 local config="Configure"
128 [[ -z ${sslout} ]] && config="config"
129 echoit \
130 ./${config} \
131 ${sslout} \
132 $(use sse2 || echo "no-sse2") \
133 enable-camellia \
134 $(use_ssl !bindist ec) \
135 $(use_ssl !bindist idea) \
136 enable-mdc2 \
137 $(use_ssl !bindist rc5) \
138 enable-tlsext \
139 $(use_ssl gmp gmp -lgmp) \
140 $(use_ssl kerberos krb5 --with-krb5-flavor=${krb5}) \
141 $(use_ssl rfc3779) \
142 $(use_ssl zlib) \
143 --prefix=/usr \
144 --openssldir=/etc/ssl \
145 --libdir=$(get_libdir) \
146 shared threads \
147 || die "Configure failed"
148
149 # Clean out hardcoded flags that openssl uses
150 local CFLAG=$(grep ^CFLAG= Makefile | LC_ALL=C sed \
151 -e 's:^CFLAG=::' \
152 -e 's:-fomit-frame-pointer ::g' \
153 -e 's:-O[0-9] ::g' \
154 -e 's:-march=[-a-z0-9]* ::g' \
155 -e 's:-mcpu=[-a-z0-9]* ::g' \
156 -e 's:-m[a-z0-9]* ::g' \
157 )
158 sed -i \
159 -e "/^CFLAG/s:=.*:=${CFLAG} ${CFLAGS}:" \
160 -e "/^SHARED_LDFLAGS=/s:$: ${LDFLAGS}:" \
161 Makefile || die
162
163 # depend is needed to use $confopts
164 # rehash is needed to prep the certs/ dir
165 emake -j1 depend || die "depend failed"
166 emake -j1 all rehash || die "make all failed"
167 }
168
169 src_test() {
170 emake -j1 test || die "make test failed"
171 }
172
173 src_install() {
174 emake -j1 INSTALL_PREFIX="${D}" install || die
175 dodoc CHANGES* FAQ NEWS README doc/*.txt doc/c-indentation.el
176 dohtml -r doc/*
177
178 # create the certs directory
179 dodir /etc/ssl/certs
180 cp -RP certs/* "${D}"/etc/ssl/certs/ || die "failed to install certs"
181 rm -r "${D}"/etc/ssl/certs/{demo,expired}
182
183 # Namespace openssl programs to prevent conflicts with other man pages
184 cd "${D}"/usr/share/man
185 local m d s
186 for m in $(find . -type f | xargs grep -L '#include') ; do
187 d=${m%/*} ; d=${d#./} ; m=${m##*/}
188 [[ ${m} == openssl.1* ]] && continue
189 [[ -n $(find -L ${d} -type l) ]] && die "erp, broken links already!"
190 mv ${d}/{,ssl-}${m}
191 # fix up references to renamed man pages
192 sed -i '/^[.]SH "SEE ALSO"/,/^[.]/s:\([^(, ]*(1)\):ssl-\1:g' ${d}/ssl-${m}
193 ln -s ssl-${m} ${d}/openssl-${m}
194 # locate any symlinks that point to this man page ... we assume
195 # that any broken links are due to the above renaming
196 for s in $(find -L ${d} -type l) ; do
197 s=${s##*/}
198 rm -f ${d}/${s}
199 ln -s ssl-${m} ${d}/ssl-${s}
200 ln -s ssl-${s} ${d}/openssl-${s}
201 done
202 done
203 [[ -n $(find -L ${d} -type l) ]] && die "broken manpage links found :("
204
205 dodir /etc/sandbox.d #254521
206 echo 'SANDBOX_PREDICT="/dev/crypto"' > "${D}"/etc/sandbox.d/10openssl
207
208 diropts -m0700
209 keepdir /etc/ssl/private
210 }
211
212 pkg_preinst() {
213 preserve_old_lib /usr/$(get_libdir)/lib{crypto,ssl}.so.0.9.{6,7,8}
214 }
215
216 pkg_postinst() {
217 preserve_old_lib_notify /usr/$(get_libdir)/lib{crypto,ssl}.so.0.9.{6,7,8}
218 }
Report Message
Find on MARC Find on Google Groups