summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndré Fabian Silva Delgado <emulatorman@parabola.nu>2016-02-22 22:21:48 -0300
committerAndré Fabian Silva Delgado <emulatorman@parabola.nu>2016-02-22 22:21:48 -0300
commit1416a2d97114247ed5600e3f04f4f7d335b25578 (patch)
tree9e0926b32044fe5e733a52947579be5929dd8726
parentaf5db9bb56f91f13f0ba11de09e0ecbf2199062e (diff)
downloadabslibre-1416a2d97114247ed5600e3f04f4f7d335b25578.tar.gz
abslibre-1416a2d97114247ed5600e3f04f4f7d335b25578.tar.bz2
abslibre-1416a2d97114247ed5600e3f04f4f7d335b25578.zip
systemd-229-3.parabola1: updating revision from Arch
* actually fix FS#48197 -> https://bugs.archlinux.org/task/48197 * backport revert for specifier parsing regression
-rw-r--r--libre/systemd/PKGBUILD7
1 files changed, 5 insertions, 2 deletions
diff --git a/libre/systemd/PKGBUILD b/libre/systemd/PKGBUILD
index 8d526b020..d474ad448 100644
--- a/libre/systemd/PKGBUILD
+++ b/libre/systemd/PKGBUILD
@@ -5,7 +5,7 @@
pkgbase=systemd
pkgname=systemd
pkgver=229
-pkgrel=2.parabola1
+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'
@@ -40,11 +40,14 @@ prepare() {
git cherry-pick -n 4edc2c9b6b5b921873eb82e58719ed4d9e0d69bf
# fix assertion failure in src/core/timer.c on bootup (FS#48197)
- git cherry-pick -n 6d2353394fc33e923d1ab464c8f88df2a5105ffb
+ git cherry-pick -n 3f51aec8647fe13f4b1e46b2f75ff635403adf91
# fix udevd error checking from cg_unified() (FS#48188)
git cherry-pick -n 6d2353394fc33e923d1ab464c8f88df2a5105ffb
+ # revert "core: resolve specifier in config_parse_exec()"
+ git cherry-pick -n bd1b973fb326e9b7587494fd6108e5ded46e9163
+
# Rename "Linux" -> "GNU/Linux"
patch -Np1 -i "$srcdir/gnu+linux.patch"
sed -i '\|os_name| s|Linux|GNU/Linux|' src/journal-remote/journal-gatewayd.c