Merge pull request #5282 from vpodzime/master-with_pcre

Fixes for libntech without GPL code
cfengine · Aug 4, 2023 · 366eee3 · 366eee3
2 parents 3e8512b + 76f1f02
commit 366eee3
Show file tree

Hide file tree

Showing 41 changed files with 2,434 additions and 56 deletions.
diff --git a/.gitignore b/.gitignore
@@ -46,6 +46,7 @@ stamp-h1
 /contrib/vagrant-ci/centos-7-x64/Makefile
 /examples/Makefile
 /ext/Makefile
+/libcfecompat/Makefile
 /libcfnet/Makefile
 /libenv/Makefile
 /libpromises/Makefile

diff --git a/Makefile.am b/Makefile.am
@@ -29,6 +29,7 @@ LCOV_FLAGS = $(if $(filter-out 0,$(V)),,-q)
 
 SUBDIRS = \
 	libntech \
+	libcfecompat \
 	libcfnet \
 	libenv \
 	cf-check \

diff --git a/cf-agent/Makefile.am b/cf-agent/Makefile.am
@@ -24,6 +24,7 @@
 noinst_LTLIBRARIES = libcf-agent.la
 
 AM_CPPFLAGS = -I$(srcdir)/../libpromises -I$(srcdir)/../libntech/libutils \
+	-I$(srcdir)/../libcfecompat \
 	-I$(srcdir)/../libcfnet \
 	-I$(srcdir)/../cf-check \
 	@CPPFLAGS@ \

diff --git a/cf-agent/cf-agent.c b/cf-agent/cf-agent.c
@@ -24,6 +24,7 @@
 
 
 #include <platform.h>
+#include <getopt.h>
 #include <generic_agent.h>
 
 #include <actuator.h>

diff --git a/cf-check/Makefile.am b/cf-check/Makefile.am
@@ -25,6 +25,7 @@ noinst_LTLIBRARIES = libcf-check.la
 
 AM_CPPFLAGS = -I$(srcdir)/../libntech/libutils \
 	-I$(srcdir)/../libntech/libcompat \
+	-I$(srcdir)/../libcfecompat \
 	@CPPFLAGS@ \
 	$(PCRE_CPPFLAGS) \
 	$(LIBYAML_CPPFLAGS) \
@@ -45,6 +46,7 @@ AM_LDFLAGS = \
 	$(LMDB_LDFLAGS)
 
 libcf_check_la_LIBADD = ../libntech/libutils/libutils.la \
+	../libcfecompat/libcfecompat.la \
 	$(LMDB_LIBS) \
 	$(PCRE_LIBS) \
 	$(LIBYAML_LIBS) \

diff --git a/cf-check/cf-check.c b/cf-check/cf-check.c
@@ -1,3 +1,5 @@
+#include <platform.h>
+#include <getopt.h>
 #include <lmdump.h>
 #include <dump.h>
 #include <diagnose.h>

diff --git a/cf-execd/Makefile.am b/cf-execd/Makefile.am
@@ -26,6 +26,7 @@ noinst_LTLIBRARIES = libcf-execd.la libcf-execd-test.la
 AM_CPPFLAGS = \
 	-I$(srcdir)/../libpromises \
 	-I$(srcdir)/../libntech/libutils \
+	-I$(srcdir)/../libcfecompat \
 	-I$(srcdir)/../libcfnet \
 	-I$(srcdir)/../libenv \
 	-I$(srcdir)/../cf-check \

diff --git a/cf-execd/cf-execd.c b/cf-execd/cf-execd.c
@@ -22,6 +22,9 @@
   included file COSL.txt.
 */
 
+#include <platform.h>
+#include <getopt.h>
+
 #include <cf-execd.h>
 
 #ifndef __MINGW32__

diff --git a/cf-key/Makefile.am b/cf-key/Makefile.am
@@ -25,6 +25,7 @@ noinst_LTLIBRARIES = libcf-key.la
 
 AM_CPPFLAGS = \
 	-I$(srcdir)/../libntech/libutils \
+	-I$(srcdir)/../libcfecompat \
 	-I$(srcdir)/../libcfnet \
 	-I$(srcdir)/../libpromises \
 	$(PCRE_CPPFLAGS) \

diff --git a/cf-key/cf-key.c b/cf-key/cf-key.c
@@ -22,6 +22,9 @@
   included file COSL.txt.
 */
 
+#include <platform.h>
+#include <getopt.h>
+
 #include <generic_agent.h>
 
 #include <dbm_api.h>

diff --git a/cf-monitord/Makefile.am b/cf-monitord/Makefile.am
@@ -25,6 +25,7 @@ noinst_LTLIBRARIES = libcf-monitord.la
 
 AM_CPPFLAGS = \
 	-I$(srcdir)/../libntech/libutils \
+	-I$(srcdir)/../libcfecompat \
 	-I$(srcdir)/../libcfnet \
 	-I$(srcdir)/../libenv \
 	-I$(srcdir)/../libpromises \

diff --git a/cf-monitord/cf-monitord.c b/cf-monitord/cf-monitord.c
@@ -22,6 +22,9 @@
   included file COSL.txt.
 */
 
+#include <platform.h>
+#include <getopt.h>
+
 #include <generic_agent.h>
 #include <mon.h>
 

diff --git a/cf-monitord/mon_load.c b/cf-monitord/mon_load.c
@@ -32,6 +32,8 @@
 # define LOADAVG_5MIN    1
 #endif
 
+#include <cfecompat.h>
+
 /* Implementation */
 
 #ifdef HAVE_GETLOADAVG

diff --git a/cf-net/Makefile.am b/cf-net/Makefile.am
@@ -24,6 +24,7 @@
 noinst_LTLIBRARIES = libcf-net.la
 
 AM_CPPFLAGS = -I$(srcdir)/../libpromises -I$(srcdir)/../libntech/libutils \
+	-I$(srcdir)/../libcfecompat \
 	-I$(srcdir)/../libcfnet \
 	$(OPENSSL_CPPFLAGS) \
 	$(PCRE_CPPFLAGS) \

diff --git a/cf-net/cf-net.c b/cf-net/cf-net.c
@@ -26,6 +26,7 @@
 #define CF_NET_VERSION "0.1.2"
 
 #include <platform.h>
+#include <getopt.h>
 #include <libgen.h>
 #include <client_code.h>        // ServerConnection
 #include <logging.h>            // Log, LogSetGlobalLevel

diff --git a/cf-promises/Makefile.am b/cf-promises/Makefile.am
@@ -26,6 +26,7 @@ noinst_LTLIBRARIES = libcf-promises.la
 AM_CPPFLAGS = \
 	-I$(srcdir)/../libntech/libutils \
 	-I$(srcdir)/../libpromises \
+	-I$(srcdir)/../libcfecompat \
 	-I$(srcdir)/../libcfnet \
 	@CPPFLAGS@ \
 	$(OPENSSL_CPPFLAGS) \

diff --git a/cf-promises/cf-promises.c b/cf-promises/cf-promises.c
@@ -22,6 +22,9 @@
   included file COSL.txt.
 */
 
+#include <platform.h>
+#include <getopt.h>
+
 #include <generic_agent.h>
 
 #include <eval_context.h>

diff --git a/cf-runagent/Makefile.am b/cf-runagent/Makefile.am
@@ -25,6 +25,7 @@ noinst_LTLIBRARIES = libcf-runagent.la
 
 AM_CPPFLAGS = -I$(srcdir)/../libpromises -I$(srcdir)/../libntech/libutils \
 	-I$(srcdir)/../libcfnet \
+	-I$(srcdir)/../libcfecompat \
 	$(OPENSSL_CPPFLAGS) \
 	$(PCRE_CPPFLAGS) \
 	$(ENTERPRISE_CPPFLAGS)

diff --git a/cf-runagent/cf-runagent.c b/cf-runagent/cf-runagent.c
@@ -22,6 +22,9 @@
   included file COSL.txt.
 */
 
+#include <platform.h>
+#include <getopt.h>
+
 #include <generic_agent.h>
 
 #include <known_dirs.h>

diff --git a/cf-secret/Makefile.am b/cf-secret/Makefile.am
@@ -24,6 +24,7 @@
 noinst_LTLIBRARIES = libcf-secret.la
 
 AM_CPPFLAGS = -I$(srcdir)/../libpromises -I$(srcdir)/../libntech/libutils \
+	-I$(srcdir)/../libcfecompat \
 	-I$(srcdir)/../libcfnet \
 	$(OPENSSL_CPPFLAGS) \
 	$(PCRE_CPPFLAGS) \

diff --git a/cf-secret/cf-secret.c b/cf-secret/cf-secret.c
@@ -44,6 +44,7 @@
 */
 
 #include <platform.h>
+#include <getopt.h>
 #include <openssl/err.h>
 
 #include <lastseen.h>

diff --git a/cf-serverd/Makefile.am b/cf-serverd/Makefile.am
@@ -25,6 +25,7 @@ noinst_LTLIBRARIES = libcf-serverd.la
 
 AM_CPPFLAGS = -I$(srcdir)/../libpromises -I$(srcdir)/../libntech/libutils \
 	-I$(srcdir)/../libcfnet \
+	-I$(srcdir)/../libcfecompat \
 	-I$(srcdir)/../libenv \
 	$(OPENSSL_CPPFLAGS) \
 	$(PCRE_CPPFLAGS) \

diff --git a/cf-serverd/cf-serverd-functions.c b/cf-serverd/cf-serverd-functions.c
@@ -22,6 +22,9 @@
   included file COSL.txt.
 */
 
+#include <platform.h>
+#include <getopt.h>
+
 #include <cf-serverd-functions.h>
 #include <cf-serverd-enterprise-stubs.h>
 

diff --git a/cf-testd/Makefile.am b/cf-testd/Makefile.am
@@ -25,6 +25,7 @@ noinst_LTLIBRARIES = libcf-testd.la
 
 AM_CPPFLAGS = -I$(srcdir)/../libpromises -I$(srcdir)/../libntech/libutils \
 	-I$(srcdir)/../libcfnet \
+	-I$(srcdir)/../libcfecompat \
 	-I$(srcdir)/../libenv \
 	-I$(srcdir)/../cf-serverd \
 	$(OPENSSL_CPPFLAGS) \

diff --git a/cf-testd/cf-testd.c b/cf-testd/cf-testd.c
@@ -23,6 +23,7 @@
 */
 
 #include <platform.h>
+#include <getopt.h>
 
 #include <client_code.h>        // cfnet_init
 #include <crypto.h>             // CryptoInitialize
@@ -774,11 +775,16 @@ int main(int argc, char *argv[])
     for (int i = 0; i < n_threads; i++)
     {
         thread_configs[i] = (CFTestD_Config*) xcalloc(1, sizeof(CFTestD_Config));
+        char *thread_num_str;
+        xasprintf(&thread_num_str, "%d", i);
 
         if (config->report_file != NULL && strstr(config->report_file, "%d") != NULL)
         {
-            /* replace the '%d' with the thread number */
-            asprintf(&(thread_configs[i]->report_file), config->report_file, i);
+            /* replace the (first) '%d' with the thread number */
+            size_t report_file_len = strlen(config->report_file) + strlen(thread_num_str) - 2 + 1;
+            thread_configs[i]->report_file = xmalloc(report_file_len);
+            StringReplaceN(thread_configs[i]->report_file, report_file_len,
+                           "%d", thread_num_str, 1);
         }
         else
         {
@@ -787,8 +793,11 @@ int main(int argc, char *argv[])
 
         if (config->key_file != NULL && strstr(config->key_file, "%d") != NULL)
         {
-            /* replace the '%d' with the thread number */
-            asprintf(&(thread_configs[i]->key_file), config->key_file, i);
+            /* replace the (first) '%d' with the thread number */
+            size_t key_file_len = strlen(config->key_file) + strlen(thread_num_str) - 2 + 1;
+            thread_configs[i]->key_file = xmalloc(key_file_len);
+            StringReplaceN(thread_configs[i]->key_file, key_file_len,
+                           "%d", thread_num_str, 1);
         }
         else
         {
@@ -803,6 +812,7 @@ int main(int argc, char *argv[])
         {
             thread_configs[i]->address = IncrementIPaddress(thread_configs[i-1]->address);
         }
+        free(thread_num_str);
     }
 
     CFTestD_ConfigDestroy(config);