X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=build-scripts%2Fdist-recursor;h=fa365ddf77abc4195e9d6289eafb565bd2274c0b;hb=44050da02d763a889dfa6f574d01e59c5a31bc92;hp=663c0bf70e7ae49f9bf6a8d3c2c37acaaaceb161;hpb=a10b43849b3091151b98d36a74d261ac621e454e;p=thirdparty%2Fpdns.git

diff --git a/build-scripts/dist-recursor b/build-scripts/dist-recursor
index 663c0bf70e..fa365ddf77 100755
--- a/build-scripts/dist-recursor
+++ b/build-scripts/dist-recursor
@@ -6,92 +6,10 @@ if [ "$0" != "./build-scripts/dist-recursor" ]; then
   echo "Please run me from the root checkout dir"
   exit 1
 fi
-
-if [ -z "$VERSION" ]; then
-  VERSION=$(./build-aux/gen-version)
-  if [ -z "$VERSION" ]; then
-    VERSION="UNKNOWN"
-  fi
-fi
-
 set -x
 
-cd pdns
-
-ragel dnslabeltext.rl -o dnslabeltext.cc
-
-cd ../docs
-pandoc -s -t man manpages/pdns_recursor.1.md -o pdns_recursor.1
-pandoc -s -t man manpages/rec_control.1.md -o rec_control.1
-cd -
-
-DIST_HOST="$(id -u -n)@$(hostname -f 2>/dev/null || hostname 2>/dev/null || echo localhost)"
-
-INCLUDES="iputils.hh arguments.hh base64.hh zoneparser-tng.hh \
-rcpgenerator.hh lock.hh dnswriter.hh  dnsrecords.hh dnsparser.hh utility.hh \
-recursor_cache.hh rec_channel.hh qtype.hh misc.hh dns.hh syncres.hh \
-sstuff.hh mtasker.hh mtasker.cc lwres.hh logger.hh pdnsexception.hh \
-mplexer.hh pubsuffix.hh mbedtlscompat.hh \
-dns_random.hh lua-pdns.hh lua-recursor.hh namespaces.hh \
-recpacketcache.hh base32.hh cachecleaner.hh json.hh version.hh \
-ws-recursor.hh ws-api.hh secpoll-recursor.hh \
-responsestats.hh webserver.hh dnsname.hh dnspacket.hh ednssubnet.hh \
-filterpo.hh rpzloader.hh ixfr.hh gss_context.hh resolver.hh dnssecinfra.hh \
-dnsseckeeper.hh statbag.hh ueberbackend.hh sha.hh dnsbackend.hh comment.hh \
-ednssubnet.hh"
-
-CFILES="syncres.cc iputils.cc  misc.cc unix_utility.cc qtype.cc \
-logger.cc arguments.cc  lwres.cc pdns_recursor.cc lua-iputils.cc \
-recursor_cache.cc  dnsparser.cc dnswriter.cc  dnsrecords.cc  rcpgenerator.cc  \
-base64.cc  zoneparser-tng.cc  rec_channel.cc rec_channel_rec.cc rec_control.cc \
-selectmplexer.cc epollmplexer.cc kqueuemplexer.cc portsmplexer.cc pdns_hw.cc \
-sillyrecords.cc pubsuffix.cc lua-pdns.cc lua-recursor.cc randomhelper.cc \
-devpollmplexer.cc recpacketcache.cc dns.cc reczones.cc base32.cc nsecrecords.cc \
-dnslabeltext.cc json.cc ws-recursor.cc ws-api.cc version.cc dns_random.cc \
-responsestats.cc webserver.cc rec-carbon.cc secpoll-recursor.cc dnsname.cc \
-filterpo.cc rpzloader.cc ixfr.cc dnssecinfra.cc gss_context.cc resolver.cc \
-ednssubnet.cc"
-
-./mkpubsuffixcc
-
-DIRNAME=pdns-recursor-$VERSION
-rm -rf $DIRNAME
-mkdir  $DIRNAME
-cp $INCLUDES $CFILES $DIRNAME
-cp Makefile-recursor $DIRNAME/Makefile.in
-cp README-recursor $DIRNAME/README
-cp ../COPYING ../NOTICE $DIRNAME/
-cp config-recursor.h $DIRNAME/config.h
-cat >>$DIRNAME/config.h <<EOF
-#define VERSION "$VERSION"
-#define DIST_HOST "$DIST_HOST"
-#define HAVE_BOOST 1
-#define HAVE_MBEDTLS2 1
-EOF
-mkdir -p $DIRNAME/ext/rapidjson/include/rapidjson/internal
-cp -a ../ext/rapidjson/include/rapidjson/*.h $DIRNAME/ext/rapidjson/include/rapidjson/
-cp -a ../ext/rapidjson/include/rapidjson/internal/*.h $DIRNAME/ext/rapidjson/include/rapidjson/internal
-mkdir -p $DIRNAME/ext/mbedtls/include/mbedtls
-cp -a ../ext/mbedtls/include/mbedtls/{config.h,check_config.h,aes.h,ripemd160.h,sha1.h,md.h,md5.h,sha256.h,sha512.h,md_internal.h} ../ext/mbedtls/include/mbedtls/base64.h ../ext/mbedtls/include/mbedtls/platform.h ../ext/mbedtls/include/mbedtls/version.h $DIRNAME/ext/mbedtls/include/mbedtls
-mkdir -p $DIRNAME/ext/mbedtls/library
-cp -a ../ext/mbedtls/library/{aes.c,base64.c,md.c,md_wrap.c,md5.c,sha1.c,sha256.c,sha512.c,ripemd160.c} $DIRNAME/ext/mbedtls/library
-cp -a ../ext/yahttp/ $DIRNAME/ext/yahttp
-echo '#include "../../../config.h"' > $DIRNAME/ext/yahttp/yahttp/yahttp-config.h
-mkdir $DIRNAME/rrd
-cp tools/rrd/{create,update,makegraphs,index.html} $DIRNAME/rrd
-cp dnslabeltext.rl $DIRNAME
-cp pdns-recursor.init.d $DIRNAME
-cp ../docs/pdns_recursor.1 ../docs/rec_control.1 $DIRNAME
-cp configure-recursor $DIRNAME/configure
-cp powerdns-example-script.lua $DIRNAME
-mkdir -p $DIRNAME/contrib
-cp ../contrib/systemd-pdns-recursor.service $DIRNAME/contrib
-cp ../build-scripts/build-recursor-semistatic $DIRNAME/build-scripts
-cp pdns-recursor.spec $DIRNAME
+cd pdns/recursordist
 
-mkdir -p $DIRNAME/sysdeps
-rm -f sysdeps-recursor/*~
-cp  sysdeps-recursor/* $DIRNAME/sysdeps
-touch $DIRNAME/dnslabeltext.cc # avoid spurious recompiles
-tar cf $DIRNAME.tar $DIRNAME
-bzip2 -f $DIRNAME.tar # .. solaris
+autoreconf -vi
+./configure
+make dist