Merge branch 'insp3' into master.

.github/workflows/ci-alpine.yml

@@ -0,0 +1,71 @@
+name: Alpine CI
+on:
+  pull_request:
+  push:
+  schedule:
+    - cron: '0 0 * * 0'
+jobs:
+  build:
+    if: "!contains(github.event.head_commit.message, '[skip alpine ci]')"
+    container: alpine:3.15
+    runs-on: ubuntu-latest
+    env:
+      CXX: ${{ matrix.compiler }}
+      INSPIRCD_DEBUG: 3
+      INSPIRCD_VERBOSE: 1
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Install dependencies
+        run: |
+          apk update
+          apk add \
+            argon2-dev \
+            clang \
+            g++ \
+            git \
+            gnutls-dev \
+            libmaxminddb-dev \
+            libpq-dev \
+            make \
+            mariadb-dev \
+            mbedtls-dev \
+            openldap-dev \
+            openssl-dev \
+            pcre2-dev \
+            perl \
+            pkgconf \
+            re2-dev \
+            sqlite-dev
+
+      - name: Run configure
+        run: |
+          ./configure --enable-extras "argon2 geo_maxmind ldap mysql pgsql regex_pcre regex_posix regex_re2 sqlite3 ssl_gnutls ssl_mbedtls ssl_openssl sslrehashsignal"
+          ./configure --development --disable-auto-extras --disable-ownership --socketengine ${{ matrix.socketengine }}
+
+      - name: Build core
+        run: |
+          INSPIRCD_TARGET=inspircd make --jobs $(($(sysctl -n hw.activecpu) + 1))
+
+      - name: Build modules
+        run: |
+          INSPIRCD_TARGET=modules make --jobs $(($(sysctl -n hw.activecpu) + 1))
+
+      - name: Install
+        run: |
+          make install
+
+      - name: Run
+        run: |
+          touch ./run/conf/inspircd.conf
+          ./run/inspircd start --runasroot
+    strategy:
+      fail-fast: false
+      matrix:
+        compiler:
+          - clang++
+          - g++
+        socketengine:
+          - epoll
+          - poll
+          - select

.github/workflows/ci-linux.yml

@@ -1,4 +1,4 @@
-name: Linux CI
+name: Ubuntu CI
 on:
   pull_request:
   push:
@@ -6,6 +6,7 @@ on:
     - cron: '0 0 * * 0'
 jobs:
   build:
+    if: "!contains(github.event.head_commit.message, '[skip ubuntu ci]')"
     runs-on: ubuntu-20.04
     env:
       CXX: ${{ matrix.compiler }}
@@ -22,8 +23,6 @@ jobs:
             g++ \
             git \
             libargon2-dev \
-            libc++-dev \
-            libc++abi-dev \
             libgnutls28-dev \
             libldap2-dev \
             libmaxminddb-dev \
@@ -37,11 +36,6 @@ jobs:
             make \
             pkg-config
 
-      - name: Work around a bug in GitHub Actions
-        if: matrix.compiler == 'clang++'
-        run: |
-          sudo apt-get remove gcc-11 libgcc-11-dev
-
       - name: Run configure
         run: |
           ./configure --enable-extras "argon2 geo_maxmind ldap mysql pgsql regex_pcre regex_posix regex_re2 sqlite3 ssl_gnutls ssl_mbedtls ssl_openssl sslrehashsignal"

.github/workflows/ci-macos.yml

@@ -6,13 +6,12 @@ on:
     - cron: '0 0 * * 0'
 jobs:
   build:
+    if: "!contains(github.event.head_commit.message, '[skip macos ci]')"
     runs-on: macos-latest
     env:
-      CXXFLAGS: -I/usr/local/opt/openssl@1.1/include -Wno-error=deprecated-declarations
+      CXXFLAGS: -Wno-error=deprecated-declarations
       INSPIRCD_DEBUG: 3
       INSPIRCD_VERBOSE: 1
-      LDFLAGS: -L/usr/local/opt/openssl@1.1/lib
-      PKG_CONFIG_PATH: /usr/local/opt/openssl@1.1/lib/pkgconfig:/usr/local/opt/sqlite/lib/pkgconfig
     steps:
       - uses: actions/checkout@v2
 
@@ -22,9 +21,19 @@ jobs:
           for PACKAGE in pkg-config argon2 gnutls libmaxminddb libpq mbedtls mysql-client openssl@1.1 pcre2 re2 sqlite;
           do
             brew install $PACKAGE || brew upgrade $PACKAGE
+
+            BREW_PREFIX=$(brew --prefix $PACKAGE)
+            if [ -d "$BREW_PREFIX/bin" ]
+            then
+              export PATH="$PATH:$BREW_PREFIX/bin"
+            fi
+            if [ -d "$BREW_PREFIX/lib/pkgconfig" ]
+            then
+              export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$BREW_PREFIX/lib/pkgconfig"
+            fi
           done
-          brew link --force --overwrite libpq
-          brew link --force --overwrite mysql-client
+          echo "PATH=$PATH" >> $GITHUB_ENV
+          echo "PKG_CONFIG_PATH=$PKG_CONFIG_PATH" >> $GITHUB_ENV
 
       - name: Run configure
         run: |

.github/workflows/ci-windows.yml

@@ -6,6 +6,7 @@ on:
     - cron: '0 0 * * 0'
 jobs:
   build:
+    if: "!contains(github.event.head_commit.message, '[skip windows ci]')"
     runs-on: windows-latest
     steps:
       - uses: actions/checkout@v2

src/modules/m_spanningtree/commands.h

@@ -365,7 +365,7 @@ class DllExport CommandSave final
  public:
 	/** Timestamp of the uuid nick of all users who collided and got their nick changed to uuid
 	 */
-	static const time_t SavedTimestamp = 100;
+	static const time_t SavedTimestamp;
 
 	CommandSave(Module* Creator) : ServerCommand(Creator, "SAVE", 2) { }
 	CmdResult Handle(User* user, Params& parameters) override;

src/modules/m_spanningtree/save.cpp

@@ -27,6 +27,8 @@
 #include "treesocket.h"
 #include "commands.h"
 
+const time_t CommandSave::SavedTimestamp = 100;
+
 /**
  * SAVE command - force nick change to UID on timestamp match
  */

src/socketengines/poll.cpp

@@ -25,7 +25,7 @@
 
 #include "inspircd.h"
 
-#include <sys/poll.h>
+#include <poll.h>
 #include <sys/resource.h>
 
 /** A specialisation of the SocketEngine class, designed to use poll().

tools/test-build

@@ -49,6 +49,7 @@ for my $compiler (@compilers) {
 	for my $socketengine (@socketengines) {
 		say "Attempting to build using the $compiler compiler and the $socketengine socket engine...";
 		my @configure_flags;
+		push @configure_flags, '--disable-ownership' unless $>;
 		if (defined $ENV{TEST_BUILD_MODULES}) {
 			execute "$root/configure", '--enable-extras', $ENV{TEST_BUILD_MODULES};
 			push @configure_flags, '--disable-auto-extras';