diff options
| -rw-r--r-- | meta/recipes-extended/psmisc/files/0001-Typo-in-fuser-makes-M-on-all-the-time.patch | 46 | ||||
| -rw-r--r-- | meta/recipes-extended/psmisc/psmisc_22.21.bb | 2 |
2 files changed, 48 insertions, 0 deletions
diff --git a/meta/recipes-extended/psmisc/files/0001-Typo-in-fuser-makes-M-on-all-the-time.patch b/meta/recipes-extended/psmisc/files/0001-Typo-in-fuser-makes-M-on-all-the-time.patch new file mode 100644 index 0000000000..e57d60f6a3 --- /dev/null +++ b/meta/recipes-extended/psmisc/files/0001-Typo-in-fuser-makes-M-on-all-the-time.patch | |||
| @@ -0,0 +1,46 @@ | |||
| 1 | From 3638cc55b4d08851faba46635d737b24d016665b Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Brad Jorsch <anomie@users.sourceforge.net> | ||
| 3 | Date: Fri, 28 Feb 2014 21:55:02 +1100 | ||
| 4 | Subject: [PATCH] Typo in fuser makes -M on all the time | ||
| 5 | |||
| 6 | Brad found that fuser had the -M option on all the time. | ||
| 7 | A simple but significant typo caused this, thanks the the patch. | ||
| 8 | |||
| 9 | Bug-Debian: http://bugs.debian.org/740275 | ||
| 10 | |||
| 11 | Upstream-Status: Backport | ||
| 12 | |||
| 13 | Signed-off-by: Craig Small <csmall@enc.com.au> | ||
| 14 | --- | ||
| 15 | ChangeLog | 4 ++++ | ||
| 16 | src/fuser.c | 2 +- | ||
| 17 | 2 files changed, 5 insertions(+), 1 deletion(-) | ||
| 18 | |||
| 19 | diff --git a/ChangeLog b/ChangeLog | ||
| 20 | index fd1cccf..e5f784c 100644 | ||
| 21 | --- a/ChangeLog | ||
| 22 | +++ b/ChangeLog | ||
| 23 | @@ -1,3 +1,7 @@ | ||
| 24 | +Changes in 22.22 | ||
| 25 | +================ | ||
| 26 | + * Fixed typo in fuser which has -M on Debian #740275 | ||
| 27 | + | ||
| 28 | Changes in 22.21 | ||
| 29 | ================ | ||
| 30 | * Missing comma in fuser(1) added Debian #702391 | ||
| 31 | diff --git a/src/fuser.c b/src/fuser.c | ||
| 32 | index b485f65..389b302 100644 | ||
| 33 | --- a/src/fuser.c | ||
| 34 | +++ b/src/fuser.c | ||
| 35 | @@ -1174,7 +1174,7 @@ int main(int argc, char *argv[]) | ||
| 36 | usage(_("No process specification given")); | ||
| 37 | |||
| 38 | /* Check if -M flag was used and if so check mounts */ | ||
| 39 | - if (opts * OPT_ISMOUNTPOINT) { | ||
| 40 | + if (opts & OPT_ISMOUNTPOINT) { | ||
| 41 | check_mountpoints(&mounts, &names_head, &names_tail); | ||
| 42 | } | ||
| 43 | |||
| 44 | -- | ||
| 45 | 1.8.4.2 | ||
| 46 | |||
diff --git a/meta/recipes-extended/psmisc/psmisc_22.21.bb b/meta/recipes-extended/psmisc/psmisc_22.21.bb index 22f65c52be..9f328bb81b 100644 --- a/meta/recipes-extended/psmisc/psmisc_22.21.bb +++ b/meta/recipes-extended/psmisc/psmisc_22.21.bb | |||
| @@ -4,3 +4,5 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3" | |||
| 4 | 4 | ||
| 5 | SRC_URI[md5sum] = "935c0fd6eb208288262b385fa656f1bf" | 5 | SRC_URI[md5sum] = "935c0fd6eb208288262b385fa656f1bf" |
| 6 | SRC_URI[sha256sum] = "97323cad619210845b696d7d722c383852b2acb5c49b5b0852c4f29c77a8145a" | 6 | SRC_URI[sha256sum] = "97323cad619210845b696d7d722c383852b2acb5c49b5b0852c4f29c77a8145a" |
| 7 | |||
| 8 | SRC_URI += "file://0001-Typo-in-fuser-makes-M-on-all-the-time.patch" | ||
