From fe76460ec8ded399141a2524b68b5a4dd3afc871 Mon Sep 17 00:00:00 2001
From: Craig Comstock <craig.comstock@northern.tech>
Date: Fri, 10 Oct 2025 11:41:30 -0400
Subject: [PATCH 1/2] Added Termux for sys.os_name_human when running in Termux
 Linux Environment (Android)

We already supported and included the termux class.
This change removes noise when running components like cf-agent.

Ticket: CFE-4427
Changelog: title
---
 libenv/sysinfo.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/libenv/sysinfo.c b/libenv/sysinfo.c
index cb37f464b8..ee429ef716 100644
--- a/libenv/sysinfo.c
+++ b/libenv/sysinfo.c
@@ -3815,6 +3815,12 @@ static void SysOSNameHuman(EvalContext *ctx)
                                       "Alpine", CF_DATA_TYPE_STRING,
                                       "source=agent,derived-from=alpine");
     }
+    else if (EvalContextClassGet(ctx, NULL, "termux") != NULL)
+    {
+        EvalContextVariablePutSpecial(ctx, SPECIAL_SCOPE_SYS, lval,
+                                      "Termux", CF_DATA_TYPE_STRING,
+                                      "source=agent,derived-from=termux");
+    }
     else if (EvalContextClassGet(ctx, NULL, "gentoo") != NULL)
     {
         EvalContextVariablePutSpecial(ctx, SPECIAL_SCOPE_SYS, lval,

From 8c5978522f17651de431a895a97933c8640e8905 Mon Sep 17 00:00:00 2001
From: Craig Comstock <craig.comstock@northern.tech>
Date: Thu, 9 Jul 2026 08:19:31 -0500
Subject: [PATCH 2/2] Reformatted
 ./tests/acceptance/31_tickets/CFE-2663/test.cf with cfengine format

Ticket: none
Changelog: none
---
 tests/acceptance/31_tickets/CFE-2663/test.cf | 53 ++++++++++----------
 1 file changed, 26 insertions(+), 27 deletions(-)

diff --git a/tests/acceptance/31_tickets/CFE-2663/test.cf b/tests/acceptance/31_tickets/CFE-2663/test.cf
index ffcf713441..27300ef480 100644
--- a/tests/acceptance/31_tickets/CFE-2663/test.cf
+++ b/tests/acceptance/31_tickets/CFE-2663/test.cf
@@ -12,70 +12,69 @@ bundle agent __main__
 bundle agent init
 {
   vars:
-      # No trailing newline in the strings, so the "[section2]" header is
-      # genuinely the last line of the "actual" file. The region selected for
-      # section2 is therefore empty and sits at the end of the file.
-      "actual" string => "[section]
+    # No trailing newline in the strings, so the "[section2]" header is
+    # genuinely the last line of the "actual" file. The region selected for
+    # section2 is therefore empty and sits at the end of the file.
+    "actual" string => "[section]
 keyone=valueone
 [section2]";
-
-      "expected" string => "[section]
+    "expected" string => "[section]
 keyone=valueone
 [section2]
 keytwo=valuetwo";
-
-      "files" slist => { "actual", "expected" };
+    "files" slist => { "actual", "expected" };
 
   files:
-      "$(G.testfile).$(files)"
-        create => "true",
-        edit_line => init_insert("$(init.$(files))"),
-        edit_defaults => init_empty;
+    "$(G.testfile).$(files)"
+      create => "true",
+      edit_line => init_insert("$(init.$(files))"),
+      edit_defaults => init_empty;
 }
 
 bundle edit_line init_insert(str)
 {
   insert_lines:
-      "$(str)";
+    "$(str)";
 }
 
 body edit_defaults init_empty
 {
-      empty_file_before_editing => "true";
+  empty_file_before_editing => "true";
 }
 
 bundle agent test
 {
   meta:
-      "description"
-        string => "Insertion into an empty trailing region (the select_start delimiter is the last line of the file) must succeed when select_end_match_eof is true",
-        meta => { "CFE-2663" };
+    "description"
+      string => "Insertion into an empty trailing region (the select_start delimiter is the last line of the file) must succeed when select_end_match_eof is true",
+      meta => { "CFE-2663" };
 
   files:
-      "$(G.testfile).actual"
-        edit_line => insert_into_trailing_section;
+    "$(G.testfile).actual" edit_line => insert_into_trailing_section;
 }
 
 bundle edit_line insert_into_trailing_section
 {
   insert_lines:
-      "keytwo=valuetwo"
-        select_region => ini_section("section2");
+    "keytwo=valuetwo" select_region => ini_section("section2");
 }
 
 body select_region ini_section(x)
 # @brief Restrict the edit to the lines in section [x], matching to EOF when
 # [x] is the final section in the file.
 {
-      select_start => "\[$(x)\]\s*";
-      select_end => "\[.*\]\s*";
-      select_end_match_eof => "true";
+  select_start => "\[$(x)\]\s*";
+  select_end => "\[.*\]\s*";
+  select_end_match_eof => "true";
 }
 
 bundle agent check
 {
   methods:
-      "any" usebundle => dcs_check_diff("$(G.testfile).actual",
-                                        "$(G.testfile).expected",
-                                        "$(this.promise_filename)");
+    "any"
+      usebundle => dcs_check_diff(
+        "$(G.testfile).actual",
+        "$(G.testfile).expected",
+        "$(this.promise_filename)"
+      );
 }