From: Otto Moerbeek Date: Thu, 5 Jun 2025 12:22:44 +0000 (+0200) Subject: Disable fortify on package builds, it is supplied db package build infra X-Git-Tag: dnsdist-2.0.0-beta1~45^2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=17b3741c82f0d0124659d13789967f271092d42b;p=thirdparty%2Fpdns.git Disable fortify on package builds, it is supplied db package build infra Signed-off-by: Otto Moerbeek --- diff --git a/builder-support/debian/recursor/debian-buster/rules b/builder-support/debian/recursor/debian-buster/rules index ad02a97ba4..3435c92701 100755 --- a/builder-support/debian/recursor/debian-buster/rules +++ b/builder-support/debian/recursor/debian-buster/rules @@ -37,7 +37,7 @@ override_dh_auto_clean: # We need clang (LLVM) to link the Rust static library and the C++ code with LTO enabled # build-id SHA1 prevents an issue with the debug symbols ("export: `-Wl,--build-id=sha1': not a valid identifier") - +# disably fortify as it is handled by package build infra override_dh_auto_configure: LDFLAGS="-latomic -fuse-ld=lld -Wl,--build-id=sha1" \ CC=clang \ @@ -47,6 +47,7 @@ override_dh_auto_configure: -Db_lto=true \ -Db_lto_mode=thin \ -Db_pie=true \ + -Dhardening-fortify-source=disabled \ -Dunit-tests=true \ -Ddns-over-tls=enabled \ -Ddnstap=enabled \ diff --git a/builder-support/debian/recursor/debian-trixie/rules b/builder-support/debian/recursor/debian-trixie/rules index ad02a97ba4..3435c92701 100755 --- a/builder-support/debian/recursor/debian-trixie/rules +++ b/builder-support/debian/recursor/debian-trixie/rules @@ -37,7 +37,7 @@ override_dh_auto_clean: # We need clang (LLVM) to link the Rust static library and the C++ code with LTO enabled # build-id SHA1 prevents an issue with the debug symbols ("export: `-Wl,--build-id=sha1': not a valid identifier") - +# disably fortify as it is handled by package build infra override_dh_auto_configure: LDFLAGS="-latomic -fuse-ld=lld -Wl,--build-id=sha1" \ CC=clang \ @@ -47,6 +47,7 @@ override_dh_auto_configure: -Db_lto=true \ -Db_lto_mode=thin \ -Db_pie=true \ + -Dhardening-fortify-source=disabled \ -Dunit-tests=true \ -Ddns-over-tls=enabled \ -Ddnstap=enabled \ diff --git a/builder-support/specs/pdns-recursor.spec b/builder-support/specs/pdns-recursor.spec index 00bee2893c..fafab277a9 100644 --- a/builder-support/specs/pdns-recursor.spec +++ b/builder-support/specs/pdns-recursor.spec @@ -93,12 +93,14 @@ export CXXFLAGS="-O2 -g -pipe -Wall -Wno-deprecated-declarations -Wno-deprecated # Note that the RPM meson macro "helpfully" sets # --auto-features=enabled so our auto-detection is broken +# disably fortify as it is handled by package build infra %meson \ --sysconfdir=%{_sysconfdir}/%{name} \ -Dunit-tests=true \ -Db_lto=true \ -Db_lto_mode=thin \ -Db_pie=true \ + -Dhardening-fortify-source=disabled \ -Ddns-over-tls=enabled \ -Ddnstap=enabled \ -Dlibcap=enabled \