diff options
author | Bjørn Forsman <bjorn.forsman@gmail.com> | 2014-04-27 20:15:59 +0200 |
---|---|---|
committer | Bjørn Forsman <bjorn.forsman@gmail.com> | 2014-04-27 20:19:31 +0200 |
commit | 68598530456af239bd4bb2c1346d29d7fe7b280f (patch) | |
tree | d438cb60c5a9af4345d5f784d45eaafca2af5585 /pkgs/os-specific | |
parent | da0c8f33efe1eb1ae9f47f5a3fdf6f4d2c461aa9 (diff) | |
download | nixpkgs-68598530456af239bd4bb2c1346d29d7fe7b280f.tar nixpkgs-68598530456af239bd4bb2c1346d29d7fe7b280f.tar.gz nixpkgs-68598530456af239bd4bb2c1346d29d7fe7b280f.tar.bz2 nixpkgs-68598530456af239bd4bb2c1346d29d7fe7b280f.tar.lz nixpkgs-68598530456af239bd4bb2c1346d29d7fe7b280f.tar.xz nixpkgs-68598530456af239bd4bb2c1346d29d7fe7b280f.tar.zst nixpkgs-68598530456af239bd4bb2c1346d29d7fe7b280f.zip |
psmisc: (from upstream) Typo in fuser makes -M on all the time
Diffstat (limited to 'pkgs/os-specific')
-rw-r--r-- | pkgs/os-specific/linux/psmisc/0001-Typo-in-fuser-makes-M-on-all-the-time.patch | 44 | ||||
-rw-r--r-- | pkgs/os-specific/linux/psmisc/default.nix | 3 |
2 files changed, 47 insertions, 0 deletions
diff --git a/pkgs/os-specific/linux/psmisc/0001-Typo-in-fuser-makes-M-on-all-the-time.patch b/pkgs/os-specific/linux/psmisc/0001-Typo-in-fuser-makes-M-on-all-the-time.patch new file mode 100644 index 00000000000..2bb93955aea --- /dev/null +++ b/pkgs/os-specific/linux/psmisc/0001-Typo-in-fuser-makes-M-on-all-the-time.patch @@ -0,0 +1,44 @@ +From 3638cc55b4d08851faba46635d737b24d016665b Mon Sep 17 00:00:00 2001 +From: Brad Jorsch <anomie@users.sourceforge.net> +Date: Fri, 28 Feb 2014 21:55:02 +1100 +Subject: [PATCH] Typo in fuser makes -M on all the time + +Brad found that fuser had the -M option on all the time. +A simple but significant typo caused this, thanks the the patch. + +Bug-Debian: http://bugs.debian.org/740275 + +Signed-off-by: Craig Small <csmall@enc.com.au> +--- + ChangeLog | 4 ++++ + src/fuser.c | 2 +- + 2 files changed, 5 insertions(+), 1 deletion(-) + +diff --git a/ChangeLog b/ChangeLog +index fd1cccf..e5f784c 100644 +--- a/ChangeLog ++++ b/ChangeLog +@@ -1,3 +1,7 @@ ++Changes in 22.22 ++================ ++ * Fixed typo in fuser which has -M on Debian #740275 ++ + Changes in 22.21 + ================ + * Missing comma in fuser(1) added Debian #702391 +diff --git a/src/fuser.c b/src/fuser.c +index b485f65..389b302 100644 +--- a/src/fuser.c ++++ b/src/fuser.c +@@ -1174,7 +1174,7 @@ int main(int argc, char *argv[]) + usage(_("No process specification given")); + + /* Check if -M flag was used and if so check mounts */ +- if (opts * OPT_ISMOUNTPOINT) { ++ if (opts & OPT_ISMOUNTPOINT) { + check_mountpoints(&mounts, &names_head, &names_tail); + } + +-- +1.9.2 + diff --git a/pkgs/os-specific/linux/psmisc/default.nix b/pkgs/os-specific/linux/psmisc/default.nix index 1215c5261f4..5cf5e9a542d 100644 --- a/pkgs/os-specific/linux/psmisc/default.nix +++ b/pkgs/os-specific/linux/psmisc/default.nix @@ -12,6 +12,9 @@ stdenv.mkDerivation rec { buildInputs = [ncurses]; + # From upstream, will be in next release. + patches = [ ./0001-Typo-in-fuser-makes-M-on-all-the-time.patch ]; + meta = { homepage = http://psmisc.sourceforge.net/; description = "A set of small useful utilities that use the proc filesystem (such as fuser, killall and pstree)"; |