re-add licence files to dnsdist and rec tarball

Fixes #7082

diff --git a/builder-support/dockerfiles/Dockerfile.dnsdist b/builder-support/dockerfiles/Dockerfile.dnsdist
index c760229a06125052e3db81feafd29c6cd79ac2a1..659df6d14d405238589acf67fbd31c89546fc45f 100644 (file)
--- a/builder-support/dockerfiles/Dockerfile.dnsdist
+++ b/builder-support/dockerfiles/Dockerfile.dnsdist
@@ -4,6 +4,7 @@ RUN apk add --no-cache gcc g++ make tar autoconf automake protobuf-dev lua-dev \
                        libtool file boost-dev ragel py-virtualenv git libedit-dev
 
 ADD builder/helpers/set-configure-ac-version.sh /dnsdist/builder/helpers/
+ADD COPYING /dnsdist/
 @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

diff --git a/builder-support/dockerfiles/Dockerfile.recursor b/builder-support/dockerfiles/Dockerfile.recursor
index 96dc73f87a41915cd7362c2550bf5ffabc3bb84b..821eeb7aeb0a6ebb82867863bdb06f6fd68fdc9c 100644 (file)
--- a/builder-support/dockerfiles/Dockerfile.recursor
+++ b/builder-support/dockerfiles/Dockerfile.recursor
@@ -4,6 +4,7 @@ RUN apk add --no-cache gcc g++ make tar autoconf automake protobuf-dev lua-dev \
                        libtool file boost-dev curl openssl-dev ragel py-virtualenv \
                        flex bison git
 
+ADD COPYING NOTICE /pdns-recursor/
 @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/

diff --git a/pdns/dnsdistdist/Makefile.am b/pdns/dnsdistdist/Makefile.am
index bf71a899bd30ccc606487eeff18073c00a52dfd1..8341b1bd493f14ec9ee666bd272f7d684885a237 100644 (file)
--- a/pdns/dnsdistdist/Makefile.am
+++ b/pdns/dnsdistdist/Makefile.am
@@ -44,7 +44,8 @@ AM_CPPFLAGS += $(GNUTLS_CFLAGS)
 endif
 endif
 
-EXTRA_DIST=dnslabeltext.rl \
+EXTRA_DIST=COPYING \
+          dnslabeltext.rl \
           dnsdistconf.lua \
           dnsmessage.proto \
           dnstap.proto \

diff --git a/pdns/recursordist/Makefile.am b/pdns/recursordist/Makefile.am
index c78faccdfe8620bac21b84196b9c92a2f323e27a..3589ac5ebccabaa7eb9a434dcb971a0c2e6913a8 100644 (file)
--- a/pdns/recursordist/Makefile.am
+++ b/pdns/recursordist/Makefile.am
@@ -43,6 +43,7 @@ endif
 
 EXTRA_DIST = \
        contrib/* \
+       COPYING \
        devpollmplexer.cc \
        dnslabeltext.cc \
        dnslabeltext.rl \
@@ -55,6 +56,7 @@ EXTRA_DIST = \
        mkpubsuffixcc \
        mtasker.cc \
        mtasker_fcontext.cc mtasker_ucontext.cc \
+       NOTICE \
        opensslsigners.hh opensslsigners.cc \
        portsmplexer.cc \
        rrd/* \