mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-12-29 14:57:28 +03:00
psmisc: 22.21 -> 23.0
No longer need fuser patch, fixes musl compat.
This commit is contained in:
parent
9fb87f9c9d
commit
b83609add3
@ -1,44 +0,0 @@
|
||||
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
|
||||
|
@ -3,18 +3,15 @@
|
||||
assert stdenv.isLinux;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "psmisc-22.21";
|
||||
name = "psmisc-23.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/psmisc/${name}.tar.gz";
|
||||
sha256 = "0nhlm1vrrwn4a845p6y4nnnb4liq70n74zbdd5dq844jc6nkqclp";
|
||||
url = "mirror://sourceforge/psmisc/${name}.tar.xz";
|
||||
sha256 = "0k7hafh9388s3hh9j943jy1qk9g1c43j02nyk0xis0ngbs632lvm";
|
||||
};
|
||||
|
||||
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)";
|
||||
|
Loading…
Reference in New Issue
Block a user