Enable support for libqrencode

dlopen() feature so no additional cost. Allows to print out recovery keys
in QR format.

diff --git a/debian/control b/debian/control
index 112487c2d5b00fb702d090fb7165f6835b414199..97e4155b3a86e9648c14639972731bf0ab520bfa 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -56,6 +56,7 @@ Build-Depends: debhelper-compat (= 13),
                libtss2-dev <!stage1>,
                libfido2-dev <!stage1>,
                libssl-dev <!stage1>,
+               libqrencode-dev <!stage1>,
                linux-base <!nocheck>,
                acl <!nocheck>,
                python3:native,
@@ -82,6 +83,7 @@ Suggests: systemd-container,
           systemd-boot,
           systemd-resolved,
           libfido2-1,
+          libqrencode4,
           libtss2-esys-3.0.2-0,
           libtss2-mu0,
           libtss2-rc0,

diff --git a/debian/rules b/debian/rules
index 78914368bf240c28a7582b5ae7ccaeeafe9bfd59..66fb7abb7f2bdb8641270937d4e882414c1cfc2a 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -61,7 +61,6 @@ CONFFLAGS = \
        -Dpamconfdir=no \
        -Dpamlibdir=/lib/$(DEB_HOST_MULTIARCH)/security \
        -Drpmmacrosdir=no \
-       -Dqrencode=false \
        -Dvconsole=false \
        -Dfirstboot=true \
        -Dsysupdate=false \
@@ -119,6 +118,7 @@ CONFFLAGS += \
        -Ddns-over-tls=openssl \
        -Dlibfido2=true \
        -Dtpm2=true \
+       -Dqrencode=true \
        -Dhomed=true \
        -Duserdb=true \
        -Dpcre2=true
@@ -138,6 +138,7 @@ CONFFLAGS += \
        -Dopenssl=false \
        -Dlibfido2=false \
        -Dtpm2=false \
+       -Dqrencode=false \
        -Dhomed=false \
        -Duserdb=false \
        -Dpcre2=false

diff --git a/debian/tests/control b/debian/tests/control
index 01b1ae427d0b941410c44f6c2d751fa26b2ebf3f..02f2c03c9bb1f17322ae36d285d494912ebfe9ed 100644 (file)
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -113,6 +113,7 @@ Depends: systemd-tests,
   libtss2-dev,
   libfido2-dev,
   libdw-dev,
+  libqrencode-dev,
 Restrictions: needs-root, isolation-container, breaks-testbed
 
 Tests: upstream
@@ -170,6 +171,7 @@ Depends: systemd-tests,
   dbus-user-session,
   libtss2-dev,
   libfido2-dev,
+  libqrencode-dev,
   python3-pexpect,
   screen,
   swtpm,