summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHauke Mehrtens2025-10-05 21:29:04 +0000
committerHauke Mehrtens2025-10-25 23:41:06 +0000
commit6268692bd2bf25a5105c074648f7c899624ecfd7 (patch)
tree0255800ddf4c51620f59c6087b8a4aced6a0ec90
parent3e6c3bf5a321480b0b512bb88b80ca6918308cae (diff)
downloadopenwrt-6268692bd2bf25a5105c074648f7c899624ecfd7.tar.gz
toolchain: fortify-headers: Update to version 2.3.3
Update to recent fortify-headers version. This version also supports _FORTIFY_SOURCE=3. Changes: https://github.com/jvoisin/fortify-headers/compare/1.1...2.3.3 A patch similar to the removed one was applied upstream: https://github.com/jvoisin/fortify-headers/commit/b40f6d87482f20e968b27470baca042e50cd6792 The root file system is getting a bit bigger. Without this commit: 5250380 bin/targets/armsr/armv8/openwrt-armsr-armv8-generic-rootfs.tar.gz 4919997 bin/targets/malta/be/openwrt-malta-be-default-rootfs.tar.gz With this commit: 5263407 bin/targets/armsr/armv8/openwrt-armsr-armv8-generic-rootfs.tar.gz 4930011 bin/targets/malta/be/openwrt-malta-be-default-rootfs.tar.gz Link: https://github.com/openwrt/openwrt/pull/20313 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
-rw-r--r--toolchain/fortify-headers/Makefile10
-rw-r--r--toolchain/fortify-headers/patches/001-__ppoll_time64.patch11
-rw-r--r--toolchain/fortify-headers/patches/002-strings.h-add-__extension__-mark.patch2
3 files changed, 6 insertions, 17 deletions
diff --git a/toolchain/fortify-headers/Makefile b/toolchain/fortify-headers/Makefile
index 7e6bad51a5..d405e9e332 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:=1.1
-PKG_RELEASE=3
+PKG_VERSION:=2.3.3
+PKG_RELEASE=1
PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://github.com/jvoisin/$(PKG_NAME).git
-PKG_SOURCE_DATE:=2019-04-14
-PKG_SOURCE_VERSION:=e3fee64643279c144efd3d6856ed4e818c0d5ca2
-PKG_MIRROR_HASH:=f2ce18b031aecbf43d18142941ece7c90691a8b4e96fbb1d5af94f24e5572dad
+PKG_SOURCE_DATE:=2024-10-21
+PKG_SOURCE_VERSION:=dcdd2f1fb065b6e98d87ab7b367e8fb483f9b59c
+PKG_MIRROR_HASH:=088a7fda614daf4e42110dbb2a288f0a5f3b25ee41ed92a988e7b3c15c76230b
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
deleted file mode 100644
index 05f8c71714..0000000000
--- a/toolchain/fortify-headers/patches/001-__ppoll_time64.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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 a07bb15aa1..c334493157 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
-@@ -16,6 +16,9 @@
+@@ -17,6 +17,9 @@
#ifndef _FORTIFY_STRINGS_H
#define _FORTIFY_STRINGS_H