Merge branch 'fanf-prune-libirs' into 'main'

Move irs_resconf into libdns and remove libirs

See merge request isc-projects/bind9!7463

CHANGES

@@ -1,3 +1,6 @@
+6111.	[cleanup]	Move irs_resconf into libdns, and remove the
+			now empty libirs. [GL !7463]
+
 6110.	[cleanup]	Refactor the dns_xfrin module to use dns_dispatch
 			to set up TCP connections and send and receive
 			messages. [GL #3886]

Makefile.top

@@ -40,12 +40,6 @@ LIBNS_CFLAGS = \
 LIBNS_LIBS = \
 	$(top_builddir)/lib/ns/libns.la
 
-LIBIRS_CFLAGS = \
-	-I$(top_srcdir)/lib/irs/include
-
-LIBIRS_LIBS = \
-	$(top_builddir)/lib/irs/libirs.la
-
 LIBISCCFG_CFLAGS = \
 	-I$(top_srcdir)/lib/isccfg/include
 

bin/delv/Makefile.am

@@ -4,8 +4,7 @@ AM_CPPFLAGS +=				\
 	-I$(top_builddir)/include	\
 	$(LIBISC_CFLAGS)		\
 	$(LIBDNS_CFLAGS)		\
-	$(LIBISCCFG_CFLAGS)		\
+	$(LIBISCCFG_CFLAGS)
-	$(LIBIRS_CFLAGS)
 
 AM_CPPFLAGS +=				\
 	-DSYSCONFDIR=\"${sysconfdir}\"
@@ -14,8 +13,8 @@ bin_PROGRAMS = delv
 
 delv_SOURCES =				\
 	delv.c
+
 delv_LDADD =				\
 	$(LIBISC_LIBS)			\
 	$(LIBDNS_LIBS)			\
-	$(LIBISCCFG_LIBS)		\
+	$(LIBISCCFG_LIBS)
-	$(LIBIRS_LIBS)

bin/dig/Makefile.am

@@ -4,7 +4,6 @@ AM_CPPFLAGS +=			\
 	$(LIBISC_CFLAGS)	\
 	$(LIBDNS_CFLAGS)	\
 	$(LIBISCCFG_CFLAGS)	\
-	$(LIBIRS_CFLAGS)	\
 	$(LIBIDN2_CFLAGS)	\
 	$(LIBUV_CFLAGS)
 
@@ -13,7 +12,6 @@ LDADD +=			\
 	$(LIBISC_LIBS)		\
 	$(LIBDNS_LIBS)		\
 	$(LIBISCCFG_LIBS)	\
-	$(LIBIRS_LIBS)		\
 	$(LIBIDN2_LIBS)
 
 noinst_LTLIBRARIES = libdighost.la

bin/nsupdate/Makefile.am

@@ -4,7 +4,6 @@ AM_CPPFLAGS +=			\
 	$(LIBISC_CFLAGS)	\
 	$(LIBDNS_CFLAGS)	\
 	$(LIBISCCFG_CFLAGS)	\
-	$(LIBIRS_CFLAGS)	\
 	$(GSSAPI_CFLAGS)	\
 	$(KRB5_CFLAGS)		\
 	$(READLINE_CFLAGS)
@@ -16,7 +15,6 @@ LDADD +=			\
 	$(LIBISC_LIBS)		\
 	$(LIBDNS_LIBS)		\
 	$(LIBISCCFG_LIBS)	\
-	$(LIBIRS_LIBS)		\
 	$(GSSAPI_LIBS)		\
 	$(KRB5_LIBS)
 

configure.ac

@@ -1558,7 +1558,6 @@ AC_CONFIG_FILES([lib/Makefile
 		 lib/isc/Makefile
 		 lib/dns/Makefile
 		 lib/ns/Makefile
-		 lib/irs/Makefile
 		 lib/isccfg/Makefile
 		 lib/isccc/Makefile])
 

doc/dev/dev.md

@@ -272,8 +272,6 @@ libraries.
       configuration parser and checker.
     * `bind9/lib/isccc`: library implementing the control channel used
       by `rndc`
-    * `bind9/lib/irs`: provides mechanisms for reading `/etc/resolv.conf`
-      and other configuration files.
 
 #### Namespace
 

doc/notes/notes-current.rst

@@ -33,6 +33,10 @@ Removed Features
   moved to the ``libisc`` and ``libisccfg`` libraries, and the
   now-empty ``libbind9`` has been removed and is no longer installed.
 
+- The ``irs_resconf`` module has been moved to the ``libdns`` shared
+  library and the now-empty ``libirs`` library has been removed and is
+  no longer installed.
+
 Feature Changes
 ~~~~~~~~~~~~~~~
 

lib/Makefile.am

@@ -1,3 +1,3 @@
 include $(top_srcdir)/Makefile.top
 
-SUBDIRS = isc dns isccc ns isccfg irs
+SUBDIRS = isc dns isccc ns isccfg

lib/dns/Makefile.am

@@ -142,9 +142,14 @@ dst_HEADERS =				\
 	include/dst/dst.h		\
 	include/dst/gssapi.h
 
+irsdir = $(includedir)/irs
+irs_HEADERS =				\
+	include/irs/resconf.h
+
 libdns_la_SOURCES =			\
 	$(libdns_la_HEADERS)		\
 	$(dst_HEADERS)			\
+	$(irs_HEADERS)			\
 	acl.c				\
 	adb.c				\
 	badcache.c			\
@@ -212,6 +217,7 @@ libdns_la_SOURCES =			\
 	rdataslab.c			\
 	remote.c			\
 	request.c			\
+	resconf.c			\
 	resolver.c			\
 	result.c			\
 	rootns.c			\

lib/dns/resconf.c

@@ -96,13 +96,11 @@ struct irs_resconf {
 	isc_mem_t *mctx;
 
 	isc_sockaddrlist_t nameservers;
-	unsigned int numns; /*%< number of configured servers
+	unsigned int numns; /*%< number of configured servers */
-			     * */
 
 	char *domainname;
 	char *search[RESCONFMAXSEARCH];
-	uint8_t searchnxt; /*%< index for next free slot
+	uint8_t searchnxt; /*%< index for next free slot */
-			    * */
 
 	irs_resconf_searchlist_t searchlist;
 

lib/irs/Makefile.am

@@ -1,27 +0,0 @@
-include $(top_srcdir)/Makefile.top
-
-lib_LTLIBRARIES = libirs.la
-
-libirs_ladir = $(includedir)/irs
-libirs_la_HEADERS =		\
-	include/irs/resconf.h
-
-libirs_la_SOURCES =		\
-	$(libirs_la_HEADERS)	\
-	resconf.c
-
-libirs_la_CPPFLAGS =		\
-	$(AM_CPPFLAGS)		\
-	$(LIBISC_CFLAGS)	\
-	$(LIBDNS_CFLAGS)	\
-	$(LIBISCCFG_CFLAGS)	\
-	$(LIBIRS_CFLAGS)
-
-libirs_la_LIBADD =		\
-	$(LIBISC_LIBS)		\
-	$(LIBDNS_LIBS)		\
-	$(LIBISCCFG_LIBS)
-
-libirs_la_LDFLAGS =		\
-	$(AM_LDFLAGS)		\
-	-release "$(PACKAGE_VERSION)"

lib/irs/include/.clang-format

@@ -1 +0,0 @@
-../../../.clang-format.headers

lib/irs/tests

@@ -1 +0,0 @@
-../../tests/irs

tests/irs/Makefile.am

@@ -2,11 +2,11 @@ include $(top_srcdir)/Makefile.top
 
 AM_CPPFLAGS +=			\
 	$(LIBISC_CFLAGS)	\
-	$(LIBIRS_CFLAGS)
+	$(LIBDNS_CFLAGS)
 
 LDADD +=			\
 	$(LIBISC_LIBS)		\
-	$(LIBIRS_LIBS)
+	$(LIBDNS_LIBS)
 
 check_PROGRAMS =		\
 	resconf_test