From b6cd0e60f7766b7578d4ff90e37c06cac87f2d0a Mon Sep 17 00:00:00 2001 From: Omar Vega Ramos Date: Mon, 9 Jul 2018 06:50:27 -0500 Subject: systemd-239.0-2.parabola1: updating version --- libre/systemd/PKGBUILD | 89 +++++++++++++++++++++++++------------------------- 1 file changed, 45 insertions(+), 44 deletions(-) (limited to 'libre/systemd/PKGBUILD') diff --git a/libre/systemd/PKGBUILD b/libre/systemd/PKGBUILD index b92e2b5a7..81ef0929c 100644 --- a/libre/systemd/PKGBUILD +++ b/libre/systemd/PKGBUILD @@ -5,18 +5,18 @@ # Contributor: Omar Vega Ramos pkgbase=systemd -pkgname=('systemd' 'libsystemd' 'systemd-sysvcompat') +pkgname=('systemd' 'libsystemd' 'systemd-resolvconf' 'systemd-sysvcompat') # We split Arch's libsystemd into the following: _libsystemd=('libsystemd-standalone' 'libudev' 'nss-systemd' 'nss-myhostname' 'nss-mymachines' 'nss-resolve') pkgname+=("${_libsystemd[@]}") # Can be from either systemd or systemd-stable -_commit='f58e62cbbc1c2842881a2a6ab9beda7bcb044a30' -pkgver=238.133 -pkgrel=4 +_commit='de7436b02badc82200dc127ff190b8155769b8e7' +pkgver=239.0 +pkgrel=2 pkgrel+=.parabola1 arch=('x86_64') arch+=('i686' 'armv7h') -url="https://www.github.com/systemd/systemd" +url='https://www.github.com/systemd/systemd' makedepends=('acl' 'cryptsetup' 'docbook-xsl' 'gperf' 'lz4' 'xz' 'pam' 'libelf' 'intltool' 'iptables' 'kmod' 'libcap' 'libidn' 'libgcrypt' 'libmicrohttpd' 'libxslt' 'util-linux' 'linux-api-headers' @@ -76,30 +76,14 @@ sha512sums=('SKIP' 'e4a9d7607fe93daf1d45270971c8d8455c4bfc2c0bea8bcad05aeb89847edee23cd1a41073a72042622acf417018fe254f5bfc137604fe2c71292680bf67a1c2' '209b01b044877cc986757fa4009a92ea98f480306c2530075d153203c3cd2b3afccab6aacc1453dee8857991e04270572f1700310705d7a0f4d5bed27fab8c67' '107d2e36544aa8ef1c6e86339fbc811acb6e1d15eb0edca9f463bdd1b0e91fa8d85cf8c9e70eeaf4196e2f942e30310b672859191f3093c4806546ae30140fb9' - '7445f9802cc194e27238cc89954c1035b0bf0c32b2702a7cbf463f701c4f87a416d7f3f75cc3eb9abe276ac7e49d377451c3727523544568420e348d47c1ef4c' + 'c811278fceba58b1e2919b32f51920c54a3e205c4e5f119ebd5c0445aef80560b9233a98547e845d223172fe355656acc7e8eb68528de12a446de4aa1874ef1a' '7b969dc665281eb43871cf399398ddc25a16f533919dfbf721e2a2eb922cde6936c42400083ef39d5cc873a0b2bf749897c9bb1aaa38624315b8e5810f82efca' 'fbcc54a62b6f3f7ec1dfad8317160c3057f145e542a423a2fd6b5c141012929aeb977491afe35b16c4903b5fd0d1469f3d87d1c8a036b4d6b623ac7dbe682ff5' '4e86eac4132d5bd712061d09c14141d91e6bfd2f3879a1fc4a92a15fa77d01552de5c9ebae4a67be2b2a54223a53f2538ba03d4fa0c96ecd1e62a4e8cf341fd1' - 'b94fc1dee0707aec7c94a1e9e709f98a54018f94b44159b95b4a7fd01446bdd30a6b2d440926448c10a33e62092d6cf8e051ef27f26a369797bafbef093418bb' + '4833ca34d4c773d69794ad1943bbfe317a1d6b2ce01c18f3fbb154e25f683d0e02a3f1436a165bfe418906126dd50736d008ee17d0fd780c34936b761a2f12a9' '6a16666f18b7075a68733376f4b1fe34dd2aa29eaf43e693a98e303b9c5202317636816cb4a914d5141801026d1693dd4de2f79e0950aa777e8de6e4879cd9d0') _backports=( - # nspawn: wait for network namespace creation before interface setup (#8633) - '7511655807e90aa33ea7b71991401a79ec36bb41' - - # sd-shutdown improvements #8429 - # umount: Add more asserts and remove some unused arguments - '0494cae03d762eaf2fb7217ee7d70f615dcb5183' - # umount: Decide whether to remount read-only earlier - '1d62d22d9432d5c4a637002c9a29b20d52f25d9a' - # umount: Provide the same mount flags too when remounting read-only - '3bc341bee9fc7dfb41a131246b6fb0afd6ff4407' - # umount: Try unmounting even if remounting read-only failed - '8645ffd12b3cc7b0292acd9e1d691c4fab4cf409' - # umount: Don't bother remounting api and ro filesystems read-only - 'e783b4902f387640bba12496936d01e967545c3c' - # shutdown: Reduce log level of unmounts - '456b2199f6ef0378da007e71347657bcf83ae465' ) _reverts=( @@ -216,7 +200,7 @@ check() { } package_systemd() { - pkgdesc="system and service manager" + pkgdesc='system and service manager' license=('GPL2' 'LGPL2.1') groups=('base-devel') depends=('acl' 'bash' 'cryptsetup' 'dbus' 'iptables' 'kbd' 'kmod' 'hwids' 'libcap' @@ -254,20 +238,23 @@ package_systemd() { # 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-stable/tmpfiles.d/legacy.conf "$pkgdir"/usr/lib/tmpfiles.d + install -m0644 $pkgbase-stable/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 @@ -276,29 +263,29 @@ package_systemd() { 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 parabola.conf "$pkgdir"/usr/share/systemd/bootctl/parabola.conf - install -Dm644 loader.conf "$pkgdir"/usr/share/systemd/bootctl/loader.conf - install -Dm644 splash-parabola.bmp "$pkgdir"/usr/share/systemd/bootctl/splash-parabola.bmp + install -D -m0644 parabola.conf "$pkgdir"/usr/share/systemd/bootctl/parabola.conf + install -D -m0644 loader.conf "$pkgdir"/usr/share/systemd/bootctl/loader.conf + install -D -m0644 splash-parabola.bmp "$pkgdir"/usr/share/systemd/bootctl/splash-parabola.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() { - pkgdesc="systemd client libraries metapackage" + pkgdesc='systemd client libraries metapackage' depends=("${_libsystemd[@]}") license=('GPL2') } package_libsystemd-standalone() { - pkgdesc="systemd client library" + pkgdesc='systemd client library' depends=('glibc' 'libcap' 'libgcrypt' 'lz4' 'xz') license=('GPL2') provides=('libsystemd.so') @@ -307,7 +294,7 @@ package_libsystemd-standalone() { } package_libudev() { - pkgdesc="systemd library for enumerating and introspecting local devices" + pkgdesc='systemd library for enumerating and introspecting local devices' depends=('glibc' 'libcap') license=('GPL2') provides=('libudev.so') @@ -316,7 +303,7 @@ package_libudev() { } package_nss-systemd() { - pkgdesc="NSS module providing user and group resolution for dynamic users and groups" + pkgdesc='NSS module providing user and group resolution for dynamic users and groups' depends=('glibc' 'libcap') license=('GPL2') @@ -324,7 +311,7 @@ package_nss-systemd() { } package_nss-myhostname() { - pkgdesc="NSS module providing hostname resolution for the locally configured system hostname" + pkgdesc='NSS module providing hostname resolution for the locally configured system hostname' depends=('glibc' 'libcap') license=('GPL2') @@ -332,7 +319,7 @@ package_nss-myhostname() { } package_nss-mymachines() { - pkgdesc="NSS module providing hostname resolution for local systemd-machined container instances" + pkgdesc='NSS module providing hostname resolution for local systemd-machined container instances' depends=('glibc' 'libcap') license=('GPL2') @@ -340,15 +327,29 @@ package_nss-mymachines() { } package_nss-resolve() { - pkgdesc="NSS module providing hostname resolution via systemd-resolved" + pkgdesc='NSS module providing hostname resolution via systemd-resolved' depends=('glibc' 'libcap') license=('GPL2') cp -rT -d --no-preserve=ownership,timestamp "$srcdir/dest/$pkgname" "$pkgdir" } +package_systemd-resolvconf() { + pkgdesc='systemd resolvconf replacement' + license=('GPL2') + depends=('systemd') + provides=('openresolv' 'resolvconf') + conflicts=('openresolv') + + 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() { - pkgdesc="sysvinit compat for systemd" + pkgdesc='sysvinit compat for systemd' license=('GPL2') groups=('base') conflicts=('sysvinit') @@ -356,7 +357,7 @@ package_systemd-sysvcompat() { cp -rT -d --no-preserve=ownership,timestamp "$srcdir/dest/$pkgname" "$pkgdir" - install -dm755 "$pkgdir"/usr/bin + 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 -- cgit v1.2.3