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-02-20 17:46:56
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/procps4 (Old)
and /work/SRC/openSUSE:Factory/.procps4.new.22824 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "procps4"
Mon Feb 20 17:46:56 2023 rev:3 rq:1066826 version:4.0.3
Changes:
--------
--- /work/SRC/openSUSE:Factory/procps4/procps4.changes 2023-01-04
17:53:26.662479256 +0100
+++ /work/SRC/openSUSE:Factory/.procps4.new.22824/procps4.changes
2023-02-20 17:47:57.436144596 +0100
@@ -1,0 +2,39 @@
+Mon Feb 20 12:12:28 UTC 2023 - Dr. Werner Fink <wer...@suse.de>
+
+- Update to procps-ng-4.0.3
+ * library
+ Only changes were in copyright headers and tests
+ * docs: Don't install English manpages twice
+ * pgrep: Add -H match on userspace signal handler merge #165
+ * pgrep: make --terminal respect other criteria
+ * ps: c flag shows command name again Debian #1026326
+ * ps.1: Match drs description from top.1 merge #156
+ * skill: Match on -p again Debian #1025915
+ * top: E/P-core toggle ('5' key) added to help
+ * vmstat: Referesh memory statistics Debian #1027963
+ * vmstat: Fix initial si,so,bi,bo,in & cs values issue #15
+ Debian #668580
+ * vmstat: Fix conversion errors due to precision merge #75
+ * w: Add --pids option merge #159
+ * watch: Pass through beep issue #104
+ * watch: -r option to not re-exec on SIGWINCH merge #125
+ * watch: find eol with --no-linewrap merge #157
+- Drop patches now upstream
+ * linguas.patch
+ * 82d8e3fa.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-ignore-scan_unevictable_pages.patch
+ * procps-ng-3.3.8-petabytes.patch
+ * procps-ng-3.3.8-readeof.patch
+ * procps-ng-3.3.8-vmstat-terabyte.dif
+ * procps-ng-3.3.9-w-notruncate.diff
+ * procps-v3.3.3-columns.dif
+ * procps-v3.3.3-ia64.diff
+ * procps-v3.3.3-pwdx.patch
+ * procps-v3.3.3-read-sysctls-also-from-boot-sysctl.conf-kernelversion.diff
+
+-------------------------------------------------------------------
Old:
----
82d8e3fa.patch
linguas.patch
procps-ng-4.0.2.tar.xz
New:
----
procps-ng-4.0.3.tar.xz
procps-ng-4.0.3.tar.xz.asc
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ procps4.spec ++++++
--- /var/tmp/diff_new_pack.otFSkD/_old 2023-02-20 17:47:58.148148618 +0100
+++ /var/tmp/diff_new_pack.otFSkD/_new 2023-02-20 17:47:58.152148640 +0100
@@ -1,7 +1,7 @@
#
# spec file for package procps4
#
-# Copyright (c) 2022 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -26,15 +26,14 @@
%bcond_without pidof
%bcond_without nls
Name: procps4
-Version: 4.0.2
+Version: 4.0.3
Release: 0
Summary: The ps utilities for /proc
License: GPL-2.0-or-later AND LGPL-2.1-or-later
Group: System/Monitoring
URL: https://sf.net/projects/procps-ng/
Source:
https://downloads.sourceforge.net/project/procps-ng/Production/procps-ng-%{version}.tar.xz
-# Not a detached signature but a signed tar ball
-#Source1:
https://downloads.sourceforge.net/project/procps-ng/Production/procps-ng-%{version}.tar.xz.asc
+Source1:
https://downloads.sourceforge.net/project/procps-ng/Production/procps-ng-%{version}.tar.xz.asc
#Alternate:
https://gitlab.com/procps-ng/procps/-/archive/v%{version}/procps-v%{version}.tar.gz
Source2: procps-rpmlintrc
Source3: procps4.keyring
@@ -59,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
-Patch38: linguas.patch
-# PATCH-FIX-UPSTREAM -- tests: Fix type for check_fatal_proc_unmounted
-Patch39: 82d8e3fa.patch
BuildRequires: automake
BuildRequires: dejagnu
BuildRequires: diffutils
@@ -150,13 +146,15 @@
%patch32
%patch33 -b .pmap4us
%patch37
-%patch38
-%patch39
%build
test -s .tarball-version || echo %{version} > .tarball-version
-#./autogen.sh
-autoreconf -fiv
+if test -f po/Makefile.in.in
+then
+ autoreconf -fiv
+else
+ sh ./autogen.sh
+fi
major=$(sed -rn 's/^#define\s+NCURSES_VERSION_MAJOR\s+([0-9]+)/\1/p'
%{_includedir}/ncurses.h)
export NCURSESW_CFLAGS="$(ncursesw${major}-config --cflags)"
export NCURSESW_LIBS="$(ncursesw${major}-config --libs)"
++++++ procps-ng-3.3.10-errno.patch ++++++
--- /var/tmp/diff_new_pack.otFSkD/_old 2023-02-20 17:47:58.176148776 +0100
+++ /var/tmp/diff_new_pack.otFSkD/_new 2023-02-20 17:47:58.176148776 +0100
@@ -11,7 +11,7 @@
--- src/free.c
+++ src/free.c 2022-10-20 13:33:28.880818112 +0000
-@@ -209,6 +209,7 @@ int main(int argc, char **argv)
+@@ -206,6 +206,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
-@@ -260,10 +261,12 @@ int main(int argc, char **argv)
+@@ -257,10 +258,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, "bkmghltvCc:ws:V", longopts, NULL))
!= -1)
switch (c) {
-@@ -333,11 +336,13 @@ int main(int argc, char **argv)
+@@ -330,11 +333,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.otFSkD/_old 2023-02-20 17:47:58.188148844 +0100
+++ /var/tmp/diff_new_pack.otFSkD/_new 2023-02-20 17:47:58.192148866 +0100
@@ -7,7 +7,7 @@
--- man/free.1
+++ man/free.1 2022-03-28 11:53:32.173182702 +0000
-@@ -100,6 +100,12 @@ Switch to the wide mode. The wide mode p
+@@ -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.
.TP
@@ -22,7 +22,7 @@
.I count
--- src/free.c
+++ src/free.c 2022-03-28 12:05:01.544663755 +0000
-@@ -93,6 +93,7 @@ static void __attribute__ ((__noreturn__
+@@ -90,6 +90,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 +30,7 @@
fputs(_(" -w, --wide wide output\n"), out);
fputs(USAGE_SEPARATOR, out);
fputs(_(" --help display this help and exit\n"), out);
-@@ -244,6 +245,7 @@ int main(int argc, char **argv)
+@@ -241,6 +242,7 @@ int main(int argc, char **argv)
{ "committed", no_argument, NULL, 'v' },
{ "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' },
-@@ -263,7 +265,7 @@ int main(int argc, char **argv)
+@@ -260,7 +262,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);
-@@ -349,6 +351,9 @@ int main(int argc, char **argv)
+@@ -346,6 +348,9 @@ int main(int argc, char **argv)
case 'w':
flags |= FREE_WIDE;
break;
@@ -61,9 +61,9 @@
+++ library/meminfo.c 2022-03-28 12:39:29.291205555 +0000
@@ -3,6 +3,7 @@
*
- * Copyright (C) 2015 Craig Small <csm...@dropbear.xyz>
- * Copyright (C) 2016-2022 Jim Warner <james.war...@comcast.net>
-+ * Copyright (c) 2008 Bart Van Assche.
+ * Copyright © 2015-2023 Jim Warner <james.war...@comcast.net>
+ * Copyright © 2015-2023 Craig Small <csm...@dropbear.xyz>
++ * 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
@@ -89,7 +89,7 @@
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
-@@ -234,6 +234,7 @@ static void __attribute__ ((__noreturn__
+@@ -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);
fputs(_(" -w, --wide wide output\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);
-@@ -948,6 +949,7 @@ int main(int argc, char *argv[])
+@@ -952,6 +953,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'},
-@@ -964,7 +966,7 @@ int main(int argc, char *argv[])
+@@ -968,7 +970,7 @@ int main(int argc, char *argv[])
atexit(close_stdout);
while ((c =
@@ -114,7 +114,7 @@
switch (c) {
case 'V':
printf(PROCPS_NG_VERSION);
-@@ -1031,6 +1033,9 @@ int main(int argc, char *argv[])
+@@ -1035,6 +1037,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.otFSkD/_old 2023-02-20 17:47:58.200148912 +0100
+++ /var/tmp/diff_new_pack.otFSkD/_new 2023-02-20 17:47:58.204148934 +0100
@@ -4,7 +4,7 @@
--- src/vmstat.c
+++ src/vmstat.c 2022-03-29 09:21:41.156855432 +0000
-@@ -362,7 +362,7 @@ static void new_format(void)
+@@ -358,7 +358,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];
-@@ -481,12 +481,12 @@ static void new_format(void)
+@@ -485,12 +485,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.otFSkD/_old 2023-02-20 17:47:58.212148979 +0100
+++ /var/tmp/diff_new_pack.otFSkD/_new 2023-02-20 17:47:58.216149002 +0100
@@ -5,7 +5,7 @@
--- src/pmap.c
+++ src/pmap.c 2022-10-20 13:35:47.074351812 +0000
-@@ -55,7 +55,9 @@ const char *nls_Address,
+@@ -59,7 +59,9 @@ const char *nls_Address,
*nls_Kbytes,
*nls_Mode,
*nls_RSS,
@@ -16,7 +16,7 @@
static void nls_initialize(void)
{
-@@ -79,7 +81,9 @@ static void nls_initialize(void)
+@@ -83,7 +85,9 @@ static void nls_initialize(void)
nls_Kbytes = _("Kbytes");
nls_Mode = _("Mode");
nls_RSS = _("RSS");
@@ -26,7 +26,7 @@
}
static int justify_print(const char *str, int width, int right)
-@@ -146,10 +150,10 @@ static int d_option = 0;
+@@ -150,10 +154,10 @@ static int d_option = 0;
static int n_option = 0;
static int N_option = 0;
static int q_option = 0;
@@ -39,7 +39,7 @@
static unsigned shm_minor = ~0u;
-@@ -538,12 +542,17 @@ static int one_proc (struct pids_stack *
+@@ -542,12 +546,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));
-@@ -566,13 +575,15 @@ static int one_proc (struct pids_stack *
+@@ -570,13 +579,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);
}
-@@ -612,6 +623,11 @@ static int one_proc (struct pids_stack *
+@@ -616,6 +627,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;
-@@ -624,16 +640,20 @@ static int one_proc (struct pids_stack *
+@@ -628,16 +644,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;
-@@ -667,7 +687,6 @@ static int one_proc (struct pids_stack *
+@@ -671,7 +691,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
-@@ -719,17 +738,21 @@ static int one_proc (struct pids_stack *
+@@ -723,17 +742,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
-@@ -1042,16 +1065,18 @@ int main(int argc, char **argv)
+@@ -1046,16 +1069,18 @@ int main(int argc, char **argv)
while ((c = getopt_long(argc, argv, "xXrdqA:hVcC:nN:p", longopts,
NULL)) != -1)
switch (c) {
case 'x':
++++++ procps-ng-3.3.8-ignore-scan_unevictable_pages.patch ++++++
--- /var/tmp/diff_new_pack.otFSkD/_old 2023-02-20 17:47:58.228149070 +0100
+++ /var/tmp/diff_new_pack.otFSkD/_new 2023-02-20 17:47:58.232149092 +0100
@@ -13,7 +13,7 @@
--- a/src/sysctl.c
+++ b/src/sysctl.c
-@@ -58,6 +58,7 @@ static const char DEFAULT_PRELOAD[] = "/
+@@ -63,6 +58,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.otFSkD/_old 2023-02-20 17:47:58.240149138 +0100
+++ /var/tmp/diff_new_pack.otFSkD/_new 2023-02-20 17:47:58.244149160 +0100
@@ -4,7 +4,7 @@
--- src/top/top.c
+++ src/top/top.c 2022-03-29 10:24:43.327490984 +0000
-@@ -1672,9 +1672,9 @@ static inline const char *make_str_utf8
+@@ -1673,9 +1673,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;
-@@ -1684,7 +1684,7 @@ static const char *scale_mem (int target
+@@ -1685,7 +1685,7 @@ static const char *scale_mem (int target
if (Rc.zero_suppress && 0 >= num)
goto end_justifies;
++++++ procps-ng-3.3.8-readeof.patch ++++++
--- /var/tmp/diff_new_pack.otFSkD/_old 2023-02-20 17:47:58.256149228 +0100
+++ /var/tmp/diff_new_pack.otFSkD/_new 2023-02-20 17:47:58.256149228 +0100
@@ -4,7 +4,7 @@
--- library/readproc.c
+++ library/readproc.c 2022-03-28 11:51:04.751862744 +0000
-@@ -731,7 +731,7 @@ static int file2str(const char *director
+@@ -735,7 +735,7 @@ static int file2str(const char *director
}
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;
-@@ -755,25 +755,25 @@ static int file2str(const char *director
+@@ -759,25 +759,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 */
}
-@@ -807,7 +807,7 @@ static char **file2strvec(const char *di
+@@ -811,7 +811,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')
-@@ -820,7 +820,7 @@ static char **file2strvec(const char *di
+@@ -824,7 +824,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 */
++++++ procps-ng-3.3.8-vmstat-terabyte.dif ++++++
--- /var/tmp/diff_new_pack.otFSkD/_old 2023-02-20 17:47:58.268149296 +0100
+++ /var/tmp/diff_new_pack.otFSkD/_new 2023-02-20 17:47:58.272149318 +0100
@@ -3,13 +3,13 @@
1 file changed, 2 insertions(+), 2 deletions(-)
--- src/vmstat.c
-+++ src/vmstat.c 2022-03-29 10:36:49.654287539 +0000
-@@ -337,8 +337,8 @@ static void new_header(void)
++++ src/vmstat.c 2023-02-08 08:59:05.175343180 +0000
+@@ -333,8 +333,8 @@ static void new_header(void)
static unsigned long unitConvert(unsigned long size)
{
-- float cvSize;
-- cvSize = (float)size / dataUnit * ((statMode == SLABSTAT) ? 1 : 1024);
+- double cvSize;
+- cvSize = (double)size / dataUnit * ((statMode == SLABSTAT) ? 1 : 1024);
+ long double cvSize;
+ cvSize = (long double)size / dataUnit * ((statMode == SLABSTAT) ? 1 :
1024);
return ((unsigned long)cvSize);
++++++ procps-ng-3.3.9-w-notruncate.diff ++++++
--- /var/tmp/diff_new_pack.otFSkD/_old 2023-02-20 17:47:58.284149386 +0100
+++ /var/tmp/diff_new_pack.otFSkD/_new 2023-02-20 17:47:58.288149409 +0100
@@ -4,8 +4,8 @@
2 files changed, 18 insertions(+), 3 deletions(-)
--- man/w.1
-+++ man/w.1 2022-03-23 15:02:32.728894724 +0000
-@@ -40,6 +40,9 @@ and a
++++ man/w.1 2023-02-08 08:51:13.971987652 +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.
.TP
@@ -16,17 +16,17 @@
Toggle printing the
.B from
--- src/w.c
-+++ src/w.c 2022-03-28 11:20:25.453174765 +0000
-@@ -450,7 +450,7 @@ static int find_best_proc(
++++ src/w.c 2023-02-08 08:53:39.785313401 +0000
+@@ -458,7 +458,7 @@ static int find_best_proc(
static void showinfo(
utmp_t * u, int formtype, int maxcmd, int from,
-- const int userlen, const int fromlen, const int ip_addresses)
-+ int userlen, int fromlen, const int ip_addresses)
+- const int userlen, const int fromlen, const int ip_addresses,
++ int userlen, int fromlen, const int ip_addresses,
+ const int pids)
{
unsigned long long jcpu, pcpu;
- unsigned i;
-@@ -481,7 +481,13 @@ static void showinfo(
+@@ -492,7 +492,13 @@ static void showinfo(
strncpy(uname, u->ut_user, UT_NAMESIZE);
if (formtype) {
@@ -41,7 +41,7 @@
if (from)
print_from(u, ip_addresses, fromlen);
#ifdef HAVE_UTMPX_H
-@@ -526,6 +532,7 @@ static void __attribute__ ((__noreturn__
+@@ -545,6 +551,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);
@@ -49,7 +49,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);
-@@ -562,6 +569,7 @@ int main(int argc, char **argv)
+@@ -583,6 +590,7 @@ int main(int argc, char **argv)
{"no-header", no_argument, NULL, 'h'},
{"no-current", no_argument, NULL, 'u'},
{"short", no_argument, NULL, 's'},
@@ -57,16 +57,16 @@
{"from", no_argument, NULL, 'f'},
{"old-style", no_argument, NULL, 'o'},
{"ip-addr", no_argument, NULL, 'i'},
-@@ -583,7 +591,7 @@ int main(int argc, char **argv)
+@@ -605,7 +613,7 @@ int main(int argc, char **argv)
#endif
while ((ch =
-- getopt_long(argc, argv, "husfoVi", longopts, NULL)) != -1)
-+ getopt_long(argc, argv, "husnfoVi", longopts, NULL)) != -1)
+- getopt_long(argc, argv, "husfoVip", longopts, NULL)) != -1)
++ getopt_long(argc, argv, "husnfoVip", longopts, NULL)) != -1)
switch (ch) {
case 'h':
header = 0;
-@@ -591,6 +599,10 @@ int main(int argc, char **argv)
+@@ -613,6 +621,10 @@ int main(int argc, char **argv)
case 's':
longform = 0;
break;
++++++ procps-ng-4.0.2.tar.xz -> procps-ng-4.0.3.tar.xz ++++++
++++ 228332 lines of diff (skipped)
++++++ procps-v3.3.3-columns.dif ++++++
--- /var/tmp/diff_new_pack.otFSkD/_old 2023-02-20 17:48:00.420161453 +0100
+++ /var/tmp/diff_new_pack.otFSkD/_new 2023-02-20 17:48:00.424161475 +0100
@@ -4,7 +4,7 @@
--- src/ps/global.c
+++ src/ps/global.c 2022-03-29 09:31:24.242140877 +0000
-@@ -258,8 +258,11 @@ static void set_screen_size(void){
+@@ -262,8 +262,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){
-@@ -401,6 +404,7 @@ static const char *set_personality(void)
+@@ -405,6 +408,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 */
-@@ -428,6 +432,7 @@ static const char *set_personality(void)
+@@ -432,6 +436,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";
-@@ -453,12 +458,14 @@ static const char *set_personality(void)
+@@ -457,12 +462,14 @@ static const char *set_personality(void)
case_hp:
case_hpux:
personality = PER_HPUX_x;
@@ -49,7 +49,7 @@
return NULL;
case_posix:
-@@ -499,8 +506,8 @@ void reset_global(void){
+@@ -503,8 +510,8 @@ void reset_global(void){
}
// --- <pids> interface --------------------------------------------------
++++++ procps-v3.3.3-ia64.diff ++++++
--- /var/tmp/diff_new_pack.otFSkD/_old 2023-02-20 17:48:00.432161520 +0100
+++ /var/tmp/diff_new_pack.otFSkD/_new 2023-02-20 17:48:00.436161543 +0100
@@ -1,6 +1,6 @@
--- library/devname.c
+++ library/devname.c 2012-06-01 13:35:43.452010553 +0000
-@@ -47,6 +47,10 @@
+@@ -50,6 +50,10 @@
#define minor(d) ( ((unsigned)(d)&0xffu) | (((unsigned)(d)&0xfff00000u)>>12u)
)
#endif
++++++ procps-v3.3.3-pwdx.patch ++++++
--- /var/tmp/diff_new_pack.otFSkD/_old 2023-02-20 17:48:00.444161588 +0100
+++ /var/tmp/diff_new_pack.otFSkD/_new 2023-02-20 17:48:00.444161588 +0100
@@ -4,7 +4,7 @@
--- src/pwdx.c
+++ src/pwdx.c 2016-07-11 13:17:16.154313659 +0000
-@@ -109,6 +109,7 @@ int main(int argc, char *argv[])
+@@ -113,6 +113,7 @@ int main(int argc, char *argv[])
buflen = 10 + strlen(argv[i]) + 1;
buf = xmalloc(buflen);
++++++ procps-v3.3.3-read-sysctls-also-from-boot-sysctl.conf-kernelversion.diff
++++++
--- /var/tmp/diff_new_pack.otFSkD/_old 2023-02-20 17:48:00.456161656 +0100
+++ /var/tmp/diff_new_pack.otFSkD/_new 2023-02-20 17:48:00.456161656 +0100
@@ -5,7 +5,7 @@
--- man/sysctl.8
+++ man/sysctl.8 2022-03-29 10:21:47.926686046 +0000
-@@ -117,6 +117,8 @@ will read files from directories in the
+@@ -122,6 +122,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.
@@ -16,7 +16,7 @@
/run/sysctl.d/*.conf
--- src/sysctl.c
+++ src/sysctl.c 2022-03-29 10:20:51.795708321 +0000
-@@ -40,6 +40,7 @@
+@@ -45,6 +45,7 @@
#include <string.h>
#include <sys/stat.h>
#include <sys/types.h>
@@ -24,7 +24,7 @@
#include <unistd.h>
#include <ctype.h>
-@@ -806,6 +807,7 @@ static int sortpairs(const void *A, cons
+@@ -811,6 +812,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",
-@@ -870,6 +872,16 @@ static int PreloadSystem(SettingList *se
+@@ -875,6 +877,16 @@ static int PreloadSystem(SettingList *se
}
qsort(cfgs, ncfgs, sizeof(struct cfg *), sortpairs);
