mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-01-22 14:45:27 +00:00
Code Issues Wiki Activity

fakeroot: apply patch to ignore EINVAL errors as well

Browse source 
Fixes #25901 the nixos.ova job.  See the referred links.
This commit is contained in:
Piotr Bogdan 2017-06-17 11:36:39 +02:00 committed by Vladimír Čunát
parent 05547dbcb4
commit 0d4431cfe9
No known key found for this signature in database
GPG key ID: E747DF1F9575A3AA
2 changed files with 50 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
pkgs/tools/system/fakeroot/default.nix
View file

@ -9,8 +9,9 @@ stdenv.mkDerivation rec {
sha256 = "0313xb2j6a4wihrw9gfd4rnyqw7zzv6wf3rfh2gglgnv356ic2kw";
};
patches = stdenv.lib.optional stdenv.isLinux ./einval.patch
# patchset from brew
patches = stdenv.lib.optionals stdenv.isDarwin [
++ stdenv.lib.optionals stdenv.isDarwin [
(fetchpatch {
name = "0001-Implement-openat-2-wrapper-which-handles-optional-ar.patch";
url = "https://bugs.debian.org/cgi-bin/bugreport.cgi?msg=5;filename=0001-Implement-openat-2-wrapper-which-handles-optional-ar.patch;att=1;bug=766649";
@ -26,7 +27,7 @@ stdenv.mkDerivation rec {
url = "https://bugs.debian.org/cgi-bin/bugreport.cgi?att=2;bug=766649;filename=fakeroot-always-pass-mode.patch;msg=20";
sha256 = "0i3zaca1v449dm9m1cq6wq4dy6hc2y04l05m9gg8d4y4swld637p";
})
];
];
buildInputs = [ getopt ]
++ stdenv.lib.optional (!stdenv.isDarwin) libcap

47
pkgs/tools/system/fakeroot/einval.patch Normal file
View file

@ -0,0 +1,47 @@
Ignore EINVAL errors. This matters within user namespaces.
See:
https://github.com/NixOS/nixpkgs/issues/25901
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=802612
https://github.com/NixOS/nixpkgs/issues/10496
diff --git a/libfakeroot.c b/libfakeroot.c
index 68a95fb..70da8bc 100644
--- a/libfakeroot.c
+++ b/libfakeroot.c
@@ -792,7 +792,7 @@ int chown(const char *path, uid_t owner, gid_t group){
r=next_lchown(path,owner,group);
else
r=0;
- if(r&&(errno==EPERM))
+ if(r&&(errno==EPERM||errno==EINVAL))
r=0;
return r;
@@ -819,7 +819,7 @@ int lchown(const char *path, uid_t owner, gid_t group){
r=next_lchown(path,owner,group);
else
r=0;
- if(r&&(errno==EPERM))
+ if(r&&(errno==EPERM||errno==EINVAL))
r=0;
return r;
@@ -843,7 +843,7 @@ int fchown(int fd, uid_t owner, gid_t group){
else
r=0;
- if(r&&(errno==EPERM))
+ if(r&&(errno==EPERM||errno==EINVAL))
r=0;
return r;
@@ -870,7 +870,7 @@ int fchownat(int dir_fd, const char *path, uid_t owner, gid_t group, int flags)
else
r=0;
- if(r&&(errno==EPERM))
+ if(r&&(errno==EPERM||errno==EINVAL))
r=0;
return r;