Skip to content

Commit 94eb39c

Browse files
committed
systemd-selinux 257.1-1 update
1 parent 41e2eab commit 94eb39c

File tree

2 files changed

+39
-20
lines changed

2 files changed

+39
-20
lines changed

.SRCINFO

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
pkgbase = systemd-selinux
2-
pkgver = 257
2+
pkgver = 257.1
33
pkgrel = 1
44
url = https://www.github.com/systemd/systemd
55
arch = x86_64
@@ -57,7 +57,7 @@ pkgbase = systemd-selinux
5757
makedepends = linux-headers
5858
makedepends = libselinux
5959
conflicts = mkinitcpio<38-1
60-
source = git+https://github.com/systemd/systemd#tag=v257?signed
60+
source = git+https://github.com/systemd/systemd#tag=v257.1?signed
6161
source = 0001-Use-Arch-Linux-device-access-groups.patch
6262
source = arch.conf
6363
source = loader.conf
@@ -79,7 +79,7 @@ pkgbase = systemd-selinux
7979
validpgpkeys = A9EA9081724FFAE0484C35A1A81CEA22BC8C7E2E
8080
validpgpkeys = 9A774DB5DB996C154EBBFBFDA0099A18E29326E1
8181
validpgpkeys = 5C251B5FC54EB2F80F407AAAC54CA336CFEB557E
82-
sha512sums = ed1118ca6dcfc8234a0f14b34ace6d979c93a6fef8b60d57dc0b0a0e5b87c5c9c527e7b17ce3a0696f28d7cd4887c96505b6f20c1e67889d1d681cd026896585
82+
sha512sums = 53b14cfadf301a44fdfcaa2fe4b9d2371c85581544093b88e5afcee4e45c5bd8668aaae9dd6663363c24f3b610f9b0d6eb61f00df71d588bce8f6264424203e4
8383
sha512sums = 78065bde708118b7d6e4ed492e096c763e4679a1c54bd98750d5d609d8cc2f1373023f308880f14fc923ae7f9fea34824917ef884c0f996b1f43d08ef022c0fb
8484
sha512sums = 61032d29241b74a0f28446f8cf1be0e8ec46d0847a61dadb2a4f096e8686d5f57fe5c72bcf386003f6520bc4b5856c32d63bf3efe7eb0bc0deefc9f68159e648
8585
sha512sums = c416e2121df83067376bcaacb58c05b01990f4614ad9de657d74b6da3efa441af251d13bf21e3f0f71ddcb4c9ea658b81da3d915667dc5c309c87ec32a1cb5a5
@@ -105,7 +105,7 @@ pkgname = systemd-selinux
105105
license = CC0-1.0
106106
license = GPL-2.0-or-later
107107
license = MIT-0
108-
depends = systemd-libs-selinux=257
108+
depends = systemd-libs-selinux=257.1
109109
depends = acl
110110
depends = libacl.so
111111
depends = bash
@@ -153,9 +153,9 @@ pkgname = systemd-selinux
153153
optdepends = libp11-kit: support PKCS#11
154154
optdepends = tpm2-tss: unlocking LUKS2 volumes with TPM2
155155
provides = nss-myhostname
156-
provides = systemd-tools=257
157-
provides = udev=257
158-
provides = systemd=257-1
156+
provides = systemd-tools=257.1
157+
provides = udev=257.1
158+
provides = systemd=257.1-1
159159
conflicts = nss-myhostname
160160
conflicts = systemd-tools
161161
conflicts = udev
@@ -196,37 +196,37 @@ pkgname = systemd-libs-selinux
196196
provides = libsystemd.so
197197
provides = libudev.so
198198
provides = libsystemd-selinux
199-
provides = systemd-libs=257-1
199+
provides = systemd-libs=257.1-1
200200
conflicts = libsystemd
201201
conflicts = libsystemd-selinux
202202
conflicts = systemd-libs
203203
replaces = libsystemd-selinux
204204

205205
pkgname = systemd-resolvconf-selinux
206206
pkgdesc = systemd resolvconf replacement with SELinux support (for use with systemd-resolved)
207-
depends = systemd-selinux=257
207+
depends = systemd-selinux=257.1
208208
provides = openresolv
209209
provides = resolvconf
210-
provides = systemd-resolvconf=257-1
210+
provides = systemd-resolvconf=257.1-1
211211
conflicts = resolvconf
212-
conflicts = systemd-resolvconf=257-1
212+
conflicts = systemd-resolvconf=257.1-1
213213

214214
pkgname = systemd-sysvcompat-selinux
215215
pkgdesc = sysvinit compat for systemd with SELinux support
216-
depends = systemd-selinux=257
217-
provides = systemd-sysvcompat=257-1
218-
provides = selinux-systemd-sysvcompat=257-1
216+
depends = systemd-selinux=257.1
217+
provides = systemd-sysvcompat=257.1-1
218+
provides = selinux-systemd-sysvcompat=257.1-1
219219
conflicts = sysvinit
220220
conflicts = systemd-sysvcompat
221221
conflicts = selinux-systemd-sysvcompat
222222

223223
pkgname = systemd-ukify-selinux
224224
pkgdesc = Combine kernel and initrd into a signed Unified Kernel Image with SELinux support
225-
depends = systemd-selinux=257
225+
depends = systemd-selinux=257.1
226226
depends = binutils
227227
depends = python-cryptography
228228
depends = python-pefile
229229
optdepends = python-pillow: Show the size of splash image
230230
optdepends = sbsigntools: Sign the embedded kernel
231231
provides = ukify
232-
provides = systemd-ukify=257-1
232+
provides = systemd-ukify=257.1-1

PKGBUILD

Lines changed: 23 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,21 @@
66
# This PKGBUILD is maintained on https://github.com/archlinuxhardened/selinux.
77
# If you want to help keep it up to date, please open a Pull Request there.
88

9+
# ➡️ Pushing pre-releases to [core-testing] can cause havoc, especially
10+
# as all [core] packages are built there, and may be moved before.
11+
# Anyway, pre-release packages may be available in my personal testing
12+
# repository. Brave souls add it with:
13+
# [eworm-testing]
14+
# SigLevel = Required
15+
# Server = https://pkgbuild.com/~eworm/$repo/$arch/
16+
917
pkgbase=systemd-selinux
1018
pkgname=('systemd-selinux'
1119
'systemd-libs-selinux'
1220
'systemd-resolvconf-selinux'
1321
'systemd-sysvcompat-selinux'
1422
'systemd-ukify-selinux')
15-
_tag='257'
23+
_tag='257.1'
1624
# Upstream versioning is incompatible with pacman's version comparisons, one
1725
# way or another. So we replace dashes and tildes with the empty string to
1826
# make sure pacman's version comparing does the right thing for rc versions:
@@ -56,7 +64,7 @@ source=("git+https://github.com/systemd/systemd#tag=v${_tag}?signed"
5664
'30-systemd-tmpfiles.hook'
5765
'30-systemd-udev-reload.hook'
5866
'30-systemd-update.hook')
59-
sha512sums=('ed1118ca6dcfc8234a0f14b34ace6d979c93a6fef8b60d57dc0b0a0e5b87c5c9c527e7b17ce3a0696f28d7cd4887c96505b6f20c1e67889d1d681cd026896585'
67+
sha512sums=('53b14cfadf301a44fdfcaa2fe4b9d2371c85581544093b88e5afcee4e45c5bd8668aaae9dd6663363c24f3b610f9b0d6eb61f00df71d588bce8f6264424203e4'
6068
'78065bde708118b7d6e4ed492e096c763e4679a1c54bd98750d5d609d8cc2f1373023f308880f14fc923ae7f9fea34824917ef884c0f996b1f43d08ef022c0fb'
6169
'61032d29241b74a0f28446f8cf1be0e8ec46d0847a61dadb2a4f096e8686d5f57fe5c72bcf386003f6520bc4b5856c32d63bf3efe7eb0bc0deefc9f68159e648'
6270
'c416e2121df83067376bcaacb58c05b01990f4614ad9de657d74b6da3efa441af251d13bf21e3f0f71ddcb4c9ea658b81da3d915667dc5c309c87ec32a1cb5a5'
@@ -80,6 +88,7 @@ _meson_vcs_tag='false'
8088
_meson_mode='release'
8189
_meson_compile=()
8290
_meson_install=()
91+
_systemd_src_dir="${pkgbase/-selinux}"
8392

8493
if ((_systemd_UPSTREAM)); then
8594
_meson_version="${pkgver}"
@@ -93,14 +102,24 @@ if ((_systemd_UPSTREAM)); then
93102
fi
94103
fi
95104

105+
# Some heuristics to detect that we are building on OBS, with no network access. Skip
106+
# git verification, and use the OBS-provided tarball instead. The sources will be
107+
# unpacked by OBS in $package-$version/
108+
# SELinux package maintenance note: ignore this, as skipping any form of validation is dangerous
109+
#if [ -f /.build/build.dist ] && [ -d /usr/src/packages/SOURCES ] && [ -d /usr/src/packages/BUILD ] && [ -d /usr/src/packages/OTHER ]; then
110+
# source[0]="${pkgbase}-${pkgver}.tar.gz"
111+
# sha512sums[0]='SKIP'
112+
# _systemd_src_dir="${pkgbase}-${pkgver}"
113+
#fi
114+
96115
_backports=(
97116
)
98117

99118
_reverts=(
100119
)
101120

102121
prepare() {
103-
cd "${pkgbase/-selinux}"
122+
cd "${_systemd_src_dir}"
104123

105124
local _c _l
106125
for _c in "${_backports[@]}"; do
@@ -178,7 +197,7 @@ build() {
178197
-Dsbat-distro-url="https://aur.archlinux.org/packages/${pkgname}/"
179198
)
180199

181-
arch-meson "${pkgbase/-selinux}" build "${_meson_options[@]}" $MESON_EXTRA_CONFIGURE_OPTIONS
200+
arch-meson "${_systemd_src_dir}" build "${_meson_options[@]}" $MESON_EXTRA_CONFIGURE_OPTIONS
182201

183202
meson compile -C build "${_meson_compile[@]}"
184203
}

0 commit comments

Comments
 (0)