diff options
author | Ludovic Courtès <ludo@gnu.org> | 2016-12-09 18:11:14 +0100 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2016-12-09 18:11:14 +0100 |
commit | f80b4d2ce09b0b7770cbdf2f90704d41b0a168c5 (patch) | |
tree | ec47c7ee5d5579cfa00f13b5038ff3d8c87e4a48 /gnu/packages/patches/readline-7.0-mingw.patch | |
parent | 13b5f44b475aa385d580f7e19b907210bc1d6d99 (diff) | |
parent | 2608e40988ba8cf51723fe0d21bdedf6b3997c9c (diff) | |
download | guix-f80b4d2ce09b0b7770cbdf2f90704d41b0a168c5.tar guix-f80b4d2ce09b0b7770cbdf2f90704d41b0a168c5.tar.gz |
Merge remote-tracking branch 'origin/master' into staging
Diffstat (limited to 'gnu/packages/patches/readline-7.0-mingw.patch')
-rw-r--r-- | gnu/packages/patches/readline-7.0-mingw.patch | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/gnu/packages/patches/readline-7.0-mingw.patch b/gnu/packages/patches/readline-7.0-mingw.patch new file mode 100644 index 0000000000..1dc491d556 --- /dev/null +++ b/gnu/packages/patches/readline-7.0-mingw.patch @@ -0,0 +1,28 @@ +Configure checks for chown; add missing shields in code. + +Upstream status: not yet presented upstream. + +--- readline-7.0/histfile.c.orig 2016-12-06 20:04:10.058901731 +0100 ++++ readline-7.0/histfile.c 2016-12-06 20:05:09.220083801 +0100 +@@ -610,8 +610,10 @@ + user is running this, it's a no-op. If the shell is running after sudo + with a shared history file, we don't want to leave the history file + owned by root. */ ++#if HAVE_CHOWN + if (rv == 0 && exists) + r = chown (filename, finfo.st_uid, finfo.st_gid); ++#endif + + xfree (filename); + FREE (tempname); +@@ -757,8 +759,10 @@ + user is running this, it's a no-op. If the shell is running after sudo + with a shared history file, we don't want to leave the history file + owned by root. */ ++#if HAVE_CHOWN + if (rv == 0 && exists) + mode = chown (histname, finfo.st_uid, finfo.st_gid); ++#endif + + FREE (histname); + FREE (tempname); |