From 87e15b393c10c6385601e7e08955d03806b1734b Mon Sep 17 00:00:00 2001
From: Andreas Gustafsson <source@isc.org>
Date: Thu, 21 Dec 2000 23:44:51 +0000
Subject: [PATCH] avoid the file name extension '.orig' so as not to conflict
 with 'patch'

---
 bin/tests/system/nsupdate/clean.sh            |  5 ++--
 .../ns1/{example.orig => example1.db}         |  2 +-
 bin/tests/system/nsupdate/ns1/update.orig     | 28 -------------------
 bin/tests/system/nsupdate/setup.sh            | 20 +++++++++++--
 4 files changed, 21 insertions(+), 34 deletions(-)
 rename bin/tests/system/nsupdate/ns1/{example.orig => example1.db} (98%)
 delete mode 100644 bin/tests/system/nsupdate/ns1/update.orig

diff --git a/bin/tests/system/nsupdate/clean.sh b/bin/tests/system/nsupdate/clean.sh
index 2cddd9e5ac..1129f47642 100644
--- a/bin/tests/system/nsupdate/clean.sh
+++ b/bin/tests/system/nsupdate/clean.sh
@@ -15,13 +15,14 @@
 # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
 # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: clean.sh,v 1.5 2000/08/01 01:16:11 tale Exp $
+# $Id: clean.sh,v 1.6 2000/12/21 23:44:47 gson Exp $
 
 #
 # Clean up after zone transfer tests.
 #
 
-rm -f dig.out.ns1 dig.out.ns2 dig.out.ns1.after ns1/*.jnl ns2/*.jnl ns1/*.db
+rm -f dig.out.ns1 dig.out.ns2 dig.out.ns1.after ns1/*.jnl ns2/*.jnl \
+    ns1/example.db ns1/update.db
 
 
 
diff --git a/bin/tests/system/nsupdate/ns1/example.orig b/bin/tests/system/nsupdate/ns1/example1.db
similarity index 98%
rename from bin/tests/system/nsupdate/ns1/example.orig
rename to bin/tests/system/nsupdate/ns1/example1.db
index 2a83b24fec..51a8d32120 100644
--- a/bin/tests/system/nsupdate/ns1/example.orig
+++ b/bin/tests/system/nsupdate/ns1/example1.db
@@ -13,7 +13,7 @@
 ; NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
 ; WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-; $Id: example.orig,v 1.3 2000/08/01 01:16:17 tale Exp $
+; $Id: example1.db,v 1.1 2000/12/21 23:44:51 gson Exp $
 
 $ORIGIN .
 $TTL 300	; 5 minutes
diff --git a/bin/tests/system/nsupdate/ns1/update.orig b/bin/tests/system/nsupdate/ns1/update.orig
deleted file mode 100644
index 2fe52d84a8..0000000000
--- a/bin/tests/system/nsupdate/ns1/update.orig
+++ /dev/null
@@ -1,28 +0,0 @@
-; Copyright (C) 2000  Internet Software Consortium.
-;
-; Permission to use, copy, modify, and distribute this software for any
-; purpose with or without fee is hereby granted, provided that the above
-; copyright notice and this permission notice appear in all copies.
-;
-; THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM
-; DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL
-; IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL
-; INTERNET SOFTWARE CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT,
-; INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING
-; FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-; NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
-; WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-; $Id: update.orig,v 1.3 2000/08/01 01:16:19 tale Exp $
-
-$ORIGIN .
-$TTL 300	; 5 minutes
-update.nil		IN SOA	ns1.example.nil. hostmaster.example.nil. (
-				1	   ; serial
-				2000       ; refresh (2000 seconds)
-				2000       ; retry (2000 seconds)
-				1814400    ; expire (3 weeks)
-				3600       ; minimum (1 hour)
-				)
-update.nil.		NS	ns1.update.nil.
-ns1.update.nil.		A	10.53.0.2
diff --git a/bin/tests/system/nsupdate/setup.sh b/bin/tests/system/nsupdate/setup.sh
index ab81e49c0b..367e9edf4c 100644
--- a/bin/tests/system/nsupdate/setup.sh
+++ b/bin/tests/system/nsupdate/setup.sh
@@ -15,14 +15,28 @@
 # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
 # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: setup.sh,v 1.4 2000/08/01 01:16:12 tale Exp $
+# $Id: setup.sh,v 1.5 2000/12/21 23:44:49 gson Exp $
 
 #
 # jnl and database files MUST be removed before we start
 #
 
 rm -f ns1/*.jnl ns1/example.db ns2/*.jnl ns2/example.bk
-cp ns1/example.orig ns1/example.db
-cp ns1/update.orig ns1/update.db
 
+cp ns1/example1.db ns1/example.db
 
+# update_test.pl has its own zone file because it
+# requires a specific NS record set.
+cat <<\EOF >ns1/update.db
+$ORIGIN .
+$TTL 300        ; 5 minutes
+update.nil              IN SOA  ns1.example.nil. hostmaster.example.nil. (
+                                1          ; serial
+                                2000       ; refresh (2000 seconds)
+                                2000       ; retry (2000 seconds)
+                                1814400    ; expire (3 weeks)
+                                3600       ; minimum (1 hour)
+                                )
+update.nil.             NS      ns1.update.nil.
+ns1.update.nil.         A       10.53.0.2
+EOF