summaryrefslogtreecommitdiff
path: root/libre
diff options
context:
space:
mode:
Diffstat (limited to 'libre')
-rw-r--r--libre/systemd/PKGBUILD75
1 files changed, 45 insertions, 30 deletions
diff --git a/libre/systemd/PKGBUILD b/libre/systemd/PKGBUILD
index d0e559ff4..ff615063a 100644
--- a/libre/systemd/PKGBUILD
+++ b/libre/systemd/PKGBUILD
@@ -11,18 +11,19 @@ pkgname+=('systemd-common' 'systemd-udev')
_libsystemd=('libsystemd' 'libudev' 'nss-systemd' 'nss-myhostname' 'nss-mymachines' 'nss-resolve')
pkgname+=("${_libsystemd[@]/#/systemd-}")
# Can be from either systemd or systemd-stable
-_commit='de7436b02badc82200dc127ff190b8155769b8e7'
-pkgver=239.0
-pkgrel=2
-pkgrel+=.parabola7
+_commit='c38499d476026d999558a7eee9c95ca2fa41e115'
+pkgver=239.2
+pkgrel=1
+pkgrel+=.parabola1
arch=('x86_64')
arch+=('i686' 'armv7h')
url='https://www.github.com/systemd/systemd'
makedepends=('acl' 'cryptsetup' 'docbook-xsl' 'gperf' 'lz4' 'xz' 'pam' 'libelf'
- 'intltool' 'iptables' 'kmod' 'libcap' 'libidn' 'libgcrypt'
+ 'intltool' 'iptables' 'kmod' 'libcap' 'libidn2' 'libgcrypt'
'libmicrohttpd' 'libxslt' 'util-linux' 'linux-api-headers'
'python-lxml' 'quota-tools' 'shadow' 'git'
- 'meson' 'libseccomp' 'pcre2')
+ 'meson' 'libseccomp' 'pcre2' 'audit' 'kexec-tools' 'libxkbcommon'
+ 'bash-completion')
makedepends_i686=('gnu-efi-libs')
makedepends_x86_64=('gnu-efi-libs')
options=('strip')
@@ -87,7 +88,9 @@ sha512sums=('SKIP'
'28a5b3fc9e2c5cec9267bb96725c73ee77788514f140c0cf8df765af64bc8130dd02f4863d9128ac45d54256b2ab4f2b06d1a3f65660ce1dfba5727618cd1839')
_backports=(
- '75720bff62a84896e9a0654afc7cf9408cf89a38' # (for glibc 2.28) build-sys: Detect whether struct statx is defined in sys/stat.h
+ # statx fixes
+ '75720bff62a84896e9a0654afc7cf9408cf89a38'
+ '9c869d08d82c73f62ab3527567858ce4b0cf1257'
)
_reverts=(
@@ -102,12 +105,12 @@ prepare() {
# the verified tag is in)
git merge --ff-only "${_commit}"
- local c
- for c in "${_backports[@]}"; do
- git cherry-pick -n "$c"
+ local _c
+ for _c in "${_backports[@]}"; do
+ git cherry-pick -n "${_c}"
done
for c in "${_reverts[@]}"; do
- git revert -n "$c"
+ git revert -n "${_c}"
done
# Replace cdrom/dialout/tape groups with optical/uucp/storage
@@ -121,17 +124,29 @@ prepare() {
}
pkgver() {
- local version count
-
cd "$pkgbase-stable"
- version="$(git describe --abbrev=0 --tags)"
- count="$(git rev-list --count ${version}..)"
- printf '%s.%s' "${version#v}" "${count}"
+ local _version _count
+ _version="$(git describe --abbrev=0 --tags)"
+ _count="$(git rev-list --count ${_version}..)"
+ printf '%s.%s' "${_version#v}" "${_count}"
}
build() {
- local timeservers=({0..3}.arch.pool.ntp.org)
+ local _timeservers=({0..3}.arch.pool.ntp.org)
+ local _nameservers=(
+ # We use these public name services, ordered by their
+ # privacy policy (hopefully):
+ # * Cloudflare (https://1.1.1.1/)
+ # * Quad9 without filtering (https://www.quad9.net/)
+ # * Google (https://developers.google.com/speed/public-dns/)
+ 1.1.1.1
+ 9.9.9.10
+ 8.8.8.8
+ 2606:4700:4700::1111
+ 2620:fe::10
+ 2001:4860:4860::8888
+ )
if [ "$CARCH" = "armv7h" ]; then
LDFLAGS+=" -Wl,-fuse-ld=bfd"
@@ -139,18 +154,18 @@ build() {
CXXFLAGS+=" -fno-lto"
fi
- local meson_options=(
- -Daudit=false
+ local _meson_options=(
-Dima=false
+ -Dlibidn2=true
-Dlz4=true
-Ddbuspolicydir=/usr/share/dbus-1/system.d
- -Ddefault-dnssec=no
# TODO(dreisner): consider changing this to unified
-Ddefault-hierarchy=hybrid
-Ddefault-kill-user-processes=false
-Dfallback-hostname='parabola'
- -Dntp-servers="${timeservers[*]}"
+ -Dntp-servers="${_timeservers[*]}"
+ -Ddns-servers="${_nameservers[*]}"
-Drpmmacrosdir=no
-Dsysvinit-path=
-Dsysvrcnd-path=
@@ -159,7 +174,7 @@ build() {
meson_options+=(-Dgnuefi=true)
fi
- arch-meson "$pkgbase-stable" build "${meson_options[@]}"
+ arch-meson "$pkgbase-stable" build "${_meson_options[@]}"
ninja -C build
@@ -168,7 +183,7 @@ build() {
rm -rf "$srcdir/dest"
# Put things in the main systemd package by default
- DESTDIR="$srcdir/dest/systemd" ninja -C build install
+ DESTDIR="$srcdir/dest/systemd" meson install -C build
install -dm755 "$srcdir/dest/common"/usr/lib/systemd
mv -T "$srcdir/dest"/{systemd,common}/usr/lib/systemd/libsystemd-shared-${pkgver%%.*}.so
@@ -210,8 +225,7 @@ build() {
}
check() {
- cd build
- meson test
+ meson test -C build
}
package_systemd() {
@@ -228,7 +242,8 @@ package_systemd() {
optdepends=('libmicrohttpd: remote journald capabilities'
'quota-tools: kernel-level quota management'
'systemd-sysvcompat: symlink package to provide sysvinit binaries'
- 'polkit: allow administration as unprivileged user')
+ 'polkit: allow administration as unprivileged user'
+ 'curl: machinectl pull-tar and pull-raw')
backup=(etc/pam.d/systemd-user
etc/systemd/coredump.conf
etc/systemd/journald.conf
@@ -296,9 +311,9 @@ package_systemd-common() {
pkgdesc='systemd files shared between split packages'
license=('LGPL2.1')
depends=('acl' 'cryptsetup' 'libdbus' 'glibc' 'iptables' 'libcap'
- 'libgcrypt' 'libidn' 'libseccomp' 'libsystemd.so'
+ 'libgcrypt' 'libidn2' 'libseccomp' 'libsystemd.so'
'libudev.so' 'libblkid.so' 'libmount.so' 'libuuid.so' 'lz4'
- 'xz')
+ 'xz' 'audit')
cp -rT -d --no-preserve=ownership,timestamp "$srcdir/dest/${pkgname#systemd-}" "$pkgdir"
}
@@ -411,7 +426,7 @@ package_systemd-resolvconf() {
pkgdesc='systemd resolvconf replacement'
license=('LGPL2.1')
depends=('systemd')
- provides=('openresolv')
+ provides=('openresolv' 'resolvconf')
conflicts=('openresolv')
replaces+=('notsystemd-resolvconf') # notsystemd-resolvconf should have never existed
@@ -440,4 +455,4 @@ package_systemd-sysvcompat() {
done
}
-# vim: ft=sh syn=sh et
+# vim:ft=sh syn=sh et sw=2: