- Fix to remove git tracking and ci information from release tarballs.

diff --git a/doc/Changelog b/doc/Changelog
index aa21d3515f9fbf2f0d38c6a2e42c858b8229e3f3..2634c68284edd937c6ad65235b45c25c280f9e5a 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,6 @@
+30 November 2021: Wouter
+       - Fix to remove git tracking and ci information from release tarballs.
+
 29 November 2021: Wouter
        - Merge PR #570 from rex4539: Fix typos.
        - Fix for #570: regen aclocal.m4, fix configure.ac for spelling.

diff --git a/makedist.sh b/makedist.sh
index ea79e7b4661de337093d83d1b3cce574c0e71bf7..4234a0672d1ba1bff3f2067788f355ee0d07a412 100755 (executable)
--- a/makedist.sh
+++ b/makedist.sh
@@ -329,7 +329,7 @@ if [ "$DOWIN" = "yes" ]; then
        info "git clone --depth=1 --no-tags -b $GITBRANCH $GITREPO unbound"
        git clone --depth=1 --no-tags -b $GITBRANCH $GITREPO unbound || error_cleanup "git clone failed"
        cd unbound || error_cleanup "Unbound not exported correctly from git"
-       rm -rf .git || error_cleanup "Failed to remove .git tracking information"
+       rm -rf .git .travis.yml .gitattributes .github .gitignore || error_cleanup "Failed to remove .git tracking and ci information"
 
        # on a re-configure the cache may no longer be valid...
        if test -f mingw32-config.cache; then rm mingw32-config.cache; fi
@@ -489,7 +489,7 @@ info "git clone --depth=1 --no-tags -b $GITBRANCH $GITREPO unbound"
 git clone --depth=1 --no-tags -b $GITBRANCH $GITREPO unbound || error_cleanup "git clone failed"
 
 cd unbound || error_cleanup "Unbound not exported correctly from git"
-rm -rf .git || error_cleanup "Failed to remove .git tracking information"
+rm -rf .git .travis.yml .gitattributes .github .gitignore || error_cleanup "Failed to remove .git tracking and ci information"
 
 info "Adding libtool utils (libtoolize)."
 libtoolize -c --install || libtoolize -c || error_cleanup "Libtoolize failed."