summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Harvey2015-09-11 22:35:51 +0000
committerJames Harvey2015-09-11 22:35:51 +0000
commit51d531108b2ee9ca5cb0ed7a87be21c159e99adf (patch)
tree46ff9d51be56451221a59870f54a49deefbd0b63
parent02212a1ee05d84dc148f2924a3cc9ca179663f7d (diff)
downloadaur-systemd-kill-fix.tar.gz
Duplicated changes between core's systemd 224-1 and 225-1
-rw-r--r--.SRCINFO10
-rw-r--r--PKGBUILD8
2 files changed, 7 insertions, 11 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 7845c376b1e3..c619a060e279 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
pkgbase = systemd-kill-fix
- pkgver = 224
+ pkgver = 225
pkgrel = 1
url = http://www.freedesktop.org/wiki/Software/systemd
arch = i686
@@ -28,7 +28,7 @@ pkgbase = systemd-kill-fix
makedepends = git
options = strip
options = debug
- source = git://github.com/systemd/systemd.git#tag=v224
+ source = git://github.com/systemd/systemd.git#tag=v225
source = initcpio-hook-udev
source = initcpio-install-systemd
source = initcpio-install-udev
@@ -68,9 +68,9 @@ pkgname = systemd-kill-fix
optdepends = systemd-sysvcompat-kill-fix: symlink package to provide sysvinit binaries
optdepends = polkit: allow administration as unprivileged user
provides = nss-myhostname
- provides = systemd-tools=224
- provides = udev=224
- provides = systemd=224
+ provides = systemd-tools=225
+ provides = udev=225
+ provides = systemd=225
conflicts = nss-myhostname
conflicts = systemd-tools
conflicts = udev
diff --git a/PKGBUILD b/PKGBUILD
index dbc3cad8082f..a976f80f5b66 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,14 +6,14 @@
# Modifications to revert commit 743970d
# ======================================
# Maintainer: James Harvey <jamespharvey20@gmail.com>
-# * This PKGBUILD as closely as possible matches core's systemd 224-1
+# * This PKGBUILD as closely as possible matches core's systemd 225-1
# * splash-arch.bmp is omitted, because it is over AUR4's 250k file size limit
# * All namcap warnings and errors are identical
pkgbase=systemd-kill-fix
pkgname=('systemd-kill-fix' 'libsystemd-kill-fix' 'systemd-sysvcompat-kill-fix')
_pkgname=systemd
-pkgver=224
+pkgver=225
pkgrel=1
arch=('i686' 'x86_64')
url="http://www.freedesktop.org/wiki/Software/systemd"
@@ -38,10 +38,6 @@ md5sums=('SKIP'
prepare() {
cd "$_pkgname"
- # networkd: fix networkd crash
- # https://github.com/systemd/systemd/commit/49f6e11e89b4
- git cherry-pick -n 49f6e11e89b4
-
# revert commit that under certain circumstances sends processes a
# kill -9 during system shutdown. most common data loss from this is
# preventing bash from writing .bash_history