Diff systemd-utils-259.3 with a systemd-utils-260.1-r1

/usr/portage/sys-apps/systemd-utils/systemd-utils-260.1-r1.ebuild 2026-05-04 19:17:05.193761523 +0300
9 9
TMPFILES_OPTIONAL=1
10 10
UDEV_OPTIONAL=1
11 11

  
12
inherit linux-info meson-multilib
13
inherit python-single-r1 secureboot shell-completion udev
12
inherit flag-o-matic linux-info meson-multilib
13
inherit python-single-r1 secureboot shell-completion toolchain-funcs udev
14 14

  
15 15
DESCRIPTION="Utilities split out from systemd for OpenRC users"
16 16
HOMEPAGE="https://systemd.io/"
......
22 22
LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
23 23
SLOT="0"
24 24
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
25
IUSE="+acl boot +kmod kernel-install selinux split-usr sysusers +tmpfiles test +udev ukify"
25
IUSE="+acl boot +kmod kernel-install selinux split-usr +sysctl sysusers +tmpfiles test +udev ukify"
26 26
REQUIRED_USE="
27
	|| ( kernel-install tmpfiles sysusers udev )
27
	|| ( kernel-install tmpfiles sysctl sysusers udev )
28 28
	boot? ( kernel-install )
29 29
	ukify? ( boot )
30 30
	${PYTHON_REQUIRED_USE}
......
34 34
COMMON_DEPEND="
35 35
	selinux? ( sys-libs/libselinux:0= )
36 36
	tmpfiles? (
37
		acl? ( sys-apps/acl:0= )
37
		acl? ( sys-apps/acl )
38 38
	)
39 39
	udev? (
40
		>=sys-apps/util-linux-2.30:0=
41
		acl? ( sys-apps/acl:0= )
42
		kmod? ( >=sys-apps/kmod-15:0= )
40
		>=sys-apps/util-linux-2.37
41
		acl? ( sys-apps/acl )
42
		kmod? ( >=sys-apps/kmod-15 )
43 43
	)
44 44
"
45 45
DEPEND="${COMMON_DEPEND}
46
	virtual/libcrypt:=[${MULTILIB_USEDEP}]
47 46
	>=sys-kernel/linux-headers-3.11
48 47
"
49 48

  
50 49
PEFILE_DEPEND='dev-python/pefile[${PYTHON_USEDEP}]'
51 50

  
52 51
RDEPEND="${COMMON_DEPEND}
53
	virtual/libcrypt:=
54 52
	boot? ( !<sys-boot/systemd-boot-250 )
55 53
	ukify? (
56 54
		${PYTHON_DEPS}
......
107 105
CONFIG_CHECK="~BLK_DEV_BSG ~DEVTMPFS ~!IDE ~INOTIFY_USER ~!SYSFS_DEPRECATED
108 106
	~!SYSFS_DEPRECATED_V2 ~SIGNALFD ~EPOLL ~FHANDLE ~NET ~UNIX"
109 107

  
108
PATCHES=(
109
	"${FILESDIR}/systemd-260.1-fuzz-journald.patch"
110
)
111

  
110 112
pkg_setup() {
111 113
	if [[ ${MERGE_TYPE} != buildonly ]] && use udev; then
112 114
		linux-info_pkg_setup
......
116 118

  
117 119
src_configure() {
118 120
	python_setup
121

  
122
	# Our toolchain sets F_S=2 by default w/ >= -O2, so we need
123
	# to unset F_S first, then explicitly set 2, to negate any default
124
	# and anything set by the user if they're choosing 3 (or if they've
125
	# modified GCC to set 3).
126
	#
127
	# malloc_usable_size doesn't play well with _F_S=3:
128
	#  https://github.com/systemd/systemd/issues/41459 (bug #971773)
129
	if tc-is-clang && tc-enables-fortify-source ; then
130
		# We can't unconditionally do this b/c we fortify needs
131
		# some level of optimisation.
132
		filter-flags -D_FORTIFY_SOURCE=3
133
		append-cppflags -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2
134
	fi
135

  
119 136
	meson-multilib_src_configure
120 137
}
121 138

  
......
128 145
		# default is developer, bug 918671
129 146
		-Dmode=release
130 147
		-Dlibc=$(usex elibc_musl musl glibc)
131
		-Dsysvinit-path=
132 148

  
133 149
		$(meson_native_use_feature boot bootloader)
134 150
		$(meson_native_use_bool kernel-install)
......
185 201
		-Dvconsole=false
186 202
		-Dwheel-group=false
187 203
		-Dxdg-autostart=false
188
		-Dxenctrl=false
189 204

  
190 205
		-Dbashcompletiondir=no
191 206
		-Ddbus-interfaces-dir=no
......
264 279

  
265 280
	installx "usr/$(get_libdir)/systemd/libsystemd-shared-${PV%%.*}.so"
266 281
	installx usr/share/locale
267
	installx usr/lib/sysctl.d
268 282

  
269 283
	if use boot; then
270 284
		installx usr/bin/bootctl
......
278 292
		installx usr/lib/kernel
279 293
	fi
280 294

  
295
	if use sysctl; then
296
		installx usr/lib/sysctl.d
297
		installx usr/lib/systemd/systemd-sysctl
298
		installx usr/share/man/man5/sysctl.d.5
299
		installx usr/share/man/man8/systemd-sysctl.8
300
		mv -v "${ed}"/usr/share/man/man8/systemd-sysctl.service.8 \
301
			"${ED}"/usr/share/man/man8/systemd-sysctl.8 || die
302
	fi
303

  
281 304
	if use sysusers; then
282 305
		installx usr/bin/systemd-sysusers
283 306
		installx usr/share/man/{man5/sysusers.d.5,man8/systemd-sysusers.8}
......
297 320
			# elogind installs udev rules that hard-code /bin/udevadm
298 321
			dosym ../usr/bin/udevadm /bin/udevadm
299 322
		fi
300
		installx usr/lib/systemd/systemd-sysctl
301 323
		installx usr/lib/systemd/systemd-udevd
302 324
		installx usr/lib/systemd/network/99-default.link
303 325
		installx usr/lib/udev
326
		if ! use sysctl; then
327
			rm "${ED}"/usr/lib/udev/rules.d/99-systemd.rules || die
328
		fi
304 329
		installx usr/share/pkgconfig/udev.pc
305
		installx usr/share/man/man5/{iocost.conf.5,systemd.link.5,udev.conf.5}
306
		installx usr/share/man/man7/{hwdb.7,udev.7}
307
		installx usr/share/man/man8/{systemd-hwdb.8,udevadm.8}
330
		installx usr/share/man/man5/{iocost.conf,systemd.link,udev.conf}.5
331
		installx usr/share/man/man7/{hwdb,udev}.7
332
		installx usr/share/man/man8/{systemd-hwdb,udevadm}.8
308 333
		mv -v "${ed}"/usr/share/man/man8/systemd-udevd.service.8 \
309 334
			"${ED}"/usr/share/man/man8/systemd-udevd.8 || die
310 335
		installx usr/share/man/man3/libudev.3 "usr/share/man/man3/udev_*"
......
388 413
		add_service systemd-tmpfiles-setup boot
389 414
	fi
390 415
	if use udev; then
391
		ebegin "Updating hwdb"
392
		systemd-hwdb --root="${ROOT}" update
393
		eend $?
416
		udev_hwdb_update
394 417
		udev_reload
395 418
	fi
396 419
}
Thank you!