Patchwork psmisc: Typo in fuser makes -M on all the time (backport)

login
register
mail settings
Submitter Patrice B
Date July 30, 2014, 10:04 a.m.
Message ID <1406714692.31179.9.camel@localhost.localdomain>
Download mbox | patch
Permalink /patch/76931/
State New
Headers show

Comments

Patrice B - July 30, 2014, 10:04 a.m.
I encountered this bug in psmisc 22.21. Since it is fixed in main
stream, I proposed this patch created from psmisc git.

More info here :
http://sourceforge.net/p/psmisc/code/ci/3638cc55b4d08851faba46635d737b24d016665b/


"Brad found that fuser had the -M option on all the time.
A simple but significant typo caused this, thanks the patch.

Bug-Debian: http://bugs.debian.org/740275"

Signed-off-by: Patrice B <pbfwdlist@gmail.com>


---
 ...001-Typo-in-fuser-makes-M-on-all-the-time.patch | 44 ++++++++++++++++++++++
 meta/recipes-extended/psmisc/psmisc_22.21.bb       |  2 +
 2 files changed, 46 insertions(+)
 create mode 100644 meta/recipes-extended/psmisc/files/0001-Typo-in-fuser-makes-M-on-all-the-time.patch
Saul Wold - July 30, 2014, 4:30 p.m.
On 07/30/2014 03:04 AM, Patrice B wrote:
> I encountered this bug in psmisc 22.21. Since it is fixed in main
> stream, I proposed this patch created from psmisc git.
>
> More info here :
> http://sourceforge.net/p/psmisc/code/ci/3638cc55b4d08851faba46635d737b24d016665b/
>
>
> "Brad found that fuser had the -M option on all the time.
> A simple but significant typo caused this, thanks the patch.
>
> Bug-Debian: http://bugs.debian.org/740275"
>
> Signed-off-by: Patrice B <pbfwdlist@gmail.com>
>
>
> ---
>   ...001-Typo-in-fuser-makes-M-on-all-the-time.patch | 44 ++++++++++++++++++++++
>   meta/recipes-extended/psmisc/psmisc_22.21.bb       |  2 +
>   2 files changed, 46 insertions(+)
>   create mode 100644 meta/recipes-extended/psmisc/files/0001-Typo-in-fuser-makes-M-on-all-the-time.patch
>
> 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 0000000..3a4c9a9
> --- /dev/null
> +++ b/meta/recipes-extended/psmisc/files/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
> +

Sorry about not being clear here, you need an Upstream-Status: Tag in 
this patch file.

Please see the wiki link below for more details:
http://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines

Thanks
	Sau!

> +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.8.4.2
> +
> diff --git a/meta/recipes-extended/psmisc/psmisc_22.21.bb b/meta/recipes-extended/psmisc/psmisc_22.21.bb
> index 22f65c5..9f328bb 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"
>
>   SRC_URI[md5sum] = "935c0fd6eb208288262b385fa656f1bf"
>   SRC_URI[sha256sum] = "97323cad619210845b696d7d722c383852b2acb5c49b5b0852c4f29c77a8145a"
> +
> +SRC_URI += "file://0001-Typo-in-fuser-makes-M-on-all-the-time.patch"
>

Patch

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 0000000..3a4c9a9
--- /dev/null
+++ b/meta/recipes-extended/psmisc/files/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.8.4.2
+
diff --git a/meta/recipes-extended/psmisc/psmisc_22.21.bb b/meta/recipes-extended/psmisc/psmisc_22.21.bb
index 22f65c5..9f328bb 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"
 
 SRC_URI[md5sum] = "935c0fd6eb208288262b385fa656f1bf"
 SRC_URI[sha256sum] = "97323cad619210845b696d7d722c383852b2acb5c49b5b0852c4f29c77a8145a"
+
+SRC_URI += "file://0001-Typo-in-fuser-makes-M-on-all-the-time.patch"