summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick McLean <chutzpah@gentoo.org>2016-06-07 14:44:15 -0700
committerPatrick McLean <chutzpah@gentoo.org>2016-06-07 14:44:42 -0700
commite16c20f579725ccbf5b0998718b8a1f0c8a4f8cc (patch)
treeefa1dc2b4b09d9b6fc5d0997211c52ad152da979 /net-misc/lldpd/files
parentnet-im/ejabberd: Fix repoman warning about missing slot operator (diff)
downloadgentoo-e16c20f579725ccbf5b0998718b8a1f0c8a4f8cc.tar.gz
gentoo-e16c20f579725ccbf5b0998718b8a1f0c8a4f8cc.tar.bz2
gentoo-e16c20f579725ccbf5b0998718b8a1f0c8a4f8cc.zip
net-misc/lldpd: Version bump, add patch for seccomp stuff (bug #577576)
Package-Manager: portage-2.3.0_rc1
Diffstat (limited to 'net-misc/lldpd/files')
-rw-r--r--net-misc/lldpd/files/lldpd-0.9-seccomp-missing-syscalls.patch12
-rw-r--r--net-misc/lldpd/files/lldpd-initd-51
-rw-r--r--net-misc/lldpd/files/lldpd.conf1
3 files changed, 14 insertions, 0 deletions
diff --git a/net-misc/lldpd/files/lldpd-0.9-seccomp-missing-syscalls.patch b/net-misc/lldpd/files/lldpd-0.9-seccomp-missing-syscalls.patch
new file mode 100644
index 000000000000..be7d341e25ba
--- /dev/null
+++ b/net-misc/lldpd/files/lldpd-0.9-seccomp-missing-syscalls.patch
@@ -0,0 +1,12 @@
+diff --git a/src/daemon/priv-seccomp.c b/src/daemon/priv-seccomp.c
+index bccd378..7cd8e7d 100644
+--- a/src/daemon/priv-seccomp.c
++++ b/src/daemon/priv-seccomp.c
+@@ -152,6 +152,7 @@ priv_seccomp_init(int remote, int child)
+ (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(socket), 0)) < 0 ||
+ (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(bind), 0)) < 0 ||
+ (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(setsockopt), 0)) < 0 ||
++ (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(getsockname), 0)) < 0 ||
+ (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(uname), 0)) < 0 ||
+ (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(unlink), 0)) < 0 ||
+ (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(ioctl), 0)) < 0 ||
diff --git a/net-misc/lldpd/files/lldpd-initd-5 b/net-misc/lldpd/files/lldpd-initd-5
index 5d59f2c78d0d..83a0aa653189 100644
--- a/net-misc/lldpd/files/lldpd-initd-5
+++ b/net-misc/lldpd/files/lldpd-initd-5
@@ -8,6 +8,7 @@ pidfile=/run/lldpd.pid
command=/usr/sbin/lldpd
retry="TERM/10/KILL/5"
command_args="${LLDPD_OPTS}"
+start_stop_daemon_args="--wait 300"
depend() {
use net
diff --git a/net-misc/lldpd/files/lldpd.conf b/net-misc/lldpd/files/lldpd.conf
new file mode 100644
index 000000000000..09233b720826
--- /dev/null
+++ b/net-misc/lldpd/files/lldpd.conf
@@ -0,0 +1 @@
+# empty placeholder configuration file for lldpd