Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package procps4 for openSUSE:Factory checked in at 2023-09-12 21:04:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/procps4 (Old) and /work/SRC/openSUSE:Factory/.procps4.new.1766 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "procps4" Tue Sep 12 21:04:03 2023 rev:6 rq:1110606 version:4.0.4 Changes: -------- --- /work/SRC/openSUSE:Factory/procps4/procps4.changes 2023-08-18 19:29:43.539462938 +0200 +++ /work/SRC/openSUSE:Factory/.procps4.new.1766/procps4.changes 2023-09-12 21:05:24.501579457 +0200 @@ -1,0 +2,43 @@ +Tue Sep 12 12:33:45 UTC 2023 - Dr. Werner Fink <[email protected]> + +- Update to procps-ng-4.0.4 + * library (API & ABI unchanged) + increment revision: 0:2:0 + tolerates all potential 'cpuinfo' formats issue #272 + restore the proper main thread tics valuations issue #280 + Remove myself from proc count merge #193 + Refactor the escape code Debian #1035649 + * free: -L one line output issue #156 + * pgrep: Use only --signal option for signal Debian #1031765 + * pgrep: suppress >15 warning if using regex Debian #1037450 + * pidof: Add -t option to show threads merge #190 + * pmap: Reset totals between processes issue #298 + * ps: fixed missing or corrupted fields with -m option Debian #1036631, issue #279 + * ps: Fix buffer overflow in -C option CVE-2023-4016 Debian #1042887, issue #297 + * ps: Add --signames to show signal names in masks merge #98 + * sysctl: -N show names merge #198, RH #2222056 + * tests: dont compare floats with == issue #271 + * tests: skips tests if maps missing merge #197, Gentoo #583036 + * top: bad command line arguments yield EXIT_FAILURE issue #273 + * top: avoids keystroke induced '%Cpu' distortions + * top: includes VM (guest) tics in 'system' overhead issue #274 + * top: includes VM (guest) tics with '!' toggle merge #179 + * top: lessen summary cpu distortions on first display merge #180 + * top: better backspace handling wtth line edits issue #278 + * vmstat: Print guest time in non-wide mode + * w: Fix musl UT_HOSTSIZE issue +- Remove patches now upstream + * CVE-2023-4016.patch + * procps-ng-4.0.3-logind.patch +- Port patches + * procps-ng-3.3.10-errno.patch + * procps-ng-3.3.10-slab.patch + * procps-ng-3.3.10-xen.dif + * procps-ng-3.3.11-pmap4suse.patch + * procps-ng-3.3.8-petabytes.patch + * procps-ng-3.3.8-tinfo.dif + * procps-ng-3.3.9-w-notruncate.diff + * procps-v3.3.3-columns.dif + * procps-v3.3.3-read-sysctls-also-from-boot-sysctl.conf-kernelversion.diff + +------------------------------------------------------------------- Old: ---- CVE-2023-4016.patch procps-ng-4.0.3-logind.patch procps-ng-4.0.3.tar.xz procps-ng-4.0.3.tar.xz.asc New: ---- procps-ng-4.0.4.tar.xz procps-ng-4.0.4.tar.xz.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ procps4.spec ++++++ --- /var/tmp/diff_new_pack.0I20nk/_old 2023-09-12 21:05:27.009668919 +0200 +++ /var/tmp/diff_new_pack.0I20nk/_new 2023-09-12 21:05:27.009668919 +0200 @@ -26,7 +26,7 @@ %bcond_without pidof %bcond_without nls Name: procps4 -Version: 4.0.3 +Version: 4.0.4 Release: 0 Summary: The ps utilities for /proc License: GPL-2.0-or-later AND LGPL-2.1-or-later @@ -58,9 +58,6 @@ Patch33: procps-ng-3.3.11-pmap4suse.patch # PATCH-FIX-SUSE -- Avoid float errors on 32bit architectures Patch37: procps-ng-4.0.0-floats.dif -# PATCH-FIX-UPSTREAM -- bsc#1214290 -Patch38: CVE-2023-4016.patch -Patch39: procps-ng-4.0.3-logind.patch BuildRequires: automake BuildRequires: dejagnu BuildRequires: diffutils @@ -134,7 +131,6 @@ %prep %setup -q -n procps-ng-%{version} %patch1 -%patch39 -p1 %patch3 -p1 -b .trcate %patch7 -b .rof %patch8 -b .cache @@ -143,14 +139,13 @@ %patch14 -b .ovrflw %patch17 -b .sysctl %patch18 -%patch20 +%patch20 -b .p20 %patch21 %patch28 %patch31 -p1 -%patch32 +%patch32 -b .p32 %patch33 -b .pmap4us %patch37 -%patch38 %build test -s .tarball-version || echo %{version} > .tarball-version ++++++ procps-ng-3.3.10-errno.patch ++++++ --- /var/tmp/diff_new_pack.0I20nk/_old 2023-09-12 21:05:27.029669632 +0200 +++ /var/tmp/diff_new_pack.0I20nk/_new 2023-09-12 21:05:27.029669632 +0200 @@ -11,7 +11,7 @@ --- src/free.c +++ src/free.c 2022-10-20 13:33:28.880818112 +0000 -@@ -206,6 +206,7 @@ int main(int argc, char **argv) +@@ -208,6 +208,7 @@ int main(int argc, char **argv) int c, flags = 0, unit_set = 0, rc = 0; struct commandline_arguments args; struct meminfo_info *mem_info = NULL; @@ -19,7 +19,7 @@ /* * For long options that have no equivalent short option, use a -@@ -257,10 +258,12 @@ int main(int argc, char **argv) +@@ -260,10 +261,12 @@ int main(int argc, char **argv) #ifdef HAVE_PROGRAM_INVOCATION_NAME program_invocation_name = program_invocation_short_name; #endif @@ -30,9 +30,9 @@ atexit(close_stdout); + errno = errsv; - while ((c = getopt_long(argc, argv, "bkmghltvCc:ws:V", longopts, NULL)) != -1) + while ((c = getopt_long(argc, argv, "bkmghlLtvCc:ws:V", longopts, NULL)) != -1) switch (c) { -@@ -330,11 +333,13 @@ int main(int argc, char **argv) +@@ -336,11 +339,13 @@ int main(int argc, char **argv) break; case 's': flags |= FREE_REPEAT; ++++++ procps-ng-3.3.10-slab.patch ++++++ --- /var/tmp/diff_new_pack.0I20nk/_old 2023-09-12 21:05:27.041670061 +0200 +++ /var/tmp/diff_new_pack.0I20nk/_new 2023-09-12 21:05:27.041670061 +0200 @@ -1,12 +1,42 @@ --- - man/free.1 | 6 ++++++ - src/free.c | 7 ++++++- - library/meminfo.c | 7 ++++++- - src/vmstat.c | 7 ++++++- + library/meminfo.c | 7 ++++++- + man/free.1 | 6 ++++++ + src/free.c | 7 ++++++- + src/vmstat.c | 7 ++++++- 4 files changed, 24 insertions(+), 3 deletions(-) +--- library/meminfo.c ++++ library/meminfo.c 2023-09-12 12:08:41.033738450 +0000 +@@ -3,6 +3,7 @@ + * + * Copyright © 2015-2023 Jim Warner <[email protected]> + * Copyright © 2015-2023 Craig Small <[email protected]> ++ * Copyright © 2008 Bart Van Assche. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public +@@ -640,6 +641,7 @@ static int meminfo_read_failed ( + int size; + unsigned long *valptr; + signed long mem_used; ++ const char *ev; + + // remember history from last time around + memcpy(&info->hist.old, &info->hist.new, sizeof(struct meminfo_data)); +@@ -692,7 +694,10 @@ static int meminfo_read_failed ( + + if (0 == mHr(MemAvailable)) + mHr(MemAvailable) = mHr(MemFree); +- mHr(derived_mem_cached) = mHr(Cached) + mHr(SReclaimable); ++ if ((ev=getenv("PS_FULL_CACHE"))) ++ mHr(derived_mem_cached) = mHr(Cached) + mHr(SReclaimable) + mHr(NFS_Unstable); ++ else ++ mHr(derived_mem_cached) = mHr(Cached) + mHr(SReclaimable); + + /* if 'available' is greater than 'total' or our calculation of mem_used + overflows, that's symptomatic of running within a lxc container where --- man/free.1 -+++ man/free.1 2022-03-28 11:53:32.173182702 +0000 ++++ man/free.1 2023-09-12 12:08:41.029738522 +0000 @@ -110,6 +110,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,8 +51,8 @@ Display the result .I count --- src/free.c -+++ src/free.c 2022-03-28 12:05:01.544663755 +0000 -@@ -90,6 +90,7 @@ static void __attribute__ ((__noreturn__ ++++ src/free.c 2023-09-12 12:10:26.647842455 +0000 +@@ -92,6 +92,7 @@ static void __attribute__ ((__noreturn__ fputs(_(" -v, --committed show committed memory and commit limit\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); @@ -30,7 +60,7 @@ fputs(_(" -w, --wide wide output\n"), out); fputs(USAGE_SEPARATOR, out); fputs(_(" --help display this help and exit\n"), out); -@@ -241,6 +242,7 @@ int main(int argc, char **argv) +@@ -244,6 +245,7 @@ int main(int argc, char **argv) { "committed", no_argument, NULL, 'v' }, { "seconds", required_argument, NULL, 's' }, { "count", required_argument, NULL, 'c' }, @@ -38,16 +68,16 @@ { "wide", no_argument, NULL, 'w' }, { "help", no_argument, NULL, HELP_OPTION }, { "version", no_argument, NULL, 'V' }, -@@ -260,7 +262,7 @@ int main(int argc, char **argv) +@@ -263,7 +265,7 @@ int main(int argc, char **argv) textdomain(PACKAGE); atexit(close_stdout); -- while ((c = getopt_long(argc, argv, "bkmghltvc:ws:V", longopts, NULL)) != -1) -+ while ((c = getopt_long(argc, argv, "bkmghltvCc:ws:V", longopts, NULL)) != -1) +- while ((c = getopt_long(argc, argv, "bkmghlLtvc:ws:V", longopts, NULL)) != -1) ++ while ((c = getopt_long(argc, argv, "bkmghlLtvCc:ws:V", longopts, NULL)) != -1) switch (c) { case 'b': check_unit_set(&unit_set); -@@ -346,6 +348,9 @@ int main(int argc, char **argv) +@@ -352,6 +354,9 @@ int main(int argc, char **argv) case 'w': flags |= FREE_WIDE; break; @@ -57,38 +87,8 @@ case HELP_OPTION: usage(stdout); case 'V': ---- library/meminfo.c -+++ library/meminfo.c 2022-03-28 12:39:29.291205555 +0000 -@@ -3,6 +3,7 @@ - * - * Copyright © 2015-2023 Jim Warner <[email protected]> - * Copyright © 2015-2023 Craig Small <[email protected]> -+ * Copyright © 2008 Bart Van Assche. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public -@@ -640,6 +641,7 @@ static int meminfo_read_failed ( - int size; - unsigned long *valptr; - signed long mem_used; -+ const char *ev; - - // remember history from last time around - memcpy(&info->hist.old, &info->hist.new, sizeof(struct meminfo_data)); -@@ -692,7 +694,10 @@ static int meminfo_read_failed ( - - if (0 == mHr(MemAvailable)) - mHr(MemAvailable) = mHr(MemFree); -- mHr(derived_mem_cached) = mHr(Cached) + mHr(SReclaimable); -+ if ((ev=getenv("PS_FULL_CACHE"))) -+ mHr(derived_mem_cached) = mHr(Cached) + mHr(SReclaimable) + mHr(NFS_Unstable); -+ else -+ mHr(derived_mem_cached) = mHr(Cached) + mHr(SReclaimable); - - /* if 'available' is greater than 'total' or our calculation of mem_used - overflows, that's symptomatic of running within a lxc container where --- src/vmstat.c -+++ src/vmstat.c 2022-03-28 12:41:52.744612074 +0000 ++++ src/vmstat.c 2023-09-12 12:08:41.033738450 +0000 @@ -230,6 +230,7 @@ static void __attribute__ ((__noreturn__ fputs(_(" -p, --partition <dev> partition specific statistics\n"), out); fputs(_(" -S, --unit <char> define display unit\n"), out); @@ -97,7 +97,7 @@ fputs(_(" -t, --timestamp show timestamp\n"), out); fputs(_(" -y, --no-first skips first line of output\n"), out); fputs(USAGE_SEPARATOR, out); -@@ -952,6 +953,7 @@ int main(int argc, char *argv[]) +@@ -951,6 +952,7 @@ int main(int argc, char *argv[]) {"partition", required_argument, NULL, 'p'}, {"unit", required_argument, NULL, 'S'}, {"wide", no_argument, NULL, 'w'}, @@ -105,7 +105,7 @@ {"timestamp", no_argument, NULL, 't'}, {"help", no_argument, NULL, 'h'}, {"version", no_argument, NULL, 'V'}, -@@ -968,7 +970,7 @@ int main(int argc, char *argv[]) +@@ -967,7 +969,7 @@ int main(int argc, char *argv[]) atexit(close_stdout); while ((c = @@ -114,7 +114,7 @@ switch (c) { case 'V': printf(PROCPS_NG_VERSION); -@@ -1035,6 +1037,9 @@ int main(int argc, char *argv[]) +@@ -1034,6 +1036,9 @@ int main(int argc, char *argv[]) case 't': t_option = 1; break; ++++++ procps-ng-3.3.10-xen.dif ++++++ --- /var/tmp/diff_new_pack.0I20nk/_old 2023-09-12 21:05:27.049670346 +0200 +++ /var/tmp/diff_new_pack.0I20nk/_new 2023-09-12 21:05:27.053670489 +0200 @@ -4,7 +4,7 @@ --- src/vmstat.c +++ src/vmstat.c 2022-03-29 09:21:41.156855432 +0000 -@@ -358,7 +358,7 @@ static void new_format(void) +@@ -357,7 +357,7 @@ static void new_format(void) unsigned long pgpgin[2], pgpgout[2], pswpin[2] = {0,0}, pswpout[2]; unsigned int sleep_half; unsigned long kb_per_page = sysconf(_SC_PAGESIZE) / 1024ul; @@ -13,7 +13,7 @@ struct tm *tm_ptr; time_t the_time; char timebuf[32]; -@@ -485,12 +485,12 @@ static void new_format(void) +@@ -484,12 +484,12 @@ static void new_format(void) /* idle can run backwards for a moment -- kernel "feature" */ if (debt) { ++++++ procps-ng-3.3.11-pmap4suse.patch ++++++ --- /var/tmp/diff_new_pack.0I20nk/_old 2023-09-12 21:05:27.085671630 +0200 +++ /var/tmp/diff_new_pack.0I20nk/_new 2023-09-12 21:05:27.089671773 +0200 @@ -4,7 +4,7 @@ 2 files changed, 44 insertions(+), 20 deletions(-) --- src/pmap.c -+++ src/pmap.c 2022-10-20 13:35:47.074351812 +0000 ++++ src/pmap.c 2023-09-12 12:23:39.537610124 +0000 @@ -59,7 +59,9 @@ const char *nls_Address, *nls_Kbytes, *nls_Mode, @@ -39,7 +39,7 @@ static unsigned shm_minor = ~0u; -@@ -542,12 +546,17 @@ static int one_proc (struct pids_stack * +@@ -544,12 +548,17 @@ static int one_proc (struct pids_stack * char perms[32] = ""; const char *cp2 = NULL; unsigned long long rss = 0ull; @@ -57,7 +57,7 @@ printf("%u: %s\n", PIDS_VAL(tgid, s_int, p, Pids_info), PIDS_VAL(cmdline, str, p, Pids_info)); -@@ -570,13 +579,15 @@ static int one_proc (struct pids_stack * +@@ -572,13 +581,15 @@ static int one_proc (struct pids_stack * if (x_option) { maxw1 = 16; if (sizeof(long) == 4) maxw1 = 8; @@ -74,7 +74,7 @@ maxw5 = justify_print(nls_Mode, maxw5, 0); justify_print(nls_Mapping, 0, 0); } -@@ -616,6 +627,11 @@ static int one_proc (struct pids_stack * +@@ -618,6 +629,11 @@ static int one_proc (struct pids_stack * total_rss += smap_value; continue; } @@ -86,7 +86,7 @@ if (strcmp("Shared_Dirty", smap_key) == 0) { shared_dirty = smap_value; total_shared_dirty += smap_value; -@@ -628,16 +644,20 @@ static int one_proc (struct pids_stack * +@@ -630,16 +646,20 @@ static int one_proc (struct pids_stack * } if (strcmp("Swap", smap_key) == 0) { /* doesn't matter as long as last */ @@ -109,7 +109,7 @@ diff = end = 0; perms[0] = '\0'; cp2 = NULL; -@@ -671,7 +691,6 @@ static int one_proc (struct pids_stack * +@@ -673,7 +693,6 @@ static int one_proc (struct pids_stack * if (perms[3] == 's') total_shared += diff; if (perms[3] == 'p') { @@ -117,7 +117,7 @@ if (perms[1] == 'w') total_private_writeable += diff; else -@@ -723,17 +742,21 @@ static int one_proc (struct pids_stack * +@@ -725,17 +744,21 @@ static int one_proc (struct pids_stack * justify_print("----------------", maxw1, 0); justify_print("-------", maxw2, 1); justify_print("-------", maxw3, 1); @@ -141,7 +141,7 @@ } if (d_option) { printf -@@ -1046,16 +1069,18 @@ int main(int argc, char **argv) +@@ -1052,16 +1075,18 @@ int main(int argc, char **argv) while ((c = getopt_long(argc, argv, "xXrdqA:hVcC:nN:p", longopts, NULL)) != -1) switch (c) { case 'x': @@ -163,7 +163,7 @@ case 'q': q_option = 1; --- testsuite/pmap.test/pmap.exp -+++ testsuite/pmap.test/pmap.exp 2022-10-20 13:35:47.074351812 +0000 ++++ testsuite/pmap.test/pmap.exp 2023-09-12 12:25:22.375764402 +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 @@ -206,13 +206,13 @@ set test "pmap device output quiet (dq)" spawn $pmap -dq $mypid expect_table $test $pmap_procname $pmap_device_items "\$" -@@ -47,7 +46,7 @@ expect_table $test $pmap_procname $pmap_ +@@ -50,7 +49,7 @@ if { [ file readable "/proc/self/smaps" + } else { + set test "pmap extended output" + spawn $pmap -x $mypid +- expect_table $test $pmap_ext_header $pmap_ext_items $pmap_ext_footer ++ expect_table $test $pmap_std_header $pmap_std_items $pmap_std_footer - set test "pmap extended output" - spawn $pmap -x $mypid --expect_table $test $pmap_ext_header $pmap_ext_items $pmap_ext_footer -+expect_table $test $pmap_std_header $pmap_std_items $pmap_std_footer - - # -X and -XX have no real format as its dependent on smaps - set test "pmap extra extended output" + # -X and -XX have no real format as its dependent on smaps + set test "pmap extra extended output" ++++++ procps-ng-3.3.8-petabytes.patch ++++++ --- /var/tmp/diff_new_pack.0I20nk/_old 2023-09-12 21:05:27.101672201 +0200 +++ /var/tmp/diff_new_pack.0I20nk/_new 2023-09-12 21:05:27.101672201 +0200 @@ -4,7 +4,7 @@ --- src/top/top.c +++ src/top/top.c 2022-03-29 10:24:43.327490984 +0000 -@@ -1673,9 +1673,9 @@ static inline const char *make_str_utf8 +@@ -1684,9 +1684,9 @@ static inline const char *make_str_utf8 static const char *scale_mem (int target, float 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]; char *psfx; -@@ -1685,7 +1685,7 @@ static const char *scale_mem (int target +@@ -1696,7 +1696,7 @@ static const char *scale_mem (int target if (Rc.zero_suppress && 0 >= num) goto end_justifies; ++++++ procps-ng-3.3.8-tinfo.dif ++++++ --- /var/tmp/diff_new_pack.0I20nk/_old 2023-09-12 21:05:27.113672629 +0200 +++ /var/tmp/diff_new_pack.0I20nk/_new 2023-09-12 21:05:27.117672771 +0200 @@ -5,10 +5,10 @@ --- Makefile.am +++ Makefile.am 2022-10-20 13:21:37.505517043 +0000 -@@ -189,7 +189,7 @@ if CYGWIN - src_top_top_SOURCES += local/strverscmp.c +@@ -191,7 +191,7 @@ src_top_top_SOURCES += local/strverscmp. endif + src_top_top_CFLAGS = @NCURSES_CFLAGS@ -src_top_top_LDADD = $(LDADD) @NCURSES_LIBS@ $(DL_LIB) +src_top_top_LDADD = $(LDADD) @TOP_NCURSES_LIBS@ $(DL_LIB) endif @@ -16,7 +16,7 @@ if BUILD_SKILL --- configure.ac +++ configure.ac 2022-10-20 13:23:50.707138810 +0000 -@@ -260,6 +260,14 @@ fi +@@ -281,6 +281,14 @@ fi # else # WATCH_NCURSES_LIBS="$NCURSES_LIBS" # fi ++++++ procps-ng-3.3.9-w-notruncate.diff ++++++ --- /var/tmp/diff_new_pack.0I20nk/_old 2023-09-12 21:05:27.129673200 +0200 +++ /var/tmp/diff_new_pack.0I20nk/_new 2023-09-12 21:05:27.133673342 +0200 @@ -1,10 +1,10 @@ --- - procps-ng-4.0.3/man/w.1 | 3 +++ - procps-ng-4.0.3/src/w.c | 27 +++++++++++++++++++++++---- + procps-ng-4.0.4/man/w.1 | 3 +++ + procps-ng-4.0.4/src/w.c | 27 +++++++++++++++++++++++---- 2 files changed, 26 insertions(+), 4 deletions(-) ---- procps-ng-4.0.3/man/w.1 -+++ procps-ng-4.0.3/man/w.1 2023-08-18 11:06:24.615573481 +0000 +--- procps-ng-4.0.4/man/w.1 ++++ procps-ng-4.0.4/man/w.1 2023-09-12 12:03:09.111689620 +0000 @@ -51,6 +51,9 @@ and a \fB\-s\fR, \fB\-\-short\fR Use the short format. Don't print the login time, JCPU or PCPU times. @@ -15,9 +15,9 @@ \fB\-f\fR, \fB\-\-from\fR Toggle printing the .B from ---- procps-ng-4.0.3/src/w.c -+++ procps-ng-4.0.3/src/w.c 2023-08-18 11:06:24.615573481 +0000 -@@ -217,7 +217,8 @@ static void print_from( +--- procps-ng-4.0.4/src/w.c ++++ procps-ng-4.0.4/src/w.c 2023-09-12 12:06:20.612256361 +0000 +@@ -220,7 +220,8 @@ static void print_from( if (r < 0 || host == NULL) print_host("", 0, fromlen); else { @@ -27,7 +27,7 @@ free(host); } } else { -@@ -510,7 +511,7 @@ static void showinfo( +@@ -513,7 +514,7 @@ static void showinfo( const char *session, const char *name, #endif utmp_t * u, int formtype, int maxcmd, int from, @@ -36,28 +36,28 @@ const int pids) { unsigned long long jcpu, pcpu; -@@ -574,7 +575,19 @@ static void showinfo( +@@ -576,7 +577,19 @@ static void showinfo( uname[UT_NAMESIZE] = '\0'; if (formtype) { -- printf("%-*.*s%-9.8s", userlen + 1, userlen, uname, tty+5); +- printf("%-*.*s%-9.8s", userlen + 1, userlen, uname, tty + 5); + int utlnlen = 8; -+ if (formtype > 1) { -+ userlen = strnlen(uname, UT_NAMESIZE); -+ if (u) { -+ fromlen = strnlen(u->ut_host, UT_HOSTSIZE); -+ utlnlen = strnlen(u->ut_line, UT_LINESIZE); -+ } else { -+ fromlen = 0; -+ utlnlen = strlen (tty+5); -+ } -+ maxcmd = MAX_CMD_WIDTH; -+ } -+ printf("%-*.*s%-*.*s", userlen + 1, userlen, uname, utlnlen + 1, utlnlen, tty+5); ++ if (formtype > 1) { ++ userlen = strnlen(uname, UT_NAMESIZE); ++ if (u) { ++ fromlen = strnlen(u->ut_host, UT_HOSTSIZE); ++ utlnlen = strnlen(u->ut_line, UT_LINESIZE); ++ } else { ++ fromlen = 0; ++ utlnlen = strlen (tty+5); ++ } ++ maxcmd = MAX_CMD_WIDTH; ++ } ++ printf("%-*.*s%-*.*s", userlen + 1, userlen, uname, utlnlen + 1, utlnlen, tty+5); #if (defined(WITH_SYSTEMD) || defined(WITH_ELOGIND)) && defined(HAVE_SD_SESSION_GET_LEADER) if (session) { - uint64_t ltime; -@@ -657,6 +670,7 @@ static void __attribute__ ((__noreturn__ + uint64_t ltime; +@@ -658,6 +671,7 @@ static void __attribute__ ((__noreturn__ fputs(_(" -h, --no-header do not print header\n"),out); fputs(_(" -u, --no-current ignore current process username\n"),out); fputs(_(" -s, --short short format\n"),out); @@ -65,7 +65,7 @@ fputs(_(" -f, --from show remote hostname field\n"),out); fputs(_(" -o, --old-style old style output\n"),out); fputs(_(" -i, --ip-addr display IP address instead of hostname (if possible)\n"), out); -@@ -695,6 +709,7 @@ int main(int argc, char **argv) +@@ -696,6 +710,7 @@ int main(int argc, char **argv) {"no-header", no_argument, NULL, 'h'}, {"no-current", no_argument, NULL, 'u'}, {"short", no_argument, NULL, 's'}, @@ -73,7 +73,7 @@ {"from", no_argument, NULL, 'f'}, {"old-style", no_argument, NULL, 'o'}, {"ip-addr", no_argument, NULL, 'i'}, -@@ -717,7 +732,7 @@ int main(int argc, char **argv) +@@ -718,7 +733,7 @@ int main(int argc, char **argv) #endif while ((ch = @@ -82,7 +82,7 @@ switch (ch) { case 'h': header = 0; -@@ -725,6 +740,10 @@ int main(int argc, char **argv) +@@ -726,6 +741,10 @@ int main(int argc, char **argv) case 's': longform = 0; break; ++++++ procps-ng-4.0.3.tar.xz -> procps-ng-4.0.4.tar.xz ++++++ ++++ 186522 lines of diff (skipped) ++++++ procps-v3.3.3-columns.dif ++++++ --- /var/tmp/diff_new_pack.0I20nk/_old 2023-09-12 21:05:27.725694459 +0200 +++ /var/tmp/diff_new_pack.0I20nk/_new 2023-09-12 21:05:27.725694459 +0200 @@ -4,7 +4,7 @@ --- src/ps/global.c +++ src/ps/global.c 2022-03-29 09:31:24.242140877 +0000 -@@ -262,8 +262,11 @@ static void set_screen_size(void){ +@@ -264,8 +264,11 @@ static void set_screen_size(void){ screen_cols = ws.ws_col; // hmmm, NetBSD subtracts 1 screen_rows = ws.ws_row; @@ -18,7 +18,7 @@ columns = getenv("COLUMNS"); if(columns && *columns){ -@@ -405,6 +408,7 @@ static const char *set_personality(void) +@@ -407,6 +410,7 @@ static const char *set_personality(void) return NULL; case_aix: @@ -26,7 +26,7 @@ bsd_j_format = "FB_j"; bsd_l_format = "FB_l"; /* bsd_s_format not used */ -@@ -432,6 +436,7 @@ static const char *set_personality(void) +@@ -434,6 +438,7 @@ static const char *set_personality(void) case_sunos4: personality = PER_NO_DEFAULT_g; @@ -34,7 +34,7 @@ prefer_bsd_defaults = 1; bsd_j_format = "FB_j"; bsd_l_format = "FB_l"; -@@ -457,12 +462,14 @@ static const char *set_personality(void) +@@ -459,12 +464,14 @@ static const char *set_personality(void) case_hp: case_hpux: personality = PER_HPUX_x; @@ -49,7 +49,7 @@ return NULL; case_posix: -@@ -503,8 +510,8 @@ void reset_global(void){ +@@ -505,8 +512,8 @@ void reset_global(void){ } // --- <pids> interface -------------------------------------------------- ++++++ procps-v3.3.3-read-sysctls-also-from-boot-sysctl.conf-kernelversion.diff ++++++ --- /var/tmp/diff_new_pack.0I20nk/_old 2023-09-12 21:05:27.741695030 +0200 +++ /var/tmp/diff_new_pack.0I20nk/_new 2023-09-12 21:05:27.745695173 +0200 @@ -5,7 +5,7 @@ --- man/sysctl.8 +++ man/sysctl.8 2022-03-29 10:21:47.926686046 +0000 -@@ -122,6 +122,8 @@ will read files from directories in the +@@ -123,6 +123,8 @@ will read files from directories in the order from top to bottom. Once a file of a given filename is loaded, any file of the same name in subsequent directories is ignored. @@ -24,7 +24,7 @@ #include <unistd.h> #include <ctype.h> -@@ -811,6 +812,7 @@ static int sortpairs(const void *A, cons +@@ -808,6 +809,7 @@ static int sortpairs(const void *A, cons static int PreloadSystem(SettingList *setlist) { unsigned di, i; @@ -32,7 +32,7 @@ const char *dirs[] = { "/etc/sysctl.d", "/run/sysctl.d", -@@ -875,6 +877,16 @@ static int PreloadSystem(SettingList *se +@@ -872,6 +874,16 @@ static int PreloadSystem(SettingList *se } qsort(cfgs, ncfgs, sizeof(struct cfg *), sortpairs);
