Skip to content
Snippets Groups Projects
Commit 7eff05fd authored by Walter Lozano's avatar Walter Lozano
Browse files

Switch to OpenSSL


To follow the Apertis guidelines, which chooses OpenSSL as TLS stack, switch
systemd to be build against it.

In the same line drop systemd-journal-remote and its dependency
libmicrohttpd-dev since it can only be built against GnuTLS but has no value
for Apertis.

Signed-off-by: default avatarWalter Lozano <walter.lozano@collabora.com>
parent 45111fa5
No related branches found
No related tags found
No related merge requests found
...@@ -38,9 +38,8 @@ Build-Depends: debhelper-compat (= 13), ...@@ -38,9 +38,8 @@ Build-Depends: debhelper-compat (= 13),
liblz4-tool <!nocheck>, liblz4-tool <!nocheck>,
libbz2-dev <!stage1>, libbz2-dev <!stage1>,
zlib1g-dev <!stage1> | libz-dev <!stage1>, zlib1g-dev <!stage1> | libz-dev <!stage1>,
libcurl4-gnutls-dev <!stage1> | libcurl-dev <!stage1>, libcurl4-openssl-dev <!stage1>,
libmicrohttpd-dev <!stage1>, libssl-dev <!stage1>,
libgnutls28-dev <!stage1>,
libpcre2-dev <!stage1>, libpcre2-dev <!stage1>,
libgcrypt20-dev, libgcrypt20-dev,
libkmod-dev (>= 15), libkmod-dev (>= 15),
......
...@@ -113,9 +113,8 @@ CONFFLAGS_deb += \ ...@@ -113,9 +113,8 @@ CONFFLAGS_deb += \
-Dlibiptc=true \ -Dlibiptc=true \
-Dlibcurl=true \ -Dlibcurl=true \
-Dimportd=true \ -Dimportd=true \
-Dmicrohttpd=true \
-Dgnutls=true \
-Dpcre2=true -Dpcre2=true
-Dopenssl=true
else else
CONFFLAGS_deb += \ CONFFLAGS_deb += \
-Daudit=false \ -Daudit=false \
...@@ -127,9 +126,8 @@ CONFFLAGS_deb += \ ...@@ -127,9 +126,8 @@ CONFFLAGS_deb += \
-Dlibiptc=false \ -Dlibiptc=false \
-Dlibcurl=false \ -Dlibcurl=false \
-Dimportd=false \ -Dimportd=false \
-Dmicrohttpd=false \
-Dgnutls=false \
-Dpcre2=false -Dpcre2=false
-Dopenssl=false
endif endif
CONFFLAGS_udeb = \ CONFFLAGS_udeb = \
...@@ -153,8 +151,7 @@ CONFFLAGS_udeb = \ ...@@ -153,8 +151,7 @@ CONFFLAGS_udeb = \
-Dmachined=false \ -Dmachined=false \
-Dlibcurl=false \ -Dlibcurl=false \
-Dimportd=false \ -Dimportd=false \
-Dmicrohttpd=false \ -Dopenssl=false \
-Dgnutls=false \
-Dhostnamed=false \ -Dhostnamed=false \
-Dtimedated=false \ -Dtimedated=false \
-Dnetworkd=false \ -Dnetworkd=false \
...@@ -314,4 +311,4 @@ ifeq (, $(filter nocheck, $(DEB_BUILD_OPTIONS))) ...@@ -314,4 +311,4 @@ ifeq (, $(filter nocheck, $(DEB_BUILD_OPTIONS)))
endif endif
%: %:
dh $@ --without autoreconf --buildsystem=meson dh $@ --without autoreconf --buildsystem=meson -Nsystemd-journal-remote
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment