Skip to content

Commit 773bc9e

Browse files
committed
2 parents ebcb2c0 + c632ded commit 773bc9e

File tree

3 files changed

+23
-14
lines changed

3 files changed

+23
-14
lines changed

util-linux-selinux/.SRCINFO

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
pkgbase = util-linux-selinux
22
pkgdesc = SELinux aware miscellaneous system utilities for Linux
3-
pkgver = 2.40.4
4-
pkgrel = 1
3+
pkgver = 2.41
4+
pkgrel = 4
55
url = https://github.com/util-linux/util-linux
66
arch = x86_64
77
arch = aarch64
@@ -22,11 +22,12 @@ pkgbase = util-linux-selinux
2222
makedepends = libselinux
2323
makedepends = libxcrypt
2424
makedepends = meson
25+
makedepends = po4a
2526
makedepends = python
2627
makedepends = sqlite
2728
makedepends = systemd
2829
options = strip
29-
source = git+https://github.com/util-linux/util-linux#tag=v2.40.4?signed
30+
source = git+https://github.com/util-linux/util-linux#tag=v2.41?signed
3031
source = util-linux-BSD-2-Clause.txt::https://raw.githubusercontent.com/Cyan4973/xxHash/f035303b8a86c1db9be70cbb638678ef6ef4cb2d/LICENSE
3132
source = pam-login
3233
source = pam-common
@@ -38,20 +39,20 @@ pkgbase = util-linux-selinux
3839
source = rfkill-unblock_.service
3940
source = rfkill-block_.service
4041
validpgpkeys = B0C64D14301CC6EFAEDF60E4E4B71D5EEC39C284
41-
sha256sums = 32b88bea337aa283e4a84a20eb70fe8df5db6c09cfd99bc133e2503e2e6b53d6
42+
sha256sums = bf69afb12389883698078d47ea5ef299d34346ab1c38a885573833ae4b43e5ec
4243
sha256sums = 6ffedbc0f7878612d2b23589f1ff2ab15633e1df7963a5d9fc750ec5500c7e7a
4344
sha256sums = ee917d55042f78b8bb03f5467e5233e3e2ddc2fe01e302bc53b218003fe22275
4445
sha256sums = 57e057758944f4557762c6def939410c04ca5803cbdd2bfa2153ce47ffe7a4af
4546
sha256sums = 8bfbee453618ba44d60ba7fb00eced6c62edebfc592f2e75dede08e769ed8931
4647
sha256sums = 48d6fba767631e3dd3620cf02a71a74c5d65a525d4c4ce4b5a0b7d9f41ebfea1
4748
sha256sums = 3f54249ac2db44945d6d12ec728dcd0d69af0735787a8b078eacd2c67e38155b
48-
sha256sums = b3d8994c0ab0c50500ed249c90fb709555a369b910e5f3eca758a28d4e73e2d3
49+
sha256sums = 4a0b3dd8aa6d34dd29e1d153f396cacf908b0d64f7218276cbcab684587c0a0a
4950
sha256sums = 7423aaaa09fee7f47baa83df9ea6fef525ff9aec395c8cbd9fe848ceb2643f37
5051
sha256sums = 8ccec10a22523f6b9d55e0d6cbf91905a39881446710aa083e935e8073323376
5152
sha256sums = a22e0a037e702170c7d88460cc9c9c2ab1d3e5c54a6985cd4a164ea7beff1b36
5253

5354
pkgname = util-linux-selinux
54-
depends = util-linux-libs-selinux=2.40.4
55+
depends = util-linux-libs-selinux=2.41
5556
depends = coreutils-selinux
5657
depends = file
5758
depends = libmagic.so
@@ -73,8 +74,8 @@ pkgname = util-linux-selinux
7374
optdepends = words: default dictionary for look
7475
provides = rfkill
7576
provides = hardlink
76-
provides = util-linux=2.40.4-1
77-
provides = selinux-util-linux=2.40.4-1
77+
provides = util-linux=2.41-4
78+
provides = selinux-util-linux=2.41-4
7879
conflicts = rfkill
7980
conflicts = hardlink
8081
conflicts = util-linux
@@ -100,7 +101,7 @@ pkgname = util-linux-libs-selinux
100101
provides = libmount.so
101102
provides = libsmartcols.so
102103
provides = libuuid.so
103-
provides = util-linux-libs=2.40.4-1
104+
provides = util-linux-libs=2.41-4
104105
provides = libutil-linux-selinux
105106
conflicts = util-linux-libs
106107
conflicts = libutil-linux-selinux

util-linux-selinux/PKGBUILD

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818

1919
pkgbase=util-linux-selinux
2020
pkgname=(util-linux-selinux util-linux-libs-selinux)
21-
pkgver='2.40.4'
22-
pkgrel=1
21+
pkgver='2.41'
22+
pkgrel=4
2323
pkgdesc='SELinux aware miscellaneous system utilities for Linux'
2424
url='https://github.com/util-linux/util-linux'
2525
arch=('x86_64' 'aarch64')
@@ -36,6 +36,7 @@ makedepends=('asciidoctor'
3636
'libselinux'
3737
'libxcrypt'
3838
'meson'
39+
'po4a'
3940
'python'
4041
'sqlite'
4142
'systemd')
@@ -59,19 +60,24 @@ source=("git+https://github.com/util-linux/util-linux#tag=v${pkgver/rc/-rc}?sign
5960
'60-rfkill.rules'
6061
'rfkill-unblock_.service'
6162
'rfkill-block_.service')
62-
sha256sums=('32b88bea337aa283e4a84a20eb70fe8df5db6c09cfd99bc133e2503e2e6b53d6'
63+
sha256sums=('bf69afb12389883698078d47ea5ef299d34346ab1c38a885573833ae4b43e5ec'
6364
'6ffedbc0f7878612d2b23589f1ff2ab15633e1df7963a5d9fc750ec5500c7e7a'
6465
'ee917d55042f78b8bb03f5467e5233e3e2ddc2fe01e302bc53b218003fe22275'
6566
'57e057758944f4557762c6def939410c04ca5803cbdd2bfa2153ce47ffe7a4af'
6667
'8bfbee453618ba44d60ba7fb00eced6c62edebfc592f2e75dede08e769ed8931'
6768
'48d6fba767631e3dd3620cf02a71a74c5d65a525d4c4ce4b5a0b7d9f41ebfea1'
6869
'3f54249ac2db44945d6d12ec728dcd0d69af0735787a8b078eacd2c67e38155b'
69-
'b3d8994c0ab0c50500ed249c90fb709555a369b910e5f3eca758a28d4e73e2d3'
70+
'4a0b3dd8aa6d34dd29e1d153f396cacf908b0d64f7218276cbcab684587c0a0a'
7071
'7423aaaa09fee7f47baa83df9ea6fef525ff9aec395c8cbd9fe848ceb2643f37'
7172
'8ccec10a22523f6b9d55e0d6cbf91905a39881446710aa083e935e8073323376'
7273
'a22e0a037e702170c7d88460cc9c9c2ab1d3e5c54a6985cd4a164ea7beff1b36')
7374

7475
_backports=(
76+
# meson: fix po-man installation
77+
'56b97db03a56d90f0480885a35b0383afabc2e18'
78+
79+
# libmount: fix --no-canonicalize regression
80+
'77723beaaaca654f72ac9538772e69fbafa8835d'
7581
)
7682

7783
_reverts=(
@@ -92,6 +98,9 @@ prepare() {
9298
git revert --mainline 1 --no-commit "${_c}"
9399
done
94100

101+
# create fully locked system accout
102+
sed -i '/^u /s|u|u!|' misc-utils/uuidd-sysusers.conf.in
103+
95104
# do not mark dirty
96105
sed -i '/dirty=/c dirty=' tools/git-version-gen
97106
}
Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
1-
u! uuidd 68 "uuid daemon" -
21
g rfkill - - -

0 commit comments

Comments
 (0)