diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2021-03-20 14:27:17 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2021-03-20 14:27:17 +0000 |
commit | 5bb9ff1ee56d2b5e75e01a7f066d8b0cec84ec02 (patch) | |
tree | 66e860a5099bcad013f1cf667255dc372a7c11b3 /net-misc/dhcpcd/files | |
parent | 7218e1b46bceac05841e90472501742d905fb3fc (diff) |
gentoo resync : 20.03.2021
Diffstat (limited to 'net-misc/dhcpcd/files')
-rw-r--r-- | net-misc/dhcpcd/files/dhcpcd-9.4.0-memleak_fix.patch | 36 | ||||
-rw-r--r-- | net-misc/dhcpcd/files/dhcpcd-9.4.0-sparc_privsep.patch | 40 | ||||
-rw-r--r-- | net-misc/dhcpcd/files/dhcpcd-9.4.0-unlink_socket.patch | 55 |
3 files changed, 131 insertions, 0 deletions
diff --git a/net-misc/dhcpcd/files/dhcpcd-9.4.0-memleak_fix.patch b/net-misc/dhcpcd/files/dhcpcd-9.4.0-memleak_fix.patch new file mode 100644 index 000000000000..61aed69656d3 --- /dev/null +++ b/net-misc/dhcpcd/files/dhcpcd-9.4.0-memleak_fix.patch @@ -0,0 +1,36 @@ +From ba9f3823ae825c341ea30f45b46d942b4ce5b8d9 Mon Sep 17 00:00:00 2001 +From: Roy Marples <roy@marples.name> +Date: Sun, 24 Jan 2021 22:53:20 +0000 +Subject: [PATCH] Linux: fix a memory leak when dhcpcd exits or the log is + reopened + +--- + src/logerr.c | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +diff --git a/src/logerr.c b/src/logerr.c +index 21e933b8..35268870 100644 +--- a/src/logerr.c ++++ b/src/logerr.c +@@ -484,13 +484,14 @@ logclose(void) + #endif + + closelog(); ++#if defined(__linux__) ++ free(_logprog); ++ _logprog = NULL; ++#endif + #ifndef SMALL + if (ctx->log_file == NULL) + return; + fclose(ctx->log_file); + ctx->log_file = NULL; + #endif +-#if defined(__linux__) +- free(_logprog); +-#endif + } +-- +2.30.0 + + diff --git a/net-misc/dhcpcd/files/dhcpcd-9.4.0-sparc_privsep.patch b/net-misc/dhcpcd/files/dhcpcd-9.4.0-sparc_privsep.patch new file mode 100644 index 000000000000..a91db28d08c7 --- /dev/null +++ b/net-misc/dhcpcd/files/dhcpcd-9.4.0-sparc_privsep.patch @@ -0,0 +1,40 @@ +From dcfd7a23f002793a855156255e81662ef84064d3 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine <fontaine.fabrice@gmail.com> +Date: Fri, 5 Feb 2021 09:25:12 +0100 +Subject: [PATCH] src/privsep-linux: fix build on sparc (#26) + +Fix the following build failure: + +privsep-linux.c:203: warning: "AUDIT_ARCH_SPARC64" redefined + 203 | # define AUDIT_ARCH_SPARC64 + | +In file included from privsep-linux.c:35: +/srv/storage/autobuild/run/instance-0/output-1/host/sparc64-buildroot-linux-gnu/sysroot/usr/include/linux/audit.h:392: note: this is the location of the previous definition + 392 | #define AUDIT_ARCH_SPARC64 (EM_SPARCV9|__AUDIT_ARCH_64BIT) + | +In file included from privsep-linux.c:36: +privsep-linux.c:215:38: error: 'SECCOMP_AUDIT_ARCH' undeclared here (not in a function); did you mean 'SECCOMP_ALLOW_ARG'? + 215 | BPF_JUMP(BPF_JMP + BPF_JEQ + BPF_K, SECCOMP_AUDIT_ARCH, 1, 0), + | ^~~~~~~~~~~~~~~~~~ + +Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> +--- + src/privsep-linux.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/privsep-linux.c b/src/privsep-linux.c +index d00894ab..5c80c1b3 100644 +--- a/src/privsep-linux.c ++++ b/src/privsep-linux.c +@@ -222,9 +222,9 @@ ps_root_sendnetlink(struct dhcpcd_ctx *ctx, int protocol, struct msghdr *msg) + # endif + #elif defined(__sparc__) + # if defined(__arch64__) +-# define AUDIT_ARCH_SPARC64 ++# define SECCOMP_AUDIT_ARCH AUDIT_ARCH_SPARC64 + # else +-# define AUDIT_ARCH_SPARC ++# define SECCOMP_AUDIT_ARCH AUDIT_ARCH_SPARC + # endif + #elif defined(__xtensa__) + # define SECCOMP_AUDIT_ARCH AUDIT_ARCH_XTENSA diff --git a/net-misc/dhcpcd/files/dhcpcd-9.4.0-unlink_socket.patch b/net-misc/dhcpcd/files/dhcpcd-9.4.0-unlink_socket.patch new file mode 100644 index 000000000000..493e9c342f51 --- /dev/null +++ b/net-misc/dhcpcd/files/dhcpcd-9.4.0-unlink_socket.patch @@ -0,0 +1,55 @@ +From d55f8e440389fbf333e14fe9f1a7d7f4da2b5197 Mon Sep 17 00:00:00 2001 +From: Roy Marples <roy@marples.name> +Date: Tue, 26 Jan 2021 17:37:29 +0000 +Subject: [PATCH] control: unlink privileged socket when shutting down + without privsep + +Otherwise we have a connection refused when dhcpcd starts again +as it sees the stale socket file. +--- + src/control.c | 13 +++++++------ + 1 file changed, 7 insertions(+), 6 deletions(-) + +diff --git a/src/control.c b/src/control.c +index 71405ed1..a601ad0a 100644 +--- a/src/control.c ++++ b/src/control.c +@@ -50,7 +50,7 @@ + + #ifndef SUN_LEN + #define SUN_LEN(su) \ +- (sizeof(*(su)) - sizeof((su)->sun_path) + strlen((su)->sun_path)) ++ (sizeof(*(su)) - sizeof((su)->sun_path) + strlen((su)->sun_path)) + #endif + + static void +@@ -350,12 +350,12 @@ control_start1(struct dhcpcd_ctx *ctx, const char *ifname, sa_family_t family, + } + #endif + +- if ((fmode & S_PRIV) == S_PRIV) +- strlcpy(ctx->control_sock, sa.sun_path, +- sizeof(ctx->control_sock)); +- else ++ if ((fmode & S_UNPRIV) == S_UNPRIV) + strlcpy(ctx->control_sock_unpriv, sa.sun_path, + sizeof(ctx->control_sock_unpriv)); ++ else ++ strlcpy(ctx->control_sock, sa.sun_path, ++ sizeof(ctx->control_sock)); + return fd; + } + +@@ -368,7 +368,8 @@ control_start(struct dhcpcd_ctx *ctx, const char *ifname, sa_family_t family) + if (IN_PRIVSEP_SE(ctx)) { + make_path(ctx->control_sock, sizeof(ctx->control_sock), + ifname, family, false); +- make_path(ctx->control_sock_unpriv, sizeof(ctx->control_sock), ++ make_path(ctx->control_sock_unpriv, ++ sizeof(ctx->control_sock_unpriv), + ifname, family, true); + return 0; + } +-- +2.30.0 + |