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

Merge #26628: treewide: setuid/setgid fallout

Browse Source
This commit is contained in:
Vladimír Čunát
2017-06-17 13:23:39 +02:00
parent 0d4431cfe9 230c0d461a
commit d88c0cf867
15 changed files with 56 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/tools/system/at/install.patch
+1 -1
View File
@@ -20,7 +20,7 @@
+ $(INSTALL) -m 755 -d $(IROOT)$(sbindir)
+ $(INSTALL) -m 755 -d $(IROOT)$(docdir)
+ $(INSTALL) -m 755 -d $(IROOT)$(atdocdir)
+ $(INSTALL) -m 6755 -s at $(IROOT)$(bindir)
+ $(INSTALL) -m 0755 -s at $(IROOT)$(bindir)
$(LN_S) -f at $(IROOT)$(bindir)/atq
$(LN_S) -f at $(IROOT)$(bindir)/atrm
- $(INSTALL) -g root -o root -m 755 batch $(IROOT)$(bindir)
pkgs/tools/system/cron/default.nix
+2 -1
View File
@@ -12,7 +12,8 @@ stdenv.mkDerivation {
hardeningEnable = [ "pie" ];
preBuild = ''
substituteInPlace Makefile --replace ' -o root' ' ' --replace 111 755
# do not set sticky bit in /nix/store
substituteInPlace Makefile --replace ' -o root' ' ' --replace 111 755 --replace 4755 0755
makeFlags="DESTROOT=$out CC=cc"
# We want to ignore the $glibc/include/paths.h definition of
pkgs/tools/system/logcheck/default.nix
+5
View File
@@ -10,6 +10,11 @@ stdenv.mkDerivation rec {
sha256 = "1x4skb5nmv2xj8cygj8pq1rd1ws4m2fsibw54yslgdyjri4r2yq7";
};
prePatch = ''
# do not set sticky bit in nix store.
substituteInPlace Makefile --replace 2750 0750
'';
preConfigure = ''
substituteInPlace src/logtail --replace "/usr/bin/perl" "${perl}/bin/perl"
substituteInPlace src/logtail2 --replace "/usr/bin/perl" "${perl}/bin/perl"