Update to 3.3.16, bsc#1158830
OBS-URL: https://build.opensuse.org/package/show/Base:System/procps?expand=0&rev=198
This commit is contained in:
parent
1b8ac2f760
commit
e6dc562b28
@ -12,7 +12,7 @@
|
||||
#include <termios.h>
|
||||
#include <unistd.h>
|
||||
#include <time.h>
|
||||
@@ -686,13 +687,12 @@ static void slabheader(void)
|
||||
@@ -708,13 +709,12 @@ static void slabheader(void)
|
||||
|
||||
static void slabformat(void)
|
||||
{
|
||||
@ -28,7 +28,7 @@
|
||||
xwarnx(_("your kernel does not support slabinfo or your permissions are insufficient"));
|
||||
return;
|
||||
}
|
||||
@@ -724,7 +724,6 @@ static void slabformat(void)
|
||||
@@ -746,7 +746,6 @@ static void slabformat(void)
|
||||
}
|
||||
free(slabs);
|
||||
}
|
||||
|
@ -4,7 +4,7 @@
|
||||
|
||||
--- top/top.c
|
||||
+++ top/top.c 2018-04-04 12:09:16.087193018 +0000
|
||||
@@ -2478,7 +2478,11 @@ static void zap_fieldstab (void) {
|
||||
@@ -2379,7 +2379,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;
|
||||
|
@ -6,7 +6,7 @@
|
||||
4 files changed, 21 insertions(+), 2 deletions(-)
|
||||
|
||||
--- free.1
|
||||
+++ free.1 2018-04-04 11:13:44.744590770 +0000
|
||||
+++ free.1 2019-12-11 06:20:16.659772479 +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 2018-04-04 11:13:44.748590695 +0000
|
||||
+++ free.c 2019-12-11 06:20:16.659772479 +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);
|
||||
@ -58,7 +58,7 @@
|
||||
usage(stdout);
|
||||
case 'V':
|
||||
--- proc/sysinfo.c
|
||||
+++ proc/sysinfo.c 2018-04-04 11:13:44.748590695 +0000
|
||||
+++ proc/sysinfo.c 2019-12-11 06:20:16.659772479 +0000
|
||||
@@ -3,6 +3,7 @@
|
||||
* Copyright (C) 1992-1998 by Michael K. Johnson, johnsonm@redhat.com
|
||||
* Copyright 1998-2003 Albert Cahalan
|
||||
@ -85,7 +85,7 @@
|
||||
|
||||
/* if kb_main_available is greater than kb_main_total or our calculation of
|
||||
--- vmstat.c
|
||||
+++ vmstat.c 2018-04-04 11:13:44.748590695 +0000
|
||||
+++ vmstat.c 2019-12-11 06:22:44.716984764 +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,16 +94,16 @@
|
||||
fputs(_(" -t, --timestamp show timestamp\n"), out);
|
||||
fputs(USAGE_SEPARATOR, out);
|
||||
fputs(USAGE_HELP, out);
|
||||
@@ -877,7 +878,7 @@ int main(int argc, char *argv[])
|
||||
@@ -899,7 +900,7 @@ int main(int argc, char *argv[])
|
||||
atexit(close_stdout);
|
||||
|
||||
while ((c =
|
||||
- getopt_long(argc, argv, "afmnsdDp:S:wthV", longopts,
|
||||
+ getopt_long(argc, argv, "aCfmnsdDp:S:wthV", longopts,
|
||||
NULL)) != EOF)
|
||||
NULL)) != -1)
|
||||
switch (c) {
|
||||
case 'V':
|
||||
@@ -946,6 +947,9 @@ int main(int argc, char *argv[])
|
||||
@@ -968,6 +969,9 @@ int main(int argc, char *argv[])
|
||||
case 't':
|
||||
t_option = 1;
|
||||
break;
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- vmstat.c
|
||||
+++ vmstat.c 2015-01-27 14:57:19.467491788 +0000
|
||||
@@ -292,7 +292,7 @@ static void new_format(void)
|
||||
@@ -295,7 +295,7 @@ static void new_format(void)
|
||||
unsigned int intr[2], ctxt[2];
|
||||
unsigned int sleep_half;
|
||||
unsigned long kb_per_page = sysconf(_SC_PAGESIZE) / 1024ul;
|
||||
@ -9,7 +9,7 @@
|
||||
struct tm *tm_ptr;
|
||||
time_t the_time;
|
||||
char timebuf[32];
|
||||
@@ -375,12 +375,12 @@ static void new_format(void)
|
||||
@@ -386,12 +386,12 @@ static void new_format(void)
|
||||
|
||||
/* idle can run backwards for a moment -- kernel "feature" */
|
||||
if (debt) {
|
||||
|
@ -1,15 +0,0 @@
|
||||
---
|
||||
top/top.1 | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
--- top/top.1
|
||||
+++ top/top.1 2018-06-05 12:46:41.483212158 +0000
|
||||
@@ -2183,7 +2183,7 @@ While not intended to be edited manually
|
||||
.fi
|
||||
|
||||
If a valid absolute path to the rcfile cannot be established, customizations
|
||||
-made to a running \*We will be impossible to preserve.
|
||||
+made to a running \*(We will be impossible to preserve.
|
||||
|
||||
.\" ......................................................................
|
||||
.SS 6b. ADDING INSPECT Entries
|
28
procps-ng-3.3.16-comm_len.patch
Normal file
28
procps-ng-3.3.16-comm_len.patch
Normal file
@ -0,0 +1,28 @@
|
||||
Bug bsc#1158830 -- "ps -C" does not allow anymore an argument longer than 15 characters
|
||||
|
||||
---
|
||||
ps/select.c | 13 +++++++++----
|
||||
1 file changed, 9 insertions(+), 4 deletions(-)
|
||||
|
||||
--- ps/select.c
|
||||
+++ ps/select.c 2019-12-11 13:07:05.428822333 +0000
|
||||
@@ -116,10 +116,15 @@ static int proc_was_listed(proc_t *buf){
|
||||
break; case SEL_TTY : return_if_match(tty,tty);
|
||||
break; case SEL_SESS: return_if_match(session,pid);
|
||||
|
||||
- break; case SEL_COMM: i=sn->n; while(i--)
|
||||
- if(!strncmp( buf->cmd, (*(sn->u+i)).cmd, 63 )) return 1;
|
||||
-
|
||||
-
|
||||
+ break; case SEL_COMM: i=sn->n; while(i--){
|
||||
+ /* In linux/sched.h TASK_COMM_LEN is still set to 15 characters plus \0 */
|
||||
+ size_t coml = strlen(buf->cmd);
|
||||
+ size_t cmdl = strlen((*(sn->u+i)).cmd);
|
||||
+ if (coml < 15 && cmdl >= 15) return 1;
|
||||
+ if (coml <= 15 && cmdl <= 15 && coml != cmdl) return 1;
|
||||
+ if (cmdl > 15) cmdl = 15;
|
||||
+ if(!strncmp( buf->cmd, (*(sn->u+i)).cmd, cmdl )) return 1;
|
||||
+ }
|
||||
|
||||
#undef return_if_match
|
||||
|
3
procps-ng-3.3.16.tar.xz
Normal file
3
procps-ng-3.3.16.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:925eacd65dedcf9c98eb94e8978bbfb63f5de37294cc1047d81462ed477a20af
|
||||
size 859736
|
@ -12,7 +12,7 @@ Index: procps-3.2.8/top.c
|
||||
|
||||
--- top/top.c
|
||||
+++ top/top.c 2018-04-04 11:33:59.278280201 +0000
|
||||
@@ -3600,7 +3600,13 @@ static void before (char *me) {
|
||||
@@ -3663,7 +3663,13 @@ static void before (char *me) {
|
||||
sa.sa_flags = 0;
|
||||
for (i = SIGRTMAX; i; i--) {
|
||||
switch (i) {
|
||||
|
@ -4,7 +4,7 @@
|
||||
|
||||
--- top/top.c
|
||||
+++ top/top.c 2018-04-04 11:49:56.472660056 +0000
|
||||
@@ -1704,9 +1704,9 @@ static inline const char *make_str_utf8
|
||||
@@ -1607,9 +1607,9 @@ static inline const char *make_str_utf8
|
||||
static const char *scale_mem (int target, unsigned long num, int width, int justr) {
|
||||
// SK_Kb SK_Mb SK_Gb SK_Tb SK_Pb SK_Eb
|
||||
#ifdef BOOST_MEMORY
|
||||
@ -16,7 +16,7 @@
|
||||
#endif
|
||||
static char buf[SMLBUFSIZ];
|
||||
float scaled_num;
|
||||
@@ -1718,7 +1718,7 @@ static const char *scale_mem (int target
|
||||
@@ -1621,7 +1621,7 @@ static const char *scale_mem (int target
|
||||
goto end_justifies;
|
||||
|
||||
scaled_num = num;
|
||||
|
@ -4,7 +4,7 @@
|
||||
|
||||
--- proc/readproc.c
|
||||
+++ proc/readproc.c 2018-06-05 08:54:06.408030693 +0000
|
||||
@@ -669,7 +669,7 @@ static int file2str(const char *director
|
||||
@@ -675,7 +675,7 @@ static int file2str(const char *director
|
||||
else ub->buf = xcalloc((ub->siz = buffGRW));
|
||||
len = snprintf(path, sizeof path, "%s/%s", directory, what);
|
||||
if (len <= 0 || (size_t)len >= sizeof path) return -1;
|
||||
@ -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;
|
||||
@@ -689,25 +689,25 @@ static int file2str(const char *director
|
||||
@@ -695,25 +695,25 @@ static int file2str(const char *director
|
||||
static char** file2strvec(const char* directory, const char* what) {
|
||||
char buf[2048]; /* read buf bytes at a time */
|
||||
char *p, *rbuf = 0, *endbuf, **q, **ret, *strp;
|
||||
@ -46,7 +46,7 @@
|
||||
end_of_file = 1; /* integer overflow: null-terminate and break */
|
||||
n = 0; /* but tot > 0 */
|
||||
}
|
||||
@@ -735,7 +735,7 @@ static char** file2strvec(const char* di
|
||||
@@ -741,7 +741,7 @@ static char** file2strvec(const char* di
|
||||
c = sizeof(char*); /* one extra for NULL term */
|
||||
for (p = rbuf; p < endbuf; p++) {
|
||||
if (!*p || *p == '\n') {
|
||||
@ -55,7 +55,7 @@
|
||||
c += sizeof(char*);
|
||||
}
|
||||
if (*p == '\n')
|
||||
@@ -747,7 +747,7 @@ static char** file2strvec(const char* di
|
||||
@@ -753,7 +753,7 @@ static char** file2strvec(const char* di
|
||||
q = ret = (char**) (endbuf+align); /* ==> free(*ret) to dealloc */
|
||||
for (strp = p = rbuf; p < endbuf; p++) {
|
||||
if (!*p) { /* NUL char implies that */
|
||||
|
@ -16,7 +16,7 @@
|
||||
if BUILD_SKILL
|
||||
--- configure.ac
|
||||
+++ configure.ac 2018-04-04 12:29:23.364676155 +0000
|
||||
@@ -163,8 +163,16 @@ else
|
||||
@@ -169,8 +169,16 @@ else
|
||||
else
|
||||
WATCH_NCURSES_LIBS="$NCURSES_LIBS"
|
||||
fi
|
||||
|
@ -1,15 +0,0 @@
|
||||
---
|
||||
top/top.1 | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
--- top/top.1
|
||||
+++ 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' !
|
||||
-.nr half_xtra 4
|
||||
+.nr half_xtra 0
|
||||
.
|
||||
.ll +(\n[half_xtra] + \n[half_xtra])
|
||||
.
|
@ -4,7 +4,7 @@
|
||||
|
||||
--- vmstat.c
|
||||
+++ vmstat.c 2016-07-11 13:18:04.993371059 +0000
|
||||
@@ -270,8 +270,8 @@ static void new_header(void)
|
||||
@@ -273,8 +273,8 @@ static void new_header(void)
|
||||
|
||||
static unsigned long unitConvert(unsigned long size)
|
||||
{
|
||||
|
@ -24,7 +24,7 @@
|
||||
#include <unistd.h>
|
||||
|
||||
#include "c.h"
|
||||
@@ -613,6 +614,7 @@ static int sortpairs(const void *A, cons
|
||||
@@ -621,6 +622,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",
|
||||
@@ -677,6 +679,16 @@ static int PreloadSystem(void)
|
||||
@@ -685,6 +687,16 @@ static int PreloadSystem(void)
|
||||
}
|
||||
qsort(cfgs, ncfgs, sizeof(struct cfg *), sortpairs);
|
||||
|
||||
|
@ -1,3 +1,40 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Dec 11 13:53:07 UTC 2019 - Dr. Werner Fink <werner@suse.de>
|
||||
|
||||
- Update to procps-ng-3.3.16
|
||||
* library: Increment to 8:2:0
|
||||
No removals or functions
|
||||
Internal changes only, so revision is incremented.
|
||||
Previous version should have been 8:1:0 not 8:0:1
|
||||
* docs: Use correct symbols for -h option in free.1 Debian #898774
|
||||
* docs: ps.1 now warns about command name length issue #101
|
||||
* docs: install translated man pages issue #146
|
||||
* pgrep: Match on runstate issue #109, Debian #919381
|
||||
* snice: Fix matching on pid merge #89
|
||||
* top: can now exploit 256-color terminals issue #96
|
||||
* top: preserves 'other filters' in configuration file issue #99
|
||||
* top: can now collapse/expand forest view children issue #99
|
||||
* top: parent %CPU time includes collapsed children
|
||||
* top: improve xterm support for vim navigation keys issue #135
|
||||
* top: avoid segmentation fault at program termination Redhat #1737552
|
||||
- Port patches (mostly changed offsets of the hunks)
|
||||
* procps-ng-3.3.10-fdleak.dif
|
||||
* procps-ng-3.3.10-large_pcpu.patch
|
||||
* procps-ng-3.3.10-slab.patch
|
||||
* procps-ng-3.3.10-xen.dif
|
||||
* procps-ng-3.3.8-bnc634840.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-vmstat-terabyte.dif
|
||||
* procps-v3.3.3-read-sysctls-also-from-boot-sysctl.conf-kernelversion.diff
|
||||
- Delete patches now upstream
|
||||
* procps-ng-3.3.15-typo.patch
|
||||
* procps-ng-3.3.8-top.1.diff
|
||||
- Add aptch procps-ng-3.3.16-comm_len.patch
|
||||
* "ps -C" does not allow anymore an argument longer than 15
|
||||
characters (bsc#1158830)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Jun 6 10:56:31 UTC 2018 - werner@suse.de
|
||||
|
||||
|
20
procps.spec
20
procps.spec
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package procps
|
||||
#
|
||||
# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
|
||||
# Copyright (c) 2019 SUSE LLC
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@ -12,29 +12,28 @@
|
||||
# license that conforms to the Open Source Definition (Version 1.9)
|
||||
# published by the Open Source Initiative.
|
||||
|
||||
# Please submit bugfixes or comments via http://bugs.opensuse.org/
|
||||
# Please submit bugfixes or comments via https://bugs.opensuse.org/
|
||||
#
|
||||
|
||||
|
||||
%define somajor 7
|
||||
%define somajor 8
|
||||
%define libname libprocps%{somajor}
|
||||
%bcond_with bin2usr
|
||||
%bcond_with pidof
|
||||
Name: procps
|
||||
Version: 3.3.15
|
||||
Version: 3.3.16
|
||||
Release: 0
|
||||
Summary: The ps utilities for /proc
|
||||
#Alternate: https://gitlab.com/procps-ng/procps/repository/archive.tar.bz2?ref=v3.3.15
|
||||
#Alternate: https://gitlab.com/procps-ng/procps/repository/archive.tar.bz2?ref=v%{version}
|
||||
#Also: http://gitorious.org/procps/
|
||||
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.15.tar.xz
|
||||
URL: http://sf.net/projects/procps-ng/
|
||||
Source: http://downloads.sourceforge.net/project/procps-ng/Production/procps-ng-%{version}.tar.xz
|
||||
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
|
||||
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
|
||||
Patch10: procps-ng-3.3.8-accuracy.dif
|
||||
@ -57,8 +56,8 @@ Patch31: procps-ng-3.3.8-ignore-scan_unevictable_pages.patch
|
||||
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-TYPO-SUSE
|
||||
Patch34: procps-ng-3.3.15-typo.patch
|
||||
# PATCH-FEATURE-SUSE -- "ps -C" does not allow anymore an argument longer than 15 characters
|
||||
Patch34: procps-ng-3.3.16-comm_len.patch
|
||||
|
||||
BuildRequires: automake
|
||||
BuildRequires: dejagnu
|
||||
@ -128,7 +127,6 @@ the process information pseudo-file system.
|
||||
%patch0
|
||||
%patch1
|
||||
%patch3 -b .trcate
|
||||
%patch5
|
||||
%patch7 -b .rof
|
||||
%patch8 -b .cache
|
||||
%patch10 -b .acc
|
||||
|
Loading…
Reference in New Issue
Block a user