commit: 1ee35fbdf88a3e5e0f67e95502574bc11e4c61d8 Author: Lucio Sauer <watermanpaint <AT> posteo <DOT> net> AuthorDate: Sun Jul 2 11:36:44 2023 +0000 Commit: Lucio Sauer <watermanpaint <AT> posteo <DOT> net> CommitDate: Sun Jul 2 12:11:36 2023 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=1ee35fbd
dev-libs/boringssl-fips: treeclean * BoringSSL is not fit to be installed system-wide: https://github.com/gentoo/guru/commit/a45331733cf318e1e81901bc64a64540afe2ad59#commitcomment-120138949 * Gentoo dev acknowledged this change on IRC: [12:31] colores: I'd like to fix the VisibleVcsPkg in dev-libs/* but I'm unsure about how to proceed with dev-libs/boringssl-fips. The authors explicitly discourage you from installing it system-wide (see https://github.com/gentoo/guru/commit/a45331733cf318e1e81901bc64a64540afe2ad59#commitcomment-120138949). Do I remove this package and it's revdeps? [12:58] + sam_: yes, it shouldn't even be packaged, really [12:58] + sam_: doe something depend on it, colores? Closes: https://bugs.gentoo.org/909504 Closes: https://bugs.gentoo.org/909505 Signed-off-by: Lucio Sauer <watermanpaint <AT> posteo.net> .../boringssl-fips/boringssl-fips-20230428.ebuild | 40 ---------------- .../files/boringssl-fips-remove-Werror.patch | 39 --------------- .../fix-boringssl-fips-collisions-openssl.patch | 55 ---------------------- dev-libs/boringssl-fips/metadata.xml | 11 ----- 4 files changed, 145 deletions(-) diff --git a/dev-libs/boringssl-fips/boringssl-fips-20230428.ebuild b/dev-libs/boringssl-fips/boringssl-fips-20230428.ebuild deleted file mode 100644 index 13dc204b3..000000000 --- a/dev-libs/boringssl-fips/boringssl-fips-20230428.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake go-module git-r3 - -EGIT_REPO_URI="https://github.com/google/boringssl"; -EGIT_BRANCH="fips-${PV}" - -DESCRIPTION="BoringSSL is a fork of OpenSSL that is designed to meet Google's needs." -HOMEPAGE="https://github.com/google/boringssl"; - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64" -IUSE="static-libs" - -DEPEND=" - dev-libs/openssl:=[static-libs=] -" - -PATCHES=( - "${FILESDIR}"/fix-${PN}-collisions-openssl.patch - "${FILESDIR}"/${PN}-remove-Werror.patch -) - -src_configure() { - local mycmakeargs=( - -DBUILD_SHARED_LIBS=$(usex !static-libs) - ) - cmake_src_configure -} - -pkg_preinst() { - mkdir -p ${D}/usr/lib64/boringssl/ - cp ${WORKDIR}/${PN}-${PV}_build/crypto/libcrypto.so ${D}/usr/lib64/boringssl/libcrypto.so - cp ${WORKDIR}/${PN}-${PV}_build/ssl/libssl.so ${D}/usr/lib64/boringssl/libssl.so - return -} diff --git a/dev-libs/boringssl-fips/files/boringssl-fips-remove-Werror.patch b/dev-libs/boringssl-fips/files/boringssl-fips-remove-Werror.patch deleted file mode 100644 index c8f839345..000000000 --- a/dev-libs/boringssl-fips/files/boringssl-fips-remove-Werror.patch +++ /dev/null @@ -1,39 +0,0 @@ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -139,7 +139,7 @@ set(CMAKE_C_STANDARD_REQUIRED ON) - if(CMAKE_COMPILER_IS_GNUCXX OR CLANG) - # Note clang-cl is odd and sets both CLANG and MSVC. We base our configuration - # primarily on our normal Clang one. -- set(C_CXX_FLAGS "-Werror -Wformat=2 -Wsign-compare -Wmissing-field-initializers -Wwrite-strings -Wvla -Wshadow -Wtype-limits") -+ set(C_CXX_FLAGS "-Wformat=2 -Wsign-compare -Wmissing-field-initializers -Wwrite-strings -Wvla -Wshadow -Wtype-limits") - if(MSVC) - # clang-cl sets different default warnings than clang. It also treats -Wall - # as -Weverything, to match MSVC. Instead -W3 is the alias for -Wall. ---- a/third_party/googletest/cmake/internal_utils.cmake -+++ b/third_party/googletest/cmake/internal_utils.cmake -@@ -82,13 +82,13 @@ macro(config_compiler_and_linker) - # http://stackoverflow.com/questions/3232669 explains the issue. - set(cxx_base_flags "${cxx_base_flags} -wd4702") - elseif (CMAKE_CXX_COMPILER_ID STREQUAL "Clang") -- set(cxx_base_flags "-Wall -Wshadow -Werror -Wconversion") -+ set(cxx_base_flags "-Wall -Wshadow -Wconversion") - set(cxx_exception_flags "-fexceptions") - set(cxx_no_exception_flags "-fno-exceptions") - set(cxx_strict_flags "-W -Wpointer-arith -Wreturn-type -Wcast-qual -Wwrite-strings -Wswitch -Wunused-parameter -Wcast-align -Wchar-subscripts -Winline -Wredundant-decls") - set(cxx_no_rtti_flags "-fno-rtti") - elseif (CMAKE_COMPILER_IS_GNUCXX) -- set(cxx_base_flags "-Wall -Wshadow -Werror") -+ set(cxx_base_flags "-Wall -Wshadow") - if(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 7.0.0) - set(cxx_base_flags "${cxx_base_flags} -Wno-error=dangling-else") - endif() ---- a/util/BUILD.toplevel -+++ b/util/BUILD.toplevel -@@ -78,7 +78,6 @@ gcc_copts = [ - - # This list of warnings should match those in the top-level CMakeLists.txt. - "-Wall", -- "-Werror", - "-Wformat=2", - "-Wsign-compare", - "-Wmissing-field-initializers", diff --git a/dev-libs/boringssl-fips/files/fix-boringssl-fips-collisions-openssl.patch b/dev-libs/boringssl-fips/files/fix-boringssl-fips-collisions-openssl.patch deleted file mode 100644 index ce26756a5..000000000 --- a/dev-libs/boringssl-fips/files/fix-boringssl-fips-collisions-openssl.patch +++ /dev/null @@ -1,55 +0,0 @@ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -589,11 +589,11 @@ add_custom_target( - DEPENDS all_tests bssl_shim handshaker fips_specific_tests_if_any - USES_TERMINAL) - --install_if_enabled(DIRECTORY include/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) -+install_if_enabled(DIRECTORY include/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/boringssl) - --install_if_enabled(EXPORT OpenSSLTargets -- FILE OpenSSLTargets.cmake -- NAMESPACE OpenSSL:: -- DESTINATION lib/cmake/OpenSSL --) -+#install_if_enabled(EXPORT OpenSSLTargets -+# FILE OpenSSLTargets.cmake -+# NAMESPACE OpenSSL:: -+# DESTINATION lib/cmake/OpenSSL -+#) - install_if_enabled(FILES cmake/OpenSSLConfig.cmake DESTINATION lib/cmake/OpenSSL) ---- a/crypto/CMakeLists.txt -+++ b/crypto/CMakeLists.txt -@@ -304,8 +304,8 @@ target_include_directories(crypto PUBLIC - $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include> - $<INSTALL_INTERFACE:include> - ) --install_if_enabled(TARGETS crypto EXPORT OpenSSLTargets ${INSTALL_DESTINATION_DEFAULT}) --set_property(TARGET crypto PROPERTY EXPORT_NAME Crypto) -+#install_if_enabled(TARGETS crypto EXPORT OpenSSLTargets ${INSTALL_DESTINATION_DEFAULT}) -+#set_property(TARGET crypto PROPERTY EXPORT_NAME Crypto) - - if(FIPS_SHARED) - # Rewrite libcrypto.so to inject the correct module hash value. This assumes ---- a/ssl/CMakeLists.txt -+++ b/ssl/CMakeLists.txt -@@ -42,8 +42,8 @@ add_library( - # Although libssl also provides headers that require an include directory, the - # flag is already specified by libcrypto, so we omit target_include_directories - # here. --install_if_enabled(TARGETS ssl EXPORT OpenSSLTargets ${INSTALL_DESTINATION_DEFAULT}) --set_property(TARGET ssl PROPERTY EXPORT_NAME SSL) -+#install_if_enabled(TARGETS ssl EXPORT OpenSSLTargets ${INSTALL_DESTINATION_DEFAULT}) -+#set_property(TARGET ssl PROPERTY EXPORT_NAME SSL) - target_link_libraries(ssl crypto) - - add_executable( ---- a/tool/CMakeLists.txt -+++ b/tool/CMakeLists.txt -@@ -19,5 +19,5 @@ add_executable( - tool.cc - transport_common.cc - ) --install_if_enabled(TARGETS bssl DESTINATION ${INSTALL_DESTINATION_DEFAULT}) -+#install_if_enabled(TARGETS bssl DESTINATION ${INSTALL_DESTINATION_DEFAULT}) - target_link_libraries(bssl ssl crypto) diff --git a/dev-libs/boringssl-fips/metadata.xml b/dev-libs/boringssl-fips/metadata.xml deleted file mode 100644 index 9fb86730d..000000000 --- a/dev-libs/boringssl-fips/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> - <maintainer type="person"> - <email>[email protected]</email> - <name>Okamura Kazuya</name> - </maintainer> - <upstream> - <remote-id type="github">google/boringssl</remote-id> - </upstream> -</pkgmetadata>
