From b4a174ee9c32d62ea6bf010e837e8c5b1c3d36a3 Mon Sep 17 00:00:00 2001 From: Sadie Powell Date: Tue, 27 Apr 2021 16:36:40 +0100 Subject: Fix a bunch of weird indentation and spacing issues. --- src/modules/extra/m_pgsql.cpp | 2 +- src/modules/extra/m_ssl_gnutls.cpp | 2 +- src/modules/extra/m_ssl_mbedtls.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src/modules/extra') diff --git a/src/modules/extra/m_pgsql.cpp b/src/modules/extra/m_pgsql.cpp index 36156013d..e1db996c8 100644 --- a/src/modules/extra/m_pgsql.cpp +++ b/src/modules/extra/m_pgsql.cpp @@ -186,7 +186,7 @@ class SQLConn : public SQL::Provider, public EventHandler public: reference conf; /* The entry */ std::deque queue; - PGconn* sql; /* PgSQL database connection handle */ + PGconn* sql; /* PgSQL database connection handle */ SQLstatus status; /* PgSQL database connection status */ QueueItem qinprog; /* If there is currently a query in progress */ diff --git a/src/modules/extra/m_ssl_gnutls.cpp b/src/modules/extra/m_ssl_gnutls.cpp index 5dadda184..e02c4a697 100644 --- a/src/modules/extra/m_ssl_gnutls.cpp +++ b/src/modules/extra/m_ssl_gnutls.cpp @@ -1248,7 +1248,7 @@ class GnuTLSIOHookProvider : public SSLIOHookProvider GnuTLS::Profile profile; public: - GnuTLSIOHookProvider(Module* mod, GnuTLS::Profile::Config& config) + GnuTLSIOHookProvider(Module* mod, GnuTLS::Profile::Config& config) : SSLIOHookProvider(mod, config.name) , profile(config) { diff --git a/src/modules/extra/m_ssl_mbedtls.cpp b/src/modules/extra/m_ssl_mbedtls.cpp index 5c768ce3c..c3d040ad0 100644 --- a/src/modules/extra/m_ssl_mbedtls.cpp +++ b/src/modules/extra/m_ssl_mbedtls.cpp @@ -822,7 +822,7 @@ class mbedTLSIOHookProvider : public SSLIOHookProvider mbedTLS::Profile profile; public: - mbedTLSIOHookProvider(Module* mod, mbedTLS::Profile::Config& config) + mbedTLSIOHookProvider(Module* mod, mbedTLS::Profile::Config& config) : SSLIOHookProvider(mod, config.name) , profile(config) { -- cgit v1.3.1-10-gc9f91 From d848034590bc402277da975b7efdbc78ce1722fc Mon Sep 17 00:00:00 2001 From: Sadie Powell Date: Fri, 7 May 2021 19:52:31 +0100 Subject: Switch from the Ubuntu 16.04 image to the 18.04 Ubuntu image. The Argon2 PPA is broken again and I don't want to deal with the stress of working out why. The 16.04 image is EOL soon (see actions/virtual-environments/#1084) so switching off it is just easier. --- .github/workflows/ci-linux.yml | 4 ++-- src/modules/extra/m_regex_re2.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src/modules/extra') diff --git a/.github/workflows/ci-linux.yml b/.github/workflows/ci-linux.yml index a622bbc0a..9d3365e53 100644 --- a/.github/workflows/ci-linux.yml +++ b/.github/workflows/ci-linux.yml @@ -4,7 +4,7 @@ on: - push jobs: build: - runs-on: ubuntu-16.04 + runs-on: ubuntu-18.04 env: CXXFLAGS: -std=${{ matrix.standard }} TEST_BUILD_MODULES: argon2 geo_maxmind ldap mysql pgsql regex_pcre regex_posix regex_re2 regex_stdlib regex_tre sqlite3 ssl_gnutls ssl_mbedtls ssl_openssl sslrehashsignal @@ -14,7 +14,7 @@ jobs: run: | sudo apt-get update --assume-yes sudo apt-get install --assume-yes --no-install-recommends clang g++ git make libc++-dev libc++abi-dev pkg-config - sudo apt-get install --assume-yes --no-install-recommends libargon2-dev libgnutls28-dev libldap2-dev libmaxminddb-dev libmbedtls-dev libmysqlclient-dev libpcre3-dev libpq-dev libre2-dev libsqlite3-dev libssl-dev libtre-dev + sudo apt-get install --assume-yes --no-install-recommends libargon2-0-dev libgnutls28-dev libldap2-dev libmaxminddb-dev libmbedtls-dev libmysqlclient-dev libpcre3-dev libpq-dev libre2-dev libsqlite3-dev libssl-dev libtre-dev - name: Run test-build run: ./tools/test-build ${{ matrix.compiler }} strategy: diff --git a/src/modules/extra/m_regex_re2.cpp b/src/modules/extra/m_regex_re2.cpp index 35414baf1..e3e793d6d 100644 --- a/src/modules/extra/m_regex_re2.cpp +++ b/src/modules/extra/m_regex_re2.cpp @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -/// $CompilerFlags: find_compiler_flags("re2" "") +/// $CompilerFlags: find_compiler_flags("re2" "-std=c++11") /// $LinkerFlags: find_linker_flags("re2" "-lre2") /// $PackageInfo: require_system("arch") pkgconf re2 -- cgit v1.3.1-10-gc9f91 From a1db12cb2e7024981291cbd7e51b73c9a684d76c Mon Sep 17 00:00:00 2001 From: Sadie Powell Date: Fri, 7 May 2021 21:17:48 +0100 Subject: Fix the Ubuntu package name for ssl_gnutls. --- src/modules/extra/m_ssl_gnutls.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/modules/extra') diff --git a/src/modules/extra/m_ssl_gnutls.cpp b/src/modules/extra/m_ssl_gnutls.cpp index e02c4a697..1b9291079 100644 --- a/src/modules/extra/m_ssl_gnutls.cpp +++ b/src/modules/extra/m_ssl_gnutls.cpp @@ -40,7 +40,7 @@ /// $PackageInfo: require_system("centos") gnutls-devel pkgconfig /// $PackageInfo: require_system("darwin") gnutls pkg-config /// $PackageInfo: require_system("debian") gnutls-bin libgnutls28-dev pkg-config -/// $PackageInfo: require_system("ubuntu") gnutls-bin libgnutls-dev pkg-config +/// $PackageInfo: require_system("ubuntu") gnutls-bin libgnutls28-dev pkg-config #include "inspircd.h" #include "modules/ssl.h" -- cgit v1.3.1-10-gc9f91