diff options
Diffstat (limited to 'meta/recipes-extended/psmisc/files')
-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/files/0002-Include-limits.h-for-PATH_MAX.patch | 29 |
2 files changed, 0 insertions, 75 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 deleted file mode 100644 index e57d60f6a3..0000000000 --- a/meta/recipes-extended/psmisc/files/0001-Typo-in-fuser-makes-M-on-all-the-time.patch +++ /dev/null | |||
@@ -1,46 +0,0 @@ | |||
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/files/0002-Include-limits.h-for-PATH_MAX.patch b/meta/recipes-extended/psmisc/files/0002-Include-limits.h-for-PATH_MAX.patch deleted file mode 100644 index c8afcac8a8..0000000000 --- a/meta/recipes-extended/psmisc/files/0002-Include-limits.h-for-PATH_MAX.patch +++ /dev/null | |||
@@ -1,29 +0,0 @@ | |||
1 | From aa66afecd8ba9cc4139f25ab15ec315173413a7d Mon Sep 17 00:00:00 2001 | ||
2 | From: Paul Barker <paul@paulbarker.me.uk> | ||
3 | Date: Wed, 20 Aug 2014 10:31:37 +0000 | ||
4 | Subject: [PATCH] Include <limits.h> for PATH_MAX | ||
5 | |||
6 | When building against musl libc, PATH_MAX is defined in <limits.h>. | ||
7 | |||
8 | Signed-off-by: Paul Barker <paul@paulbarker.me.uk> | ||
9 | |||
10 | Upstream-Status: Accepted (Should be in next release after 22.21) | ||
11 | --- | ||
12 | src/pstree.c | 1 + | ||
13 | 1 file changed, 1 insertion(+) | ||
14 | |||
15 | diff --git a/src/pstree.c b/src/pstree.c | ||
16 | index 071e6c4..0d28260 100644 | ||
17 | --- a/src/pstree.c | ||
18 | +++ b/src/pstree.c | ||
19 | @@ -41,6 +41,7 @@ | ||
20 | #include <sys/types.h> | ||
21 | #include <sys/stat.h> | ||
22 | #include <sys/ioctl.h> | ||
23 | +#include <limits.h> | ||
24 | |||
25 | #include "i18n.h" | ||
26 | #include "comm.h" | ||
27 | -- | ||
28 | 2.0.4 | ||
29 | |||