commit: 3cdb40eee187debe65b1bf38c96dd0b485650d60 Author: David Seifert <soap <AT> gentoo <DOT> org> AuthorDate: Sat Feb 14 14:44:36 2026 +0000 Commit: David Seifert <soap <AT> gentoo <DOT> org> CommitDate: Sat Feb 14 14:44:36 2026 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3cdb40ee
net-analyzer/ike-scan: fix x86 build Closes: https://bugs.gentoo.org/927489 Signed-off-by: David Seifert <soap <AT> gentoo.org> .../ike-scan/files/ike-scan-1.9.5-clang-16.patch | 70 ++++++++-------------- 1 file changed, 26 insertions(+), 44 deletions(-) diff --git a/net-analyzer/ike-scan/files/ike-scan-1.9.5-clang-16.patch b/net-analyzer/ike-scan/files/ike-scan-1.9.5-clang-16.patch index c4aec2836ba0..31ab6da26398 100644 --- a/net-analyzer/ike-scan/files/ike-scan-1.9.5-clang-16.patch +++ b/net-analyzer/ike-scan/files/ike-scan-1.9.5-clang-16.patch @@ -1,14 +1,22 @@ https://github.com/royhills/ike-scan/pull/39 -From 9949ce4bdf9f4bcb616b2a5d273708a7ea9ee93d Mon Sep 17 00:00:00 2001 -From: Sam James <[email protected]> -Date: Mon, 26 Sep 2022 05:22:18 +0100 -Subject: [PATCH 1/3] acinclude.m4: fix -Wimplicit-int errors (Clang 16+ - compat) +Before: +``` +checking whether clang accepts -fstack-protector... yes +checking whether clang accepts -D_FORTIFY_SOURCE... yes +checking whether clang accepts -Wformat-security... no +``` + +After: +``` +checking whether clang accepts -fstack-protector... yes +checking whether clang accepts -Wformat-security... yes +checking whether clang accepts -D_FORTIFY_SOURCE... yes +``` --- a/acinclude.m4 +++ b/acinclude.m4 -@@ -144,7 +144,7 @@ int does_int64_work() +@@ -144,7 +144,7 @@ return 0; return 1; } @@ -17,7 +25,15 @@ Subject: [PATCH 1/3] acinclude.m4: fix -Wimplicit-int errors (Clang 16+ return ! does_int64_work(); }], [Ac_cachevar=yes], -@@ -200,7 +200,7 @@ int does_int64_snprintf_work() +@@ -180,6 +180,7 @@ + AC_CACHE_VAL(pgac_cv_snprintf_long_long_int_format, + [for pgac_format in '%lld' '%qd' '%I64d'; do + AC_TRY_RUN([#include <stdio.h> ++#include <string.h> + typedef long long int int64; + #define INT64_FORMAT "$pgac_format" + +@@ -200,7 +201,7 @@ return 0; /* either multiply or snprintf is busted */ return 1; } @@ -26,18 +42,7 @@ Subject: [PATCH 1/3] acinclude.m4: fix -Wimplicit-int errors (Clang 16+ return ! does_int64_snprintf_work(); }], [pgac_cv_snprintf_long_long_int_format=$pgac_format; break], - -From 6a931ca559a937cb9f7917b9131ec1aca4919683 Mon Sep 17 00:00:00 2001 -From: Sam James <[email protected]> -Date: Mon, 26 Sep 2022 05:23:06 +0100 -Subject: [PATCH 2/3] acinclude.m4: fix typo in 'x' if check - -Case doesn't matter but case does need to match on left & right -hand side, so just choose uppercase everywhere to match what -the rest of the file does. ---- a/acinclude.m4 -+++ b/acinclude.m4 -@@ -278,7 +278,7 @@ dnl in <features.h>. We don't use __GNUC_PREREQ directly because <features.h> +@@ -278,7 +279,7 @@ dnl is not present on all the operating systems that we support, e.g. OpenBSD. dnl AC_DEFUN([GCC_FORTIFY_SOURCE],[ @@ -46,7 +51,7 @@ the rest of the file does. AC_MSG_CHECKING([whether ${CC} accepts -D_FORTIFY_SOURCE]) AC_TRY_COMPILE(,[ #define GNUC_PREREQ(maj, min) ((__GNUC__ << 16) + __GNUC_MINOR__ >= ((maj) << 16) + (min)) -@@ -311,7 +311,7 @@ dnl If it is not supported, then the test program will compile without +@@ -311,7 +312,7 @@ dnl warnings. dnl AC_DEFUN([GCC_FORMAT_SECURITY],[ @@ -55,31 +60,9 @@ the rest of the file does. AC_MSG_CHECKING([whether ${CC} accepts -Wformat-security]) wfs_old_cflags="$CFLAGS" CFLAGS="$CFLAGS -Wall -Werror -Wformat -Wformat-security" - -From fbc40c7b117b523eceb9aa58d6086bde701f1299 Mon Sep 17 00:00:00 2001 -From: Sam James <[email protected]> -Date: Sat, 1 Oct 2022 01:24:04 +0100 -Subject: [PATCH 3/3] configure.ac: Fix recognising -Wformat-security with - Clang - -Before: -``` -checking whether clang accepts -fstack-protector... yes -checking whether clang accepts -D_FORTIFY_SOURCE... yes -checking whether clang accepts -Wformat-security... no -``` - -After: -``` -checking whether clang accepts -fstack-protector... yes -checking whether clang accepts -Wformat-security... yes -checking whether clang accepts -D_FORTIFY_SOURCE... yes -``` - -Signed-off-by: Sam James <[email protected]> --- a/configure.ac +++ b/configure.ac -@@ -34,8 +34,8 @@ if test -n "$GCC"; then +@@ -34,8 +34,8 @@ CFLAGS="$CFLAGS -Wall -Wshadow -Wwrite-strings" GCC_WEXTRA GCC_STACK_PROTECT_CC @@ -89,4 +72,3 @@ Signed-off-by: Sam James <[email protected]> dnl Uncomment the lines below for testing with stricter warnings. dnl CFLAGS="$CFLAGS -pedantic -Wpointer-arith -Wcast-qual -Wcast-align -Wconversion -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wnested-externs -Winline " dnl Uncomment the line below to check malloc/free with electric fence -
