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

(cherry picked from commit a4e76a630ea69c04f89c6c1bf0b7d15e655c97c2)

diff --git a/.gitignore b/.gitignore
index a1d898291ed1ef297c9af14cf139a605da135e34..94c69f85f543821988ddafe9207667508b0b67a7 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/confgen/.gitignore b/bin/confgen/.gitignore
index 05f645a34fdc741bd659a868ab51359a49d6d12d..17533e0b438c73a098ab4eebf67fd1deb6e16b3c 100644 (file)
--- a/bin/confgen/.gitignore
+++ b/bin/confgen/.gitignore
@@ -1,2 +1,3 @@
 ddns-confgen
 rndc-confgen
+tsig-keygen

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

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..d6c6dce
--- /dev/null
+++ b/bin/pkcs11/.gitignore
@@ -0,0 +1,4 @@
+pkcs11-destroy
+pkcs11-keygen
+pkcs11-list
+pkcs11-tokens

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/pkcs11/.gitignore b/bin/tests/pkcs11/.gitignore
new file mode 100644 (file)
index 0000000..a259902
--- /dev/null
+++ b/bin/tests/pkcs11/.gitignore
@@ -0,0 +1,13 @@
+create
+find
+genrsa
+login
+privrsa
+pubrsa
+random
+session
+sha1
+sign
+verify
+pkcs11-hmacmd5
+pkcs11-md5sum

diff --git a/bin/tests/system/dsdigest/.gitignore b/bin/tests/system/dsdigest/.gitignore
deleted file mode 100644 (file)
index eee491d..0000000
--- a/bin/tests/system/dsdigest/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-prereq.sh

diff --git a/bin/tests/system/ecdsa/.gitignore b/bin/tests/system/ecdsa/.gitignore
deleted file mode 100644 (file)
index eee491d..0000000
--- a/bin/tests/system/ecdsa/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-prereq.sh

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

diff --git a/bin/tests/system/gost/.gitignore b/bin/tests/system/gost/.gitignore
deleted file mode 100644 (file)
index eee491d..0000000
--- a/bin/tests/system/gost/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-prereq.sh

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/bin/tests/system/ixfr/ns4/.gitignore b/bin/tests/system/ixfr/ns4/.gitignore
deleted file mode 100644 (file)
index 58e5c92..0000000
--- a/bin/tests/system/ixfr/ns4/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-named.conf

diff --git a/bin/tools/.gitignore b/bin/tools/.gitignore
index 3e2caffd69a23dd0af448172d5d0e7ad0f41919e..9843f0f913dc6f380978073756b8e3af020d4636 100644 (file)
--- a/bin/tools/.gitignore
+++ b/bin/tools/.gitignore
@@ -2,4 +2,5 @@ arpaname
 genrandom
 isc-hmac-fixup
 named-journalprint
+named-rrchecker
 nsec3hash

diff --git a/configure.in b/configure.in
index 046996b14228676cf6a2b932636fff1b57b0f0b9..fb95d117bb38d9340e12465872822f73ba02cd1b 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -4021,7 +4021,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-3.0a2/.gitignore b/contrib/nslint-3.0a2/.gitignore
new file mode 100644 (file)
index 0000000..356afe2
--- /dev/null
+++ b/contrib/nslint-3.0a2/.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-1.1.2/.gitignore b/contrib/zkt-1.1.2/.gitignore
new file mode 100644 (file)
index 0000000..4fac138
--- /dev/null
+++ b/contrib/zkt-1.1.2/.gitignore
@@ -0,0 +1,5 @@
+/zkt-conf
+/zkt-keyman
+/zkt-ls
+/zkt-signer
+/zkt-soaserial

diff --git a/contrib/zkt-1.1.2/Makefile.in b/contrib/zkt-1.1.2/Makefile.in
index 6daa47d168d8277b6dd8b420d3d4b119d2a31771..b2f8ee0a711059ad24ae4433a74a2529b4c351f5 100644 (file)
--- a/contrib/zkt-1.1.2/Makefile.in
+++ b/contrib/zkt-1.1.2/Makefile.in
@@ -94,10 +94,10 @@ $(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_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/irs/win32/include/irs/.gitignore b/lib/irs/win32/include/irs/.gitignore
new file mode 100644 (file)
index 0000000..a705f39
--- /dev/null
+++ b/lib/irs/win32/include/irs/.gitignore
@@ -0,0 +1,2 @@
+!netdb.h
+!platform.h

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