Christian Hesse pushed to branch main at Arch Linux / Packaging / Packages / lib32-systemd
Commits: a0e42723 by Daan De Meyer at 2024-02-27T21:41:50+01:00 Drop "strip" from options strip is enabled in the default makepkg flags as can be seen in https://gitlab.archlinux.org/archlinux/devtools/-/blob/master/config/makepkg/x86_64.conf so let's not specify it explicitly in the PKGBUILD. This allows it to be overridden by users. - - - - - 646877f6 by Jan Alexander Steffens (heftig) at 2024-02-27T21:43:39+01:00 Use meson test --print-errorlogs - - - - - e5ac91c5 by Christian Hesse at 2024-02-27T21:47:06+01:00 use valid SPDX license identifier - - - - - 73f1d3e0 by Christian Hesse at 2024-02-27T21:48:29+01:00 drop workaround for fortification level Should be fixed with: https://github.com/systemd/systemd/commit/7929e180aa47a2692ad4f053afac2857d7198758 - - - - - 9b768faa by Daan De Meyer at 2024-02-27T21:51:58+01:00 Adapt to upstream tag naming changes >From the next release onwards, upstream will start using tildes instead of hyphens as the tag separator (v256~rc1 instead of v256-rc1) so let's adapt the PKGBUILD in advance. - - - - - ea8ffe4b by Christian Hesse at 2024-02-27T21:55:19+01:00 upgpkg: 255.4-1: new upstream release - - - - - 2 changed files: - .SRCINFO - PKGBUILD Changes: ===================================== .SRCINFO ===================================== @@ -1,11 +1,10 @@ pkgbase = lib32-systemd pkgdesc = system and service manager (32-bit) - pkgver = 255.3 + pkgver = 255.4 pkgrel = 1 url = https://www.github.com/systemd/systemd arch = x86_64 - license = GPL2 - license = LGPL2.1 + license = LGPL-2.1-or-later checkdepends = systemd makedepends = git makedepends = gperf @@ -32,8 +31,7 @@ pkgbase = lib32-systemd depends = systemd-libs provides = libsystemd.so provides = libudev.so - options = strip - source = git+https://github.com/systemd/systemd-stable#tag=8cf1da1e9172ba04d90a483a63118873343ea656?signed + source = git+https://github.com/systemd/systemd-stable#tag=4003dd6754e3446691402d3cc389fbfd4faccc90?signed source = git+https://github.com/systemd/systemd#tag=v255?signed validpgpkeys = 63CDA1E5D3FC22B998D20DD6327F26951A015CC4 validpgpkeys = A9EA9081724FFAE0484C35A1A81CEA22BC8C7E2E ===================================== PKGBUILD ===================================== @@ -2,14 +2,21 @@ pkgname=lib32-systemd _pkgbasename=systemd -_tag='8cf1da1e9172ba04d90a483a63118873343ea656' # git rev-parse v${_tag_name} -_tag_name=255.3 -pkgver="${_tag_name/-/}" +_tag='4003dd6754e3446691402d3cc389fbfd4faccc90' # git rev-parse v${_tag_name} +_tag_name=255.4 +# Upstream versioning is incompatible with pacman's version comparisons so we +# replace tildes with the empty string to make sure pacman's version comparing +# does the right thing for rc versions: +# ➜ vercmp 255~rc1 255 +# 1 +# ➜ vercmp 255rc1 255 +# -1 +pkgver="${_tag_name/~/}" pkgrel=1 pkgdesc='system and service manager (32-bit)' arch=('x86_64') url='https://www.github.com/systemd/systemd' -license=('GPL2' 'LGPL2.1') +license=('LGPL-2.1-or-later') depends=('lib32-gcc-libs' 'lib32-libcap' 'lib32-libgcrypt' 'lib32-libxcrypt' 'lib32-xz' 'lib32-zstd' 'systemd-libs') makedepends=('git' 'gperf' 'intltool' 'lib32-acl' 'lib32-bzip2' @@ -18,7 +25,6 @@ makedepends=('git' 'gperf' 'intltool' 'lib32-acl' 'lib32-bzip2' 'libxslt' 'meson' 'python-jinja') checkdepends=('systemd') provides=('libsystemd.so' 'libudev.so') -options=('strip') validpgpkeys=('63CDA1E5D3FC22B998D20DD6327F26951A015CC4' # Lennart Poettering <lenn...@poettering.net> 'A9EA9081724FFAE0484C35A1A81CEA22BC8C7E2E' # Luca Boccassi <luca.bocca...@gmail.com> '9A774DB5DB996C154EBBFBFDA0099A18E29326E1' # Yu Watanabe <watanabe.yu+git...@gmail.com> @@ -77,9 +83,9 @@ build() { --libexecdir /usr/lib32 --libdir /usr/lib32 - # internal version comparison is incompatible with pacman: - # 249~rc1 < 249 < 249.1 < 249rc - -Dversion-tag="${_tag_name/-/\~}-${pkgrel}-arch" + -Dversion-tag="${_tag_name}-${pkgrel}-arch" + # We use the version without tildes as the shared library tag because + # pacman looks at the shared library version. -Dshared-lib-tag="${pkgver}-${pkgrel}" -Dmode=release @@ -167,17 +173,13 @@ build() { -Dsysvrcnd-path= ) - # this uses malloc_usable_size, which is incompatible with fortification level 3 - export CFLAGS="${CFLAGS/_FORTIFY_SOURCE=3/_FORTIFY_SOURCE=2}" - export CXXFLAGS="${CXXFLAGS/_FORTIFY_SOURCE=3/_FORTIFY_SOURCE=2}" - arch-meson "$_pkgbasename-stable" build "${_meson_options[@]}" meson compile -C build } check() { - meson test -C build + meson test -C build --print-errorlogs } package() { View it on GitLab: https://gitlab.archlinux.org/archlinux/packaging/packages/lib32-systemd/-/compare/b0b686b8e3cff462ebef8982e758fb1167a378c3...ea8ffe4b35566535d83601dd6de477cccf3a704e -- View it on GitLab: https://gitlab.archlinux.org/archlinux/packaging/packages/lib32-systemd/-/compare/b0b686b8e3cff462ebef8982e758fb1167a378c3...ea8ffe4b35566535d83601dd6de477cccf3a704e You're receiving this email because of your account on gitlab.archlinux.org.
