mod_uuid: Move uuid.c out of core into separate module.

Move uuid out of the core and into a separate module. This library was
only used for one function in the core, which was only used by one
caller in net_nntp. Support for this library is not universal (e.g.
lacking on BSD), so moving this out of the core allows the core to
build successfully on more platforms.

Author: InterLinked1

.github/workflows/main.yml

@@ -252,7 +252,6 @@ jobs:
       - name: Run basic tests
         run: |
           tests/test -ttest_menus -ddddddddd -DDDDDDDDDD -x
-# Binary fails to link due to uuid library missing in CI, but it will make all specified targets, so enumerate those
   freebsd-14:
     runs-on: ubuntu-24.04
     name: FreeBSD
@@ -266,7 +265,7 @@ jobs:
             ./scripts/install_prereq.sh
             gmake modcheck
             gmake modconfig
-            gmake main
+            gmake bbs
             gmake doors
             gmake io
             gmake modules

bbs/Makefile

@@ -11,7 +11,7 @@ INC = -I..
 LIBS	= -lrt -lm -ldl
 
 # -lcrypto needed for SHA1_Init in hash.c
-LIBS += -lcrypt -lcrypto -luuid -rdynamic
+LIBS += -lcrypt -lcrypto -rdynamic
 
 # -lbfd and friends
 # On SUSE, the remaining libraries are needed to link successfully

bbs/utils.c

@@ -34,7 +34,6 @@
 #include <limits.h> /* use PATH_MAX */
 
 #ifdef __linux__
-#include <uuid/uuid.h> /* use uuid_generate, uuid_unparse */
 #include <syscall.h>
 #endif
 
@@ -44,25 +43,6 @@
 #include "include/base64.h"
 #include "include/system.h"
 
-char *bbs_uuid(void)
-{
-#ifdef UUID_STR_LEN
-	char *uuid;
-	uuid_t binary_uuid;
-
-	uuid_generate_random(binary_uuid);
-	uuid = malloc(UUID_STR_LEN + 1);
-	if (ALLOC_FAILURE(uuid)) {
-		return NULL;
-	}
-	uuid_unparse_lower(binary_uuid, uuid);
-	return uuid;
-#else
-	bbs_error("uuid not supported on this platform\n");
-	return NULL;
-#endif
-}
-
 void dyn_str_reset(struct dyn_str *dynstr)
 {
 	free_if(dynstr->buf);

configs/modules.conf

@@ -44,6 +44,7 @@ load = mod_node_callbacks.so
 load = mod_history.so ; A dependency of mod_sysop, for keeping track of command history.
 load = mod_sysop.so ; You probably don't want to forget this one if autoload=no. require will force the module to load or abort startup on failure.
 load = mod_curl.so ; cURL support
+load = mod_uuid.so ; UUID support
 load = mod_version.so
 load = mod_ip_blocker.so
 

include/mod_uuid.h

@@ -0,0 +1,21 @@
+/*
+ * LBBS -- The Lightweight Bulletin Board System
+ *
+ * Copyright (C) 2025, Naveen Albert
+ *
+ * Naveen Albert <bbs@phreaknet.org>
+ *
+ */
+
+/*! \file
+ *
+ * \brief UUID support
+ *
+ * \author Naveen Albert <bbs@phreaknet.org>
+ */
+
+/*!
+ * \brief Generate a UUID (universally unique identifier), all lowercase
+ * \return UUID on success, NULL on failure
+ */
+char *bbs_uuid(void);

include/utils.h

@@ -33,12 +33,6 @@ struct sockaddr_in;
 struct bbs_user;
 struct dirent;
 
-/*!
- * \brief Generate a UUID (universally unique identifier), all lowercase
- * \return UUID on success, NULL on failure
- */
-char *bbs_uuid(void);
-
 /*! \note This really should be opaque, but it's declared here so that callers can stack allocate it */
 struct dyn_str {
 	char *buf;

modules/Makefile

@@ -137,6 +137,10 @@ mod_systemd.so : mod_systemd.o
 	@echo "  [LD] $^ -> $@"
 	$(CC) -shared -fPIC -o $(basename $^).so $^ -lsystemd
 
+mod_uuid.so : mod_uuid.o
+	@echo "  [LD] $^ -> $@"
+	$(CC) -shared -fPIC -o $(basename $^).so $^ -luuid
+
 mod_webmail.so : mod_webmail.o
 	@echo "  [LD] $^ -> $@"
 	$(CC) -shared -fPIC -o $(basename $^).so $^ $(MOD_WEBMAIL_LIBS) -L/usr/local/lib -Wl,-rpath=/usr/local/lib/ -letpan

modules/mod_uuid.c

@@ -0,0 +1,59 @@
+/*
+ * LBBS -- The Lightweight Bulletin Board System
+ *
+ * Copyright (C) 2025, Naveen Albert
+ *
+ * Naveen Albert <bbs@phreaknet.org>
+ *
+ * This program is free software, distributed under the terms of
+ * the GNU General Public License Version 2. See the LICENSE file
+ * at the top of the source tree.
+ */
+
+/*! \file
+ *
+ * \brief UUID support
+ *
+ * \author Naveen Albert <bbs@phreaknet.org>
+ */
+
+#include "include/bbs.h"
+
+#ifdef __linux__
+#include <uuid/uuid.h> /* use uuid_generate, uuid_unparse */
+#endif
+
+#include "include/module.h"
+
+#include "include/mod_uuid.h"
+
+char *bbs_uuid(void)
+{
+#ifdef UUID_STR_LEN
+	char *uuid;
+	uuid_t binary_uuid;
+
+	uuid_generate_random(binary_uuid);
+	uuid = malloc(UUID_STR_LEN + 1);
+	if (ALLOC_FAILURE(uuid)) {
+		return NULL;
+	}
+	uuid_unparse_lower(binary_uuid, uuid);
+	return uuid;
+#else
+	bbs_error("uuid not supported on this platform\n");
+	return NULL;
+#endif
+}
+
+static int unload_module(void)
+{
+	return 0;
+}
+
+static int load_module(void)
+{
+	return 0;
+}
+
+BBS_MODULE_INFO_FLAGS("UUID Support", MODFLAG_GLOBAL_SYMBOLS);

nets/net_nntp.c

@@ -39,6 +39,7 @@
 #include "include/user.h"
 
 #include "include/mod_mail.h"
+#include "include/mod_uuid.h"
 
 /* NNTP ports */
 /* Reading server */
@@ -1398,4 +1399,4 @@ static int unload_module(void)
 	return 0;
 }
 
-BBS_MODULE_INFO_STANDARD("RFC3977 NNTP/NNSP");
+BBS_MODULE_INFO_DEPENDENT("RFC3977 NNTP/NNSP", "mod_uuid.so");

scripts/install_prereq.sh

@@ -46,13 +46,6 @@ PACKAGES_SUSE="$PACKAGES_SUSE libcap-devel"
 PACKAGES_ARCH="$PACKAGES_ARCH libcap"
 PACKAGES_ALPINE="$PACKAGES_ALPINE libcap-dev"
 
-# <uuid/uuid.h>
-PACKAGES_DEBIAN="$PACKAGES_DEBIAN libuuid1 uuid-dev"
-PACKAGES_FEDORA="$PACKAGES_FEDORA libuuid-devel"
-PACKAGES_SUSE="$PACKAGES_SUSE libuuid-devel"
-PACKAGES_ARCH="$PACKAGES_ARCH util-linux-libs"
-PACKAGES_ALPINE="$PACKAGES_ALPINE util-linux-dev"
-
 # sz, rz programs for ZMODEM transfers
 PACKAGES_DEBIAN="$PACKAGES_DEBIAN lrzsz"
 PACKAGES_FEDORA="$PACKAGES_FEDORA lrzsz"
@@ -88,6 +81,13 @@ PACKAGES_ARCH="$PACKAGES_ARCH systemd-libs"
 # Alpine Linux doesn't use systemd, so no need for that here!
 # No systemd on FreeBSD, or other Unices
 
+# <uuid/uuid.h> (mod_uuid)
+PACKAGES_DEBIAN="$PACKAGES_DEBIAN libuuid1 uuid-dev"
+PACKAGES_FEDORA="$PACKAGES_FEDORA libuuid-devel"
+PACKAGES_SUSE="$PACKAGES_SUSE libuuid-devel"
+PACKAGES_ARCH="$PACKAGES_ARCH util-linux-libs"
+PACKAGES_ALPINE="$PACKAGES_ALPINE util-linux-dev"
+
 # libssh (net_ssh)
 PACKAGES_DEBIAN="$PACKAGES_DEBIAN libssh-dev"
 # net_ssh, which requires objdump to test for symbol existence... thanks a lot, libssh