mirror of
https://gitlab.com/buildroot.org/buildroot.git
synced 2026-08-08 08:30:47 -09:00
package/procps-ng: bump version to 4.0.6
https://gitlab.com/procps-ng/procps/-/blob/v4.0.6/NEWS Removed patch which is included in this release. Switched _SITE to https. Signed-off-by: Bernd Kuhls <bernd@kuhls.net> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
committed by
Peter Korsgaard
parent
8501cb30fb
commit
386c34cc38
@@ -1,57 +0,0 @@
|
||||
From 90a0ddcd64c2d43dc2c2c856b1b42b5cae6b8a44 Mon Sep 17 00:00:00 2001
|
||||
From: Markus Mayer <mmayer@broadcom.com>
|
||||
Date: Wed, 11 Dec 2024 14:53:33 -0800
|
||||
Subject: [PATCH] pgrep: provide definition for __NR_pidfd_open if needed
|
||||
|
||||
We already implement pidfd_open() ourselves if libc doesn't provide it.
|
||||
Let's also provide our own definition of __NR_pidfd_open in case the
|
||||
kernel headers don't contain it.
|
||||
|
||||
This way, pgrep can provide its full capabilities after being built
|
||||
against older kernel headers (for increased compatibility) but being run
|
||||
on systems with newer kernels.
|
||||
|
||||
Signed-off-by: Markus Mayer <mmayer@broadcom.com>
|
||||
Upstream: https://gitlab.com/procps-ng/procps/-/commit/90a0ddcd64c2d43dc2c2c856b1b42b5cae6b8a44
|
||||
Signed-off: Michael Nosthoff <buildroot@heine.tech>
|
||||
---
|
||||
configure.ac | 2 +-
|
||||
src/pgrep.c | 9 +++++++++
|
||||
2 files changed, 10 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 1e984b12..14ba3ad7 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -325,7 +325,7 @@ AS_IF([[test "x$enable_pidwait" = xyes -a "x$have_pidfd_open" = xno]],
|
||||
AC_COMPILE_IFELSE([AC_LANG_SOURCE([
|
||||
#include <sys/syscall.h>
|
||||
#ifndef __NR_pidfd_open
|
||||
-#error __NR_pidfd_open not defined
|
||||
+#warning __NR_pidfd_open not defined; using our definition
|
||||
#endif
|
||||
])],
|
||||
AC_MSG_RESULT([yes]),
|
||||
diff --git a/src/pgrep.c b/src/pgrep.c
|
||||
index 2c6b06b8..6fc25dd4 100644
|
||||
--- a/src/pgrep.c
|
||||
+++ b/src/pgrep.c
|
||||
@@ -874,6 +874,15 @@ static int signal_option(int *argc, char **argv)
|
||||
}
|
||||
|
||||
#if defined(ENABLE_PIDWAIT) && !defined(HAVE_PIDFD_OPEN)
|
||||
+
|
||||
+#ifndef __NR_pidfd_open
|
||||
+#ifdef __alpha__
|
||||
+#define __NR_pidfd_open 544
|
||||
+#else
|
||||
+#define __NR_pidfd_open 434
|
||||
+#endif
|
||||
+#endif
|
||||
+
|
||||
static int pidfd_open (pid_t pid, unsigned int flags)
|
||||
{
|
||||
return syscall(__NR_pidfd_open, pid, flags);
|
||||
--
|
||||
GitLab
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
# From http://sourceforge.net/projects/procps-ng/files/Production/
|
||||
md5 90803e64f51f192f3325d25c3335d057 procps-ng-4.0.5.tar.xz
|
||||
sha1 a36b8ab95950addb4b34251fcf23195c45a63eda procps-ng-4.0.5.tar.xz
|
||||
md5 20c23dc3dd1569a2bb1d1fa93de213ed procps-ng-4.0.6.tar.xz
|
||||
sha1 6e23f716a86dbec3174c05bdc23a02aa72ac3185 procps-ng-4.0.6.tar.xz
|
||||
# Locally calculated after checking signature
|
||||
# http://downloads.sourceforge.net/project/procps-ng/Production/procps-ng-4.0.5.tar.xz.asc
|
||||
sha256 c2e6d193cc78f84cd6ddb72aaf6d5c6a9162f0470e5992092057f5ff518562fa procps-ng-4.0.5.tar.xz
|
||||
# http://downloads.sourceforge.net/project/procps-ng/Production/procps-ng-4.0.6.tar.xz.asc
|
||||
sha256 67bea6fbc3a42a535a0230c9e891e5ddfb4d9d39422d46565a2990d1ace15216 procps-ng-4.0.6.tar.xz
|
||||
sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING
|
||||
sha256 681e386e44a19d7d0674b4320272c90e66b6610b741e7e6305f8219c42e85366 COPYING.LIB
|
||||
|
||||
@@ -4,9 +4,9 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
PROCPS_NG_VERSION = 4.0.5
|
||||
PROCPS_NG_VERSION = 4.0.6
|
||||
PROCPS_NG_SOURCE = procps-ng-$(PROCPS_NG_VERSION).tar.xz
|
||||
PROCPS_NG_SITE = http://downloads.sourceforge.net/project/procps-ng/Production
|
||||
PROCPS_NG_SITE = https://downloads.sourceforge.net/project/procps-ng/Production
|
||||
PROCPS_NG_LICENSE = GPL-2.0+, LGPL-2.0+ (libproc and libps)
|
||||
PROCPS_NG_LICENSE_FILES = COPYING COPYING.LIB
|
||||
PROCPS_NG_CPE_ID_VALID = YES
|
||||
@@ -14,9 +14,6 @@ PROCPS_NG_INSTALL_STAGING = YES
|
||||
PROCPS_NG_DEPENDENCIES = ncurses host-pkgconf $(TARGET_NLS_DEPENDENCIES)
|
||||
PROCPS_NG_CONF_OPTS = LIBS=$(TARGET_NLS_LIBS)
|
||||
|
||||
# Applying 0001-pgrep-provide-definition-for-nr-pidfd_open.patch touches configure.ac
|
||||
PROCPS_NG_AUTORECONF = YES
|
||||
|
||||
ifeq ($(BR2_PACKAGE_SYSTEMD),y)
|
||||
PROCPS_NG_DEPENDENCIES += systemd
|
||||
PROCPS_NG_CONF_OPTS += --with-systemd
|
||||
|
||||
Reference in New Issue
Block a user