Hello community,
here is the log from the commit of package procps for openSUSE:Factory checked in at 2018-04-20 17:24:44
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/procps (Old)
and /work/SRC/openSUSE:Factory/.procps.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "procps"
Fri Apr 20 17:24:44 2018 rev:110 rq:593914 version:3.3.13
Changes:
--------
--- /work/SRC/openSUSE:Factory/procps/procps.changes 2018-03-01 12:06:44.968379609 +0100
+++ /work/SRC/openSUSE:Factory/.procps.new/procps.changes 2018-04-20 17:24:47.176729797 +0200
@@ -1,0 +2,80 @@
+Thu Apr 5 17:52:38 UTC 2018 - jengelh@inai.de
+
+- Update descriptions.
+
+-------------------------------------------------------------------
+Thu Apr 5 09:03:49 UTC 2018 - werner@suse.de
+
+- Remove sysvinit boot script
+- Add procps-rpmlintrc
+
+-------------------------------------------------------------------
+Wed Apr 4 13:16:25 UTC 2018 - werner@suse.de
+
+- Update to procps-ng-3.3.13
+ * library: Increment to 7:0:1
+ No changes, no removals
+ New fuctions: numa_init, numa_max_node, numa_node_of_cpu,
+ numa_uninit, xalloc_err_handler
+ * doc: Document I idle state in ps.1 and top.1 Debian #886967
+ * free: fix some of the SI multiples issue #45
+ * kill: -l space between name parses correctly Debian #854407
+ * library: dont use vm_min_free on non Linux Debian #831396
+ * library: dont use SIGPWR on FreeBSD Debian #832148
+ * library: don't strip off wchan prefixes (ps & top) Redhat #1322111
+ * pgrep: warn about 15+ char name only if -f not used
+ * pgrep/pkill: only match in same namespace by default merge #41
+ * pidof: specify separator between pids merge #58
+ * pkill: Return 0 only if we can kill process Debian #852758
+ * pmap: fix duplicate output line under '-x' option Redhat #1374061
+ * ps: avoid eip/esp address truncations Debian #846361
+ * ps: recognizes SCHED_DEADLINE as valid CPU scheduler
+ * ps: display NUMA node under which a thread ran issue #58
+ * ps: Add seconds display for cputime and time merge #43
+ * ps: Add LUID field merge #57 Redhat #1518986
+ * sysctl: Permit empty string for value issue #74
+ * sysctl: Don't segv when file not available issue #76
+ * sysctl: Read and write large buffers merge #56
+ * top: add config file support for XDG specification
+ * top: eliminated minor libnuma memory leak
+ * top: show fewer memory decimal places (configurable) issue #50
+ * top: provide command line switch for memory scaling Redhat #1034466, issue #53
+ * top: provide command line switch for CPU States issue #55
+ * top: provides more accurate cpu usage at startup Redhat #1182327
+ * top: display NUMA node under which a thread ran issue #58
+ * top: fix argument parsing quirk resulting in SEGV Redhat #1450429
+ * top: delay interval accepts non-locale radix point Redhat #1182248
+ * top: address a wishlist man page NLS suggestion Debian #865689
+ * top: fix potential distortion in 'Mem' graph display issue #64
+ * top: provide proper multi-byte string handling issue #68
+ * top: startup defaults are fully customizable Redhat #1153049, #1499410, issues #6, #78
+ * see man page 6c. SYSTEM Configuration File
+ * watch: define HOST_NAME_MAX where not defined Debian #830734
+ * vmstat: Fix alignment for disk partition format issue #69
+ * watch: Support ANSI 39,49 reset sequences issue #73
+- Removed now patch now upstream
+ 0001-Preload-sysctl-lines-even-if-longer-than-stdio-buffe.patch
+ 0002-Add-flexible-buffered-I-O-based-on-fopencookie-3.patch
+ 0003-Use-new-standard-I-O-for-reading-writing-sysctl-valu.patch
+ procps-ng-3.3.12-stable_secret.patch
+ procps-ng-3.3.12-strtod.patch
+ procps-ng-3.3.12-sysctl-a.patch
+ procps-ng-3.3.12-sysctl-iobuf.patch
+- Port patches
+ procps-ng-3.3.10-bnc634071_procstat2.diff
+ procps-ng-3.3.10-errno.patch
+ procps-ng-3.3.10-fdleak.dif
+ procps-ng-3.3.10-integer-overflow.patch
+ procps-ng-3.3.10-large_pcpu.patch
+ procps-ng-3.3.10-slab.patch
+ procps-ng-3.3.11-pmap4suse.patch
+ procps-ng-3.3.8-accuracy.dif
+ procps-ng-3.3.8-bnc634840.patch
+ procps-ng-3.3.8-ignore-scan_unevictable_pages.patch
+ procps-ng-3.3.8-petabytes.patch
+ procps-ng-3.3.8-readeof.patch
+ procps-ng-3.3.8-tinfo.dif
+ procps-ng-3.3.8-top.1.diff
+ procps-v3.3.3-read-sysctls-also-from-boot-sysctl.conf-kernelversion.diff
+
+-------------------------------------------------------------------
Old:
----
0001-Preload-sysctl-lines-even-if-longer-than-stdio-buffe.patch
0002-Add-flexible-buffered-I-O-based-on-fopencookie-3.patch
0003-Use-new-standard-I-O-for-reading-writing-sysctl-valu.patch
boot.sysctl
procps-ng-3.3.12-stable_secret.patch
procps-ng-3.3.12-strtod.patch
procps-ng-3.3.12-sysctl-a.patch
procps-ng-3.3.12-sysctl-iobuf.patch
procps-ng-3.3.12.tar.xz
New:
----
procps-ng-3.3.13.tar.xz
procps-rpmlintrc
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ procps.spec ++++++
--- /var/tmp/diff_new_pack.MddOjQ/_old 2018-04-20 17:24:48.364686721 +0200
+++ /var/tmp/diff_new_pack.MddOjQ/_new 2018-04-20 17:24:48.364686721 +0200
@@ -21,16 +21,16 @@
%bcond_with bin2usr
%bcond_with pidof
Name: procps
-Version: 3.3.12
+Version: 3.3.13
Release: 0
Summary: The ps utilities for /proc
-#Alternate: https://gitlab.com/procps-ng/procps/repository/archive.tar.bz2?ref=v3.3.12
+#Alternate: https://gitlab.com/procps-ng/procps/repository/archive.tar.bz2?ref=v3.3.13
#Also: http://gitorious.org/procps/
-License: GPL-2.0+ and LGPL-2.1+
+License: GPL-2.0-or-later AND LGPL-2.1-or-later
Group: System/Monitoring
Url: http://sf.net/projects/procps-ng/
-Source: http://downloads.sourceforge.net/project/procps-ng/Production/procps-ng-3.3....
-Source2: boot.sysctl
+Source: http://downloads.sourceforge.net/project/procps-ng/Production/procps-ng-3.3....
+Source1: procps-rpmlintrc
Patch0: procps-ng-3.3.9-watch.patch
Patch1: procps-v3.3.3-ia64.diff
Patch3: procps-ng-3.3.9-w-notruncate.diff
@@ -51,28 +51,16 @@
Patch21: procps-v3.3.3-pwdx.patch
# PATCH-FIX-OPENSUSE -- trifle rest of the old terabyte patch
Patch28: procps-ng-3.3.8-vmstat-terabyte.dif
-# PATCH-FIX-SUSE -- Avoid error due missed declaration
-Patch30: procps-ng-3.3.12-strtod.patch
# PATCH-FIX-SUSE -- Ignore scan_unevictable_pages in sysctl
Patch31: procps-ng-3.3.8-ignore-scan_unevictable_pages.patch
# PATCH-FIX-SUSE -- Avoid errno set by setlocale()
Patch32: procps-ng-3.3.10-errno.patch
# PATCH-FEATURE-SUSE -- Let upstream pmap behave simialr to old suse pmap
Patch33: procps-ng-3.3.11-pmap4suse.patch
-# PATCH-FIX-UPSTREAM -- Allow content lines below /proc/sys longer than 1024 characters
-Patch34: procps-ng-3.3.12-sysctl-a.patch
-# PATCH-ENHANCE-SUSE -- Increase buffer on reading/writing /proc/sys values
-Patch35: procps-ng-3.3.12-sysctl-iobuf.patch
-# PATCH-FIX-SUSE -- Ignore EIO on reading unset value of e.g. /proc/sys/net/ipv6/conf/all/stable_secret
-Patch36: procps-ng-3.3.12-stable_secret.patch
-# PATCH-ENHANCE-SUSE -- Use increased buffer on writing /proc/sys/net/ipv4/ip_local_reserved_ports
-#Patch37: procps-ng-3.3.12-sysctl-iobuf-write.patch
-Patch37: 0001-Preload-sysctl-lines-even-if-longer-than-stdio-buffe.patch
-Patch38: 0002-Add-flexible-buffered-I-O-based-on-fopencookie-3.patch
-Patch39: 0003-Use-new-standard-I-O-for-reading-writing-sysctl-valu.patch
BuildRequires: automake
BuildRequires: dejagnu
+BuildRequires: diffutils
BuildRequires: libselinux-devel
BuildRequires: libtool
BuildRequires: ncurses-devel
@@ -113,23 +101,25 @@
about processes, memory, paging, block I/O, traps, and CPU activity.
%package devel
-Summary: Include Files and Libraries mandatory for Development
-License: GPL-2.0+ and LGPL-2.1+
+Summary: Development files for procps
+License: GPL-2.0-or-later AND LGPL-2.1-or-later
Group: Development/Libraries/C and C++
Requires: %{libname} = %{version}
%description devel
-This package contains all necessary include files and libraries needed
-to develop applications that require these.
+The procps library can be used to read informations out from /proc
+the process information pseudo-file system.
+
+This subpackage contains the header files for libprocps.
%package -n %{libname}
Summary: The procps library
-License: LGPL-2.1+
+License: LGPL-2.1-or-later
Group: System/Libraries
%description -n %{libname}
The procps library can be used to read informations out from /proc
-the process information pseudo-file system,
+the process information pseudo-file system.
%prep
%setup -q -n %{name}-ng-%{version}
@@ -152,16 +142,9 @@
%patch20
%patch21
%patch28
-%patch30
%patch31 -p1
%patch32
%patch33
-%patch34
-%patch35
-%patch36
-%patch37 -b .0001
-%patch38 -b .0002
-%patch39 -b .0003
%build
#
@@ -217,10 +200,6 @@
%make_install
install -d %{buildroot}/bin
install -d %{buildroot}/sbin
-%if 0%{?suse_version} < 1230
-install -d %{buildroot}%{_sysconfdir}/init.d
-install -m 755 %{SOURCE2} %{buildroot}%{_sysconfdir}/init.d
-%endif
# clean unwanted files (e.g. coreutils)
rm -f %{buildroot}%{_bindir}/kill
@@ -230,6 +209,14 @@
find %{buildroot} -type f -name "*.la" -delete -print
rm -rf %{buildroot}%{_datadir}/doc/procps-ng
+if cmp -s %{buildroot}%{_mandir}/man1/procps.1 %{buildroot}%{_mandir}/man1/ps.1
+then
+ rm -vf %{buildroot}%{_mandir}/man1/procps.1
+ (cat > %{buildroot}%{_mandir}/man1/procps.1)<<-'EOF'
+ .so man1/ps.1
+ EOF
+fi
+
%if %{with bin2usr}
#
# Identical binaries
@@ -280,14 +267,6 @@
ln -s /sbin/sysctl %{buildroot}%{_sbindir}/sysctl
%endif
-%if 0%{?suse_version} < 1230
-%post
-%{fillup_and_insserv -ny boot.sysctl boot.sysctl}
-
-%postun
-%insserv_cleanup
-%endif
-
%post -n %{libname} -p /sbin/ldconfig
%postun -n %{libname} -p /sbin/ldconfig
@@ -340,9 +319,6 @@
%defattr (-,root,root,755)
%license COPYING COPYING.LIB
%doc NEWS Documentation/bugs.md Documentation/FAQ
-%if 0%{?suse_version} < 1230
-%config %{_initddir}/boot.sysctl
-%endif
%if %{with bin2usr}
%verify(link) /bin/ps
%verify(link) /bin/pgrep
@@ -383,6 +359,7 @@
%endif
%{_mandir}/man1/pkill.1%{ext_man}
%{_mandir}/man1/pmap.1%{ext_man}
+%{_mandir}/man1/procps.1%{ext_man}
%{_mandir}/man1/ps.1%{ext_man}
%{_mandir}/man1/pwdx.1%{ext_man}
%{_mandir}/man1/skill.1%{ext_man}
@@ -402,7 +379,7 @@
%{_includedir}/proc/alloc.h
%{_includedir}/proc/devname.h
%{_includedir}/proc/escape.h
-%{_includedir}/proc/procio.h
+%{_includedir}/proc/numa.h
%{_includedir}/proc/procps.h
%{_includedir}/proc/pwcache.h
%{_includedir}/proc/readproc.h
@@ -414,7 +391,6 @@
%{_includedir}/proc/whattime.h
%{_libdir}/libprocps.so
%{_libdir}/pkgconfig/libprocps.pc
-%{_mandir}/man3/procio.3%{ext_man}
%{_mandir}/man3/openproc.3%{ext_man}
%{_mandir}/man3/readproc.3%{ext_man}
%{_mandir}/man3/readproctab.3%{ext_man}
++++++ procps-ng-3.3.10-bnc634071_procstat2.diff ++++++
--- /var/tmp/diff_new_pack.MddOjQ/_old 2018-04-20 17:24:48.400685416 +0200
+++ /var/tmp/diff_new_pack.MddOjQ/_new 2018-04-20 17:24:48.400685416 +0200
@@ -5,8 +5,8 @@
3 files changed, 14 insertions(+), 2 deletions(-)
--- proc/libprocps.sym
-+++ proc/libprocps.sym 2016-07-11 13:11:10.857365085 +0000
-@@ -54,6 +54,7 @@ global:
++++ proc/libprocps.sym 2018-04-04 11:30:51.841725161 +0000
+@@ -60,6 +60,7 @@ global:
signal_name_to_number;
signal_number_to_name;
smp_num_cpus;
@@ -15,10 +15,10 @@
strtosig;
tty_to_dev;
--- proc/sysinfo.c
-+++ proc/sysinfo.c 2016-07-11 13:11:10.857365085 +0000
-@@ -37,7 +37,8 @@
- #include /* htons */
++++ proc/sysinfo.c 2018-04-04 11:33:26.306886237 +0000
+@@ -45,7 +45,8 @@
#endif
+ #include
-long smp_num_cpus; /* number of CPUs */
+#undef smp_num_cpus
@@ -26,7 +26,7 @@
long page_bytes; /* this architecture's page size */
#define BAD_OPEN_MESSAGE \
-@@ -1076,7 +1077,11 @@ out:
+@@ -1152,7 +1153,11 @@ out:
///////////////////////////////////////////////////////////////////////////
@@ -39,7 +39,7 @@
// ought to count CPUs in /proc/stat instead of relying
// on glibc, which foolishly tries to parse /proc/cpuinfo
// note: that may have been the case but now /proc/stat
-@@ -1091,4 +1096,8 @@ void cpuinfo (void) {
+@@ -1167,4 +1172,8 @@ void cpuinfo (void) {
smp_num_cpus = sysconf(_SC_NPROCESSORS_ONLN);
if (smp_num_cpus<1) /* SPARC glibc is buggy */
smp_num_cpus=1;
@@ -49,7 +49,7 @@
+
+void cpuinfo (void) { (void)__smp_num_cpus(); }
--- proc/sysinfo.h
-+++ proc/sysinfo.h 2016-07-11 13:11:10.857365085 +0000
++++ proc/sysinfo.h 2018-04-04 11:30:51.841725161 +0000
@@ -8,6 +8,8 @@ EXTERN_C_BEGIN
extern unsigned long long Hertz; /* clock tick frequency */
++++++ procps-ng-3.3.10-errno.patch ++++++
--- /var/tmp/diff_new_pack.MddOjQ/_old 2018-04-20 17:24:48.416684836 +0200
+++ /var/tmp/diff_new_pack.MddOjQ/_new 2018-04-20 17:24:48.416684836 +0200
@@ -10,16 +10,16 @@
1 file changed, 5 insertions(+)
--- free.c
-+++ free.c 2016-07-11 13:22:25.480344200 +0000
-@@ -205,6 +205,7 @@ int main(int argc, char **argv)
++++ free.c 2018-04-04 12:47:06.360757839 +0000
+@@ -197,6 +197,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
-@@ -255,10 +256,12 @@ int main(int argc, char **argv)
+@@ -247,10 +248,12 @@ int main(int argc, char **argv)
#ifdef HAVE_PROGRAM_INVOCATION_NAME
program_invocation_name = program_invocation_short_name;
#endif
@@ -32,7 +32,7 @@
while ((c = getopt_long(argc, argv, "bkmghltCc:ws:V", longopts, NULL)) != -1)
switch (c) {
-@@ -325,11 +328,13 @@ int main(int argc, char **argv)
+@@ -317,11 +320,13 @@ int main(int argc, char **argv)
break;
case 's':
flags |= FREE_REPEAT;
++++++ procps-ng-3.3.10-fdleak.dif ++++++
--- /var/tmp/diff_new_pack.MddOjQ/_old 2018-04-20 17:24:48.432684256 +0200
+++ /var/tmp/diff_new_pack.MddOjQ/_new 2018-04-20 17:24:48.436684111 +0200
@@ -1,5 +1,9 @@
+---
+ vmstat.c | 7 +++----
+ 1 file changed, 3 insertions(+), 4 deletions(-)
+
--- vmstat.c
-+++ vmstat.c 2015-01-27 14:59:34.049571755 +0000
++++ vmstat.c 2018-04-04 11:16:07.577968520 +0000
@@ -40,6 +40,7 @@
#include
#include
@@ -8,7 +12,7 @@
#include
#include
#include
-@@ -690,13 +691,12 @@ static void slabheader(void)
+@@ -686,13 +687,12 @@ static void slabheader(void)
static void slabformat(void)
{
@@ -24,7 +28,7 @@
xwarnx(_("your kernel does not support slabinfo or your permissions are insufficient"));
return;
}
-@@ -728,7 +728,6 @@ static void slabformat(void)
+@@ -724,7 +724,6 @@ static void slabformat(void)
}
free(slabs);
}
++++++ procps-ng-3.3.10-integer-overflow.patch ++++++
--- /var/tmp/diff_new_pack.MddOjQ/_old 2018-04-20 17:24:48.448683676 +0200
+++ /var/tmp/diff_new_pack.MddOjQ/_new 2018-04-20 17:24:48.448683676 +0200
@@ -1,11 +1,20 @@
---
- free.c | 17 +++++++++++++++--
+ free.c | 19 ++++++++++++++++---
proc/sysinfo.c | 5 ++++-
- 2 files changed, 19 insertions(+), 3 deletions(-)
+ 2 files changed, 20 insertions(+), 4 deletions(-)
--- free.c
-+++ free.c 2016-07-11 13:05:52.351515040 +0000
-@@ -387,15 +387,28 @@ int main(int argc, char **argv)
++++ free.c 2018-04-04 11:29:36.599107898 +0000
+@@ -134,7 +134,7 @@ static const char *scale_size(unsigned l
+ if (args.exponent > 1) {
+ /* In desired scale. */
+ snprintf(buf, sizeof(buf), "%ld",
+- (long int)((size * 1024) / power(base, args.exponent-1))
++ (long int)(((long long int)size * 1024) / power(base, args.exponent-1))
+ );
+ return buf;
+ }
+@@ -379,15 +379,28 @@ int main(int argc, char **argv)
* to print the high info, even if it is zero.
*/
if (flags & FREE_LOHI) {
@@ -37,8 +46,8 @@
printf("\n");
}
--- proc/sysinfo.c
-+++ proc/sysinfo.c 2016-07-11 13:08:00.145047300 +0000
-@@ -709,7 +709,10 @@ nextline:
++++ proc/sysinfo.c 2018-04-04 11:17:32.480409601 +0000
+@@ -781,7 +781,10 @@ nextline:
kb_main_cached = kb_page_cache + kb_slab_reclaimable;
if ((ev=getenv("PS_FULL_CACHE")))
kb_main_cached += kb_swap_cached + kb_nfs_unstable;
++++++ procps-ng-3.3.10-large_pcpu.patch ++++++
--- /var/tmp/diff_new_pack.MddOjQ/_old 2018-04-20 17:24:48.464683095 +0200
+++ /var/tmp/diff_new_pack.MddOjQ/_new 2018-04-20 17:24:48.464683095 +0200
@@ -1,43 +1,19 @@
---
- top/top.c | 17 +++++++++++++++--
- 1 file changed, 15 insertions(+), 2 deletions(-)
+ top/top.c | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
--- top/top.c
-+++ top/top.c 2016-07-11 13:14:56.681005709 +0000
-@@ -2295,8 +2295,15 @@ static void zap_fieldstab (void) {
- Fieldstab[EU_CPU].width = 5;
++++ top/top.c 2018-04-04 12:09:16.087193018 +0000
+@@ -2458,7 +2458,11 @@ static void zap_fieldstab (void) {
+ Cpu_pmax = 99.9;
if (Rc.mode_irixps && smp_num_cpus > 1 && !Thread_mode) {
Cpu_pmax = 100.0 * smp_num_cpus;
- if (smp_num_cpus > 10) {
+ if (smp_num_cpus > 1000) {
+ if (Cpu_pmax > 9999999.0) Cpu_pmax = 9999999.0;
-+ Fieldstab[EU_CPU].width = 8;
+ } else if (smp_num_cpus > 100) {
+ if (Cpu_pmax > 999999.0) Cpu_pmax = 999999.0;
-+ Fieldstab[EU_CPU].width = 7;
+ } else if (smp_num_cpus > 10) {
if (Cpu_pmax > 99999.0) Cpu_pmax = 99999.0;
-+ Fieldstab[EU_CPU].width = 6;
} else {
if (Cpu_pmax > 999.9) Cpu_pmax = 999.9;
- }
-@@ -2306,12 +2313,18 @@ static void zap_fieldstab (void) {
- Fieldstab[EU_CPU].width = 4;
- if (Rc.mode_irixps && smp_num_cpus > 1 && !Thread_mode) {
- Cpu_pmax = 100.0 * smp_num_cpus;
-+ if (smp_num_cpus > 1000) {
-+ if (Cpu_pmax > 9999999.0) Cpu_pmax = 9999999.0;
-+ Fieldstab[EU_CPU].width = 7;
-+ } else if (smp_num_cpus > 100) {
-+ if (Cpu_pmax > 999999.0) Cpu_pmax = 999999.0;
-+ Fieldstab[EU_CPU].width = 6;
- if (smp_num_cpus > 10) {
- if (Cpu_pmax > 99999.0) Cpu_pmax = 99999.0;
-+ Fieldstab[EU_CPU].width = 5;
- } else {
- if (Cpu_pmax > 999.9) Cpu_pmax = 999.9;
- }
-- Fieldstab[EU_CPU].width = 5;
- }
- #endif
-
++++++ procps-ng-3.3.10-slab.patch ++++++
--- /var/tmp/diff_new_pack.MddOjQ/_old 2018-04-20 17:24:48.480682515 +0200
+++ /var/tmp/diff_new_pack.MddOjQ/_new 2018-04-20 17:24:48.480682515 +0200
@@ -1,12 +1,12 @@
---
- free.1 | 7 +++++++
+ free.1 | 6 ++++++
free.c | 7 ++++++-
proc/sysinfo.c | 4 ++++
vmstat.c | 6 +++++-
- 4 files changed, 22 insertions(+), 2 deletions(-)
+ 4 files changed, 21 insertions(+), 2 deletions(-)
--- free.1
-+++ free.1 2016-07-11 12:50:09.681730441 +0000
++++ free.1 2018-04-04 11:13:44.744590770 +0000
@@ -100,6 +100,12 @@ 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.
@@ -21,7 +21,7 @@
Display the result
.I count
--- free.c
-+++ free.c 2016-07-11 12:50:09.681730441 +0000
++++ free.c 2018-04-04 11:13:44.748590695 +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);
@@ -30,7 +30,7 @@
fputs(_(" -w, --wide wide output\n"), out);
fputs(USAGE_SEPARATOR, out);
fputs(_(" --help display this help and exit\n"), out);
-@@ -239,6 +240,7 @@ int main(int argc, char **argv)
+@@ -231,6 +232,7 @@ int main(int argc, char **argv)
{ "total", no_argument, NULL, 't' },
{ "seconds", required_argument, NULL, 's' },
{ "count", required_argument, NULL, 'c' },
@@ -38,7 +38,7 @@
{ "wide", no_argument, NULL, 'w' },
{ "help", no_argument, NULL, HELP_OPTION },
{ "version", no_argument, NULL, 'V' },
-@@ -258,7 +260,7 @@ int main(int argc, char **argv)
+@@ -250,7 +252,7 @@ int main(int argc, char **argv)
textdomain(PACKAGE);
atexit(close_stdout);
@@ -47,7 +47,7 @@
switch (c) {
case 'b':
check_unit_set(&unit_set);
-@@ -341,6 +343,9 @@ int main(int argc, char **argv)
+@@ -333,6 +335,9 @@ int main(int argc, char **argv)
case 'w':
flags |= FREE_WIDE;
break;
@@ -58,7 +58,7 @@
usage(stdout);
case 'V':
--- proc/sysinfo.c
-+++ proc/sysinfo.c 2016-07-11 12:57:46.980885685 +0000
++++ proc/sysinfo.c 2018-04-04 11:13:44.748590695 +0000
@@ -3,6 +3,7 @@
* Copyright (C) 1992-1998 by Michael K. Johnson, johnsonm@redhat.com
* Copyright 1998-2003 Albert Cahalan
@@ -67,7 +67,7 @@
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
-@@ -626,6 +627,7 @@ void meminfo(void){
+@@ -698,6 +699,7 @@ void meminfo(void){
int linux_version_code = procps_linux_version();
mem_table_struct findme = { namebuf, NULL};
mem_table_struct *found;
@@ -75,7 +75,7 @@
char *head;
char *tail;
static const mem_table_struct mem_table[] = {
-@@ -705,6 +707,8 @@ nextline:
+@@ -777,6 +779,8 @@ nextline:
kb_inactive = kb_inact_dirty + kb_inact_clean + kb_inact_laundry;
}
kb_main_cached = kb_page_cache + kb_slab_reclaimable;
@@ -85,7 +85,7 @@
/* if kb_main_available is greater than kb_main_total or our calculation of
--- vmstat.c
-+++ vmstat.c 2016-07-11 12:50:09.685730365 +0000
++++ vmstat.c 2018-04-04 11:13:44.748590695 +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);
@@ -94,7 +94,7 @@
fputs(_(" -t, --timestamp show timestamp\n"), out);
fputs(USAGE_SEPARATOR, out);
fputs(USAGE_HELP, out);
-@@ -881,7 +882,7 @@ int main(int argc, char *argv[])
+@@ -877,7 +878,7 @@ int main(int argc, char *argv[])
atexit(close_stdout);
while ((c =
@@ -103,7 +103,7 @@
NULL)) != EOF)
switch (c) {
case 'V':
-@@ -950,6 +951,9 @@ int main(int argc, char *argv[])
+@@ -946,6 +947,9 @@ int main(int argc, char *argv[])
case 't':
t_option = 1;
break;
++++++ procps-ng-3.3.11-pmap4suse.patch ++++++
--- /var/tmp/diff_new_pack.MddOjQ/_old 2018-04-20 17:24:48.500681790 +0200
+++ /var/tmp/diff_new_pack.MddOjQ/_new 2018-04-20 17:24:48.500681790 +0200
@@ -1,10 +1,10 @@
---
- pmap.c | 50 +++++++++++++++++++++++++++++++------------
- testsuite/pmap.test/pmap.exp | 17 ++++++--------
- 2 files changed, 45 insertions(+), 22 deletions(-)
+ pmap.c | 48 ++++++++++++++++++++++++++++++++-----------
+ testsuite/pmap.test/pmap.exp | 17 +++++++--------
+ 2 files changed, 44 insertions(+), 21 deletions(-)
--- pmap.c
-+++ pmap.c 2016-05-30 11:36:45.447592219 +0000
++++ pmap.c 2018-04-04 12:52:03.219187662 +0000
@@ -48,7 +48,9 @@ const char *nls_Address,
*nls_Kbytes,
*nls_Mode,
@@ -74,7 +74,7 @@
maxw5 = justify_print(nls_Mode, maxw5, 0);
justify_print(nls_Mapping, 0, 0);
}
-@@ -605,6 +616,11 @@ static int one_proc(proc_t * p)
+@@ -603,6 +614,11 @@ static int one_proc(proc_t * p)
total_rss += smap_value;
continue;
}
@@ -83,17 +83,15 @@
+ total_pss += smap_value;
+ continue;
+ }
- if (strncmp("Shared_Dirty", smap_key, 12) == 0) {
+ if (strcmp("Shared_Dirty", smap_key) == 0) {
shared_dirty = smap_value;
total_shared_dirty += smap_value;
-@@ -615,17 +631,20 @@ static int one_proc(proc_t * p)
- total_private_dirty += smap_value;
+@@ -614,16 +630,19 @@ static int one_proc(proc_t * p)
continue;
}
-- if (strncmp("Swap", smap_key, 4) == 0) {
+ if (strcmp("Swap", smap_key) == 0) {
- /*doesn't matter as long as last */
- printf("%0*" KLF "x %*lu %*llu %*llu %*s %s\n",
-+ if (strncmp("Swap", smap_key, 4) == 0 && strlen(smap_key) == 4) {
+ swap = smap_value;
+ total_swap += smap_value;
+ printf("%0*" KLF "x %*lu %*llu %*llu %*llu %*llu %*s %s\n",
@@ -111,7 +109,7 @@
diff = 0;
continue;
}
-@@ -656,7 +675,6 @@ static int one_proc(proc_t * p)
+@@ -654,7 +673,6 @@ static int one_proc(proc_t * p)
if (perms[3] == 's')
total_shared += diff;
if (perms[3] == 'p') {
@@ -119,7 +117,7 @@
if (perms[1] == 'w')
total_private_writeable += diff;
else
-@@ -708,17 +726,21 @@ static int one_proc(proc_t * p)
+@@ -706,17 +724,21 @@ static int one_proc(proc_t * p)
justify_print("----------------", maxw1, 0);
justify_print("-------", maxw2, 1);
justify_print("-------", maxw3, 1);
@@ -143,7 +141,7 @@
}
if (d_option) {
printf
-@@ -1025,16 +1047,18 @@ int main(int argc, char **argv)
+@@ -1023,16 +1045,18 @@ int main(int argc, char **argv)
while ((c = getopt_long(argc, argv, "xXrdqA:hVcC:nN:p", longopts, NULL)) != -1)
switch (c) {
case 'x':
@@ -165,7 +163,7 @@
case 'q':
q_option = 1;
--- testsuite/pmap.test/pmap.exp
-+++ testsuite/pmap.test/pmap.exp 2016-07-12 15:12:26.592609617 +0000
++++ testsuite/pmap.test/pmap.exp 2018-04-04 12:47:45.452023967 +0000
@@ -8,16 +8,16 @@ set pmap_procname "${mypid}:\\s+\\S+\[^\
set pmap_initname "1:\\s+\\S+\[^\\r\]+\\s+"
set pmap_std_header $pmap_procname
++++++ procps-ng-3.3.12.tar.xz -> procps-ng-3.3.13.tar.xz ++++++
++++ 63050 lines of diff (skipped)
++++++ procps-ng-3.3.8-accuracy.dif ++++++
--- /var/tmp/diff_new_pack.MddOjQ/_old 2018-04-20 17:24:48.908666996 +0200
+++ /var/tmp/diff_new_pack.MddOjQ/_new 2018-04-20 17:24:48.912666852 +0200
@@ -5,7 +5,7 @@
3 files changed, 15 insertions(+), 10 deletions(-)
--- ps/common.h
-+++ ps/common.h 2016-07-11 13:02:13.815735709 +0000
++++ ps/common.h 2018-04-04 11:14:33.915688098 +0000
@@ -302,6 +302,7 @@ extern int running_only;
extern int screen_cols;
extern int screen_rows;
@@ -15,7 +15,7 @@
extern unsigned simple_select;
extern sort_node *sort_list;
--- ps/global.c
-+++ ps/global.c 2016-07-11 13:02:13.815735709 +0000
++++ ps/global.c 2018-04-04 11:14:33.915688098 +0000
@@ -78,6 +78,7 @@ int prefer_bsd_defaults = -1
int screen_cols = -1;
int screen_rows = -1;
@@ -43,8 +43,8 @@
simple_select = 0;
sort_list = NULL;
--- ps/output.c
-+++ ps/output.c 2016-07-11 13:02:13.815735709 +0000
-@@ -132,6 +132,7 @@ static int sr_ ## NAME (const proc_t* P,
++++ ps/output.c 2018-04-04 11:14:33.915688098 +0000
+@@ -135,6 +135,7 @@ static int sr_ ## NAME (const proc_t* P,
#define cook_time(P) (P->utime + P->stime) / Hertz
#define cook_etime(P) (((unsigned long long)seconds_since_boot >= (P->start_time / Hertz)) ? ((unsigned long long)seconds_since_boot - (P->start_time / Hertz)) : 0)
@@ -52,7 +52,7 @@
#define CMP_COOKED_TIME(NAME) \
static int sr_ ## NAME (const proc_t* P, const proc_t* Q) { \
-@@ -505,11 +506,11 @@ static int pr_etimes(char *restrict cons
+@@ -508,11 +509,11 @@ static int pr_etimes(char *restrict cons
static int pr_c(char *restrict const outbuf, const proc_t *restrict const pp){
unsigned long long total_time; /* jiffies used by this process */
unsigned pcpu = 0; /* scaled %cpu, 99 means 99% */
@@ -67,7 +67,7 @@
if (pcpu > 99U) pcpu = 99U;
return snprintf(outbuf, COLWID, "%2u", pcpu);
}
-@@ -517,11 +518,11 @@ static int pr_c(char *restrict const out
+@@ -520,11 +521,11 @@ static int pr_c(char *restrict const out
static int pr_pcpu(char *restrict const outbuf, const proc_t *restrict const pp){
unsigned long long total_time; /* jiffies used by this process */
unsigned pcpu = 0; /* scaled %cpu, 999 means 99.9% */
@@ -82,7 +82,7 @@
if (pcpu > 999U)
return snprintf(outbuf, COLWID, "%u", pcpu/10U);
return snprintf(outbuf, COLWID, "%u.%u", pcpu/10U, pcpu%10U);
-@@ -530,11 +531,11 @@ static int pr_pcpu(char *restrict const
+@@ -533,11 +534,11 @@ static int pr_pcpu(char *restrict const
static int pr_cp(char *restrict const outbuf, const proc_t *restrict const pp){
unsigned long long total_time; /* jiffies used by this process */
unsigned pcpu = 0; /* scaled %cpu, 999 means 99.9% */
++++++ procps-ng-3.3.8-bnc634840.patch ++++++
--- /var/tmp/diff_new_pack.MddOjQ/_old 2018-04-20 17:24:48.924666416 +0200
+++ /var/tmp/diff_new_pack.MddOjQ/_new 2018-04-20 17:24:48.924666416 +0200
@@ -11,8 +11,8 @@
1 file changed, 7 insertions(+), 1 deletion(-)
--- top/top.c
-+++ top/top.c 2016-07-11 13:12:07.436272792 +0000
-@@ -3328,7 +3328,13 @@ static void before (char *me) {
++++ top/top.c 2018-04-04 11:33:59.278280201 +0000
+@@ -3575,7 +3575,13 @@ static void before (char *me) {
sa.sa_flags = 0;
for (i = SIGRTMAX; i; i--) {
switch (i) {
++++++ procps-ng-3.3.8-ignore-scan_unevictable_pages.patch ++++++
--- /var/tmp/diff_new_pack.MddOjQ/_old 2018-04-20 17:24:48.940665836 +0200
+++ /var/tmp/diff_new_pack.MddOjQ/_new 2018-04-20 17:24:48.940665836 +0200
@@ -13,7 +13,7 @@
--- a/sysctl.c
+++ b/sysctl.c
-@@ -57,6 +57,7 @@ static const char DEFAULT_PRELOAD[] = "/
+@@ -59,6 +59,7 @@ static const char DEFAULT_PRELOAD[] = "/
static const char *DEPRECATED[] = {
"base_reachable_time",
"retrans_time",
++++++ procps-ng-3.3.8-petabytes.patch ++++++
--- /var/tmp/diff_new_pack.MddOjQ/_old 2018-04-20 17:24:48.952665401 +0200
+++ /var/tmp/diff_new_pack.MddOjQ/_new 2018-04-20 17:24:48.956665256 +0200
@@ -3,20 +3,20 @@
1 file changed, 3 insertions(+), 3 deletions(-)
--- top/top.c
-+++ top/top.c 2016-07-11 13:13:56.178173598 +0000
-@@ -1536,9 +1536,9 @@ static inline const char *make_str (cons
++++ top/top.c 2018-04-04 11:49:56.472660056 +0000
+@@ -1688,9 +1688,9 @@ static inline const char *make_str_utf8
static const char *scale_mem (int target, unsigned long num, int width, int justr) {
- #ifndef NOBOOST_MEMS
// SK_Kb SK_Mb SK_Gb SK_Tb SK_Pb SK_Eb
+ #ifdef BOOST_MEMORY
- static const char *fmttab[] = { "%.0f", "%#.1f%c", "%#.3f%c", "%#.3f%c", "%#.3f%c", NULL };
+ static const char *fmttab[] = { "%.0f", "%#.1f%c", "%#.3f%c", "%#.3f%c", "%#.3f%c", "%#.3f%c", NULL };
#else
-- static const char *fmttab[] = { "%.0f", "%.0f%c", "%.0f%c", "%.0f%c", "%.0f%c", NULL };
-+ static const char *fmttab[] = { "%.0f", "%.0f%c", "%.0f%c", "%.0f%c", "%.0f%c", "%.0f%c", NULL };
+- static const char *fmttab[] = { "%.0f", "%.1f%c", "%.1f%c", "%.1f%c", "%.1f%c", NULL };
++ static const char *fmttab[] = { "%.0f", "%.1f%c", "%.1f%c", "%.1f%c", "%.1f%c", "%.1f%c", NULL };
#endif
static char buf[SMLBUFSIZ];
float scaled_num;
-@@ -1550,7 +1550,7 @@ static const char *scale_mem (int target
+@@ -1702,7 +1702,7 @@ static const char *scale_mem (int target
goto end_justifies;
scaled_num = num;
++++++ procps-ng-3.3.8-readeof.patch ++++++
--- /var/tmp/diff_new_pack.MddOjQ/_old 2018-04-20 17:24:48.968664821 +0200
+++ /var/tmp/diff_new_pack.MddOjQ/_new 2018-04-20 17:24:48.972664676 +0200
@@ -3,8 +3,8 @@
1 file changed, 25 insertions(+), 24 deletions(-)
--- proc/readproc.c
-+++ proc/readproc.c 2016-07-11 12:49:24.778601134 +0000
-@@ -643,7 +643,7 @@ static int file2str(const char *director
++++ proc/readproc.c 2018-04-04 11:13:11.593199324 +0000
+@@ -644,7 +644,7 @@ static int file2str(const char *director
if (ub->buf) ub->buf[0] = '\0';
else ub->buf = xcalloc((ub->siz = buffGRW));
sprintf(path, "%s/%s", directory, what);
@@ -13,7 +13,7 @@
while (0 < (num = read(fd, ub->buf + tot_read, ub->siz - tot_read))) {
tot_read += num;
if (tot_read < ub->siz) break;
-@@ -658,41 +658,42 @@ static int file2str(const char *director
+@@ -659,41 +659,42 @@ static int file2str(const char *director
static char** file2strvec(const char* directory, const char* what) {
char buf[2048]; /* read buf bytes at a time */
@@ -78,7 +78,7 @@
endbuf = rbuf + tot; /* count space for pointers */
align = (sizeof(char*)-1) - ((tot + sizeof(char*)-1) & (sizeof(char*)-1));
for (c = 0, p = rbuf; p < endbuf; p++) {
-@@ -725,7 +726,7 @@ static int read_unvectored(char *restric
+@@ -726,7 +727,7 @@ static int read_unvectored(char *restric
unsigned n = 0;
snprintf(path, sizeof(path), "%s/%s", whom, what);
++++++ procps-ng-3.3.8-tinfo.dif ++++++
--- /var/tmp/diff_new_pack.MddOjQ/_old 2018-04-20 17:24:48.984664241 +0200
+++ /var/tmp/diff_new_pack.MddOjQ/_new 2018-04-20 17:24:48.984664241 +0200
@@ -4,9 +4,9 @@
2 files changed, 9 insertions(+), 1 deletion(-)
--- Makefile.am
-+++ Makefile.am 2016-07-11 13:16:34.327120958 +0000
-@@ -112,7 +112,7 @@ if CYGWIN
- top_top_SOURCES += lib/strverscmp.c
++++ Makefile.am 2018-04-04 12:28:14.937957527 +0000
+@@ -165,7 +165,7 @@ else
+ slabtop_LDADD = $(LDADD) @NCURSES_LIBS@
endif
-top_top_LDADD = $(LDADD) @NCURSES_LIBS@ $(DL_LIB)
@@ -15,8 +15,8 @@
if BUILD_SKILL
--- configure.ac
-+++ configure.ac 2016-07-11 13:15:42.864114271 +0000
-@@ -141,9 +141,17 @@ else
++++ configure.ac 2018-04-04 12:29:23.364676155 +0000
+@@ -163,8 +163,16 @@ else
else
WATCH_NCURSES_LIBS="$NCURSES_LIBS"
fi
@@ -29,8 +29,7 @@
+ fi
fi
AC_SUBST([NCURSES_LIBS])
- AC_SUBST([WATCH_NCURSES_LIBS])
+AC_SUBST([TOP_NCURSES_LIBS])
+ AC_SUBST([WATCH_NCURSES_LIBS])
+ AC_SUBST([WATCH_NCURSES_CFLAGS])
- AC_ARG_WITH([systemd],
- [AS_HELP_STRING([--with-systemd], [enable systemd support])],
++++++ procps-ng-3.3.8-top.1.diff ++++++
--- /var/tmp/diff_new_pack.MddOjQ/_old 2018-04-20 17:24:48.996663805 +0200
+++ /var/tmp/diff_new_pack.MddOjQ/_new 2018-04-20 17:24:48.996663805 +0200
@@ -1,6 +1,10 @@
+---
+ top/top.1 | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
--- top/top.1
-+++ top/top.1 2013-05-29 10:50:57.169939440 +0000
-@@ -9,7 +9,7 @@
++++ top/top.1 2018-04-04 11:11:58.234544896 +0000
+@@ -7,7 +7,7 @@
..
\# Setup ////////////////////////////////////////////////////////////////
\# ** Comment out '.nr' or set to 0 to eliminate WIDTH fiddlin' !
++++++ procps-rpmlintrc ++++++
addFilter(".*W:.*shared-lib-calls-exit.*libprocps\.so.*")
++++++ procps-v3.3.3-read-sysctls-also-from-boot-sysctl.conf-kernelversion.diff ++++++
--- /var/tmp/diff_new_pack.MddOjQ/_old 2018-04-20 17:24:49.048661920 +0200
+++ /var/tmp/diff_new_pack.MddOjQ/_new 2018-04-20 17:24:49.052661775 +0200
@@ -4,10 +4,10 @@
2 files changed, 14 insertions(+)
--- sysctl.8
-+++ sysctl.8 2016-07-11 13:12:48.427481461 +0000
-@@ -80,6 +80,8 @@ Print value without new line.
- \fB\-\-system\fR
- Load settings from all system configuration files.
++++ sysctl.8 2018-04-04 11:38:10.173667994 +0000
+@@ -81,6 +81,8 @@ directories in the following list in giv
+ Once a file of a given filename is loaded, any file of the same name
+ in subsequent directories is ignored.
.br
+/boot/sysctl.conf-<kernelversion>
+.br
@@ -15,7 +15,7 @@
.br
/etc/sysctl.d/*.conf
--- sysctl.c
-+++ sysctl.c 2016-07-11 13:12:48.427481461 +0000
++++ sysctl.c 2018-04-04 11:36:32.515463365 +0000
@@ -39,6 +39,7 @@
#include
#include
@@ -24,7 +24,7 @@
#include
#include "c.h"
-@@ -584,6 +585,7 @@ static int sortpairs(const void *A, cons
+@@ -613,6 +614,7 @@ static int sortpairs(const void *A, cons
static int PreloadSystem(void)
{
unsigned di, i;
@@ -32,7 +32,7 @@
const char *dirs[] = {
"/run/sysctl.d",
"/etc/sysctl.d",
-@@ -648,6 +650,16 @@ static int PreloadSystem(void)
+@@ -677,6 +679,16 @@ static int PreloadSystem(void)
}
qsort(cfgs, ncfgs, sizeof(struct cfg *), sortpairs);