Commit 32278e4e authored by Vladimir Bashkirtsev's avatar Vladimir Bashkirtsev

Upgraded procps-ng to 3.3.17

parent b85c6166
all: all:
tar xf procps-ng-3.3.16.tar.xz tar xf procps-ng-3.3.17.tar.xz
cd procps-ng-3.3.16 && ./configure --build=$(CLFS_TARGET) --prefix=/usr --exec-prefix= --libdir=/usr/lib --docdir=/usr/share/doc/procps-ng-3.3.16 --disable-static --disable-kill --with-systemd patch -Np1 -d procps-3.3.17 < procps-ng-3.3.17-fix_pkill_tests.patch
$(MAKE) -C procps-ng-3.3.16 cd procps-3.3.17 && ./configure --build=$(CLFS_TARGET) --prefix=/usr --exec-prefix= --libdir=/usr/lib --docdir=/usr/share/doc/procps-ng-3.3.17 --disable-static --disable-kill --with-systemd
cd procps-ng-3.3.16 && sed -i -r 's|(pmap_initname)\\\$$|\1|' testsuite/pmap.test/pmap.exp $(MAKE) -C procps-3.3.17
cd procps-3.3.17 && sed -i -r 's|(pmap_initname)\\\$$|\1|' testsuite/pmap.test/pmap.exp
if [[ ! "$(BUILD_OPTIONS)" =~ no-tests ]] ; then \ if [[ ! "$(BUILD_OPTIONS)" =~ no-tests ]] ; then \
$(MAKE) -C procps-ng-3.3.16 check ; \ $(MAKE) -C procps-3.3.17 check ; \
fi fi
$(MAKE) -C procps-ng-3.3.16 install $(MAKE) -C procps-3.3.17 install
mv -v /usr/lib/libprocps.so.* /lib mv -v /usr/lib/libprocps.so.* /lib
ln -sfv ../../lib/$$(readlink /usr/lib/libprocps.so) /usr/lib/libprocps.so ln -sfv ../../lib/$$(readlink /usr/lib/libprocps.so) /usr/lib/libprocps.so
rm -rf procps-ng-3.3.16 rm -rf procps-3.3.17
diff -uNr procps-3.3.17/pgrep.c procps-3.3.17-fix_pkill_tests/pgrep.c
--- procps-3.3.17/pgrep.c 2021-02-09 20:41:25.000000000 +1030
+++ procps-3.3.17-fix_pkill_tests/pgrep.c 2022-10-19 00:01:44.562851704 +1030
@@ -794,12 +794,12 @@
};
#ifdef ENABLE_PWAIT
- if (strcmp (program_invocation_short_name, "pwait") == 0) {
+ if (strstr (program_invocation_short_name, "pwait")) {
prog_mode = PWAIT;
strcat (opts, "e");
} else
#endif
- if (strcmp (program_invocation_short_name, "pkill") == 0) {
+ if (strstr (program_invocation_short_name, "pkill")) {
int sig;
prog_mode = PKILL;
sig = signal_option(&argc, argv);
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment