summaryrefslogtreecommitdiff
path: root/net-misc/lldpd/files
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2022-08-18 02:33:40 +0100
committerV3n3RiX <venerix@koprulu.sector>2022-08-18 02:33:40 +0100
commit0b1a4d018ed7758b9e49f6e4b3b38304f91a8cf5 (patch)
treeaf08d12b7c45998ae9a11a5dd6c1bbb85dc585b8 /net-misc/lldpd/files
parent1c9a2b6cf059fca455a527c1bd76a2321f93b310 (diff)
gentoo auto-resync : 18:08:2022 - 02:33:40
Diffstat (limited to 'net-misc/lldpd/files')
-rw-r--r--net-misc/lldpd/files/lldpd-1.0.10-glibc-2.33.patch12
-rw-r--r--net-misc/lldpd/files/lldpd-1.0.13-glibc-2.33.patch19
-rw-r--r--net-misc/lldpd/files/lldpd-1.0.13-r2-glibc-2.33.patch50
3 files changed, 0 insertions, 81 deletions
diff --git a/net-misc/lldpd/files/lldpd-1.0.10-glibc-2.33.patch b/net-misc/lldpd/files/lldpd-1.0.10-glibc-2.33.patch
deleted file mode 100644
index 876a9ce31cd5..000000000000
--- a/net-misc/lldpd/files/lldpd-1.0.10-glibc-2.33.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/src/daemon/priv-seccomp.c b/src/daemon/priv-seccomp.c
-index 6d2736a..533f6fe 100644
---- a/src/daemon/priv-seccomp.c
-+++ b/src/daemon/priv-seccomp.c
-@@ -180,6 +180,7 @@ priv_seccomp_init(int remote, int child)
- (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(mmap), 0)) < 0 ||
- (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(munmap), 0)) < 0 ||
- (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(fstat), 0)) < 0 ||
-+ (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(newfstatat), 0)) < 0 ||
- (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(connect), 0)) < 0 ||
- (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(futex), 0)) < 0 ||
-
diff --git a/net-misc/lldpd/files/lldpd-1.0.13-glibc-2.33.patch b/net-misc/lldpd/files/lldpd-1.0.13-glibc-2.33.patch
deleted file mode 100644
index 68f3592ec9b6..000000000000
--- a/net-misc/lldpd/files/lldpd-1.0.13-glibc-2.33.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-https://bugs.gentoo.org/827736
-https://github.com/lldpd/lldpd/commit/e57bf5ea66a70ff87bba5c39c0e10c071b4af824
-
-From: Benedikt Neuffer <benedikt.neuffer@kit.edu>
-Date: Sat, 27 Nov 2021 17:07:50 +0100
-Subject: [PATCH] linux: add missing SECCOMP rules
-
-Signed-off-by: Benedikt Neuffer <benedikt.neuffer@kit.edu>
---- a/src/daemon/priv-seccomp.c
-+++ b/src/daemon/priv-seccomp.c
-@@ -176,6 +176,8 @@ priv_seccomp_init(int remote, int child)
- (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(sendmmsg), 0)) < 0 ||
- (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(clock_gettime), 0)) < 0 ||
- (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(gettimeofday), 0)) < 0 ||
-+ (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(newfstatat), 0)) < 0 ||
-+ (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(pread64), 0)) < 0 ||
- /* The following are for resolving addresses */
- (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(mmap), 0)) < 0 ||
- (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(munmap), 0)) < 0 ||
diff --git a/net-misc/lldpd/files/lldpd-1.0.13-r2-glibc-2.33.patch b/net-misc/lldpd/files/lldpd-1.0.13-r2-glibc-2.33.patch
deleted file mode 100644
index 62f8cdc2e62b..000000000000
--- a/net-misc/lldpd/files/lldpd-1.0.13-r2-glibc-2.33.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-https://github.com/lldpd/lldpd/commit/0ea4b1a5e0e9c35d960145d25166e92a9990227f
-https://github.com/lldpd/lldpd/commit/1def824404cfcab9f64b687da1cb7a4b4b51bbe0
-
-From: Antonio Quartulli <a@unstable.cc>
-Date: Sun, 9 Jan 2022 15:24:55 +0100
-Subject: [PATCH] linux: add access syscall to seccomp rules
-
-Signed-off-by: Antonio Quartulli <a@unstable.cc>
---- a/src/daemon/priv-seccomp.c
-+++ b/src/daemon/priv-seccomp.c
-@@ -178,6 +178,7 @@ priv_seccomp_init(int remote, int child)
- (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(gettimeofday), 0)) < 0 ||
- (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(newfstatat), 0)) < 0 ||
- (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(pread64), 0)) < 0 ||
-+ (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(access), 0)) < 0 ||
- /* The following are for resolving addresses */
- (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(mmap), 0)) < 0 ||
- (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(munmap), 0)) < 0 ||
-
-From: David Sastre Medina <d.sastre.medina@gmail.com>
-Date: Tue, 11 Jan 2022 14:55:05 +0100
-Subject: [PATCH] daemon: add additional syscalls to SECCOMP filter when
- running in the foreground
-
-Running lldpd in the foreground as follows:
-
-strace -c /usr/sbin/lldpd -d -cfse -D -C lldpd-peer -I lldpd-peer \
- -S lldpd-system-name -m 192.168.50.6
-
-Requires additional syscalls to be filtered (non relevant syscalls removed):
-
-% time seconds usecs/call calls errors syscall
------- ----------- ----------- --------- --------- ----------------
- 0.47 0.000026 6 4 ppoll
- 0.33 0.000018 3 5 rt_sigprocmask
- 0.27 0.000015 3 4 getsockopt
------- ----------- ----------- --------- --------- ----------------
-100.00 0.005520 8 637 22 total
---- a/src/daemon/priv-seccomp.c
-+++ b/src/daemon/priv-seccomp.c
-@@ -179,6 +179,9 @@ priv_seccomp_init(int remote, int child)
- (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(newfstatat), 0)) < 0 ||
- (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(pread64), 0)) < 0 ||
- (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(access), 0)) < 0 ||
-+ (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(rt_sigprocmask), 0)) < 0 ||
-+ (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(getsockopt), 0)) < 0 ||
-+ (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(ppoll), 0)) < 0 ||
- /* The following are for resolving addresses */
- (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(mmap), 0)) < 0 ||
- (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(munmap), 0)) < 0 ||