chainsaw 14/06/05 18:14:56 Modified: ChangeLog Added: openssl-1.0.1h-r1.ebuild openssl-1.0.1h-r2.ebuild Removed: openssl-1.0.1h.ebuild Log: Decouple 1.0.1H security upgrade from experimental multilib portation with broken dependency tree. Your security upgrade is R1 and your experiment is R2. (Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 0xB5058F9A)
Revision Changes Path 1.542 dev-libs/openssl/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/openssl/ChangeLog?rev=1.542&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/openssl/ChangeLog?rev=1.542&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/openssl/ChangeLog?r1=1.541&r2=1.542 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-libs/openssl/ChangeLog,v retrieving revision 1.541 retrieving revision 1.542 diff -u -r1.541 -r1.542 --- ChangeLog 5 Jun 2014 12:53:23 -0000 1.541 +++ ChangeLog 5 Jun 2014 18:14:56 -0000 1.542 @@ -1,6 +1,15 @@ # ChangeLog for dev-libs/openssl # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/ChangeLog,v 1.541 2014/06/05 12:53:23 polynomial-c Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/ChangeLog,v 1.542 2014/06/05 18:14:56 chainsaw Exp $ + +*openssl-1.0.1h-r2 (05 Jun 2014) +*openssl-1.0.1h-r1 (05 Jun 2014) + + 05 Jun 2014; Tony Vroon <chain...@gentoo.org> -openssl-1.0.1h.ebuild, + +openssl-1.0.1h-r1.ebuild, +openssl-1.0.1h-r2.ebuild: + Decouple 1.0.1H security upgrade from experimental multilib portation with + broken dependency tree. Your security upgrade is R1 and your experiment is + R2. *openssl-1.0.1h (05 Jun 2014) *openssl-1.0.0m (05 Jun 2014) 1.1 dev-libs/openssl/openssl-1.0.1h-r1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/openssl/openssl-1.0.1h-r1.ebuild?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/openssl/openssl-1.0.1h-r1.ebuild?rev=1.1&content-type=text/plain Index: openssl-1.0.1h-r1.ebuild =================================================================== # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-1.0.1h-r1.ebuild,v 1.1 2014/06/05 18:14:56 chainsaw Exp $ EAPI="4" inherit eutils flag-o-matic toolchain-funcs multilib REV="1.7" DESCRIPTION="full-strength general purpose cryptography library (including SSL and TLS)" HOMEPAGE="http://www.openssl.org/"; SRC_URI="mirror://openssl/source/${P}.tar.gz http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/${PN}/${PN}-c_rehash.sh?rev=${REV} -> ${PN}-c_rehash.sh.${REV}" LICENSE="openssl" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~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 +tls-heartbeat vanilla zlib" # Have the sub-libs in RDEPEND with [static-libs] since, logically, # our libssl.a depends on libz.a/etc... at runtime. LIB_DEPEND="gmp? ( dev-libs/gmp[static-libs(+)] ) zlib? ( sys-libs/zlib[static-libs(+)] ) kerberos? ( app-crypt/mit-krb5 )" # The blocks are temporary just to make sure people upgrade to a # version that lack runtime version checking. We'll drop them in # the future. RDEPEND="static-libs? ( ${LIB_DEPEND} ) !static-libs? ( ${LIB_DEPEND//\[static-libs(+)]} ) !<net-misc/openssh-5.9_p1-r4 !<net-libs/neon-0.29.6-r1" DEPEND="${RDEPEND} sys-apps/diffutils >=dev-lang/perl-5 test? ( sys-devel/bc )" PDEPEND="app-misc/ca-certificates" src_unpack() { unpack ${P}.tar.gz SSL_CNF_DIR="/etc/ssl" sed \ -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 } src_prepare() { # Make sure we only ever touch Makefile.org and avoid patching a file # that gets blown away anyways by the Configure script in src_configure rm -f Makefile if ! use vanilla ; then epatch "${FILESDIR}"/${PN}-1.0.0a-ldflags.patch #327421 epatch "${FILESDIR}"/${PN}-1.0.0d-windres.patch #373743 epatch "${FILESDIR}"/${PN}-1.0.0h-pkg-config.patch epatch "${FILESDIR}"/${PN}-1.0.1-parallel-build.patch epatch "${FILESDIR}"/${PN}-1.0.1-x32.patch epatch "${FILESDIR}"/${PN}-1.0.1h-ipv6.patch epatch "${FILESDIR}"/${PN}-1.0.1e-s_client-verify.patch #472584 epatch "${FILESDIR}"/${PN}-1.0.1f-revert-alpha-perl-generation.patch #499086 epatch_user #332661 fi # 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:=.*:='${EPREFIX}'/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-1.0.1 gentoo.config || die chmod a+rx gentoo.config append-flags -fno-strict-aliasing append-flags $(test-flags-CC -Wa,--noexecstack) sed -i '1s,^:$,#!'${EPREFIX}'/usr/bin/perl,' Configure #141906 # The config script does stupid stuff to prompt the user. Kill it. sed -i '/stty -icanon min 0 time 50; read waste/d' config || die ./config --test-sanity || die "I AM NOT SANE" } src_configure() { unset APPS #197996 unset SCRIPTS #312551 unset CROSS_COMPILE #311473 tc-export CC AR RANLIB RC # Clean out patent-or-otherwise-encumbered code # Camellia: Royalty Free http://en.wikipedia.org/wiki/Camellia_(cipher) # IDEA: Expired 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() { usex $1 "enable-${2:-$1}" "no-${2:-$1}" " ${*:3}" ; } echoit() { echo "$@" ; "$@" ; } local krb5=$(has_version app-crypt/mit-krb5 && echo "MIT" || echo "Heimdal") # See if our toolchain supports __uint128_t. If so, it's 64bit # friendly and can use the nicely optimized code paths. #460790 local ec_nistp_64_gcc_128 # Disable it for now though #469976 #if ! use bindist ; then # echo "__uint128_t i;" > "${T}"/128.c # if ${CC} ${CFLAGS} -c "${T}"/128.c -o /dev/null >&/dev/null ; then # ec_nistp_64_gcc_128="enable-ec_nistp_64_gcc_128" # fi #fi 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) \ ${ec_nistp_64_gcc_128} \ enable-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 tls-heartbeat heartbeats) \ $(use_ssl zlib) \ --prefix="${EPREFIX}"/usr \ --openssldir="${EPREFIX}"${SSL_CNF_DIR} \ --libdir=$(get_libdir) \ shared threads \ || die # 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 } src_compile() { # depend is needed to use $confopts; it also doesn't matter # that it's -j1 as the code itself serializes subdirs emake -j1 depend emake all # rehash is needed to prep the certs/ dir; do this # separately to avoid parallel build issues. emake rehash } src_test() { emake -j1 test } src_install() { emake INSTALL_PREFIX="${D}" install dobin "${WORKDIR}"/c_rehash #333117 dodoc CHANGES* FAQ NEWS README doc/*.txt doc/c-indentation.el dohtml -r doc/* use rfc3779 && dodoc engines/ccgost/README.gost # This is crappy in that the static archives are still built even # when USE=static-libs. But this is due to a failing in the openssl # 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 "${ED}"/usr/lib*/lib*.a # create the certs directory dodir ${SSL_CNF_DIR}/certs 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 "${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##*/} [[ ${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"' > "${ED}"/etc/sandbox.d/10openssl diropts -m0700 keepdir ${SSL_CNF_DIR}/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() { 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 preserve_old_lib_notify /usr/$(get_libdir)/lib{crypto,ssl}.so.0.9.8 } 1.1 dev-libs/openssl/openssl-1.0.1h-r2.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/openssl/openssl-1.0.1h-r2.ebuild?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/openssl/openssl-1.0.1h-r2.ebuild?rev=1.1&content-type=text/plain Index: openssl-1.0.1h-r2.ebuild =================================================================== # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-1.0.1h-r2.ebuild,v 1.1 2014/06/05 18:14:56 chainsaw Exp $ EAPI="4" inherit eutils flag-o-matic toolchain-funcs multilib multilib-minimal REV="1.7" DESCRIPTION="full-strength general purpose cryptography library (including SSL and TLS)" HOMEPAGE="http://www.openssl.org/"; SRC_URI="mirror://openssl/source/${P}.tar.gz http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/${PN}/${PN}-c_rehash.sh?rev=${REV} -> ${PN}-c_rehash.sh.${REV}" LICENSE="openssl" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~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 +tls-heartbeat vanilla zlib" # The blocks are temporary just to make sure people upgrade to a # version that lack runtime version checking. We'll drop them in # the future. RDEPEND="gmp? ( dev-libs/gmp[static-libs(+)?,${MULTILIB_USEDEP}] ) zlib? ( sys-libs/zlib[static-libs(+)?,${MULTILIB_USEDEP}] ) kerberos? ( app-crypt/mit-krb5[${MULTILIB_USEDEP}] ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140406-r3 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) !<net-misc/openssh-5.9_p1-r4 !<net-libs/neon-0.29.6-r1" DEPEND="${RDEPEND} sys-apps/diffutils >=dev-lang/perl-5 test? ( sys-devel/bc )" PDEPEND="app-misc/ca-certificates" src_unpack() { unpack ${P}.tar.gz SSL_CNF_DIR="/etc/ssl" sed \ -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 } MULTILIB_WRAPPED_HEADERS=( usr/include/openssl/opensslconf.h ) src_prepare() { # Make sure we only ever touch Makefile.org and avoid patching a file # that gets blown away anyways by the Configure script in src_configure rm -f Makefile if ! use vanilla ; then epatch "${FILESDIR}"/${PN}-1.0.0a-ldflags.patch #327421 epatch "${FILESDIR}"/${PN}-1.0.0d-windres.patch #373743 epatch "${FILESDIR}"/${PN}-1.0.0h-pkg-config.patch epatch "${FILESDIR}"/${PN}-1.0.1-parallel-build.patch epatch "${FILESDIR}"/${PN}-1.0.1-x32.patch epatch "${FILESDIR}"/${PN}-1.0.1h-ipv6.patch epatch "${FILESDIR}"/${PN}-1.0.1e-s_client-verify.patch #472584 epatch "${FILESDIR}"/${PN}-1.0.1f-revert-alpha-perl-generation.patch #499086 epatch_user #332661 fi # 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:=.*:='${EPREFIX}'/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-1.0.1 gentoo.config || die chmod a+rx gentoo.config append-flags -fno-strict-aliasing append-flags $(test-flags-CC -Wa,--noexecstack) sed -i '1s,^:$,#!'${EPREFIX}'/usr/bin/perl,' Configure #141906 # The config script does stupid stuff to prompt the user. Kill it. sed -i '/stty -icanon min 0 time 50; read waste/d' config || die ./config --test-sanity || die "I AM NOT SANE" multilib_copy_sources } multilib_src_configure() { unset APPS #197996 unset SCRIPTS #312551 unset CROSS_COMPILE #311473 tc-export CC AR RANLIB RC # Clean out patent-or-otherwise-encumbered code # Camellia: Royalty Free http://en.wikipedia.org/wiki/Camellia_(cipher) # IDEA: Expired 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() { usex $1 "enable-${2:-$1}" "no-${2:-$1}" " ${*:3}" ; } echoit() { echo "$@" ; "$@" ; } local krb5=$(has_version app-crypt/mit-krb5 && echo "MIT" || echo "Heimdal") # See if our toolchain supports __uint128_t. If so, it's 64bit # friendly and can use the nicely optimized code paths. #460790 local ec_nistp_64_gcc_128 # Disable it for now though #469976 #if ! use bindist ; then # echo "__uint128_t i;" > "${T}"/128.c # if ${CC} ${CFLAGS} -c "${T}"/128.c -o /dev/null >&/dev/null ; then # ec_nistp_64_gcc_128="enable-ec_nistp_64_gcc_128" # fi #fi 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) \ ${ec_nistp_64_gcc_128} \ enable-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 tls-heartbeat heartbeats) \ $(use_ssl zlib) \ --prefix="${EPREFIX}"/usr \ --openssldir="${EPREFIX}"${SSL_CNF_DIR} \ --libdir=$(get_libdir) \ shared threads \ || die # 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 } multilib_src_compile() { # depend is needed to use $confopts; it also doesn't matter # that it's -j1 as the code itself serializes subdirs emake -j1 depend emake all # rehash is needed to prep the certs/ dir; do this # separately to avoid parallel build issues. emake rehash } multilib_src_test() { emake -j1 test } multilib_src_install() { emake INSTALL_PREFIX="${D}" install } multilib_src_install_all() { dobin "${WORKDIR}"/c_rehash #333117 dodoc CHANGES* FAQ NEWS README doc/*.txt doc/c-indentation.el dohtml -r doc/* use rfc3779 && dodoc engines/ccgost/README.gost # This is crappy in that the static archives are still built even # when USE=static-libs. But this is due to a failing in the openssl # 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 "${ED}"/usr/lib*/lib*.a # create the certs directory dodir ${SSL_CNF_DIR}/certs 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 "${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##*/} [[ ${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"' > "${ED}"/etc/sandbox.d/10openssl diropts -m0700 keepdir ${SSL_CNF_DIR}/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() { 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 preserve_old_lib_notify /usr/$(get_libdir)/lib{crypto,ssl}.so.0.9.8 }
