summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicolas Iooss2015-09-26 16:43:57 +0200
committerNicolas Iooss2015-09-26 16:43:57 +0200
commit77358db68eaf129f33c6cd075c9a434550debb18 (patch)
tree85cd65545d12c7bf4d182fb7cc43393ff12f5f6b
parent7b6d5fa98a73877df3ddcdb5b47f8ee1ef7db006 (diff)
downloadaur-77358db68eaf129f33c6cd075c9a434550debb18.tar.gz
systemd-selinux 226-1 update
-rw-r--r--.SRCINFO16
-rw-r--r--PKGBUILD14
2 files changed, 13 insertions, 17 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 239038b06f16..44501dff49e0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
pkgbase = systemd-selinux
- pkgver = 225
+ pkgver = 226
pkgrel = 1
url = http://www.freedesktop.org/wiki/Software/systemd
arch = i686
@@ -30,7 +30,7 @@ pkgbase = systemd-selinux
makedepends = libselinux
options = strip
options = debug
- source = git://github.com/systemd/systemd.git#tag=v225
+ source = git://github.com/systemd/systemd.git#tag=v226
source = initcpio-hook-udev
source = initcpio-install-systemd
source = initcpio-install-udev
@@ -74,9 +74,9 @@ pkgname = systemd-selinux
optdepends = systemd-sysvcompat: symlink package to provide sysvinit binaries
optdepends = polkit: allow administration as unprivileged user
provides = nss-myhostname
- provides = systemd-tools=225
- provides = udev=225
- provides = systemd=225-1
+ provides = systemd-tools=226
+ provides = udev=226
+ provides = systemd=226-1
conflicts = nss-myhostname
conflicts = systemd-tools
conflicts = udev
@@ -120,15 +120,15 @@ pkgname = libsystemd-selinux
provides = libsystemd-journal.so
provides = libsystemd-login.so
provides = libudev.so
- provides = libsystemd=225-1
+ provides = libsystemd=226-1
conflicts = libsystemd
pkgname = systemd-sysvcompat-selinux
pkgdesc = sysvinit compat for systemd with SELinux support
license = GPL2
depends = systemd-selinux
- provides = systemd-sysvcompat=225-1
- provides = selinux-systemd-sysvcompat=225-1
+ provides = systemd-sysvcompat=226-1
+ provides = selinux-systemd-sysvcompat=226-1
conflicts = sysvinit
conflicts = systemd-sysvcompat
conflicts = selinux-systemd-sysvcompat
diff --git a/PKGBUILD b/PKGBUILD
index 56f877615800..6a997339cedb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@
pkgbase=systemd-selinux
pkgname=('systemd-selinux' 'libsystemd-selinux' 'systemd-sysvcompat-selinux')
-pkgver=225
+pkgver=226
pkgrel=1
arch=('i686' 'x86_64')
url="http://www.freedesktop.org/wiki/Software/systemd"
@@ -35,13 +35,13 @@ md5sums=('SKIP'
'1e2f9a8b0fa32022bf0a8f39123e5f4e')
prepare() {
- cd "${pkgname/-selinux}"
+ cd "${pkgbase/-selinux}"
./autogen.sh
}
build() {
- cd "${pkgname/-selinux}"
+ cd "${pkgbase/-selinux}"
local timeservers=({0..3}.arch.pool.ntp.org)
@@ -63,10 +63,6 @@ build() {
make
}
-check() {
- make -C "${pkgname/-selinux}" check || :
-}
-
package_systemd-selinux() {
pkgdesc="system and service manager with SELinux support"
license=('GPL2' 'LGPL2.1')
@@ -105,7 +101,7 @@ package_systemd-selinux() {
etc/udev/udev.conf)
install="systemd.install"
- make -C "${pkgname/-selinux}" DESTDIR="$pkgdir" install
+ make -C "${pkgbase/-selinux}" DESTDIR="$pkgdir" install
# don't write units to /etc by default. some of these will be re-enabled on
# post_install.
@@ -115,7 +111,7 @@ package_systemd-selinux() {
rm -r "$pkgdir/usr/lib/rpm"
# add back tmpfiles.d/legacy.conf
- install -m644 "${pkgname/-selinux}/tmpfiles.d/legacy.conf" "$pkgdir/usr/lib/tmpfiles.d"
+ install -m644 "${pkgbase/-selinux}/tmpfiles.d/legacy.conf" "$pkgdir/usr/lib/tmpfiles.d"
# Replace dialout/tape/cdrom group in rules with uucp/storage/optical group
sed -i 's#GROUP="dialout"#GROUP="uucp"#g;