Merge branch 'insp4' into master.

.github/workflows/ci-irctest.yml

@@ -21,13 +21,6 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v4
 
-      - name: Checkout irctest
-        uses: actions/checkout@v4
-        with:
-          path: irctest
-          ref: af980ed3b639b5e1b3749c74027872adb69922a7
-          repository: progval/irctest
-
       - name: Run configure
         run: ./configure --development --disable-auto-extras --prefix=$HOME/.local/
 
@@ -40,11 +33,6 @@ jobs:
           CXXFLAGS: -DINSPIRCD_UNLIMITED_MAINLOOP
         run: make install --jobs $(($(getconf _NPROCESSORS_ONLN) + 1))
 
-      - name: Work around an issue with irctest
-        env:
-          CXXFLAGS: -DINSPIRCD_UNLIMITED_MAINLOOP
-        run: cp ~/.local/conf/examples/help.example.conf ~/.local/conf/examples/help.conf.example
-
       - name: Make artifact tarball
         run: |-
           cd ~
@@ -78,7 +66,7 @@ jobs:
         uses: actions/checkout@v4
         with:
           path: irctest
-          ref: af980ed3b639b5e1b3749c74027872adb69922a7
+          ref: 9f33633cc71739cd8e88cc4f3d39fa002cc0f97e
           repository: progval/irctest
 
       - name: Install irctest dependencies

configure

@@ -218,7 +218,7 @@ if (defined $opt_portable) {
 	$config{BINARY_DIR}  = $opt_binary_dir  // catdir $config{BASE_DIR}, 'usr/bin';
 	$config{CONFIG_DIR}  = $opt_config_dir  // catdir $config{BASE_DIR}, 'etc/inspircd';
 	$config{DATA_DIR}    = $opt_data_dir    // catdir $config{BASE_DIR}, 'var/lib/inspircd';
-	$config{EXAMPLE_DIR} = $opt_example_dir // catdir $config{BASE_DIR}, 'usr/share/doc/inspircd';
+	$config{EXAMPLE_DIR} = $opt_example_dir // catdir $config{BASE_DIR}, 'usr/share/doc/inspircd/examples';
 	$config{LOG_DIR}     = $opt_log_dir     // catdir $config{BASE_DIR}, 'var/log/inspircd';
 	$config{MANUAL_DIR}  = $opt_manual_dir  // catdir $config{BASE_DIR}, 'usr/share/man/man1';
 	$config{MODULE_DIR}  = $opt_module_dir  // catdir $config{BASE_DIR}, 'usr/lib/inspircd';

src/modules/m_spanningtree/main.h

@@ -40,27 +40,6 @@
 #include "protocolinterface.h"
 #include "tags.h"
 
-/** An enumeration of all known protocol versions.
- *
- * If you introduce new protocol versions please document them here:
- * https://docs.inspircd.org/spanningtree/changes
- */
-enum ProtocolVersion
-	: uint16_t
-{
-	/** The linking protocol version introduced in InspIRCd v3.0. */
-	PROTO_INSPIRCD_3 = 1205,
-
-	/** The linking protocol version introduced in InspIRCd v4.0a1. */
-	PROTO_INSPIRCD_4 = 1206,
-
-	/** The oldest version of the protocol that we support. */
-	PROTO_OLDEST = PROTO_INSPIRCD_3,
-
-	/** The newest version of the protocol that we support. */
-	PROTO_NEWEST = PROTO_INSPIRCD_4
-};
-
 /** Forward declarations
  */
 class SpanningTreeUtilities;

src/modules/m_spanningtree/treesocket.h

@@ -31,6 +31,27 @@
 
 #include "utils.h"
 
+/** An enumeration of all known protocol versions.
+ *
+ * If you introduce new protocol versions please document them here:
+ * https://docs.inspircd.org/server/change-log/
+ */
+enum ProtocolVersion
+	: uint16_t
+{
+	/** The linking protocol version introduced in InspIRCd v3.0. */
+	PROTO_INSPIRCD_3 = 1205,
+
+	/** The linking protocol version introduced in InspIRCd v4.0. */
+	PROTO_INSPIRCD_4 = 1206,
+
+	/** The oldest version of the protocol that we support. */
+	PROTO_OLDEST = PROTO_INSPIRCD_3,
+
+	/** The newest version of the protocol that we support. */
+	PROTO_NEWEST = PROTO_INSPIRCD_4
+};
+
 /*
  * The server list in InspIRCd is maintained as two structures
  * which hold the data in different ways. Most of the time, we
@@ -183,7 +204,7 @@ public:
 	const time_t age;
 
 	// The protocol version which has been negotiated with the remote server.
-	uint16_t proto_version = 0;
+	uint16_t proto_version = PROTO_NEWEST;
 
 	/** Because most of the I/O gubbins are encapsulated within
 	 * BufferedSocket, we just call the superclass constructor for

win/conanfile.txt

@@ -1,4 +1,4 @@
-# Last updated: 2024-03-01
+# Last updated: 2024-06-19
 #
 # Modules we can't legally ship: geo_maxmind, ssl_openssl
 # Modules which don't apply to Windows: sslrehashsignal
@@ -6,15 +6,15 @@
 
 [requires]
 argon2/20190702
-## libmaxminddb/1.9.1
+## libmaxminddb/1.10.0
 libmysqlclient/8.1.0
-libpq/15.4
+libpq/15.5
 libpsl/0.21.1
-## openssl/3.2.1
-pcre2/10.43
+## openssl/3.2.2
+pcre2/10.44
 rapidjson/cci.20230929
-re2/20231101
-sqlite3/3.45.1
+re2/20240301
+sqlite3/3.46.0
 
 [options]
 argon2:shared=True