pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
knot-resolver: it's compile and able to start once conf file created ;-)
Module Name: pkgsrc-wip
Committed By: Marcin Gondek <drixter%e-utp.net@localhost>
Pushed By: drixter
Date: Tue Jun 16 22:00:00 2026 +0200
Changeset: d3025777935b76abe7c74fd560e74791de854b11
Modified Files:
knot-resolver/Makefile
knot-resolver/PLIST
knot-resolver/TODO
Added Files:
knot-resolver/files/kresd.sh
Log Message:
knot-resolver: it's compile and able to start once conf file created ;-)
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=d3025777935b76abe7c74fd560e74791de854b11
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
knot-resolver/Makefile | 19 ++++++++++++-------
knot-resolver/PLIST | 7 ++++---
knot-resolver/TODO | 4 +++-
knot-resolver/files/kresd.sh | 25 +++++++++++++++++++++++++
4 files changed, 44 insertions(+), 11 deletions(-)
diffs:
diff --git a/knot-resolver/Makefile b/knot-resolver/Makefile
index 7a6d600985..f71c337d00 100644
--- a/knot-resolver/Makefile
+++ b/knot-resolver/Makefile
@@ -14,17 +14,22 @@ USE_TOOLS+= pkg-config
USE_TOOLS+= cmake
USE_LANGUAGES= c c++
USE_LIBTOOL= yes
+DEPENDS+= daemonize-[0-9]*:../../sysutils/daemonize
-#RCD_SCRIPTS= knot-resolver
+RCD_SCRIPTS= kresd
-EGDIR= ${PREFIX}/etc/knot-resolver
-#PKG_SYSCONFSUBDIR= knot-resolver
+CONF_FILES+= ${PREFIX}/share/examples/knot-resolver/icann-ca.pem ${PKG_SYSCONFDIR}/knot-resolver/icann-ca.pem
+CONF_FILES+= ${PREFIX}/share/examples/knot-resolver/root.hints ${PKG_SYSCONFDIR}/knot-resolver/root.hints
+CONF_FILES+= ${PREFIX}/share/examples/knot-resolver/root.keys ${PKG_SYSCONFDIR}/knot-resolver/root.keys
-CONF_FILES+= ${EGDIR}/icann-ca.pem ${PKG_SYSCONFDIR}/icann-ca.pem
-CONF_FILES+= ${EGDIR}/root.hints ${PKG_SYSCONFDIR}/knot-resolver/root.hints
-CONF_FILES+= ${EGDIR}/root.keys ${PKG_SYSCONFDIR}/knot-resolver/root.keys
+INSTALLATION_DIRS+= share/examples/knot-resolver
-INSTALLATION_DIRS= ${EGDIR}
+post-install:
+ ${MKDIR} ${DESTDIR}${PREFIX}/share/examples/knot-resolver
+ ${MV} ${DESTDIR}${PREFIX}/etc/knot-resolver/icann-ca.pem ${DESTDIR}${PREFIX}/share/examples/knot-resolver/
+ ${MV} ${DESTDIR}${PREFIX}/etc/knot-resolver/root.hints ${DESTDIR}${PREFIX}/share/examples/knot-resolver/
+ ${MV} ${DESTDIR}${PREFIX}/etc/knot-resolver/root.keys ${DESTDIR}${PREFIX}/share/examples/knot-resolver/
+ ${RMDIR} ${DESTDIR}${PREFIX}/etc/knot-resolver
.include "../../net/knot/buildlink3.mk"
.include "../../devel/libuv/buildlink3.mk"
diff --git a/knot-resolver/PLIST b/knot-resolver/PLIST
index 140b72c5d3..42a2e9f12a 100644
--- a/knot-resolver/PLIST
+++ b/knot-resolver/PLIST
@@ -112,6 +112,7 @@ share/doc/knot-resolver/examples/config.isp
share/doc/knot-resolver/examples/config.personal
share/doc/knot-resolver/examples/config.privacy
share/doc/knot-resolver/examples/config.splitview
-etc/knot-resolver/icann-ca.pem
-etc/knot-resolver/root.hints
-etc/knot-resolver/root.keys
+share/examples/knot-resolver/icann-ca.pem
+share/examples/knot-resolver/root.hints
+share/examples/knot-resolver/root.keys
+@pkgdir etc/knot-resolver
diff --git a/knot-resolver/TODO b/knot-resolver/TODO
index 8f5fee6620..0f5612aaa7 100644
--- a/knot-resolver/TODO
+++ b/knot-resolver/TODO
@@ -1,2 +1,4 @@
-Able to compile, starting script and sanity check left
+Dirty solution for addtional files in etc
+Basic start-up script, relay on daemonize - probably will leave it as is
+
diff --git a/knot-resolver/files/kresd.sh b/knot-resolver/files/kresd.sh
new file mode 100644
index 0000000000..7183fb8792
--- /dev/null
+++ b/knot-resolver/files/kresd.sh
@@ -0,0 +1,25 @@
+#!/bin/sh
+#
+# $NetBSD: drixter $
+#
+
+# PROVIDE: kresd
+# REQUIRE: DAEMON
+
+. /etc/rc.subr
+
+name="kresd"
+rcvar="kresd_enable"
+
+knotresolver_user="root"
+knotresolver_command="@PREFIX@/sbin/kresd -n -c @PKG_SYSCONFDIR@/kresd.conf @PKG_SYSCONFDIR@/knot-resolver"
+
+pidfile="/var/run/${name}.pid"
+command="@PREFIX@/sbin/daemonize"
+command_args="-p ${pidfile} -u ${knotresolver_user} -o /var/log/knotresolver.log -- ${knotresolver_command}"
+
+procname="@PREFIX@/sbin/kresd"
+
+load_rc_config $name
+run_rc_command "$1"
+
Home |
Main Index |
Thread Index |
Old Index