From fa603a808e80817f6a85efa6923bba4da12559f1 Mon Sep 17 00:00:00 2001
From: "Dr. Werner Fink" <werner@suse.com>
Date: Wed, 28 Jun 2017 16:53:30 +0000
Subject: [PATCH] .

OBS-URL: https://build.opensuse.org/package/show/Base:System/psmisc?expand=0&rev=85
---
 psmisc-23.0-net.patch | 45 ++++++++++++-------------------------------
 psmisc.spec           |  1 +
 2 files changed, 13 insertions(+), 33 deletions(-)

diff --git a/psmisc-23.0-net.patch b/psmisc-23.0-net.patch
index ce55c18..9e2fb4d 100644
--- a/psmisc-23.0-net.patch
+++ b/psmisc-23.0-net.patch
@@ -1,36 +1,15 @@
 ---
- src/fuser.c |   23 ++++++++++++-----------
- 1 file changed, 12 insertions(+), 11 deletions(-)
+ src/fuser.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 --- src/fuser.c
-+++ src/fuser.c	2017-06-28 13:07:15.917978249 +0000
-@@ -1160,17 +1160,18 @@ int main(int argc, char *argv[])
- 					}
- 					skip_argv = 1;
- 					//while(option != '\0') option++;
--					if (strcmp(argv[argc_cnt], "tcp") == 0)
--						default_namespace =
--						    NAMESPACE_TCP;
--					else if (strcmp(argv[argc_cnt], "udp")
--						 == 0)
--						default_namespace =
--						    NAMESPACE_UDP;
--					else if (strcmp(argv[argc_cnt], "file")
--						 == 0)
--						default_namespace =
--						    NAMESPACE_FILE;
-+					if (strcmp(argv[argc_cnt], "tcp") == 0) {
-+						default_namespace = NAMESPACE_TCP;
-+#if defined(WITH_MOUNTINFO_LIST)
-+						opts |= OPT_ALWAYSSTAT;
-+#endif
-+					} else if (strcmp(argv[argc_cnt], "udp") == 0) {
-+						default_namespace = NAMESPACE_UDP;
-+#if defined(WITH_MOUNTINFO_LIST)
-+						opts |= OPT_ALWAYSSTAT;
-+#endif
-+					} else if (strcmp(argv[argc_cnt], "file") == 0)
-+						default_namespace = NAMESPACE_FILE;
- 					else
- 						usage(_
- 						      ("Invalid namespace name"));
++++ src/fuser.c	2017-06-28 16:52:23.402294591 +0000
+@@ -1210,7 +1210,7 @@ int main(int argc, char *argv[])
+ 		}
+ 
+ #if defined(WITH_MOUNTINFO_LIST)
+-		if ((opts & OPT_ALWAYSSTAT) == 0)
++		if ((opts & (OPT_MOUNT|OPT_ALWAYSSTAT)) == OPT_MOUNT)
+ 			thestat = mntstat;
+ #endif
+ 		/* an option */
diff --git a/psmisc.spec b/psmisc.spec
index 0441544..1bef9a3 100644
--- a/psmisc.spec
+++ b/psmisc.spec
@@ -63,6 +63,7 @@ ln -sf %{name}-v%{version}-%{hash} %{name}-%version
 %patch4 -p0 -b .mntpt
 %patch5 -p0 -b .lessnfs
 %patch6 -p0 -b .ka
+exit 1
 %patch7 -p0 -b .net
 %patch0 -p0 -b .0