[gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-tmpfiles/, sys-apps/systemd-tmpfiles/files/

[Georgy Yakovlev]

commit:     24543d0cf460e3cf58a55ae4da5228dffb39cb4d
Author:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 24 06:13:54 2021 +0000
Commit:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Fri Dec 24 09:04:02 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=24543d0c

sys-apps/systemd-tmpfiles: drop 249.2

Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>

 sys-apps/systemd-tmpfiles/Manifest                 |   2 -
 .../files/249-sys-include-posix.patch              |  67 ------
 .../files/systemd-tmpfiles-249.2-meson-0.60.patch  |  26 --
 .../systemd-tmpfiles/systemd-tmpfiles-249.2.ebuild | 263 ---------------------
 4 files changed, 358 deletions(-)

diff --git a/sys-apps/systemd-tmpfiles/Manifest b/sys-apps/systemd-tmpfiles/Manifest
index 766449cac780..56ae06fe69b3 100644
--- a/sys-apps/systemd-tmpfiles/Manifest
+++ b/sys-apps/systemd-tmpfiles/Manifest
@@ -1,4 +1,2 @@
-DIST systemd-musl-patches-249.1-r1.tar.xz 24536 BLAKE2B 25135519112b2a1c638046addb6971ea1997fc7dd8626de90d162a4beb6383b5724df78a14c73be1283df58632fb4a0fcb32f90f50f1886f31a1aded15e9567c SHA512 4655f2a06e1b3310cb27b839360353dfbfdbdaa86f4392aeebf63f63efd441d1953f7ac108be7fed7ea721596d191988ed999e34443e47922afca92db779175a
 DIST systemd-musl-patches-249.5-r1.tar.xz 25148 BLAKE2B 6717291b5335997dcc327764beffc4ded50a5ac0e777bb3c540b5e355bee419c3d9b4a5605c239392d4c1b0e70792bc87282fa15dc9c09a0465b5608f2909006 SHA512 4bb7566437c280e75402fc435a3437aedad127f7b94c9bd54b94e9e1e7507409ad0898681f23e813b9b47414f58e4ca413b6d4e520bbbf578faec09054bf7f9b
-DIST systemd-stable-249.2.tar.gz 10591728 BLAKE2B fb24c681cf2328aa26fa49a8ba20cccd1ee0fae82ec9f9931a69eaa377fc01b2ece12fdf407444514d494b8ac1418f155b0fceeff4925bebaba691f0b8a2acc8 SHA512 4f42a0b93156529a464545361436fa98193e12a7e0809315b9fdedbcf33b81dd2037acac27fb0dfefcb2679bc49ebb6da4d152ecb4b15db797c81f7ca4588a11
 DIST systemd-stable-249.5.tar.gz 10597897 BLAKE2B 5c573322ef9bcd9d019776d6e2d8625a741c1535c0d06661b5666c2438a70cfc4dc182919bb419829de27a4d93c16717ce24e668faf9bd6b09e57f8bd88be725 SHA512 d6f1a5a6f03f0ed05b111aee75da509c5868c523af6209f33e630724dd0c7e0d0abf16920795d587e6c31a5915d247ebc613cf26d4aecf39f82ebb0690fab75f

diff --git a/sys-apps/systemd-tmpfiles/files/249-sys-include-posix.patch b/sys-apps/systemd-tmpfiles/files/249-sys-include-posix.patch
deleted file mode 100644
index 6d9e0039b9c9..000000000000
--- a/sys-apps/systemd-tmpfiles/files/249-sys-include-posix.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-Silence annoying #warning's on musl
-
-https://github.com/systemd/systemd/pull/20362
-https://github.com/systemd/systemd/pull/20364
-
-From f8d54f7810aeea5ff27a5db03e1aab7ea54c8268 Mon Sep 17 00:00:00 2001
-From: David Seifert <soap@g.o>
-Date: Mon, 2 Aug 2021 12:41:38 +0200
-Subject: [PATCH] Use correct `<fcntl.h>` include
-
-* `<sys/fcntl.h>` is not specified in POSIX
----
- src/basic/fileio.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/basic/fileio.h b/src/basic/fileio.h
-index af797cfafdbf..4295b84a85c5 100644
---- a/src/basic/fileio.h
-+++ b/src/basic/fileio.h
-@@ -2,11 +2,11 @@
- #pragma once
- 
- #include <dirent.h>
-+#include <fcntl.h>
- #include <stdbool.h>
- #include <stddef.h>
- #include <stdio.h>
- #include <sys/stat.h>
--#include <sys/fcntl.h>
- #include <sys/types.h>
- 
- #include "macro.h"
-From 2b6c0bb2a341c95223ce672249e43c743b03d78c Mon Sep 17 00:00:00 2001
-From: David Seifert <soap@g.o>
-Date: Mon, 2 Aug 2021 16:09:10 +0200
-Subject: [PATCH] Use correct `<poll.h>` include
-
-* `<sys/poll.h>` is not specified in POSIX
----
- src/shared/nscd-flush.c | 2 +-
- src/shared/varlink.c    | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/shared/nscd-flush.c b/src/shared/nscd-flush.c
-index dfc47c423441..19e16d93455c 100644
---- a/src/shared/nscd-flush.c
-+++ b/src/shared/nscd-flush.c
-@@ -1,5 +1,5 @@
- /* SPDX-License-Identifier: LGPL-2.1-or-later */
--#include <sys/poll.h>
-+#include <poll.h>
- 
- #include "fd-util.h"
- #include "io-util.h"
-diff --git a/src/shared/varlink.c b/src/shared/varlink.c
-index 3a53c16a7242..4033947d3b8c 100644
---- a/src/shared/varlink.c
-+++ b/src/shared/varlink.c
-@@ -1,7 +1,7 @@
- /* SPDX-License-Identifier: LGPL-2.1-or-later */
- 
- #include <malloc.h>
--#include <sys/poll.h>
-+#include <poll.h>
- 
- #include "alloc-util.h"
- #include "errno-util.h"

diff --git a/sys-apps/systemd-tmpfiles/files/systemd-tmpfiles-249.2-meson-0.60.patch b/sys-apps/systemd-tmpfiles/files/systemd-tmpfiles-249.2-meson-0.60.patch
deleted file mode 100644
index b931912be23e..000000000000
--- a/sys-apps/systemd-tmpfiles/files/systemd-tmpfiles-249.2-meson-0.60.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-https://github.com/systemd/systemd/commit/c29537f39e4f413a6cbfe9669fa121bdd6d8b36f
-https://bugs.gentoo.org/821547
-
-From: Dan Streetman <ddstreet@×××××××××.com>
-Date: Fri, 3 Sep 2021 12:43:33 -0400
-Subject: [PATCH] meson.build: change operator combining bools from + to and
-
-upstream meson stopped allowing combining boolean with the plus
-operator, and now requires using the logical and operator
-
-reference:
-https://github.com/mesonbuild/meson/commit/43302d3296baff6aeaf8e03f5d701b0402e37a6c
-
-Fixes: #20632
---- a/meson.build
-+++ b/meson.build
-@@ -35,7 +35,7 @@ conf.set10('BUILD_MODE_DEVELOPER', get_option('mode') == 'developer',
- 
- want_ossfuzz = get_option('oss-fuzz')
- want_libfuzzer = get_option('llvm-fuzz')
--if want_ossfuzz + want_libfuzzer > 1
-+if want_ossfuzz and want_libfuzzer
-         error('only one of oss-fuzz or llvm-fuzz can be specified')
- endif
- 
-

diff --git a/sys-apps/systemd-tmpfiles/systemd-tmpfiles-249.2.ebuild b/sys-apps/systemd-tmpfiles/systemd-tmpfiles-249.2.ebuild
deleted file mode 100644
index ad80dc82cf86..000000000000
--- a/sys-apps/systemd-tmpfiles/systemd-tmpfiles-249.2.ebuild
+++ /dev/null
@@ -1,263 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-if [[ ${PV} == *.* ]]; then
-	MY_PN=systemd-stable
-else
-	 MY_PN=systemd
-fi
-
-MINKV="3.11"
-MUSL_PATCHSET="${PV%.*}.1-r1"
-PYTHON_COMPAT=( python3_{8..10} )
-inherit flag-o-matic meson python-any-r1
-
-DESCRIPTION="Creates, deletes and cleans up volatile and temporary files and directories"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd"
-SRC_URI="https://github.com/systemd/${MY_PN}/archive/v${PV}.tar.gz -> ${MY_PN}-${PV}.tar.gz
-	elibc_musl? (
-		https://dev.gentoo.org/~gyakovlev/distfiles/systemd-musl-patches-${MUSL_PATCHSET}.tar.xz
-		https://dev.gentoo.org/~soap/distfiles/systemd-musl-patches-${MUSL_PATCHSET}.tar.xz
-	)"
-
-LICENSE="BSD-2 GPL-2 LGPL-2.1 MIT public-domain"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="selinux test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	sys-apps/acl:0=
-	>=sys-apps/util-linux-2.30:0=
-	sys-libs/libcap:0=
-	selinux? ( sys-libs/libselinux:0= )
-	virtual/libcrypt:=
-	!sys-apps/opentmpfiles
-	!sys-apps/systemd
-"
-
-DEPEND="
-	${RDEPEND}
-	>=sys-kernel/linux-headers-${MINKV}
-"
-
-BDEPEND="
-	${PYTHON_DEPS}
-	$(python_gen_any_dep 'dev-python/jinja[${PYTHON_USEDEP}]')
-	app-text/docbook-xml-dtd:4.2
-	app-text/docbook-xml-dtd:4.5
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	dev-util/gperf
-	>=dev-util/meson-0.46
-	>=sys-apps/coreutils-8.16
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-PATCHES=(
-	# backport from 250 to silence musl warnings
-	"${FILESDIR}/249-sys-include-posix.patch"
-	"${FILESDIR}/${P}-meson-0.60.patch"
-)
-
-python_check_deps() {
-	has_version -b "dev-python/jinja[${PYTHON_USEDEP}]"
-}
-
-pkg_pretend() {
-	if [[ -n ${EPREFIX} ]]; then
-		ewarn "systemd-tmpfiles uses un-prefixed paths at runtime.".
-	fi
-}
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	# musl patchset from:
-	# http://cgit.openembedded.org/openembedded-core/tree/meta/recipes-core/systemd/systemd
-	# check SRC_URI_MUSL in systemd_${PV}.bb file for exact list of musl patches
-	# we share patch tarball with sys-fs/udev
-	if use elibc_musl; then
-		einfo "applying musl patches and workarounds"
-		eapply "${WORKDIR}/musl-patches"
-
-		# avoids re-definition of struct ethhdr, also 0006-Include-netinet-if_ether.h.patch
-		append-cppflags '-D__UAPI_DEF_ETHHDR=0'
-
-		# src/basic/rlimit-util.c:46:19: error: format ‘%lu’ expects argument of type ‘long unsigned int’,
-		# but argument 9 has type ‘rlim_t’ {aka ‘long long unsigned int’}
-		# not a nice workaround, but it comes from debug messages and we don't really use this component.
-		append-cflags '-Wno-error=format'
-	fi
-
-	default
-
-	# https://bugs.gentoo.org/767403
-	python_fix_shebang src/test/*.py
-	python_fix_shebang test/*.py
-	python_fix_shebang tools/*.py
-}
-
-src_configure() {
-	# disable everything until configure says "enabled features: ACL, tmpfiles, standalone-binaries, static-libsystemd(true)"
-	# and optionally selinux feature can be enabled to make tmpfiles secontext-aware
-	local systemd_disable_options=(
-		adm-group
-		analyze
-		apparmor
-		audit
-		backlight
-		binfmt
-		blkid
-		bzip2
-		coredump
-		dbus
-		efi
-		elfutils
-		environment-d
-		fdisk
-		gcrypt
-		glib
-		gshadow
-		gnutls
-		hibernate
-		hostnamed
-		hwdb
-		idn
-		ima
-		initrd
-		firstboot
-		kernel-install
-		kmod
-		ldconfig
-		libcryptsetup
-		libcurl
-		libfido2
-		libidn
-		libidn2
-		libiptc
-		link-networkd-shared
-		link-systemctl-shared
-		link-timesyncd-shared
-		link-udev-shared
-		localed
-		logind
-		lz4
-		machined
-		microhttpd
-		networkd
-		nscd
-		nss-myhostname
-		nss-resolve
-		nss-systemd
-		oomd
-		openssl
-		p11kit
-		pam
-		pcre2
-		polkit
-		portabled
-		pstore
-		pwquality
-		randomseed
-		resolve
-		rfkill
-		seccomp
-		smack
-		sysext
-		sysusers
-		timedated
-		timesyncd
-		tpm
-		qrencode
-		quotacheck
-		userdb
-		utmp
-		vconsole
-		wheel-group
-		xdg-autostart
-		xkbcommon
-		xz
-		zlib
-		zstd
-	)
-
-	# prepend -D and append =false, e.g. zstd becomes -Dzstd=false
-	systemd_disable_options=( ${systemd_disable_options[@]/#/-D} )
-	systemd_disable_options=( ${systemd_disable_options[@]/%/=false} )
-
-	local emesonargs=(
-		-Drootprefix="${EPREFIX:-/}"
-		-Dacl=true
-		-Dtmpfiles=true
-		-Dstandalone-binaries=true # this and below option does the magic
-		-Dstatic-libsystemd=true
-		-Dsysvinit-path=''
-		${systemd_disable_options[@]}
-		$(meson_use selinux)
-	)
-	meson_src_configure
-}
-
-src_compile() {
-	# tmpfiles and sysusers can be built as standalone and link systemd-shared in statically.
-	# https://github.com/systemd/systemd/pull/16061 original implementation
-	# we just need to pass -Dstandalone-binaries=true and
-	# use <name>.standalone target below.
-	# check meson.build for if have_standalone_binaries condition per target.
-	local mytargets=(
-		systemd-tmpfiles.standalone
-		man/tmpfiles.d.5
-		man/systemd-tmpfiles.8
-	)
-	meson_src_compile "${mytargets[@]}"
-}
-
-src_install() {
-	# lean and mean installation, single binary and man-pages
-	pushd "${BUILD_DIR}" > /dev/null || die
-	into /
-	newbin systemd-tmpfiles.standalone systemd-tmpfiles
-
-	doman man/{systemd-tmpfiles.8,tmpfiles.d.5}
-
-	popd > /dev/null || die
-
-	# service files adapter from opentmpfiles
-	newinitd "${FILESDIR}"/stmpfiles-dev.initd stmpfiles-dev
-	newinitd "${FILESDIR}"/stmpfiles-setup.initd stmpfiles-setup
-
-	# same content, but install as different file
-	newconfd "${FILESDIR}"/stmpfiles.confd stmpfiles-dev
-	newconfd "${FILESDIR}"/stmpfiles.confd stmpfiles-setup
-}
-
-src_test() {
-	# 'meson test' will compile full systemd, but we can still outsmart it
-	"${EPYTHON}" test/test-systemd-tmpfiles.py \
-		"${BUILD_DIR}"/systemd-tmpfiles.standalone || die "${FUNCNAME} failed"
-}
-
-# stolen from opentmpfiles ebuild
-add_service() {
-	local initd=$1
-	local runlevel=$2
-
-	elog "Auto-adding '${initd}' service to your ${runlevel} runlevel"
-	mkdir -p "${EROOT}/etc/runlevels/${runlevel}"
-	ln -snf "${EPREFIX}/etc/init.d/${initd}" "${EROOT}/etc/runlevels/${runlevel}/${initd}"
-}
-
-pkg_postinst() {
-	if [[ -z $REPLACING_VERSIONS ]]; then
-		add_service stmpfiles-dev sysinit
-		add_service stmpfiles-setup boot
-	fi
-}