procps: Update to version v4.0.4

- Update from version v4.0.3 to v4.0.4
- Update of rootfile
- Removal of patch to fix build failures with gettext-0.22 as this has been incorporated
   into the source tarball.
- Changelog
    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
	  * watch: Add color support at compile time               issue #296

Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/config/rootfiles/common/procps b/config/rootfiles/common/procps
index db9a8cfc319c0d135473af02f7308491e6313750..08431a6119754c1bae12a0f1a7eaa63eccb6bb40 100644 (file)
--- a/config/rootfiles/common/procps
+++ b/config/rootfiles/common/procps
@@ -3,7 +3,7 @@ bin/ps
 #lib/libproc2.la
 #lib/libproc2.so
 lib/libproc2.so.0
-lib/libproc2.so.0.0.1
+lib/libproc2.so.0.0.2
 #lib/pkgconfig
 #lib/pkgconfig/libproc2.pc
 sbin/sysctl

diff --git a/lfs/procps b/lfs/procps
index 7aa41909a75b827b4e69f404378f7db70e579cdd..cc2d7fbceee96fe88b27463fa25d1cb72d02433d 100644 (file)
--- a/lfs/procps
+++ b/lfs/procps
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = v4.0.3
+VER        = v4.0.4
 
 THISAPP    = procps-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_BLAKE2 = 9836bda7bf8c9dab83d2c6064af3c52f070737ad2fb399e4ca015f33c1d45db378097eb9e77763107975412a19b4dacfbe110655074704270d679ccd94e6f9c0
+$(DL_FILE)_BLAKE2 = 0ce3c6291e17ae6dcfb15a144689b9be481d3d9728372822a8f2119446ad844100f98e15e559266c2472aa128e381d1cf495348f5adb90ac393f4de4b7185a5b
 
 install : $(TARGET)
 
@@ -70,7 +70,6 @@ $(subst %,%_BLAKE2,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/procps-v4.0.3_address_build_failures_with_gettext_0.22.patch
        cd $(DIR_APP) && ./autogen.sh
        cd $(DIR_APP) && ./configure \
                                --prefix=/usr \

diff --git a/src/patches/procps-v4.0.3_address_build_failures_with_gettext_0.22.patch b/src/patches/procps-v4.0.3_address_build_failures_with_gettext_0.22.patch
deleted file mode 100644 (file)
index 6552151..0000000
--- a/src/patches/procps-v4.0.3_address_build_failures_with_gettext_0.22.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- procps-v4.0.3/po/fr.po.orig        2023-02-15 21:26:15.000000000 +0100
-+++ procps-v4.0.3/po/fr.po     2023-07-28 19:45:59.065599580 +0200
-@@ -3800,7 +3800,7 @@
- "Type 'q' or <Esc> to continue "
- msgstr ""
- "Aide pour les commandes interactives~2 - %s\n"
--"Fenêtre ~1%s~6: ~1Mode cumulatif ~3%s~2.  ~1Système~6: ~1Délai ~3%.1lf "
-+"Fenêtre ~1%s~6: ~1Mode cumulatif ~3%s~2.  ~1Système~6: ~1Délai ~3%.1f "
- "secs~2; ~1Mode sûr ~3%s~2.\n"
- "\n"
- "  Z~5,~1B~5,E,e   Global: «~1Z~2» couleurs; «~1B~2» gras; «~1E~2»/«~1e~2» "
-@@ -4723,7 +4723,7 @@
- #: src/watch.c:486
- #, c-format
- msgid "Every %.1fs: "
--msgstr "Toutes les %.1lfs: "
-+msgstr "Toutes les %.1fs: "
- 
- #: src/watch.c:487
- #, c-format