[v9_8] update gitignore files; use rev-parse to get srcid

(cherry picked from commit a4e76a630ea69c04f89c6c1bf0b7d15e655c97c2)
(cherry picked from commit a71b8efb04831849ca2978df24c18a093f93a7eb)
(cherry picked from commit ea401c7295f09ec303d80202a0533dd7a94fcd3b)

diff --git a/.gitignore b/.gitignore
index 09977ff4b2d8fa1ac1733d66d5c078f7316a02d0..d612c013ea32b359df6afb5c51e4ab2623645a26 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -4,9 +4,9 @@ config.h
 config.cache
 config.status
 libtool
-isc-config.sh
-configure.lineno
-autom4te.cache
+/isc-config.sh
+/configure.lineno
+autom4te.cache/
 *.o
 *.lo
 *.so

diff --git a/bin/dig/.gitignore b/bin/dig/.gitignore
index b6a693214585bb253c8e95b93e74efc5f2371608..a6bd583aaa249ebc40e78dee73cf6712a3a04309 100644 (file)
--- a/bin/dig/.gitignore
+++ b/bin/dig/.gitignore
@@ -1,6 +1,6 @@
-dig
-host
-nslookup
+/dig
+/host
+/nslookup
 .libs
 dig-symtbl.c
 host-symtbl.c

diff --git a/bin/named/.gitignore b/bin/named/.gitignore
index 33d5f1cfe7fd71f8423754a13d98ff849e741ac9..efa677a1a17c522e777d25fdb723ba05f26fc966 100644 (file)
--- a/bin/named/.gitignore
+++ b/bin/named/.gitignore
@@ -1,4 +1,4 @@
 .libs
-named
+/named
+/lwresd
 named-symtbl.c
-lwresd

diff --git a/bin/named/include/.gitignore b/bin/named/include/.gitignore
index 8866500f0a9433f0b40f194092de3661a410f148..a3093fc3a5247aa02cb79ed0f49e016fcdb7f1a3 100644 (file)
--- a/bin/named/include/.gitignore
+++ b/bin/named/include/.gitignore
@@ -1 +1,2 @@
+!config.h
 !named

diff --git a/bin/pkcs11/.gitignore b/bin/pkcs11/.gitignore
new file mode 100644 (file)
index 0000000..094f465
--- /dev/null
+++ b/bin/pkcs11/.gitignore
@@ -0,0 +1,3 @@
+pkcs11-destroy
+pkcs11-keygen
+pkcs11-list

diff --git a/bin/rndc/.gitignore b/bin/rndc/.gitignore
index d9a02c91eb64d3fefdd811acbfd22703314b690a..4b44ecf1e943cc664677b3d64d645dadb9b8fbbc 100644 (file)
--- a/bin/rndc/.gitignore
+++ b/bin/rndc/.gitignore
@@ -1,3 +1,3 @@
 .libs
-rndc
-rndc-confgen
+/rndc
+/rndc-confgen

diff --git a/bin/tests/system/filter-aaaa/.gitignore b/bin/tests/system/filter-aaaa/.gitignore
index 719fc327c09d801d95a220edcc9bf3f168a02972..8feb10418a11e2429ad9b7eb0e8f27040195631e 100644 (file)
--- a/bin/tests/system/filter-aaaa/.gitignore
+++ b/bin/tests/system/filter-aaaa/.gitignore
@@ -1,3 +1,3 @@
 filter-aaaa
-named1.conf
-named2.conf
+named.memstats
+named.run

diff --git a/bin/tests/system/ixfr/ns3/.gitignore b/bin/tests/system/ixfr/ns3/.gitignore
deleted file mode 100644 (file)
index 58e5c92..0000000
--- a/bin/tests/system/ixfr/ns3/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-named.conf

diff --git a/configure.in b/configure.in
index cfe20d02662c91776ace892609589dcd1d8790ca..5def94551d533664580f832bb18fb2998277f934 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -3304,7 +3304,7 @@ if test -f "${srcdir}/srcid"; then
        . "${srcdir}/srcid"
        BIND9_SRCID="SRCID=$SRCID"
 elif test -d "${srcdir}/.git"; then
-       BIND9_SRCID="SRCID="`(cd "${srcdir}";git log -n 1 --format=%h)`
+       BIND9_SRCID="SRCID="`(cd "${srcdir}";git rev-parse --short HEAD)`
 fi
 
 AC_SUBST(BIND9_SRCID)

diff --git a/contrib/dlz/.gitignore b/contrib/dlz/.gitignore
new file mode 100644 (file)
index 0000000..2460008
--- /dev/null
+++ b/contrib/dlz/.gitignore
@@ -0,0 +1 @@
+!Makefile

diff --git a/contrib/dlz/bin/.gitignore b/contrib/dlz/bin/.gitignore
new file mode 100644 (file)
index 0000000..f3c7a7c
--- /dev/null
+++ b/contrib/dlz/bin/.gitignore
@@ -0,0 +1 @@
+Makefile

diff --git a/contrib/idn/idnkit-1.0-src/.gitignore b/contrib/idn/idnkit-1.0-src/.gitignore
new file mode 100644 (file)
index 0000000..d25028d
--- /dev/null
+++ b/contrib/idn/idnkit-1.0-src/.gitignore
@@ -0,0 +1,10 @@
+idn.conf.sample
+idnalias.conf.sample
+idn.conf.5
+idnalias.conf.5
+idnrc.5
+libidnkit.3
+libidnkitlite.3
+/idnconv
+/idnslookup
+/runidn

diff --git a/contrib/idn/idnkit-1.0-src/util/.gitignore b/contrib/idn/idnkit-1.0-src/util/.gitignore
new file mode 100644 (file)
index 0000000..2460008
--- /dev/null
+++ b/contrib/idn/idnkit-1.0-src/util/.gitignore
@@ -0,0 +1 @@
+!Makefile

diff --git a/contrib/nslint-2.1a3/.gitignore b/contrib/nslint-2.1a3/.gitignore
new file mode 100644 (file)
index 0000000..356afe2
--- /dev/null
+++ b/contrib/nslint-2.1a3/.gitignore
@@ -0,0 +1,3 @@
+/gnuc.h
+/nslint
+/version.c

diff --git a/contrib/perftcpdns/.gitignore b/contrib/perftcpdns/.gitignore
new file mode 100644 (file)
index 0000000..b53d484
--- /dev/null
+++ b/contrib/perftcpdns/.gitignore
@@ -0,0 +1 @@
+perftcpdns

diff --git a/contrib/queryperf/.gitignore b/contrib/queryperf/.gitignore
new file mode 100644 (file)
index 0000000..ddf89f8
--- /dev/null
+++ b/contrib/queryperf/.gitignore
@@ -0,0 +1 @@
+queryperf

diff --git a/contrib/zkt/.gitignore b/contrib/zkt/.gitignore
new file mode 100644 (file)
index 0000000..4fac138
--- /dev/null
+++ b/contrib/zkt/.gitignore
@@ -0,0 +1,5 @@
+/zkt-conf
+/zkt-keyman
+/zkt-ls
+/zkt-signer
+/zkt-soaserial

diff --git a/contrib/zkt/Makefile.in b/contrib/zkt/Makefile.in
index 21219cd9d615b472fe24560897c887f249d4496b..e111a231a96e4858e22ec5e6626224de63eec6d1 100644 (file)
--- a/contrib/zkt/Makefile.in
+++ b/contrib/zkt/Makefile.in
@@ -100,13 +100,13 @@ $(PROG_CNF):      $(OBJ_CNF) $(OBJ_ALL) Makefile
        $(CC) $(LDFLAGS) $(OBJ_CNF) $(OBJ_ALL) -o $(PROG_CNF)
 
 $(PROG_KEY):   $(OBJ_KEY) $(OBJ_ALL) Makefile
-       $(CC) $(LDFLAGS) $(LIBS) $(OBJ_KEY) $(OBJ_ALL) -o $(PROG_KEY)
+       $(CC) $(LDFLAGS) $(OBJ_KEY) $(OBJ_ALL) $(LIBS) -o $(PROG_KEY)
 
 $(PROG_ZKT):   $(OBJ_ZKT) $(OBJ_ALL) Makefile
        $(CC) $(LDFLAGS) $(LIBS) $(OBJ_ZKT) $(OBJ_ALL) -o $(PROG_ZKT)
 
 $(PROG_LS):    $(OBJ_LS) $(OBJ_ALL) Makefile
-       $(CC) $(LDFLAGS) $(LIBS) $(OBJ_LS) $(OBJ_ALL) -o $(PROG_LS)
+       $(CC) $(LDFLAGS) $(OBJ_LS) $(OBJ_ALL) $(LIBS) -o $(PROG_LS)
 
 $(PROG_SER):   $(OBJ_SER) Makefile
        $(CC) $(LDFLAGS) $(OBJ_SER) -o $(PROG_SER)

diff --git a/lib/isc/.gitignore b/lib/isc/.gitignore
new file mode 100644 (file)
index 0000000..734ffcd
--- /dev/null
+++ b/lib/isc/.gitignore
@@ -0,0 +1 @@
+!netdb.h

diff --git a/lib/lwres/win32/include/lwres/.gitignore b/lib/lwres/win32/include/lwres/.gitignore
new file mode 100644 (file)
index 0000000..a705f39
--- /dev/null
+++ b/lib/lwres/win32/include/lwres/.gitignore
@@ -0,0 +1,2 @@
+!netdb.h
+!platform.h

diff --git a/unit/.gitignore b/unit/.gitignore
index 6ff543b02895342bc89e8a0bc16e3110db72e28d..db27d5b1d73355d18371f179b1940686ca5d82c2 100644 (file)
--- a/unit/.gitignore
+++ b/unit/.gitignore
@@ -1,3 +1,4 @@
+!config.h
 Makefile
 atf
 unittest.sh