Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: Mike Gilbert <floppym@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd/
Date: Sat, 13 Apr 2019 13:43:18
Message-Id: 1555162987.6ff400688d95696650641565e44203e1b7cfd02a.floppym@gentoo
1 commit: 6ff400688d95696650641565e44203e1b7cfd02a
2 Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
3 AuthorDate: Sat Apr 13 13:37:35 2019 +0000
4 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
5 CommitDate: Sat Apr 13 13:43:07 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ff40068
7
8 sys-apps/systemd: bump to 242
9
10 Fixes DNS-over-TLS support, based loosely on work by Lucas Yamanishi.
11
12 Closes: https://bugs.gentoo.org/674672
13 Closes: https://github.com/gentoo/gentoo/pull/11030
14 Package-Manager: Portage-2.3.62_p4, Repoman-2.3.12_p87
15 Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
16
17 sys-apps/systemd/Manifest | 2 +-
18 sys-apps/systemd/metadata.xml | 1 +
19 .../{systemd-242_rc3.ebuild => systemd-242.ebuild} | 20 ++++++++++++++++----
20 sys-apps/systemd/systemd-9999.ebuild | 20 ++++++++++++++++----
21 4 files changed, 34 insertions(+), 9 deletions(-)
22
23 diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
24 index 1251ddef58c..ccc853651c0 100644
25 --- a/sys-apps/systemd/Manifest
26 +++ b/sys-apps/systemd/Manifest
27 @@ -1,4 +1,4 @@
28 DIST systemd-239-patches-2.tar.gz 33416 BLAKE2B 9602d101cbac65d3b2490f28308e843c28fcaea848dd09005abef0da0bc79ba0766a1cbe7c3cac63f796accddf0295b4eb946e601a201f7e81a48bd1720051ca SHA512 5f5a764d317c43c6b1854171a753eafaca006e12e4f91c81e6ba1d50e80bbbaca23c900fba417264bf9f0d827a73aca71a6da8f2a2043aaaefefed62f5a92b23
29 DIST systemd-239.tar.gz 7157293 BLAKE2B 975f6215c8bb6662d6e161f637e1fece22930c0190b3c31a8fc4cb1a10600546a252704ac95590d9d14e495fcd06082a590e6d755e36603a41b3a396d579d8b0 SHA512 fd44590dfd148504c5ed1e67521efce50d84b627b7fc77015fa95dfa76d7a42297c56cc89eff40181809732024b16d48f2a87038cf435e0c63bc2b95ecd86b0f
30 DIST systemd-241.tar.gz 7640538 BLAKE2B 69d7196fee0d0ad06ea8d7c78b0299cc17517ecce3ca4c0b1181a3fbb13bc2627629156785051e2ff427dcc21414f7a078724c6409ebaa431618e4799ebcd50a SHA512 a7757574590e8aa37e1291ea0b2c5eb03a8d8062fe9462fa5b0bf50830c933e2b301d106c70d904f94afc0aa8e43a8acfd11926dfa25b1b89174580e491e545e
31 -DIST systemd-242-rc3.tar.gz 7818751 BLAKE2B 594555f3ecc39d29f57653614f8f03812cefc759a3faca3cab21aac79820e8851d70e94da7922a02dd0342ff3693c3007b0379cad40d049e55ba3a25c3b72e1c SHA512 89471959adfe8b80f8ae8993463cecbcb4c7115f2bf36d256eff1a1bbbe10ac6ce4301763f98594ee8faf547ec1187ff872b1bed0207e092e300345af92baaad
32 +DIST systemd-242.tar.gz 7831435 BLAKE2B 288e65d0a8e133ef5885689eb16118a83d93c730e342da63115cea0892fc999104c3a4856c83f3e7ef909ba2f3311146730b05ee02d84cc0400851ccbdcd54cd SHA512 578f68a3c8f2d454198fc04ff8d943abcfb390531d57f9603d185857f7afa7f4dc641dafecf49ce50fe22f5837b252b181400891e8efd4459fd4f69bb4283cb4
33
34 diff --git a/sys-apps/systemd/metadata.xml b/sys-apps/systemd/metadata.xml
35 index ad89da66586..cdd60730620 100644
36 --- a/sys-apps/systemd/metadata.xml
37 +++ b/sys-apps/systemd/metadata.xml
38 @@ -13,6 +13,7 @@
39 <flag name="audit">Enable support for <pkg>sys-process/audit</pkg></flag>
40 <flag name="curl">Enable support for uploading journals</flag>
41 <flag name="cryptsetup">Enable cryptsetup tools (includes unit generator for crypttab)</flag>
42 + <flag name="dns-over-tls">Enable DNS-over-TLS support</flag>
43 <flag name="gnuefi">Enable EFI boot manager and stub loader (built using <pkg>sys-boot/gnu-efi</pkg>)</flag>
44 <flag name="elfutils">Enable coredump stacktraces in the journal</flag>
45 <flag name="gcrypt">Enable sealing of journal files using gcrypt</flag>
46
47 diff --git a/sys-apps/systemd/systemd-242_rc3.ebuild b/sys-apps/systemd/systemd-242.ebuild
48 similarity index 95%
49 rename from sys-apps/systemd/systemd-242_rc3.ebuild
50 rename to sys-apps/systemd/systemd-242.ebuild
51 index c167a2fd0b7..9c4d9d338b2 100644
52 --- a/sys-apps/systemd/systemd-242_rc3.ebuild
53 +++ b/sys-apps/systemd/systemd-242.ebuild
54 @@ -23,7 +23,7 @@ HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd"
55
56 LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
57 SLOT="0/2"
58 -IUSE="acl apparmor audit build cryptsetup curl elfutils +gcrypt gnuefi http idn importd +kmod libidn2 +lz4 lzma nat pam pcre policykit qrcode +resolvconf +seccomp selinux +split-usr ssl +sysv-utils test vanilla xkb"
59 +IUSE="acl apparmor audit build cryptsetup curl dns-over-tls elfutils +gcrypt gnuefi gnutls http idn importd +kmod libidn2 +lz4 lzma nat pam pcre policykit qrcode +resolvconf +seccomp selinux +split-usr +sysv-utils test vanilla xkb"
60
61 REQUIRED_USE="importd? ( curl gcrypt lzma )"
62 RESTRICT="!test? ( test )"
63 @@ -38,11 +38,15 @@ COMMON_DEPEND=">=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
64 audit? ( >=sys-process/audit-2:0= )
65 cryptsetup? ( >=sys-fs/cryptsetup-1.6:0= )
66 curl? ( net-misc/curl:0= )
67 + dns-over-tls? (
68 + gnutls? ( >=net-libs/gnutls-3.5.3:0= )
69 + !gnutls? ( >=dev-libs/openssl-1.1.0:0= )
70 + )
71 elfutils? ( >=dev-libs/elfutils-0.158:0= )
72 gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0=[${MULTILIB_USEDEP}] )
73 http? (
74 >=net-libs/libmicrohttpd-0.9.33:0=
75 - ssl? ( >=net-libs/gnutls-3.1.4:0= )
76 + gnutls? ( >=net-libs/gnutls-3.1.4:0= )
77 )
78 idn? (
79 libidn2? ( net-dns/libidn2:= )
80 @@ -228,9 +232,9 @@ multilib_src_configure() {
81 -Delfutils=$(meson_multilib_native_use elfutils)
82 -Dgcrypt=$(meson_use gcrypt)
83 -Dgnu-efi=$(meson_multilib_native_use gnuefi)
84 + -Dgnutls=$(meson_multilib_native_use gnutls)
85 -Defi-libdir="${EPREFIX}/usr/$(get_libdir)"
86 -Dmicrohttpd=$(meson_multilib_native_use http)
87 - $(usex http -Dgnutls=$(meson_multilib_native_use ssl) -Dgnutls=false)
88 -Dimportd=$(meson_multilib_native_use importd)
89 -Dbzip2=$(meson_multilib_native_use importd)
90 -Dzlib=$(meson_multilib_native_use importd)
91 @@ -244,7 +248,6 @@ multilib_src_configure() {
92 -Dqrencode=$(meson_multilib_native_use qrcode)
93 -Dseccomp=$(meson_multilib_native_use seccomp)
94 -Dselinux=$(meson_multilib_native_use selinux)
95 - #-Dtests=$(meson_multilib_native_use test)
96 -Ddbus=$(meson_multilib_native_use test)
97 -Dxkbcommon=$(meson_multilib_native_use xkb)
98 # hardcode a few paths to spare some deps
99 @@ -288,6 +291,15 @@ multilib_src_configure() {
100 )
101 fi
102
103 + if multilib_is_native_abi && use dns-over-tls; then
104 + myconf+=(
105 + -Ddns-over-tls=true
106 + -Dopenssl=$(usex !gnutls true false)
107 + )
108 + else
109 + myconf+=( -Ddns-over-tls=false -Dopenssl=false )
110 + fi
111 +
112 meson_src_configure "${myconf[@]}"
113 }
114
115
116 diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild
117 index c167a2fd0b7..9c4d9d338b2 100644
118 --- a/sys-apps/systemd/systemd-9999.ebuild
119 +++ b/sys-apps/systemd/systemd-9999.ebuild
120 @@ -23,7 +23,7 @@ HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd"
121
122 LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
123 SLOT="0/2"
124 -IUSE="acl apparmor audit build cryptsetup curl elfutils +gcrypt gnuefi http idn importd +kmod libidn2 +lz4 lzma nat pam pcre policykit qrcode +resolvconf +seccomp selinux +split-usr ssl +sysv-utils test vanilla xkb"
125 +IUSE="acl apparmor audit build cryptsetup curl dns-over-tls elfutils +gcrypt gnuefi gnutls http idn importd +kmod libidn2 +lz4 lzma nat pam pcre policykit qrcode +resolvconf +seccomp selinux +split-usr +sysv-utils test vanilla xkb"
126
127 REQUIRED_USE="importd? ( curl gcrypt lzma )"
128 RESTRICT="!test? ( test )"
129 @@ -38,11 +38,15 @@ COMMON_DEPEND=">=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
130 audit? ( >=sys-process/audit-2:0= )
131 cryptsetup? ( >=sys-fs/cryptsetup-1.6:0= )
132 curl? ( net-misc/curl:0= )
133 + dns-over-tls? (
134 + gnutls? ( >=net-libs/gnutls-3.5.3:0= )
135 + !gnutls? ( >=dev-libs/openssl-1.1.0:0= )
136 + )
137 elfutils? ( >=dev-libs/elfutils-0.158:0= )
138 gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0=[${MULTILIB_USEDEP}] )
139 http? (
140 >=net-libs/libmicrohttpd-0.9.33:0=
141 - ssl? ( >=net-libs/gnutls-3.1.4:0= )
142 + gnutls? ( >=net-libs/gnutls-3.1.4:0= )
143 )
144 idn? (
145 libidn2? ( net-dns/libidn2:= )
146 @@ -228,9 +232,9 @@ multilib_src_configure() {
147 -Delfutils=$(meson_multilib_native_use elfutils)
148 -Dgcrypt=$(meson_use gcrypt)
149 -Dgnu-efi=$(meson_multilib_native_use gnuefi)
150 + -Dgnutls=$(meson_multilib_native_use gnutls)
151 -Defi-libdir="${EPREFIX}/usr/$(get_libdir)"
152 -Dmicrohttpd=$(meson_multilib_native_use http)
153 - $(usex http -Dgnutls=$(meson_multilib_native_use ssl) -Dgnutls=false)
154 -Dimportd=$(meson_multilib_native_use importd)
155 -Dbzip2=$(meson_multilib_native_use importd)
156 -Dzlib=$(meson_multilib_native_use importd)
157 @@ -244,7 +248,6 @@ multilib_src_configure() {
158 -Dqrencode=$(meson_multilib_native_use qrcode)
159 -Dseccomp=$(meson_multilib_native_use seccomp)
160 -Dselinux=$(meson_multilib_native_use selinux)
161 - #-Dtests=$(meson_multilib_native_use test)
162 -Ddbus=$(meson_multilib_native_use test)
163 -Dxkbcommon=$(meson_multilib_native_use xkb)
164 # hardcode a few paths to spare some deps
165 @@ -288,6 +291,15 @@ multilib_src_configure() {
166 )
167 fi
168
169 + if multilib_is_native_abi && use dns-over-tls; then
170 + myconf+=(
171 + -Ddns-over-tls=true
172 + -Dopenssl=$(usex !gnutls true false)
173 + )
174 + else
175 + myconf+=( -Ddns-over-tls=false -Dopenssl=false )
176 + fi
177 +
178 meson_src_configure "${myconf[@]}"
179 }
Report Message
Find on MARC Find on Google Groups