annotate core/procps/patch-musl.patch @ 1321:412f1510b619

lib/glib: upgrade to 2.70.1
author David Demelier <markand@malikania.fr>
date Sun, 21 Nov 2021 10:29:39 +0100
parents 8c73c712e598
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
1287
8c73c712e598 core/procps: upgrad to 3.3.17
David Demelier <markand@malikania.fr>
parents:
diff changeset
1 Pulling in utmpx.h which does not have UT_HOSTSIZE, UT_LINESIZE & UT_NAMESIZE defined.
8c73c712e598 core/procps: upgrad to 3.3.17
David Demelier <markand@malikania.fr>
parents:
diff changeset
2
8c73c712e598 core/procps: upgrad to 3.3.17
David Demelier <markand@malikania.fr>
parents:
diff changeset
3 Causing:
8c73c712e598 core/procps: upgrad to 3.3.17
David Demelier <markand@malikania.fr>
parents:
diff changeset
4 w.c: In function 'print_from':
8c73c712e598 core/procps: upgrad to 3.3.17
David Demelier <markand@malikania.fr>
parents:
diff changeset
5 w.c:236:43: error: 'UT_HOSTSIZE' undeclared (first use in this function)
8c73c712e598 core/procps: upgrad to 3.3.17
David Demelier <markand@malikania.fr>
parents:
diff changeset
6 236 | print_display_or_interface(u->ut_host, UT_HOSTSIZE, fromlen - len);
8c73c712e598 core/procps: upgrad to 3.3.17
David Demelier <markand@malikania.fr>
parents:
diff changeset
7 | ^~~~~~~~~~~
8c73c712e598 core/procps: upgrad to 3.3.17
David Demelier <markand@malikania.fr>
parents:
diff changeset
8 w.c:236:43: note: each undeclared identifier is reported only once for each function it appears in
8c73c712e598 core/procps: upgrad to 3.3.17
David Demelier <markand@malikania.fr>
parents:
diff changeset
9 w.c: In function 'getproc':
8c73c712e598 core/procps: upgrad to 3.3.17
David Demelier <markand@malikania.fr>
parents:
diff changeset
10 w.c:357:12: error: 'UT_NAMESIZE' undeclared (first use in this function)
8c73c712e598 core/procps: upgrad to 3.3.17
David Demelier <markand@malikania.fr>
parents:
diff changeset
11 357 | char buf[UT_NAMESIZE + 1];
8c73c712e598 core/procps: upgrad to 3.3.17
David Demelier <markand@malikania.fr>
parents:
diff changeset
12 ....
8c73c712e598 core/procps: upgrad to 3.3.17
David Demelier <markand@malikania.fr>
parents:
diff changeset
13
8c73c712e598 core/procps: upgrad to 3.3.17
David Demelier <markand@malikania.fr>
parents:
diff changeset
14 proc/escape.c:237:30: error: 'CODESET' undeclared (first use in this function)
8c73c712e598 core/procps: upgrad to 3.3.17
David Demelier <markand@malikania.fr>
parents:
diff changeset
15 237 | char *enc = nl_langinfo(CODESET);
8c73c712e598 core/procps: upgrad to 3.3.17
David Demelier <markand@malikania.fr>
parents:
diff changeset
16
8c73c712e598 core/procps: upgrad to 3.3.17
David Demelier <markand@malikania.fr>
parents:
diff changeset
17 --- a/w.c
8c73c712e598 core/procps: upgrad to 3.3.17
David Demelier <markand@malikania.fr>
parents:
diff changeset
18 +++ b/w.c
8c73c712e598 core/procps: upgrad to 3.3.17
David Demelier <markand@malikania.fr>
parents:
diff changeset
19 @@ -55,11 +55,7 @@
8c73c712e598 core/procps: upgrad to 3.3.17
David Demelier <markand@malikania.fr>
parents:
diff changeset
20 #include <termios.h>
8c73c712e598 core/procps: upgrad to 3.3.17
David Demelier <markand@malikania.fr>
parents:
diff changeset
21 #include <time.h>
8c73c712e598 core/procps: upgrad to 3.3.17
David Demelier <markand@malikania.fr>
parents:
diff changeset
22 #include <unistd.h>
8c73c712e598 core/procps: upgrad to 3.3.17
David Demelier <markand@malikania.fr>
parents:
diff changeset
23 -#ifdef HAVE_UTMPX_H
8c73c712e598 core/procps: upgrad to 3.3.17
David Demelier <markand@malikania.fr>
parents:
diff changeset
24 -# include <utmpx.h>
8c73c712e598 core/procps: upgrad to 3.3.17
David Demelier <markand@malikania.fr>
parents:
diff changeset
25 -#else
8c73c712e598 core/procps: upgrad to 3.3.17
David Demelier <markand@malikania.fr>
parents:
diff changeset
26 -# include <utmp.h>
8c73c712e598 core/procps: upgrad to 3.3.17
David Demelier <markand@malikania.fr>
parents:
diff changeset
27 -#endif
8c73c712e598 core/procps: upgrad to 3.3.17
David Demelier <markand@malikania.fr>
parents:
diff changeset
28 +#include <utmp.h>
8c73c712e598 core/procps: upgrad to 3.3.17
David Demelier <markand@malikania.fr>
parents:
diff changeset
29 #include <arpa/inet.h>
8c73c712e598 core/procps: upgrad to 3.3.17
David Demelier <markand@malikania.fr>
parents:
diff changeset
30
8c73c712e598 core/procps: upgrad to 3.3.17
David Demelier <markand@malikania.fr>
parents:
diff changeset
31 static int ignoreuser = 0; /* for '-u' */
8c73c712e598 core/procps: upgrad to 3.3.17
David Demelier <markand@malikania.fr>
parents:
diff changeset
32 --- a/proc/escape.c
8c73c712e598 core/procps: upgrad to 3.3.17
David Demelier <markand@malikania.fr>
parents:
diff changeset
33 +++ b/proc/escape.c
8c73c712e598 core/procps: upgrad to 3.3.17
David Demelier <markand@malikania.fr>
parents:
diff changeset
34 @@ -21,6 +21,7 @@
8c73c712e598 core/procps: upgrad to 3.3.17
David Demelier <markand@malikania.fr>
parents:
diff changeset
35 #include <sys/types.h>
8c73c712e598 core/procps: upgrad to 3.3.17
David Demelier <markand@malikania.fr>
parents:
diff changeset
36 #include <string.h>
8c73c712e598 core/procps: upgrad to 3.3.17
David Demelier <markand@malikania.fr>
parents:
diff changeset
37 #include <limits.h>
8c73c712e598 core/procps: upgrad to 3.3.17
David Demelier <markand@malikania.fr>
parents:
diff changeset
38 +#include <langinfo.h>
8c73c712e598 core/procps: upgrad to 3.3.17
David Demelier <markand@malikania.fr>
parents:
diff changeset
39 #include "procps.h"
8c73c712e598 core/procps: upgrad to 3.3.17
David Demelier <markand@malikania.fr>
parents:
diff changeset
40 #include "escape.h"
8c73c712e598 core/procps: upgrad to 3.3.17
David Demelier <markand@malikania.fr>
parents:
diff changeset
41 #include "readproc.h"