From 5c67d1d12021e87639f16d55a56782acc4b22327 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= <ondrej@sury.org>
Date: Wed, 20 Mar 2019 09:20:14 +0100
Subject: [PATCH 1/2] Update top level .gitignore to ignore automake files

---
 .gitignore | 43 +++++++++++++++++++++++++++++++++++--------
 1 file changed, 35 insertions(+), 8 deletions(-)

diff --git a/.gitignore b/.gitignore
index 73497b8934..bf0a55d86c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,12 +1,30 @@
-Makefile
-config.log
-config.h
-config.cache
-config.status
-libtool
+/aclocal.m4
+/compile
+/config.log
+/config.h
+/config.cache
+/config.status
+/config.sub
+/config.guess
+/configure
+/config.h.in
+/depcomp
+/install-sh
+/libltdl/*
+/libtool
+/ltmain.sh
+/missing
 /isc-config.sh
 /configure.lineno
-autom4te.cache/
+/autom4te.cache/
+/m4/libtool.m4
+/m4/ltoptions.m4
+/m4/ltsugar.m4
+/m4/ltversion.m4
+/m4/lt~obsolete.m4
+/m4/ltargz.m4
+/m4/ltdl.m4
+Makefile
 *.rej
 *.orig
 *.o
@@ -33,4 +51,13 @@ gen.dSYM/
 .project
 .cproject
 .settings
-kyua.log
\ No newline at end of file
+kyua.log
+/ar-lib
+/compile
+/depcomp
+/missing
+/bind.keys.h
+/configure
+/stamp-h1
+/py-compile
+/test-driver

From b9d524ed7e4e31fd926ccef70a3948d78074a82e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= <ondrej@sury.org>
Date: Wed, 20 Mar 2019 09:22:08 +0100
Subject: [PATCH 2/2] Sort the top level .gitignore file

---
 .gitignore | 83 +++++++++++++++++++++++++-----------------------------
 1 file changed, 39 insertions(+), 44 deletions(-)

diff --git a/.gitignore b/.gitignore
index bf0a55d86c..1f4d9e378f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,63 +1,58 @@
+*-symtbl.c
+*.a
+*.gcda
+*.gcno
+*.la
+*.lo
+*.o
+*.orig
+*.plist/ # ccc-analyzer store its results in .plist directories
+*.rej
+*.so
+*_test
+*~
+.ccache/
+.cproject
+.deps/
+.dirstamp
+.libs/
+.project
+.settings
 /aclocal.m4
+/ar-lib
+/autom4te.cache/
+/bind.keys.h
 /compile
-/config.log
-/config.h
 /config.cache
+/config.guess
+/config.h
+/config.h.in
+/config.log
 /config.status
 /config.sub
-/config.guess
 /configure
-/config.h.in
+/configure.lineno
 /depcomp
 /install-sh
+/isc-config.sh
 /libltdl/*
 /libtool
 /ltmain.sh
-/missing
-/isc-config.sh
-/configure.lineno
-/autom4te.cache/
 /m4/libtool.m4
+/m4/ltargz.m4
+/m4/ltdl.m4
 /m4/ltoptions.m4
 /m4/ltsugar.m4
 /m4/ltversion.m4
 /m4/lt~obsolete.m4
-/m4/ltargz.m4
-/m4/ltdl.m4
-Makefile
-*.rej
-*.orig
-*.o
-*.lo
-*.so
-*.a
-*.la
-*.gcno
-*.gcda
-*_test
-*-symtbl.c
-timestamp
-ans.run
-named.run
-named.memstats
-gen.dSYM/
-.ccache/
-.deps/
-.dirstamp
-.libs/
-# ccc-analyzer store its results in .plist directories
-*.plist/
-*~
-.project
-.cproject
-.settings
-kyua.log
-/ar-lib
-/compile
-/depcomp
 /missing
-/bind.keys.h
-/configure
-/stamp-h1
 /py-compile
+/stamp-h1
 /test-driver
+Makefile
+ans.run
+gen.dSYM/
+kyua.log
+named.memstats
+named.run
+timestamp