pool/psmisc
2
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

.

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/Base:System/psmisc?expand=0&rev=85
This commit is contained in:
Dr. Werner Fink 2017-06-28 16:53:30 +00:00 committed by Git OBS Bridge
parent 4e258aabaa
commit fa603a808e
2 changed files with 13 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
psmisc-23.0-net.patch
View File

@ -1,36 +1,15 @@
--- ---
src/fuser.c | 23 ++++++++++++----------- src/fuser.c | 2 +-
1 file changed, 12 insertions(+), 11 deletions(-) 1 file changed, 1 insertion(+), 1 deletion(-)
--- src/fuser.c --- src/fuser.c
+++ src/fuser.c 2017-06-28 13:07:15.917978249 +0000 +++ src/fuser.c 2017-06-28 16:52:23.402294591 +0000
@@ -1160,17 +1160,18 @@ int main(int argc, char *argv[]) @@ -1210,7 +1210,7 @@ int main(int argc, char *argv[])
} }
skip_argv = 1;
//while(option != '\0') option++; #if defined(WITH_MOUNTINFO_LIST)
- if (strcmp(argv[argc_cnt], "tcp") == 0) - if ((opts & OPT_ALWAYSSTAT) == 0)
- default_namespace = + if ((opts & (OPT_MOUNT|OPT_ALWAYSSTAT)) == OPT_MOUNT)
- NAMESPACE_TCP; thestat = mntstat;
- else if (strcmp(argv[argc_cnt], "udp") #endif
- == 0) /* an option */
- 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"));

1
psmisc.spec
View File

@ -63,6 +63,7 @@ ln -sf %{name}-v%{version}-%{hash} %{name}-%version
%patch4 -p0 -b .mntpt %patch4 -p0 -b .mntpt
%patch5 -p0 -b .lessnfs %patch5 -p0 -b .lessnfs
%patch6 -p0 -b .ka %patch6 -p0 -b .ka
exit 1
%patch7 -p0 -b .net %patch7 -p0 -b .net
%patch0 -p0 -b .0 %patch0 -p0 -b .0