From 98f9e19f1b4b7c20696f7d61a0dab2a9ddf5215b Mon Sep 17 00:00:00 2001
From: "Anthony G. Basile" <blueness@gentoo.org>
Date: Fri, 10 Nov 2017 07:40:31 -0500
Subject: dev-libs/libressl: fix RWX GNU_STACK, bug #636960

Package-Manager: Portage-2.3.8, Repoman-2.3.3
---
 dev-libs/libressl/libressl-2.6.3-r1.ebuild | 55 ++++++++++++++++++++++++++++++
 dev-libs/libressl/libressl-2.6.3.ebuild    | 54 -----------------------------
 2 files changed, 55 insertions(+), 54 deletions(-)
 create mode 100644 dev-libs/libressl/libressl-2.6.3-r1.ebuild
 delete mode 100644 dev-libs/libressl/libressl-2.6.3.ebuild

(limited to 'dev-libs/libressl')

diff --git a/dev-libs/libressl/libressl-2.6.3-r1.ebuild b/dev-libs/libressl/libressl-2.6.3-r1.ebuild
new file mode 100644
index 000000000000..973160f6917a
--- /dev/null
+++ b/dev-libs/libressl/libressl-2.6.3-r1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-multilib
+
+DESCRIPTION="Free version of the SSL/TLS protocol forked from OpenSSL"
+HOMEPAGE="https://www.libressl.org"
+SRC_URI="https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/${P}.tar.gz"
+
+LICENSE="ISC openssl"
+# Reflects ABI of libcrypto.so and libssl.so.  Since these can differ,
+# we'll try to use the max of either.  However, if either change between
+# versions, we have to change the subslot to trigger rebuild of consumers.
+SLOT="0/44"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86"
+IUSE="+asm nc static-libs"
+
+RDEPEND="
+	!dev-libs/openssl:0
+	nc? ( !net-analyzer/openbsd-netcat )"
+DEPEND="${RDEPEND}"
+PDEPEND="app-misc/ca-certificates"
+
+src_prepare() {
+	# Correct hardcoded paths to use ca-certificates instead of cert.pem
+	find "${S}"/{apps,crypto,tls} -type f -exec \
+		sed -e 's|/cert.pem|/certs/ca-certificates.crt|' -i {} \; || die
+
+	eapply_user
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_ASM=$(usex asm)
+		-DENABLE_NC=$(usex nc)
+		-DOPENSSLDIR="${EPREFIX}"/etc/ssl
+		-DUSE_SHARED=1
+	)
+
+	cmake-multilib_src_configure
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	# Delete cert.pem
+	rm "${ED}"/etc/ssl/cert.pem || die
+	scanelf -Xe "${ED}"/usr/lib64/libcrypto.so.42.0.0
+
+	if ! use static-libs ; then
+		find "${D}" -name '*.a' -exec rm -f {} + || die
+	fi
+}
diff --git a/dev-libs/libressl/libressl-2.6.3.ebuild b/dev-libs/libressl/libressl-2.6.3.ebuild
deleted file mode 100644
index 6372f13faa6a..000000000000
--- a/dev-libs/libressl/libressl-2.6.3.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-multilib
-
-DESCRIPTION="Free version of the SSL/TLS protocol forked from OpenSSL"
-HOMEPAGE="https://www.libressl.org"
-SRC_URI="https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/${P}.tar.gz"
-
-LICENSE="ISC openssl"
-# Reflects ABI of libcrypto.so and libssl.so.  Since these can differ,
-# we'll try to use the max of either.  However, if either change between
-# versions, we have to change the subslot to trigger rebuild of consumers.
-SLOT="0/44"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86"
-IUSE="+asm nc static-libs"
-
-RDEPEND="
-	!dev-libs/openssl:0
-	nc? ( !net-analyzer/openbsd-netcat )"
-DEPEND="${RDEPEND}"
-PDEPEND="app-misc/ca-certificates"
-
-src_prepare() {
-	# Correct hardcoded paths to use ca-certificates instead of cert.pem
-	find "${S}"/{apps,crypto,tls} -type f -exec \
-		sed -e 's|/cert.pem|/certs/ca-certificates.crt|' -i {} \; || die
-
-	eapply_user
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_ASM=$(usex asm)
-		-DENABLE_NC=$(usex nc)
-		-DOPENSSLDIR="${EPREFIX}"/etc/ssl
-		-DUSE_SHARED=1
-	)
-
-	cmake-multilib_src_configure
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	# Delete cert.pem
-	rm "${ED}"/etc/ssl/cert.pem || die
-
-	if ! use static-libs ; then
-		find "${D}" -name '*.a' -exec rm -f {} + || die
-	fi
-}
-- 
cgit v1.2.3-65-gdbad