From 0a6e59d212b08a6b8c3f94d96f2a599593a1513d Mon Sep 17 00:00:00 2001 From: Kevin Mihelich Date: Sun, 8 Sep 2019 20:33:30 +0000 Subject: [PATCH] core/systemd to 243.0-1 --- ...emd-binfmt.hook => 30-systemd-binfmt.hook} | 0 ...d-catalog.hook => 30-systemd-catalog.hook} | 0 ...oad.hook => 30-systemd-daemon-reload.hook} | 0 ...systemd-hwdb.hook => 30-systemd-hwdb.hook} | 0 ...emd-sysctl.hook => 30-systemd-sysctl.hook} | 0 ...tmpfiles.hook => 30-systemd-tmpfiles.hook} | 0 ...eload.hook => 30-systemd-udev-reload.hook} | 0 ...emd-update.hook => 30-systemd-update.hook} | 0 core/systemd/PKGBUILD | 56 +++++-------------- 9 files changed, 15 insertions(+), 41 deletions(-) rename core/systemd/{systemd-binfmt.hook => 30-systemd-binfmt.hook} (100%) rename core/systemd/{systemd-catalog.hook => 30-systemd-catalog.hook} (100%) rename core/systemd/{systemd-daemon-reload.hook => 30-systemd-daemon-reload.hook} (100%) rename core/systemd/{systemd-hwdb.hook => 30-systemd-hwdb.hook} (100%) rename core/systemd/{systemd-sysctl.hook => 30-systemd-sysctl.hook} (100%) rename core/systemd/{systemd-tmpfiles.hook => 30-systemd-tmpfiles.hook} (100%) rename core/systemd/{systemd-udev-reload.hook => 30-systemd-udev-reload.hook} (100%) rename core/systemd/{systemd-update.hook => 30-systemd-update.hook} (100%) diff --git a/core/systemd/systemd-binfmt.hook b/core/systemd/30-systemd-binfmt.hook similarity index 100% rename from core/systemd/systemd-binfmt.hook rename to core/systemd/30-systemd-binfmt.hook diff --git a/core/systemd/systemd-catalog.hook b/core/systemd/30-systemd-catalog.hook similarity index 100% rename from core/systemd/systemd-catalog.hook rename to core/systemd/30-systemd-catalog.hook diff --git a/core/systemd/systemd-daemon-reload.hook b/core/systemd/30-systemd-daemon-reload.hook similarity index 100% rename from core/systemd/systemd-daemon-reload.hook rename to core/systemd/30-systemd-daemon-reload.hook diff --git a/core/systemd/systemd-hwdb.hook b/core/systemd/30-systemd-hwdb.hook similarity index 100% rename from core/systemd/systemd-hwdb.hook rename to core/systemd/30-systemd-hwdb.hook diff --git a/core/systemd/systemd-sysctl.hook b/core/systemd/30-systemd-sysctl.hook similarity index 100% rename from core/systemd/systemd-sysctl.hook rename to core/systemd/30-systemd-sysctl.hook diff --git a/core/systemd/systemd-tmpfiles.hook b/core/systemd/30-systemd-tmpfiles.hook similarity index 100% rename from core/systemd/systemd-tmpfiles.hook rename to core/systemd/30-systemd-tmpfiles.hook diff --git a/core/systemd/systemd-udev-reload.hook b/core/systemd/30-systemd-udev-reload.hook similarity index 100% rename from core/systemd/systemd-udev-reload.hook rename to core/systemd/30-systemd-udev-reload.hook diff --git a/core/systemd/systemd-update.hook b/core/systemd/30-systemd-update.hook similarity index 100% rename from core/systemd/systemd-update.hook rename to core/systemd/30-systemd-update.hook diff --git a/core/systemd/PKGBUILD b/core/systemd/PKGBUILD index 9e8d73596..e307fb15f 100644 --- a/core/systemd/PKGBUILD +++ b/core/systemd/PKGBUILD @@ -11,9 +11,9 @@ pkgbase=systemd pkgname=('systemd' 'systemd-libs' 'systemd-resolvconf' 'systemd-sysvcompat') # Can be from either systemd or systemd-stable -_commit='9d34e79ae8ef891adf3757f9248566def70471ad' -pkgver=242.84 -pkgrel=2 +_commit='efb536d0cbe2e58f80e501d19999928c75e08f6a' +pkgver=243.0 +pkgrel=1 arch=('x86_64') url='https://www.github.com/systemd/systemd' makedepends=('acl' 'cryptsetup' 'docbook-xsl' 'gperf' 'lz4' 'xz' 'pam' 'libelf' @@ -39,14 +39,14 @@ source=(# fragment is latest tag for source verification, final merge in prepare 'systemd-user.pam' 'systemd-hook' '20-systemd-sysusers.hook' - 'systemd-binfmt.hook' - 'systemd-catalog.hook' - 'systemd-daemon-reload.hook' - 'systemd-hwdb.hook' - 'systemd-sysctl.hook' - 'systemd-tmpfiles.hook' - 'systemd-udev-reload.hook' - 'systemd-update.hook') + '30-systemd-binfmt.hook' + '30-systemd-catalog.hook' + '30-systemd-daemon-reload.hook' + '30-systemd-hwdb.hook' + '30-systemd-sysctl.hook' + '30-systemd-tmpfiles.hook' + '30-systemd-udev-reload.hook' + '30-systemd-update.hook') sha512sums=('SKIP' 'SKIP' '9348683829190628e25b7b3300fd880c426d555bde330d5fc5150a9a54b3ad9d4d1f2e69ea1dc6d6f086693dacc53c5af30f1fa7ad9b479791fd77bcdafa430e' @@ -70,30 +70,6 @@ sha512sums=('SKIP' '209b01b044877cc986757fa4009a92ea98f480306c2530075d153203c3cd2b3afccab6aacc1453dee8857991e04270572f1700310705d7a0f4d5bed27fab8c67') _backports=( - # basic/socket-util: put a limit on the loop to flush connections - '67962036f6c6cfd34828c1f1f1fbdc0018fb9898' - - # network: logs link state change - '0beb9542e90ab1c5d1507a1046a326fbcf73861c' - - # network: drop invalid assertion - '51aba17b88617515e037e8985d3a4ea871ac47fe' - # network: fix assertion when link get carrier - 'b9ea3d2e47b3741f3f46ba9c5e19640136933b71' - - # network: do not use ordered_set_printf() for DOMAINS= or ROUTE_DOMAINS= - 'fe0e16db093a7da09fcb52a2bc7017197047443d' - - # network: honor MTUBytes= setting - '933c70a0a4e4fac47d18e0348ae97ee3d48dc139' - # network: bump MTU bytes only when MTUByte= is not set - 'f6fcc1c2a41eae749467de58453174296b635a69' - - # network: do not send ipv6 token to kernel - '9f6e82e6eb3b6e73d66d00d1d6eee60691fb702f' - - # cgroup-util: kill also threads - 'e48fcfef06d81bf08607d3c1657fdc6aa1e9a6ee' ) _reverts=( @@ -161,6 +137,7 @@ build() { -Dima=false -Dlibidn2=true -Dlz4=true + -Dman=true -Ddbuspolicydir=/usr/share/dbus-1/system.d -Ddefault-hierarchy=hybrid @@ -215,10 +192,6 @@ package_systemd() { DESTDIR="$pkgdir" meson install -C build - # don't write units to /etc by default. some of these will be re-enabled on - # post_install. - rm -rv "$pkgdir"/etc/systemd/system/* - # we'll create this on installation rmdir "$pkgdir"/var/log/journal/remote @@ -236,8 +209,9 @@ package_systemd() { 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 + rm "$pkgdir"/usr/share/factory/etc/{issue,nsswitch.conf} + sed -i -e '/^C \/etc\/nsswitch\.conf/d' \ + -e '/^C \/etc\/issue/d' "$pkgdir"/usr/lib/tmpfiles.d/etc.conf # add back tmpfiles.d/legacy.conf, normally omitted without sysv-compat install -m0644 $pkgbase-stable/tmpfiles.d/legacy.conf "$pkgdir"/usr/lib/tmpfiles.d