From: Pieter Lexis <pieter.lexis@powerdns.com>
Date: Fri, 16 Mar 2018 13:25:45 +0000 (+0100)
Subject: Ensure autoreconf from non-builder tarballs yield "unknown" as version
X-Git-Tag: dnsdist-1.3.3~83^2~25
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8670e40d1d62ad7ec5a1b9580025f5ffd6d29000;p=thirdparty%2Fpdns.git

Ensure autoreconf from non-builder tarballs yield "unknown" as version
---

diff --git a/Makefile.am b/Makefile.am
index 9a2942c458..e26c915213 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -8,7 +8,8 @@ EXTRA_DIST = \
 	codedocs/doxygen.conf \
 	contrib/powerdns.solaris.init.d \
 	pdns/named.conf.parsertest \
-	regression-tests/zones/unit.test
+	regression-tests/zones/unit.test \
+	builder-support/gen-version
 
 ACLOCAL_AMFLAGS = -I m4
 
diff --git a/builder-support/dockerfiles/Dockerfile.authoritative b/builder-support/dockerfiles/Dockerfile.authoritative
index 60ac71baa7..d202333fde 100644
--- a/builder-support/dockerfiles/Dockerfile.authoritative
+++ b/builder-support/dockerfiles/Dockerfile.authoritative
@@ -9,6 +9,7 @@ ADD configure.ac Makefile.am COPYING INSTALL NOTICE README /pdns-authoritative/
 @EXEC sdist_dirs=(build-aux m4 pdns ext docs modules codedocs contrib regression-tests)
 @EXEC for d in ${sdist_dirs[@]} ; do echo "COPY $d/ /pdns-authoritative/$d/" ; done
 ADD builder/helpers/set-configure-ac-version.sh /pdns-authoritative/builder/helpers/
+ADD builder-support/gen-version /pdns-authoritative/builder-support/gen-version
 WORKDIR /pdns-authoritative/
 
 RUN mkdir /sdist
diff --git a/builder-support/dockerfiles/Dockerfile.dnsdist b/builder-support/dockerfiles/Dockerfile.dnsdist
index fb886a4753..c760229a06 100644
--- a/builder-support/dockerfiles/Dockerfile.dnsdist
+++ b/builder-support/dockerfiles/Dockerfile.dnsdist
@@ -6,6 +6,7 @@ RUN apk add --no-cache gcc g++ make tar autoconf automake protobuf-dev lua-dev \
 ADD builder/helpers/set-configure-ac-version.sh /dnsdist/builder/helpers/
 @EXEC sdist_dirs=(build-aux m4 pdns ext)
 @EXEC for d in ${sdist_dirs[@]} ; do echo "COPY $d/ /dnsdist/$d/" ; done
+ADD builder-support/gen-version /dnsdist/pdns/dnsdistdist/builder-support/gen-version
 WORKDIR /dnsdist/pdns/dnsdistdist
 
 RUN mkdir /sdist
diff --git a/builder-support/dockerfiles/Dockerfile.recursor b/builder-support/dockerfiles/Dockerfile.recursor
index b214140679..96dc73f87a 100644
--- a/builder-support/dockerfiles/Dockerfile.recursor
+++ b/builder-support/dockerfiles/Dockerfile.recursor
@@ -7,6 +7,7 @@ RUN apk add --no-cache gcc g++ make tar autoconf automake protobuf-dev lua-dev \
 @EXEC sdist_dirs=(build-aux m4 pdns ext docs)
 @EXEC for d in ${sdist_dirs[@]} ; do echo "COPY $d/ /pdns-recursor/$d/" ; done
 ADD builder/helpers/set-configure-ac-version.sh /pdns-recursor/builder/helpers/
+ADD builder-support/gen-version /pdns-recursor/pdns/recursordist/builder-support/gen-version
 WORKDIR /pdns-recursor/pdns/recursordist
 
 RUN mkdir /sdist
diff --git a/pdns/dnsdistdist/Makefile.am b/pdns/dnsdistdist/Makefile.am
index 9eda0d5017..b6e1d39eea 100644
--- a/pdns/dnsdistdist/Makefile.am
+++ b/pdns/dnsdistdist/Makefile.am
@@ -64,7 +64,8 @@ EXTRA_DIST=dnslabeltext.rl \
 	   devpollmplexer.cc \
 	   epollmplexer.cc \
 	   kqueuemplexer.cc \
-	   portsmplexer.cc
+	   portsmplexer.cc \
+	   builder-support/gen-version
 
 bin_PROGRAMS = dnsdist
 
diff --git a/pdns/recursordist/Makefile.am b/pdns/recursordist/Makefile.am
index 06e402a202..36658cb156 100644
--- a/pdns/recursordist/Makefile.am
+++ b/pdns/recursordist/Makefile.am
@@ -61,7 +61,8 @@ EXTRA_DIST = \
 	html incfiles \
 	test_libcrypto \
 	pdns-recursor.service.in \
-	RECURSOR-MIB.txt
+	RECURSOR-MIB.txt \
+	builder-support/gen-version
 
 dist-hook:
 	for file in $$(find $(distdir)/docs -type l); do \