From 9999907593950adabfc36a82183b0d663f0624fa Mon Sep 17 00:00:00 2001
From: Willem Toorop <willem@nlnetlabs.nl>
Date: Tue, 13 Feb 2018 15:05:29 +0100
Subject: [PATCH] update Stubby + other dist tarball fixes

---
 Makefile.in     |  5 +++++
 configure.ac    |  2 ++
 src/Makefile.in | 10 +++++++++-
 stubby          |  2 +-
 4 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index f6d7acab..b160e369 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -213,12 +213,14 @@ $(distdir):
 	mkdir -p $(distdir)/src/tools
 	mkdir -p $(distdir)/src/jsmn
 	mkdir -p $(distdir)/src/yxml
+	mkdir -p $(distdir)/src/ssl_dane
 	mkdir -p $(distdir)/doc
 	mkdir -p $(distdir)/spec
 	mkdir -p $(distdir)/spec/example
 	mkdir -p $(distdir)/stubby
 	mkdir -p $(distdir)/stubby/src
 	mkdir -p $(distdir)/stubby/src/yaml
+	mkdir -p $(distdir)/stubby/doc
 	cp $(srcdir)/configure.ac $(distdir)
 	cp $(srcdir)/configure $(distdir)
 	cp $(srcdir)/AUTHORS $(distdir)
@@ -267,12 +269,15 @@ $(distdir):
 	cp $(srcdir)/stubby/src/yaml/*.[ch] $(distdir)/stubby/src/yaml
 	cp $(srcdir)/stubby/COPYING $(distdir)/stubby
 	cp $(srcdir)/stubby/README.md $(distdir)/stubby
+	cp $(srcdir)/stubby/doc/stubby.1.in $(distdir)/stubby/doc
 	cp $(srcdir)/src/jsmn/*.[ch] $(distdir)/src/jsmn
 	cp $(srcdir)/src/jsmn/LICENSE $(distdir)/src/jsmn
 	cp $(srcdir)/src/jsmn/README.md $(distdir)/src/jsmn
 	cp $(srcdir)/src/yxml/*.[ch] $(distdir)/src/yxml
 	cp $(srcdir)/src/yxml/COPYING $(distdir)/src/yxml
 	cp $(srcdir)/src/yxml/yxml.pod $(distdir)/src/yxml
+	cp $(srcdir)/src/ssl_dane/danessl.[ch] $(distdir)/src/ssl_dane
+	cp $(srcdir)/src/ssl_dane/README.md $(distdir)/src/ssl_dane
 	rm -f $(distdir)/Makefile $(distdir)/src/Makefile $(distdir)/src/getdns/getdns.h $(distdir)/spec/example/Makefile $(distdir)/src/test/Makefile $(distdir)/doc/Makefile $(distdir)/src/config.h
 
 distcheck: $(distdir).tar.gz
diff --git a/configure.ac b/configure.ac
index 5b7abc60..221df401 100644
--- a/configure.ac
+++ b/configure.ac
@@ -67,6 +67,8 @@ AC_SUBST(API_VERSION, ["December 2015"])
 AC_SUBST(API_NUMERIC_VERSION, [0x07df0c00])
 GETDNS_COMPILATION_COMMENT="AC_PACKAGE_NAME $GETDNS_VERSION configured on $CURRENT_DATE for the $API_VERSION version of the API"
 
+AC_DEFINE_UNQUOTED([STUBBY_PACKAGE], ["stubby"], [Stubby package])
+AC_DEFINE_UNQUOTED([STUBBY_PACKAGE_STRING], ["0.2.2$RELEASE_CANDIDATE"], [Stubby package string])
 
 # Library version
 # ---------------
diff --git a/src/Makefile.in b/src/Makefile.in
index 59cbfb9b..a7cc9ea4 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -47,6 +47,7 @@ have_libuv = @have_libuv@
 have_libev = @have_libev@
 # datarootdir is here to please some checkers
 datarootdir=@datarootdir@
+mandir=@mandir@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 
@@ -205,6 +206,9 @@ getdns_query: default
 getdns_server_mon: default
 	cd tools && $(MAKE) $@
 
+stubby.1: $(stubbysrcdir)/doc/stubby.1.in
+	sed -e "s|@ETCDIR@|$(stubbyconfdir)|g" $< > $@
+
 stubby.lo: $(stubbysrcdir)/src/stubby.c
 	$(LIBTOOL) --quiet --tag=CC --mode=compile $(CC) $(CFLAGS) $(WPEDANTICFLAG) -DSTUBBYCONFDIR=\"$(sysconfdir)/stubby\" -DRUNSTATEDIR=\"$(runstatedir)\" -c $< -o $@
 
@@ -228,14 +232,18 @@ install-stubby-files-windows: stubby.yml.windows
 	test -f $(DESTDIR)$(stubbyconfdir)/stubby.yml || \
 		$(INSTALL_DATA) stubby.yml.windows $(DESTDIR)$(stubbyconfdir)/stubby.yml
 
-install-stubby: stubby install-stubby-files-@HOSTOS@
+install-stubby: stubby stubby.1 install-stubby-files-@HOSTOS@
 	$(INSTALL) -m 755 -d $(DESTDIR)$(bindir)
 	$(LIBTOOL) --mode=install cp stubby $(DESTDIR)$(bindir)
 	$(INSTALL) -m 755 -d $(DESTDIR)$(runstatedir)
+	$(INSTALL) -m 755 -d $(DESTDIR)$(mandir)
+	$(INSTALL) -m 755 -d $(DESTDIR)$(mandir)/man1
+	$(INSTALL) -m 644 stubby\.1 $(DESTDIR)$(mandir)/man1
 
 uninstall-stubby:
 	$(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(bindir)/stubby
 	rm -f $(DESTDIR)$(sbindir)/stubby-setdns-macos.sh
+	rm -f $(DESTDIR)$(mandir)/man1/stubby.1
 
 scratchpad: default
 	cd test && $(MAKE) $@
diff --git a/stubby b/stubby
index f0b33045..9657d0e4 160000
--- a/stubby
+++ b/stubby
@@ -1 +1 @@
-Subproject commit f0b330454b95a07106af33b1869b7cd18cfaebf2
+Subproject commit 9657d0e492e0a459d8d0ee301cf1604ed6895bd3