diff --git a/psmisc-23.0-net.patch b/psmisc-23.0-net.patch new file mode 100644 index 0000000..ce55c18 --- /dev/null +++ b/psmisc-23.0-net.patch @@ -0,0 +1,36 @@ +--- + src/fuser.c | 23 ++++++++++++----------- + 1 file changed, 12 insertions(+), 11 deletions(-) + +--- 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")); diff --git a/psmisc-23.0.dif b/psmisc-23.0.dif index d3653e6..9f6f515 100644 --- a/psmisc-23.0.dif +++ b/psmisc-23.0.dif @@ -5,7 +5,7 @@ 3 files changed, 11 insertions(+), 8 deletions(-) --- configure.ac -+++ configure.ac 2017-06-20 14:31:15.914973762 +0000 ++++ configure.ac 2017-06-28 13:10:43.594188007 +0000 @@ -42,7 +42,7 @@ fi if test "$enable_timeout_stat" = "static"; then AC_DEFINE([WITH_TIMEOUT_STAT], [2], [Use timeout on stat calls]) @@ -25,7 +25,7 @@ AC_CHECK_MEMBERS([struct pt_regs.orig_gpr3, struct pt_regs.gpr], [],[], [#include ]) --- doc/Makefile.am -+++ doc/Makefile.am 2017-06-20 15:23:10.973015404 +0000 ++++ doc/Makefile.am 2017-06-28 13:10:43.594188007 +0000 @@ -1,5 +1,5 @@ -man_MANS = killall.1 peekfd.1 prtstat.1 pstree.1 @@ -34,7 +34,7 @@ if WANT_FUSER --- src/fuser.c -+++ src/fuser.c 2017-06-20 14:33:26.908568387 +0000 ++++ src/fuser.c 2017-06-28 13:10:43.594188007 +0000 @@ -1041,6 +1041,7 @@ int main(int argc, char *argv[]) struct option *optr; char *nsptr; @@ -51,7 +51,7 @@ for (argc_cnt = 1; argc_cnt < argc; argc_cnt++) { current_argv = argv[argc_cnt]; if (current_argv[0] == '-') { /* its an option */ -@@ -1234,6 +1236,7 @@ int main(int argc, char *argv[]) +@@ -1235,6 +1237,7 @@ int main(int argc, char *argv[]) } } this_name->matched_procs = NULL; @@ -59,7 +59,7 @@ if (opts & (OPT_MOUNTS | OPT_ISMOUNTPOINT) && this_name->name_space != NAMESPACE_FILE) { free(this_name); -@@ -1287,7 +1290,7 @@ int main(int argc, char *argv[]) +@@ -1288,7 +1291,7 @@ int main(int argc, char *argv[]) names_tail->next = this_name; names_tail = this_name; } /* for across the argvs */ @@ -68,7 +68,7 @@ usage(_("No process specification given")); /* Check if -M flag was used and if so check mounts */ -@@ -1551,17 +1554,17 @@ check_dir(const pid_t pid, const char *d +@@ -1552,17 +1555,17 @@ check_dir(const pid_t pid, const char *d struct device_list *dev_tmp; struct unixsocket_list *sock_tmp; struct stat st, lst; diff --git a/psmisc.changes b/psmisc.changes index 0eee9f8..f6f9e87 100644 --- a/psmisc.changes +++ b/psmisc.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Jun 28 13:11:49 UTC 2017 - werner@suse.de + +- Add patch psmisc-23.0-net.patch to reenable network support + broken to my own upstream commit + ------------------------------------------------------------------- Wed Jun 28 10:00:16 UTC 2017 - werner@suse.de diff --git a/psmisc.spec b/psmisc.spec index 56a4559..0441544 100644 --- a/psmisc.spec +++ b/psmisc.spec @@ -41,6 +41,8 @@ Patch4: %{name}-22.21-mntpt.patch Patch5: %{name}-22.21-lessnfs.patch # PATCH-FIX_UPSTREAM boo#1046237 -- Debug output in killall from psmisc package Patch6: %{name}-%{version}-killall.patch +# PATCH-FIX-SUSE broken net support as the mntstat does not work with fd of sockets +Patch7: %{name}-%{version}-net.patch %define have_peekfd %ix86 x86_64 ppc ppc64 ppc64le %arm mipsel m68k @@ -61,6 +63,7 @@ ln -sf %{name}-v%{version}-%{hash} %{name}-%version %patch4 -p0 -b .mntpt %patch5 -p0 -b .lessnfs %patch6 -p0 -b .ka +%patch7 -p0 -b .net %patch0 -p0 -b .0 %build