vanhofen
3 years ago
6 changed files with 143 additions and 0 deletions
@ -0,0 +1,13 @@ |
|||
diff --git a/sysctl.c b/sysctl.c
|
|||
index bbca0b9..90d594d 100644
|
|||
--- a/sysctl.c
|
|||
+++ b/sysctl.c
|
|||
@@ -624,7 +624,7 @@ static int PreloadSystem(void)
|
|||
const char *dirs[] = { |
|||
"/etc/sysctl.d", |
|||
"/run/sysctl.d", |
|||
- "/usr/local/lib/sysctl.d",
|
|||
+ "/var/etc/sysctl.d",
|
|||
"/usr/lib/sysctl.d", |
|||
"/lib/sysctl.d", |
|||
}; |
@ -0,0 +1,26 @@ |
|||
--- a/Makefile.am
|
|||
+++ b/Makefile.am
|
|||
@@ -15,10 +15,7 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
|
|||
|
|||
ACLOCAL_AMFLAGS = -I m4 |
|||
SUBDIRS = \ |
|||
- include \
|
|||
- man-po \
|
|||
- po \
|
|||
- testsuite
|
|||
+ include
|
|||
|
|||
AM_CFLAGS = -Iproc |
|||
LDADD = ./proc/libprocps.la $(CYGWINFLAGS) |
|||
--- a/configure.ac
|
|||
+++ b/configure.ac
|
|||
@@ -323,8 +323,5 @@ AC_CHECK_FUNCS([__fpending alarm atexit dup2 gethostname getpagesize gettimeofda
|
|||
|
|||
AC_CONFIG_FILES([Makefile |
|||
include/Makefile |
|||
- man-po/Makefile
|
|||
- po/Makefile.in
|
|||
- proc/libprocps.pc
|
|||
- testsuite/Makefile])
|
|||
+ proc/libprocps.pc])
|
|||
AC_OUTPUT |
@ -0,0 +1,44 @@ |
|||
From 22f8d25567b8d64bdbab0fb0b4915b4362561d9b Mon Sep 17 00:00:00 2001 |
|||
From: Alexander Kanavin <alex.kanavin@gmail.com> |
|||
Date: Wed, 24 Feb 2021 21:14:31 +0000 |
|||
Subject: [PATCH] w.c: correct musl builds |
|||
|
|||
No need to redefine UT_ stuff to something that does not exist. |
|||
|
|||
UT_ is already provided in musl but via utmp.h header, so include |
|||
it always. |
|||
|
|||
Upstream-Status: Submitted [https://gitlab.com/procps-ng/procps/-/merge_requests/126] |
|||
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> |
|||
---
|
|||
w.c | 9 +-------- |
|||
1 file changed, 1 insertion(+), 8 deletions(-) |
|||
|
|||
diff --git a/w.c b/w.c
|
|||
index 9d07ac9..d10639b 100644
|
|||
--- a/w.c
|
|||
+++ b/w.c
|
|||
@@ -57,9 +57,8 @@
|
|||
#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' */ |
|||
@@ -72,12 +71,6 @@ typedef struct utmpx utmp_t;
|
|||
typedef struct utmp utmp_t; |
|||
#endif |
|||
|
|||
-#if !defined(UT_HOSTSIZE) || defined(__UT_HOSTSIZE)
|
|||
-# define UT_HOSTSIZE __UT_HOSTSIZE
|
|||
-# define UT_LINESIZE __UT_LINESIZE
|
|||
-# define UT_NAMESIZE __UT_NAMESIZE
|
|||
-#endif
|
|||
-
|
|||
#ifdef W_SHOWFROM |
|||
# define FROM_STRING "on" |
|||
#else |
@ -0,0 +1,34 @@ |
|||
From 2763b9880a7aab569694d6ee3170dd7341a26b84 Mon Sep 17 00:00:00 2001 |
|||
From: "Issam E. Maghni" <issam.e.maghni@mailbox.org> |
|||
Date: Fri, 23 Apr 2021 16:53:39 -0400 |
|||
Subject: [PATCH] escape.c: Fix missing nl_langinfo on certain configs |
|||
|
|||
[Retrieved from: |
|||
https://gitlab.com/procps-ng/procps/-/commit/2763b9880a7aab569694d6ee3170dd7341a26b84] |
|||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> |
|||
---
|
|||
proc/escape.c | 2 +- |
|||
1 file changed, 1 insertion(+), 1 deletion(-) |
|||
|
|||
diff --git a/proc/escape.c b/proc/escape.c
|
|||
index 2e8fb7dd..cf4a80de 100644
|
|||
--- a/proc/escape.c
|
|||
+++ b/proc/escape.c
|
|||
@@ -24,13 +24,13 @@
|
|||
#include "procps.h" |
|||
#include "escape.h" |
|||
#include "readproc.h" |
|||
+#include "nls.h"
|
|||
|
|||
#if (__GNU_LIBRARY__ >= 6) && (!defined(__UCLIBC__) || defined(__UCLIBC_HAS_WCHAR__)) |
|||
# include <wchar.h> |
|||
# include <wctype.h> |
|||
# include <stdlib.h> /* MB_CUR_MAX */ |
|||
# include <ctype.h> |
|||
-# include <langinfo.h>
|
|||
#endif |
|||
|
|||
#define SECURE_ESCAPE_ARGS(dst, bytes, cells) do { \ |
|||
--
|
|||
GitLab |
|||
|
@ -0,0 +1,13 @@ |
|||
diff --git a/sysctl.c b/sysctl.c
|
|||
index bbca0b9..90d594d 100644
|
|||
--- a/sysctl.c
|
|||
+++ b/sysctl.c
|
|||
@@ -624,7 +624,7 @@ static int PreloadSystem(void)
|
|||
const char *dirs[] = { |
|||
"/etc/sysctl.d", |
|||
"/run/sysctl.d", |
|||
- "/usr/local/lib/sysctl.d",
|
|||
+ "/var/etc/sysctl.d",
|
|||
"/usr/lib/sysctl.d", |
|||
"/lib/sysctl.d", |
|||
}; |
@ -0,0 +1,13 @@ |
|||
diff --git a/watch.c b/watch.c
|
|||
index 0ba6b3f..96f525b 100644
|
|||
--- a/watch.c
|
|||
+++ b/watch.c
|
|||
@@ -52,7 +52,7 @@
|
|||
# define _XOPEN_SOURCE_EXTENDED 1 |
|||
# include <wchar.h> |
|||
# include <wctype.h> |
|||
-# include <ncursesw/ncurses.h>
|
|||
+# include <ncurses.h>
|
|||
#else |
|||
# include <ncurses.h> |
|||
#endif /* WITH_WATCH8BIT */ |
Loading…
Reference in new issue