diff options
| -rw-r--r-- | .SRCINFO | 48 | ||||
| -rw-r--r-- | PKGBUILD | 89 | ||||
| -rw-r--r-- | initcpio-install-systemd | 4 | ||||
| -rw-r--r-- | systemd-binfmt.hook | 1 | ||||
| -rw-r--r-- | systemd-sysctl.hook | 1 | ||||
| -rw-r--r-- | systemd-sysusers.hook | 1 | ||||
| -rw-r--r-- | systemd-tmpfiles.hook | 1 |
7 files changed, 97 insertions, 48 deletions
@@ -1,6 +1,6 @@ pkgbase = systemd-git - pkgdesc = systemd from git - pkgver = 238.1513 + pkgdesc = systemd (git version) + pkgver = 239.236 pkgrel = 1 url = https://www.github.com/systemd/systemd arch = i686 @@ -54,25 +54,25 @@ pkgbase = systemd-git source = systemd-update.hook sha512sums = SKIP sha512sums = f0d933e8c6064ed830dec54049b0a01e27be87203208f6ae982f10fb4eddc7258cb2919d594cbfb9a33e74c3510cfd682f3416ba8e804387ab87d1a217eb4b73 - sha512sums = 86d7cacd7536b1069c82bbbb08de7ec81e7f0f18a19fc2b06fabe90db4700623eb3540b75121080d325672d92e26912632ae4f93fd3c0bb48eb3e5eedd88352c + sha512sums = 01de24951a05d38eca6b615a7645beb3677ca0e0f87638d133649f6dc14dcd2ea82594a60b793c31b14493a286d1d11a0d25617f54dbfa02be237652c8faa691 sha512sums = a25b28af2e8c516c3a2eec4e64b8c7f70c21f974af4a955a4a9d45fd3e3ff0d2a98b4419fe425d47152d5acae77d64e69d8d014a7209524b75a81b0edb10bf3a sha512sums = 61032d29241b74a0f28446f8cf1be0e8ec46d0847a61dadb2a4f096e8686d5f57fe5c72bcf386003f6520bc4b5856c32d63bf3efe7eb0bc0deefc9f68159e648 sha512sums = c416e2121df83067376bcaacb58c05b01990f4614ad9de657d74b6da3efa441af251d13bf21e3f0f71ddcb4c9ea658b81da3d915667dc5c309c87ec32a1cb5a5 sha512sums = 5a1d78b5170da5abe3d18fdf9f2c3a4d78f15ba7d1ee9ec2708c4c9c2e28973469bc19386f70b3cf32ffafbe4fcc4303e5ebbd6d5187a1df3314ae0965b25e75 sha512sums = b90c99d768dc2a4f020ba854edf45ccf1b86a09d2f66e475de21fe589ff7e32c33ef4aa0876d7f1864491488fd7edb2682fc0d68e83a6d4890a0778dc2d6fe19 sha512sums = 462ed39bd5c90168079956a402abafe8f0910882e6876b165a2c27af73833d0cad1be9cdbcb3549b34652ea86e5d0dba044946a38797bd533fdd1f5a0083f63b - sha512sums = 46f93725bc94381300535737fd0186a3c096fa83661179eab0c450c7b164a87d9a5dd9abcf6ae98bdeb4bf50a4ba4f1944769948c236e4814f166ff03b0ee177 + sha512sums = 5a6b6beef8c31c79018884d948de840f4d3dfb07d9a87081ebf65e2b8fe595bc8c96dbd7742920ccf948c233213ed0026abc913650cefd77ad90c6f8c89bddb8 sha512sums = 4cff2ebd962e26e2f516d8b4ac45c839dbfa54dd0588b423c224a328b9f7c62306ca7b2f6cb55240c564caf9972d5bcd2e0efaf2de49d64729aeb3bc1560c9eb sha512sums = 872de70325e9798f0b5a77e991c85bd2ab6de24d9b9ba4e35002d2dd5df15f8b30739a0042a624776177ffc14a838cde7ee98622016ed41df3efda9a659730b2 sha512sums = 471342b8d0e05533908cda5d6a906050a51e3181beda1239e91d717029ee40a9eaed714996a445417d87c4e31b7f8522a665de176077fe0536d538369594996d - sha512sums = 3b11e8956169e6d80eca6e6de1b3e42641454d9d7be48961d400754f2242077d69fb7bfbeb0904f35ce569511036a7c9614a4a1cc3096fba993f46ae65e02895 - sha512sums = bf3225011760695040e9f7be2560348e68e86eac0295f5a17a6f7e3dda7ad7c008812a15904e2071b53d5f8048891602c8a9a18608ac64930f2d8cc4fac2a319 - sha512sums = ff1429a7c88e21d578c25d07e8cd9568577feb5a940fe39a7a815cf8431c57ca951ac6b394c53d2cdeb4efc645572c0b1b670a48cafcc405db41a6602b548e35 + sha512sums = da783e3bfc6469b92dee4064a13e2b427520d3d96b57c95a4e07aaca3e844d95210a8b16122b022080f5452d65096f274dd1c1467725bbdb2e40ef304b78774a + sha512sums = 08a590d08043a21f30f04252164b94df972b1ff1022a0469d6aef713e14484a3a037cce290a2a582851e6fac3e64add69d6cc8fc130bbeeaea08626ebf3e1763 + sha512sums = 577e33a1c50b4b41157a67f64162b035dd0c4a541e19cee55a100048bdb50cb2c82852741b1372989a0fe4c4782ba477522747fcc81d72aed99b3db512a86447 sha512sums = e4a9d7607fe93daf1d45270971c8d8455c4bfc2c0bea8bcad05aeb89847edee23cd1a41073a72042622acf417018fe254f5bfc137604fe2c71292680bf67a1c2 sha512sums = 209b01b044877cc986757fa4009a92ea98f480306c2530075d153203c3cd2b3afccab6aacc1453dee8857991e04270572f1700310705d7a0f4d5bed27fab8c67 pkgname = systemd-git - pkgdesc = system and service manager from git + pkgdesc = system and service manager (git version) install = systemd.install groups = base-devel license = GPL2 @@ -101,18 +101,13 @@ pkgname = systemd-git optdepends = systemd-sysvcompat-git: symlink package to provide sysvinit binaries optdepends = polkit: allow administration as unprivileged user provides = nss-myhostname - provides = systemd-sysvcompat - provides = systemd-tools=238.1513 - provides = udev=238.1513 - provides = systemd=238.1513 - provides = systemd-sysvcompat-git - provides = openresolv + provides = systemd-tools=239.236 + provides = udev=239.236 + provides = systemd=239.236 conflicts = nss-myhostname conflicts = systemd-tools conflicts = udev conflicts = systemd - conflicts = systemd-sysvcompat-git - conflicts = openresolv replaces = nss-myhostname replaces = systemd-tools replaces = udev @@ -130,7 +125,7 @@ pkgname = systemd-git backup = etc/udev/udev.conf pkgname = libsystemd-git - pkgdesc = systemd client libraries from git + pkgdesc = systemd client libraries (git version) license = GPL2 depends = glibc depends = libcap @@ -142,3 +137,22 @@ pkgname = libsystemd-git provides = libsystemd conflicts = libsystemd +pkgname = systemd-resolvconf-git + pkgdesc = systemd resolvconf replacement (git version) + license = GPL2 + depends = systemd + provides = openresolv + provides = resolvconf + provides = systemd-resolvconf + conflicts = openresolv + conflicts = systemd-resolvconf + +pkgname = systemd-sysvcompat-git + pkgdesc = sysvinit compat for systemd (git version) + groups = base + license = GPL2 + depends = systemd-git + provides = systemd-sysvcompat + conflicts = sysvinit + conflicts = systemd-sysvcompat + @@ -1,14 +1,14 @@ # Maintainer: Yurii Kolesnykov <yurikoles@gmai.com> +# Credit: Christian Hesse <mail@eworm.de> # Credit: Dave Reisner <dreisner@archlinux.org> # Credit: Tom Gundersen <teg@jklm.no> pkgbase=systemd-git _pkgbase=systemd -pkgname=('systemd-git' 'libsystemd-git') -pkgdesc="systemd from git" -pkgver=238.1513 +pkgname=('systemd-git' 'libsystemd-git' 'systemd-resolvconf-git' 'systemd-sysvcompat-git') +pkgdesc="systemd (git version)" +pkgver=239.236 pkgrel=1 -branch='master' arch=('i686' 'x86_64') url="https://www.github.com/systemd/systemd" makedepends=('acl' 'cryptsetup' 'docbook-xsl' 'gperf' 'lz4' 'xz' 'pam' 'libelf' @@ -37,20 +37,20 @@ source=('git+https://github.com/systemd/systemd' 'systemd-update.hook') sha512sums=('SKIP' 'f0d933e8c6064ed830dec54049b0a01e27be87203208f6ae982f10fb4eddc7258cb2919d594cbfb9a33e74c3510cfd682f3416ba8e804387ab87d1a217eb4b73' - '86d7cacd7536b1069c82bbbb08de7ec81e7f0f18a19fc2b06fabe90db4700623eb3540b75121080d325672d92e26912632ae4f93fd3c0bb48eb3e5eedd88352c' + '01de24951a05d38eca6b615a7645beb3677ca0e0f87638d133649f6dc14dcd2ea82594a60b793c31b14493a286d1d11a0d25617f54dbfa02be237652c8faa691' 'a25b28af2e8c516c3a2eec4e64b8c7f70c21f974af4a955a4a9d45fd3e3ff0d2a98b4419fe425d47152d5acae77d64e69d8d014a7209524b75a81b0edb10bf3a' '61032d29241b74a0f28446f8cf1be0e8ec46d0847a61dadb2a4f096e8686d5f57fe5c72bcf386003f6520bc4b5856c32d63bf3efe7eb0bc0deefc9f68159e648' 'c416e2121df83067376bcaacb58c05b01990f4614ad9de657d74b6da3efa441af251d13bf21e3f0f71ddcb4c9ea658b81da3d915667dc5c309c87ec32a1cb5a5' '5a1d78b5170da5abe3d18fdf9f2c3a4d78f15ba7d1ee9ec2708c4c9c2e28973469bc19386f70b3cf32ffafbe4fcc4303e5ebbd6d5187a1df3314ae0965b25e75' 'b90c99d768dc2a4f020ba854edf45ccf1b86a09d2f66e475de21fe589ff7e32c33ef4aa0876d7f1864491488fd7edb2682fc0d68e83a6d4890a0778dc2d6fe19' '462ed39bd5c90168079956a402abafe8f0910882e6876b165a2c27af73833d0cad1be9cdbcb3549b34652ea86e5d0dba044946a38797bd533fdd1f5a0083f63b' - '46f93725bc94381300535737fd0186a3c096fa83661179eab0c450c7b164a87d9a5dd9abcf6ae98bdeb4bf50a4ba4f1944769948c236e4814f166ff03b0ee177' + '5a6b6beef8c31c79018884d948de840f4d3dfb07d9a87081ebf65e2b8fe595bc8c96dbd7742920ccf948c233213ed0026abc913650cefd77ad90c6f8c89bddb8' '4cff2ebd962e26e2f516d8b4ac45c839dbfa54dd0588b423c224a328b9f7c62306ca7b2f6cb55240c564caf9972d5bcd2e0efaf2de49d64729aeb3bc1560c9eb' '872de70325e9798f0b5a77e991c85bd2ab6de24d9b9ba4e35002d2dd5df15f8b30739a0042a624776177ffc14a838cde7ee98622016ed41df3efda9a659730b2' '471342b8d0e05533908cda5d6a906050a51e3181beda1239e91d717029ee40a9eaed714996a445417d87c4e31b7f8522a665de176077fe0536d538369594996d' - '3b11e8956169e6d80eca6e6de1b3e42641454d9d7be48961d400754f2242077d69fb7bfbeb0904f35ce569511036a7c9614a4a1cc3096fba993f46ae65e02895' - 'bf3225011760695040e9f7be2560348e68e86eac0295f5a17a6f7e3dda7ad7c008812a15904e2071b53d5f8048891602c8a9a18608ac64930f2d8cc4fac2a319' - 'ff1429a7c88e21d578c25d07e8cd9568577feb5a940fe39a7a815cf8431c57ca951ac6b394c53d2cdeb4efc645572c0b1b670a48cafcc405db41a6602b548e35' + 'da783e3bfc6469b92dee4064a13e2b427520d3d96b57c95a4e07aaca3e844d95210a8b16122b022080f5452d65096f274dd1c1467725bbdb2e40ef304b78774a' + '08a590d08043a21f30f04252164b94df972b1ff1022a0469d6aef713e14484a3a037cce290a2a582851e6fac3e64add69d6cc8fc130bbeeaea08626ebf3e1763' + '577e33a1c50b4b41157a67f64162b035dd0c4a541e19cee55a100048bdb50cb2c82852741b1372989a0fe4c4782ba477522747fcc81d72aed99b3db512a86447' 'e4a9d7607fe93daf1d45270971c8d8455c4bfc2c0bea8bcad05aeb89847edee23cd1a41073a72042622acf417018fe254f5bfc137604fe2c71292680bf67a1c2' '209b01b044877cc986757fa4009a92ea98f480306c2530075d153203c3cd2b3afccab6aacc1453dee8857991e04270572f1700310705d7a0f4d5bed27fab8c67') pkgver() { @@ -64,7 +64,6 @@ pkgver() { } build() { - local timeservers=({0..3}.arch.pool.ntp.org) local meson_options=( @@ -96,15 +95,15 @@ check() { } package_systemd-git() { - pkgdesc="system and service manager from git" + pkgdesc="system and service manager (git version)" license=('GPL2' 'LGPL2.1') groups=('base-devel') depends=('acl' 'bash' 'cryptsetup' 'dbus' 'iptables' 'kbd' 'kmod' 'hwids' 'libcap' 'libgcrypt' 'libsystemd' 'libidn' 'lz4' 'pam' 'libelf' 'libseccomp' 'util-linux' 'xz' 'pcre2') - provides=('nss-myhostname' 'systemd-sysvcompat' "systemd-tools=$pkgver" "udev=$pkgver" "systemd=$pkgver" 'systemd-sysvcompat-git' 'openresolv') + provides=('nss-myhostname' "systemd-tools=$pkgver" "udev=$pkgver" "systemd=$pkgver") replaces=('nss-myhostname' 'systemd-tools' 'udev' 'systemd') - conflicts=('nss-myhostname' 'systemd-tools' 'udev' 'systemd' 'systemd-sysvcompat-git' 'openresolv') + conflicts=('nss-myhostname' 'systemd-tools' 'udev' 'systemd') optdepends=('libmicrohttpd: remote journald capabilities' 'quota-tools: kernel-level quota management' 'systemd-sysvcompat-git: symlink package to provide sysvinit binaries' @@ -132,7 +131,7 @@ package_systemd-git() { rmdir "$pkgdir"/var/log/journal/remote # runtime libraries shipped with libsystemd - install -dm755 libsystemd + install -d -m0755 libsystemd mv "$pkgdir"/usr/lib/lib{nss,systemd,udev}*.so* libsystemd # manpages shipped with systemd-sysvcompat @@ -141,20 +140,23 @@ package_systemd-git() { # executable (symlinks) shipped with systemd-sysvcompat 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} + # avoid a potential conflict with [core]/filesystem rm "$pkgdir"/usr/share/factory/etc/nsswitch.conf sed -i '/^C \/etc\/nsswitch\.conf/d' "$pkgdir"/usr/lib/tmpfiles.d/etc.conf # add back tmpfiles.d/legacy.conf, normally omitted without sysv-compat - install -m644 $_pkgbase/tmpfiles.d/legacy.conf "$pkgdir"/usr/lib/tmpfiles.d + install -m0644 $_pkgbase/tmpfiles.d/legacy.conf "$pkgdir"/usr/lib/tmpfiles.d # ship default policy to leave services disabled echo 'disable *' >"$pkgdir"/usr/lib/systemd/system-preset/99-default.preset # add mkinitcpio hooks - install -Dm644 initcpio-install-systemd "$pkgdir"/usr/lib/initcpio/install/systemd - install -Dm644 initcpio-install-udev "$pkgdir"/usr/lib/initcpio/install/udev - install -Dm644 initcpio-hook-udev "$pkgdir"/usr/lib/initcpio/hooks/udev + install -D -m0644 initcpio-install-systemd "$pkgdir"/usr/lib/initcpio/install/systemd + install -D -m0644 initcpio-install-udev "$pkgdir"/usr/lib/initcpio/install/udev + install -D -m0644 initcpio-hook-udev "$pkgdir"/usr/lib/initcpio/hooks/udev # ensure proper permissions for /var/log/journal # The permissions are stored with named group by tar, so this works with @@ -163,28 +165,61 @@ package_systemd-git() { install -d -o root -g systemd-journal -m 2755 "$pkgdir"/var/log/journal # match directory owner/group and mode from [extra]/polkit - install -d -o root -g 102 -m 750 "$pkgdir"/usr/share/polkit-1/rules.d + install -d -o root -g 102 -m 0750 "$pkgdir"/usr/share/polkit-1/rules.d # add example bootctl configuration - install -Dm644 arch.conf "$pkgdir"/usr/share/systemd/bootctl/arch.conf - install -Dm644 loader.conf "$pkgdir"/usr/share/systemd/bootctl/loader.conf - install -Dm644 splash-arch.bmp "$pkgdir"/usr/share/systemd/bootctl/splash-arch.bmp + install -D -m0644 arch.conf "$pkgdir"/usr/share/systemd/bootctl/arch.conf + install -D -m0644 loader.conf "$pkgdir"/usr/share/systemd/bootctl/loader.conf + install -D -m0644 splash-arch.bmp "$pkgdir"/usr/share/systemd/bootctl/splash-arch.bmp # pacman hooks - install -Dm755 systemd-hook "$pkgdir"/usr/share/libalpm/scripts/systemd-hook - install -Dm644 -t "$pkgdir"/usr/share/libalpm/hooks *.hook + install -D -m0755 systemd-hook "$pkgdir"/usr/share/libalpm/scripts/systemd-hook + install -D -m0644 -t "$pkgdir"/usr/share/libalpm/hooks *.hook # overwrite the systemd-user PAM configuration with our own - install -Dm644 systemd-user.pam "$pkgdir"/etc/pam.d/systemd-user + install -D -m0644 systemd-user.pam "$pkgdir"/etc/pam.d/systemd-user } package_libsystemd-git() { - pkgdesc="systemd client libraries from git" + pkgdesc="systemd client libraries (git version)" depends=('glibc' 'libcap' 'libgcrypt' 'lz4' 'xz') license=('GPL2') provides=('libsystemd.so' 'libudev.so' 'libsystemd') conflicts=('libsystemd') - install -dm755 "$pkgdir"/usr + install -d -m0755 "$pkgdir"/usr mv libsystemd "$pkgdir"/usr/lib } + +package_systemd-resolvconf-git() { + pkgdesc='systemd resolvconf replacement (git version)' + license=('GPL2') + depends=('systemd') + provides=('openresolv' 'resolvconf' 'systemd-resolvconf') + conflicts=('openresolv' 'systemd-resolvconf') + + install -d -m0755 "$pkgdir"/usr/bin + ln -s resolvectl "$pkgdir"/usr/bin/resolvconf + + install -d -m0755 "$pkgdir"/usr/share/man/man1 + ln -s resolvectl.1.gz "$pkgdir"/usr/share/man/man1/resolvconf.1.gz +} + + +package_systemd-sysvcompat-git() { + pkgdesc='sysvinit compat for systemd (git version)' + license=('GPL2') + groups=('base') + provides=('systemd-sysvcompat') + conflicts=('sysvinit' 'systemd-sysvcompat') + depends=('systemd-git') + + install -D -m0644 -t "$pkgdir"/usr/share/man/man8 \ + build/man/{telinit,halt,reboot,poweroff,runlevel,shutdown}.8 + + install -d -m0755 "$pkgdir"/usr/bin + ln -s ../lib/systemd/systemd "$pkgdir"/usr/bin/init + for tool in runlevel reboot shutdown poweroff halt telinit; do + ln -s systemctl "$pkgdir"/usr/bin/$tool + done +} diff --git a/initcpio-install-systemd b/initcpio-install-systemd index 40a352c70a71..8fb4441f7c76 100644 --- a/initcpio-install-systemd +++ b/initcpio-install-systemd @@ -112,11 +112,15 @@ build() { map add_binary \ /usr/bin/systemd-tmpfiles \ /usr/lib/systemd/systemd-hibernate-resume \ + /usr/lib/systemd/systemd-shutdown \ /usr/lib/systemd/systemd-sulogin-shell \ /usr/lib/systemd/system-generators/systemd-fstab-generator \ /usr/lib/systemd/system-generators/systemd-gpt-auto-generator \ /usr/lib/systemd/system-generators/systemd-hibernate-resume-generator + # for journalctl in emergency shell + add_binary journalctl + # udev rules and systemd units map add_udev_rule "$rules" \ 50-udev-default.rules \ diff --git a/systemd-binfmt.hook b/systemd-binfmt.hook index 8e6284bbc175..9c31a4b162cc 100644 --- a/systemd-binfmt.hook +++ b/systemd-binfmt.hook @@ -8,4 +8,3 @@ Target = usr/lib/binfmt.d/*.conf Description = Registering binary formats... When = PostTransaction Exec = /usr/share/libalpm/scripts/systemd-hook binfmt -NeedsTargets diff --git a/systemd-sysctl.hook b/systemd-sysctl.hook index 348bb03152b5..aec5ac1b0e84 100644 --- a/systemd-sysctl.hook +++ b/systemd-sysctl.hook @@ -8,4 +8,3 @@ Target = usr/lib/sysctl.d/*.conf Description = Applying kernel sysctl settings... When = PostTransaction Exec = /usr/share/libalpm/scripts/systemd-hook sysctl -NeedsTargets diff --git a/systemd-sysusers.hook b/systemd-sysusers.hook index a7d40057a12b..9873dd402013 100644 --- a/systemd-sysusers.hook +++ b/systemd-sysusers.hook @@ -8,4 +8,3 @@ Target = usr/lib/sysusers.d/*.conf Description = Creating system user accounts... When = PostTransaction Exec = /usr/share/libalpm/scripts/systemd-hook sysusers -NeedsTargets diff --git a/systemd-tmpfiles.hook b/systemd-tmpfiles.hook index 06554cde557e..df60d82752ea 100644 --- a/systemd-tmpfiles.hook +++ b/systemd-tmpfiles.hook @@ -8,4 +8,3 @@ Target = usr/lib/tmpfiles.d/*.conf Description = Creating temporary files... When = PostTransaction Exec = /usr/share/libalpm/scripts/systemd-hook tmpfiles -NeedsTargets |