From 5563c369387df4819fda9e47857a2aa428452578 Mon Sep 17 00:00:00 2001
From: Alex Denes <caskd@redxen.eu>
Date: Thu, 23 Nov 2023 15:29:42 +0000
Subject: [PATCH] Add lldpd

---
 main/nnd-s6-services/APKBUILD                              | 4 ++--
 .../rc/dir.run-lldpd/dependencies.d/mount.run              | 0
 main/nnd-s6-services/rc/dir.run-lldpd/type                 | 1 +
 main/nnd-s6-services/rc/dir.run-lldpd/up                   | 4 ++++
 main/nnd-s6-services/rc/lldpd/dependencies.d/dir.run-lldpd | 0
 main/nnd-s6-services/rc/lldpd/dependencies.d/mount.sys     | 0
 main/nnd-s6-services/rc/lldpd/producer-for                 | 1 +
 main/nnd-s6-services/rc/lldpd/run                          | 7 +++++++
 main/nnd-s6-services/rc/lldpd/type                         | 1 +
 main/nnd-s6-services/rc/logger.lldpd/consumer-for          | 1 +
 .../rc/logger.lldpd/dependencies.d/dir.var-log             | 0
 main/nnd-s6-services/rc/logger.lldpd/notification-fd       | 1 +
 main/nnd-s6-services/rc/logger.lldpd/run                   | 4 ++++
 main/nnd-s6-services/rc/logger.lldpd/type                  | 1 +
 14 files changed, 23 insertions(+), 2 deletions(-)
 create mode 100644 main/nnd-s6-services/rc/dir.run-lldpd/dependencies.d/mount.run
 create mode 100644 main/nnd-s6-services/rc/dir.run-lldpd/type
 create mode 100644 main/nnd-s6-services/rc/dir.run-lldpd/up
 create mode 100644 main/nnd-s6-services/rc/lldpd/dependencies.d/dir.run-lldpd
 create mode 100644 main/nnd-s6-services/rc/lldpd/dependencies.d/mount.sys
 create mode 100644 main/nnd-s6-services/rc/lldpd/producer-for
 create mode 100755 main/nnd-s6-services/rc/lldpd/run
 create mode 100644 main/nnd-s6-services/rc/lldpd/type
 create mode 100644 main/nnd-s6-services/rc/logger.lldpd/consumer-for
 create mode 100644 main/nnd-s6-services/rc/logger.lldpd/dependencies.d/dir.var-log
 create mode 100644 main/nnd-s6-services/rc/logger.lldpd/notification-fd
 create mode 100755 main/nnd-s6-services/rc/logger.lldpd/run
 create mode 100644 main/nnd-s6-services/rc/logger.lldpd/type

diff --git a/main/nnd-s6-services/APKBUILD b/main/nnd-s6-services/APKBUILD
index a533055..646da7b 100644
--- a/main/nnd-s6-services/APKBUILD
+++ b/main/nnd-s6-services/APKBUILD
@@ -3,8 +3,8 @@
 . ../../APKBUILD.template
 
 pkgname=nnd-s6-services
-pkgver=2.60
-pkgrel=3
+pkgver=2.61
+pkgrel=2
 pkgdesc="Base services for s6"
 depends="s6-rc s6-portable-utils s6-linux-utils"
 builddir="$srcdir/"
diff --git a/main/nnd-s6-services/rc/dir.run-lldpd/dependencies.d/mount.run b/main/nnd-s6-services/rc/dir.run-lldpd/dependencies.d/mount.run
new file mode 100644
index 0000000..e69de29
diff --git a/main/nnd-s6-services/rc/dir.run-lldpd/type b/main/nnd-s6-services/rc/dir.run-lldpd/type
new file mode 100644
index 0000000..bdd22a1
--- /dev/null
+++ b/main/nnd-s6-services/rc/dir.run-lldpd/type
@@ -0,0 +1 @@
+oneshot
diff --git a/main/nnd-s6-services/rc/dir.run-lldpd/up b/main/nnd-s6-services/rc/dir.run-lldpd/up
new file mode 100644
index 0000000..e850cbe
--- /dev/null
+++ b/main/nnd-s6-services/rc/dir.run-lldpd/up
@@ -0,0 +1,4 @@
+#!/bin/execlineb -P
+export DIR /run/lldpd
+
+/usr/libexec/nnd/s6/dir
diff --git a/main/nnd-s6-services/rc/lldpd/dependencies.d/dir.run-lldpd b/main/nnd-s6-services/rc/lldpd/dependencies.d/dir.run-lldpd
new file mode 100644
index 0000000..e69de29
diff --git a/main/nnd-s6-services/rc/lldpd/dependencies.d/mount.sys b/main/nnd-s6-services/rc/lldpd/dependencies.d/mount.sys
new file mode 100644
index 0000000..e69de29
diff --git a/main/nnd-s6-services/rc/lldpd/producer-for b/main/nnd-s6-services/rc/lldpd/producer-for
new file mode 100644
index 0000000..51e182f
--- /dev/null
+++ b/main/nnd-s6-services/rc/lldpd/producer-for
@@ -0,0 +1 @@
+logger.lldpd
diff --git a/main/nnd-s6-services/rc/lldpd/run b/main/nnd-s6-services/rc/lldpd/run
new file mode 100755
index 0000000..4692c24
--- /dev/null
+++ b/main/nnd-s6-services/rc/lldpd/run
@@ -0,0 +1,7 @@
+#!/bin/execlineb -P
+s6-envdir -i /etc/s6/env/path
+emptyenv -p
+
+fdmove -c 2 1
+
+lldpd -d
diff --git a/main/nnd-s6-services/rc/lldpd/type b/main/nnd-s6-services/rc/lldpd/type
new file mode 100644
index 0000000..5883cff
--- /dev/null
+++ b/main/nnd-s6-services/rc/lldpd/type
@@ -0,0 +1 @@
+longrun
diff --git a/main/nnd-s6-services/rc/logger.lldpd/consumer-for b/main/nnd-s6-services/rc/logger.lldpd/consumer-for
new file mode 100644
index 0000000..d46a900
--- /dev/null
+++ b/main/nnd-s6-services/rc/logger.lldpd/consumer-for
@@ -0,0 +1 @@
+lldpd
diff --git a/main/nnd-s6-services/rc/logger.lldpd/dependencies.d/dir.var-log b/main/nnd-s6-services/rc/logger.lldpd/dependencies.d/dir.var-log
new file mode 100644
index 0000000..e69de29
diff --git a/main/nnd-s6-services/rc/logger.lldpd/notification-fd b/main/nnd-s6-services/rc/logger.lldpd/notification-fd
new file mode 100644
index 0000000..00750ed
--- /dev/null
+++ b/main/nnd-s6-services/rc/logger.lldpd/notification-fd
@@ -0,0 +1 @@
+3
diff --git a/main/nnd-s6-services/rc/logger.lldpd/run b/main/nnd-s6-services/rc/logger.lldpd/run
new file mode 100755
index 0000000..5b05edc
--- /dev/null
+++ b/main/nnd-s6-services/rc/logger.lldpd/run
@@ -0,0 +1,4 @@
+#!/bin/execlineb -P
+export NAME lldpd
+
+/usr/libexec/nnd/s6/logger
diff --git a/main/nnd-s6-services/rc/logger.lldpd/type b/main/nnd-s6-services/rc/logger.lldpd/type
new file mode 100644
index 0000000..5883cff
--- /dev/null
+++ b/main/nnd-s6-services/rc/logger.lldpd/type
@@ -0,0 +1 @@
+longrun