Switch from gnutls to openssl

Upstream is slowly phasing out gnutls. Start switching to openssl.
Drops support for '--trust' in the journal-gatewayd and journal-remote
programs.

diff --git a/debian/control b/debian/control
index f688289679d7e59eb7a06b5e42c3ba3c29686f3f..7013cc53fb0d7d85b816ca19527db56f388fd3a3 100644 (file)
--- 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>,
+               libcurl4-openssl-dev <!stage1>,
                libmicrohttpd-dev <!stage1>,
-               libgnutls28-dev <!stage1>,
                libpcre2-dev <!stage1>,
                libgcrypt20-dev,
                libkmod-dev (>= 15),

diff --git a/debian/rules b/debian/rules
index bf79b0fdbbb4a046e80c60f44057e8fb48ad6d37..b8d4d1ec7ecacebdc62ec5cf1ad42a690776c375 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -64,6 +64,7 @@ CONFFLAGS = \
        -Dqrencode=false \
        -Dvconsole=false \
        -Dfirstboot=false \
+       -Dsysupdate=false \
        -Dxkbcommon=false \
        -Dwheel-group=false \
        -Duserdb=false \
@@ -72,7 +73,7 @@ CONFFLAGS = \
        -Dp11kit=false \
        -Doomd=true \
        -Durlify=false \
-       -Dopenssl=false \
+       -Dgnutls=false \
        -Dlink-udev-shared=false \
        -Dlink-systemctl-shared=false \
        -Dbump-proc-sys-fs-nr-open=false \
@@ -115,7 +116,9 @@ CONFFLAGS += \
        -Dlibcurl=true \
        -Dimportd=true \
        -Dmicrohttpd=true \
-       -Dgnutls=true \
+       -Dopenssl=true \
+       -Dcryptolib=openssl \
+       -Ddns-over-tls=openssl \
        -Dlibfido2=true \
        -Dtpm2=true \
        -Dpcre2=true
@@ -131,7 +134,7 @@ CONFFLAGS += \
        -Dlibcurl=false \
        -Dimportd=false \
        -Dmicrohttpd=false \
-       -Dgnutls=false \
+       -Dopenssl=false \
        -Dlibfido2=false \
        -Dtpm2=false \
        -Dpcre2=false