* [gentoo-commits] gentoo-x86 commit in dev-libs/openssl: ChangeLog openssl-0.9.8o-r2.ebuild
@ 2010-08-14 5:53 Mike Frysinger (vapier)
0 siblings, 0 replies; 3+ messages in thread
From: Mike Frysinger (vapier) @ 2010-08-14 5:53 UTC (permalink / raw
To: gentoo-commits
vapier 10/08/14 05:53:33
Modified: ChangeLog
Added: openssl-0.9.8o-r2.ebuild
Log:
Add fix from upstream for double free to older version too #332027 by Hanno Boeck.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Revision Changes Path
1.343 dev-libs/openssl/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/openssl/ChangeLog?rev=1.343&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/openssl/ChangeLog?rev=1.343&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/openssl/ChangeLog?r1=1.342&r2=1.343
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-libs/openssl/ChangeLog,v
retrieving revision 1.342
retrieving revision 1.343
diff -u -r1.342 -r1.343
--- ChangeLog 10 Aug 2010 21:04:59 -0000 1.342
+++ ChangeLog 14 Aug 2010 05:53:33 -0000 1.343
@@ -1,6 +1,12 @@
# 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.342 2010/08/10 21:04:59 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/ChangeLog,v 1.343 2010/08/14 05:53:33 vapier Exp $
+
+*openssl-0.9.8o-r2 (14 Aug 2010)
+
+ 14 Aug 2010; Mike Frysinger <vapier@gentoo.org> +openssl-0.9.8o-r2.ebuild:
+ Add fix from upstream for double free to older version too #332027 by Hanno
+ Boeck.
*openssl-1.0.0a-r1 (10 Aug 2010)
1.1 dev-libs/openssl/openssl-0.9.8o-r2.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/openssl/openssl-0.9.8o-r2.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/openssl/openssl-0.9.8o-r2.ebuild?rev=1.1&content-type=text/plain
Index: openssl-0.9.8o-r2.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-0.9.8o-r2.ebuild,v 1.1 2010/08/14 05:53:33 vapier Exp $
# this ebuild is only for the libcrypto.so.0.9.8 and libssl.so.0.9.8 SONAME for ABI compat
EAPI=1
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.9.8"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
IUSE="bindist gmp kerberos sse2 test zlib"
RDEPEND="gmp? ( dev-libs/gmp )
zlib? ( sys-libs/zlib )
kerberos? ( app-crypt/mit-krb5 )
!=dev-libs/openssl-0.9.8*:0"
DEPEND="${RDEPEND}
sys-apps/diffutils
>=dev-lang/perl-5
test? ( sys-devel/bc )"
pkg_setup() {
[[ -e ${ROOT}/usr/$(get_libdir)/libcrypto.so.0.9.8 ]] && \
rm -f "${ROOT}"/usr/$(get_libdir)/libcrypto.so.0.9.8
[[ -e ${ROOT}/usr/$(get_libdir)/libssl.so.0.9.8 ]] && \
rm -f "${ROOT}"/usr/$(get_libdir)/libssl.so.0.9.8
}
src_unpack() {
unpack ${A}
cd "${S}"
epatch "${FILESDIR}"/${PN}-0.9.7e-gentoo.patch
epatch "${FILESDIR}"/${PN}-0.9.8e-bsd-sparc64.patch
epatch "${FILESDIR}"/${PN}-0.9.8h-ldflags.patch #181438
epatch "${FILESDIR}"/${PN}-0.9.8m-binutils.patch #289130
epatch "${FILESDIR}"/${PN}-1.0.0a-fix-double-free.patch #332027
# 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
sed -i '/^"debug-steve/d' Configure # 0.9.8k shipped broken
./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 zlib) \
--prefix=/usr \
--openssldir=/etc/ssl \
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 "/^LIBDIR=/s:=.*:=$(get_libdir):" \
-e "/^CFLAG/s:=.*:=${CFLAG} ${CFLAGS}:" \
-e "/^SHARED_LDFLAGS=/s:$: ${LDFLAGS}:" \
Makefile || die
# depend is needed to use $confopts
emake -j1 depend || die "depend failed"
emake -j1 build_libs || die "make build_libs failed"
}
src_test() {
emake -j1 test || die "make test failed"
}
src_install() {
dolib.so lib{crypto,ssl}.so.0.9.8 || die
}
^ permalink raw reply [flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in dev-libs/openssl: ChangeLog openssl-0.9.8o-r2.ebuild
@ 2010-10-08 18:44 Mike Frysinger (vapier)
0 siblings, 0 replies; 3+ messages in thread
From: Mike Frysinger (vapier) @ 2010-10-08 18:44 UTC (permalink / raw
To: gentoo-commits
vapier 10/10/08 18:44:37
Modified: ChangeLog openssl-0.9.8o-r2.ebuild
Log:
Only remove libs when installing this SLOT for the first time, and warn about it #340033 by Marcin Mirosław.
(Portage version: 2.2_rc86/cvs/Linux x86_64)
Revision Changes Path
1.360 dev-libs/openssl/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/openssl/ChangeLog?rev=1.360&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/openssl/ChangeLog?rev=1.360&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/openssl/ChangeLog?r1=1.359&r2=1.360
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-libs/openssl/ChangeLog,v
retrieving revision 1.359
retrieving revision 1.360
diff -u -r1.359 -r1.360
--- ChangeLog 7 Oct 2010 15:47:55 -0000 1.359
+++ ChangeLog 8 Oct 2010 18:44:37 -0000 1.360
@@ -1,6 +1,10 @@
# 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.359 2010/10/07 15:47:55 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/ChangeLog,v 1.360 2010/10/08 18:44:37 vapier Exp $
+
+ 08 Oct 2010; Mike Frysinger <vapier@gentoo.org> openssl-0.9.8o-r2.ebuild:
+ Only remove libs when installing this SLOT for the first time, and warn
+ about it #340033 by Marcin Mirosław.
07 Oct 2010; Jeroen Roovers <jer@gentoo.org> openssl-1.0.0a-r3.ebuild:
Stable for HPPA PPC (bug #332027).
1.3 dev-libs/openssl/openssl-0.9.8o-r2.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/openssl/openssl-0.9.8o-r2.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/openssl/openssl-0.9.8o-r2.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/openssl/openssl-0.9.8o-r2.ebuild?r1=1.2&r2=1.3
Index: openssl-0.9.8o-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-0.9.8o-r2.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- openssl-0.9.8o-r2.ebuild 28 Sep 2010 11:02:13 -0000 1.2
+++ openssl-0.9.8o-r2.ebuild 8 Oct 2010 18:44:37 -0000 1.3
@@ -1,10 +1,11 @@
# 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-0.9.8o-r2.ebuild,v 1.2 2010/09/28 11:02:13 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-0.9.8o-r2.ebuild,v 1.3 2010/10/08 18:44:37 vapier Exp $
# this ebuild is only for the libcrypto.so.0.9.8 and libssl.so.0.9.8 SONAME for ABI compat
-EAPI=1
+EAPI="1"
+
inherit eutils flag-o-matic toolchain-funcs
DESCRIPTION="Toolkit for SSL v2/v3 and TLS v1"
@@ -26,10 +27,11 @@
test? ( sys-devel/bc )"
pkg_setup() {
- [[ -e ${ROOT}/usr/$(get_libdir)/libcrypto.so.0.9.8 ]] && \
- rm -f "${ROOT}"/usr/$(get_libdir)/libcrypto.so.0.9.8
- [[ -e ${ROOT}/usr/$(get_libdir)/libssl.so.0.9.8 ]] && \
- rm -f "${ROOT}"/usr/$(get_libdir)/libssl.so.0.9.8
+ # avoid collisions with openssl-1 (preserve lib)
+ if ! has_version dev-libs/openssl:${SLOT} ; then
+ ewarn "Removing lib{crypto,ssl}.so.0.9.8 to avoid collision with openssl-1"
+ rm -f "${ROOT}"/usr/$(get_libdir)/lib{crypto,ssl}.so.0.9.8
+ fi
}
src_unpack() {
^ permalink raw reply [flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in dev-libs/openssl: ChangeLog openssl-0.9.8o-r2.ebuild
@ 2010-10-11 7:05 Christian Faulhammer (fauli)
0 siblings, 0 replies; 3+ messages in thread
From: Christian Faulhammer (fauli) @ 2010-10-11 7:05 UTC (permalink / raw
To: gentoo-commits
fauli 10/10/11 07:05:25
Modified: ChangeLog openssl-0.9.8o-r2.ebuild
Log:
stable x86, bug 330437
(Portage version: 2.1.8.3/cvs/Linux i686)
Revision Changes Path
1.362 dev-libs/openssl/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/openssl/ChangeLog?rev=1.362&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/openssl/ChangeLog?rev=1.362&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/openssl/ChangeLog?r1=1.361&r2=1.362
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-libs/openssl/ChangeLog,v
retrieving revision 1.361
retrieving revision 1.362
diff -u -r1.361 -r1.362
--- ChangeLog 10 Oct 2010 18:31:20 -0000 1.361
+++ ChangeLog 11 Oct 2010 07:05:25 -0000 1.362
@@ -1,6 +1,10 @@
# 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.361 2010/10/10 18:31:20 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/ChangeLog,v 1.362 2010/10/11 07:05:25 fauli Exp $
+
+ 11 Oct 2010; Christian Faulhammer <fauli@gentoo.org>
+ openssl-0.9.8o-r2.ebuild:
+ stable x86, bug 330437
10 Oct 2010; Raúl Porcel <armin76@gentoo.org> openssl-1.0.0a-r3.ebuild:
arm/ia64/m68k/s390/sh/sparc stable wrt #330437
1.4 dev-libs/openssl/openssl-0.9.8o-r2.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/openssl/openssl-0.9.8o-r2.ebuild?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/openssl/openssl-0.9.8o-r2.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/openssl/openssl-0.9.8o-r2.ebuild?r1=1.3&r2=1.4
Index: openssl-0.9.8o-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-0.9.8o-r2.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- openssl-0.9.8o-r2.ebuild 8 Oct 2010 18:44:37 -0000 1.3
+++ openssl-0.9.8o-r2.ebuild 11 Oct 2010 07:05:25 -0000 1.4
@@ -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-0.9.8o-r2.ebuild,v 1.3 2010/10/08 18:44:37 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-0.9.8o-r2.ebuild,v 1.4 2010/10/11 07:05:25 fauli Exp $
# this ebuild is only for the libcrypto.so.0.9.8 and libssl.so.0.9.8 SONAME for ABI compat
@@ -14,7 +14,7 @@
LICENSE="openssl"
SLOT="0.9.8"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd"
IUSE="bindist gmp kerberos sse2 test zlib"
RDEPEND="gmp? ( dev-libs/gmp )
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2010-10-11 7:05 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-10-11 7:05 [gentoo-commits] gentoo-x86 commit in dev-libs/openssl: ChangeLog openssl-0.9.8o-r2.ebuild Christian Faulhammer (fauli)
-- strict thread matches above, loose matches on Subject: below --
2010-10-08 18:44 Mike Frysinger (vapier)
2010-08-14 5:53 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