From 404e82616d950cbf45b16adb11ce3a52e285e16b Mon Sep 17 00:00:00 2001
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Date: Tue, 27 Aug 2024 14:54:07 +0200
Subject: [PATCH 1/3] configure.ac: properly evaluate ac_test_CFLAGS

Since autoconf 2.69 and
https://git.savannah.gnu.org/cgit/autoconf.git/commit/?id=76754e04fce5f6a7701bec57b057020585df2ae3
ac_test_CFLAGS is set to ${CFLAGS+y} instead of ${CFLAGS+set}.

Just test that ac_test_CFLAGS is not empty, to support both cases.

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
---
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 0ed4d2d7..3eeb446d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -120,7 +120,7 @@ AC_SEARCH_LIBS([clock_gettime], [rt posix4],
 AC_CANONICAL_HOST
 
 # Store this value because ac_test_CFLAGS is overwritten by AC_PROG_CC
-if test "$ac_test_CFLAGS" != set ; then
+if ! test "$ac_test_CFLAGS" ; then
   bird_cflags_default=yes
 fi
 

From 2ba6e797ccd365f5c930a18953a08d3c5e315ff9 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Thu, 29 Aug 2024 14:37:19 +0200
Subject: [PATCH 2/3] Fixed a stupid bug in parse-and-exit mode

Introduced in 08ff0af8986099e6fb1d8a94c7ce62c83e4df7f1, the additional CLI
configuration wasn't properly initialized in the parse-and-exit mode
due to an oversight that cli_init_unix() is not called in this mode.

Thanks to Felix Friedlander for the bugreport.
---
 sysdep/unix/main.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/sysdep/unix/main.c b/sysdep/unix/main.c
index 880cc3c4..b825a1f3 100644
--- a/sysdep/unix/main.c
+++ b/sysdep/unix/main.c
@@ -599,7 +599,6 @@ static void
 cli_init_unix(uid_t use_uid, gid_t use_gid)
 {
   ASSERT_DIE(main_control_socket_config == NULL);
-  cli_init();
 
   main_control_socket_config = &initial_control_socket_config;
   main_control_socket_config->uid = use_uid;
@@ -614,6 +613,9 @@ cli_init_unix(uid_t use_uid, gid_t use_gid)
 static void
 cli_preconfig(struct config *c)
 {
+  if (!main_control_socket_config)
+    return;
+
   struct cli_config *ccf = mb_alloc(cli_pool, sizeof *ccf);
   memcpy(ccf, main_control_socket_config, sizeof *ccf);
   ccf->n = (struct cli_config_node) {};
@@ -1011,6 +1013,8 @@ main(int argc, char **argv)
   uid_t use_uid = get_uid(use_user);
   gid_t use_gid = get_gid(use_group);
 
+  cli_init();
+
   if (!parse_and_exit)
   {
     test_old_bird(path_control_socket);

From 5daec239c4c62dd508a3cd8f7ca82d3666becbe6 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Mon, 8 Jul 2024 17:12:21 +0200
Subject: [PATCH 3/3] Renamed my past self in commit authorship and mentioned
 that in the contributing policy

---
 .mailmap        | 2 ++
 CONTRIBUTING.md | 5 ++++-
 2 files changed, 6 insertions(+), 1 deletion(-)
 create mode 100644 .mailmap

diff --git a/.mailmap b/.mailmap
new file mode 100644
index 00000000..01f7262a
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,2 @@
+Maria Matejka <mq@ucw.cz>
+Maria Matejka <mq@jmq.cz>
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index ecdc3d35..8651b145 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -90,7 +90,10 @@ The credits are scattered over all the source code files; in the commentary
 section, you may find typically the original authors of these files or some
 major contributors who felt like adding their names there. Overall, if you feel
 like your name should be there, include this change in your commits please.
-If your name should be changed, please do that change there.
+
+If your name should be changed, please do that change in the source code files.
+If your name should be changed in the displayed git commit author / commiter
+logs, please submit a patch on the `.mailmap` file.
 
 We are planning to centralize the credits one day; we'll then update this file
 accordingly.