pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

Remove knot-resolver as is not working non-functional and little clean-up for powerdns-recursor52 and dnsdist

Module Name:	pkgsrc-wip
Committed By:	Marcin Gondek <drixter%e-utp.net@localhost>
Pushed By:	drixter
Date:		Sat Feb 8 19:48:09 2025 +0100
Changeset:	9c3e2972b375d0f25ab8d9b657bc6c8ce42c71b5

Modified Files:
	Makefile
	dnsdist/Makefile
	powerdns-recursor52/cargo.mk
Removed Files:
	knot-resolver/DESCR
	knot-resolver/Makefile
	knot-resolver/PLIST
	knot-resolver/TODO
	knot-resolver/distinfo
	knot-resolver/files/kresd.sh
	knot-resolver/patches/patch-utils_client_kresc.c
	knot/buildlink3.mk

Log Message:
Remove knot-resolver as is not working non-functional and little clean-up for powerdns-recursor52 and dnsdist

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=9c3e2972b375d0f25ab8d9b657bc6c8ce42c71b5

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 Makefile                                         |   1 -
 dnsdist/Makefile                                 |   2 +-
 knot-resolver/DESCR                              |   8 --
 knot-resolver/Makefile                           |  49 ----------
 knot-resolver/PLIST                              | 110 -----------------------
 knot-resolver/TODO                               |   9 --
 knot-resolver/distinfo                           |   6 --
 knot-resolver/files/kresd.sh                     |  24 -----
 knot-resolver/patches/patch-utils_client_kresc.c |  15 ----
 knot/buildlink3.mk                               |  13 ---
 powerdns-recursor52/cargo.mk                     |  18 ++--
 11 files changed, 10 insertions(+), 245 deletions(-)

diffs:
diff --git a/Makefile b/Makefile
index 0b94492643..ae55894421 100644
--- a/Makefile
+++ b/Makefile
@@ -1904,7 +1904,6 @@ SUBDIR+=	kmscube
 SUBDIR+=	kmscube-git
 SUBDIR+=	kmymoney-git
 SUBDIR+=	kmymoney4
-SUBDIR+=	knot-resolver
 SUBDIR+=	kodi
 SUBDIR+=	koha
 SUBDIR+=	krename
diff --git a/dnsdist/Makefile b/dnsdist/Makefile
index 57742f4231..6dfdc06f04 100644
--- a/dnsdist/Makefile
+++ b/dnsdist/Makefile
@@ -6,7 +6,7 @@ CATEGORIES=	net
 MASTER_SITES=	https://downloads.powerdns.com/releases/
 EXTRACT_SUFX=	.tar.bz2
 
-MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
+MAINTAINER=	drixter%e-utp.net@localhost
 HOMEPAGE=	https://dnsdist.org/
 COMMENT=	Highly DNS-, DoS- and abuse-aware loadbalancer
 LICENSE=	gnu-gpl-v2
diff --git a/knot-resolver/DESCR b/knot-resolver/DESCR
deleted file mode 100644
index c3dbb67000..0000000000
--- a/knot-resolver/DESCR
+++ /dev/null
@@ -1,8 +0,0 @@
-Knot Resolver is a caching full resolver implementation
-written in C and LuaJIT, both a resolver library and a daemon.
-The core architecture is tiny and efficient, and provides a
-foundation and a state-machine like API for extensions.
-There are three modules built-in - *iterator*, *validator*,
-*cache*, and a few more are loaded by default.
-Most of the rich features are written in Lua(JIT) and C.
-Batteries are included, but optional.
diff --git a/knot-resolver/Makefile b/knot-resolver/Makefile
deleted file mode 100644
index 31378b99b6..0000000000
--- a/knot-resolver/Makefile
+++ /dev/null
@@ -1,49 +0,0 @@
-# $NetBSD$
-
-DISTNAME=	knot-resolver-5.7.4
-CATEGORIES=	net
-MASTER_SITES=	https://secure.nic.cz/files/knot-resolver/
-EXTRACT_SUFX=	.tar.xz
-
-MAINTAINER=	drixter%e-utp.net@localhost
-HOMEPAGE=	https://secure.nic.cz/files/knot-resolver/
-COMMENT=	Knot (resolver) DNS server
-LICENSE=	gnu-gpl-v3
-
-USE_LANGUAGES=	c c++
-
-CMAKE_ARGS+=		-DINSTALL_BINDIR="bin"
-CMAKE_ARGS+=		-DINSTALL_INFODIR="${PKGINFODIR}"
-CMAKE_ARGS+=		-DINSTALL_LIBDIR="${PKGLIBDIR}"
-CMAKE_ARGS+=		-DINSTALL_MANDIR="${PKGMANDIR}"
-CMAKE_ARGS+=		-DCMAKE_INSTALL_SYSCONFDIR=${PKG_SYSCONFDIR}
-CMAKE_ARGS+=		-DINSTALL_SBINDIR="sbin"
-CMAKE_ARGS+=		-DINSTALL_SCRIPTDIR="bin"
-
-MESON_ARGS+=		-Dinstall_kresd_conf=enabled
-
-PKG_SYSCONFVAR=		knot-resolver
-
-MAKE_DIRS+=             ${LOCALBASE}/var/cache/knot-resovler
-
-.include "../../mk/bsd.prefs.mk"
-
-USE_LIBTOOL=	yes
-USE_TOOLS+=	cmake pkg-config
-
-RCD_SCRIPTS=	kresd
-
-.include "../../net/knot/buildlink3.mk"
-.include "../../devel/libuv/buildlink3.mk"
-.include "../../databases/lmdb/buildlink3.mk"
-.include "../../lang/LuaJIT2/buildlink3.mk"
-.include "../../devel/libidn/buildlink3.mk"
-.include "../../devel/userspace-rcu/buildlink3.mk"
-.include "../../devel/zlib/buildlink3.mk"
-.include "../../security/gnutls/buildlink3.mk"
-.include "../../devel/editline/buildlink3.mk"
-.include "../../devel/jemalloc/buildlink3.mk"
-.include "../../devel/cmocka/buildlink3.mk"
-.include "../../mk/tools/pkg-config.mk"
-.include "../../devel/meson/build.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/knot-resolver/PLIST b/knot-resolver/PLIST
deleted file mode 100644
index f57cf0ee47..0000000000
--- a/knot-resolver/PLIST
+++ /dev/null
@@ -1,110 +0,0 @@
-@comment $NetBSD$
-etc/knot-resolver/icann-ca.pem
-etc/knot-resolver/kresd.conf
-etc/knot-resolver/root.hints
-etc/knot-resolver/root.keys
-include/libkres/api.h
-include/libkres/array.h
-include/libkres/cdb_api.h
-include/libkres/cdb_lmdb.h
-include/libkres/defines.h
-include/libkres/dnssec.h
-include/libkres/impl.h
-include/libkres/iterate.h
-include/libkres/layer.h
-include/libkres/log.h
-include/libkres/lru.h
-include/libkres/module.h
-include/libkres/nsec.h
-include/libkres/nsec3.h
-include/libkres/pack.h
-include/libkres/queue.h
-include/libkres/resolve.h
-include/libkres/rplan.h
-include/libkres/selection.h
-include/libkres/selection_forward.h
-include/libkres/selection_iter.h
-include/libkres/signature.h
-include/libkres/ta.h
-include/libkres/trie.h
-include/libkres/utils.h
-include/libkres/zonecut.h
-lib/knot-resolver/ahocorasick.so
-lib/knot-resolver/debug_opensslkeylog.so
-lib/knot-resolver/distro-preconfig.lua
-lib/knot-resolver/kluautil.lua
-lib/knot-resolver/kres-gen.lua
-lib/knot-resolver/kres.lua
-lib/knot-resolver/kres_modules/bogus_log.so
-lib/knot-resolver/kres_modules/daf.lua
-lib/knot-resolver/kres_modules/daf/daf.js
-lib/knot-resolver/kres_modules/detect_time_jump.lua
-lib/knot-resolver/kres_modules/detect_time_skew.lua
-lib/knot-resolver/kres_modules/dns64.lua
-lib/knot-resolver/kres_modules/edns_keepalive.so
-lib/knot-resolver/kres_modules/etcd.lua
-lib/knot-resolver/kres_modules/experimental_dot_auth.lua
-lib/knot-resolver/kres_modules/extended_error.so
-lib/knot-resolver/kres_modules/graphite.lua
-lib/knot-resolver/kres_modules/hints.so
-lib/knot-resolver/kres_modules/http.lua
-lib/knot-resolver/kres_modules/http/bootstrap-theme.min.css
-lib/knot-resolver/kres_modules/http/bootstrap.min.css
-lib/knot-resolver/kres_modules/http/bootstrap.min.js
-lib/knot-resolver/kres_modules/http/d3.js
-lib/knot-resolver/kres_modules/http/datamaps.world.min.js
-lib/knot-resolver/kres_modules/http/dygraph.min.js
-lib/knot-resolver/kres_modules/http/epoch.css
-lib/knot-resolver/kres_modules/http/epoch.js
-lib/knot-resolver/kres_modules/http/favicon.ico
-lib/knot-resolver/kres_modules/http/glyphicons-halflings-regular.woff2
-lib/knot-resolver/kres_modules/http/jquery.js
-lib/knot-resolver/kres_modules/http/kresd.css
-lib/knot-resolver/kres_modules/http/kresd.js
-lib/knot-resolver/kres_modules/http/main.tpl
-lib/knot-resolver/kres_modules/http/selectize.bootstrap3.css
-lib/knot-resolver/kres_modules/http/selectize.min.js
-lib/knot-resolver/kres_modules/http/topojson.js
-lib/knot-resolver/kres_modules/http_doh.lua
-lib/knot-resolver/kres_modules/http_tls_cert.lua
-lib/knot-resolver/kres_modules/http_trace.lua
-lib/knot-resolver/kres_modules/nsid.so
-lib/knot-resolver/kres_modules/policy.lua
-lib/knot-resolver/kres_modules/predict.lua
-lib/knot-resolver/kres_modules/prefill.lua
-lib/knot-resolver/kres_modules/priming.lua
-lib/knot-resolver/kres_modules/prometheus.lua
-lib/knot-resolver/kres_modules/rebinding.lua
-lib/knot-resolver/kres_modules/refuse_nord.so
-lib/knot-resolver/kres_modules/renumber.lua
-lib/knot-resolver/kres_modules/serve_stale.lua
-lib/knot-resolver/kres_modules/stats.so
-lib/knot-resolver/kres_modules/ta_sentinel.lua
-lib/knot-resolver/kres_modules/ta_signal_query.lua
-lib/knot-resolver/kres_modules/ta_update.lua
-lib/knot-resolver/kres_modules/view.lua
-lib/knot-resolver/kres_modules/watchdog.lua
-lib/knot-resolver/kres_modules/workarounds.lua
-lib/knot-resolver/krprint.lua
-lib/knot-resolver/postconfig.lua
-lib/knot-resolver/sandbox.lua
-lib/knot-resolver/trust_anchors.lua
-lib/knot-resolver/upgrade-4-to-5.lua
-lib/knot-resolver/zonefile.lua
-lib/libkres.so
-lib/libkres.so.9
-lib/pkgconfig/libkres.pc
-man/man8/kresd.8
-sbin/kres-cache-gc
-sbin/kresc
-sbin/kresd
-share/doc/knot-resolver/AUTHORS
-share/doc/knot-resolver/COPYING
-share/doc/knot-resolver/NEWS
-share/doc/knot-resolver/examples/config.cluster
-share/doc/knot-resolver/examples/config.docker
-share/doc/knot-resolver/examples/config.internal
-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
diff --git a/knot-resolver/TODO b/knot-resolver/TODO
deleted file mode 100644
index 4f7447c1ef..0000000000
--- a/knot-resolver/TODO
+++ /dev/null
@@ -1,9 +0,0 @@
-# $NetBSD$
-
-[.] Update Makefile
-[ ] Create start-up script
-[X] Ensure that all LUA points to proper folder after installation
-[X] Create folder for cache
-[ ] Sanity check of everything
-[ ] Run it it somewhere for test
-
diff --git a/knot-resolver/distinfo b/knot-resolver/distinfo
deleted file mode 100644
index 6ae10d4377..0000000000
--- a/knot-resolver/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD$
-
-BLAKE2s (knot-resolver-5.7.4.tar.xz) = 7fe0d2b44d17ea9e86e54d8296060600abfef73efa592894caf6cf3d2136ae70
-SHA512 (knot-resolver-5.7.4.tar.xz) = 5d8ea5b5b0cba5a1058aaa6e04573c838895d6b2c204e8d09c9ad898fb074c52ef7589afdad164b007edf151167d31fd0f940466edfeec597f96e5bc1cd72171
-Size (knot-resolver-5.7.4.tar.xz) = 1931124 bytes
-SHA1 (patch-utils_client_kresc.c) = 94976fd265048974df41988981f4a7eaeab91a54
diff --git a/knot-resolver/files/kresd.sh b/knot-resolver/files/kresd.sh
deleted file mode 100644
index ccdaa8c12f..0000000000
--- a/knot-resolver/files/kresd.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#!@RCD_SCRIPTS_SHELL@
-#
-# $NetBSD$
-#
-# PROVIDE: knot-resolver
-# REQUIRE: DAEMON
-
-if [ -f /etc/rc.subr ]; then
-	. /etc/rc.subr
-fi
-
-name="kresd"
-rcvar=$name
-command="@PREFIX@/sbin/daemonize "
-command_args="-p ${pidfile} @PREFIX@/sbin/${name} -c @PKG_SYSCONFDIR@/knot-resolver/${name}.conf -c @PKG_SYSCONFDIR@/../lib/knot-resolver/distro-preconfig.lua -n"
-required_files="@PKG_SYSCONFDIR@/knot-resolver/${name}.conf"
-
-if [ -f /etc/rc.subr ]; then
-	load_rc_config $name
-	run_rc_command "$1"
-else
-	@ECHO@ -n " ${name}"
-	${command} ${command_args}
-fi
diff --git a/knot-resolver/patches/patch-utils_client_kresc.c b/knot-resolver/patches/patch-utils_client_kresc.c
deleted file mode 100644
index 4c108e1a8b..0000000000
--- a/knot-resolver/patches/patch-utils_client_kresc.c
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD$
-
-Fix readline.h location
-
---- utils/client/kresc.c.orig	2024-08-26 10:16:43.040999797 +0000
-+++ utils/client/kresc.c
-@@ -3,7 +3,7 @@
-  */
- #include <arpa/inet.h>
- #include <contrib/ccan/asprintf/asprintf.h>
--#include <editline/readline.h>
-+#include <readline.h>
- #include <errno.h>
- #include <histedit.h>
- #include <stdbool.h>
diff --git a/knot/buildlink3.mk b/knot/buildlink3.mk
deleted file mode 100644
index aaf876d852..0000000000
--- a/knot/buildlink3.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-# $NetBSD$
-
-BUILDLINK_TREE+=        knot
-
-.if !defined(KNOT_BUILDLINK3_MK)
-KNOT_BUILDLINK3_MK:=
-
-BUILDLINK_API_DEPENDS.knot+=    knot>=3.3.8
-BUILDLINK_PKGSRCDIR.knot?=      ../../net/knot
-
-.endif  # KNOT_BUILDLINK3_MK
-
-BUILDLINK_TREE+=        -knot
diff --git a/powerdns-recursor52/cargo.mk b/powerdns-recursor52/cargo.mk
index 856d41b84a..81b3606516 100644
--- a/powerdns-recursor52/cargo.mk
+++ b/powerdns-recursor52/cargo.mk
@@ -106,12 +106,12 @@ ALL_ENV+=		CARGO_HOME=${WRKDIR}
 #	${RM} -f ${DESTDIR}${PREFIX}/.crates.toml
 #	${RM} -f ${DESTDIR}${PREFIX}/.crates2.json
 	
-.if ${OPSYS} == "Darwin"
-.PHONY: do-cargo-post-install-darwin-fix-rpath
-post-install: do-cargo-post-install-darwin-fix-rpath
-do-cargo-post-install-darwin-fix-rpath:
-	${RUN} cd ${DESTDIR};								\
-	for i in $$(${FIND} .${PREFIX}/lib -name '*.so' | ${SED} -e 's|^\./||'); do	\
-	  install_name_tool -id /$$i $$i;						\
-	done
-.endif
+#.if ${OPSYS} == "Darwin"
+#.PHONY: do-cargo-post-install-darwin-fix-rpath
+#post-install: do-cargo-post-install-darwin-fix-rpath
+#do-cargo-post-install-darwin-fix-rpath:
+#	${RUN} cd ${DESTDIR};								\
+#	for i in $$(${FIND} .${PREFIX}/lib -name '*.so' | ${SED} -e 's|^\./||'); do	\
+#	  install_name_tool -id /$$i $$i;						\
+#	done
+#.endif
Home | Main Index | Thread Index | Old Index