summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--groups/231.native_packages_etc.group8
-rw-r--r--patches/procps_ng-3.3.17.local.patch27
2 files changed, 31 insertions, 4 deletions
diff --git a/groups/231.native_packages_etc.group b/groups/231.native_packages_etc.group
index 720ec2d1..0a890574 100644
--- a/groups/231.native_packages_etc.group
+++ b/groups/231.native_packages_etc.group
@@ -396,11 +396,11 @@ have_shm_mmap_posix=yes"};
: ${PKG_POTRACE_VERSION:=1.16};
: ${PKG_POTRACE_URL:=https://ftp.osuosl.org/pub/blfs/conglomeration/potrace/potrace-${PKG_POTRACE_VERSION}.tar.gz};
: ${PKG_PROCPS_NG_DEPENDS:="ncurses ncursesw"};
-: ${PKG_PROCPS_NG_SHA256SUM:=10bd744ffcb3de2d591d2f6acf1a54a7ba070fdcc432a855931a5057149f0465};
-: ${PKG_PROCPS_NG_VERSION:=3.3.15};
-: ${PKG_PROCPS_NG_URL:=http://mirror.internode.on.net/pub/slackware/slackware64/patches/source/procps-ng/procps-ng-${PKG_PROCPS_NG_VERSION}.tar.xz};
+: ${PKG_PROCPS_NG_SHA256SUM:=4518b3e7aafd34ec07d0063d250fd474999b20b200218c3ae56f5d2113f141b4};
+: ${PKG_PROCPS_NG_VERSION:=3.3.17};
+: ${PKG_PROCPS_NG_URL:=http://mirror.internode.on.net/pub/slackware/slackware64/source/a/procps-ng/procps-ng-${PKG_PROCPS_NG_VERSION}.tar.xz};
: ${PKG_PROCPS_NG_CFLAGS_CONFIGURE_EXTRA:=-I${PREFIX_NATIVE}/include/ncursesw};
-: ${PKG_PROCPS_NG_CONFIG_CACHE_EXTRA:="ac_cv_func_realloc_0_nonnull=yes"};
+: ${PKG_PROCPS_NG_SUBDIR:=procps-${PKG_PROCPS_NG_VERSION}};
: ${PKG_PROCPS_NG_IN_TREE:=1};
: ${PKG_PROCPS_NG_MAKEFLAGS_BUILD:="LIBS=-Wl,-lncurses,-ltinfo"};
: ${PKG_PROCPS_NG_FNAME:=procps_ng-${PKG_PROCPS_NG_VERSION}.tar.xz};
diff --git a/patches/procps_ng-3.3.17.local.patch b/patches/procps_ng-3.3.17.local.patch
new file mode 100644
index 00000000..40afa885
--- /dev/null
+++ b/patches/procps_ng-3.3.17.local.patch
@@ -0,0 +1,27 @@
+diff -ru procps-3.3.17.orig/proc/escape.c procps-3.3.17/proc/escape.c
+--- procps-3.3.17.orig/proc/escape.c 2022-02-05 23:39:09.677115085 +0100
++++ procps-3.3.17/proc/escape.c 2022-02-05 23:32:43.385130312 +0100
+@@ -21,6 +21,7 @@
+ #include <sys/types.h>
+ #include <string.h>
+ #include <limits.h>
++#include <langinfo.h>
+ #include "procps.h"
+ #include "escape.h"
+ #include "readproc.h"
+diff -ru procps-3.3.17.orig/w.c procps-3.3.17/w.c
+--- procps-3.3.17.orig/w.c 2021-02-09 11:11:25.000000000 +0100
++++ procps-3.3.17/w.c 2022-02-05 23:38:48.901114668 +0100
+@@ -55,11 +55,7 @@
+ #include <termios.h>
+ #include <time.h>
+ #include <unistd.h>
+-#ifdef HAVE_UTMPX_H
+-# include <utmpx.h>
+-#else
+-# include <utmp.h>
+-#endif
++#include <utmp.h>
+ #include <arpa/inet.h>
+
+ static int ignoreuser = 0; /* for '-u' */