Disable fortify on package builds, it is supplied db package build infra

Signed-off-by: Otto Moerbeek <otto.moerbeek@open-xchange.com>

diff --git a/builder-support/debian/recursor/debian-buster/rules b/builder-support/debian/recursor/debian-buster/rules
index ad02a97ba47d6b161910017e3c53afca0239f3e0..3435c92701fe3d58ffd8d4366d286b8eb16a1678 100755 (executable)
--- 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 ad02a97ba47d6b161910017e3c53afca0239f3e0..3435c92701fe3d58ffd8d4366d286b8eb16a1678 100755 (executable)
--- 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 00bee2893c899d883c093cb5ec19b8e3fc2aa04c..fafab277a9e2d6ea5e20f9bddffb17e81a0e7ab4 100644 (file)
--- 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 \