From 6c1e04fc61eeb3526c9e91f1c36bf9bc44a478c3 Mon Sep 17 00:00:00 2001
From: Beniamino Galvani <bgalvani@redhat.com>
Date: Thu, 2 Oct 2025 16:29:35 +0200
Subject: [PATCH] helpers: move helper programs to the same directory

Create a new 'nm-helpers' directory for all the helper programs, to
avoid having too many subdirs in the src directory.
---
 src/meson.build                               |  3 +--
 src/nm-daemon-helper/README.md                | 11 ----------
 src/nm-daemon-helper/meson.build              | 15 --------------
 src/{nm-priv-helper => nm-helpers}/README.md  | 20 ++++++++++++++++++-
 .../meson.build                               | 20 +++++++++++++++++++
 .../nm-daemon-helper.c                        |  0
 .../nm-priv-helper.c                          |  0
 .../nm-priv-helper.conf                       |  0
 .../org.freedesktop.nm_priv_helper.service.in |  0
 9 files changed, 40 insertions(+), 29 deletions(-)
 delete mode 100644 src/nm-daemon-helper/README.md
 delete mode 100644 src/nm-daemon-helper/meson.build
 rename src/{nm-priv-helper => nm-helpers}/README.md (64%)
 rename src/{nm-priv-helper => nm-helpers}/meson.build (67%)
 rename src/{nm-daemon-helper => nm-helpers}/nm-daemon-helper.c (100%)
 rename src/{nm-priv-helper => nm-helpers}/nm-priv-helper.c (100%)
 rename src/{nm-priv-helper => nm-helpers}/nm-priv-helper.conf (100%)
 rename src/{nm-priv-helper => nm-helpers}/org.freedesktop.nm_priv_helper.service.in (100%)

diff --git a/src/meson.build b/src/meson.build
index a5b3441ba7..7c02080952 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -103,8 +103,7 @@ if enable_nmtui
 endif
 subdir('nmcli')
 subdir('nm-dispatcher')
-subdir('nm-priv-helper')
-subdir('nm-daemon-helper')
+subdir('nm-helpers')
 subdir('nm-online')
 if enable_nmtui
   subdir('nmtui')
diff --git a/src/nm-daemon-helper/README.md b/src/nm-daemon-helper/README.md
deleted file mode 100644
index 695f533553..0000000000
--- a/src/nm-daemon-helper/README.md
+++ /dev/null
@@ -1,11 +0,0 @@
-nm-daemon-helper
-================
-
-A internal helper application that is spawned by NetworkManager
-to perform certain actions.
-
-Currently all it does is doing a reverse DNS lookup, which
-cannot be done by NetworkManager because the operation requires
-to reconfigure the libc resolver (which is a process-wide operation).
-
-This is not directly useful to the user.
diff --git a/src/nm-daemon-helper/meson.build b/src/nm-daemon-helper/meson.build
deleted file mode 100644
index da0d6571e1..0000000000
--- a/src/nm-daemon-helper/meson.build
+++ /dev/null
@@ -1,15 +0,0 @@
-executable(
-  'nm-daemon-helper',
-  'nm-daemon-helper.c',
-  include_directories : [
-    src_inc,
-    top_inc,
-  ],
-  link_with: [
-    libnm_std_aux,
-  ],
-  link_args: ldflags_linker_script_binary,
-  link_depends: linker_script_binary,
-  install: true,
-  install_dir: nm_libexecdir,
-)
diff --git a/src/nm-priv-helper/README.md b/src/nm-helpers/README.md
similarity index 64%
rename from src/nm-priv-helper/README.md
rename to src/nm-helpers/README.md
index 576da7a70b..ccaa5bf5cd 100644
--- a/src/nm-priv-helper/README.md
+++ b/src/nm-helpers/README.md
@@ -1,5 +1,23 @@
+nm-helpers
+==========
+
+This directory contains stand-alone helper programs used by various
+components.
+
+nm-daemon-helper
+----------------
+
+A internal helper application that is spawned by NetworkManager
+to perform certain actions.
+
+Currently all it does is doing a reverse DNS lookup, which
+cannot be done by NetworkManager because the operation requires
+to reconfigure the libc resolver (which is a process-wide operation).
+
+This is not directly useful to the user.
+
 nm-priv-helper
-==============
+--------------
 
 This is a D-Bus activatable, exit-on-idle service, which
 provides an internal API to NetworkManager daemon.
diff --git a/src/nm-priv-helper/meson.build b/src/nm-helpers/meson.build
similarity index 67%
rename from src/nm-priv-helper/meson.build
rename to src/nm-helpers/meson.build
index 6141e0e207..5f330cbc94 100644
--- a/src/nm-priv-helper/meson.build
+++ b/src/nm-helpers/meson.build
@@ -1,5 +1,25 @@
 # SPDX-License-Identifier: LGPL-2.1-or-later
 
+# nm-daemon-helper
+
+executable(
+  'nm-daemon-helper',
+  'nm-daemon-helper.c',
+  include_directories : [
+    src_inc,
+    top_inc,
+  ],
+  link_with: [
+    libnm_std_aux,
+  ],
+  link_args: ldflags_linker_script_binary,
+  link_depends: linker_script_binary,
+  install: true,
+  install_dir: nm_libexecdir,
+)
+
+# nm-priv-helper
+
 configure_file(
   input: 'org.freedesktop.nm_priv_helper.service.in',
   output: '@BASENAME@',
diff --git a/src/nm-daemon-helper/nm-daemon-helper.c b/src/nm-helpers/nm-daemon-helper.c
similarity index 100%
rename from src/nm-daemon-helper/nm-daemon-helper.c
rename to src/nm-helpers/nm-daemon-helper.c
diff --git a/src/nm-priv-helper/nm-priv-helper.c b/src/nm-helpers/nm-priv-helper.c
similarity index 100%
rename from src/nm-priv-helper/nm-priv-helper.c
rename to src/nm-helpers/nm-priv-helper.c
diff --git a/src/nm-priv-helper/nm-priv-helper.conf b/src/nm-helpers/nm-priv-helper.conf
similarity index 100%
rename from src/nm-priv-helper/nm-priv-helper.conf
rename to src/nm-helpers/nm-priv-helper.conf
diff --git a/src/nm-priv-helper/org.freedesktop.nm_priv_helper.service.in b/src/nm-helpers/org.freedesktop.nm_priv_helper.service.in
similarity index 100%
rename from src/nm-priv-helper/org.freedesktop.nm_priv_helper.service.in
rename to src/nm-helpers/org.freedesktop.nm_priv_helper.service.in