Source: monkeysphere Version: 0.43-3.1 Severity: important Tags: ftbfs patch User: [email protected] Usertags: libgcrypt-config-removal Control: block 714589 by -1
Hello, monkeysphere FTBFS against libgcrypt 1.11 which drops libgcrypt-config. (It will also fail when libassuan drops its config script.) Please use pkgconf instead. Patch attached. A development snapshot of the yet-unreleased libgcrypt 1.11 is available in experimental. cu Andreas
diff -Nru monkeysphere-0.43/debian/changelog monkeysphere-0.43/debian/changelog --- monkeysphere-0.43/debian/changelog 2021-01-02 18:04:05.000000000 +0100 +++ monkeysphere-0.43/debian/changelog 2024-05-26 11:35:22.000000000 +0200 @@ -1,3 +1,12 @@ +monkeysphere (0.43-3.2) UNRELEASED; urgency=medium + + * Non-maintainer upload. + * Fix FTBFS against libgcrypt 1.11 (and next libassuan), add patch to use + pkgconf instead of libassuan-config/libgcrypt-config, and also search for + gpg-error and add b-d on pkgconf. + + -- Andreas Metzler <[email protected]> Sun, 26 May 2024 11:35:22 +0200 + monkeysphere (0.43-3.1) unstable; urgency=medium * Non maintainer upload by the Reproducible Builds team. diff -Nru monkeysphere-0.43/debian/control monkeysphere-0.43/debian/control --- monkeysphere-0.43/debian/control 2019-05-10 22:55:04.000000000 +0200 +++ monkeysphere-0.43/debian/control 2024-05-26 11:35:22.000000000 +0200 @@ -16,10 +16,12 @@ libassuan-dev, libcrypt-openssl-rsa-perl <!nocheck>, libdigest-sha-perl <!nocheck>, + libgpg-error-dev, libgcrypt20-dev, lockfile-progs | procmail <!nocheck>, openssh-server <!nocheck>, openssl <!nocheck>, + pkgconf, socat <!nocheck>, Standards-Version: 4.3.0 Homepage: https://web.monkeysphere.info/ diff -Nru monkeysphere-0.43/debian/patches/series monkeysphere-0.43/debian/patches/series --- monkeysphere-0.43/debian/patches/series 2019-05-10 22:55:04.000000000 +0200 +++ monkeysphere-0.43/debian/patches/series 2024-05-26 11:35:22.000000000 +0200 @@ -4,3 +4,4 @@ 0004-tests-basic-ensure-functionality-with-output-of-stan.patch 0005-Use-gpg-s-reworked-quick-interface-for-adding-revoki.patch 0006-mh-import-key-use-ssh-add-and-gpg-agent-for-import-C.patch +use-pkg-config-instead-of-foo.-config.diff diff -Nru monkeysphere-0.43/debian/patches/use-pkg-config-instead-of-foo.-config.diff monkeysphere-0.43/debian/patches/use-pkg-config-instead-of-foo.-config.diff --- monkeysphere-0.43/debian/patches/use-pkg-config-instead-of-foo.-config.diff 1970-01-01 01:00:00.000000000 +0100 +++ monkeysphere-0.43/debian/patches/use-pkg-config-instead-of-foo.-config.diff 2024-05-26 11:35:22.000000000 +0200 @@ -0,0 +1,26 @@ +Description: Fix FTBFS against libgcrypt 1.11 (and next libassuan) + Use pkgconf instead of libassuan-config/libgcrypt-config. + Also explicitely link against libgpg-error since we use gpg_strerror() +Author: Andreas Metzler <[email protected]> +Last-Update: 2024-05-26 + +--- a/Makefile ++++ b/Makefile +@@ -13,15 +13,13 @@ ETCPREFIX ?= + ETCSUFFIX ?= + PREFIX ?= /usr + MANPREFIX ?= $(PREFIX)/share/man + LOCALSTATEDIR ?= /var/lib + +-CFLAGS += $(shell libassuan-config --cflags) +-CFLAGS += $(shell libgcrypt-config --cflags) ++CFLAGS += $(shell pkg-config --cflags gpg-error libassuan libgcrypt) + CFLAGS += --pedantic -Wall -Werror -std=c99 +-LIBS += $(shell libassuan-config --libs) +-LIBS += $(shell libgcrypt-config --libs) ++LIBS += $(shell pkg-config --libs gpg-error libassuan libgcrypt) + + REPLACEMENTS = src/monkeysphere src/monkeysphere-host \ + src/monkeysphere-authentication src/share/defaultenv $(wildcard \ + src/transitions/*) +
