GitHub CI Workflow: Bump OS and compiler versions (#447)

* GitHub CI Workflow: Bump OS and compiler versions

* CI: fix for clang 18/19

  - Don't enable -Werror during the execution of ./configure and
    drop -Wunused-value from --enable-warnings
  - librb/src/crypt.c: remove old-style function decls
  - rb_dictionary: define type of arguments, fix callees
  - rb_radixtree: fix spurious out-of-bounds diagnostic

Co-authored-by: Doug Freed <[email protected]>

Author: aaronmdjones

.github/workflows/ci.yml

@@ -2,9 +2,10 @@ name: CI
 
 on:
   push:
-    branches: 
+    branches:
       - main
     paths-ignore:
+      - '.github/workflows/docs.yaml'
       - 'doc/oper-guide/**'
       - 'CREDITS'
       - 'LICENSE'
@@ -14,6 +15,7 @@ on:
     branches:
       - main
     paths-ignore:
+      - '.github/workflows/docs.yaml'
       - 'doc/oper-guide/**'
       - 'CREDITS'
       - 'LICENSE'
@@ -23,39 +25,40 @@ on:
 jobs:
   linux:
     name: Linux
-
     runs-on: ${{ matrix.os }}
-
     strategy:
       fail-fast: false
       matrix:
         include:
-          # Debian 10 Buster
-          - os: ubuntu-20.04
-            compiler: gcc-8
-          - os: ubuntu-20.04
-            compiler: clang-7
-          # Ubuntu 20.04 Focal
-          - os: ubuntu-20.04
-            compiler: gcc-9
-          - os: ubuntu-20.04
-            compiler: clang-10
           # Debian 11 Bullseye
           - os: ubuntu-22.04
             compiler: gcc-10
           - os: ubuntu-22.04
             compiler: clang-11
+          # Debian 12 Bookworm
+          - os: ubuntu-24.04
+            compiler: gcc-12
+          - os: ubuntu-24.04
+            compiler: clang-14
+          # Debian 13 Trixie
+          - os: ubuntu-24.04
+            compiler: gcc-14
+          - os: ubuntu-24.04
+            compiler: clang-19
           # Ubuntu 22.04 Jammy
           - os: ubuntu-22.04
             compiler: gcc-11
           - os: ubuntu-22.04
             compiler: clang-14
-          # next
-          - os: ubuntu-22.04
-            compiler: gcc-12
+          # Ubuntu 24.04 Noble
+          - os: ubuntu-24.04
+            compiler: gcc-13
+          - os: ubuntu-24.04
+            compiler: clang-18
 
     env:
       CC: ${{ matrix.compiler }}
+      RUNNING_IN_CI: yes
 
     steps:
     - name: Install dependencies
@@ -66,14 +69,18 @@ jobs:
           automake \
           autoconf \
           libtool \
+          libltdl-dev \
           libsqlite3-dev \
           libhyperscan-dev \
           # EOF
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@main
+      with:
+        persist-credentials: false
+        submodules: recursive
     - name: autogen.sh
       run: bash autogen.sh
     - name: configure
-      run: CFLAGS="-Werror -Wno-unused-value -Wno-unused-parameter" ./configure --enable-assert=hard --enable-warnings
+      run: ./configure --enable-assert=hard --enable-warnings
     - name: make
       run: make -j2
     - name: make check

configure.ac

@@ -588,7 +588,7 @@ SOLANUM_C_GCC_TRY_FLAGS([-Wmissing-noreturn], solanum_cv_c_gcc_w_missing_noretur
 SOLANUM_C_GCC_TRY_FLAGS([-Wundef], solanum_cv_c_gcc_w_undef)
 SOLANUM_C_GCC_TRY_FLAGS([-Wpacked], solanum_cv_c_gcc_w_packed)
 SOLANUM_C_GCC_TRY_FLAGS([-Wnested-externs], solanum_cv_c_gcc_w_nested_externs)
-SOLANUM_C_GCC_TRY_FLAGS([-Wunused-function -Wunused-label -Wunused-value -Wunused-variable], solanum_cv_c_gcc_w_unused)
+SOLANUM_C_GCC_TRY_FLAGS([-Wunused-function -Wunused-label -Wunused-variable], solanum_cv_c_gcc_w_unused)
 SOLANUM_C_GCC_TRY_FLAGS([-Wredundant-decls], solanum_cv_c_gcc_w_redundant_decls)
 SOLANUM_C_GCC_TRY_FLAGS([-Wfloat-equal], solanum_cv_c_gcc_w_float_equal)
 SOLANUM_C_GCC_TRY_FLAGS([-Wformat -Wformat-y2k -Wno-format-security], solanum_cv_c_gcc_w_format)
@@ -619,6 +619,11 @@ else
 	AC_DEFINE_UNQUOTED(IRCD_PREFIX, "$prefix", [Prefix where the ircd is installed.])
 fi
 
+if test "x${RUNNING_IN_CI}" = "xyes"; then
+	IRC_CFLAGS="${IRC_CFLAGS} -Werror -Wno-unused-value -Wno-unused-parameter"
+	AC_SUBST(IRC_CFLAGS)
+fi
+
 AC_CONFIG_FILES(			\
 	Makefile			\
 	authd/Makefile			\

include/match.h

@@ -73,11 +73,11 @@ bool matches_mask(const struct matchset *m, const char *mask);
 /*
  * irccmp - case insensitive comparison of s1 and s2
  */
-extern int irccmp(const char *s1, const char *s2);
+extern int irccmp(const void *s1, const void *s2);
 /*
  * ircncmp - counted case insensitive comparison of s1 and s2
  */
-extern int ircncmp(const char *s1, const char *s2, int n);
+extern int ircncmp(const void *s1, const void *s2, int n);
 /*
 ** canonize - reduce a string of duplicate list entries to contain
 ** only the unique items.

ircd/match.c

@@ -583,7 +583,7 @@ char *collapse_esc(char *pattern)
  *              <0, if s1 lexicographically less than s2
  *              >0, if s1 lexicographically greater than s2
  */
-int irccmp(const char *s1, const char *s2)
+int irccmp(const void *s1, const void *s2)
 {
 	const unsigned char *str1 = (const unsigned char *)s1;
 	const unsigned char *str2 = (const unsigned char *)s2;
@@ -602,7 +602,7 @@ int irccmp(const char *s1, const char *s2)
 	return (res);
 }
 
-int ircncmp(const char *s1, const char *s2, int n)
+int ircncmp(const void *s1, const void *s2, int n)
 {
 	const unsigned char *str1 = (const unsigned char *)s1;
 	const unsigned char *str2 = (const unsigned char *)s2;

librb/include/rb_dictionary.h

@@ -33,7 +33,7 @@ typedef struct rb_dictionary_iter rb_dictionary_iter;
 
 struct rb_dictionary;
 
-typedef int (*DCF)(/* const void *a, const void *b */);
+typedef int (*DCF)(const void *a, const void *b);
 
 struct rb_dictionary_element
 {

librb/include/rb_tools.h

@@ -30,8 +30,8 @@
 #ifndef __TOOLS_H__
 #define __TOOLS_H__
 
-int rb_strcasecmp(const char *s1, const char *s2);
-int rb_strncasecmp(const char *s1, const char *s2, size_t n);
+int rb_strcasecmp(const void *s1, const void *s2);
+int rb_strncasecmp(const void *s1, const void *s2, size_t n);
 char *rb_strcasestr(const char *s, const char *find);
 size_t rb_strlcpy(char *dst, const char *src, size_t siz);
 size_t rb_strlcat(char *dst, const char *src, size_t siz);

librb/src/crypt.c

@@ -846,8 +846,7 @@ static unsigned char PADDING[64] = {
 /* MD5 initialization. Begins an MD5 operation, writing a new context. */
 
 static void
-MD5Init (context)
-	MD5_CTX *context;
+MD5Init (MD5_CTX *context)
 {
 
 	context->count[0] = context->count[1] = 0;
@@ -866,10 +865,7 @@ MD5Init (context)
  */
 
 static void
-MD5Update (context, in, inputLen)
-	MD5_CTX *context;
-	const void *in;
-	unsigned int inputLen;
+MD5Update (MD5_CTX *context, const void *in, unsigned int inputLen)
 {
 	unsigned int i, idx, partLen;
 	const unsigned char *input = in;
@@ -909,8 +905,7 @@ MD5Update (context, in, inputLen)
  */
 
 static void
-MD5Pad (context)
-	MD5_CTX *context;
+MD5Pad (MD5_CTX *context)
 {
 	unsigned char bits[8];
 	unsigned int idx, padLen;
@@ -933,9 +928,7 @@ MD5Pad (context)
  */
 
 static void
-MD5Final (digest, context)
-	unsigned char digest[16];
-	MD5_CTX *context;
+MD5Final (unsigned char digest[16], MD5_CTX *context)
 {
 	/* Do padding. */
 	MD5Pad (context);
@@ -950,9 +943,7 @@ MD5Final (digest, context)
 /* MD5 basic transformation. Transforms state based on block. */
 
 static void
-MD5Transform (state, block)
-	uint32_t state[4];
-	const unsigned char block[64];
+MD5Transform (uint32_t state[4], const unsigned char block[64])
 {
 	uint32_t a = state[0], b = state[1], c = state[2], d = state[3], x[16];
 

librb/src/radixtree.c

@@ -673,8 +673,7 @@ rb_radixtree_elem_add(rb_radixtree *dict, const char *key, void *data)
 	char *ckey;
 
 	rb_radixtree_elem *delem, *prev, *newnode;
-
-	rb_radixtree_elem **place1;
+	rb_radixtree_leaf *leaf;
 
 	int val, keylen;
 	int i, j;
@@ -723,16 +722,16 @@ rb_radixtree_elem_add(rb_radixtree *dict, const char *key, void *data)
 	{
 		lrb_assert(prev == NULL);
 		lrb_assert(dict->count == 0);
-		place1 = &dict->root;
-		*place1 = rb_malloc(sizeof(rb_radixtree_leaf));
-		lrb_assert(*place1 != NULL);
-		(*place1)->nibnum = -1;
-		(*place1)->leaf.data = data;
-		(*place1)->leaf.key = ckey;
-		(*place1)->leaf.parent = prev;
-		(*place1)->leaf.parent_val = val;
+		leaf = rb_malloc(sizeof(rb_radixtree_leaf));
+		lrb_assert(leaf != NULL);
+		leaf->nibnum = -1;
+		leaf->data = data;
+		leaf->key = ckey;
+		leaf->parent = prev;
+		leaf->parent_val = val;
+		dict->root = (rb_radixtree_elem *) leaf;
 		dict->count++;
-		return &(*place1)->leaf;
+		return leaf;
 	}
 
 	/* Find the first nibble where they differ. */
@@ -802,17 +801,17 @@ rb_radixtree_elem_add(rb_radixtree *dict, const char *key, void *data)
 	}
 
 	val = NIBBLE_VAL(ckey, i);
-	place1 = &newnode->node.down[val];
-	lrb_assert(*place1 == NULL);
-	*place1 = rb_malloc(sizeof(rb_radixtree_leaf));
-	lrb_assert(*place1 != NULL);
-	(*place1)->nibnum = -1;
-	(*place1)->leaf.data = data;
-	(*place1)->leaf.key = ckey;
-	(*place1)->leaf.parent = newnode;
-	(*place1)->leaf.parent_val = val;
+	lrb_assert(newnode->node.down[val] == NULL);
+	leaf = rb_malloc(sizeof(rb_radixtree_leaf));
+	lrb_assert(leaf != NULL);
+	leaf->nibnum = -1;
+	leaf->data = data;
+	leaf->key = ckey;
+	leaf->parent = newnode;
+	leaf->parent_val = val;
+	newnode->node.down[val] = (rb_radixtree_elem *) leaf;
 	dict->count++;
-	return &(*place1)->leaf;
+	return leaf;
 }
 
 int

librb/src/tools.c

@@ -134,13 +134,13 @@ rb_string_to_array(char *string, char **parv, int maxpara)
 }
 
 int
-rb_strcasecmp(const char *s1, const char *s2)
+rb_strcasecmp(const void *s1, const void *s2)
 {
 	return strcasecmp(s1, s2);
 }
 
 int
-rb_strncasecmp(const char *s1, const char *s2, size_t n)
+rb_strncasecmp(const void *s1, const void *s2, size_t n)
 {
 	return strncasecmp(s1, s2, n);
 }

tests/rb_dictionary1.c

@@ -33,7 +33,7 @@
 
 static void replace1(void)
 {
-	rb_dictionary *dict = rb_dictionary_create("replace1", strcmp);
+	rb_dictionary *dict = rb_dictionary_create("replace1", rb_strcasecmp);
 	rb_dictionary_element *original = rb_dictionary_add(dict, "test", "data1");
 
 	ok(original != NULL, MSG);