From 190aaf9142657cfb45639349f0eca309514e49b8 Mon Sep 17 00:00:00 2001
From: Pieter Lexis <pieter.lexis@powerdns.com>
Date: Thu, 18 Oct 2018 17:04:15 +0200
Subject: [PATCH] re-add licence files to dnsdist and rec tarball

Fixes #7082
---
 builder-support/dockerfiles/Dockerfile.dnsdist  | 1 +
 builder-support/dockerfiles/Dockerfile.recursor | 1 +
 pdns/dnsdistdist/Makefile.am                    | 3 ++-
 pdns/recursordist/Makefile.am                   | 2 ++
 4 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/builder-support/dockerfiles/Dockerfile.dnsdist b/builder-support/dockerfiles/Dockerfile.dnsdist
index c760229a06..659df6d14d 100644
--- 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 96dc73f87a..821eeb7aeb 100644
--- 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 bf71a899bd..8341b1bd49 100644
--- 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 c78faccdfe..3589ac5ebc 100644
--- 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/* \
-- 
2.47.2