diff --git a/.github/workflows/devshell.yml b/.github/workflows/devshell.yml index d3e7ae5fb..80d9acdd0 100644 --- a/.github/workflows/devshell.yml +++ b/.github/workflows/devshell.yml @@ -45,7 +45,6 @@ jobs: --prefix=${SYSLOG_NG_INSTALL_DIR} --enable-debug --enable-all-modules - --disable-smtp --disable-java --disable-java-modules --enable-ebpf @@ -171,7 +170,6 @@ jobs: --enable-linux-caps --enable-manpages --enable-all-modules - --disable-smtp --disable-java --disable-java-modules --with-python=3 diff --git a/dbld/build.manifest b/dbld/build.manifest index 3690028fd..0fdbbc1e1 100644 --- a/dbld/build.manifest +++ b/dbld/build.manifest @@ -30,7 +30,7 @@ # libcriterion-dev is available starting with bullseye debian-bullseye python3,nojava,notzdatalegacy,nobpf debian-bookworm python3,nojava,notzdatalegacy -debian-testing python3,nojava,nosmtp +debian-testing python3,nojava debian-sid python3,nojava # on ubuntu, we start using Python3 at focal onwards. diff --git a/packaging/debian/control b/packaging/debian/control index 497f8e6a4..29a42fd40 100644 --- a/packaging/debian/control +++ b/packaging/debian/control @@ -13,7 +13,7 @@ Build-Depends: debhelper (>= 10~), pkg-config, flex, bison (>= 3.4.2), gperf, libcriterion-dev , xsltproc, docbook-xsl, - libesmtp-dev , + libesmtp-dev, libivykis-dev (>= 0.36.1~), libnet1-dev, libglib2.0-dev, diff --git a/packaging/debian/rules b/packaging/debian/rules index afdbe27cd..b2b6bd072 100755 --- a/packaging/debian/rules +++ b/packaging/debian/rules @@ -64,10 +64,6 @@ endif PYTHON_VERSION = 3 -ifneq ($(filter sng-nosmtp,$(DEB_BUILD_PROFILES)),) -DH_OPTIONS += -Naxosyslog-mod-smtp -endif - ifneq ($(filter sng-nokafka,$(DEB_BUILD_PROFILES)),) DH_OPTIONS += -Naxosyslog-mod-rdkafka endif