Merge pull request #306 from MrAnno/revert-debian-smtp

Revert "dbld: disable smtp on debian-testing"
axoflow · Sep 26, 2024 · b0812f9 · b0812f9
2 parents faa4cc0 + c30440c
commit b0812f9
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 8 deletions.
diff --git 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
@@ -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
@@ -13,7 +13,7 @@ Build-Depends: debhelper (>= 10~),
                pkg-config, flex, bison (>= 3.4.2), gperf,
                libcriterion-dev <!sng-nocriterion>,
                xsltproc, docbook-xsl,
-               libesmtp-dev <!sng-nosmtp>,
+               libesmtp-dev,
                libivykis-dev (>= 0.36.1~),
                libnet1-dev,
                libglib2.0-dev,

diff --git 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