diff options
| -rw-r--r-- | .SRCINFO | 46 | ||||
| -rw-r--r-- | 0001-tmpfiles-add-and-install-for-uuidd-generate-run-uuid.patch | 83 | ||||
| -rw-r--r-- | PKGBUILD | 55 |
3 files changed, 58 insertions, 126 deletions
@@ -1,7 +1,7 @@ pkgbase = util-linux-selinux pkgdesc = SELinux aware miscellaneous system utilities for Linux - pkgver = 2.39.3 - pkgrel = 2 + pkgver = 2.40 + pkgrel = 1 url = https://github.com/util-linux/util-linux arch = x86_64 arch = aarch64 @@ -15,19 +15,18 @@ pkgbase = util-linux-selinux license = ISC license = LGPL-2.1-or-later license = LicenseRef-PublicDomain - makedepends = git - makedepends = meson makedepends = asciidoctor makedepends = bash-completion + makedepends = git makedepends = libcap-ng - makedepends = libutempter + makedepends = libselinux makedepends = libxcrypt + makedepends = meson makedepends = python + makedepends = sqlite makedepends = systemd - makedepends = libselinux options = strip - source = git+https://github.com/util-linux/util-linux#tag=bc0e318941a0539be1205ea1ac1dbfa834b7d033?signed - source = 0001-tmpfiles-add-and-install-for-uuidd-generate-run-uuid.patch + source = git+https://github.com/util-linux/util-linux#tag=v2.40?signed source = util-linux-BSD-2-Clause.txt::https://raw.githubusercontent.com/Cyan4973/xxHash/f035303b8a86c1db9be70cbb638678ef6ef4cb2d/LICENSE source = pam-login source = pam-common @@ -39,8 +38,7 @@ pkgbase = util-linux-selinux source = rfkill-unblock_.service source = rfkill-block_.service validpgpkeys = B0C64D14301CC6EFAEDF60E4E4B71D5EEC39C284 - sha256sums = SKIP - sha256sums = d0864b925b14aaf0560afeb8df4257c0603c4e5bfce70f25e0ed3c6ab6fc58f6 + sha256sums = 153ae22d30a04e8c3ef1edbac63081f21b2d7622467dd7bf324f7f45e45b343d sha256sums = 6ffedbc0f7878612d2b23589f1ff2ab15633e1df7963a5d9fc750ec5500c7e7a sha256sums = ee917d55042f78b8bb03f5467e5233e3e2ddc2fe01e302bc53b218003fe22275 sha256sums = 57e057758944f4557762c6def939410c04ca5803cbdd2bfa2153ce47ffe7a4af @@ -53,28 +51,30 @@ pkgbase = util-linux-selinux sha256sums = a22e0a037e702170c7d88460cc9c9c2ab1d3e5c54a6985cd4a164ea7beff1b36 pkgname = util-linux-selinux + depends = coreutils-selinux + depends = file + depends = libmagic.so depends = glibc + depends = libcap-ng + depends = libselinux + depends = libselinux.so + depends = libxcrypt + depends = libcrypt.so + depends = ncurses + depends = libncursesw.so depends = pam-selinux + depends = readline depends = shadow-selinux - depends = coreutils-selinux depends = systemd-libs depends = libsystemd.so depends = libudev.so - depends = libcap-ng - depends = libutempter - depends = libxcrypt - depends = libcrypt.so depends = util-linux-libs-selinux - depends = libmagic.so - depends = libncursesw.so - depends = readline depends = zlib - optdepends = python: python bindings to libmount optdepends = words: default dictionary for look provides = rfkill provides = hardlink - provides = util-linux=2.39.3-2 - provides = selinux-util-linux=2.39.3-2 + provides = util-linux=2.40-1 + provides = selinux-util-linux=2.40-1 conflicts = rfkill conflicts = hardlink conflicts = util-linux @@ -90,7 +90,9 @@ pkgname = util-linux-selinux pkgname = util-linux-libs-selinux pkgdesc = util-linux-selinux runtime libraries + depends = glibc depends = libselinux + depends = sqlite optdepends = python: python bindings to libmount provides = libutil-linux provides = libblkid.so @@ -98,7 +100,7 @@ pkgname = util-linux-libs-selinux provides = libmount.so provides = libsmartcols.so provides = libuuid.so - provides = util-linux-libs=2.39.3-2 + provides = util-linux-libs=2.40-1 provides = libutil-linux-selinux conflicts = util-linux-libs conflicts = libutil-linux-selinux diff --git a/0001-tmpfiles-add-and-install-for-uuidd-generate-run-uuid.patch b/0001-tmpfiles-add-and-install-for-uuidd-generate-run-uuid.patch deleted file mode 100644 index 1bad1fdde534..000000000000 --- a/0001-tmpfiles-add-and-install-for-uuidd-generate-run-uuid.patch +++ /dev/null @@ -1,83 +0,0 @@ -From 127ac4c8de64e954dbb4d1cf9b5e365639796cc7 Mon Sep 17 00:00:00 2001 -From: Christian Hesse <mail@eworm.de> -Date: Thu, 22 Feb 2024 08:48:55 +0100 -Subject: [PATCH 1/1] tmpfiles: add and install for uuidd, generate /run/uuidd - & /var/lib/libuuid - -These directories are requird for uuidd, so let systemd-tmpfiles create them. - -Signed-off-by: Christian Hesse <mail@eworm.de> -(cherry picked from commit 2b7410544c90f56fbb9abca999ed48feffbe31ef) ---- - misc-utils/.gitignore | 1 + - misc-utils/Makemodule.am | 4 +++- - misc-utils/meson.build | 8 ++++++++ - misc-utils/uuidd-tmpfiles.conf.in | 6 ++++++ - 4 files changed, 18 insertions(+), 1 deletion(-) - create mode 100644 misc-utils/uuidd-tmpfiles.conf.in - -diff --git a/misc-utils/.gitignore b/misc-utils/.gitignore -index c0287917d..6ceec2057 100644 ---- a/misc-utils/.gitignore -+++ b/misc-utils/.gitignore -@@ -3,3 +3,4 @@ uuidd.8 - uuidd.rc - uuidd.service - uuidd.socket -+uuidd-tmpfiles.conf -diff --git a/misc-utils/Makemodule.am b/misc-utils/Makemodule.am -index 71548c9f9..05804ccff 100644 ---- a/misc-utils/Makemodule.am -+++ b/misc-utils/Makemodule.am -@@ -128,6 +128,7 @@ uuidd_SOURCES = misc-utils/uuidd.c lib/monotonic.c lib/timer.c - if HAVE_SYSTEMD - uuidd_LDADD += $(SYSTEMD_LIBS) $(SYSTEMD_DAEMON_LIBS) - uuidd_CFLAGS += $(SYSTEMD_CFLAGS) $(SYSTEMD_DAEMON_CFLAGS) -+tmpfiles_DATA += misc-utils/uuidd-tmpfiles.conf - systemdsystemunit_DATA += \ - misc-utils/uuidd.service \ - misc-utils/uuidd.socket -@@ -142,7 +143,8 @@ endif # BUILD_UUIDD - PATHFILES += \ - misc-utils/uuidd.rc \ - misc-utils/uuidd.service \ -- misc-utils/uuidd.socket -+ misc-utils/uuidd.socket \ -+ misc-utils/uuidd-tmpfiles.conf - - if BUILD_BLKID - sbin_PROGRAMS += blkid -diff --git a/misc-utils/meson.build b/misc-utils/meson.build -index 7d21d02c1..026d92d11 100644 ---- a/misc-utils/meson.build -+++ b/misc-utils/meson.build -@@ -76,6 +76,14 @@ test_uuidd_sources = files( - ) - - if build_uuidd and systemd.found() -+ uuidd_tmpfiles = configure_file( -+ input : 'uuidd-tmpfiles.conf.in', -+ output : 'uuidd-tmpfiles.conf', -+ configuration : conf) -+ install_data( -+ uuidd_tmpfiles, -+ install_dir : '/usr/lib/tmpfiles.d') -+ - uuidd_service = configure_file( - input : 'uuidd.service.in', - output : 'uuidd.service', -diff --git a/misc-utils/uuidd-tmpfiles.conf.in b/misc-utils/uuidd-tmpfiles.conf.in -new file mode 100644 -index 000000000..9c2005bdf ---- /dev/null -+++ b/misc-utils/uuidd-tmpfiles.conf.in -@@ -0,0 +1,6 @@ -+# This file is part of uuidd. -+# -+# See tmpfiles.d(5) for details -+# -+d @runstatedir@/uuidd 2775 uuidd uuidd - -+d /var/lib/libuuid 0755 uuidd uuidd - --- -2.44.0 - @@ -10,10 +10,9 @@ pkgbase=util-linux-selinux pkgname=(util-linux-selinux util-linux-libs-selinux) -_tag='bc0e318941a0539be1205ea1ac1dbfa834b7d033' # git rev-parse v${_tag_name} -_tag_name=2.39.3 -pkgver=${_tag_name/-/} -pkgrel=2 +_tag='2.40' +pkgver="${_tag/-/}" +pkgrel=1 pkgdesc='SELinux aware miscellaneous system utilities for Linux' url='https://github.com/util-linux/util-linux' arch=('x86_64' 'aarch64') @@ -23,8 +22,16 @@ groups=('selinux') # systemd depends on libutil-linux and util-linux depends on libudev # provided by libsystemd (FS#39767). To break this cycle, make # util-linux-selinux depend on systemd at build time. -makedepends=('git' 'meson' 'asciidoctor' 'bash-completion' 'libcap-ng' - 'libutempter' 'libxcrypt' 'python' 'systemd' 'libselinux') +makedepends=('asciidoctor' + 'bash-completion' + 'git' + 'libcap-ng' + 'libselinux' + 'libxcrypt' + 'meson' + 'python' + 'sqlite' + 'systemd') license=( 'BSD-2-Clause' 'BSD-3-Clause' @@ -38,16 +45,14 @@ license=( ) options=('strip') validpgpkeys=('B0C64D14301CC6EFAEDF60E4E4B71D5EEC39C284') # Karel Zak -source=("git+https://github.com/util-linux/util-linux#tag=${_tag}?signed" - '0001-tmpfiles-add-and-install-for-uuidd-generate-run-uuid.patch' +source=("git+https://github.com/util-linux/util-linux#tag=v${_tag}?signed" ${pkgbase/-selinux}-BSD-2-Clause.txt::https://raw.githubusercontent.com/Cyan4973/xxHash/f035303b8a86c1db9be70cbb638678ef6ef4cb2d/LICENSE pam-{login,common,remote,runuser,su} 'util-linux.sysusers' '60-rfkill.rules' 'rfkill-unblock_.service' 'rfkill-block_.service') -sha256sums=('SKIP' - 'd0864b925b14aaf0560afeb8df4257c0603c4e5bfce70f25e0ed3c6ab6fc58f6' +sha256sums=('153ae22d30a04e8c3ef1edbac63081f21b2d7622467dd7bf324f7f45e45b343d' '6ffedbc0f7878612d2b23589f1ff2ab15633e1df7963a5d9fc750ec5500c7e7a' 'ee917d55042f78b8bb03f5467e5233e3e2ddc2fe01e302bc53b218003fe22275' '57e057758944f4557762c6def939410c04ca5803cbdd2bfa2153ce47ffe7a4af' @@ -82,9 +87,6 @@ prepare() { # do not mark dirty sed -i '/dirty=/c dirty=' tools/git-version-gen - - # tmpfiles: add and install for uuidd, generate /run/uuidd & /var/lib/libuuid - patch -Np1 < ../0001-tmpfiles-add-and-install-for-uuidd-generate-run-uuid.patch } build() { @@ -92,6 +94,7 @@ build() { -Dfs-search-path=/usr/bin:/usr/local/bin -Dlibuser=disabled + -Dlibutempter=disabled -Dncurses=disabled -Dncursesw=enabled -Deconf=disabled @@ -116,11 +119,20 @@ package_util-linux-selinux() { provides=('rfkill' 'hardlink' "${pkgname/-selinux}=${pkgver}-${pkgrel}" "selinux-${pkgname/-selinux}=${pkgver}-${pkgrel}") - depends=('glibc' 'pam-selinux' 'shadow-selinux' 'coreutils-selinux' 'systemd-libs' 'libsystemd.so' - 'libudev.so' 'libcap-ng' 'libutempter' 'libxcrypt' 'libcrypt.so' 'util-linux-libs-selinux' - 'libmagic.so' 'libncursesw.so' 'readline' 'zlib') - optdepends=('python: python bindings to libmount' - 'words: default dictionary for look') + depends=('coreutils-selinux' + 'file' 'libmagic.so' + 'glibc' + 'libcap-ng' + 'libselinux' 'libselinux.so' + 'libxcrypt' 'libcrypt.so' + 'ncurses' 'libncursesw.so' + 'pam-selinux' + 'readline' + 'shadow-selinux' + 'systemd-libs' 'libsystemd.so' 'libudev.so' + 'util-linux-libs-selinux' + 'zlib') + optdepends=('words: default dictionary for look') backup=(etc/pam.d/chfn etc/pam.d/chsh etc/pam.d/login @@ -179,12 +191,13 @@ package_util-linux-selinux() { } package_util-linux-libs-selinux() { - pkgdesc="util-linux-selinux runtime libraries" - depends=('glibc') + pkgdesc='util-linux-selinux runtime libraries' + depends=('glibc' + 'libselinux' + 'sqlite') provides=('libutil-linux' 'libblkid.so' 'libfdisk.so' 'libmount.so' 'libsmartcols.so' 'libuuid.so' "${pkgname/-selinux}=${pkgver}-${pkgrel}" 'libutil-linux-selinux') - depends=('libselinux') conflicts=("${pkgname/-selinux}" 'libutil-linux-selinux') replaces=('libutil-linux-selinux') optdepends=('python: python bindings to libmount') |