From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id CA447158086 for ; Sat, 25 Dec 2021 18:20:29 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C64EB2BC001; Sat, 25 Dec 2021 18:20:28 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 263212BC001 for ; Sat, 25 Dec 2021 18:20:26 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E206F343151 for ; Sat, 25 Dec 2021 18:20:23 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 622E023E for ; Sat, 25 Dec 2021 18:20:22 +0000 (UTC) From: "Mike Gilbert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Gilbert" Message-ID: <1640456344.9a73ceca960a687e8457fa24a382fa04ef4dc6f9.floppym@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd/, sys-apps/systemd/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/systemd/files/250-fix-openssl.patch sys-apps/systemd/systemd-250.ebuild X-VCS-Directories: sys-apps/systemd/ sys-apps/systemd/files/ X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert X-VCS-Revision: 9a73ceca960a687e8457fa24a382fa04ef4dc6f9 X-VCS-Branch: master Date: Sat, 25 Dec 2021 18:20:22 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: a360768f-21a4-4df8-bda7-f1e6cd6e62b4 X-Archives-Hash: 80d7fdc5a322a53302b85c47143ea187 commit: 9a73ceca960a687e8457fa24a382fa04ef4dc6f9 Author: Mike Gilbert gentoo org> AuthorDate: Sat Dec 25 18:19:04 2021 +0000 Commit: Mike Gilbert gentoo org> CommitDate: Sat Dec 25 18:19:04 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9a73ceca sys-apps/systemd: backport build fix for USE="-dns-over-tls -gcrypt" Closes: https://bugs.gentoo.org/829944 Signed-off-by: Mike Gilbert gentoo.org> sys-apps/systemd/files/250-fix-openssl.patch | 102 +++++++++++++++++++++++++++ sys-apps/systemd/systemd-250.ebuild | 1 + 2 files changed, 103 insertions(+) diff --git a/sys-apps/systemd/files/250-fix-openssl.patch b/sys-apps/systemd/files/250-fix-openssl.patch new file mode 100644 index 000000000000..520ba0b66427 --- /dev/null +++ b/sys-apps/systemd/files/250-fix-openssl.patch @@ -0,0 +1,102 @@ +From 9bcf483b117b23ae25bf4a5d39ddc3eade8659a6 Mon Sep 17 00:00:00 2001 +From: Yu Watanabe +Date: Fri, 24 Dec 2021 10:06:13 +0900 +Subject: [PATCH] meson: fix build with -Dcryptolib=openssl + -Ddns-over-tls=false + +Previously, when -Ddns-over-tls=false, libopenssl was missing in the +dependency of resolved. +Also, this drops libgpg_error when it is not necessary. + +Replaces #21878. +--- + meson.build | 3 +-- + src/resolve/meson.build | 9 +-------- + 2 files changed, 2 insertions(+), 10 deletions(-) + +diff --git a/meson.build b/meson.build +index c0cbadecb123..0b7c1918ad4c 100644 +--- a/meson.build ++++ b/meson.build +@@ -1474,7 +1474,7 @@ conf.set10('PREFER_OPENSSL', + opt == 'openssl' or (opt == 'auto' and conf.get('HAVE_OPENSSL') == 1 and conf.get('HAVE_GCRYPT') == 0)) + conf.set10('HAVE_OPENSSL_OR_GCRYPT', + conf.get('HAVE_OPENSSL') == 1 or conf.get('HAVE_GCRYPT') == 1) +-lib_openssl_or_gcrypt = conf.get('PREFER_OPENSSL') == 1 ? libopenssl : libgcrypt ++lib_openssl_or_gcrypt = conf.get('PREFER_OPENSSL') == 1 ? [libopenssl] : [libgcrypt, libgpg_error] + + dns_over_tls = get_option('dns-over-tls') + if dns_over_tls != 'false' +@@ -2200,7 +2200,6 @@ if conf.get('ENABLE_RESOLVE') == 1 + libsystemd_resolve_core], + dependencies : [threads, + lib_openssl_or_gcrypt, +- libgpg_error, + libm, + libidn], + install_rpath : rootlibexecdir, +diff --git a/src/resolve/meson.build b/src/resolve/meson.build +index 0580fbeec625..2cdf24b1cbef 100644 +--- a/src/resolve/meson.build ++++ b/src/resolve/meson.build +@@ -135,7 +135,7 @@ systemd_resolved_sources += custom_target( + output : 'resolved-dnssd-gperf.c', + command : [gperf, '@INPUT@', '--output-file', '@OUTPUT@']) + +-systemd_resolved_dependencies = [threads, libgpg_error, libm] ++systemd_resolved_dependencies = [threads, libm] + [lib_openssl_or_gcrypt] + if conf.get('ENABLE_DNS_OVER_TLS') == 1 + if conf.get('DNS_OVER_TLS_USE_GNUTLS') == 1 + systemd_resolved_sources += files( +@@ -178,14 +178,12 @@ tests += [ + [libsystemd_resolve_core, + libshared], + [lib_openssl_or_gcrypt, +- libgpg_error, + libm]], + + [['src/resolve/test-dns-packet.c'], + [libsystemd_resolve_core, + libshared], + [lib_openssl_or_gcrypt, +- libgpg_error, + libm]], + + [['src/resolve/test-resolved-etc-hosts.c', +@@ -194,21 +192,18 @@ tests += [ + [libsystemd_resolve_core, + libshared], + [lib_openssl_or_gcrypt, +- libgpg_error, + libm]], + + [['src/resolve/test-resolved-packet.c'], + [libsystemd_resolve_core, + libshared], + [lib_openssl_or_gcrypt, +- libgpg_error, + libm]], + + [['src/resolve/test-dnssec.c'], + [libsystemd_resolve_core, + libshared], + [lib_openssl_or_gcrypt, +- libgpg_error, + libm], + [], 'HAVE_OPENSSL_OR_GCRYPT'], + +@@ -216,7 +211,6 @@ tests += [ + [libsystemd_resolve_core, + libshared], + [lib_openssl_or_gcrypt, +- libgpg_error, + libm], + [], '', 'manual'], + ] +@@ -226,6 +220,5 @@ fuzzers += [ + [libsystemd_resolve_core, + libshared], + [lib_openssl_or_gcrypt, +- libgpg_error, + libm]], + ] diff --git a/sys-apps/systemd/systemd-250.ebuild b/sys-apps/systemd/systemd-250.ebuild index bc4018c9efa4..26dc346527a3 100644 --- a/sys-apps/systemd/systemd-250.ebuild +++ b/sys-apps/systemd/systemd-250.ebuild @@ -237,6 +237,7 @@ src_prepare() { # Add local patches here PATCHES+=( + "${FILESDIR}"/250-fix-openssl.patch ) if ! use vanilla; then