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-tmpfiles/
Date: Thu, 13 Jan 2022 16:29:45
Message-Id: 1642091359.28a1d60a9f070e01affcaee1f230a3cbaee4c80e.floppym@gentoo
1 commit: 28a1d60a9f070e01affcaee1f230a3cbaee4c80e
2 Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
3 AuthorDate: Thu Jan 13 16:29:19 2022 +0000
4 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
5 CommitDate: Thu Jan 13 16:29:19 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=28a1d60a
7
8 sys-apps/systemd-tmpfiles: drop 249.5
9
10 Bug: https://bugs.gentoo.org/830967
11 Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
12
13 sys-apps/systemd-tmpfiles/Manifest | 1 -
14 .../systemd-tmpfiles/systemd-tmpfiles-249.5.ebuild | 257 ---------------------
15 2 files changed, 258 deletions(-)
16
17 diff --git a/sys-apps/systemd-tmpfiles/Manifest b/sys-apps/systemd-tmpfiles/Manifest
18 index 70031c2ea400..f06572e8f2be 100644
19 --- a/sys-apps/systemd-tmpfiles/Manifest
20 +++ b/sys-apps/systemd-tmpfiles/Manifest
21 @@ -1,5 +1,4 @@
22 DIST systemd-249.7-CVE-2021-3997.tar.gz 8431 BLAKE2B 167ae8bfb3b653fa4a7a62eee164f2a7edf2f0fb312db8ed955634030c95dfdbd747821b4652620cd34a7af38fe0b77e48ed61096b5d076c3eb2f56371e191c8 SHA512 b17a60a0862743faee0153218792a77b5d06a44876e0c53c264e98d62786442c165f47136d7bc2857edcedc24e667c220a2e7d065e77f9a957804131acb26598
23 DIST systemd-musl-patches-249.5-r1.tar.xz 25148 BLAKE2B 6717291b5335997dcc327764beffc4ded50a5ac0e777bb3c540b5e355bee419c3d9b4a5605c239392d4c1b0e70792bc87282fa15dc9c09a0465b5608f2909006 SHA512 4bb7566437c280e75402fc435a3437aedad127f7b94c9bd54b94e9e1e7507409ad0898681f23e813b9b47414f58e4ca413b6d4e520bbbf578faec09054bf7f9b
24 -DIST systemd-stable-249.5.tar.gz 10597897 BLAKE2B 5c573322ef9bcd9d019776d6e2d8625a741c1535c0d06661b5666c2438a70cfc4dc182919bb419829de27a4d93c16717ce24e668faf9bd6b09e57f8bd88be725 SHA512 d6f1a5a6f03f0ed05b111aee75da509c5868c523af6209f33e630724dd0c7e0d0abf16920795d587e6c31a5915d247ebc613cf26d4aecf39f82ebb0690fab75f
25 DIST systemd-stable-249.7.tar.gz 10608252 BLAKE2B a5597c4973b24c962779622cae47dbf8351af49f8cd898d9c16a967c6f3600c6feb293e9b03eab0423b860eef5b04b287185fb9827cb323429d0ab9fc6d809b2 SHA512 4daf8570621fdcda5c94d982908c64eddfeef989005f4fd79a10f199dbc6f366354177bb59dff34bcb14764fb4423a870ffabac1163849ec53592e29760105fc
26 DIST systemd-stable-249.9.tar.gz 10613893 BLAKE2B fc7a14fa3b0cc3d05fa9f20fde2efedd3ef0f011d9dce53b0a418994b4257cf753b228cf98f749fb2028d81db55ef30a6e3d9b138d86239cad4fc730d845f9e2 SHA512 ce57bc6c522082e55649fc1886c4dc818c89607e175df2c92feffe288dbd38757f36b30abeebe153f5be6b664a49d729405040a952473cb2133a2e39cf9cc164
27
28 diff --git a/sys-apps/systemd-tmpfiles/systemd-tmpfiles-249.5.ebuild b/sys-apps/systemd-tmpfiles/systemd-tmpfiles-249.5.ebuild
29 deleted file mode 100644
30 index d4b97e07bdd5..000000000000
31 --- a/sys-apps/systemd-tmpfiles/systemd-tmpfiles-249.5.ebuild
32 +++ /dev/null
33 @@ -1,257 +0,0 @@
34 -# Copyright 2020-2021 Gentoo Authors
35 -# Distributed under the terms of the GNU General Public License v2
36 -
37 -EAPI=7
38 -
39 -if [[ ${PV} == *.* ]]; then
40 - MY_PN=systemd-stable
41 -else
42 - MY_PN=systemd
43 -fi
44 -
45 -MINKV="3.11"
46 -MUSL_PATCHSET="${PV}-r1"
47 -PYTHON_COMPAT=( python3_{8..10} )
48 -inherit flag-o-matic meson python-any-r1
49 -
50 -DESCRIPTION="Creates, deletes and cleans up volatile and temporary files and directories"
51 -HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd"
52 -SRC_URI="https://github.com/systemd/${MY_PN}/archive/v${PV}.tar.gz -> ${MY_PN}-${PV}.tar.gz
53 - elibc_musl? (
54 - https://dev.gentoo.org/~gyakovlev/distfiles/systemd-musl-patches-${MUSL_PATCHSET}.tar.xz
55 - https://dev.gentoo.org/~soap/distfiles/systemd-musl-patches-${MUSL_PATCHSET}.tar.xz
56 - )"
57 -
58 -LICENSE="BSD-2 GPL-2 LGPL-2.1 MIT public-domain"
59 -SLOT="0"
60 -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
61 -IUSE="selinux test"
62 -RESTRICT="!test? ( test )"
63 -
64 -RDEPEND="
65 - sys-apps/acl:0=
66 - >=sys-apps/util-linux-2.30:0=
67 - sys-libs/libcap:0=
68 - selinux? ( sys-libs/libselinux:0= )
69 - virtual/libcrypt:=
70 - !sys-apps/opentmpfiles
71 - !sys-apps/systemd
72 -"
73 -
74 -DEPEND="
75 - ${RDEPEND}
76 - >=sys-kernel/linux-headers-${MINKV}
77 -"
78 -
79 -BDEPEND="
80 - ${PYTHON_DEPS}
81 - $(python_gen_any_dep 'dev-python/jinja[${PYTHON_USEDEP}]')
82 - app-text/docbook-xml-dtd:4.2
83 - app-text/docbook-xml-dtd:4.5
84 - app-text/docbook-xsl-stylesheets
85 - dev-libs/libxslt
86 - dev-util/gperf
87 - >=dev-util/meson-0.46
88 - >=sys-apps/coreutils-8.16
89 - sys-devel/gettext
90 - virtual/pkgconfig
91 -"
92 -
93 -S="${WORKDIR}/${MY_PN}-${PV}"
94 -
95 -python_check_deps() {
96 - has_version -b "dev-python/jinja[${PYTHON_USEDEP}]"
97 -}
98 -
99 -pkg_pretend() {
100 - if [[ -n ${EPREFIX} ]]; then
101 - ewarn "systemd-tmpfiles uses un-prefixed paths at runtime.".
102 - fi
103 -}
104 -
105 -pkg_setup() {
106 - python-any-r1_pkg_setup
107 -}
108 -
109 -src_prepare() {
110 - # musl patchset from:
111 - # http://cgit.openembedded.org/openembedded-core/tree/meta/recipes-core/systemd/systemd
112 - # check SRC_URI_MUSL in systemd_${PV}.bb file for exact list of musl patches
113 - # we share patch tarball with sys-fs/udev
114 - if use elibc_musl; then
115 - einfo "applying musl patches and workarounds"
116 - eapply "${WORKDIR}/musl-patches"
117 -
118 - # avoids re-definition of struct ethhdr, also 0006-Include-netinet-if_ether.h.patch
119 - append-cppflags '-D__UAPI_DEF_ETHHDR=0'
120 -
121 - # src/basic/rlimit-util.c:46:19: error: format ‘%lu’ expects argument of type ‘long unsigned int’,
122 - # but argument 9 has type ‘rlim_t’ {aka ‘long long unsigned int’}
123 - # not a nice workaround, but it comes from debug messages and we don't really use this component.
124 - append-cflags '-Wno-error=format'
125 - fi
126 -
127 - default
128 -
129 - # https://bugs.gentoo.org/767403
130 - python_fix_shebang src/test/*.py
131 - python_fix_shebang test/*.py
132 - python_fix_shebang tools/*.py
133 -}
134 -
135 -src_configure() {
136 - # disable everything until configure says "enabled features: ACL, tmpfiles, standalone-binaries, static-libsystemd(true)"
137 - # and optionally selinux feature can be enabled to make tmpfiles secontext-aware
138 - local systemd_disable_options=(
139 - adm-group
140 - analyze
141 - apparmor
142 - audit
143 - backlight
144 - binfmt
145 - blkid
146 - bzip2
147 - coredump
148 - dbus
149 - efi
150 - elfutils
151 - environment-d
152 - fdisk
153 - gcrypt
154 - glib
155 - gshadow
156 - gnutls
157 - hibernate
158 - hostnamed
159 - hwdb
160 - idn
161 - ima
162 - initrd
163 - firstboot
164 - kernel-install
165 - kmod
166 - ldconfig
167 - libcryptsetup
168 - libcurl
169 - libfido2
170 - libidn
171 - libidn2
172 - libiptc
173 - link-networkd-shared
174 - link-systemctl-shared
175 - link-timesyncd-shared
176 - link-udev-shared
177 - localed
178 - logind
179 - lz4
180 - machined
181 - microhttpd
182 - networkd
183 - nscd
184 - nss-myhostname
185 - nss-resolve
186 - nss-systemd
187 - oomd
188 - openssl
189 - p11kit
190 - pam
191 - pcre2
192 - polkit
193 - portabled
194 - pstore
195 - pwquality
196 - randomseed
197 - resolve
198 - rfkill
199 - seccomp
200 - smack
201 - sysext
202 - sysusers
203 - timedated
204 - timesyncd
205 - tpm
206 - qrencode
207 - quotacheck
208 - userdb
209 - utmp
210 - vconsole
211 - wheel-group
212 - xdg-autostart
213 - xkbcommon
214 - xz
215 - zlib
216 - zstd
217 - )
218 -
219 - # prepend -D and append =false, e.g. zstd becomes -Dzstd=false
220 - systemd_disable_options=( ${systemd_disable_options[@]/#/-D} )
221 - systemd_disable_options=( ${systemd_disable_options[@]/%/=false} )
222 -
223 - local emesonargs=(
224 - -Drootprefix="${EPREFIX:-/}"
225 - -Dacl=true
226 - -Dtmpfiles=true
227 - -Dstandalone-binaries=true # this and below option does the magic
228 - -Dstatic-libsystemd=true
229 - -Dsysvinit-path=''
230 - ${systemd_disable_options[@]}
231 - $(meson_use selinux)
232 - )
233 - meson_src_configure
234 -}
235 -
236 -src_compile() {
237 - # tmpfiles and sysusers can be built as standalone and link systemd-shared in statically.
238 - # https://github.com/systemd/systemd/pull/16061 original implementation
239 - # we just need to pass -Dstandalone-binaries=true and
240 - # use <name>.standalone target below.
241 - # check meson.build for if have_standalone_binaries condition per target.
242 - local mytargets=(
243 - systemd-tmpfiles.standalone
244 - man/tmpfiles.d.5
245 - man/systemd-tmpfiles.8
246 - )
247 - meson_src_compile "${mytargets[@]}"
248 -}
249 -
250 -src_install() {
251 - # lean and mean installation, single binary and man-pages
252 - pushd "${BUILD_DIR}" > /dev/null || die
253 - into /
254 - newbin systemd-tmpfiles.standalone systemd-tmpfiles
255 -
256 - doman man/{systemd-tmpfiles.8,tmpfiles.d.5}
257 -
258 - popd > /dev/null || die
259 -
260 - # service files adapter from opentmpfiles
261 - newinitd "${FILESDIR}"/stmpfiles-dev.initd stmpfiles-dev
262 - newinitd "${FILESDIR}"/stmpfiles-setup.initd stmpfiles-setup
263 -
264 - # same content, but install as different file
265 - newconfd "${FILESDIR}"/stmpfiles.confd stmpfiles-dev
266 - newconfd "${FILESDIR}"/stmpfiles.confd stmpfiles-setup
267 -}
268 -
269 -src_test() {
270 - # 'meson test' will compile full systemd, but we can still outsmart it
271 - "${EPYTHON}" test/test-systemd-tmpfiles.py \
272 - "${BUILD_DIR}"/systemd-tmpfiles.standalone || die "${FUNCNAME} failed"
273 -}
274 -
275 -# stolen from opentmpfiles ebuild
276 -add_service() {
277 - local initd=$1
278 - local runlevel=$2
279 -
280 - elog "Auto-adding '${initd}' service to your ${runlevel} runlevel"
281 - mkdir -p "${EROOT}/etc/runlevels/${runlevel}"
282 - ln -snf "${EPREFIX}/etc/init.d/${initd}" "${EROOT}/etc/runlevels/${runlevel}/${initd}"
283 -}
284 -
285 -pkg_postinst() {
286 - if [[ -z $REPLACING_VERSIONS ]]; then
287 - add_service stmpfiles-dev sysinit
288 - add_service stmpfiles-setup boot
289 - fi
290 -}