From: Otto Moerbeek <otto.moerbeek@open-xchange.com>
Date: Mon, 23 Sep 2024 09:21:13 +0000 (+0200)
Subject: Do not include a stray pdns dir in the recursor artifacts
X-Git-Tag: rec-5.2.0-alpha1~68^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f484abd4476cb50345d516d7ae02fd96573ee56e;p=thirdparty%2Fpdns.git

Do not include a stray pdns dir in the recursor artifacts

This is caused by pdns-recursor matching pdns*, which is intended to select
auth files only.
Not terribly happy with the code duplication, but we would end up in quoting hell otherwise.
---

diff --git a/builder-support/post-build b/builder-support/post-build
index 9e7a9c64b2..b2bc088315 100755
--- a/builder-support/post-build
+++ b/builder-support/post-build
@@ -17,15 +17,20 @@ if ! $tar --version | grep -q GNU; then
     exit 1
 fi
 
-for prog in pdns-recursor dnsdist pdns; do
+for prog in pdns-recursor dnsdist; do
   if [ $(find ${SRCDIR}/dist -name "${prog}*" 2>/dev/null | wc -l) -ne 0 ]; then
     dst=${DESTDIR}/${prog}/${BUILDER_VERSION}
     mkdir -p ${dst}
     cp ${BUILDER_TMP}/${BUILDER_VERSION}/sdist/${prog}*.tar.bz2 ${dst}
-    if [ "${prog}" = "pdns" ]; then
-      rm -f ${dst}/pdns-recursor*
-    fi
     tardirname=${prog}-${BUILDER_VERSION}-${BUILDER_TARGET}
     "$tar" -cjf ${dst}/${tardirname}.tar.bz2 --transform="s,.*/,${tardirname}/,g"  $(find ${SRCDIR} -type f)
   fi
 done
+prog=pdns
+if [ $(find ${SRCDIR}/dist -name 'pdns*' -a ! -name 'pdns-recursor*' 2>/dev/null | wc -l) -ne 0 ]; then
+  dst=${DESTDIR}/${prog}/${BUILDER_VERSION}
+  mkdir -p ${dst}
+  cp ${BUILDER_TMP}/${BUILDER_VERSION}/sdist/${prog}*.tar.bz2 ${dst}
+  tardirname=${prog}-${BUILDER_VERSION}-${BUILDER_TARGET}
+  "$tar" -cjf ${dst}/${tardirname}.tar.bz2 --transform="s,.*/,${tardirname}/,g"  $(find ${SRCDIR} -type f)
+fi