summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Down2020-05-26 18:21:38 +0100
committerChris Down2020-05-26 18:21:38 +0100
commit1c2e10463604cee81df53853b77be3ea4eb88181 (patch)
treea47ab008fbd078e521d777f3e7c0f3a958ac5a12
parentf50d8f1d52ee0ffac01e0c2542d8f39ddf1026e0 (diff)
downloadaur-systemd-cdown-git.tar.gz
upgpkg: systemd-cdown-git 245.r630.g842a362c3a-1
-rw-r--r--.SRCINFO30
-rw-r--r--PKGBUILD36
2 files changed, 37 insertions, 29 deletions
diff --git a/.SRCINFO b/.SRCINFO
index fa62d6c4fc0..e69b40bf224 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = systemd-cdown-git
pkgdesc = systemd (git version)
- pkgver = 243.r551.g98647fa0fa
+ pkgver = 245.r630.g842a362c3a
pkgrel = 1
url = https://www.github.com/systemd/systemd
arch = x86_64
@@ -34,6 +34,7 @@ pkgbase = systemd-cdown-git
makedepends = kexec-tools
makedepends = libxkbcommon
makedepends = bash-completion
+ makedepends = p11-kit
options = !strip
source = git+https://github.com/cdown/systemd#branch=cdowntest
source = 0001-Use-Arch-Linux-device-access-groups.patch
@@ -89,7 +90,7 @@ pkgname = systemd-cdown-git
depends = hwids
depends = libcap
depends = libgcrypt
- depends = systemd-cdown-libs-git
+ depends = systemd-libs
depends = libidn2
depends = libidn2.so
depends = lz4
@@ -100,21 +101,22 @@ pkgname = systemd-cdown-git
depends = xz
depends = pcre2
depends = audit
+ depends = libp11-kit
optdepends = libmicrohttpd: remote journald capabilities
optdepends = quota-tools: kernel-level quota management
- optdepends = systemd-cdown-sysvcompat-git: symlink package to provide sysvinit binaries
+ optdepends = systemd-sysvcompat: symlink package to provide sysvinit binaries
optdepends = polkit: allow administration as unprivileged user
optdepends = curl: machinectl pull-tar and pull-raw
- provides = systemd=243.r551.g98647fa0fa
provides = nss-myhostname
- provides = systemd-tools=243.r551.g98647fa0fa
- provides = udev=243.r551.g98647fa0fa
- conflicts = systemd
+ provides = systemd-tools=245.r630.g842a362c3a
+ provides = udev=245.r630.g842a362c3a
+ provides = systemd=245.r630.g842a362c3a
conflicts = nss-myhostname
- conflicts = systemd-cdown-tools
+ conflicts = systemd-tools
conflicts = udev
+ conflicts = systemd
replaces = nss-myhostname
- replaces = systemd-cdown-tools
+ replaces = systemd-tools
replaces = udev
backup = etc/pam.d/systemd-user
backup = etc/systemd/coredump.conf
@@ -138,29 +140,29 @@ pkgname = systemd-cdown-libs-git
depends = libgcrypt
depends = lz4
depends = xz
- provides = systemd-libs
provides = libsystemd
provides = libsystemd.so
provides = libudev.so
- conflicts = systemd-libs
+ provides = systemd-libs
conflicts = libsystemd
+ conflicts = systemd-libs
replaces = libsystemd
pkgname = systemd-cdown-resolvconf-git
pkgdesc = systemd resolvconf replacement (for use with systemd-resolved, git version)
license = LGPL2.1
depends = systemd-cdown-git
- provides = systemd-resolvconf
provides = openresolv
provides = resolvconf
- conflicts = systemd-resolvconf
+ provides = systemd-resolvconf
conflicts = openresolv
+ conflicts = systemd-resolvconf
pkgname = systemd-cdown-sysvcompat-git
pkgdesc = sysvinit compat for systemd (git version)
license = GPL2
depends = systemd-cdown-git
provides = systemd-sysvcompat
- conflicts = systemd-sysvcompat
conflicts = sysvinit
+ conflicts = systemd-sysvcompat
diff --git a/PKGBUILD b/PKGBUILD
index 26b8f8cadd6..2793de0cdae 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,7 @@ pkgbase=systemd-cdown-git
_pkgbase=systemd
pkgname=('systemd-cdown-git' 'systemd-cdown-libs-git' 'systemd-cdown-resolvconf-git' 'systemd-cdown-sysvcompat-git')
pkgdesc="systemd (git version)"
-pkgver=243.r551.g98647fa0fa
+pkgver=245.r630.g842a362c3a
pkgrel=1
arch=('x86_64')
url='https://www.github.com/systemd/systemd'
@@ -16,7 +16,7 @@ makedepends=('acl' 'cryptsetup' 'docbook-xsl' 'gperf' 'lz4' 'xz' 'pam' 'libelf'
'libmicrohttpd' 'libxslt' 'util-linux' 'linux-api-headers'
'python-lxml' 'quota-tools' 'shadow' 'gnu-efi-libs' 'git'
'meson' 'libseccomp' 'pcre2' 'audit' 'kexec-tools' 'libxkbcommon'
- 'bash-completion')
+ 'bash-completion' 'p11-kit')
options=('!strip')
source=('git+https://github.com/cdown/systemd#branch=cdowntest'
'0001-Use-Arch-Linux-device-access-groups.patch'
@@ -74,7 +74,6 @@ pkgver() {
git describe --long --tags | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
}
-
build() {
local _timeservers=({0..3}.arch.pool.ntp.org)
local _nameservers=(
@@ -127,14 +126,16 @@ package_systemd-cdown-git() {
pkgdesc="system and service manager (git version)"
license=('GPL2' 'LGPL2.1')
depends=('acl' 'bash' 'cryptsetup' 'dbus' 'iptables' 'kbd' 'kmod' 'hwids' 'libcap'
- 'libgcrypt' 'systemd-cdown-libs-git' 'libidn2' 'libidn2.so' 'lz4' 'pam' 'libelf'
- 'libseccomp' 'util-linux' 'xz' 'pcre2' 'audit')
- provides=("${_pkgbase}=$pkgver" 'nss-myhostname' "systemd-tools=$pkgver" "udev=$pkgver")
- replaces=('nss-myhostname' 'systemd-cdown-tools' 'udev')
- conflicts=("${_pkgbase}" 'nss-myhostname' 'systemd-cdown-tools' 'udev')
+ 'libgcrypt' 'systemd-libs' 'libidn2' 'libidn2.so' 'lz4' 'pam' 'libelf'
+ 'libseccomp' 'util-linux' 'xz' 'pcre2' 'audit' 'libp11-kit')
+ provides=('nss-myhostname' "systemd-tools=$pkgver" "udev=$pkgver"
+ "${_pkgbase}=$pkgver")
+ replaces=('nss-myhostname' 'systemd-tools' 'udev')
+ conflicts=('nss-myhostname' 'systemd-tools' 'udev'
+ "${_pkgbase}")
optdepends=('libmicrohttpd: remote journald capabilities'
'quota-tools: kernel-level quota management'
- 'systemd-cdown-sysvcompat-git: symlink package to provide sysvinit binaries'
+ 'systemd-sysvcompat: symlink package to provide sysvinit binaries'
'polkit: allow administration as unprivileged user'
'curl: machinectl pull-tar and pull-raw')
backup=(etc/pam.d/systemd-user
@@ -165,7 +166,7 @@ package_systemd-cdown-git() {
rm "$pkgdir"/usr/share/man/man8/{halt,poweroff,reboot,runlevel,shutdown,telinit}.8
# executable (symlinks) shipped with systemd-sysvcompat
- rm "$pkgdir"/usr/bin/{halt,init,poweroff,reboot,shutdown}
+ rm "$pkgdir"/usr/bin/{halt,init,poweroff,reboot,runlevel,shutdown,telinit}
# files shipped with systemd-resolvconf
rm "$pkgdir"/usr/{bin/resolvconf,share/man/man1/resolvconf.1}
@@ -212,8 +213,10 @@ package_systemd-cdown-libs-git() {
pkgdesc='systemd client libraries (git version)'
depends=('glibc' 'libcap' 'libgcrypt' 'lz4' 'xz')
license=('LGPL2.1')
- provides=('systemd-libs' 'libsystemd' 'libsystemd.so' 'libudev.so')
- conflicts=('systemd-libs' 'libsystemd')
+ provides=('libsystemd' 'libsystemd.so' 'libudev.so'
+ 'systemd-libs')
+ conflicts=('libsystemd'
+ 'systemd-libs')
replaces=('libsystemd')
install -d -m0755 "$pkgdir"/usr
@@ -224,8 +227,10 @@ package_systemd-cdown-resolvconf-git() {
pkgdesc='systemd resolvconf replacement (for use with systemd-resolved, git version)'
license=('LGPL2.1')
depends=("${pkgbase}")
- provides=('systemd-resolvconf' 'openresolv' 'resolvconf')
- conflicts=('systemd-resolvconf' 'openresolv')
+ provides=('openresolv' 'resolvconf'
+ 'systemd-resolvconf')
+ conflicts=('openresolv'
+ 'systemd-resolvconf')
install -d -m0755 "$pkgdir"/usr/bin
ln -s resolvectl "$pkgdir"/usr/bin/resolvconf
@@ -238,9 +243,10 @@ package_systemd-cdown-resolvconf-git() {
package_systemd-cdown-sysvcompat-git() {
pkgdesc='sysvinit compat for systemd (git version)'
license=('GPL2')
+ conflicts=('sysvinit'
+ 'systemd-sysvcompat')
depends=("${pkgbase}")
provides=('systemd-sysvcompat')
- conflicts=('systemd-sysvcompat' 'sysvinit')
install -D -m0644 -t "$pkgdir"/usr/share/man/man8 \
build/man/{telinit,halt,reboot,poweroff,runlevel,shutdown}.8