Revert to d4a92c1a5cad30101b668941d87f0dac

as in devel project prior to import

0006-gcc-disable-werror.patch

@@ -0,0 +1,19 @@
+commit 225886dff82c04b5f689e7fb57d75c9ec18b45d1
+Author: Jeff Kowalczyk <jkowalczyk@suse.com>
+Date:   Mon Mar 31 12:26:24 2025 -0700
+
+    0006-gcc-disable-werror.patch
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 4d6f30e..76a3723 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -117,7 +117,7 @@ endif()
+ 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")
++  set(C_CXX_FLAGS "-Wformat=2 -Wsign-compare -Wmissing-field-initializers -Wwrite-strings -Wvla")
+   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.

0007-fix-go-vendor-embed_test_data.patch

@@ -0,0 +1,20 @@
+commit 84b3970a1a7fa419f305a833effbedb3e53690b7
+Author: Jeff Kowalczyk <jkowalczyk@suse.com>
+Date:   Mon Mar 31 08:40:57 2025 -0700
+
+    0007-fix-go-vendor-embed_test_data.patch
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 76a3723..fb2c801 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -585,7 +585,8 @@ file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/embed_test_data_args.txt"
+ 
+ add_custom_command(
+   OUTPUT crypto_test_data.cc
+-  COMMAND ${GO_EXECUTABLE} run util/embed_test_data.go -file-list
++  COMMAND ${GO_EXECUTABLE} build -mod=vendor util/embed_test_data.go
++  COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/embed_test_data -file-list
+           "${CMAKE_CURRENT_BINARY_DIR}/embed_test_data_args.txt" >
+           "${CMAKE_CURRENT_BINARY_DIR}/crypto_test_data.cc"
+   DEPENDS util/embed_test_data.go ${CRYPTO_TEST_DATA}

0008-fix-go-vendor-err_data_generate.patch

@@ -0,0 +1,20 @@
+commit 05f4d459a1c3495918585d5bc3531f55b12baca7
+Author: Jeff Kowalczyk <jkowalczyk@suse.com>
+Date:   Mon Mar 31 14:25:59 2025 -0700
+
+    0008-fix-go-vendor-err_data_generate.patch
+
+diff --git a/crypto/CMakeLists.txt b/crypto/CMakeLists.txt
+index c06cbb7..0a5a2b7 100644
+--- a/crypto/CMakeLists.txt
++++ b/crypto/CMakeLists.txt
+@@ -167,7 +167,8 @@ perlasm(test/trampoline-x86_64.${ASM_EXT} test/asm/trampoline-x86_64.pl)
+ 
+ add_custom_command(
+   OUTPUT err_data.c
+-  COMMAND ${GO_EXECUTABLE} run err_data_generate.go > ${CMAKE_CURRENT_BINARY_DIR}/err_data.c
++  COMMAND ${GO_EXECUTABLE} build -mod=vendor err_data_generate.go
++  COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/err/err_data_generate > ${CMAKE_CURRENT_BINARY_DIR}/err_data.c
+   DEPENDS
+   err/err_data_generate.go
+   err/asn1.errordata

0009-soname-sover.patch

@@ -0,0 +1,217 @@
+commit ffa90ddfe8ed4436f0893f28d29a7b66d6f1f6b0
+Author: Jeff Kowalczyk <jkowalczyk@suse.com>
+Date:   Fri Feb 28 14:57:46 2025 -0800
+
+    0009-soname-sover.patch
+
+diff --git a/crypto/CMakeLists.txt b/crypto/CMakeLists.txt
+index 0a5a2b7..99a1306 100644
+--- a/crypto/CMakeLists.txt
++++ b/crypto/CMakeLists.txt
+@@ -198,7 +198,7 @@ add_custom_command(
+ )
+ 
+ add_library(
+-  crypto
++  boringssl_crypto
+ 
+   asn1/a_bitstr.c
+   asn1/a_bool.c
+@@ -443,7 +443,7 @@ if(FIPS_SHARED)
+   # Rewrite libcrypto.so to inject the correct module hash value. This assumes
+   # UNIX-style library naming, but we only support FIPS mode on Linux anyway.
+   add_custom_command(
+-    TARGET crypto POST_BUILD
++    TARGET boringssl_crypto POST_BUILD
+     COMMAND ${GO_EXECUTABLE} run
+     ${CMAKE_CURRENT_SOURCE_DIR}/../util/fipstools/inject_hash/inject_hash.go
+     -o libcrypto.so -in-object libcrypto.so ${EXTRA_INJECT_HASH_ARGS}
+@@ -455,22 +455,22 @@ if(FIPS_SHARED)
+   )
+ endif()
+ 
+-add_dependencies(crypto global_target)
++add_dependencies(boringssl_crypto global_target)
+ 
+ if(FIPS_DELOCATE OR FIPS_SHARED)
+-  add_dependencies(crypto bcm_o_target)
++  add_dependencies(boringssl_crypto bcm_o_target)
+ endif()
+ 
+-SET_TARGET_PROPERTIES(crypto PROPERTIES LINKER_LANGUAGE C)
++SET_TARGET_PROPERTIES(boringssl_crypto PROPERTIES LINKER_LANGUAGE C)
+ 
+ if(NOT WIN32 AND NOT ANDROID)
+-  target_link_libraries(crypto pthread)
++  target_link_libraries(boringssl_crypto pthread)
+ endif()
+ 
+ # Every target depends on crypto, so we add libcxx as a dependency here to
+ # simplify injecting it everywhere.
+ if(USE_CUSTOM_LIBCXX)
+-  target_link_libraries(crypto libcxx)
++  target_link_libraries(boringssl_crypto libcxx)
+ endif()
+ 
+ # urandom_test is a separate binary because it needs to be able to observe the
+@@ -482,11 +482,13 @@ add_executable(
+   fipsmodule/rand/urandom_test.cc
+ )
+ 
+-target_link_libraries(urandom_test test_support_lib boringssl_gtest crypto)
++target_link_libraries(urandom_test test_support_lib boringssl_gtest boringssl_crypto)
+ 
+ add_dependencies(urandom_test global_target)
+ add_dependencies(all_tests urandom_test)
+ 
++set_target_properties(boringssl_crypto PROPERTIES SOVERSION 1)
++
+ add_executable(
+   crypto_test
+ 
+@@ -560,7 +562,7 @@ add_executable(
+ 
+ add_dependencies(crypto_test global_target)
+ 
+-target_link_libraries(crypto_test test_support_lib boringssl_gtest crypto)
++target_link_libraries(crypto_test test_support_lib boringssl_gtest boringssl_crypto)
+ if(WIN32)
+   target_link_libraries(crypto_test ws2_32)
+ endif()
+diff --git a/decrepit/CMakeLists.txt b/decrepit/CMakeLists.txt
+index ef95a6b..d1ef907 100644
+--- a/decrepit/CMakeLists.txt
++++ b/decrepit/CMakeLists.txt
+@@ -24,7 +24,7 @@ add_library(
+ 
+ add_dependencies(decrepit global_target)
+ 
+-target_link_libraries(decrepit crypto ssl)
++target_link_libraries(decrepit boringssl_crypto boringssl_ssl)
+ 
+ add_executable(
+   decrepit_test
+@@ -41,7 +41,7 @@ add_executable(
+ add_dependencies(decrepit_test global_target)
+ 
+ target_link_libraries(decrepit_test test_support_lib boringssl_gtest decrepit
+-                      crypto)
++                      boringssl_crypto)
+ if(WIN32)
+   target_link_libraries(decrepit_test ws2_32)
+ endif()
+diff --git a/fuzz/CMakeLists.txt b/fuzz/CMakeLists.txt
+index 62652cb..7aabbc4 100644
+--- a/fuzz/CMakeLists.txt
++++ b/fuzz/CMakeLists.txt
+@@ -5,7 +5,7 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-missing-prototypes")
+ macro(fuzzer name)
+   add_executable(${name} ${name}.cc)
+   add_dependencies(${name} global_target)
+-  target_link_libraries(${name} crypto ${ARGN})
++  target_link_libraries(${name} boringssl_crypto ${ARGN})
+   if(LIBFUZZER_FROM_DEPS)
+     set_target_properties(${name} PROPERTIES LINK_FLAGS "-fsanitize=fuzzer-no-link")
+     target_link_libraries(${name} Fuzzer)
+diff --git a/ssl/CMakeLists.txt b/ssl/CMakeLists.txt
+index 38c686b..fa086c0 100644
+--- a/ssl/CMakeLists.txt
++++ b/ssl/CMakeLists.txt
+@@ -1,7 +1,7 @@
+ include_directories(../include)
+ 
+ add_library(
+-  ssl
++  boringssl_ssl
+ 
+   bio_ssl.cc
+   d1_both.cc
+@@ -42,9 +42,11 @@ add_library(
+   tls13_server.cc
+ )
+ 
+-add_dependencies(ssl global_target)
++add_dependencies(boringssl_ssl global_target)
+ 
+-target_link_libraries(ssl crypto)
++target_link_libraries(boringssl_ssl boringssl_crypto)
++
++set_target_properties(boringssl_ssl PROPERTIES SOVERSION 1)
+ 
+ add_executable(
+   ssl_test
+@@ -58,7 +60,7 @@ add_executable(
+ 
+ add_dependencies(ssl_test global_target)
+ 
+-target_link_libraries(ssl_test test_support_lib boringssl_gtest ssl crypto)
++target_link_libraries(ssl_test test_support_lib boringssl_gtest boringssl_ssl boringssl_crypto)
+ if(WIN32)
+   target_link_libraries(ssl_test ws2_32)
+ endif()
+diff --git a/ssl/test/CMakeLists.txt b/ssl/test/CMakeLists.txt
+index bb9bd81..c9e353d 100644
+--- a/ssl/test/CMakeLists.txt
++++ b/ssl/test/CMakeLists.txt
+@@ -15,7 +15,7 @@ add_executable(
+ 
+ add_dependencies(bssl_shim global_target)
+ 
+-target_link_libraries(bssl_shim test_support_lib ssl crypto)
++target_link_libraries(bssl_shim test_support_lib boringssl_ssl boringssl_crypto)
+ 
+ if(UNIX AND NOT APPLE AND NOT ANDROID)
+   add_executable(
+@@ -33,7 +33,7 @@ if(UNIX AND NOT APPLE AND NOT ANDROID)
+ 
+   add_dependencies(handshaker global_target)
+ 
+-  target_link_libraries(handshaker test_support_lib ssl crypto)
++  target_link_libraries(handshaker test_support_lib boringssl_ssl boringssl_crypto)
+ else()
+   # Declare a dummy target for run_tests to depend on.
+   add_custom_target(handshaker)
+diff --git a/tool/CMakeLists.txt b/tool/CMakeLists.txt
+index e9e387b..ae82517 100644
+--- a/tool/CMakeLists.txt
++++ b/tool/CMakeLists.txt
+@@ -28,12 +28,12 @@ if(WIN32)
+ endif()
+ 
+ if(APPLE OR WIN32 OR ANDROID)
+-  target_link_libraries(bssl ssl crypto)
++  target_link_libraries(bssl boringssl_ssl boringssl_crypto)
+ else()
+   find_library(FOUND_LIBRT rt)
+   if(FOUND_LIBRT)
+-    target_link_libraries(bssl ssl crypto -lrt)
++    target_link_libraries(bssl boringssl_ssl boringssl_crypto -lrt)
+   else()
+-    target_link_libraries(bssl ssl crypto)
++    target_link_libraries(bssl boringssl_ssl boringssl_crypto)
+   endif()
+ endif()
+diff --git a/util/fipstools/acvp/modulewrapper/CMakeLists.txt b/util/fipstools/acvp/modulewrapper/CMakeLists.txt
+index 267f82c..af6950b 100644
+--- a/util/fipstools/acvp/modulewrapper/CMakeLists.txt
++++ b/util/fipstools/acvp/modulewrapper/CMakeLists.txt
+@@ -10,5 +10,5 @@ if(FIPS)
+ 
+   add_dependencies(modulewrapper global_target)
+ 
+-  target_link_libraries(modulewrapper crypto)
++  target_link_libraries(modulewrapper boringssl_crypto)
+ endif()
+diff --git a/util/fipstools/cavp/CMakeLists.txt b/util/fipstools/cavp/CMakeLists.txt
+index a50c9ab..b3142e4 100644
+--- a/util/fipstools/cavp/CMakeLists.txt
++++ b/util/fipstools/cavp/CMakeLists.txt
+@@ -37,6 +37,6 @@ if(FIPS)
+ 
+   add_dependencies(test_fips global_target)
+ 
+-  target_link_libraries(cavp test_support_lib crypto)
+-  target_link_libraries(test_fips test_support_lib crypto)
++  target_link_libraries(cavp test_support_lib boringssl_crypto)
++  target_link_libraries(test_fips test_support_lib boringssl_crypto)
+ endif()

_service

@@ -4,7 +4,7 @@
     <param name="scm">git</param>
     <param name="changesgenerate">enable</param>
     <param name="filename">boringssl</param>
-    <param name="versionformat">%cd</param>
+    <param name="versionformat">0.%cd</param>
     <param name="revision">1ce6682c7f6cfe0426ed54a37c10775bea9d3502</param>
   </service>
   <service mode="disabled" name="recompress">

boringssl-20200921.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:06c23874008d413073f4ffd8330574e8a5265a8f31609f7400a84f5a695bce9a
-size 27974920

boringssl.changes

@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Sun Oct 27 20:24:10 UTC 2024 - Fridrich Strba <fstrba@suse.com>
+
+- Change version of the sources to 0.%%cd to avoid problems when
+  upgrading if the versioning changes.
+- Added patch:
+  * soname-sover.patch
+    + Replace patchelf run with patch that makes cmake produce the
+      shared libraries with the right SONAME and SOVER.
+- Remove unnecessary dependencies on go, patchelf, ninja and
+  libunwind, since they are only needed for tests we are not
+  running
+
 -------------------------------------------------------------------
 Fri Feb  9 08:08:42 UTC 2024 - Otto Hollmann <otto.hollmann@suse.com>
 

boringssl.spec

@@ -20,7 +20,7 @@
 %define libname libboringssl%{sover}
 %define src_install_dir /usr/src/%{name}
 Name:           boringssl
-Version:        20200921
+Version:        0.20200921
 Release:        0
 Summary:        An SSL/TLS protocol implementation
 License:        OpenSSL
@@ -32,13 +32,10 @@ Patch1:         0003-enable-s390x-builds.patch
 Patch2:         0004-fix-alignment-for-ppc64le.patch
 Patch3:         0005-fix-alignment-for-arm.patch
 Patch4:         0001-Compile-for-RISC-V.patch
+Patch5:         soname-sover.patch
 BuildRequires:  cmake >= 3.0
 BuildRequires:  fdupes
 BuildRequires:  gcc-c++
-BuildRequires:  go
-BuildRequires:  libunwind-devel
-BuildRequires:  ninja
-BuildRequires:  patchelf
 ExclusiveArch:  %{ix86} x86_64 aarch64 s390x ppc64le %arm riscv64
 
 %description
@@ -85,11 +82,8 @@ Source files for BoringSSL implementation
 
 %install
 # Install libraries
-install -D -m0755 build/libcrypto.so %{buildroot}%{_libdir}/libboringssl_crypto.so.%{sover}
+install -D -m0755 build/libboringssl_crypto.so.%{sover} %{buildroot}%{_libdir}/libboringssl_crypto.so.%{sover}
-install -D -m0755 build/libssl.so %{buildroot}%{_libdir}/libboringssl_ssl.so.%{sover}
+install -D -m0755 build/libboringssl_ssl.so.%{sover} %{buildroot}%{_libdir}/libboringssl_ssl.so.%{sover}
-# Add SOVER to SONAME fields in libraries
-patchelf --set-soname libboringssl_crypto.so.%{sover} %{buildroot}%{_libdir}/libboringssl_crypto.so.%{sover}
-patchelf --set-soname libboringssl_ssl.so.%{sover} %{buildroot}%{_libdir}/libboringssl_ssl.so.%{sover}
 # Create links from *.so to *.so.SOVER
 ln -sf libboringssl_crypto.so.%{sover} %{buildroot}%{_libdir}/libboringssl_crypto.so
 ln -sf libboringssl_ssl.so.%{sover} %{buildroot}%{_libdir}/libboringssl_ssl.so

soname-sover.patch

@@ -0,0 +1,46 @@
+diff -urEbwB boringssl-20200921.orig/CMakeLists.txt boringssl-20200921/CMakeLists.txt
+--- boringssl-20200921.orig/CMakeLists.txt	2024-10-27 21:00:08.071155909 +0100
++++ boringssl-20200921/CMakeLists.txt	2024-10-27 21:10:35.549252602 +0100
+@@ -342,7 +342,7 @@
+ endif()
+ 
+ add_library(
+-  crypto
++  boringssl_crypto
+ 
+   ${CRYPTO_ARCH_SOURCES}
+   err_data.c
+@@ -577,8 +577,10 @@
+   src/crypto/x509v3/v3_utl.c
+ )
+ 
++set_target_properties(boringssl_crypto PROPERTIES SOVERSION 1)
++
+ add_library(
+-  ssl
++  boringssl_ssl
+ 
+   src/ssl/bio_ssl.cc
+   src/ssl/d1_both.cc
+@@ -618,6 +620,8 @@
+   src/ssl/tls_record.cc
+ )
+ 
++set_target_properties(boringssl_ssl PROPERTIES SOVERSION 1)
++
+ add_executable(
+   bssl
+ 
+@@ -639,10 +643,10 @@
+   src/tool/transport_common.cc
+ )
+ 
+-target_link_libraries(bssl ssl crypto)
++target_link_libraries(bssl boringssl_ssl boringssl_crypto)
+ 
+ if(NOT WIN32 AND NOT ANDROID)
+-  target_link_libraries(crypto pthread)
++  target_link_libraries(boringssl_crypto pthread)
+ endif()
+ 
+ if(WIN32)

vendor.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:124cf487b9db20d403ed9803b56ae0ff7ff51b38938ae8963e1ccd381b552a54
+size 1335422