| 1 |
commit: f017304f5a38b4bcd0712759876997af96431fbc |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Jun 1 00:30:40 2022 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Jun 1 00:31:36 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f017304f |
| 7 |
|
| 8 |
sys-cluster/kronosnet: don't set FORTIFY_SOURCE=2 twice; forward Werror patch |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/847790 |
| 11 |
Bug: https://bugs.gentoo.org/750548 |
| 12 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 13 |
|
| 14 |
.../files/kronosnet-1.23-no-extra-fortify-source.patch | 18 ++++++++++++++++++ |
| 15 |
sys-cluster/kronosnet/kronosnet-1.23.ebuild | 5 +++++ |
| 16 |
2 files changed, 23 insertions(+) |
| 17 |
|
| 18 |
diff --git a/sys-cluster/kronosnet/files/kronosnet-1.23-no-extra-fortify-source.patch b/sys-cluster/kronosnet/files/kronosnet-1.23-no-extra-fortify-source.patch |
| 19 |
new file mode 100644 |
| 20 |
index 000000000000..83acebb40298 |
| 21 |
--- /dev/null |
| 22 |
+++ b/sys-cluster/kronosnet/files/kronosnet-1.23-no-extra-fortify-source.patch |
| 23 |
@@ -0,0 +1,18 @@ |
| 24 |
+We already set this via GCC (patched in) and setting it individually per-package |
| 25 |
+like this causes redefinition errors if folks try to use the new =3 level. |
| 26 |
+ |
| 27 |
+So, protection is the same without this, and this patch removes |
| 28 |
+the trouble of upgrading to =3 which we're working on. |
| 29 |
+ |
| 30 |
+https://bugs.gentoo.org/847790 |
| 31 |
+--- a/configure.ac |
| 32 |
++++ b/configure.ac |
| 33 |
+@@ -324,7 +324,7 @@ if test "x${enable_debug}" = xyes; then |
| 34 |
+ FORTIFY_CFLAGS="" |
| 35 |
+ else |
| 36 |
+ OPT_CFLAGS="-O3" |
| 37 |
+- FORTIFY_CFLAGS="-D_FORTIFY_SOURCE=2" |
| 38 |
++ FORTIFY_CFLAGS="" |
| 39 |
+ fi |
| 40 |
+ |
| 41 |
+ # Check for availablility of hardening options |
| 42 |
|
| 43 |
diff --git a/sys-cluster/kronosnet/kronosnet-1.23.ebuild b/sys-cluster/kronosnet/kronosnet-1.23.ebuild |
| 44 |
index 115a30239682..355e4941778f 100644 |
| 45 |
--- a/sys-cluster/kronosnet/kronosnet-1.23.ebuild |
| 46 |
+++ b/sys-cluster/kronosnet/kronosnet-1.23.ebuild |
| 47 |
@@ -30,6 +30,11 @@ BDEPEND=" |
| 48 |
app-doc/doxygen[dot] |
| 49 |
)" |
| 50 |
|
| 51 |
+PATCHES=( |
| 52 |
+ "${FILESDIR}"/${PN}-1.19-no-Werror.patch |
| 53 |
+ "${FILESDIR}"/${PN}-1.23-no-extra-fortify-source.patch |
| 54 |
+) |
| 55 |
+ |
| 56 |
src_configure() { |
| 57 |
local myeconfargs=( |
| 58 |
$(use_enable doc man) |
Archives