From 86e95f7efdad4bd0552a9f5bab1bb3e1b39b47b2 Mon Sep 17 00:00:00 2001
From: Mark Andrews <marka@isc.org>
Date: Thu, 8 Mar 2018 13:48:07 +1100
Subject: [PATCH] update util/check-changes to handle non master branched
 (util/check-changes master=0 CHANGES)

(cherry picked from commit 88a2202093c2b5712f3d1b5b7edc7223b8a02e9a)
---
 CHANGES            |  3 +++
 util/check-changes | 14 ++++++++++----
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/CHANGES b/CHANGES
index cb54d9b1321..e5a8d73fa99 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+4910.	[func]		Update util/check-changes to work on release branches.
+			[GL #113]
+
 4909.	[bug]		named-checkconf did not detect in-view zone collisions.
 			[GL #125]
 
diff --git a/util/check-changes b/util/check-changes
index 3a26847db4a..e440d72eea4 100644
--- a/util/check-changes
+++ b/util/check-changes
@@ -6,13 +6,13 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-# $Id$
-
 eval 'exec /usr/bin/perl -S $0 ${1+"$@"}'
     if $running_under_some_shell;
 			# this emulates #! processing on NIH machines.
 			# (remove #! line above if indigestible)
 
+$master = 1;
+
 eval '$'.$1.'$2;' while $ARGV[0] =~ /^([A-Za-z_0-9]+=)(.*)/ && shift;
 			# process any FOO=bar switches
 
@@ -23,9 +23,15 @@ $change = 0;
 $status = 0;
 
 line: while (<>) {
-    ($Fld1,$Fld2) = split(' ', $_, 9999);
+    ($Fld1,$Fld2,$Fld3,$Fld4) = split(' ', $_, 9999);
+    $change = 0 if (!$master && $Fld1 eq "---" &&
+		    $Fld3 eq "released" && $Fld4 eq "---");
     if ($Fld1 =~ /^[1-9][0-9]*\.$/ && $Fld2 =~ /^\[.*\]$/) {
-	if ($change != 0 && $Fld1 + 1 != $change) {
+	if ($change != 0 && $Fld1 >= $change) {
+	    print 'bad change number', $Fld1;
+	    $status = 1;
+	}
+	if ($master && $change != 0 && $Fld1 + 1 != $change) {
 	    print 'bad change number', $Fld1;
 	    $status = 1;
 	}
-- 
2.47.3