From cc8be892b3220621072f3136a9f3eddf8c0a3e4e Mon Sep 17 00:00:00 2001 From: triallax Date: Tue, 30 May 2023 17:48:30 +0100 Subject: [PATCH 1/2] eudev: update to 3.2.12. --- ...80239647d37e5cfe320c422cce879c2e0d2c.patch | 20 ------------------ srcpkgs/eudev/template | 21 +++++++++---------- 2 files changed, 10 insertions(+), 31 deletions(-) delete mode 100644 srcpkgs/eudev/patches/9d9e80239647d37e5cfe320c422cce879c2e0d2c.patch diff --git a/srcpkgs/eudev/patches/9d9e80239647d37e5cfe320c422cce879c2e0d2c.patch b/srcpkgs/eudev/patches/9d9e80239647d37e5cfe320c422cce879c2e0d2c.patch deleted file mode 100644 index b36b84f75496..000000000000 --- a/srcpkgs/eudev/patches/9d9e80239647d37e5cfe320c422cce879c2e0d2c.patch +++ /dev/null @@ -1,20 +0,0 @@ -From 9d9e80239647d37e5cfe320c422cce879c2e0d2c Mon Sep 17 00:00:00 2001 -From: oreo639 <31916379+Oreo639@users.noreply.github.com> -Date: Sat, 9 Apr 2022 05:39:56 -0700 -Subject: [PATCH] udev: add udev_dir as synonym of udevdir - ---- - src/udev/udev.pc.in | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/udev/udev.pc.in b/src/udev/udev.pc.in -index 4a9d867b8..cccebb245 100644 ---- a/src/udev/udev.pc.in -+++ b/src/udev/udev.pc.in -@@ -3,4 +3,5 @@ Description: eudev - Version: @UDEV_VERSION@ - prefix=@prefix@ - exec_prefix=@exec_prefix@ --udevdir=@udevlibexecdir@ -+udev_dir=@udevlibexecdir@ -+udevdir=${udev_dir} diff --git a/srcpkgs/eudev/template b/srcpkgs/eudev/template index 1639a17d3448..27c652e974ea 100644 --- a/srcpkgs/eudev/template +++ b/srcpkgs/eudev/template @@ -3,33 +3,32 @@ _UDEV_VERSION="243" # compatible udev version provided pkgname=eudev -version=3.2.11 +version=3.2.12 revision=1 build_style=gnu-configure -configure_args="--enable-hwdb --enable-manpages --disable-introspection" +configure_args="--enable-hwdb --enable-manpages" hostmakedepends="pkg-config gperf" makedepends="libblkid-devel libkmod-devel" checkdepends="xz tar perl" short_desc="Fork of systemd-udev (enhanced userland device daemon)" maintainer="Enno Boland " license="GPL-2.0-or-later" -homepage="https://github.com/eudev-project" +homepage="https://github.com/eudev-project/eudev" +changelog="https://github.com/eudev-project/eudev/releases" distfiles="https://github.com/eudev-project/eudev/releases/download/v${version}/eudev-${version}.tar.gz" -checksum=19847cafec67897da855fde56f9dc7d92e21c50e450aa79068a7e704ed44558b +checksum=ccdd64ec3c381d3c3ed0e99d2e70d1f62988c7763de89ca7bdffafa5eacb9ad8 conf_files="/etc/udev/udev.conf" +if [ "$XBPS_ALLOW_CHROOT_BREAKOUT" ]; then + # requires unshare(2) which is not available in chroot + make_check=no +fi + post_install() { mv "${DESTDIR}/etc/udev/hwdb.d" "${DESTDIR}/usr/lib/udev" vsv udevd } -do_check() { - # requires unshare(2) which is not available in chroot - if [ ! "$XBPS_ALLOW_CHROOT_BREAKOUT" ]; then - make check - fi -} - eudev-libudev-devel_package() { provides="libudev-devel-${_UDEV_VERSION}_${revision}" depends="eudev-libudev>=${version}_${revision}" From 08675ad6ecec0bae985cad04b6c0e0a819ccd124 Mon Sep 17 00:00:00 2001 From: triallax Date: Mon, 12 Jun 2023 19:26:50 +0100 Subject: [PATCH 2/2] base-files: add 'sgx' group. --- srcpkgs/base-files/files/group | 1 + srcpkgs/base-files/template | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/srcpkgs/base-files/files/group b/srcpkgs/base-files/files/group index dfad1019792b..455c937b1aef 100644 --- a/srcpkgs/base-files/files/group +++ b/srcpkgs/base-files/files/group @@ -24,6 +24,7 @@ kvm:x:24: input:x:25: plugdev:x:26: usbmon:x:27: +sgx:x:28: nogroup:x:99: users:x:100: xbuilder:x:101: diff --git a/srcpkgs/base-files/template b/srcpkgs/base-files/template index 27b83604b648..5594c5a0efb4 100644 --- a/srcpkgs/base-files/template +++ b/srcpkgs/base-files/template @@ -1,7 +1,7 @@ # Template file for 'base-files' pkgname=base-files version=0.143 -revision=1 +revision=2 bootstrap=yes depends="xbps-triggers" short_desc="Void Linux base system files" @@ -29,7 +29,7 @@ conf_files=" replaces="base-directories>=0" # New system groups -system_groups="kvm:24 plugdev:26 usbmon:27" +system_groups="kvm:24 plugdev:26 usbmon:27 sgx:28" do_install() { # Create bin and lib dirs and symlinks.