From 91e808f1db0b76f3625f516ec73a95b4e32decb2 Mon Sep 17 00:00:00 2001 From: Laurent Bercot Date: Sun, 17 May 2020 18:07:58 +0000 Subject: Add s6-dnsip, prepare for 2.3.3.0, fix resolvenoq_aaaaa TODO: resolveq_aaaaa returns the best (1 answer) whereas we want both ip6 and ip4 when available. It works with noq, it should work with q too. --- package/deps.mak | 3 +++ package/info | 2 +- package/targets.mak | 1 + 3 files changed, 5 insertions(+), 1 deletion(-) (limited to 'package') diff --git a/package/deps.mak b/package/deps.mak index b10d4b8..9b58f8b 100644 --- a/package/deps.mak +++ b/package/deps.mak @@ -24,6 +24,7 @@ src/caches/shibari_whitelist_add6.o src/caches/shibari_whitelist_add6.lo: src/ca src/caches/shibari_whitelist_ip4_match.o src/caches/shibari_whitelist_ip4_match.lo: src/caches/shibari_whitelist_ip4_match.c src/caches/shibari-internal.h src/caches/shibari_whitelist_ip6_match.o src/caches/shibari_whitelist_ip6_match.lo: src/caches/shibari_whitelist_ip6_match.c src/caches/shibari-internal.h src/caches/shibari_whitelist_read.o src/caches/shibari_whitelist_read.lo: src/caches/shibari_whitelist_read.c src/caches/shibari-internal.h +src/clients/s6-dnsip.o src/clients/s6-dnsip.lo: src/clients/s6-dnsip.c src/include/s6-dns/s6dns.h src/clients/s6-dnsip4-filter.o src/clients/s6-dnsip4-filter.lo: src/clients/s6-dnsip4-filter.c src/include/s6-dns/s6dns-constants.h src/include/s6-dns/s6dns-message.h src/clients/s6dns-generic-filter.h src/clients/s6-dnsip4.o src/clients/s6-dnsip4.lo: src/clients/s6-dnsip4.c src/include/s6-dns/s6dns.h src/clients/s6-dnsip6-filter.o src/clients/s6-dnsip6-filter.lo: src/clients/s6-dnsip6-filter.c src/include/s6-dns/s6dns-constants.h src/include/s6-dns/s6dns-message.h src/clients/s6dns-generic-filter.h @@ -163,6 +164,8 @@ libshibari.so.xyzzy: EXTRA_LIBS := libshibari.so.xyzzy: src/caches/shibari_whitelist_add6.lo src/caches/shibari_whitelist_ip4_match.lo src/caches/shibari_whitelist_ip6_match.lo src/caches/shibari_whitelist_read.lo shibari: EXTRA_LIBS := -lskarnet ${SOCKET_LIB} ${SYSCLOCK_LIB} shibari: src/caches/shibari.o libshibari.a.xyzzy ${LIBDCACHE} ${LIBS6DNS} +s6-dnsip: EXTRA_LIBS := -lskarnet ${SOCKET_LIB} ${SYSCLOCK_LIB} +s6-dnsip: src/clients/s6-dnsip.o ${LIBS6DNS} s6-dnsip4: EXTRA_LIBS := -lskarnet ${SOCKET_LIB} ${SYSCLOCK_LIB} s6-dnsip4: src/clients/s6-dnsip4.o ${LIBS6DNS} s6-dnsip4-filter: EXTRA_LIBS := -lskarnet ${SOCKET_LIB} ${SYSCLOCK_LIB} ${SPAWN_LIB} diff --git a/package/info b/package/info index 2e264fb..432358a 100644 --- a/package/info +++ b/package/info @@ -1,4 +1,4 @@ package=s6-dns -version=2.3.2.0 +version=2.3.3.0 category=web package_macro_name=S6_DNS diff --git a/package/targets.mak b/package/targets.mak index 9d7a60f..ffab27d 100644 --- a/package/targets.mak +++ b/package/targets.mak @@ -2,6 +2,7 @@ BIN_TARGETS := \ skadnsd \ s6-randomip \ s6-dnsqualify \ +s6-dnsip \ s6-dnsip4 \ s6-dnsip6 \ s6-dnsmx \ -- cgit v1.2.3