Commit 145dec22 authored by jan.koester's avatar jan.koester
Browse files

test

parent 8b09e07f

CMakeLists.txt

+1 −1
Changes for CMakeLists.txt: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ find_package(libconfplus REQUIRED) 
find_package(libdbpp REQUIRED)

find_package(fenrirds REQUIRED)

find_package(json-c REQUIRED)

find_package(smtpclient REQUIRED)

find_package(libsmtppp REQUIRED)

find_package(libuuidp REQUIRED)

find_package(tinyxml2 REQUIRED)

find_package(paritypp REQUIRED)

Dockerfile

+4 −7
Changes for Dockerfile: 4 added lines, 7 removed lines.
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
# images from another registry/namespace -- see DOCKER_PREFIX in systempp/build-chroot.sh.



ARG IMAGE_PREFIX=tuxist/

ARG FENRIROS_TAG=20261107

ARG FENRIROS_TAG=20261108



FROM ${IMAGE_PREFIX}fenriros-devel:${FENRIROS_TAG} AS build
@@ -31,7 +31,6 @@ ARG LIBDBPP_REF=main 
ARG MEDIADB_REF=main

ARG AUTHDB_REF=main

ARG GAMEINFOPLUS_REF=main

ARG SMTPCLIENT_REF=master



# Sources are fetched by ADD on the build host: FenrirOS resolves names through

# /etc/resolv.yaml, which docker build does not provide, so curl inside the image can't.
@@ -42,7 +41,6 @@ ADD ${TUXIST_GIT}/jan.koester/libdbpp.git#${LIBDBPP_REF} /src/libdbpp 
ADD ${TUXIST_GIT}/tuxist/mediadb.git#${MEDIADB_REF} /src/mediadb

ADD ${TUXIST_GIT}/tuxist/authdb.git#${AUTHDB_REF} /src/authdb

ADD ${TUXIST_GIT}/jan.koester/libgameinfoplus.git#${GAMEINFOPLUS_REF} /src/libgameinfoplus

ADD https://github.com/Tuxist/CPP-SMTPClient-library.git#${SMTPCLIENT_REF} /src/smtpclient

COPY docker/postgresql/ /src/postgresql-port/



# libpq (shared library + client headers only, the server is not needed)
@@ -80,7 +78,8 @@ RUN set -e; \ 
    ln -sf libsqlite3.so.0 /usr/lib/libsqlite3.so; \

    cp sqlite3.h sqlite3ext.h /usr/include/



# libdbpp (pgsql + sqlite backends), MediaDB client, libgameinfoplus, SMTP client

# libdbpp (pgsql + sqlite backends), MediaDB client, libgameinfoplus (libsmtppp comes with

# fenriros-devel, like the other tuxist libraries)

RUN set -e; \

    build() { src=$1; shift; \

        cmake -S "$src" -B "$src/build" -G Ninja \
@@ -92,9 +91,7 @@ RUN set -e; \ 
        cmake --install "$src/build"; }; \

    build /src/libdbpp; \

    build /src/mediadb -DCLIENT_ONLY=ON; \

    build /src/libgameinfoplus; \

    # CPP-SMTPClient does not include GNUInstallDirs, so its include dir must be given

    build /src/smtpclient -DBUILD_TESTING=OFF -DCMAKE_INSTALL_INCLUDEDIR=include -DCMAKE_INSTALL_BINDIR=bin

    build /src/libgameinfoplus



# fenrirdsctl (formerly authcli; run.sh registers the blogi client with it); the authdb

# client library and headers come from libauthdb-client-dev, so only the tool is built

debian/control

+1 −1
Changes for debian/control: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ Build-Depends: debhelper-compat (= 13), cmake (>= 3.18), 
 libdbpp-dev <nonspawn>,

 libbrotli-dev <nonspawn>,

 libtinyxml2-dev <nonspawn>,

 libsmtpclient-dev <nonspawn>,

 libsmtppp-dev <nonspawn>,

 libhtmlpp-dev <nonspawn>,

 zlib1g-dev <nonspawn>,

 pkg-config

src/CMakeLists.txt

+1 −3
Changes for src/CMakeLists.txt: 1 added line, 3 removed lines.
Original line number Diff line number Diff line
@@ -15,8 +15,6 @@ add_library(blogidev STATIC 
    blogi.cpp

)



target_include_directories(blogidev PRIVATE ${SMTPCLIENT_INCLUDE_DIR})



target_link_libraries(blogidev PUBLIC

    htmlpp::htmlpp

    httppp::httppp
@@ -25,7 +23,7 @@ target_link_libraries(blogidev PUBLIC 
    json-c::json-c

    fenrirds::client

    confplus::confplus

    smtpclient::smtpclient

    smtppp::smtppp

    dbpp::dbpp

    uuidp::uuidp

    tinyxml2::tinyxml2

src/blogi.cpp

+4 −0
Changes for src/blogi.cpp: 4 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -425,6 +425,8 @@ blogi::Blogi::Blogi(std::vector<netplus::socket *> serversocket, bool debug) 
            getConfig(*initdb, "SMTPUSER", ctx.plgArgs->smtp->_SUser);

            getConfig(*initdb, "SMTPSENDER", ctx.plgArgs->smtp->_Sender);

            getConfig(*initdb, "SMTPPASSWORD", ctx.plgArgs->smtp->_SPass);

            // not set yet = verify (see SmtpSettings::_STlsVerify)

            try { std::string v; getConfig(*initdb, "SMTPTLSVERIFY", v); ctx.plgArgs->smtp->_STlsVerify = v != "off"; } catch (...) {}

        }

        catch (std::runtime_error &e)

        {
@@ -593,6 +595,8 @@ bool blogi::Blogi::reloadConfig() 
                getConfig(*initdb, "SMTPUSER", ctx->plgArgs->smtp->_SUser);

                getConfig(*initdb, "SMTPSENDER", ctx->plgArgs->smtp->_Sender);

                getConfig(*initdb, "SMTPPASSWORD", ctx->plgArgs->smtp->_SPass);

                // not set yet = verify (see SmtpSettings::_STlsVerify)

                try { std::string v; getConfig(*initdb, "SMTPTLSVERIFY", v); ctx->plgArgs->smtp->_STlsVerify = v != "off"; } catch (...) {}

            }

            catch (...)

            {