Reviewed-by: Peter Müller > - Update from v3.3.16 to v4.0.0 > - added --disable-static to ./configure to remove static libs from rootfile > - Update of rootfile > - Changed lib name. Ran ./make.sh find-dependencies. No dependencies on old libraries > - Changelog > procps-ng-4.0.0 > * Rename pwait to pidwait > * free: Add committed line option merge #25 > * free: Fix -h --si combined options issue #133, #223 > * free: Fix first column justification issue #229, #204, #206, Debian #1001689 > * free: Better spacing for Chinese language issue #213 > * library: renamed to libproc-2 and reset to 0:0:0 > * library: add support for accessing smaps_rollup issue #112, #201 > * library: add support for accessing autogroups > * library: add support for LIBPROC_HIDE_KERNEL env var merge #147 > * library: add support for cpu utilization to pids i/f > * pkill: Check for lt- variants of program name issue #192 > * pgrep: Add newline after regex error message merge #91 > * pgrep: Fix selection where uid/gid > 2^31 merge !146 > * pgrep: Select on cgroup v2 paths issue #168 > * ps: Add OOM and OOMADJ fields issue #198 > * ps: Add IO Accounting fields issue #184 > * ps: Add PSS and USS fields issue #112 > * ps: Add two new autogroup fields > * ps: Ignore SIGURG merge !142 > * slabtop: Don't combine d and o options issue #160 > * sysctl: Add support for systemd glob patterns issue #191 > * sysctl: Check resolved path to be under /proc/sys issue #179 > * sysctl: return non-zero if EINVAL return for write merge #76 > * sysctl.conf.5: Note max line length issue #77 > * top: added LOGID similar to 3.3.13 ps LUID > * top: added EXE identical to 3.3.17 ps EXE > * top: exploit some library smaps_rollup provisions issue #112 > * top: added four new IO accounting fields issue #184 > * top: 'F' key is now a new forest view 'focus' toggle > * top: summary area memory lines can print two abreast > * top: added two new autogroup fields > * top: added long versions of command line options > * top: added cpu utilization & 2 time related fields > * top: the time related fields can now be user scaled > * uptime: print short/pretty format correctly issue #217 > * vmstat: add -y option to remove first line merge !72 > procps-ng-3.3.17 > * library: Incremented to 8:3:0 > (no removals or additions, internal changes only) > * all: properly handle utf8 cmdline translations issue #176 > * kill: Pass int to signalled process merge #32 > * pgrep: Pass int to signalled process merge #32 > * pgrep: Check sanity of SG_ARG_MAX issue #152 > * pgrep: Add older than selection merge #79 > * pidof: Quiet mode merge #83 > * pidof: show worker threads Redhat #1803640 > * ps.1: Mention stime alias issue #164 > * ps: check also match on truncated 16 char comm names > * ps: Add exe output option Redhat #1399206 > * pwait: New command waits for a process merge #97 > * sysctl: Match systemd directory order Debian #950788 > * sysctl: Document directory order Debian #951550 > * top: ensure config file backward compatibility Debian #951335 > * top: add command line 'e' for symmetry with 'E' issue #165 > * top: add '4' toggle for two abreast cpu display issue #172 > * top: add '!' toggle for combining multiple cpus > * top: fix potential SEGV involving -p switch merge #114 > * vmstat: Wide mode gives wider proc columns merge #48 > * watch: Add environment variable for interval merge #62 > * watch: Add no linewrap option issue #182 > * watch: Support more colors merge #106,#109 > * free,uptime,slabtop: complain about extra ops issue #181 > > Signed-off-by: Adolf Belka > --- > config/rootfiles/common/procps | 44 ++++++++++++++++------------------ > lfs/procps | 7 +++--- > 2 files changed, 24 insertions(+), 27 deletions(-) > > diff --git a/config/rootfiles/common/procps b/config/rootfiles/common/procps > index fc7d9326e..144af75d7 100644 > --- a/config/rootfiles/common/procps > +++ b/config/rootfiles/common/procps > @@ -1,16 +1,16 @@ > bin/kill > bin/ps > -#lib/libprocps.a > -#lib/libprocps.la > -#lib/libprocps.so > -lib/libprocps.so.8 > -lib/libprocps.so.8.0.2 > +#lib/libproc-2.la > +#lib/libproc-2.so > +lib/libproc-2.so.0 > +lib/libproc-2.so.0.0.0 > #lib/pkgconfig > -#lib/pkgconfig/libprocps.pc > +#lib/pkgconfig/libproc-2.pc > sbin/sysctl > usr/bin/free > usr/bin/pgrep > usr/bin/pidof > +usr/bin/pidwait > #usr/bin/pkill > #usr/bin/pmap > #usr/bin/pwdx > @@ -20,23 +20,19 @@ usr/bin/top > usr/bin/vmstat > usr/bin/w > usr/bin/watch > -#usr/include/proc > -#usr/include/proc/alloc.h > -#usr/include/proc/devname.h > -#usr/include/proc/escape.h > -#usr/include/proc/numa.h > -#usr/include/proc/procps.h > -#usr/include/proc/pwcache.h > -#usr/include/proc/readproc.h > -#usr/include/proc/sig.h > -#usr/include/proc/slab.h > -#usr/include/proc/sysinfo.h > -#usr/include/proc/version.h > -#usr/include/proc/wchan.h > -#usr/include/proc/whattime.h > +#usr/include/procps > +#usr/include/procps/diskstats.h > +#usr/include/procps/meminfo.h > +#usr/include/procps/misc.h > +#usr/include/procps/pids.h > +#usr/include/procps/slabinfo.h > +#usr/include/procps/stat.h > +#usr/include/procps/vmstat.h > +#usr/include/procps/xtra-procps-debug.h > #usr/share/doc/procps-ng > #usr/share/doc/procps-ng/FAQ > #usr/share/doc/procps-ng/bugs.md > +#usr/share/doc/procps-ng/libproc.supp > #usr/share/locale/de/LC_MESSAGES/procps-ng.mo > #usr/share/locale/fr/LC_MESSAGES/procps-ng.mo > #usr/share/locale/pl/LC_MESSAGES/procps-ng.mo > @@ -49,9 +45,9 @@ usr/bin/watch > #usr/share/man/man1/kill.1 > #usr/share/man/man1/pgrep.1 > #usr/share/man/man1/pidof.1 > +#usr/share/man/man1/pidwait.1 > #usr/share/man/man1/pkill.1 > #usr/share/man/man1/pmap.1 > -#usr/share/man/man1/procps.1 > #usr/share/man/man1/ps.1 > #usr/share/man/man1/pwdx.1 > #usr/share/man/man1/slabtop.1 > @@ -59,9 +55,9 @@ usr/bin/watch > #usr/share/man/man1/top.1 > #usr/share/man/man1/w.1 > #usr/share/man/man1/watch.1 > -#usr/share/man/man3/openproc.3 > -#usr/share/man/man3/readproc.3 > -#usr/share/man/man3/readproctab.3 > +#usr/share/man/man3/procps.3 > +#usr/share/man/man3/procps_misc.3 > +#usr/share/man/man3/procps_pids.3 > #usr/share/man/man5/sysctl.conf.5 > #usr/share/man/man8/sysctl.8 > #usr/share/man/man8/vmstat.8 > diff --git a/lfs/procps b/lfs/procps > index 258d1c769..5189e477b 100644 > --- a/lfs/procps > +++ b/lfs/procps > @@ -24,7 +24,7 @@ > > include Config > > -VER = v3.3.16 > +VER = v4.0.0 > > THISAPP = procps-$(VER) > DL_FILE = $(THISAPP).tar.gz > @@ -40,7 +40,7 @@ objects = $(DL_FILE) > > $(DL_FILE) = $(DL_FROM)/$(DL_FILE) > > -$(DL_FILE)_BLAKE2 = 44b5871deeba9d37a38a113937c8b632cc3e400d184fbdf9d64d53370c4f52d1339c1b5e15cc7d53141c4774f993de0cafc0b53aeff6d7fb658126c9b9ad88da > +$(DL_FILE)_BLAKE2 = 5b6c684aaaf4114ea6d53287f220fbc375556a9630a54d9ad8e0750d1d373ab73cf38e06df7cc663853d11fa69237ecd89dffaf3a84dc57df652357983f536cb > > install : $(TARGET) > > @@ -73,7 +73,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) > cd $(DIR_APP) && ./autogen.sh > cd $(DIR_APP) && ./configure \ > --prefix=/usr \ > - --libdir=/lib > + --libdir=/lib \ > + --disable-static > cd $(DIR_APP) && make $(MAKETUNING) > cd $(DIR_APP) && make install > install -m 0644 $(DIR_SRC)/config/etc/sysctl.conf /etc