Skip to content

Commit

Permalink
Merge pull request #242466 from risicle/ris-fortify3-disable-various
Browse files Browse the repository at this point in the history
disable `fortify3` hardening flag on various packages
  • Loading branch information
collares authored Jul 12, 2023
2 parents bc41da4 + bf55980 commit e2622ee
Show file tree
Hide file tree
Showing 13 changed files with 42 additions and 2 deletions.
8 changes: 6 additions & 2 deletions pkgs/applications/audio/mympd/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,12 @@ stdenv.mkDerivation rec {
# similarly here
"-DCMAKE_INSTALL_LOCALSTATEDIR=/var/lib/mympd"
];
# See https://github.com/jcorporation/myMPD/issues/315
hardeningDisable = [ "strictoverflow" ];
hardeningDisable = [
# See https://github.com/jcorporation/myMPD/issues/315
"strictoverflow"
# causes redefinition of _FORTIFY_SOURCE
"fortify3"
];

meta = {
homepage = "https://jcorporation.github.io/myMPD";
Expand Down
3 changes: 3 additions & 0 deletions pkgs/applications/networking/nextcloud-client/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,9 @@ mkDerivation rec {
"-DNO_SHIBBOLETH=1" # allows to compile without qtwebkit
];

# causes redefinition of _FORTIFY_SOURCE
hardeningDisable = [ "fortify3" ];

postBuild = ''
make doc-man
'';
Expand Down
3 changes: 3 additions & 0 deletions pkgs/applications/science/misc/root/5.nix
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,9 @@ stdenv.mkDerivation rec {
})
];

# https://github.com/root-project/root/issues/13216
hardeningDisable = [ "fortify3" ];

preConfigure = ''
# binutils 2.37 fixes
fixupList=(
Expand Down
3 changes: 3 additions & 0 deletions pkgs/applications/virtualization/singularity/generic.nix
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,9 @@ in
++ extraConfigureFlags
;

# causes redefinition of _FORTIFY_SOURCE
hardeningDisable = [ "fortify3" ];

# Packages to prefix to the Apptainer/Singularity container runtime default PATH
# Use overrideAttrs to override
defaultPathInputs = [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,9 @@ stdenv.mkDerivation rec {
"-DIGC_PREFERRED_LLVM_VERSION=${lib.getVersion llvm}"
];

# causes redefinition of _FORTIFY_SOURCE
hardeningDisable = [ "fortify3" ];

meta = with lib; {
homepage = "https://github.com/intel/intel-graphics-compiler";
description = "LLVM-based compiler for OpenCL targeting Intel Gen graphics hardware";
Expand Down
3 changes: 3 additions & 0 deletions pkgs/development/libraries/gvm-libs/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,9 @@ stdenv.mkDerivation rec {
"-DGVM_RUN_DIR=${placeholder "out"}/run/gvm"
];

# causes redefinition of _FORTIFY_SOURCE
hardeningDisable = [ "fortify3" ];

meta = with lib; {
description = "Libraries module for the Greenbone Vulnerability Management Solution";
homepage = "https://github.com/greenbone/gvm-libs";
Expand Down
3 changes: 3 additions & 0 deletions pkgs/development/libraries/linbox/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,9 @@ stdenv.mkDerivation rec {
"--enable-sage"
];

# https://github.com/linbox-team/linbox/issues/304
hardeningDisable = [ "fortify3" ];

doCheck = true;

enableParallelBuilding = true;
Expand Down
3 changes: 3 additions & 0 deletions pkgs/misc/beep/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@ stdenv.mkDerivation rec {

makeFlags = [ "prefix=${placeholder "out"}"];

# causes redefinition of _FORTIFY_SOURCE
hardeningDisable = [ "fortify3" ];

meta = with lib; {
description = "The advanced PC speaker beeper";
homepage = "https://github.com/spkr-beep/beep";
Expand Down
3 changes: 3 additions & 0 deletions pkgs/os-specific/linux/libevdevc/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@ stdenv.mkDerivation rec {

makeFlags = [ "DESTDIR=$(out)" "LIBDIR=/lib" ];

# causes redefinition of _FORTIFY_SOURCE
hardeningDisable = [ "fortify3" ];

meta = with lib; {
description = "ChromiumOS libevdev. Renamed to avoid conflicts with the standard libevdev found in Linux distros";
license = licenses.bsd3;
Expand Down
3 changes: 3 additions & 0 deletions pkgs/servers/mqtt/nanomq/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,9 @@ let
};

nativeBuildInputs = [ cmake ninja flex bison ];

# https://github.com/nanomq/idl-serial/issues/36
hardeningDisable = [ "fortify3" ];
};

in stdenv.mkDerivation (finalAttrs: {
Expand Down
3 changes: 3 additions & 0 deletions pkgs/tools/security/hash_extender/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@ stdenv.mkDerivation {
doCheck = true;
checkPhase = "./hash_extender --test";

# https://github.com/iagox86/hash_extender/issues/26
hardeningDisable = [ "fortify3" ];

env.NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations";

installPhase = ''
Expand Down
3 changes: 3 additions & 0 deletions pkgs/tools/security/yubihsm-shell/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,9 @@ stdenv.mkDerivation rec {
"-DDISABLE_LTO=ON"
];

# causes redefinition of _FORTIFY_SOURCE
hardeningDisable = [ "fortify3" ];

meta = with lib; {
description = "yubihsm-shell and libyubihsm";
homepage = "https://github.com/Yubico/yubihsm-shell";
Expand Down
3 changes: 3 additions & 0 deletions pkgs/tools/system/minijail/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@ stdenv.mkDerivation rec {
patchShebangs platform2_preinstall.sh
'';

# causes redefinition of _FORTIFY_SOURCE
hardeningDisable = [ "fortify3" ];

installPhase = ''
./platform2_preinstall.sh ${version} $out/include/chromeos
Expand Down

0 comments on commit e2622ee

Please sign in to comment.