gentoo resync : 04.05.2021

5 files changed, 10 insertions, 73 deletions

diff --git a/app-crypt/trousers/Manifest b/app-crypt/trousers/Manifest
index a9fbdc6851d7..d9bb1c92fd17 100644
--- a/app-crypt/trousers/Manifest
+++ b/app-crypt/trousers/Manifest
@@ -5,11 +5,9 @@ AUX tcsd.service 131 BLAKE2B db7995ca078c6008daba2bee50b892d5ae0fceb184c966f6757
 AUX trousers-0.3.13-nouseradd.patch 606 BLAKE2B 7e4a479fe1bdc75f743263c1321f2d99cfe99d04d8196b57a158bd2ce75335526b2001c2af8aa0f8b17ddfefa304685e237385be0bc4113d5ca366dd464fa85d SHA512 a6c9074e535429f09ce5e850d943378348b54bed479b7fef0fff7bb18ab2547421407900aa35533749a764275a241ddbd083c4e2f3d6a9ad6f9b1d40d090f783
 AUX trousers-0.3.14-Makefile.am-Mark-tddl.a-nodist.patch 746 BLAKE2B 91dec77a329a4931487cdff54ab8c77ae302af6bc741da3db61bc34b416d29615808799c8a4c5b39a293021dc1cc16642461037fcb367507ceadcc4456565715 SHA512 704a87fd4b5e50356ac6a0ad68aec04eebb2030d9818c9e23a40f2e621d6e2d5e5660b81997b459e67a8059a0d88a254a41baa833806ce99268ee24b1190ae0b
 AUX trousers-0.3.14-fno-common.patch 385 BLAKE2B 7ed20c894c4687275804adf8d820227e5b246f02880d38b29dc6a17d12a4932059f237913f8d1841d56ee32c652cf732c01e77cd1235255b8e2fc28bc9a78027 SHA512 cf771b065d972b9974c93ec67a471a8ed3da737178a14b2d14537ee7948544bcbf071201d42d6e2b1333a3c30e8104cd1dbb344327a424597e5046e50137a692
-AUX trousers-0.3.14-libressl.patch 877 BLAKE2B 6416ecf1cf99678299e4ac39756920de61e598ec9b9c91c17cf8eddfa10af145b813756e2fae3b39fef8682eeb2ee722b3979d52570f41b99708fb4ba2cebe2d SHA512 3aba9ec7554d4fdb941063f771b40c5700efefdbb6e5df186824e93a6b2c61801acb4be60cdbe71dcee9360c0f59229e5d17f1a18aa981132807b5e74efc2d59
 AUX trousers-0.3.14-tcsd-fixes.patch 2203 BLAKE2B 8085cfd36817e35d54d39a012037945440fcae6e5040f7a7fd35a3c814df93264382a87eb06758b6042b64bef851ab3d5f5e424c2b946c0d1eaa92ebb97a733f SHA512 cc2827ed501cc29dcadd00537161804a62918c9dc703b2a773227aaf74a695d026b44c70848819a78b01cc785831117ae9dfa1d4c30133241b97dd32e8e838ba
-AUX trousers-0.3.15-libressl.patch 1018 BLAKE2B b762dfb984f84644e04076aeab8317555961103e0eb9c19e6b9fc5b5635054f0d53121e94d4887cd804628dcedff4c62362298a1bf7f520ff6c5eff6db769745 SHA512 9b0b01a326cc0149ace71f045a38a065e2ca61d640321b253dfc905c81913c97788922214cfe949e871dbf98c5487c61e023032a137b2ee70a4c45f7e1f03484
 DIST trousers-0.3.14.tar.gz 1378438 BLAKE2B 3dc2824fa2ca1b1f1181f98d59e85276e7d38af4bfc07ee8246431d9ccb300a8e0820b318643d4cf5d757d2a49492c8686e2fe9de03484263d2189d4bbaa32d0 SHA512 bf87f00329cf1d76a12cf6b6181fa22f90e76af3c5786e6e2db98438d2d3f0c0e05364374664173f45e3a2f6c0e2364948d0b958a7845cb23fcb340150cd9b21
 DIST trousers-0.3.15.tar.gz 4699936 BLAKE2B 53c60498ed6a9d3d87295b00676e5d0d82452918c35af6b98c7979ffa2dc04dd817e7cd3f4a33ca17c30b90eab53d80b2bb25306fe9db7bda2125019edfed280 SHA512 769c7d891c6306c1b3252448f86e3043ee837e566c9431f5b4353512113e2907f6ce29c91e8044c420025b79c5f3ff2396ddce93f73b1eb2a15ea1de89ac0fdb
-EBUILD trousers-0.3.14-r3.ebuild 1673 BLAKE2B 4c86cb8c9764179850cb778094a3dcdcbd4775955858981e8d5ce958217f51e2d6529059e31f61149156d517fe2f3179f7d85ae9a4724f3c2f1aa9c34da6bd84 SHA512 555038110e4fe3ff35c5fbfb9d1f35e3f72345dbbd31381b0de9a4f09404c1241456088d185c5dc2d94eda55d54277820d9a8145493b8499f1734bfb7f6413e2
-EBUILD trousers-0.3.15.ebuild 1597 BLAKE2B a402299093ac80756a929fd82b503c5ee718969fb4676a83d58a027ae3b2174bdc988d6a7e505ba64a5e9057143d7e2601e8698ca078bc2f8a4734aabc1d3c3d SHA512 1ff94752e3051e2d469e0f73f094ac7336b41b809cabaf8781925889da8f0d23bf52cabb9c0553c75c4a176a2351f58d8a32cba53acffff4ace5366ce913d29f
+EBUILD trousers-0.3.14-r3.ebuild 1580 BLAKE2B 7dcebd1140aee67cc63e4665afd2bb030bc44339ada7dcc6f9f5dbc2bd1f010c3eef573ae3ca35e8fbcf1450ce6e2a3539bc13479c3f5dbffcd81f96f774e107 SHA512 c62b0f19be4be398c94220be992c933595ed4c6182bf135458d8090695ed831be1f219ec778edf524dae7383e0b83f731bd829b57c7007f0535e0cba273fd827
+EBUILD trousers-0.3.15.ebuild 1504 BLAKE2B b7dc45d5813c0715e8250658a20848759645732a1028ed13313e71971b6c172708eeb6f729a07e788808da854b3873e78d64ad494f88e6bd3bac2fe6c7f63e3c SHA512 6ffc7fbf06f80fe96583f9cc9f42a4a88b84aa47e9110f8d548943c240ab13fd58cf416ac3d6b3b5ebaa6de6cd47d88e0f1a70c887ae9e0caf148b2fb55b9ff6
 MISC metadata.xml 541 BLAKE2B 11de571e9140dcd8c4b9c8778415d17c3c71a12f36ec96d74fa3f562d8d4f189a02e138a8ea9146d8df02e1e539237bf22a042f97c1b83e231f0302833d532e7 SHA512 4befaa1a46b211424a26034a22b068fc6443c66fd7ccc1dcef6657b86710cfbfc4533f5fd0f88484e463dc2f0d9f154248e07329455216a76c0f72b45e53d373
diff --git a/app-crypt/trousers/files/trousers-0.3.14-libressl.patch b/app-crypt/trousers/files/trousers-0.3.14-libressl.patch
deleted file mode 100644
index 9ee7c167e219..000000000000
--- a/app-crypt/trousers/files/trousers-0.3.14-libressl.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From b8b1cda430270f03dc556cf9cf7d2fd478101525 Mon Sep 17 00:00:00 2001
-From: Alon Bar-Lev <alon.barlev@gmail.com>
-Date: Wed, 7 Dec 2016 09:36:34 +0200
-Subject: [PATCH] tspi: support libressl
-
-Bug: https://sourceforge.net/p/trousers/bugs/222/
-
-Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
----
- src/trspi/crypto/openssl/rsa.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/trspi/crypto/openssl/rsa.c b/src/trspi/crypto/openssl/rsa.c
-index 2b1205f..3e56015 100644
---- a/src/trspi/crypto/openssl/rsa.c
-+++ b/src/trspi/crypto/openssl/rsa.c
-@@ -38,7 +38,7 @@
- #define DEBUG_print_openssl_errors()
- #endif
- 
--#if OPENSSL_VERSION_NUMBER < 0x10100001L
-+#if OPENSSL_VERSION_NUMBER < 0x10100001L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L)
- static int
- RSA_set0_key(RSA *r, BIGNUM *n, BIGNUM *e, BIGNUM *d)
- {
--- 
-2.7.3
-
diff --git a/app-crypt/trousers/files/trousers-0.3.15-libressl.patch b/app-crypt/trousers/files/trousers-0.3.15-libressl.patch
deleted file mode 100644
index e4aee00d8d97..000000000000
--- a/app-crypt/trousers/files/trousers-0.3.15-libressl.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 88e90ee4c36f0decdf7c15e271bccb8b0809a21a Mon Sep 17 00:00:00 2001
-From: Stefan Strogin <stefan@steils.org>
-Date: Tue, 24 Nov 2020 11:08:13 +0200
-Subject: [PATCH] trousers: do not re-declare RSA_set0_key with LibreSSL
-
-The method RSA_set0_key is provided by LibreSSL since 2.7.0, that means
-in all currently supported versions.
-
-Upstream-Status: Submitted
-[https://sourceforge.net/p/trousers/trousers/merge-requests/2/]
-Signed-off-by: Stefan Strogin <stefan@steils.org>
----
- src/trspi/crypto/openssl/rsa.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/trspi/crypto/openssl/rsa.c b/src/trspi/crypto/openssl/rsa.c
-index 24f13e7..cf46c08 100644
---- a/src/trspi/crypto/openssl/rsa.c
-+++ b/src/trspi/crypto/openssl/rsa.c
-@@ -38,7 +38,7 @@
- #define DEBUG_print_openssl_errors()
- #endif
- 
--#if (OPENSSL_VERSION_NUMBER < 0x10100001L) || defined(LIBRESSL_VERSION_NUMBER)
-+#if (OPENSSL_VERSION_NUMBER < 0x10100001L)
- static int
- RSA_set0_key(RSA *r, BIGNUM *n, BIGNUM *e, BIGNUM *d)
- {
--- 
-2.29.2
-
diff --git a/app-crypt/trousers/trousers-0.3.14-r3.ebuild b/app-crypt/trousers/trousers-0.3.14-r3.ebuild
index 70af34e9a2eb..72418a365fc0 100644
--- a/app-crypt/trousers/trousers-0.3.14-r3.ebuild
+++ b/app-crypt/trousers/trousers-0.3.14-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/trousers/${PN}/${P}.tar.gz"
 LICENSE="CPL-1.0 GPL-2"
 SLOT="0"
 KEYWORDS="amd64 arm arm64 ~m68k ~ppc ppc64 ~s390 x86"
-IUSE="doc libressl selinux" # gtk
+IUSE="doc selinux" # gtk
 
 # gtk support presently does NOT compile.
 #	gtk? ( >=x11-libs/gtk+-2 )
@@ -20,15 +20,14 @@ IUSE="doc libressl selinux" # gtk
 DEPEND="acct-group/tss
 	acct-user/tss
 	>=dev-libs/glib-2
-	!libressl? ( >=dev-libs/openssl-0.9.7:0= )
-	libressl? ( dev-libs/libressl:0= )"
+	>=dev-libs/openssl-0.9.7:0=
+	"
 RDEPEND="${DEPEND}
 	selinux? ( sec-policy/selinux-tcsd )"
 BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-0.3.13-nouseradd.patch"
-	"${FILESDIR}/${P}-libressl.patch"
 	"${FILESDIR}/${P}-fno-common.patch"
 	"${FILESDIR}/${P}-Makefile.am-Mark-tddl.a-nodist.patch"
 	"${FILESDIR}/${P}-tcsd-fixes.patch"
diff --git a/app-crypt/trousers/trousers-0.3.15.ebuild b/app-crypt/trousers/trousers-0.3.15.ebuild
index 041250710cb6..103c18d5498e 100644
--- a/app-crypt/trousers/trousers-0.3.15.ebuild
+++ b/app-crypt/trousers/trousers-0.3.15.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/trousers/${PN}/${P}.tar.gz"
 LICENSE="CPL-1.0 GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~m68k ~ppc ~ppc64 ~s390 ~x86"
-IUSE="doc libressl selinux" # gtk
+IUSE="doc selinux" # gtk
 
 # gtk support presently does NOT compile.
 #	gtk? ( >=x11-libs/gtk+-2 )
@@ -20,8 +20,8 @@ IUSE="doc libressl selinux" # gtk
 DEPEND="acct-group/tss
 	acct-user/tss
 	>=dev-libs/glib-2
-	!libressl? ( >=dev-libs/openssl-0.9.7:0= )
-	libressl? ( dev-libs/libressl:0= )"
+	>=dev-libs/openssl-0.9.7:0=
+	"
 RDEPEND="${DEPEND}
 	selinux? ( sec-policy/selinux-tcsd )"
 BDEPEND="virtual/pkgconfig"
@@ -29,7 +29,6 @@ BDEPEND="virtual/pkgconfig"
 PATCHES=(
 	"${FILESDIR}/${PN}-0.3.13-nouseradd.patch"
 	"${FILESDIR}/${PN}-0.3.14-Makefile.am-Mark-tddl.a-nodist.patch"
-	"${FILESDIR}/${P}-libressl.patch"
 )
 
 DOCS="AUTHORS ChangeLog NICETOHAVES README TODO"