Merge branch 'main' into edk/searchkline

Author: edk0

.appveyor-build.sh

@@ -0,0 +1,61 @@
+name: CI
+
+on:
+  push:
+    branches: 
+      - main
+    paths-ignore:
+      - 'doc/oper-guide/**'
+  pull_request:
+    branches:
+      - main
+    paths-ignore:
+      - 'doc/oper-guide/**'
+
+jobs:
+  linux:
+    name: Linux
+
+    runs-on: ${{ matrix.os }}
+
+    strategy:
+      fail-fast: false
+      matrix:
+        os:
+          - ubuntu-18.04
+        compiler:
+          - gcc-6 # Debian 9 (OFTC)
+          - gcc-7
+          - gcc-8
+          - clang-7
+          - clang-8
+        include:
+          - os: ubuntu-20.04
+            compiler: gcc-10
+
+    env:
+      CC: ${{ matrix.compiler }}
+
+    steps:
+    - name: Install dependencies
+      run: |
+        sudo apt-get update
+        sudo apt-get install -y --no-install-recommends \
+          ${CC} \
+          automake \
+          autoconf \
+          libtool \
+          libsqlite3-dev \
+          libhyperscan-dev \
+          # EOF
+    - uses: actions/checkout@v2
+    - name: autogen.sh
+      run: bash autogen.sh
+    - name: configure
+      run: CFLAGS="-Werror -Wno-unused-value -Wno-unused-parameter" ./configure --enable-assert=hard --enable-warnings
+    - name: make
+      run: make -j2
+    - name: make check
+      run: make check
+    - name: make install
+      run: make install

.appveyor.yml

@@ -0,0 +1,29 @@
+name: Oper Guide
+
+on:
+  push:
+    branches:
+      - main
+    paths:
+      - 'doc/oper-guide/**'
+  pull_request:
+    branches:
+      - main
+    paths:
+      - 'doc/oper-guide/**'
+      
+jobs:
+  build:
+    runs-on: ubuntu-18.04
+
+    steps:
+      - name: Install dependencies
+        run: |
+          apt-get update
+          apt-get install -y --no-install-recommends \
+            python-sphinx \
+            texinfo \
+            # EOF
+      - uses: actions/checkout@v2
+      - name: Build
+        run: make -C doc/oper-guide html man info

.github/workflows/ci.yml

@@ -14,7 +14,7 @@ Makefile
 .libs
 authd/authd
 bandb/bandb
-bandb/bantool
+bandb/solanum-bantool
 autom4te.cache
 aclocal.m4
 compile
@@ -56,23 +56,6 @@ ircd/version.c
 ircd/version.c.last
 ssld/ssld
 wsockd/wsockd
-tests/core
-tests/msgbuf_parse1
-tests/msgbuf_unparse1
-tests/rb_dictionary1
-tests/rb_snprintf_append1
-tests/rb_snprintf_try_append1
-tests/sasl_abort1
-tests/send1
-tests/serv_connect1
-tests/substitution1
-tests/runtests
-tests/*.c.ban.db
-tests/*.c.ban.db-journal
-tests/*.c.log
-tests/*.c.pid
-!tests/runtime/modules/*.so
-!tests/runtime/modules/autoload/*.so
 testsuite/ircd.pid.*
 tools/solanum-mkpasswd
 tools/solanum-mkfingerprint

.github/workflows/docs.yaml

@@ -19,8 +19,6 @@ SUBDIRS += ircd \
            help \
            doc
 
-logdir = @prefix@/logs
-
 BUILT_SOURCES = include/serno.h
 
 include/serno.h:
@@ -41,9 +39,11 @@ install-data-hook:
 	test -d ${DESTDIR}${logdir} || mkdir -p ${DESTDIR}${logdir}
 
 install-exec-hook:
+	rm -f ${DESTDIR}${libdir}/*.la
 	rm -f ${DESTDIR}${moduledir}/*.la
 	rm -f ${DESTDIR}${moduledir}/autoload/*.la
 	rm -f ${DESTDIR}${moduledir}/extensions/*.la
+	rm -f ${DESTDIR}${libdir}/*.dll.a
 	rm -f ${DESTDIR}${moduledir}/*.dll.a
 	rm -f ${DESTDIR}${moduledir}/autoload/*.dll.a
 	rm -f ${DESTDIR}${moduledir}/extensions/*.dll.a

.gitignore

@@ -7,8 +7,8 @@ See LICENSE for licensing details (GPL v2).
 
 Includes changes from charybdis-4.1.3-dev.
 
-**This release includes breaking changes.** Please pay close attention to bolded warnings in the
-full release notes below.
+**This release includes breaking changes from charybdis 4.x.** Please pay close attention to
+bolded warnings in the full release notes below.
 
 ### build
 - Add `--with-asan` to configure to produce an ASan instrumented build
@@ -32,11 +32,14 @@ full release notes below.
 - Channel bans don't see through IP spoofs
 - Global /names now respects userhost-in-names
 - The `$j` extban is no longer usable inside ban exceptions
+- TLSv1 connections are accepted. They can still be disabled using OpenSSL config if you don't
+  want them. TLSv1 existing is not thought to be a threat to up-to-date clients.
 
 ### oper
 - **Breaking:** Kick immunity for override is now its own extension, override\_kick\_immunity
 - **Breaking:** /stats A output now follows the same format as other stats letters
 - **Breaking:** helpops now uses +h instead of +H
+- **Breaking:** sno\_whois and the spy\_ extensions have been removed
 - Opers now have their privset (identified by name) on remote servers
 - Oper-only umodes are refreshed after rehash and /grant
 - Extension modules can be reloaded
@@ -63,13 +66,16 @@ full release notes below.
 - Add channel::opmod\_send\_statusmsg to send messages allowed by +z to @#channel
 - Add class::max\_autoconn, with the behaviour of class::max\_number for servers prior to
   charybdis 4
+- Add `secure {}` blocks. Networks listed in a secure block gain +Z and can match `need_ssl` I-
+  and O-lines.
 - Remove general::kline\_delay
 - If m\_webirc is loaded, connections that try to use a webirc auth block as their I-line will
   be disconnected on registration
 
 ### misc
 - **Breaking:** WEBIRC now processes the "secure" option as specified by IRCv3. Web gateways that
   do not set this option will need to be updated or their connections will show as insecure.
+- Successfully changing IP with WEBIRC now drops an identd username
 
 ### code
 - Channel lists are now kept sorted. A for-loop macro, `ITER_COMM_CHANNELS`, is introduced to

.travis.yml

@@ -1,10 +1,10 @@
-# solanum [![Build Status](https://travis-ci.com/solanum-ircd/solanum.svg?branch=main)](https://travis-ci.com/solanum-ircd/solanum)
+# solanum [![Build Status](https://github.com/solanum-ircd/solanum/workflows/CI/badge.svg)]
 
 Solanum is an IRCv3 server designed to be highly scalable.  It implements IRCv3.1 and some parts of IRCv3.2.
 
 It is meant to be used with an IRCv3-capable services implementation such as [Atheme][atheme] or [Anope][anope].
 
-   [atheme]: http://www.atheme.net/
+   [atheme]: https://atheme.github.io/
    [anope]: http://www.anope.org/
 
 # necessary requirements
@@ -65,10 +65,17 @@ These are known issues and workarounds for supported platforms.
  * **Solaris**: you may have to set your PATH to include /usr/gnu/bin and /usr/gnu/sbin before /usr/bin
    and /usr/sbin. Solaris's default tools don't seem to play nicely with the configure script.
 
-# building from git
+# building
 
-We no longer supply a prebuilt configure script in git, due to use of automake and libtool causing problems.
-You will need to run `autogen.sh` to build the autotools files prior to building solanum.
+```bash
+./autogen.sh
+./configure --prefix=/path/to/installation
+make
+make check # run tests
+make install
+```
+
+See `./configure --help` for build options.
 
 # feature specific requirements
 

Makefile.am

@@ -1,16 +1,11 @@
 pkglibexec_PROGRAMS = bandb
-bin_PROGRAMS = bantool
+bin_PROGRAMS = solanum-bantool
 AM_CFLAGS=$(WARNFLAGS)
 
 AM_CPPFLAGS = -I../include -I../librb/include @SQLITE_INCLUDES@
-AM_CPPFLAGS += -DSQLITE_THREADSAFE=0 -DSQLITE_OMIT_LOAD_EXTENSION
 
 bandb_SOURCES = bandb.c rsdb_sqlite3.c rsdb_snprintf.c
-EXTRA_bandb_SOURCES = sqlite3.c
-bandb_LDADD = ../librb/src/librb.la @SQLITE_LD@ @SQLITE_OBJ@
-bandb_DEPENDENCIES = @SQLITE_OBJ@
+bandb_LDADD = ../librb/src/librb.la @SQLITE_LD@
 
-bantool_SOURCES = bantool.c rsdb_sqlite3.c rsdb_snprintf.c
-EXTRA_bantool_SOURCES = sqlite3.c
-bantool_LDADD = ../librb/src/librb.la @SQLITE_LD@ @SQLITE_OBJ@
-bantool_DEPENDENCIES = @SQLITE_OBJ@
+solanum_bantool_SOURCES = bantool.c rsdb_sqlite3.c rsdb_snprintf.c
+solanum_bantool_LDADD = ../librb/src/librb.la @SQLITE_LD@