* [gentoo-commits] gentoo-x86 commit in dev-libs/openssl: ChangeLog openssl-1.0.0a-r1.ebuild
@ 2010-08-10 21:04 Samuli Suominen (ssuominen)
0 siblings, 0 replies; 2+ messages in thread
From: Samuli Suominen (ssuominen) @ 2010-08-10 21:04 UTC (permalink / raw
To: gentoo-commits
ssuominen 10/08/10 21:04:59
Modified: ChangeLog
Added: openssl-1.0.0a-r1.ebuild
Log:
Use environment LDFLAGS wrt #327421 by Olivier Huber. Fix double free wrt #332027 by Hanno Boeck.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Revision Changes Path
1.342 dev-libs/openssl/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/openssl/ChangeLog?rev=1.342&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/openssl/ChangeLog?rev=1.342&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/openssl/ChangeLog?r1=1.341&r2=1.342
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-libs/openssl/ChangeLog,v
retrieving revision 1.341
retrieving revision 1.342
diff -u -r1.341 -r1.342
--- ChangeLog 4 Aug 2010 02:41:18 -0000 1.341
+++ ChangeLog 10 Aug 2010 21:04:59 -0000 1.342
@@ -1,6 +1,14 @@
# ChangeLog for dev-libs/openssl
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/ChangeLog,v 1.341 2010/08/04 02:41:18 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/ChangeLog,v 1.342 2010/08/10 21:04:59 ssuominen Exp $
+
+*openssl-1.0.0a-r1 (10 Aug 2010)
+
+ 10 Aug 2010; Samuli Suominen <ssuominen@gentoo.org>
+ +openssl-1.0.0a-r1.ebuild, +files/openssl-1.0.0a-fix-double-free.patch,
+ +files/openssl-1.0.0a-ldflags.patch:
+ Use environment LDFLAGS wrt #327421 by Olivier Huber. Fix double free wrt
+ #332027 by Hanno Boeck.
04 Aug 2010; Mike Frysinger <vapier@gentoo.org> openssl-1.0.0a.ebuild,
+files/alphacpuid.s:
1.1 dev-libs/openssl/openssl-1.0.0a-r1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/openssl/openssl-1.0.0a-r1.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/openssl/openssl-1.0.0a-r1.ebuild?rev=1.1&content-type=text/plain
Index: openssl-1.0.0a-r1.ebuild
===================================================================
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-1.0.0a-r1.ebuild,v 1.1 2010/08/10 21:04:59 ssuominen 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"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
IUSE="bindist gmp kerberos rfc3779 sse2 test zlib"
RDEPEND="gmp? ( dev-libs/gmp )
zlib? ( sys-libs/zlib )
kerberos? ( app-crypt/mit-krb5 )"
DEPEND="${RDEPEND}
sys-apps/diffutils
>=dev-lang/perl-5
test? ( sys-devel/bc )"
PDEPEND="app-misc/ca-certificates"
src_unpack() {
unpack ${A}
cd "${S}"
epatch "${FILESDIR}"/${PN}-0.9.7e-gentoo.patch
epatch "${FILESDIR}"/${PN}-0.9.8l-binutils.patch #289130
epatch "${FILESDIR}"/${PN}-1.0.0a-ldflags.patch #327421
epatch "${FILESDIR}"/${P}-fix-double-free.patch #332027
cp "${FILESDIR}"/alphacpuid.s "${S}"/crypto/ || die #330915
# disable fips in the build
# make sure the man pages are suffixed #302165
# don't bother building man pages if they're disabled
sed -i \
-e '/DIRS/s: fips : :g' \
-e '/^MANSUFFIX/s:=.*:=ssl:' \
-e '/^MAKEDEPPROG/s:=.*:=$(CC):' \
-e $(has noman FEATURES \
&& echo '/^install:/s:install_docs::' \
|| echo '/^MANDIR=/s:=.*:=/usr/share/man:') \
Makefile{,.org} \
|| die
# show the actual commands in the log
sed -i '/^SET_X/s:=.*:=set -x:' Makefile.shared
# allow openssl to be cross-compiled
cp "${FILESDIR}"/gentoo.config-0.9.8 gentoo.config || die "cp cross-compile failed"
chmod a+rx gentoo.config
append-flags -fno-strict-aliasing
append-flags -Wa,--noexecstack
sed -i '1s,^:$,#!/usr/bin/perl,' Configure #141906
./config --test-sanity || die "I AM NOT SANE"
}
src_compile() {
unset APPS #197996
unset SCRIPTS #312551
tc-export CC AR RANLIB
# Clean out patent-or-otherwise-encumbered code
# Camellia: Royalty Free http://en.wikipedia.org/wiki/Camellia_(cipher)
# IDEA: 5,214,703 25/05/2010 http://en.wikipedia.org/wiki/International_Data_Encryption_Algorithm
# EC: ????????? ??/??/2015 http://en.wikipedia.org/wiki/Elliptic_Curve_Cryptography
# MDC2: Expired http://en.wikipedia.org/wiki/MDC-2
# RC5: 5,724,428 03/03/2015 http://en.wikipedia.org/wiki/RC5
use_ssl() { use $1 && echo "enable-${2:-$1} ${*:3}" || echo "no-${2:-$1}" ; }
echoit() { echo "$@" ; "$@" ; }
local krb5=$(has_version app-crypt/mit-krb5 && echo "MIT" || echo "Heimdal")
local sslout=$(./gentoo.config)
einfo "Use configuration ${sslout:-(openssl knows best)}"
local config="Configure"
[[ -z ${sslout} ]] && config="config"
echoit \
./${config} \
${sslout} \
$(use sse2 || echo "no-sse2") \
enable-camellia \
$(use_ssl !bindist ec) \
$(use_ssl !bindist idea) \
enable-mdc2 \
$(use_ssl !bindist rc5) \
enable-tlsext \
$(use_ssl gmp gmp -lgmp) \
$(use_ssl kerberos krb5 --with-krb5-flavor=${krb5}) \
$(use_ssl rfc3779) \
$(use_ssl zlib) \
--prefix=/usr \
--openssldir=/etc/ssl \
--libdir=$(get_libdir) \
shared threads \
|| die "Configure failed"
# Clean out hardcoded flags that openssl uses
local CFLAG=$(grep ^CFLAG= Makefile | LC_ALL=C sed \
-e 's:^CFLAG=::' \
-e 's:-fomit-frame-pointer ::g' \
-e 's:-O[0-9] ::g' \
-e 's:-march=[-a-z0-9]* ::g' \
-e 's:-mcpu=[-a-z0-9]* ::g' \
-e 's:-m[a-z0-9]* ::g' \
)
sed -i \
-e "/^CFLAG/s:=.*:=${CFLAG} ${CFLAGS}:" \
-e "/^SHARED_LDFLAGS=/s:$: ${LDFLAGS}:" \
Makefile || die
# depend is needed to use $confopts
# rehash is needed to prep the certs/ dir
emake -j1 depend || die "depend failed"
emake -j1 all rehash || die "make all failed"
}
src_test() {
emake -j1 test || die "make test failed"
}
src_install() {
emake -j1 INSTALL_PREFIX="${D}" install || die
dodoc CHANGES* FAQ NEWS README doc/*.txt doc/c-indentation.el
dohtml -r doc/*
# create the certs directory
dodir /etc/ssl/certs
cp -RP certs/* "${D}"/etc/ssl/certs/ || die "failed to install certs"
rm -r "${D}"/etc/ssl/certs/{demo,expired}
# Namespace openssl programs to prevent conflicts with other man pages
cd "${D}"/usr/share/man
local m d s
for m in $(find . -type f | xargs grep -L '#include') ; do
d=${m%/*} ; d=${d#./} ; m=${m##*/}
[[ ${m} == openssl.1* ]] && continue
[[ -n $(find -L ${d} -type l) ]] && die "erp, broken links already!"
mv ${d}/{,ssl-}${m}
# fix up references to renamed man pages
sed -i '/^[.]SH "SEE ALSO"/,/^[.]/s:\([^(, ]*(1)\):ssl-\1:g' ${d}/ssl-${m}
ln -s ssl-${m} ${d}/openssl-${m}
# locate any symlinks that point to this man page ... we assume
# that any broken links are due to the above renaming
for s in $(find -L ${d} -type l) ; do
s=${s##*/}
rm -f ${d}/${s}
ln -s ssl-${m} ${d}/ssl-${s}
ln -s ssl-${s} ${d}/openssl-${s}
done
done
[[ -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
diropts -m0700
keepdir /etc/ssl/private
}
pkg_preinst() {
has_version ${CATEGORY}/${PN}:0.9.8 && return 0
preserve_old_lib /usr/$(get_libdir)/lib{crypto,ssl}.so.0.9.8
}
pkg_postinst() {
has_version ${CATEGORY}/${PN}:0.9.8 && return 0
preserve_old_lib_notify /usr/$(get_libdir)/lib{crypto,ssl}.so.0.9.8
}
^ permalink raw reply [flat|nested] 2+ messages in thread
* [gentoo-commits] gentoo-x86 commit in dev-libs/openssl: ChangeLog openssl-1.0.0a-r1.ebuild
@ 2010-08-17 4:10 Mike Frysinger (vapier)
0 siblings, 0 replies; 2+ messages in thread
From: Mike Frysinger (vapier) @ 2010-08-17 4:10 UTC (permalink / raw
To: gentoo-commits
vapier 10/08/17 04:10:11
Modified: ChangeLog openssl-1.0.0a-r1.ebuild
Log:
Automatically rehash ssl certs for people #333069.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Revision Changes Path
1.344 dev-libs/openssl/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/openssl/ChangeLog?rev=1.344&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/openssl/ChangeLog?rev=1.344&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/openssl/ChangeLog?r1=1.343&r2=1.344
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-libs/openssl/ChangeLog,v
retrieving revision 1.343
retrieving revision 1.344
diff -u -r1.343 -r1.344
--- ChangeLog 14 Aug 2010 05:53:33 -0000 1.343
+++ ChangeLog 17 Aug 2010 04:10:10 -0000 1.344
@@ -1,6 +1,9 @@
# ChangeLog for dev-libs/openssl
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/ChangeLog,v 1.343 2010/08/14 05:53:33 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/ChangeLog,v 1.344 2010/08/17 04:10:10 vapier Exp $
+
+ 17 Aug 2010; Mike Frysinger <vapier@gentoo.org> openssl-1.0.0a-r1.ebuild:
+ Automatically rehash ssl certs for people #333069.
*openssl-0.9.8o-r2 (14 Aug 2010)
1.2 dev-libs/openssl/openssl-1.0.0a-r1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/openssl/openssl-1.0.0a-r1.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/openssl/openssl-1.0.0a-r1.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/openssl/openssl-1.0.0a-r1.ebuild?r1=1.1&r2=1.2
Index: openssl-1.0.0a-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-1.0.0a-r1.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openssl-1.0.0a-r1.ebuild 10 Aug 2010 21:04:59 -0000 1.1
+++ openssl-1.0.0a-r1.ebuild 17 Aug 2010 04:10:10 -0000 1.2
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-1.0.0a-r1.ebuild,v 1.1 2010/08/10 21:04:59 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-1.0.0a-r1.ebuild,v 1.2 2010/08/17 04:10:10 vapier Exp $
inherit eutils flag-o-matic toolchain-funcs
@@ -169,6 +169,10 @@
}
pkg_postinst() {
+ ebegin "Running 'c_rehash ${ROOT}etc/ssl/certs/' to rebuild hashes #333069"
+ c_rehash "${ROOT}etc/ssl/certs" >/dev/null
+ eend $?
+
has_version ${CATEGORY}/${PN}:0.9.8 && return 0
preserve_old_lib_notify /usr/$(get_libdir)/lib{crypto,ssl}.so.0.9.8
}
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-08-17 4:10 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-08-10 21:04 [gentoo-commits] gentoo-x86 commit in dev-libs/openssl: ChangeLog openssl-1.0.0a-r1.ebuild Samuli Suominen (ssuominen)
-- strict thread matches above, loose matches on Subject: below --
2010-08-17 4:10 Mike Frysinger (vapier)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox