public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into hardened-stdenv

Browse Source
This commit is contained in:
Franz Pletz
2016-03-05 18:55:30 +01:00
parent aff1f4ab94 4e8853ca8d
commit cb3d27df93
175 changed files with 11585 additions and 8679 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/servers/http/nginx/default.nix
+9 -1
View File
@@ -1,6 +1,7 @@
{ stdenv, fetchurl, fetchFromGitHub, openssl, zlib, pcre, libxml2, libxslt, expat
, gd, geoip
, modules ? []
, hardening ? true
}:
with stdenv.lib;
@@ -53,7 +54,14 @@ stdenv.mkDerivation rec {
NIX_CFLAGS_COMPILE = [ "-I${libxml2}/include/libxml2" ] ++ optional stdenv.isDarwin "-Wno-error=deprecated-declarations -Wno-error=conditional-uninitialized";
preConfigure = concatMapStringsSep "\n" (mod: mod.preConfigure or "") modules;
preConfigure = (concatMapStringsSep "\n" (mod: mod.preConfigure or "") modules)
+ optionalString (hardening && (stdenv.cc.cc.isGNU or false)) ''
configureFlagsArray=(
--with-cc-opt="-fPIE -fstack-protector-all --param ssp-buffer-size=4 -O2 -D_FORTIFY_SOURCE=2"
--with-ld-opt="-pie -Wl,-z,relro,-z,now"
)
''
;
hardeningEnable = [ "pie" ];
pkgs/servers/http/nginx/unstable.nix
+9 -1
View File
@@ -2,6 +2,7 @@
, gd, geoip
, withStream ? false
, modules ? []
, hardening ? true
}:
with stdenv.lib;
@@ -51,7 +52,14 @@ stdenv.mkDerivation rec {
NIX_CFLAGS_COMPILE = [ "-I${libxml2}/include/libxml2" ] ++ optional stdenv.isDarwin "-Wno-error=deprecated-declarations";
preConfigure = concatMapStringsSep "\n" (mod: mod.preConfigure or "") modules;
preConfigure = (concatMapStringsSep "\n" (mod: mod.preConfigure or "") modules)
+ optionalString (hardening && (stdenv.cc.cc.isGNU or false)) ''
configureFlagsArray=(
--with-cc-opt="-fPIE -fstack-protector-all --param ssp-buffer-size=4 -O2 -D_FORTIFY_SOURCE=2"
--with-ld-opt="-pie -Wl,-z,relro,-z,now"
)
''
;
postInstall = ''
mv $out/sbin $out/bin