This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".
The branch, next has been updated via 1b57f838f19e2a8c1e1a3bd903b2a70c730ab08f (commit) via cecad543cb59d0e052cea437cc064bb0924cdbd2 (commit) via 900e1c57229b896ee5824ec543560605df062e77 (commit) via be60a304dd1714af9129fce8a673fab80f6cd3dc (commit) via 691a64130f7a83ceba89127c7b016b3ba96719b3 (commit) from 394405b1dd985b2563b9a95122808b43a843d39c (commit)
Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.
- Log ----------------------------------------------------------------- commit 1b57f838f19e2a8c1e1a3bd903b2a70c730ab08f Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Feb 5 16:47:35 2024 +0000
make.sh: Compile with minimal debug information
In IPFire 2, we don't make any use out of the debug information. Therefore we can tell the compiler to generate as minimal debug information as possible in order to have a faster compilation process.
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit cecad543cb59d0e052cea437cc064bb0924cdbd2 Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Feb 5 16:46:36 2024 +0000
make.sh: Build with _FORTIFY_SOURCE=3
This will require that we re-ship everything.
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 900e1c57229b896ee5824ec543560605df062e77 Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Feb 5 16:46:06 2024 +0000
vim: Don't try to build with custom _FORTIFY_SOURCE
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit be60a304dd1714af9129fce8a673fab80f6cd3dc Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Feb 5 16:45:38 2024 +0000
mympd: Don't overwrite our own hardening flags
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 691a64130f7a83ceba89127c7b016b3ba96719b3 Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Feb 5 16:45:06 2024 +0000
multipath-tools: Don't overwrite our hardening flags
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
-----------------------------------------------------------------------
Summary of changes: lfs/multipath-tools | 2 +- lfs/mympd | 4 ++++ lfs/vim | 4 ++++ make.sh | 4 ++-- 4 files changed, 11 insertions(+), 3 deletions(-)
Difference in files: diff --git a/lfs/multipath-tools b/lfs/multipath-tools index 61b6183f0..0ff8d813f 100644 --- a/lfs/multipath-tools +++ b/lfs/multipath-tools @@ -73,7 +73,7 @@ $(subst %,%_BLAKE2,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP)/kpartx && make $(MAKETUNING) + cd $(DIR_APP)/kpartx && make $(MAKETUNING) CPPFLAGS= cd $(DIR_APP)/kpartx && make install PREFIX=/usr @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/mympd b/lfs/mympd index ffedcdcce..9a43ac6b7 100644 --- a/lfs/mympd +++ b/lfs/mympd @@ -82,6 +82,10 @@ $(subst %,%_BLAKE2,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) + + # Do not try to re-define _FORTIFY_SOURCE + cd $(DIR_APP) && sed -e "/D_FORTIFY_SOURCE/d" -i CMakeLists.txt + cd $(DIR_APP) && mkdir -p build cd $(DIR_APP)/build && cmake -Wno-dev \ -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release .. diff --git a/lfs/vim b/lfs/vim index ea52c8e73..19f6ec10a 100644 --- a/lfs/vim +++ b/lfs/vim @@ -32,6 +32,10 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/vim90 TARGET = $(DIR_INFO)/$(THISAPP)
+# vim tries to build itself with FORTIFY_SOURCE=1 and is not very good at +# filtering out any CFLAGS that might change that. So we do this ourselves. +CFLAGS := $(filter-out -Wp$(COMMA)-U_FORTIFY_SOURCE,$(CFLAGS)) + ############################################################################### # Top-level Rules ############################################################################### diff --git a/make.sh b/make.sh index b3be0865b..ab7e0911f 100755 --- a/make.sh +++ b/make.sh @@ -182,9 +182,9 @@ configure_build() { TOOLS_DIR="/tools_${BUILD_ARCH}"
# Enables hardening - HARDENING_CFLAGS="-Wp,-D_FORTIFY_SOURCE=2 -Wp,-D_GLIBCXX_ASSERTIONS -fstack-protector-strong -fstack-clash-protection" + HARDENING_CFLAGS="-Wp,-U_FORTIFY_SOURCE -Wp,-D_FORTIFY_SOURCE=3 -Wp,-D_GLIBCXX_ASSERTIONS -fstack-protector-strong -fstack-clash-protection"
- CFLAGS="-O2 -pipe -Wall -fexceptions -fPIC ${CFLAGS_ARCH}" + CFLAGS="-O2 -g0 -pipe -Wall -fexceptions -fPIC ${CFLAGS_ARCH}" CXXFLAGS="${CFLAGS}"
RUSTFLAGS="-Copt-level=3 -Clink-arg=-Wl,-z,relro,-z,now -Ccodegen-units=1 --cap-lints=warn ${RUSTFLAGS_ARCH}"
hooks/post-receive -- IPFire 2.x development tree