From: Mark Andrews <marka@isc.org>
Date: Tue, 5 Jun 2018 01:49:38 +0000 (+1000)
Subject: call util/check-changes in setup
X-Git-Tag: v9.11.4rc1~14^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c0e69cc4067cde6671601096dfccdf70fc15d7c4;p=thirdparty%2Fbind9.git

call util/check-changes in setup
---

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4651f823a1d..db1ace50d0f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -140,6 +140,7 @@ precheck:debian:sid:amd64:
   <<: *debian_sid_amd64_image
   stage: precheck
   script:
+    - perl util/check-changes CHANGES
     - perl -w util/merge_copyrights
     - diff -urNap util/copyrights util/newcopyrights
     - rm util/newcopyrights
diff --git a/CHANGES b/CHANGES
index aa4605c315e..0ab651160eb 100644
--- a/CHANGES
+++ b/CHANGES
@@ -104,6 +104,7 @@
 			server cookies.  [RT #45672]
 
 	--- 9.11.3 released ---
+
 	--- 9.11.3rc2 released ---
 
 4904.	[bug]		Temporarily revert change #4859. [GL #124]
diff --git a/util/check-changes b/util/check-changes
index ee79da23b5c..85eec0e6a88 100644
--- a/util/check-changes
+++ b/util/check-changes
@@ -14,7 +14,7 @@ eval 'exec /usr/bin/perl -S $0 ${1+"$@"}'
 			# this emulates #! processing on NIH machines.
 			# (remove #! line above if indigestible)
 
-$master = 1;
+$master = 0;
 
 eval '$'.$1.'$2;' while $ARGV[0] =~ /^([A-Za-z_0-9]+=)(.*)/ && shift;
 			# process any FOO=bar switches