From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 2B52D13835A for ; Sun, 20 Dec 2020 15:00:14 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 65608E088B; Sun, 20 Dec 2020 15:00:13 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3C658E088B for ; Sun, 20 Dec 2020 15:00:13 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 32DB5340D2A for ; Sun, 20 Dec 2020 15:00:11 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8DB8F2CA for ; Sun, 20 Dec 2020 15:00:09 +0000 (UTC) From: "Fabian Groffen" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Fabian Groffen" Message-ID: <1608475412.2008828ac3bd2fe373ae549de9b7e0ec2dbf8fb1.grobian@gentoo> Subject: [gentoo-commits] repo/proj/prefix:master commit in: dev-libs/openssl/files/, dev-libs/openssl/ X-VCS-Repository: repo/proj/prefix X-VCS-Files: dev-libs/openssl/files/openssl-1.0.2a-aix-soname.patch dev-libs/openssl/openssl-1.0.2t-r1.ebuild dev-libs/openssl/openssl-1.0.2u.ebuild dev-libs/openssl/openssl-1.1.1g.ebuild dev-libs/openssl/openssl-1.1.1i.ebuild X-VCS-Directories: dev-libs/openssl/ dev-libs/openssl/files/ X-VCS-Committer: grobian X-VCS-Committer-Name: Fabian Groffen X-VCS-Revision: 2008828ac3bd2fe373ae549de9b7e0ec2dbf8fb1 X-VCS-Branch: master Date: Sun, 20 Dec 2020 15:00:09 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: a64a20c2-d599-4a18-8d7f-c0bc501b6a4d X-Archives-Hash: 78474acf1f463d941220103cc5bbe627 commit: 2008828ac3bd2fe373ae549de9b7e0ec2dbf8fb1 Author: Fabian Groffen gentoo org> AuthorDate: Sun Dec 20 14:43:32 2020 +0000 Commit: Fabian Groffen gentoo org> CommitDate: Sun Dec 20 14:43:32 2020 +0000 URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=2008828a dev-libs/openssl: drop ~ppc-aix Bug: https://bugs.gentoo.org/760057 Package-Manager: Portage-3.0.12-prefix, Repoman-3.0.2 Signed-off-by: Fabian Groffen gentoo.org> .../openssl/files/openssl-1.0.2a-aix-soname.patch | 76 ---------------------- dev-libs/openssl/openssl-1.0.2t-r1.ebuild | 5 +- dev-libs/openssl/openssl-1.0.2u.ebuild | 3 +- dev-libs/openssl/openssl-1.1.1g.ebuild | 2 +- dev-libs/openssl/openssl-1.1.1i.ebuild | 2 +- 5 files changed, 5 insertions(+), 83 deletions(-) diff --git a/dev-libs/openssl/files/openssl-1.0.2a-aix-soname.patch b/dev-libs/openssl/files/openssl-1.0.2a-aix-soname.patch deleted file mode 100644 index a2fcca4cf9..0000000000 --- a/dev-libs/openssl/files/openssl-1.0.2a-aix-soname.patch +++ /dev/null @@ -1,76 +0,0 @@ ---- a/Configure -+++ b/Configure -@@ -967,6 +967,10 @@ - { - $cross_compile_prefix=$1; - } -+ elsif (/^--with-aix-soname=(aix|both|svr4)$/) -+ { -+ $withargs{"aix-soname"}=$1; -+ } - elsif (/^-[lL](.*)$/ or /^-Wl,/) - { - $libs.=$_." "; -@@ -1431,6 +1435,10 @@ - $no_shared_warn = 1 if !$no_shared; - $no_shared = 1; - } -+elsif ($shared_target eq "aix-shared" && defined($withargs{"aix-soname"})) -+ { -+ $shared_target .= "-" . $withargs{"aix-soname"}; -+ } - if (!$no_shared) - { - if ($shared_cflag ne "") ---- a/Makefile.shared -+++ b/Makefile.shared -@@ -545,6 +545,38 @@ - NOALLSYMSFLAGS=''; \ - SHAREDFLAGS='$(CFLAGS) $(SHARED_LDFLAGS) -Wl,-bexpall,-bnolibpath,-bM:SRE'; \ - $(LINK_SO_O); -+link_a.aix.svr4: -+ @ $(CALC_VERSIONS); \ -+ OBJECT_MODE=`expr "x$(SHARED_LDFLAGS)" : 'x\-[a-z]*\(64\)'` || : ; \ -+ OBJECT_MODE=$${OBJECT_MODE:-32}; export OBJECT_MODE; \ -+ SHLIB=lib$(LIBNAME).so; \ -+ SHLIB_SUFFIX=; \ -+ test "$$OBJECT_MODE" = 64 && shr='shr_64' || shr='shr'; \ -+ shrexp=$$SHLIB$$SHLIB_SOVER.d/$$shr.exp; \ -+ shrimp=$$SHLIB$$SHLIB_SOVER.d/$$shr.imp; \ -+ ALLSYMSFLAGS="-Wl,-bexport:$$shrexp"; \ -+ NOALLSYMSFLAGS=''; \ -+ SHAREDFLAGS='$(CFLAGS) $(SHARED_LDFLAGS) -shared -Wl,-G,-bernotok,-bsymbolic,-bnolibpath'; \ -+ NM='$(NM)'; : $${NM:=nm}; \ -+ AR='$(AR)'; : $${AR:=ar r}; \ -+ STRIP='$(STRIP)'; : $${STRIP:=strip}; \ -+ SHOBJECTS="lib$(LIBNAME).a $(LIBEXTRAS)"; \ -+ ( rm -rf $$SHLIB$$SHLIB_SOVER.d && \ -+ mkdir $$SHLIB$$SHLIB_SOVER.d && \ -+ $${NM} -PCpgl $$SHOBJECTS \ -+ | awk '{ \ -+ if ((($$ 2 == "T") || ($$ 2 == "D") || ($$ 2 == "B") || ($$ 2 == "W") || ($$ 2 == "V") || ($$ 2 == "Z")) && (substr($$ 1, 1, 1) != ".")) { \ -+ if (($$ 2 == "W") || ($$ 2 == "V") || ($$ 2 == "Z")) { print $$ 1 " weak" } else { print $$ 1 } \ -+ } }' \ -+ | sort -u > $$shrexp && \ -+ { echo "#! $$SHLIB$$SHLIB_SOVER($$shr.o)"; echo "# $$OBJECT_MODE"; cat $$shrexp; } > $$shrimp && \ -+ INHIBIT_SYMLINKS=1; \ -+ SHLIB_SUFFIX=".d/$$shr.o"; \ -+ $(LINK_SO) && \ -+ $${STRIP} -e $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX && \ -+ $${AR} $$SHLIB$$SHLIB_SOVER $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX $$shrimp && \ -+ rm -rf $$SHLIB$$SHLIB_SOVER.d \ -+ ) && $(SYMLINK_SO) - link_a.aix: - @ $(CALC_VERSIONS); \ - OBJECT_MODE=`expr "x$(SHARED_LDFLAGS)" : 'x\-[a-z]*\(64\)'` || : ; \ -@@ -649,6 +681,10 @@ - link_a.aix-shared: link_a.aix - link_app.aix-shared: link_app.aix - symlink.aix-shared: symlink.aix -+link_o.aix-shared-svr4: link_o.aix -+link_a.aix-shared-svr4: link_a.aix.svr4 -+link_app.aix-shared-svr4: link_app.aix -+symlink.aix-shared-svr4: symlink.aix - link_o.reliantunix-shared: link_o.reliantunix - link_a.reliantunix-shared: link_a.reliantunix - link_app.reliantunix-shared: link_app.reliantunix diff --git a/dev-libs/openssl/openssl-1.0.2t-r1.ebuild b/dev-libs/openssl/openssl-1.0.2t-r1.ebuild index 41dd63e4b0..f12aa9e990 100644 --- a/dev-libs/openssl/openssl-1.0.2t-r1.ebuild +++ b/dev-libs/openssl/openssl-1.0.2t-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" @@ -37,7 +37,7 @@ SRC_URI="mirror://openssl/source/${MY_P}.tar.gz LICENSE="openssl" SLOT="0" -KEYWORDS="~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" +KEYWORDS="~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" IUSE="+asm bindist gmp kerberos rfc3779 sctp cpu_flags_x86_sse2 sslv2 +sslv3 static-libs test +tls-heartbeat vanilla zlib" RESTRICT="!bindist? ( bindist )" @@ -110,7 +110,6 @@ src_prepare() { # show the actual commands in the log sed -i '/^SET_X/s:=.*:=set -x:' Makefile.shared - eapply "${FILESDIR}"/${PN}-1.0.2a-aix-soname.patch # like libtool eapply "${FILESDIR}"/${PN}-0.9.8g-engines-installnames.patch eapply "${FILESDIR}"/${PN}-1.0.0b-darwin-bundle-compile-fix.patch eapply "${FILESDIR}"/${PN}-1.0.2-gethostbyname2-solaris.patch diff --git a/dev-libs/openssl/openssl-1.0.2u.ebuild b/dev-libs/openssl/openssl-1.0.2u.ebuild index 3361d8a3b4..8ea24c07cb 100644 --- a/dev-libs/openssl/openssl-1.0.2u.ebuild +++ b/dev-libs/openssl/openssl-1.0.2u.ebuild @@ -37,7 +37,7 @@ SRC_URI="mirror://openssl/source/${MY_P}.tar.gz LICENSE="openssl" SLOT="0" -KEYWORDS="~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" +KEYWORDS="~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" IUSE="+asm bindist gmp kerberos rfc3779 sctp cpu_flags_x86_sse2 sslv2 +sslv3 static-libs test +tls-heartbeat vanilla zlib" RESTRICT="!bindist? ( bindist ) !test? ( test )" @@ -111,7 +111,6 @@ src_prepare() { # show the actual commands in the log sed -i '/^SET_X/s:=.*:=set -x:' Makefile.shared - eapply "${FILESDIR}"/${PN}-1.0.2a-aix-soname.patch # like libtool eapply "${FILESDIR}"/${PN}-0.9.8g-engines-installnames.patch eapply "${FILESDIR}"/${PN}-1.0.0b-darwin-bundle-compile-fix.patch eapply "${FILESDIR}"/${PN}-1.0.2-gethostbyname2-solaris.patch diff --git a/dev-libs/openssl/openssl-1.1.1g.ebuild b/dev-libs/openssl/openssl-1.1.1g.ebuild index 14cc146ee7..cce8faee67 100644 --- a/dev-libs/openssl/openssl-1.1.1g.ebuild +++ b/dev-libs/openssl/openssl-1.1.1g.ebuild @@ -27,7 +27,7 @@ SRC_URI="mirror://openssl/source/${MY_P}.tar.gz LICENSE="openssl" SLOT="0/1.1" # .so version of libssl/libcrypto [[ "${PV}" = *_pre* ]] || \ -KEYWORDS="~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" +KEYWORDS="~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" IUSE="+asm bindist elibc_musl rfc3779 sctp cpu_flags_x86_sse2 kernel_linux sslv3 static-libs test tls-heartbeat vanilla zlib" RESTRICT="!bindist? ( bindist ) !test? ( test )" diff --git a/dev-libs/openssl/openssl-1.1.1i.ebuild b/dev-libs/openssl/openssl-1.1.1i.ebuild index 01da3c43c6..5da8b72a93 100644 --- a/dev-libs/openssl/openssl-1.1.1i.ebuild +++ b/dev-libs/openssl/openssl-1.1.1i.ebuild @@ -27,7 +27,7 @@ SRC_URI="mirror://openssl/source/${MY_P}.tar.gz LICENSE="openssl" SLOT="0/1.1" # .so version of libssl/libcrypto [[ "${PV}" = *_pre* ]] || \ -KEYWORDS="~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" +KEYWORDS="~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" IUSE="+asm bindist elibc_musl rfc3779 sctp cpu_flags_x86_sse2 kernel_linux sslv3 static-libs test tls-heartbeat vanilla zlib" RESTRICT="!bindist? ( bindist ) !test? ( test )"