From patchwork Sat Dec 26 16:40:32 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adolf Belka X-Patchwork-Id: 3757 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4D38hB327tz3wx8 for ; Sat, 26 Dec 2020 16:40:58 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail02.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4D38h84RfCz1SP; Sat, 26 Dec 2020 16:40:56 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4D38h75lPsz2xlL; Sat, 26 Dec 2020 16:40:55 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature RSA-PSS (4096 bits)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4D38h5670yz2xfh for ; Sat, 26 Dec 2020 16:40:52 +0000 (UTC) Received: from smtpq4.tb.mail.iss.as9143.net (smtpq4.tb.mail.iss.as9143.net [212.54.42.167]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPS id 4D38gz2Lxjz1SP for ; Sat, 26 Dec 2020 16:40:47 +0000 (UTC) Received: from [212.54.42.137] (helo=smtp6.tb.mail.iss.as9143.net) by smtpq4.tb.mail.iss.as9143.net with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ktCcY-0004bs-JV; Sat, 26 Dec 2020 17:40:46 +0100 Received: from j103033.upc-j.chello.nl ([24.132.103.33] helo=rhea.saturn.pimb.org) by smtp6.tb.mail.iss.as9143.net with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.93) (envelope-from ) id 1ktCcY-002Fe9-7q; Sat, 26 Dec 2020 17:40:46 +0100 Received: from hyperion.saturn.pimb.org (hyperion.saturn.pimb.org [192.168.26.32]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by rhea.saturn.pimb.org (Postfix) with ESMTPSA id BDE2F3E2B; Sat, 26 Dec 2020 17:40:44 +0100 (CET) From: Adolf Belka To: development@lists.ipfire.org Subject: [PATCH] procps: Update to 3.3.16 Date: Sat, 26 Dec 2020 17:40:32 +0100 Message-Id: <20201226164032.3257066-1-ahb.ipfire@gmail.com> X-Mailer: git-send-email 2.29.2 MIME-Version: 1.0 X-SourceIP: 24.132.103.33 X-Authenticated-Sender: adolf.belka@ziggo.nl (via SMTP) X-Ziggo-spambar: / X-Ziggo-spamscore: 0.0 X-Ziggo-spamreport: CMAE Analysis: v=2.4 cv=TcEoCTch c=1 sm=1 tr=0 ts=5fe7678e a=N0UC3/faf55XGTeY5t7zSQ==:17 a=9+rZDBEiDlHhcck0kWbJtElFXBc=:19 a=zTNgK-yGK50A:10 a=x7bEGLp0ZPQA:10 a=6yxbeI8x3IIA:10 a=SXrL0pDUAAAA:20 a=pGLkceISAAAA:8 a=H0Oeh-fsAAAA:8 a=gGqeNROB3SSEZcb0JJkA:9 a=ykfiiK0KQT7XJlOC9nR5:22 X-Ziggo-Spam-Status: No X-Spam-Status: No X-Spam-Flag: No ARC-Authentication-Results: i=1; mail01.ipfire.org; dkim=none; spf=softfail (mail01.ipfire.org: 212.54.42.167 is neither permitted nor denied by domain of ahbipfire@gmail.com) smtp.mailfrom=ahbipfire@gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=lists.ipfire.org; s=202003rsa; t=1609000847; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=s96p9AeYrPKTVnMh6cegm9zN6ee8T+sVYfAiN/4Sreg=; b=M3m/dffXeTb//hEmVdM+mso2PjSjQ8WmYjwYzj4v5QoxFi1kEYv2iM5IIuxT2Pkrgob0iO ozCvnxqhdx8fWeij/qXeICPm9FHl5+tjEZmMM15ikdRW2fsVlPv+aIf0AyHvr0BEZpAjoO KFAUoAZFA7FwtF892tgeJ+CFeQy3yRwvZQcscteUJKkJympSwhQsbOA2azs59FnofXp84n E4Lz0aVRcl2PyU7BmxbzSRDBcRK3ry3bN9fZfmovnD96E9agEyv+hhhvl3GK1e6m4qT/rZ XAHawsfWMGy6zfvcrEL6vxHsUofMLquqtSiG0IxW/XbripUgfNko983UJNtv0g== ARC-Seal: i=1; s=202003rsa; d=lists.ipfire.org; t=1609000847; a=rsa-sha256; cv=none; b=wKAPbMh7i6u/DhmJ6GtO7vSNYw27yy+YsfUnr87LKA80+lBiNmxV7p5yz1xj/5DyN1h7F/ 1zBGDmiBFkhWiueOSZjYlkpiTU6NkLakABaq9PKzSXR1GMGD8P/ubaPkrNLccXFhysu6m7 nuFBvc6SgrrX1TMnab/CK0cpjue+y/v5ELFN3XyvtC0ePkSN7ZTcDuuGvWbjno6wVe47T4 o0jo22iif74f8xTqKh7XkKBQg5/RVOBMKaegdT9hVbnfH5EpAx221eF/7X60HMLgI9gwbN 0qK2dqpaczInResVkG+egBKPVZVO+CvYYZciXzhcHuyjT4gMbE0Ws7zyHT8GrQ== X-Rspamd-Queue-Id: 4D38gz2Lxjz1SP Authentication-Results: mail01.ipfire.org; dkim=none; spf=softfail (mail01.ipfire.org: 212.54.42.167 is neither permitted nor denied by domain of ahbipfire@gmail.com) smtp.mailfrom=ahbipfire@gmail.com; dmarc=fail reason="No valid SPF, No valid DKIM" header.from=gmail.com (policy=none) X-Rspamd-Server: mail01.haj.ipfire.org X-Spamd-Result: default: False [-1.26 / 11.00]; RCVD_VIA_SMTP_AUTH(0.00)[]; TO_DN_SOME(0.00)[]; FREEMAIL_FROM(0.00)[gmail.com]; R_MISSING_CHARSET(2.50)[]; IP_REPUTATION_HAM(-2.26)[asn: 33915(-0.25), country: NL(-0.00), ip: 212.54.42.167(-0.88)]; BROKEN_CONTENT_TYPE(1.50)[]; R_SPF_SOFTFAIL(0.00)[~all]; ARC_SIGNED(0.00)[lists.ipfire.org:s=202003rsa:i=1]; RCVD_COUNT_THREE(0.00)[4]; RCPT_COUNT_TWO(0.00)[2]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; FREEMAIL_ENVFROM(0.00)[gmail.com]; ASN(0.00)[asn:33915, ipnet:212.54.32.0/20, country:NL]; R_DKIM_NA(0.00)[]; HAS_X_AS(0.00)[]; RECEIVED_SPAMHAUS_PBL(0.00)[24.132.103.33:received]; TAGGED_FROM(0.00)[]; ARC_NA(0.00)[]; MID_RHS_MATCH_FROM(0.00)[]; FROM_HAS_DN(0.00)[]; BAYES_HAM(-3.00)[100.00%]; TAGGED_RCPT(0.00)[]; MIME_GOOD(-0.10)[text/plain]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[212.54.42.167:from]; RWL_MAILSPIKE_POSSIBLE(0.00)[212.54.42.167:from]; FREEMAIL_CC(0.00)[gmail.com]; RCVD_TLS_ALL(0.00)[]; DMARC_POLICY_SOFTFAIL(0.10)[gmail.com : No valid SPF, No valid DKIM,none] X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: development-bounces@lists.ipfire.org Sender: "Development" - update from 3.2.8 to 3.3.16 This is also an update from procps to procps-ng The previous version was no longer being maintained. - Added autogen.sh into lfs as ity is needed to create the config script. - Added libdir=/lib line into configure command as default is /usr/lib - Added mv commands for kill, ps & sysctl to place them into the same locations as the previous version of procps - Moved lfsmake2 procps line to after pkg-config in make.sh The autogen line requires autoconf, libtool, gettext and pkg-config to be available so procps moved to after them. - procps-3.2.8-fix_unknown_HZ_value.patch no longer required with new version so removed. - rootfile updated. - libprocps library being maintained by the same people now maitaining this version of procps. - information on the releases from 3.3.13 to 3.3.16 available on https://gitlab.com/procps-ng/procps/-/releases Signed-off-by: Adolf Belka --- config/rootfiles/common/procps | 45 ++++++++++++++++--- lfs/procps | 16 +++++-- make.sh | 2 +- .../procps-3.2.8-fix_unknown_HZ_value.patch | 35 --------------- 4 files changed, 51 insertions(+), 47 deletions(-) delete mode 100644 src/patches/procps-3.2.8-fix_unknown_HZ_value.patch diff --git a/config/rootfiles/common/procps b/config/rootfiles/common/procps index 1f32be94a..fc7d9326e 100644 --- a/config/rootfiles/common/procps +++ b/config/rootfiles/common/procps @@ -1,36 +1,67 @@ bin/kill bin/ps -lib/libproc-3.2.8.so +#lib/libprocps.a +#lib/libprocps.la +#lib/libprocps.so +lib/libprocps.so.8 +lib/libprocps.so.8.0.2 +#lib/pkgconfig +#lib/pkgconfig/libprocps.pc sbin/sysctl usr/bin/free usr/bin/pgrep +usr/bin/pidof #usr/bin/pkill #usr/bin/pmap #usr/bin/pwdx -#usr/bin/skill #usr/bin/slabtop -#usr/bin/snice #usr/bin/tload usr/bin/top -usr/bin/uptime 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/share/doc/procps-ng +#usr/share/doc/procps-ng/FAQ +#usr/share/doc/procps-ng/bugs.md +#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 +#usr/share/locale/pt_BR/LC_MESSAGES/procps-ng.mo +#usr/share/locale/sv/LC_MESSAGES/procps-ng.mo +#usr/share/locale/uk/LC_MESSAGES/procps-ng.mo +#usr/share/locale/vi/LC_MESSAGES/procps-ng.mo +#usr/share/locale/zh_CN/LC_MESSAGES/procps-ng.mo #usr/share/man/man1/free.1 #usr/share/man/man1/kill.1 #usr/share/man/man1/pgrep.1 +#usr/share/man/man1/pidof.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/skill.1 #usr/share/man/man1/slabtop.1 -#usr/share/man/man1/snice.1 #usr/share/man/man1/tload.1 #usr/share/man/man1/top.1 -#usr/share/man/man1/uptime.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/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 4807f5210..4667917c8 100644 --- a/lfs/procps +++ b/lfs/procps @@ -24,7 +24,7 @@ include Config -VER = 3.2.8 +VER = v3.3.16 THISAPP = procps-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 9532714b6846013ca9898984ba4cd7e0 +$(DL_FILE)_MD5 = 2af440d54f94a3b44020bf0ea1bf9de8 install : $(TARGET) @@ -70,9 +70,17 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-fix_unknown_HZ_value.patch - cd $(DIR_APP) && make $(MAKETUNING) LIBPROC=proc/libproc-$(VER).so + cd $(DIR_APP) && ./autogen.sh + cd $(DIR_APP) && ./configure \ + --prefix=/usr \ + --libdir=/lib + cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install install -m 0644 $(DIR_SRC)/config/etc/sysctl.conf /etc + + # Move some tools to /bin & /sbin + mv -v /usr/bin/{kill,ps} /bin + mv -v /usr/sbin/sysctl /sbin + @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/make.sh b/make.sh index f9b2ee6ba..7ef48e92a 100755 --- a/make.sh +++ b/make.sh @@ -1093,7 +1093,6 @@ buildbase() { lfsmake2 m4 lfsmake2 bison lfsmake2 ncurses - lfsmake2 procps lfsmake2 libtool lfsmake2 perl lfsmake2 readline @@ -1121,6 +1120,7 @@ buildbase() { lfsmake2 kbd lfsmake2 less lfsmake2 pkg-config + lfsmake2 procps lfsmake2 make lfsmake2 man lfsmake2 net-tools diff --git a/src/patches/procps-3.2.8-fix_unknown_HZ_value.patch b/src/patches/procps-3.2.8-fix_unknown_HZ_value.patch deleted file mode 100644 index 08edaa6cc..000000000 --- a/src/patches/procps-3.2.8-fix_unknown_HZ_value.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff -Naur procps-3.2.6.org/proc/sysinfo.c procps-3.2.6/proc/sysinfo.c ---- procps-3.2.6.org/proc/sysinfo.c 2005-03-14 05:31:27.000000000 +0100 -+++ procps-3.2.6/proc/sysinfo.c 2011-10-02 12:51:32.000000000 +0200 -@@ -212,6 +212,7 @@ - static void init_libproc(void) __attribute__((constructor)); - static void init_libproc(void){ - have_privs = check_for_privs(); -+ init_Linux_version(); - // ought to count CPUs in /proc/stat instead of relying - // on glibc, which foolishly tries to parse /proc/cpuinfo - // -diff -Naur procps-3.2.6.org/proc/version.c procps-3.2.6/proc/version.c ---- procps-3.2.6.org/proc/version.c 2003-01-29 02:11:43.000000000 +0100 -+++ procps-3.2.6/proc/version.c 2011-10-02 12:52:36.000000000 +0200 -@@ -33,8 +33,7 @@ - - int linux_version_code; - --static void init_Linux_version(void) __attribute__((constructor)); --static void init_Linux_version(void) { -+void init_Linux_version(void) { - static struct utsname uts; - int x = 0, y = 0, z = 0; /* cleared in case sscanf() < 3 */ - -diff -Naur procps-3.2.6.org/proc/version.h procps-3.2.6/proc/version.h ---- procps-3.2.6.org/proc/version.h 2002-12-15 01:08:32.000000000 +0100 -+++ procps-3.2.6/proc/version.h 2011-10-02 12:53:10.000000000 +0200 -@@ -14,6 +14,7 @@ - - EXTERN_C_BEGIN - -+extern void init_Linux_version(void); - extern void display_version(void); /* display suite version */ - extern const char procps_version[]; /* global buf for suite version */ -