Hello community, here is the log from the commit of package procps for openSUSE:Factory checked in at 2015-09-24 07:17:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/procps (Old) and /work/SRC/openSUSE:Factory/.procps.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "procps" Changes: -------- --- /work/SRC/openSUSE:Factory/procps/procps.changes 2015-07-21 13:24:30.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.procps.new/procps.changes 2015-09-24 07:17:29.000000000 +0200 @@ -1,0 +2,21 @@ +Fri Sep 18 12:41:05 UTC 2015 - [email protected] + +- Update to procps-ng-3.3.11 + * libprocps API 5:0:0 + * pgrep: don't crash with -a -w flags. Merge 33, Debian #768190 + * skill: command line with signal number interpreted correctly + * pmap: print process name even if smaps is unreadable Debian #775624 + * ps: sort by etimes column, uses etime Debian #794619 + * ps, top: Add support for LXC containers. Ubuntu #1174911 + * w: work with smaller window sizes Debian #183394 + * w: correctly find "best" proc with pid wrap + * library: use merged systemd library Debian #731256 + * kill,skill,pkill: fix option parsing + * top once again will fully honor a saved rcfile, + without requiring --disable-modern-top. Debian #762928, #762947 + * vmstat: Not crash if partition appears before disk Debian #736628 + * free: -s without -c works Debian #733758 +- Remove the patch procps-v3.3.4-w-simply-work.diff as now upstream +- Port our legacy pmap to new procps-ng-3.3.11 + +------------------------------------------------------------------- @@ -26 +47 @@ -- Update tp procps-ng-3.3.10 +- Update to procps-ng-3.3.10 Old: ---- procps-ng-3.3.10.tar.xz procps-v3.3.4-w-simply-work.diff New: ---- procps-ng-3.3.11.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ procps.spec ++++++ --- /var/tmp/diff_new_pack.0oBtVR/_old 2015-09-24 07:17:30.000000000 +0200 +++ /var/tmp/diff_new_pack.0oBtVR/_new 2015-09-24 07:17:30.000000000 +0200 @@ -18,7 +18,7 @@ %bcond_with bin2usr %bcond_with pidof -%define somajor 4 +%define somajor 5 %define libname libprocps%{somajor} Name: procps @@ -40,7 +40,7 @@ %endif %endif BuildRequires: xz -Version: 3.3.10 +Version: 3.3.11 Release: 0 Provides: ps = %version-%release Obsoletes: ps < %version-%release @@ -50,14 +50,13 @@ Summary: The ps utilities for /proc License: GPL-2.0+ and LGPL-2.1+ Group: System/Monitoring -Source: http://downloads.sourceforge.net/project/procps-ng/Production/procps-ng-3.3.10.tar.xz +Source: http://downloads.sourceforge.net/project/procps-ng/Production/procps-ng-3.3.11.tar.xz Source1: procps-pmap-legacy.tar.bz2 Source2: boot.sysctl Source3: systat.xinetd Patch0: procps-ng-3.3.9-watch.patch Patch1: procps-v3.3.3-ia64.diff Patch3: procps-ng-3.3.9-w-notruncate.diff -Patch4: procps-v3.3.4-w-simply-work.diff Patch5: procps-ng-3.3.8-top.1.diff Patch7: procps-ng-3.3.8-readeof.patch Patch8: procps-ng-3.3.10-slab.patch @@ -124,7 +123,6 @@ %patch0 %patch1 %patch3 -b .trcate -%patch4 %patch5 %patch7 %patch8 -b .cache @@ -142,7 +140,7 @@ %patch21 %patch28 %patch31 -p1 -%patch32 +%patch32 -b .xy %build tar --strip-components=1 -xf %{S:1} @@ -243,7 +241,7 @@ %files %defattr (-,root,root,755) -%doc NEWS README COPYING Documentation/BUGS Documentation/FAQ top/README.top +%doc NEWS COPYING COPYING.LIB Documentation/bugs.md Documentation/FAQ %if 0%{?suse_version} < 1230 %config /etc/init.d/boot.sysctl %endif ++++++ procps-ng-3.3.10-errno.patch ++++++ --- /var/tmp/diff_new_pack.0oBtVR/_old 2015-09-24 07:17:30.000000000 +0200 +++ /var/tmp/diff_new_pack.0oBtVR/_new 2015-09-24 07:17:30.000000000 +0200 @@ -6,20 +6,20 @@ and this causes a problem later on (bsc#908516) --- - free.c | 6 ++++++ - 1 file changed, 6 insertions(+) + free.c | 5 +++++ + 1 file changed, 5 insertions(+) --- free.c -+++ free.c 2015-01-27 15:28:08.494018768 +0000 -@@ -190,6 +190,7 @@ int main(int argc, char **argv) - int c, flags = 0; ++++ free.c 2015-09-18 12:38:22.565518967 +0000 +@@ -205,6 +205,7 @@ int main(int argc, char **argv) + int c, flags = 0, unit_set = 0; char *endptr; struct commandline_arguments args; + int errsv; /* * For long options that have no equivalent short option, use a -@@ -228,10 +229,12 @@ int main(int argc, char **argv) +@@ -255,10 +256,12 @@ int main(int argc, char **argv) #ifdef HAVE_PROGRAM_INVOCATION_NAME program_invocation_name = program_invocation_short_name; #endif @@ -32,15 +32,15 @@ while ((c = getopt_long(argc, argv, "bkmghltCc:ws:V", longopts, NULL)) != -1) switch (c) { -@@ -264,12 +267,15 @@ int main(int argc, char **argv) +@@ -325,6 +328,7 @@ int main(int argc, char **argv) break; case 's': flags |= FREE_REPEAT; + errsv = errno; -+ errno = 0; + errno = 0; args.repeat_interval = (1000000 * strtof(optarg, &endptr)); if (errno || optarg == endptr || (endptr && *endptr)) - xerrx(EXIT_FAILURE, _("seconds argument `%s' failed"), optarg); +@@ -332,6 +336,7 @@ int main(int argc, char **argv) if (args.repeat_interval < 1) xerrx(EXIT_FAILURE, _("seconds argument `%s' is not positive number"), optarg); ++++++ procps-ng-3.3.10-integer-overflow.patch ++++++ --- /var/tmp/diff_new_pack.0oBtVR/_old 2015-09-24 07:17:30.000000000 +0200 +++ /var/tmp/diff_new_pack.0oBtVR/_new 2015-09-24 07:17:30.000000000 +0200 @@ -1,25 +1,11 @@ ---- proc/sysinfo.c -+++ proc/sysinfo.c 2015-01-27 15:04:57.337518882 +0000 -@@ -708,8 +708,14 @@ nextline: - kb_main_cached = kb_page_cache + kb_slab; - if ((ev=getenv("PS_FULL_CACHE"))) - kb_main_cached += kb_slab_reclaimable + kb_swap_cached + kb_nfs_unstable; -- kb_swap_used = kb_swap_total - kb_swap_free; -- kb_main_used = kb_main_total - kb_main_free - kb_main_cached - kb_main_buffers; -+ if (kb_swap_total > kb_swap_free) -+ kb_swap_used = kb_swap_total - kb_swap_free; -+ else -+ kb_swap_used = 0; -+ if (kb_main_total > kb_main_free + kb_main_cached + kb_main_buffers) -+ kb_main_used = kb_main_total - kb_main_free - kb_main_cached - kb_main_buffers; -+ else -+ kb_main_used = 0; - - /* zero? might need fallback for 2.6.27 <= kernel <? 3.14 */ - if (!kb_main_available) { +--- + free.c | 17 +++++++++++++++-- + proc/sysinfo.c | 5 ++++- + 2 files changed, 19 insertions(+), 3 deletions(-) + --- free.c -+++ free.c 2015-01-27 15:07:36.725518136 +0000 -@@ -327,15 +327,28 @@ int main(int argc, char **argv) ++++ free.c 2015-01-27 15:07:37.000000000 +0000 +@@ -389,15 +389,28 @@ int main(int argc, char **argv) * to print the high info, even if it is zero. */ if (flags & FREE_LOHI) { @@ -50,3 +36,17 @@ printf(" %11s", scale_size(kb_high_free, flags, args)); printf("\n"); } +--- proc/sysinfo.c ++++ proc/sysinfo.c 2015-09-18 12:28:40.046018780 +0000 +@@ -709,7 +709,10 @@ nextline: + kb_main_cached = kb_page_cache + kb_slab; + if ((ev=getenv("PS_FULL_CACHE"))) + kb_main_cached += kb_slab_reclaimable + kb_swap_cached + kb_nfs_unstable; +- kb_swap_used = kb_swap_total - kb_swap_free; ++ if (kb_swap_total > kb_swap_free) ++ kb_swap_used = kb_swap_total - kb_swap_free; ++ else ++ kb_swap_used = 0; + + /* if kb_main_available is greater than kb_main_total or our calculation of + mem_used overflows, that's symptomatic of running within a lxc container ++++++ procps-ng-3.3.10-slab.patch ++++++ --- /var/tmp/diff_new_pack.0oBtVR/_old 2015-09-24 07:17:30.000000000 +0200 +++ /var/tmp/diff_new_pack.0oBtVR/_new 2015-09-24 07:17:30.000000000 +0200 @@ -2,13 +2,12 @@ free.1 | 7 +++++++ free.c | 7 ++++++- proc/sysinfo.c | 4 ++++ - proc/sysinfo.h | 5 +++++ vmstat.c | 6 +++++- - 5 files changed, 27 insertions(+), 2 deletions(-) + 4 files changed, 22 insertions(+), 2 deletions(-) --- free.1 -+++ free.1 2015-01-27 14:38:35.233518879 +0000 -@@ -82,6 +82,13 @@ Switch to the wide mode. The wide mode p ++++ free.1 2015-01-27 14:38:35.000000000 +0000 +@@ -101,6 +101,13 @@ Switch to the wide mode. The wide mode p than 80 characters. In this mode \fBbuffers\fR and \fBcache\fR are reported in two separate columns. .TP @@ -23,8 +22,8 @@ Display the result .I count --- free.c -+++ free.c 2015-01-27 14:43:17.341678624 +0000 -@@ -84,6 +84,7 @@ static void __attribute__ ((__noreturn__ ++++ free.c 2015-09-18 12:18:41.257517943 +0000 +@@ -90,6 +90,7 @@ static void __attribute__ ((__noreturn__ fputs(_(" -t, --total show total for RAM + swap\n"), out); fputs(_(" -s N, --seconds N repeat printing every N seconds\n"), out); fputs(_(" -c N, --count N repeat printing N times, then exit\n"), out); @@ -32,7 +31,7 @@ fputs(_(" -w, --wide wide output\n"), out); fputs(USAGE_SEPARATOR, out); fputs(_(" --help display this help and exit\n"), out); -@@ -212,6 +213,7 @@ int main(int argc, char **argv) +@@ -239,6 +240,7 @@ int main(int argc, char **argv) { "total", no_argument, NULL, 't' }, { "seconds", required_argument, NULL, 's' }, { "count", required_argument, NULL, 'c' }, @@ -40,7 +39,7 @@ { "wide", no_argument, NULL, 'w' }, { "help", no_argument, NULL, HELP_OPTION }, { "version", no_argument, NULL, 'V' }, -@@ -231,7 +233,7 @@ int main(int argc, char **argv) +@@ -258,7 +260,7 @@ int main(int argc, char **argv) textdomain(PACKAGE); atexit(close_stdout); @@ -48,8 +47,8 @@ + while ((c = getopt_long(argc, argv, "bkmghltCc:ws:V", longopts, NULL)) != -1) switch (c) { case 'b': - args.exponent = 1; -@@ -281,6 +283,9 @@ int main(int argc, char **argv) + check_unit_set(&unit_set); +@@ -343,6 +345,9 @@ int main(int argc, char **argv) case 'w': flags |= FREE_WIDE; break; @@ -60,7 +59,7 @@ usage(stdout); case 'V': --- proc/sysinfo.c -+++ proc/sysinfo.c 2015-01-27 14:45:59.665518819 +0000 ++++ proc/sysinfo.c 2015-09-18 12:20:41.721518774 +0000 @@ -3,6 +3,7 @@ * Copyright (C) 1992-1998 by Michael K. Johnson, [email protected] * Copyright 1998-2003 Albert Cahalan @@ -69,25 +68,25 @@ * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public -@@ -625,6 +626,7 @@ void meminfo(void){ - char namebuf[32]; /* big enough to hold any row name */ +@@ -626,6 +627,7 @@ void meminfo(void){ + int linux_version_code = procps_linux_version(); mem_table_struct findme = { namebuf, NULL}; mem_table_struct *found; + const char *ev; char *head; char *tail; static const mem_table_struct mem_table[] = { -@@ -704,6 +706,8 @@ nextline: +@@ -705,6 +707,8 @@ nextline: kb_inactive = kb_inact_dirty + kb_inact_clean + kb_inact_laundry; } kb_main_cached = kb_page_cache + kb_slab; + if ((ev=getenv("PS_FULL_CACHE"))) + kb_main_cached += kb_slab_reclaimable + kb_swap_cached + kb_nfs_unstable; kb_swap_used = kb_swap_total - kb_swap_free; - kb_main_used = kb_main_total - kb_main_free - kb_main_cached - kb_main_buffers; + /* if kb_main_available is greater than kb_main_total or our calculation of --- vmstat.c -+++ vmstat.c 2015-01-27 14:51:23.801518151 +0000 ++++ vmstat.c 2015-01-27 14:51:24.000000000 +0000 @@ -103,6 +103,7 @@ static void __attribute__ ((__noreturn__ fputs(_(" -p, --partition <dev> partition specific statistics\n"), out); fputs(_(" -S, --unit <char> define display unit\n"), out); ++++++ procps-ng-3.3.10.tar.xz -> procps-ng-3.3.11.tar.xz ++++++ ++++ 46160 lines of diff (skipped) ++++++ procps-ng-3.3.8-tinfo.dif ++++++ --- /var/tmp/diff_new_pack.0oBtVR/_old 2015-09-24 07:17:31.000000000 +0200 +++ /var/tmp/diff_new_pack.0oBtVR/_new 2015-09-24 07:17:31.000000000 +0200 @@ -1,6 +1,22 @@ +--- + Makefile.am | 2 +- + configure.ac | 8 ++++++++ + 2 files changed, 9 insertions(+), 1 deletion(-) + +--- Makefile.am ++++ Makefile.am 2015-09-18 12:33:07.753518470 +0000 +@@ -103,7 +103,7 @@ top_top_SOURCES = \ + top/top_nls.h \ + top/top_nls.c \ + lib/fileutils.c +-top_top_LDADD = $(LDADD) @NCURSES_LIBS@ $(DL_LIB) ++top_top_LDADD = $(LDADD) @TOP_NCURSES_LIBS@ $(DL_LIB) + endif + + if BUILD_SKILL --- configure.ac -+++ configure.ac 2013-05-29 13:25:27.693939536 +0000 -@@ -137,9 +137,17 @@ else ++++ configure.ac 2013-05-29 13:25:28.000000000 +0000 +@@ -141,9 +141,17 @@ else else WATCH_NCURSES_LIBS="$NCURSES_LIBS" fi @@ -18,14 +34,3 @@ AC_ARG_WITH([systemd], [AS_HELP_STRING([--with-systemd], [enable systemd support])], ---- top/Makefile.am -+++ top/Makefile.am 2012-06-04 10:58:15.024104602 +0000 -@@ -19,7 +19,7 @@ top_SOURCES = \ - dist_man_MANS = \ - top.1 - --top_LDADD = @NCURSES_LIBS@ -+top_LDADD = @TOP_NCURSES_LIBS@ - endif - - EXTRA_DIST = ++++++ procps-ng-3.3.9-watch.patch ++++++ --- /var/tmp/diff_new_pack.0oBtVR/_old 2015-09-24 07:17:31.000000000 +0200 +++ /var/tmp/diff_new_pack.0oBtVR/_new 2015-09-24 07:17:31.000000000 +0200 @@ -1,14 +1,3 @@ ---- configure.ac -+++ configure.ac 2013-05-29 10:45:47.000000000 +0000 -@@ -70,7 +70,7 @@ AC_FUNC_MMAP - AC_FUNC_REALLOC - AC_FUNC_STRTOD - --usrbin_execdir='${exec_prefix}/usr/bin' -+usrbin_execdir='${exec_prefix}/bin' - AC_SUBST([usrbin_execdir]) - - AM_GNU_GETTEXT_VERSION([0.14.1]) --- proc/libprocps.sym +++ proc/libprocps.sym 2014-05-15 13:16:40.950235845 +0000 @@ -14,6 +14,7 @@ global: ++++++ procps-pmap-legacy.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/procps-pmap-legacy/pmap.c new/procps-pmap-legacy/pmap.c --- old/procps-pmap-legacy/pmap.c 2013-10-07 15:35:23.000000000 +0200 +++ new/procps-pmap-legacy/pmap.c 2015-09-18 15:14:11.000000000 +0200 @@ -22,6 +22,7 @@ #include <sys/utsname.h> #include <unistd.h> +#include "c.h" #include "proc/readproc.h" #include "proc/version.h" #include "xalloc.h" @@ -290,7 +291,7 @@ while ((o = getopt_long(argc, argv, "hqdxA:V", longopts, NULL)) != -1) { switch (o) { case 'V': - display_version(); + printf("%s using library of %s\n", program_invocation_short_name, PACKAGE_STRING); return 0; case 'q': quiet = 1;
