From fbe2ad6c60709aa5379e227d10a6f3e0e711c84b Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Tue, 28 Oct 2025 21:57:06 +0100 Subject: [PATCH] Revert "toolchain: fortify-headers: Update to version 2.3.3" This reverts commit 6268692bd2bf25a5105c074648f7c899624ecfd7. The new fortify-headers version needs some more work to be usable in OpenWrt. Revert this to fix the builds again. Signed-off-by: Hauke Mehrtens --- toolchain/fortify-headers/Makefile | 10 +++++----- .../fortify-headers/patches/001-__ppoll_time64.patch | 11 +++++++++++ .../002-strings.h-add-__extension__-mark.patch | 2 +- 3 files changed, 17 insertions(+), 6 deletions(-) create mode 100644 toolchain/fortify-headers/patches/001-__ppoll_time64.patch diff --git a/toolchain/fortify-headers/Makefile b/toolchain/fortify-headers/Makefile index d405e9e3323..7e6bad51a5a 100644 --- a/toolchain/fortify-headers/Makefile +++ b/toolchain/fortify-headers/Makefile @@ -8,14 +8,14 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/target.mk PKG_NAME:=fortify-headers -PKG_VERSION:=2.3.3 -PKG_RELEASE=1 +PKG_VERSION:=1.1 +PKG_RELEASE=3 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/jvoisin/$(PKG_NAME).git -PKG_SOURCE_DATE:=2024-10-21 -PKG_SOURCE_VERSION:=dcdd2f1fb065b6e98d87ab7b367e8fb483f9b59c -PKG_MIRROR_HASH:=088a7fda614daf4e42110dbb2a288f0a5f3b25ee41ed92a988e7b3c15c76230b +PKG_SOURCE_DATE:=2019-04-14 +PKG_SOURCE_VERSION:=e3fee64643279c144efd3d6856ed4e818c0d5ca2 +PKG_MIRROR_HASH:=f2ce18b031aecbf43d18142941ece7c90691a8b4e96fbb1d5af94f24e5572dad include $(INCLUDE_DIR)/toolchain-build.mk diff --git a/toolchain/fortify-headers/patches/001-__ppoll_time64.patch b/toolchain/fortify-headers/patches/001-__ppoll_time64.patch new file mode 100644 index 00000000000..05f8c717148 --- /dev/null +++ b/toolchain/fortify-headers/patches/001-__ppoll_time64.patch @@ -0,0 +1,11 @@ +--- a/include/poll.h ++++ b/include/poll.h +@@ -39,7 +39,7 @@ _FORTIFY_FN(poll) int poll(struct pollfd + return __orig_poll(__f, __n, __s); + } + +-#ifdef _GNU_SOURCE ++#if defined(_GNU_SOURCE) && !(defined(_REDIR_TIME64) && _REDIR_TIME64) + #undef ppoll + _FORTIFY_FN(ppoll) int ppoll(struct pollfd *__f, nfds_t __n, const struct timespec *__s, + const sigset_t *__m) diff --git a/toolchain/fortify-headers/patches/002-strings.h-add-__extension__-mark.patch b/toolchain/fortify-headers/patches/002-strings.h-add-__extension__-mark.patch index c3344931571..a07bb15aa1d 100644 --- a/toolchain/fortify-headers/patches/002-strings.h-add-__extension__-mark.patch +++ b/toolchain/fortify-headers/patches/002-strings.h-add-__extension__-mark.patch @@ -12,7 +12,7 @@ Add __extension__ before #include-next in strings.h as was done for all other he --- a/include/strings.h +++ b/include/strings.h -@@ -17,6 +17,9 @@ +@@ -16,6 +16,9 @@ #ifndef _FORTIFY_STRINGS_H #define _FORTIFY_STRINGS_H