From 7eff05fdb66d5350fa1d4ad70f7f8fa78d32f182 Mon Sep 17 00:00:00 2001
From: Walter Lozano <walter.lozano@collabora.com>
Date: Mon, 22 Feb 2021 15:43:36 -0300
Subject: [PATCH] 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: Walter Lozano <walter.lozano@collabora.com>
---
debian/control | 5 ++---
debian/rules | 11 ++++-------
2 files changed, 6 insertions(+), 10 deletions(-)
diff --git a/debian/control b/debian/control
index 568725c8..0757464d 100644
--- a/debian/control
+++ b/debian/control
@@ -38,9 +38,8 @@ Build-Depends: debhelper-compat (= 13),
liblz4-tool <!nocheck>,
libbz2-dev <!stage1>,
zlib1g-dev <!stage1> | libz-dev <!stage1>,
- libcurl4-gnutls-dev <!stage1> | libcurl-dev <!stage1>,
- libmicrohttpd-dev <!stage1>,
- libgnutls28-dev <!stage1>,
+ libcurl4-openssl-dev <!stage1>,
+ libssl-dev <!stage1>,
libpcre2-dev <!stage1>,
libgcrypt20-dev,
libkmod-dev (>= 15),
diff --git a/debian/rules b/debian/rules
index 2a82d816..87ad4aae 100755
--- a/debian/rules
+++ b/debian/rules
@@ -113,9 +113,8 @@ CONFFLAGS_deb += \
-Dlibiptc=true \
-Dlibcurl=true \
-Dimportd=true \
- -Dmicrohttpd=true \
- -Dgnutls=true \
-Dpcre2=true
+ -Dopenssl=true
else
CONFFLAGS_deb += \
-Daudit=false \
@@ -127,9 +126,8 @@ CONFFLAGS_deb += \
-Dlibiptc=false \
-Dlibcurl=false \
-Dimportd=false \
- -Dmicrohttpd=false \
- -Dgnutls=false \
-Dpcre2=false
+ -Dopenssl=false
endif
CONFFLAGS_udeb = \
@@ -153,8 +151,7 @@ CONFFLAGS_udeb = \
-Dmachined=false \
-Dlibcurl=false \
-Dimportd=false \
- -Dmicrohttpd=false \
- -Dgnutls=false \
+ -Dopenssl=false \
-Dhostnamed=false \
-Dtimedated=false \
-Dnetworkd=false \
@@ -314,4 +311,4 @@ ifeq (, $(filter nocheck, $(DEB_BUILD_OPTIONS)))
endif
%:
- dh $@ --without autoreconf --buildsystem=meson
+ dh $@ --without autoreconf --buildsystem=meson -Nsystemd-journal-remote
--
GitLab