From: Peter van Dijk <peter.van.dijk@netherlabs.nl>
Date: Fri, 5 Jul 2013 13:24:03 +0000 (+0200)
Subject: Merge branch 'rel/auth-3.3'
X-Git-Tag: rec-3.6.0-rc1~584
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d3c0bc10259d732bf3bf933fb271f5f782c1e8cd;p=thirdparty%2Fpdns.git

Merge branch 'rel/auth-3.3'

Conflicts:
	.travis.yml
	debian-pdns/rules
	modules/remotebackend/testrunner.sh
	modules/remotebackend/unittest_http.rb
	modules/remotebackend/unittest_json.rb
	modules/remotebackend/unittest_pipe.rb
	modules/remotebackend/unittest_post.rb
	pdns.spec
	pdns/Makefile.am
	pdns/misc.hh
	regression-tests/start-test-stop
---

d3c0bc10259d732bf3bf933fb271f5f782c1e8cd
diff --cc debian-pdns/rules
index a8f7298661,02598ac792..a0cdf31f79
--- a/debian-pdns/rules
+++ b/debian-pdns/rules
@@@ -133,8 -133,8 +133,9 @@@ binary-main-prepare
  
  	install -d -m 755 -o root -g root "$(tools_tmpdir)"/DEBIAN
  
+ 	#FIXME: shell loops hide errors
 -	for prog in dnsbulktest dnsreplay dnsscan dnsscope dnstcpbench dnswasher nproxy nsec3dig ; do \
 +	for prog in dnsbulktest dnsreplay dnsscan dnsscope dnstcpbench dnswasher \
 +		nproxy dnsdist nsec3dig ; do \
  		mv "$(tmpdir)"/usr/bin/$$prog "$(tools_tmpdir)"/usr/bin ; \
  		[ -e "$(tmpdir)"/usr/share/man/man8/"$$prog".8 ] && \
  			mv "$(tmpdir)"/usr/share/man/man8/"$$prog".8 "$(tools_tmpdir)"/usr/share/man/man8/ ; \
diff --cc pdns.spec
index 87b9f65147,5a850126c5..4494547944
--- a/pdns.spec
+++ b/pdns.spec
@@@ -1,6 -1,6 +1,6 @@@
  BuildRoot: /tmp/pdns
  Name: pdns-static
- Version: 3.2
 -Version: 3.3rc1
++Version: 3.3
  Release: 1
  Summary: extremely powerful and versatile nameserver
  License: GPL