bump to 1.0.11

5 files changed, 104 insertions, 50 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 461c6f99980f..52c90893ead7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = ovirt-guest-agent
 	pkgdesc = The oVirt Guest Agent
-	pkgver = 1.0.10
-	pkgrel = 3
+	pkgver = 1.0.11
+	pkgrel = 1
 	url = http://wiki.ovirt.org/Category:Ovirt_guest_agent
 	install = ovirt-guest-agent.install
 	arch = any
@@ -19,12 +19,14 @@ pkgbase = ovirt-guest-agent
 	depends = python2-ethtool
 	depends = usermode
 	backup = etc/ovirt-guest-agent.conf
-	source = ovirt-guest-agent.install
+	source = python2-arch.patch
+	source = sysusers.conf
 	source = ovirt-guest-agent.service
-	source = https://evilissimo.fedorapeople.org/releases/ovirt-guest-agent/1.0.10/ovirt-guest-agent-1.0.10.3.tar.bz2
-	sha256sums = 10c5dc2fa265e6944d9316003fb04163ff005debddd3e86ad4ce3e4ec00ee893
+	source = https://evilissimo.fedorapeople.org/releases/ovirt-guest-agent/1.0.11/ovirt-guest-agent-1.0.11.tar.bz2
+	sha256sums = 95c162b584dd137296bcec70d14079d4b93d10d8542a87bd8f1cd6ad01e4b140
+	sha256sums = fab3d62ecd8f6546d5b193f4ca22919de20451678b4cce2c53aa0977fed4f483
 	sha256sums = 545235630d6da51b547c1e8c177ddbf9f57aa81017b8683274a449d46e765cc4
-	sha256sums = d11e1a6a9a36a2e318cfc7f063f22a30b29594284f31e5a5903bbd3984c1070b
+	sha256sums = ccb3fec17caa92e62ff119b8700b5f86de0b9b625e1d3f3977b9480bc5d9a2d5
 
 pkgname = ovirt-guest-agent
 
diff --git a/PKGBUILD b/PKGBUILD
index ee12e1a46e6a..7215fb6298d2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,25 +1,32 @@
-# Maintainer: Konstantin Shalygin (k0ste@opentech.ru)
+# Maintainer: Konstantin Shalygin (k0ste@cn.ru)
 
 pkgname='ovirt-guest-agent'
-pkgver='1.0.10'
-pkgrel='3'
+pkgver='1.0.11'
+pkgrel='1'
 pkgdesc='The oVirt Guest Agent'
 arch=('any')
 url='http://wiki.ovirt.org/Category:Ovirt_guest_agent'
 depends=('systemd' 'python2' 'python2-dbus' 'python2-gobject2' 'dbus-glib' 'python2-ethtool' 'usermode')
 makedepends=('pam' 'libtool' 'python2' 'python2-pep8' 'pep8')
 license=('ASL 2.0')
-install='ovirt-guest-agent.install'
-source=('ovirt-guest-agent.install'
-	'ovirt-guest-agent.service'
-	"https://evilissimo.fedorapeople.org/releases/${pkgname}/${pkgver}/${pkgname}-${pkgver}.${pkgrel}.tar.bz2")
-sha256sums=('10c5dc2fa265e6944d9316003fb04163ff005debddd3e86ad4ce3e4ec00ee893'
-	    '545235630d6da51b547c1e8c177ddbf9f57aa81017b8683274a449d46e765cc4'
-	    "d11e1a6a9a36a2e318cfc7f063f22a30b29594284f31e5a5903bbd3984c1070b")
-backup=('etc/ovirt-guest-agent.conf')
+install=("${pkgname}.install")
+source=("python2-arch.patch"
+	"sysusers.conf"
+	"${pkgname}.service"
+	"https://evilissimo.fedorapeople.org/releases/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2")
+sha256sums=("95c162b584dd137296bcec70d14079d4b93d10d8542a87bd8f1cd6ad01e4b140"
+	    "fab3d62ecd8f6546d5b193f4ca22919de20451678b4cce2c53aa0977fed4f483"
+	    "545235630d6da51b547c1e8c177ddbf9f57aa81017b8683274a449d46e765cc4"
+	    "ccb3fec17caa92e62ff119b8700b5f86de0b9b625e1d3f3977b9480bc5d9a2d5")
+backup=("etc/${pkgname}.conf")
+
+prepare() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -p1 -i ../python2-arch.patch
+}
 
 build() {
-  cd "$pkgname-$pkgver.$pkgrel"
+  cd "${pkgname}-${pkgver}"
   PYTHON=/usr/bin/python2 ./configure \
     --prefix=/usr \
     --bindir=/usr/bin \
@@ -40,13 +47,10 @@ build() {
 }
 
 package() {
-  pushd "$pkgname-$pkgver.$pkgrel"
-  make DESTDIR="$pkgdir" install
+  pushd "${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
   popd
-  install -dm775 -o 175 -g 175 "$pkgdir/var/log/ovirt-guest-agent"
-  rm "$pkgdir/usr/lib/systemd/system/ovirt-guest-agent.service"
-  install -Dm644 "ovirt-guest-agent.service" "$pkgdir/usr/lib/systemd/system/ovirt-guest-agent.service"
-  sed -i 's|bin/python|bin/python2|g' "$pkgdir/usr/share/ovirt-guest-agent/ovirt-guest-agent.py"
-  sed -i 's|env python|env python2|g' "$pkgdir/usr/share/ovirt-guest-agent/diskmapper"
-  sed -i 's|bin/python|bin/python2|g' "$pkgdir/usr/share/ovirt-guest-agent/LockActiveSession.py"
+  install -Dm644 "${pkgname}.service" "${pkgdir}/usr/lib/systemd/system/${pkgname}.service"
+  install -Dm644 "sysusers.conf" "${pkgdir}/usr/lib/sysusers.d/${pkgname}.conf"
+  install -dm775 -o 175 -g 175 "${pkgdir}/var/log/${pkgname}"
 }
diff --git a/ovirt-guest-agent.install b/ovirt-guest-agent.install
index 6dad0bb42a34..96c22da8b285 100644
--- a/ovirt-guest-agent.install
+++ b/ovirt-guest-agent.install
@@ -1,34 +1,27 @@
-pre_install() {
-getent group ovirtagent >/dev/null || groupadd -r -g 175 ovirtagent
-getent passwd ovirtagent > /dev/null || \
-    /usr/bin/useradd -u 175 -g 175 -o -r ovirtagent \
-    -c "oVirt Guest Agent" -d /usr/share/ovirt-guest-agent -s /usr/bin/nologin
-exit 0
-}
-
 post_install() {
-/usr/bin/udevadm trigger --subsystem-match="virtio-ports" \
+  /usr/bin/systemd-sysusers ovirt-guest-agent.conf
+  /usr/bin/udevadm trigger --subsystem-match="virtio-ports" \
     --attr-match="name=com.redhat.rhevm.vdsm"
-
-/usr/bin/systemctl daemon-reload
+  /usr/bin/systemctl daemon-reload
 }
 
 pre_remove() {
-    /usr/bin/systemctl stop ovirt-guest-agent.service > /dev/null 2>&1
-    # Send an "uninstalled" notification to vdsm.
-    VIRTIO=`grep "^device" /etc/ovirt-guest-agent.conf | awk '{ print $3; }'`
-    if [ -w $VIRTIO ]
-    then
-        # Non blocking uninstalled notification
-        echo -e '{"__name__": "uninstalled"}\n' | dd of=$VIRTIO \
-            oflag=nonblock status=noxfer conv=nocreat 1>& /dev/null || :
-    fi
+  /usr/bin/systemctl stop ovirt-guest-agent.service > /dev/null 2>&1
+# Send an "uninstalled" notification to vdsm.
+  VIRTIO=`grep "^device" /etc/ovirt-guest-agent.conf | awk '{ print $3; }'`
+  if [ -w $VIRTIO ]
+  then
+  # Non blocking uninstalled notification
+  echo -e '{"__name__": "uninstalled"}\n' | dd of=$VIRTIO \
+  oflag=nonblock status=noxfer conv=nocreat 1>& /dev/null || :
+  fi
 }
+
 post_remove() {
-    /usr/bin/systemctl daemon-reload
-    # Let udev clear access rights
-    /usr/bin/udevadm trigger --subsystem-match="virtio-ports" \
-        --attr-match="name=com.redhat.rhevm.vdsm"
+  /usr/bin/userdel ovirtagent > /dev/null
+  /usr/bin/systemctl daemon-reload
+  /usr/bin/udevadm trigger --subsystem-match="virtio-ports" \
+    --attr-match="name=com.redhat.rhevm.vdsm"
 }
 
 post_upgrade() {
diff --git a/python2-arch.patch b/python2-arch.patch
new file mode 100644
index 000000000000..f13f9f3bd3aa
--- /dev/null
+++ b/python2-arch.patch
@@ -0,0 +1,54 @@
+diff -Naupr ovirt-guest-agent-1.0.11/ovirt-guest-agent/LockActiveSession.py ovirt-guest-agent-1.0.11-orig/ovirt-guest-agent/LockActiveSession.py
+--- ovirt-guest-agent-1.0.11/ovirt-guest-agent/LockActiveSession.py	2014-11-21 15:37:32.000000000 +0600
++++ ovirt-guest-agent-1.0.11-orig/ovirt-guest-agent/LockActiveSession.py	2015-08-08 09:54:24.331528178 +0600
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/bin/python2
+ #
+ # Licensed under the Apache License, Version 2.0 (the "License");
+ # you may not use this file except in compliance with the License.
+diff -Naupr ovirt-guest-agent-1.0.11/ovirt-guest-agent/LogoutActiveUser.py ovirt-guest-agent-1.0.11-orig/ovirt-guest-agent/LogoutActiveUser.py
+--- ovirt-guest-agent-1.0.11/ovirt-guest-agent/LogoutActiveUser.py	2015-06-05 15:11:43.000000000 +0600
++++ ovirt-guest-agent-1.0.11-orig/ovirt-guest-agent/LogoutActiveUser.py	2015-08-08 09:54:32.041549387 +0600
+@@ -1,4 +1,4 @@
+-#! /usr/bin/env python
++#! /usr/bin/env python2
+ # -*- coding: utf-8 -*-
+ # vim:fenc=utf-8
+ #
+diff -Naupr ovirt-guest-agent-1.0.11/ovirt-guest-agent/ovirt-guest-agent.py ovirt-guest-agent-1.0.11-orig/ovirt-guest-agent/ovirt-guest-agent.py
+--- ovirt-guest-agent-1.0.11/ovirt-guest-agent/ovirt-guest-agent.py	2014-08-27 15:38:02.000000000 +0700
++++ ovirt-guest-agent-1.0.11-orig/ovirt-guest-agent/ovirt-guest-agent.py	2015-08-08 09:56:02.135130545 +0600
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/bin/python2
+ #
+ # Licensed under the Apache License, Version 2.0 (the "License");
+ # you may not use this file except in compliance with the License.
+diff -Naupr ovirt-guest-agent-1.0.11/ovirt-guest-agent/timezone.py ovirt-guest-agent-1.0.11-orig/ovirt-guest-agent/timezone.py
+--- ovirt-guest-agent-1.0.11/ovirt-guest-agent/timezone.py	2015-04-22 14:03:00.000000000 +0600
++++ ovirt-guest-agent-1.0.11-orig/ovirt-guest-agent/timezone.py	2015-08-08 09:56:52.395268799 +0600
+@@ -1,4 +1,4 @@
+-#! /usr/bin/env python
++#! /usr/bin/env python2
+ # -*- coding: utf-8 -*-
+ # vim:fenc=utf-8
+ # Copyright 2014 Vinzenz Feenstra, Red Hat, Inc. and/or its affiliates.
+diff -Naupr ovirt-guest-agent-1.0.11/scripts/diskmapper/diskmapper.libudev ovirt-guest-agent-1.0.11-orig/scripts/diskmapper/diskmapper.libudev
+--- ovirt-guest-agent-1.0.11/scripts/diskmapper/diskmapper.libudev	2015-02-02 18:38:02.000000000 +0600
++++ ovirt-guest-agent-1.0.11-orig/scripts/diskmapper/diskmapper.libudev	2015-08-08 09:55:44.225081279 +0600
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/env python2
+ #
+ # Copyright 2014 Red Hat, Inc. and/or its affiliates.
+ #
+diff -Naupr ovirt-guest-agent-1.0.11/scripts/ovirt-osinfo ovirt-guest-agent-1.0.11-orig/scripts/ovirt-osinfo
+--- ovirt-guest-agent-1.0.11/scripts/ovirt-osinfo	2015-04-22 14:03:00.000000000 +0600
++++ ovirt-guest-agent-1.0.11-orig/scripts/ovirt-osinfo	2015-08-08 09:56:31.775212078 +0600
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/bin/python2
+ 
+ import platform
+ info = platform.linux_distribution()
diff --git a/sysusers.conf b/sysusers.conf
new file mode 100644
index 000000000000..5704fb23329b
--- /dev/null
+++ b/sysusers.conf
@@ -0,0 +1 @@
+u ovirtagent 175 "oVirt Guest Agent" /usr/share/ovirt-guest-agent