From c2b9d9449610c3bad0f1e8644385869e000b4456 Mon Sep 17 00:00:00 2001 From: Sandino Araico Sanchez Date: Wed, 20 Jun 2018 00:16:42 -0500 Subject: [PATCH] libressl-2.6.5-r100 --- dev-libs/libressl/Manifest | 3 + .../files/libressl-2.6.4-hppa-asm.patch | 62 +++++++++++++++++++ ....6.5.ebuild => libressl-2.6.5-r100.ebuild} | 4 +- 3 files changed, 66 insertions(+), 3 deletions(-) create mode 100644 dev-libs/libressl/files/libressl-2.6.4-hppa-asm.patch rename dev-libs/libressl/{libressl-2.6.5.ebuild => libressl-2.6.5-r100.ebuild} (90%) diff --git a/dev-libs/libressl/Manifest b/dev-libs/libressl/Manifest index 4df5703..bd19177 100644 --- a/dev-libs/libressl/Manifest +++ b/dev-libs/libressl/Manifest @@ -1,5 +1,6 @@ AUX libressl-2.2.4-clientcert.patch 1387 BLAKE2B aac223b0b8159c81f46d5b7005ef6ea419d39f5983b2aec751ef24e5582c5e69dce236f94372e6450d794d84bc66c589e528a0b5b846ebdf93bc049150228424 SHA512 411c50b5bf9bdeba022f6181d8395b571842625962d5d6f4467cde8b1e87156cea8b33416cfc1c537c0fb19fad7e7c7fb3a542045e84e5af0c80116259446554 AUX libressl-2.6.4-getrandom.patch 1583 BLAKE2B adee7f53d43f1c40f363a72e603f1f83d6aeee7b97424768c0470b27d069c14279b45d5ec5b2ead6c49fb94b19d8aadfae14fe50af7b719e6fe1c4e85c5af53c SHA512 3aa1df08ed3aa3d43e11c7d94a8cbe10a4644d295ce6d5537ccc8559e6b0a78b695113bfdf1b83109c9a438a690c9bbf08e0cd005b0f08c9b3ab5b0f5e46c872 +AUX libressl-2.6.4-hppa-asm.patch 2236 BLAKE2B 508555aa87f763c7cc39cf1cbd2ae5692d7c33315b08e4527db61a878cb5373e6856669e8185b7c49ab82e3f7c01034c1496c639d3a46d605c39170f3f1ce32d SHA512 b49da63109f4b0d471402c07df927b1aba60f94e263376919206fac9a4dddb9a10c4c0004836b2c00a560eb59dcde71bd6b4aba45d966a3e0b2fba79f7277a3e DIST libressl-2.5.4.tar.gz 3286042 BLAKE2B 0e0220b4ad0bf13c4e705fd3fad851a9387b0ac938099c71557f0229d69c2973a729a5bedad758a78a5c0cd258ac9a20fa0ec2dc80c2fafb6c87a5f5b5b1fc36 SHA512 8ca86c14af0020c90bef4651892799864938dab9d898172269cb78bad5963314e064f2b4c46e6a04e0b85d1eddbd1840b734803c11ceec8fd6bb1290e0fe204c DIST libressl-2.5.5.tar.gz 3283158 BLAKE2B d8a6c6f663d728daa165395302981f5777987b0d9522283bca278a9107e57067af19235b228555c9ed1c04009140d5de1c51b1419723ea368f4b585878310ed0 SHA512 3f576e74ddea17bd72e1bfbe0b57b94e1a2a9e6fa56cee50624cd8d18f0a8674273086225669e6ece56e6b859d2376e36e2c140d37acb52d4cd79374c4ba7096 DIST libressl-2.6.0.tar.gz 3297288 BLAKE2B 8906227a1d125e32afafb666e67c1364d764234d6a3c389c59f820cb5d778133811cc4be06de948fe6375e36ceddd061e1736e3b0fe3511e8807f5cb9fddc978 SHA512 e195c6a2c9680cfaaca31bb6d3392fc6f725efd2a2d18b9a24d457d035a581c88630e6a066a4a4e0903e71f3ae3c30a031eb4f58281e483fdf1d877227452e9a @@ -7,6 +8,7 @@ DIST libressl-2.6.1.tar.gz 3219005 BLAKE2B ca5c1b2f1c824f9faf26cf335a533b98a9af4 DIST libressl-2.6.2.tar.gz 3229140 BLAKE2B 65ee69ac9d5754a153ed8e9ca20240cf6d584093731a0fc53fc847f6c2a6516fa709f347ef58059a3dfde7a6013cef0188d6632a15ace172f6a371f1fcdb7756 SHA512 2896d52185b84edfb23eae73949f5a537966b42e659f00b0b2e0635e69daf546fc41e0e7b97cb52a85e73b2d27ead221a3225977f6b5ee998aefdabf0908a9e4 DIST libressl-2.6.3.tar.gz 3228661 BLAKE2B 01d1e09a5c4541e1d6b35d0a1cd9246671a7cda404c9818885cce55897dd405585a656b748ca6c959224b7d6155c20700fb4a92c37af42429959162a7ad8fb87 SHA512 5c0a0f86ecad1226c2d9a3a8a2e6f412ac0941d402c213ae1d293cd90c6a684198410db8c5250f83b8e2b00968a089afc39e90e053669fc27f82a4eb7c65f5c9 DIST libressl-2.6.4.tar.gz 3227935 BLAKE2B 48e865448a9e5b0b604b06060091073276aebd376506de73773a5eb9cb0bb4c5b93aa16353b4892abaee97ec933ad77e89775c3f52263d77bb17c68e481b4f70 SHA512 181761da573ff392aaee17dd3dde416d7cbb299ab3e07b49c97e279ceb3f619e78d1dc9ec4c59b0af024f0a8270ff31fe37f8282d0392be34c3143c9647cd246 +DIST libressl-2.6.5.tar.gz 3225481 BLAKE2B fcdf0d8b4b68fdb6c17299f4b9897c84f51ec3407abc6c1bf8d474c4424161c563667ca1fb26c45dd20a0e895457e9210b7bd0539581472b94d594cc32a68191 SHA512 0601c73bb5c3d149df7eca3566831f1b35713aa16a15788a291922fce0bffa1ba0bc6ea9cac1fcecfd980009f2292b08b2a57d66b517fc1bc8c7364a24dbbd9d EBUILD libressl-2.5.4-r100.ebuild 1295 BLAKE2B 62afb0c600956c3094a7fe1d3da9d583568ffbc768e5586dfe268b0547b9cca9b29815fb6027b05245214c48c236730b30ea43dc75afb411d469cbdabcd0bcef SHA512 805e6f0bc9170570dba7702a1e890986e42ccd045768eeba023fa499132ed427c0eee11ea9f8fd298f33cf319121e4e1a33c78663ca8233be74372a02f13bc91 EBUILD libressl-2.5.5-r100.ebuild 1295 BLAKE2B 62afb0c600956c3094a7fe1d3da9d583568ffbc768e5586dfe268b0547b9cca9b29815fb6027b05245214c48c236730b30ea43dc75afb411d469cbdabcd0bcef SHA512 805e6f0bc9170570dba7702a1e890986e42ccd045768eeba023fa499132ed427c0eee11ea9f8fd298f33cf319121e4e1a33c78663ca8233be74372a02f13bc91 EBUILD libressl-2.6.0-r100.ebuild 1295 BLAKE2B 62afb0c600956c3094a7fe1d3da9d583568ffbc768e5586dfe268b0547b9cca9b29815fb6027b05245214c48c236730b30ea43dc75afb411d469cbdabcd0bcef SHA512 805e6f0bc9170570dba7702a1e890986e42ccd045768eeba023fa499132ed427c0eee11ea9f8fd298f33cf319121e4e1a33c78663ca8233be74372a02f13bc91 @@ -15,3 +17,4 @@ EBUILD libressl-2.6.2-r100.ebuild 1295 BLAKE2B 62afb0c600956c3094a7fe1d3da9d5835 EBUILD libressl-2.6.3-r100.ebuild 1356 BLAKE2B db26a717bdcce836279cb11c93bd4405ac9cf84086ce79d90fd4d8dd63b72a19713526da4a53cf32c38d62c4ad62309e9b74ee84077113da9899e4aaaf70d495 SHA512 eedfe387bf37713efe6b27e874daa673763fe479774d0263dcad52dd8ccc9b8a98f79c208d243b0707fbc6b3d24cee2213e9297825a42ea3522d2e07043fbf3c EBUILD libressl-2.6.4-r100.ebuild 1356 BLAKE2B db26a717bdcce836279cb11c93bd4405ac9cf84086ce79d90fd4d8dd63b72a19713526da4a53cf32c38d62c4ad62309e9b74ee84077113da9899e4aaaf70d495 SHA512 eedfe387bf37713efe6b27e874daa673763fe479774d0263dcad52dd8ccc9b8a98f79c208d243b0707fbc6b3d24cee2213e9297825a42ea3522d2e07043fbf3c EBUILD libressl-2.6.4-r101.ebuild 1377 BLAKE2B d9083965ee68b7cbcfda4e86a4c8f5abdc19878de4f0bc3a9625a4ce4ef71377cfd068c97b6304c5d12e4aa6dd27ffd5031a99b31510f883b778cc6f303a48d4 SHA512 b522a20ac79205d3ba1817a3478903da8f0bbab4015bb26cc1611f74a33f61c7cbc271fc28de1faa29dc45cbd542c7bc47e971d25c7c3a65ddbce1dc0a19d79b +EBUILD libressl-2.6.5-r100.ebuild 1388 BLAKE2B 226bbbcb25443acb46997c4c3dc2b302efe1797a339acbc28223c603625f7c014afd6b1f77e302ef7abff0c95ef5027276b419bdc900564880e4fd28ff54a454 SHA512 50d160d31444602e1f3b77afb889a333ce853395ea27d43dbfc3a4d2e2fe04d0d0714592511511fcc967b81a8ca4bdb3946fe2fefec435bcd76c7d0d6d14a96b diff --git a/dev-libs/libressl/files/libressl-2.6.4-hppa-asm.patch b/dev-libs/libressl/files/libressl-2.6.4-hppa-asm.patch new file mode 100644 index 0000000..a0922af --- /dev/null +++ b/dev-libs/libressl/files/libressl-2.6.4-hppa-asm.patch @@ -0,0 +1,62 @@ +From 787d8d240bbeaa812bcf37deeedb3c467be468a3 Mon Sep 17 00:00:00 2001 +From: Sergei Trofimovich +Date: Sat, 19 May 2018 17:31:42 +0100 +Subject: [PATCH] __warn_references: tweak assembly for "gnu.warning" section + +On some targets ';' (like hppa) is treated as a comment +in assembly files. This occasionally causes the following +assembly failures: + +``` +Error: can't resolve `.gnu.warning.EVP_DecryptFinal' +{.gnu.warning.EVP_DecryptFinal section} - `.Ltext0' {.text section} +``` + +Note how branch (or other reference) attempts to cross the +boundary across two section types: '.text' and '.gnu.warning'. + +Tobias Ulmer notes that openbsd already uses newlines +for similar macro: + +https://github.com/openbsd/src/blob/master/sys/arch/hppa/include/cdefs.h + +This change switches from ';' to newline as well. +Tested on hppa2.0 and x86_64. + +Reported-by: Jeroen Roovers +Bug: https://bugs.gentoo.org/656104 +Signed-off-by: Sergei Trofimovich +--- + configure.ac | 2 +- + include/compat/sys/types.h | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index b74b8a1..16ed825 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -91,7 +91,7 @@ AM_CONDITIONAL([HOST_CPU_IS_INTEL], [test "x$HOSTARCH" = "xintel"]) + AC_MSG_CHECKING([if .gnu.warning accepts long strings]) + AC_LINK_IFELSE([AC_LANG_SOURCE([[ + extern void SSLv3_method(); +-__asm__(".section .gnu.warning.SSLv3_method; .ascii \"SSLv3_method is insecure\" ; .text"); ++__asm__(".section .gnu.warning.SSLv3_method\n\t.ascii \"SSLv3_method is insecure\"\n\t.text"); + int main() {return 0;} + ]])], [ + AC_DEFINE(HAS_GNU_WARNING_LONG, 1, [Define if .gnu.warning accepts long strings.]) +diff --git a/include/compat/sys/types.h b/include/compat/sys/types.h +index 2107119..dec09e3 100644 +--- a/include/compat/sys/types.h ++++ b/include/compat/sys/types.h +@@ -62,7 +62,7 @@ typedef SSIZE_T ssize_t; + #if defined(__GNUC__) && defined (HAS_GNU_WARNING_LONG) + #define __warn_references(sym,msg) \ + __asm__(".section .gnu.warning." __STRING(sym) \ +- " ; .ascii \"" msg "\" ; .text"); ++ "\n\t.ascii \"" msg "\"\n\t.text"); + #else + #define __warn_references(sym,msg) + #endif +-- +2.17.0 + diff --git a/dev-libs/libressl/libressl-2.6.5.ebuild b/dev-libs/libressl/libressl-2.6.5-r100.ebuild similarity index 90% rename from dev-libs/libressl/libressl-2.6.5.ebuild rename to dev-libs/libressl/libressl-2.6.5-r100.ebuild index ea6984e..d754354 100644 --- a/dev-libs/libressl/libressl-2.6.5.ebuild +++ b/dev-libs/libressl/libressl-2.6.5-r100.ebuild @@ -14,12 +14,10 @@ LICENSE="ISC openssl" # 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 ~s390 sparc x86" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86" IUSE="+asm static-libs test" REQUIRED_USE="test? ( static-libs )" -RDEPEND="!dev-libs/openssl:0" -DEPEND="${RDEPEND}" PDEPEND="app-misc/ca-certificates" PATCHES=( "${FILESDIR}/libressl-2.6.4-hppa-asm.patch" )