Package improvements.

11 files changed, 135 insertions, 65 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a6e2f3ad7e73..5df899775b70 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Sat Jan 28 16:16:57 UTC 2017
+# Tue Apr 18 15:39:20 UTC 2017
 pkgbase = ovirt-guest-agent
 	pkgdesc = The oVirt Guest Agent
 	pkgver = 1.0.13
-	pkgrel = 1
+	pkgrel = 2
 	url = http://ovirt.org/develop/developer-guide/vdsm/guest-agent
 	install = ovirt-guest-agent.install
 	arch = x86_64
@@ -14,24 +14,43 @@ pkgbase = ovirt-guest-agent
 	makedepends = python2-pycodestyle
 	makedepends = patch
 	makedepends = autoconf
-	depends = systemd
-	depends = python2
-	depends = python2-dbus
-	depends = python2-gobject2
-	depends = dbus-glib
-	depends = python2-ethtool
-	depends = usermode
 	backup = etc/ovirt-guest-agent.conf
 	source = https://evilissimo.fedorapeople.org/releases/ovirt-guest-agent/1.0.13/ovirt-guest-agent-1.0.13.tar.bz2
 	source = python2-arch.patch
-	source = ovirt-guest-agent-1.0.12.1_python_pycodestyle.patch
-	source = sysusers.conf
+	source = ovirt-guest-agent-1.0.13_arch_pycodestyle.patch
+	source = 39-ovirt-memory-hotplug.rules
+	source = console.apps_diskmapper
+	source = pam.d_diskmapper
+	source = ovirt-guest-agent.tmpfiles
+	source = ovirt-guest-agent.sysusers
 	source = ovirt-guest-agent.service
 	sha256sums = 3b4d429d3e5ca1a369cc0868217910eadc70178156bb62e9d68cb1a9fde8afcc
 	sha256sums = 95c162b584dd137296bcec70d14079d4b93d10d8542a87bd8f1cd6ad01e4b140
-	sha256sums = 23ca1080d0ea1c4214afa60849087c91e8eaecf03afcb69ef9ee19220644163a
+	sha256sums = ebe724b39b78a3bc21a998884b188e0efdaa2fc3ea3416fb4e4e273629394e24
+	sha256sums = 78994d3cfe8f293aab84692c9d181b2c20caeb47e9854bb9377f2199b45984fb
+	sha256sums = 3575b027e6364d5b0d664cff9f9bc6c27a6a57691f7f188c3cf281663ccc3c0d
+	sha256sums = f9afb37eb23e77cf59d34f8783d3cacc509ed9400936c3dc95d6db629b3b58a1
+	sha256sums = f55ea5c26a5b0548ae0dfc1397520d10869f2ca5ff184418dfebaceb7910a43f
 	sha256sums = fab3d62ecd8f6546d5b193f4ca22919de20451678b4cce2c53aa0977fed4f483
-	sha256sums = 545235630d6da51b547c1e8c177ddbf9f57aa81017b8683274a449d46e765cc4
+	sha256sums = 9d80826cb331ecbf1a3f979cbe30de3ae1704322f137e49250ce620eaf64cfc7
 
 pkgname = ovirt-guest-agent
+	pkgdesc = The oVirt Guest Agent
+	depends = qemu-guest-agent
+	depends = python2-dbus
+	depends = python2-gobject2
+	depends = dbus-glib
+	depends = python2-ethtool
+	conflicts = ovirt-guest-agent-common
+
+pkgname = ovirt-guest-agent-common
+	pkgdesc = The oVirt Guest Agent (with X support)
+	depends = qemu-guest-agent
+	depends = python2
+	depends = python2-dbus
+	depends = python2-gobject2
+	depends = dbus-glib
+	depends = python2-ethtool
+	depends = usermode
+	conflicts = ovirt-guest-agent
 
diff --git a/39-ovirt-memory-hotplug.rules b/39-ovirt-memory-hotplug.rules
new file mode 100644
index 000000000000..10ad453d43e8
--- /dev/null
+++ b/39-ovirt-memory-hotplug.rules
@@ -0,0 +1,4 @@
+# do not edit this file, it will be overwritten on update
+
+# Memory hotadd request: Make the added memory movable.
+SUBSYSTEM=="memory", ACTION=="add", PROGRAM="/bin/uname -p", RESULT!="s390*", ATTR{state}=="offline", ATTR{state}="online_movable"
diff --git a/PKGBUILD b/PKGBUILD
index b819a31bccbd..684e126c96d7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,33 +1,45 @@
 # Maintainer: Konstantin Shalygin <k0ste@k0ste.ru>
 # Contributor: Konstantin Shalygin <k0ste@k0ste.ru>
 
-pkgname='ovirt-guest-agent'
+pkgbase='ovirt-guest-agent'
+pkgname=("${pkgbase}" "${pkgbase}-common")
 _mainver='1.0.13'
 _subrel=''
 pkgver="${_mainver}${_subrel}"
-pkgrel='1'
+pkgrel='2'
 pkgdesc='The oVirt Guest Agent'
 arch=('x86_64')
 url="http://ovirt.org/develop/developer-guide/vdsm/guest-agent"
-depends=('systemd' 'python2' 'python2-dbus' 'python2-gobject2' 'dbus-glib' 'python2-ethtool' 'usermode')
 makedepends=('pam' 'libtool' 'python2' 'python2-pycodestyle' 'patch' 'autoconf')
 license=('ASL 2.0')
-install="${pkgname}.install"
-source=("https://evilissimo.fedorapeople.org/releases/${pkgname}/${_mainver}/${pkgname}-${pkgver}.tar.bz2"
+install="${pkgbase}.install"
+source=("https://evilissimo.fedorapeople.org/releases/${pkgbase}/${_mainver}/${pkgbase}-${pkgver}.tar.bz2"
 	"python2-arch.patch"
-	"sysusers.conf"
-	"${pkgname}.service")
+	"${pkgbase}-1.0.13_arch_pycodestyle.patch"
+	"39-ovirt-memory-hotplug.rules"
+	"console.apps_diskmapper"
+	"pam.d_diskmapper"
+	"${pkgbase}.tmpfiles"
+	"${pkgbase}.sysusers"
+	"${pkgbase}.service")
 sha256sums=('3b4d429d3e5ca1a369cc0868217910eadc70178156bb62e9d68cb1a9fde8afcc'
             '95c162b584dd137296bcec70d14079d4b93d10d8542a87bd8f1cd6ad01e4b140'
+            'ebe724b39b78a3bc21a998884b188e0efdaa2fc3ea3416fb4e4e273629394e24'
+            '78994d3cfe8f293aab84692c9d181b2c20caeb47e9854bb9377f2199b45984fb'
+            '3575b027e6364d5b0d664cff9f9bc6c27a6a57691f7f188c3cf281663ccc3c0d'
+            'f9afb37eb23e77cf59d34f8783d3cacc509ed9400936c3dc95d6db629b3b58a1'
+            'f55ea5c26a5b0548ae0dfc1397520d10869f2ca5ff184418dfebaceb7910a43f'
             'fab3d62ecd8f6546d5b193f4ca22919de20451678b4cce2c53aa0977fed4f483'
-            '545235630d6da51b547c1e8c177ddbf9f57aa81017b8683274a449d46e765cc4')
-backup=("etc/${pkgname}.conf")
+            '9d80826cb331ecbf1a3f979cbe30de3ae1704322f137e49250ce620eaf64cfc7')
+backup=("etc/${pkgbase}.conf")
 
 prepare() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd "${srcdir}/${pkgbase}-${pkgver}"
+  
+  patch -p1 -i "${srcdir}/${pkgbase}-1.0.13_arch_pycodestyle.patch"
   patch -p1 -i "${srcdir}/python2-arch.patch"
-  autoreconf -fvi
 
+  autoreconf -fvi
   PYTHON=/usr/bin/python2 ./configure \
     --prefix=/usr \
     --bindir=/usr/bin \
@@ -39,23 +51,52 @@ prepare() {
     --datadir=/usr/share \
     --infodir=/usr/share/info \
     --includedir=/usr/include/security \
+    --enable-securedir=/usr/lib/security \
     --with-systemdsystemunitdir=/usr/lib/systemd/system \
     --with-pam-prefix=/etc \
     --without-gdm \
-    --without-kdm \
-    --enable-securedir=/usr/lib/security
+    --without-kdm
 }
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd "${srcdir}/${pkgbase}-${pkgver}"
   make
 }
 
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+package_ovirt-guest-agent() {
+  depends=('qemu-guest-agent' 'python2-dbus' 'python2-gobject2' 'dbus-glib' 'python2-ethtool')
+  pkgdesc='The oVirt Guest Agent'
+  conflicts=("${pkgbase}-common")
+
+  cd "${srcdir}/${pkgbase}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+
+  install -Dm0644 "${srcdir}/${pkgbase}.service" "${pkgdir}/usr/lib/systemd/system/${pkgbase}.service"
+  install -Dm0644 "${srcdir}/${pkgbase}.sysusers" "${pkgdir}/usr/lib/sysusers.d/${pkgbase}.conf"
+  install -Dm0644 "${srcdir}/${pkgbase}.tmpfiles" "${pkgdir}/usr/lib/tmpfiles.d/${pkgbase}.conf"
+  install -Dm0644 "${srcdir}/39-ovirt-memory-hotplug.rules" "${pkgdir}/usr/lib/udev/rules.d/39-ovirt-memory-hotplug.rules"
+  mv "${pkgdir}/etc/udev/rules.d/"* "${pkgdir}/usr/lib/udev/rules.d/"
+  rm -rf "${pkgdir}/etc/udev"
+}
+
+package_ovirt-guest-agent-common() {
+  depends=('qemu-guest-agent' 'python2' 'python2-dbus' 'python2-gobject2' 'dbus-glib' 'python2-ethtool' 'usermode')
+  pkgdesc='The oVirt Guest Agent (with X support)'
+  conflicts=("${pkgbase}")
+
+  cd "${srcdir}/${pkgbase}-${pkgver}"
   make DESTDIR="${pkgdir}" install
-  libtool --finish ${pkgdir}/usr/lib/security
-  install -Dm0644 "${srcdir}/${pkgname}.service" "${pkgdir}/usr/lib/systemd/system/${pkgname}.service"
-  install -Dm0644 "${srcdir}/sysusers.conf" "${pkgdir}/usr/lib/sysusers.d/${pkgname}.conf"
-  install -dm0775 -o 175 -g 175 "${pkgdir}/var/log/${pkgname}"
+
+  install -Dm0644 "${srcdir}/${pkgbase}.service" "${pkgdir}/usr/lib/systemd/system/${pkgbase}.service"
+  install -Dm0644 "${srcdir}/${pkgbase}.sysusers" "${pkgdir}/usr/lib/sysusers.d/${pkgbase}.conf"
+  install -Dm0644 "${srcdir}/${pkgbase}.tmpfiles" "${pkgdir}/usr/lib/tmpfiles.d/${pkgbase}.conf"
+  install -Dm0644 "${srcdir}/39-ovirt-memory-hotplug.rules" "${pkgdir}/usr/lib/udev/rules.d/39-ovirt-memory-hotplug.rules"
+  mv "${pkgdir}/etc/udev/rules.d/"* "${pkgdir}/usr/lib/udev/rules.d/"
+  rm -rf "${pkgdir}/etc/udev"
+
+# EL7 Magic
+  cp "${srcdir}/console.apps_diskmapper" "${pkgdir}/etc/security/console.apps/diskmapper"
+  cp "${srcdir}/pam.d_diskmapper" "${pkgdir}/etc/pam.d/diskmapper"
+  mv "${pkgdir}/usr/share/${pkgbase}/diskmapper" "${pkgdir}/usr/share/${pkgbase}/diskmapper.script"
+  ln -s "/usr/bin/consolehelper" "${pkgdir}/usr/share/${pkgbase}/diskmapper"
 }
diff --git a/console.apps_diskmapper b/console.apps_diskmapper
new file mode 100644
index 000000000000..235e9009619b
--- /dev/null
+++ b/console.apps_diskmapper
@@ -0,0 +1 @@
+PROGRAM=/usr/share/ovirt-guest-agent/diskmapper.script
diff --git a/ovirt-guest-agent-1.0.12.1_python_pycodestyle.patch b/ovirt-guest-agent-1.0.12.1_python_pycodestyle.patch
deleted file mode 100644
index 5a23a6f43111..000000000000
--- a/ovirt-guest-agent-1.0.12.1_python_pycodestyle.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -Naupr ovirt-guest-agent-1.0.12.1_orig/configure.ac ovirt-guest-agent-1.0.12.1/configure.ac
---- ovirt-guest-agent-1.0.12.1_orig/configure.ac	2016-06-15 13:07:57.000000000 +0600
-+++ ovirt-guest-agent-1.0.12.1/configure.ac	2016-07-23 21:39:58.512299556 +0600
-@@ -101,8 +101,11 @@ dnl ------------------------------------
- HAVE_PEP8="yes"
- AC_PATH_PROG([PEP8], [pep8])
- if test "x$PEP8" = "x"; then
--  AC_MSG_WARN([python-pep8 not found])
--  HAVE_PEP8="no"
-+  AC_PATH_PROG([PEP8], [pycodestyle2])
-+  if test "x$PEP8" = "x"; then
-+      AC_MSG_WARN([Neither python-pep8 nor python-pycodestyle could be found])
-+      HAVE_PEP8="no"
-+  fi
- fi
- AM_CONDITIONAL(HAVE_PEP8, [ test -n "$HAVE_PEP8" -a "x$HAVE_PEP8" != xno ])
- 
diff --git a/ovirt-guest-agent-1.0.13_arch_pycodestyle.patch b/ovirt-guest-agent-1.0.13_arch_pycodestyle.patch
new file mode 100644
index 000000000000..c3b9cef1cbd9
--- /dev/null
+++ b/ovirt-guest-agent-1.0.13_arch_pycodestyle.patch
@@ -0,0 +1,12 @@
+diff -Naupr ovirt-guest-agent-1.0.13_orig/configure.ac ovirt-guest-agent-1.0.13/configure.ac
+--- ovirt-guest-agent-1.0.13_orig/configure.ac	2016-12-06 18:05:53.000000000 +0700
++++ ovirt-guest-agent-1.0.13/configure.ac	2017-04-18 21:50:34.574548863 +0700
+@@ -101,7 +101,7 @@ dnl ------------------------------------
+ HAVE_PEP8="yes"
+ AC_PATH_PROG([PEP8], [pep8])
+ if test "x$PEP8" = "x"; then
+-  AC_PATH_PROG([PEP8], [pycodestyle])
++  AC_PATH_PROG([PEP8], [pycodestyle2])
+   if test "x$PEP8" = "x"; then
+       AC_MSG_WARN([Neither python-pep8 nor python-pycodestyle could be found])
+       HAVE_PEP8="no"
diff --git a/ovirt-guest-agent.install b/ovirt-guest-agent.install
index 624af0ddc91c..717f328df71a 100644
--- a/ovirt-guest-agent.install
+++ b/ovirt-guest-agent.install
@@ -1,26 +1,29 @@
 post_install() {
+# EL7 magic
   /usr/bin/udevadm trigger --subsystem-match="virtio-ports" \
     --attr-match="name=com.redhat.rhevm.vdsm"
+  /usr/bin/udevadm trigger --subsystem-match="virtio-ports" \
+    --attr-match="name=ovirt-guest-agent.0"
+  /usr/bin/udevadm trigger --subsystem-match="memory"
 }
 
 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
+
+# non blocking uninstalled notification
+  echo -e '{"__name__": "uninstalled"}\n' | dd \
+    of=/dev/virtio-ports/com.redhat.rhevm.vdsm \
+    oflag=nonblock status=noxfer conv=nocreat 1>& /dev/null || :
+
+  echo -e '{"__name__": "uninstalled"}\n' | dd \
+    of=/dev/virtio-ports/org.ovirt.vdsm \
+    oflag=nonblock status=noxfer conv=nocreat 1>& /dev/null || :
 }
 
 post_remove() {
-  /usr/bin/userdel ovirtagent > /dev/null
+# Let udev clear access rights
   /usr/bin/udevadm trigger --subsystem-match="virtio-ports" \
     --attr-match="name=com.redhat.rhevm.vdsm"
-}
-
-post_upgrade() {
-    /usr/bin/systemctl try-restart ovirt-guest-agent.service >/dev/null 2>&1 || :
+  /usr/bin/udevadm trigger --subsystem-match="virtio-ports" \
+    --attr-match="name=ovirt-guest-agent.0"
 }
diff --git a/ovirt-guest-agent.service b/ovirt-guest-agent.service
index 3676992ca53a..61acc6958ed7 100644
--- a/ovirt-guest-agent.service
+++ b/ovirt-guest-agent.service
@@ -4,11 +4,11 @@ After=network.target
 
 [Service]
 Type=simple
-PIDFile=/tmp/ovirt-guest-agent.pid
+PIDFile=/run/ovirtagent/ovirt-guest-agent.pid
 User=ovirtagent
 Group=ovirtagent
 ExecStartPre=/usr/bin/modprobe virtio_console
-ExecStart=/usr/bin/python2 /usr/share/ovirt-guest-agent/ovirt-guest-agent.py -p /tmp/ovirt-guest-agent.pid
+ExecStart=/usr/bin/python2 /usr/share/ovirt-guest-agent/ovirt-guest-agent.py -p /run/ovirtagent/ovirt-guest-agent.pid
 
 [Install]
 WantedBy=multi-user.target
diff --git a/sysusers.conf b/ovirt-guest-agent.sysusers
index 5704fb23329b..5704fb23329b 100644
--- a/sysusers.conf
+++ b/ovirt-guest-agent.sysusers
diff --git a/ovirt-guest-agent.tmpfiles b/ovirt-guest-agent.tmpfiles
new file mode 100644
index 000000000000..9eab4eedec71
--- /dev/null
+++ b/ovirt-guest-agent.tmpfiles
@@ -0,0 +1,3 @@
+d /var/log/ovirtagent 0750 ovirtagent ovirtagent
+d /run/ovirtagent 0750 ovirtagent ovirtagent
+
diff --git a/pam.d_diskmapper b/pam.d_diskmapper
new file mode 100644
index 000000000000..51e6962ee87e
--- /dev/null
+++ b/pam.d_diskmapper
@@ -0,0 +1,4 @@
+#%PAM-1.0
+auth     sufficient  pam_succeed_if.so user = ovirtagent
+auth     required    pam_deny.so
+account  required    pam_permit.so