Hello community, here is the log from the commit of package psmisc for openSUSE:Factory checked in at 2014-03-27 06:15:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/psmisc (Old) and /work/SRC/openSUSE:Factory/.psmisc.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "psmisc" Changes: -------- --- /work/SRC/openSUSE:Factory/psmisc/psmisc.changes 2013-10-24 14:41:24.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.psmisc.new/psmisc.changes 2014-03-27 06:16:00.000000000 +0100 @@ -1,0 +2,21 @@ +Mon Mar 24 16:01:51 UTC 2014 - [email protected] + +- Update to version 22.21 + * Missing comma in fuser(1) added Debian #702391 + * pstree uses COLUMN env variable Debian #717017 + * pstree shows proper thread names SF Bug#57 + * pstree shows namespace options SF Patch#30 + * killall.1 minor fixes SF Bug#59 + * peekfd for m68k SF Patch#31 + * Fixing some derefefed pointers SF Patch#32 + * Minor typos in man pages SF Bug#61 Bug#60 + * fuser -m and -M flags work either way Debian #606178 +- Remove patch + psmisc-22.20-pstree.patch as now part of upstream + peekfd-m68k.patch as now part of upstream +- Port the patches + psmisc-22.20-upstream.patch which becomes psmisc-22.21-upstream.patch + psmisc-22.20.dif which becomes psmisc-22.21.dif + psmisc-22.12-pstree.patch which becomes psmisc-22.21-pstree.patch + +------------------------------------------------------------------- Old: ---- peekfd-m68k.patch psmisc-22.12-pstree.patch psmisc-22.20-pstree.patch psmisc-22.20.dif New: ---- psmisc-22.21-pstree.patch psmisc-22.21-upstream.patch psmisc-22.21.dif psmisc-22.21.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ psmisc.spec ++++++ --- /var/tmp/diff_new_pack.A0OcB7/_old 2014-03-27 06:16:01.000000000 +0100 +++ /var/tmp/diff_new_pack.A0OcB7/_new 2014-03-27 06:16:01.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package psmisc # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -23,7 +23,7 @@ BuildRequires: libselinux-devel BuildRequires: ncurses-devel Url: http://sourceforge.net/projects/psmisc/ -Version: 22.20 +Version: 22.21 Release: 0 Provides: ps:/usr/bin/killall Recommends: %{name}-lang @@ -31,12 +31,10 @@ License: GPL-2.0+ Group: System/Monitoring Source: http://sourceforge.net/projects/psmisc/files/psmisc/%{name}-%{version}.tar.gz -Patch0: %name-22.20.dif +Patch0: %name-22.21.dif Patch1: %name-22.12-tigetstr.patch -Patch2: %name-22.12-pstree.patch -Patch3: %name-22.20-pstree.patch -Patch4: peekfd-m68k.patch -Patch42: %{name}-%{version}-upstream.patch +Patch2: %name-22.21-pstree.patch +Patch42: %{name}-22.21-upstream.patch %define nopeek s390 s390x ia64 %sparc hppa aarch64 @@ -55,9 +53,7 @@ %patch42 -p0 -b .up %patch1 -p0 -b .tigetstr %patch2 -p0 -b .pstree -%patch3 -p0 -b .se %patch0 -p0 -b .0 -%patch4 -p1 %build autoreconf -fi ++++++ psmisc-22.20-upstream.patch ++++++ --- /var/tmp/diff_new_pack.A0OcB7/_old 2014-03-27 06:16:01.000000000 +0100 +++ /var/tmp/diff_new_pack.A0OcB7/_new 2014-03-27 06:16:01.000000000 +0100 @@ -18,9 +18,9 @@ + reduce the load due write/read the stat buffers + * Add list_sort() to lists.h to be able to sort lists + - Changes in 22.20 + Changes in 22.21 ================ - * pstree sorts properly on names Debian #682014 + * Missing comma in fuser(1) added Debian #702391 diff --git configure.ac configure.ac index 9df639d..cb03ba9 100644 --- configure.ac ++++++ psmisc-22.12-pstree.patch -> psmisc-22.21-pstree.patch ++++++ --- /work/SRC/openSUSE:Factory/psmisc/psmisc-22.12-pstree.patch 2011-09-23 12:42:03.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.psmisc.new/psmisc-22.21-pstree.patch 2014-03-27 06:16:00.000000000 +0100 @@ -1,6 +1,6 @@ --- src/pstree.c -+++ src/pstree.c 2010-07-13 10:27:54.139239142 +0000 -@@ -61,6 +61,7 @@ extern const char *__progname; ++++ src/pstree.c 2014-03-24 15:54:58.905193559 +0000 +@@ -69,6 +69,7 @@ extern const char *__progname; #define UTF_HD "\342\224\254" /* U+252C, Horizontal and down */ #define VT_BEG "\033(0\017" /* use graphic chars */ @@ -8,9 +8,9 @@ #define VT_END "\033(B" /* back to normal char set */ #define VT_V "x" /* see UTF definitions above */ #define VT_VR "t" -@@ -230,6 +231,27 @@ static void out_scontext(security_contex +@@ -397,6 +398,27 @@ static void out_scontext(security_contex + out_string("'"); } - #endif /*WITH_SELINUX */ +/* + * Only affects vt100 line drawing mode: Do not count the strlen of @@ -33,10 +33,10 @@ + } +} + - static void out_newline(void) { -@@ -426,11 +448,12 @@ dump_tree(PROC * current, int level, int + if (last_char && cur_x == output_width) +@@ -605,11 +627,12 @@ dump_tree(PROC * current, int level, int for (lvl = 0; lvl < level; lvl++) { for (i = width[lvl] + 1; i; i--) out_char(' '); @@ -54,7 +54,7 @@ } if (rep < 2) add = 0; -@@ -531,7 +554,7 @@ dump_tree(PROC * current, int level, int +@@ -714,7 +737,7 @@ dump_tree(PROC * current, int level, int } width[level] = comm_len + cur_x - offset + add; if (cur_x >= output_width && trunc) { @@ -63,7 +63,7 @@ out_string("+"); out_newline(); return; -@@ -553,7 +576,7 @@ dump_tree(PROC * current, int level, int +@@ -736,7 +759,7 @@ dump_tree(PROC * current, int level, int } } if (first) { ++++++ psmisc-22.21-upstream.patch ++++++ ++++ 838 lines (skipped) ++++++ psmisc-22.20.dif -> psmisc-22.21.dif ++++++ --- /work/SRC/openSUSE:Factory/psmisc/psmisc-22.20.dif 2012-12-21 15:02:18.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.psmisc.new/psmisc-22.21.dif 2014-03-27 06:16:00.000000000 +0100 @@ -1,5 +1,14 @@ --- configure.ac +++ configure.ac 2010-10-15 09:00:33.000000000 +0000 +@@ -40,7 +40,7 @@ fi + if test "$enable_timeout_stat" = "static"; then + AC_DEFINE([WITH_TIMEOUT_STAT], [2], [Use timeout on stat calls]) + fi +-AM_CONDITIONAL([WANT_TIMEOUT_STAT], [test "$enable_timeout_stat" = "static"]) ++AM_CONDITIONAL([WANT_TIMEOUT_STAT], [test "$enable_timeout_stat" != "no"]) + + # Use string search for network based file systems but only if the system + # has /proc/self/mountinfo @@ -121,7 +121,7 @@ AC_CHECK_MEMBERS([struct user_regs_struc struct user_regs_struct.rdi, struct user_regs_struct.rsi, @@ -10,8 +19,8 @@ AC_CHECK_MEMBERS([struct pt_regs.orig_gpr3, struct pt_regs.gpr], [],[], [#include <linux/ptrace.h>]) --- src/fuser.c -+++ src/fuser.c 2012-12-18 16:52:23.749452207 +0000 -@@ -878,6 +878,7 @@ int main(int argc, char *argv[]) ++++ src/fuser.c 2014-03-24 15:56:40.134235583 +0000 +@@ -901,6 +901,7 @@ int main(int argc, char *argv[]) struct option *optr; char *nsptr; int skip_argv; @@ -19,7 +28,7 @@ struct option options[] = { {"all", 0, NULL, 'a'}, -@@ -918,6 +919,7 @@ int main(int argc, char *argv[]) +@@ -941,6 +942,7 @@ int main(int argc, char *argv[]) fill_unix_cache(&unixsockets); #endif @@ -27,7 +36,7 @@ for (argc_cnt = 1; argc_cnt < argc; argc_cnt++) { current_argv = argv[argc_cnt]; if (current_argv[0] == '-') { /* its an option */ -@@ -1070,6 +1072,7 @@ int main(int argc, char *argv[]) +@@ -1093,6 +1095,7 @@ int main(int argc, char *argv[]) } } this_name->matched_procs = NULL; @@ -35,7 +44,7 @@ if (opts & (OPT_MOUNTS | OPT_ISMOUNTPOINT) && this_name->name_space != NAMESPACE_FILE) usage(_ -@@ -1126,7 +1129,7 @@ int main(int argc, char *argv[]) +@@ -1144,7 +1147,7 @@ int main(int argc, char *argv[]) names_tail->next = this_name; names_tail = this_name; } /* for across the argvs */ @@ -43,4 +52,4 @@ + if (names_head == NULL && !seen_file) usage(_("No process specification given")); - if (opts & OPT_SILENT) { + /* Check if -M flag was used and if so check mounts */ -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
