[gentoo-commits] repo/proj/guru:master commit in: net-p2p/feather/files/

[gentoo-commits] repo/proj/guru:master commit in: net-p2p/feather/files/

[Viorel Munteanu]

commit:     ef4c67eac4e08df6aa28226f1e636e877f1c04fe
Author:     Adam Pimentel <adam.pimentel <AT> protonmail <DOT> com>
AuthorDate: Sat Feb  4 08:44:41 2023 +0000
Commit:     Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
CommitDate: Sat Feb  4 08:44:41 2023 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=ef4c67ea

net-p2p/feather: prevent supercop assembly compilation from creating executable stack

Closes: https://bugs.gentoo.org/892575
Signed-off-by: Adam Pimentel <adam.pimentel <AT> protonmail.com>

 net-p2p/feather/files/feather_remove_cflags-2.2.3.patch | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/net-p2p/feather/files/feather_remove_cflags-2.2.3.patch b/net-p2p/feather/files/feather_remove_cflags-2.2.3.patch
index e3a36c9af..480179a15 100644
--- a/net-p2p/feather/files/feather_remove_cflags-2.2.3.patch
+++ b/net-p2p/feather/files/feather_remove_cflags-2.2.3.patch
@@ -1,6 +1,6 @@
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -284,12 +284,6 @@
+@@ -284,12 +284,8 @@
  add_c_flag_if_supported(-fPIC C_SECURITY_FLAGS)
  add_cxx_flag_if_supported(-fPIC CXX_SECURITY_FLAGS)
 
@@ -11,6 +11,8 @@
 -set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c11 ${C_SECURITY_FLAGS}")
 -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 ${CXX_SECURITY_FLAGS}")
 -set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${LD_SECURITY_FLAGS} ${STATIC_FLAGS}")
-+set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${STATIC_FLAGS}")
++set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c11 -Wa,--noexecstack")
++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wa,--noexecstack")
++set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-z,noexecstack ${STATIC_FLAGS}")
 
  add_subdirectory(src)

[gentoo-commits] repo/proj/guru:master commit in: net-p2p/feather/files/

[Viorel Munteanu]

commit:     0909a91fd455dec082971e05e04c94fe6571827c
Author:     Adam Pimentel <adam.pimentel <AT> protonmail <DOT> com>
AuthorDate: Sat Feb  4 09:27:07 2023 +0000
Commit:     Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
CommitDate: Sat Feb  4 09:27:34 2023 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=0909a91f

net-p2p/feather: stop monero from setting -march flag

Closes: https://bugs.gentoo.org/893198
Signed-off-by: Adam Pimentel <adam.pimentel <AT> protonmail.com>

 net-p2p/feather/files/monero_remove_cflags-2.2.3.patch | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/net-p2p/feather/files/monero_remove_cflags-2.2.3.patch b/net-p2p/feather/files/monero_remove_cflags-2.2.3.patch
index 5ae53dd88..23360c817 100644
--- a/net-p2p/feather/files/monero_remove_cflags-2.2.3.patch
+++ b/net-p2p/feather/files/monero_remove_cflags-2.2.3.patch
@@ -1,6 +1,15 @@
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -901,9 +901,9 @@
+@@ -773,8 +773,6 @@
+     message(STATUS "AES support disabled")
+   endif()
+
+-  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${ARCH_FLAG}")
+-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${ARCH_FLAG}")
+
+   set(WARNINGS "-Wall -Wextra -Wpointer-arith -Wundef -Wvla -Wwrite-strings -Wno-error=extra -Wno-error=deprecated-declarations -Wno-unused-parameter -Wno-error=unused-variable -Wno-error=undef -Wno-error=uninitialized")
+   if(CMAKE_C_COMPILER_ID MATCHES "Clang" OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+@@ -901,9 +899,9 @@
    message(STATUS "Using C++ security hardening flags: ${CXX_SECURITY_FLAGS}")
    message(STATUS "Using linker security hardening flags: ${LD_SECURITY_FLAGS}")