diff options
Diffstat (limited to 'libre/systemd/PKGBUILD')
| -rw-r--r-- | libre/systemd/PKGBUILD | 65 |
1 files changed, 39 insertions, 26 deletions
diff --git a/libre/systemd/PKGBUILD b/libre/systemd/PKGBUILD index 48b23cfde..d35849dad 100644 --- a/libre/systemd/PKGBUILD +++ b/libre/systemd/PKGBUILD @@ -6,8 +6,8 @@ pkgbase=systemd pkgname=('systemd' 'libsystemd' 'systemd-sysvcompat' 'libsystemd-standalone' 'libudev' 'nss-myhostname' 'nss-mymachines' 'nss-resolve') -pkgver=229 -pkgrel=3.parabola2 +pkgver=230 +pkgrel=3.parabola1 arch=('i686' 'x86_64' 'armv7h') url="http://www.freedesktop.org/wiki/Software/systemd" makedepends=('acl' 'cryptsetup' 'docbook-xsl' 'gperf' 'lz4' 'xz' 'pam' 'libelf' @@ -23,6 +23,7 @@ source=("git://github.com/systemd/systemd.git#tag=v$pkgver" 'initcpio-install-udev' 'parabola.conf' 'loader.conf' + 'udev-hwdb.hook' '0001-FSDG-man-Refer-to-the-operating-system-as-GNU-Linux.patch' '0002-FSDG-os-release-Default-to-PRETTY_NAME-GNU-Linux-ins.patch' '0003-FSDG-os-release-Default-to-NAME-GNU-Linux-instead-of.patch' @@ -32,12 +33,13 @@ source=("git://github.com/systemd/systemd.git#tag=v$pkgver" "https://repo.parabola.nu/other/systemd/splash-parabola.bmp"{,.sig}) md5sums=('SKIP' '90ea67a7bb237502094914622a39e281' - '976c5511b6493715e381f43f16cdb151' + 'cfb3f8ea657ab24535cc061bb38ec4c1' '1b3aa3a0551b08af9305d33f85b5c2fc' '36ee74767ac8734dede1cbd0f4f275d7' '9b9f4a58e4c4009bf5290c5b297600c3' + 'a475a5ed8f03fb0f6b58b4684998d05c' '92a4bb5e527e1e956743c1ffa622adc7' - '35e9e89add0243f77f0b1c9be6f7bdcb' + '397e2262bf96df3bc1762a3b0bef2f75' 'e592f6778c12627d46982ddfe0698361' 'c4c559f9916806f5162ccff3e7c433e8' '5166fe700ef5991c2da3876206c699fb' @@ -46,20 +48,23 @@ md5sums=('SKIP' 'SKIP') validpgpkeys=('684D54A189305A9CC95446D36B888913DDB59515') # Márcio Silva -prepare() { - cd "$pkgbase" +_backports=( + # Revert "rules: allow users to access frame buffer devices" (#3333) + e77813ca9f4e0735fd0e3e2caae4d7d1ee436011 - # networkd: FIONREAD is not reliable on some sockets - git cherry-pick -n 4edc2c9b6b5b921873eb82e58719ed4d9e0d69bf + # {machine,system}ctl: always pass &changes and &n_changes (#3350) + acc0269cad31d1aaef2034a055b34c07c88a353d - # fix assertion failure in src/core/timer.c on bootup (FS#48197) - git cherry-pick -n 3f51aec8647fe13f4b1e46b2f75ff635403adf91 + # systemctl: fix return values on success + 5f056378b0ceffb6e6fba3513f7eae72e2d09dc8 +) - # fix udevd error checking from cg_unified() (FS#48188) - git cherry-pick -n 6d2353394fc33e923d1ab464c8f88df2a5105ffb +prepare() { + cd "$pkgbase" - # revert "core: resolve specifier in config_parse_exec()" - git cherry-pick -n bd1b973fb326e9b7587494fd6108e5ded46e9163 + if (( ${#_backports[*]} > 0 )); then + git cherry-pick -n "${_backports[@]}" + fi # apply FSDG patches local patchfile @@ -89,17 +94,24 @@ build() { enable_gnuefi='--enable-gnuefi' fi - ./configure \ - --libexecdir=/usr/lib \ - --localstatedir=/var \ - --sysconfdir=/etc \ - --enable-lz4 \ - $enable_gnuefi \ - --disable-audit \ - --disable-ima \ - --with-sysvinit-path= \ - --with-sysvrcnd-path= \ - --with-ntp-servers="${timeservers[*]}" + local configure_options=( + --libexecdir=/usr/lib + --localstatedir=/var + --sysconfdir=/etc + + --enable-lz4 + $enable_gnuefi + --disable-audit + --disable-ima + + --with-sysvinit-path= + --with-sysvrcnd-path= + --with-ntp-servers="${timeservers[*]}" + --with-default-dnssec=no + --without-kill-user-processes + ) + + ./configure "${configure_options[@]}" make @@ -159,7 +171,6 @@ package_systemd() { etc/dbus-1/system.d/org.freedesktop.import1.conf etc/dbus-1/system.d/org.freedesktop.network1.conf etc/pam.d/systemd-user - etc/systemd/bootchart.conf etc/systemd/coredump.conf etc/systemd/journald.conf etc/systemd/journal-remote.conf @@ -214,6 +225,8 @@ package_systemd() { install -Dm644 "$srcdir/parabola.conf" "$pkgdir"/usr/share/systemd/bootctl/parabola.conf install -Dm644 "$srcdir/loader.conf" "$pkgdir"/usr/share/systemd/bootctl/loader.conf install -Dm644 "$srcdir/splash-parabola.bmp" "$pkgdir"/usr/share/systemd/bootctl/splash-parabola.bmp + + install -Dm644 "$srcdir/udev-hwdb.hook" "$pkgdir/usr/share/libalpm/hooks/udev-hwdb.hook" } package_libsystemd() { |