Hello community, here is the log from the commit of package ovirt-guest-agent for openSUSE:Factory checked in at 2017-12-03 10:12:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ovirt-guest-agent (Old) and /work/SRC/openSUSE:Factory/.ovirt-guest-agent.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ovirt-guest-agent" Sun Dec 3 10:12:57 2017 rev:3 rq:547114 version:1.0.14 Changes: -------- --- /work/SRC/openSUSE:Factory/ovirt-guest-agent/ovirt-guest-agent.changes 2017-02-16 16:50:16.661441168 +0100 +++ /work/SRC/openSUSE:Factory/.ovirt-guest-agent.new/ovirt-guest-agent.changes 2017-12-03 10:13:01.043870076 +0100 @@ -1,0 +2,7 @@ +Thu Nov 9 07:29:12 UTC 2017 - bo...@steki.net + +- update to upstream release 1.0.14 +- removed fix-script-name-in-etc-sudoersd-file-for-ovirt.patch + as it has been fixed upstream + +------------------------------------------------------------------- Old: ---- fix-script-name-in-etc-sudoersd-file-for-ovirt.patch ovirt-guest-agent-1.0.13.tar.bz2 New: ---- ovirt-guest-agent-1.0.14.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ovirt-guest-agent.spec ++++++ --- /var/tmp/diff_new_pack.yzMk0Q/_old 2017-12-03 10:13:01.655847826 +0100 +++ /var/tmp/diff_new_pack.yzMk0Q/_new 2017-12-03 10:13:01.655847826 +0100 @@ -26,7 +26,7 @@ %{!?_udevrulesdir: %{expand: %%global _udevrulesdir %{?withprefix}/lib/udev/rules.d}} %global release_version 1 -%define major_version 1.0.13 +%define major_version 1.0.14 Name: ovirt-guest-agent Version: %major_version Release: %{release_version}%{?dist} @@ -34,8 +34,7 @@ License: Apache-2.0 Group: System/Monitoring Url: http://wiki.ovirt.org/wiki/Category:Ovirt_guest_agent -Source0: http://evilissimo.fedorapeople.org/releases/ovirt-guest-agent/%{major_version}/%{name}-%{major_version}.tar.bz2 -Patch1: fix-script-name-in-etc-sudoersd-file-for-ovirt.patch +Source0: http://resources.ovirt.org/pub/src/ovirt-guest-agent/ovirt-guest-agent-%{major_version}.tar.bz2 %if 0%{?suse_version} >= 1210 BuildRequires: fdupes @@ -78,7 +77,6 @@ %prep %setup -q -n ovirt-guest-agent-%{version} sed "s@/run/ovirt-guest-agent.pid@%{_rundir}/ovirt-guest-agent.pid@g" -i ovirt-guest-agent/ovirt-guest-agent.py -%patch1 -p1 %build ++++++ ovirt-guest-agent-1.0.13.tar.bz2 -> ovirt-guest-agent-1.0.14.tar.bz2 ++++++ ++++ 2218 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ovirt-guest-agent-1.0.13/ChangeLog new/ovirt-guest-agent-1.0.14/ChangeLog --- old/ovirt-guest-agent-1.0.13/ChangeLog 2016-12-06 12:05:53.000000000 +0100 +++ new/ovirt-guest-agent-1.0.14/ChangeLog 2017-10-25 12:14:26.000000000 +0200 @@ -1,3 +1,264 @@ +commit e72ea907a5c6d12e5ff031de20e7b8027ecdfebc +Author: Tomáš Golembiovský <tgole...@redhat.com> +Date: Sun Oct 22 23:48:26 2017 +0200 + + bump pywin32-py2.7 to version 221 + + In [1] the pywin32-py2.7 has been rebased to version 221. Bump our + dependency accordingly. + + [1] https://gerrit.ovirt.org/#/c/82667/ + + Change-Id: I9a4ec3be1fe1e6b4aeb1004aa5d18a74db4a346e + Signed-off-by: Tomáš Golembiovský <tgole...@redhat.com> + +commit 6018f8f551f4ede2d6407cc062cf1138623305fa +Author: Tomáš Golembiovský <tgole...@redhat.com> +Date: Sun Oct 22 21:16:38 2017 +0200 + + gitignore: ignore automake files and dist package + + Ignore files created by automake during build. + Ignore package created by 'make dist'. + + Change-Id: I44196f85054a18c725028cef1e1c6756984d18a6 + Signed-off-by: Tomáš Golembiovský <tgole...@redhat.com> + +commit bbb7cf26dd92212157ad84bed45472540f0eb984 +Author: Tomáš Golembiovský <tgole...@redhat.com> +Date: Thu Jun 8 19:28:08 2017 +0200 + + win: fix comment in GA service + + It's not Qumranet Monitoring Agent for long long time. + + Change-Id: I0b87ed3f5f7ee35c172b80614dfa9c8116442ce8 + Signed-off-by: Tomáš Golembiovský <tgole...@redhat.com> + +commit 27ca2539743e5cb681235bf4289df44bf55be7af +Author: Tomáš Golembiovský <tgole...@redhat.com> +Date: Tue Oct 10 13:10:35 2017 +0200 + + automation: drop bad comment + + The comment in build-artifacts.sh is no longer true. We are able to + build the ovirt-gutest-agent-windows on EL7 and Fedora. + + Change-Id: I5d347b4615d4e2735e18f954b145819536266188 + Signed-off-by: Tomáš Golembiovský <tgole...@redhat.com> + +commit bb821a5228cefbcd13a79e08dd473c0b751d0003 +Author: Sandro Bonazzola <sbona...@redhat.com> +Date: Tue Oct 10 09:59:31 2017 +0200 + + packaging: spec: windows: requires python 2.7.14 + + python 2.7.14 is now provided in the build system. + + Change-Id: Id2aefdfa06c9067c42e121a1cc0221d0950ff65e + Requires: https://gerrit.ovirt.org/82638 + Signed-off-by: Sandro Bonazzola <sbona...@redhat.com> + +commit 684b6d0b3086fe938cd84b85b28e78ba43dd62e0 +Author: Sandro Bonazzola <sbona...@redhat.com> +Date: Mon Oct 9 23:01:09 2017 +0200 + + automation: fix el7 build for windows agent + + fix el7 build for windows agent by providing a recent + wine with both 64bit and 32bit support. + + Change-Id: I745a362591f2aad14f32e03a498575565301a876 + Signed-off-by: Sandro Bonazzola <sbona...@redhat.com> + +commit f648cf099e82d7523c5c9020ab3864bfa6bc319b +Author: Tomáš Golembiovský <tgole...@redhat.com> +Date: Wed Oct 4 14:31:32 2017 +0200 + + configuration: ignore some filesystems + + Adding following to list of ignored filesystems: + * cgroup2 -- v2 of the cgroup + * configfs -- userspace-driven kernel object configuration [1] + * pstore -- persistent storage for a kernel crash log [2] + + [1] https://www.mjmwired.net/kernel/Documentation/filesystems/configfs/configfs.txt + [2] https://lwn.net/Articles/434821/ + + Change-Id: I76bd011e02384ab4f12d395f01131bd2141be1c2 + Signed-off-by: Tomáš Golembiovský <tgole...@redhat.com> + +commit d8c007b03f3a4299ccfebc8d19186de87e54d9e4 +Author: Tomáš Golembiovský <tgole...@redhat.com> +Date: Wed Oct 4 14:29:59 2017 +0200 + + configuration: sort list of ignored filesystems + + Change-Id: I6044b6ff57de43f412c94b8ce7625b3e60287cd8 + Signed-off-by: Tomáš Golembiovský <tgole...@redhat.com> + +commit f51c1215c766c2229214c0785bc65a1a66da5edc +Author: Tomáš Golembiovský <tgole...@redhat.com> +Date: Wed Oct 4 14:12:48 2017 +0200 + + linux: disks-usage: log details about mountpoint on failure + + Change-Id: I751e344e7ac36dbbc268338bc85dc9a48e9553a5 + Signed-off-by: Tomáš Golembiovský <tgole...@redhat.com> + +commit 0f383b060aebfd9d5a324185c55b9df23dd6884f +Author: Tomáš Golembiovský <tgole...@redhat.com> +Date: Thu Oct 5 14:09:06 2017 +0200 + + Remove dependency on tuned + + The dependency is no longer needed, tuned sets the correct profile + automatically. + + Change-Id: Ia43bf716b0bb8e8241a161a4cc16d94676244737 + Bug-Url: https://bugzilla.redhat.com/1443143 + Signed-off-by: Tomáš Golembiovský <tgole...@redhat.com> + +commit cda44e485ea99f3aa3ab826783c85079df1a154d +Author: Tomáš Golembiovský <tgole...@redhat.com> +Date: Tue Sep 19 12:50:58 2017 +0200 + + sudoers: fix path to container listing script + + Change-Id: Ib1f33e9d83177ea5df4b45f6997e415e11ea8710 + Signed-off-by: Tomáš Golembiovský <tgole...@redhat.com> + +commit 1d2181b0c2b2ab2c1d26684b54f2e19aefc35f23 +Author: Tomáš Golembiovský <tgole...@redhat.com> +Date: Thu Jun 8 19:33:41 2017 +0200 + + build: remove reference to non-existing directory + + A directory "re" is added to search paths for modules. But this + directory is actually located outside of the repository root. + Whatever that was, it is not relevant anymore. + + Change-Id: Ic5c1d1d97a15703effe8d1b13935bfb50f082bea + Signed-off-by: Tomáš Golembiovský <tgole...@redhat.com> + +commit 1090707087adb69fc4b89f29b980f5cbcc3f82de +Author: Tomáš Golembiovský <tgole...@redhat.com> +Date: Thu Jun 8 18:21:49 2017 +0200 + + build: drop useless version.py + + The module version.py is hardly used and most of the content is not + outdated anyway. There is no real reason to keep it. + + Change-Id: I98fd82a6d5f2f8832793b28cc12b247e36326628 + Signed-off-by: Tomáš Golembiovský <tgole...@redhat.com> + +commit 0bd04757b6c2087186eee64a9b12049b8ea77c20 +Author: Tomáš Golembiovský <tgole...@redhat.com> +Date: Wed Aug 2 11:21:12 2017 +0200 + + remove debian directory + + Remove the directory with debian packaging. We don't use it anymore and + it causes only confusion. + + Change-Id: I5a3f344ca33d130b4708a156ae1b1672602c732d + Signed-off-by: Tomáš Golembiovský <tgole...@redhat.com> + +commit 30ba9ea673c5db66e437948689d9b203f29ec6f7 +Author: Tomáš Golembiovský <tgole...@redhat.com> +Date: Wed Aug 2 13:47:43 2017 +0200 + + linux: fix missing argument for lambda of list_nics + + Commit a76da96 added posibility to ignore certain interfaces from list + of available NICs. This change added a new argument to the function + ethtool_list_nics() that handles listing when python-ethtool is + available. It however did not add the argument to the lambda used when + there is no python-ethtool available. + + Change-Id: I3235e9a95ad7accde1e7d88973dc3fe03c8c0d2b + Signed-off-by: Tomáš Golembiovský <tgole...@redhat.com> + +commit 1d284c59092ce32261b3bd054e670f899a579ac7 +Author: Vinzenz Feenstra <vfeen...@redhat.com> +Date: Thu Apr 20 09:28:29 2017 +0200 + + systemd: Add dependency on qemu-guest-agent service + + Change-Id: I0d288e8265b440df9f4b091c240d853eefabb895 + Signed-off-by: Vinzenz Feenstra <vfeen...@redhat.com> + +commit a76da96c5a9ca3a4294a154bd76aecaf658b8aa9 +Author: Marcus Young <myoun...@my.apsu.edu> +Date: Tue Mar 28 20:20:24 2017 -0500 + + Allow ability to ignore specific NICs in linux guest agent + + Change-Id: Ifc7cd4e72a72b5133bae7405753046f56036c37f + Signed-off-by: Marcus Young <myoun...@my.apsu.edu> + +commit c3cfd269d66def2a3b1bf5cfcfd878493aa99473 +Author: Vinzenz Feenstra <vfeen...@redhat.com> +Date: Thu Jan 26 08:09:56 2017 +0100 + + win32: Do not attempt to login when the desktop is unlocked + + When the desktop is unlocked we should not try to login because we're + calling the 'Secure Attention Sequence' which will open the fullscreen + window with the options to lock the screen, change password etc. This is + a disturbing side effect that should be avoided. + + After searching for the best possible solution I came to the conclusion + that the solution introduced in this patch is good enough, even though + it won't work right after starting the agent. It will start working after + the first login or unlock of the screen. That means also that this + functionality won't be working after a restart of the service, since the + agent won't be aware of the fact that it has been only restarted. + I also can't say by default that the screen is unlocked, because that + would break the SSO on startup and other cases. Therefore I assumed + this as the currently 'good enough solution' as this is also a niche + problem because for this feature to be useful the option to take no + action on console disconnect has to be active in the ovirt-engine. The + default is the lock screen behavior which will intiate the locking of + the screen in case of a disconnect of the console. + + Bug-Url: https://bugzilla.redhat.com/1365925 + Backport-To: 4.1 + Change-Id: I52e92dc00eb34f9f6afc98dc4743a7d793de858b + Signed-off-by: Vinzenz Feenstra <vfeen...@redhat.com> + +commit fb12983b0396b5628b222e8df427fde2ed1a41a9 +Author: Sandro Bonazzola <sbona...@redhat.com> +Date: Thu Feb 2 17:40:29 2017 +0100 + + ovirt-guest-agent-windows: add dist tag + + adding dist tag to the NVR of the package to ensure + it's correctly handled by repoman and jenkins automation + queue + + Change-Id: I1914257d26e71e8cdbca5ecf9b4757f75294f5d5 + Signed-off-by: Sandro Bonazzola <sbona...@redhat.com> + +commit 165fff1854b70f8dfff19bbc0c43462e6c930e8b +Author: Vinzenz Feenstra <vfeen...@redhat.com> +Date: Thu Dec 8 12:37:25 2016 +0100 + + rpm: Build artifacts having EL7 buildable + + Change-Id: If6d7fe77edc72db5b5442351b5fcb39cf32fef25 + Signed-off-by: Vinzenz Feenstra <vfeen...@redhat.com> + +commit 272f8798ace2eacc179c3f3b8744b363b3e4512f +Author: Vinzenz Feenstra <vfeen...@redhat.com> +Date: Tue Dec 6 11:09:15 2016 +0100 + + Version bump to 1.0.13 for ovirt 4.1 + + Change-Id: I053ddf7653692b2d739e56802fa2985e74081277 + Signed-off-by: Vinzenz Feenstra <vfeen...@redhat.com> + commit f51546c15f723590118e094bb95a9ee89b89f160 Author: Vinzenz Feenstra <vfeen...@redhat.com> Date: Sat Nov 12 18:55:24 2016 +0100 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ovirt-guest-agent-1.0.13/Makefile.am new/ovirt-guest-agent-1.0.14/Makefile.am --- old/ovirt-guest-agent-1.0.13/Makefile.am 2016-05-19 17:05:16.000000000 +0200 +++ new/ovirt-guest-agent-1.0.14/Makefile.am 2017-10-25 12:14:26.000000000 +0200 @@ -41,7 +41,6 @@ ovirt-guest-agent.spec \ ovirt-guest-agent.rhel6.spec\ m4/fhs.m4 \ - debian \ $(NULL) # When fixing a file to conform with pep8 add it to the WL here so it will be @@ -56,7 +55,6 @@ ovirt-guest-agent/VirtIoChannel.py \ ovirt-guest-agent/WinFile.py \ ovirt-guest-agent/ovirt-guest-agent.py \ - ovirt-guest-agent/version.py \ ovirt-guest-agent/hooks.py \ tests/*.py diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ovirt-guest-agent-1.0.13/configurations/default.conf new/ovirt-guest-agent-1.0.14/configurations/default.conf --- old/ovirt-guest-agent-1.0.13/configurations/default.conf 2016-11-14 10:29:09.000000000 +0100 +++ new/ovirt-guest-agent-1.0.14/configurations/default.conf 2017-10-25 12:14:26.000000000 +0200 @@ -15,8 +15,9 @@ # Debian Packages: linux-image xserver-xorg-video-qxl # openSUSE Packages: xf86-video-qxl kernel-desktop kernel-default kernel-trace kernel-vanilla kernel-debug kernel-ec2 kernel-xen kernel-ppc64 applications_list = kernel ovirt-guest-agent ovirt-guest-agent-common xorg-x11-drv-qxl linux-image xserver-xorg-video-qxl xf86-video-qxl kernel-desktop kernel-default kernel-trace kernel-vanilla kernel-debug kernel-ec2 kernel-xen kernel-ppc64 cloud-init -ignored_fs = rootfs tmpfs autofs cgroup selinuxfs udev mqueue nfsd proc sysfs devtmpfs hugetlbfs rpc_pipefs devpts securityfs debugfs binfmt_misc fuse.gvfsd-fuse fuse.gvfs-fuse-daemon fusectl usbfs +ignored_fs = autofs binfmt_misc cgroup cgroup2 configfs debugfs devpts devtmpfs fusectl fuse.gvfsd-fuse fuse.gvfs-fuse-daemon hugetlbfs mqueue nfsd proc pstore rootfs rpc_pipefs securityfs selinuxfs sysfs tmpfs udev usbfs ignore_zero_size_fs = true +ignored_nics = docker0 [virtio] device_prefix = /dev/virtio-ports/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ovirt-guest-agent-1.0.13/configurations/ovirt-guest-agent.conf new/ovirt-guest-agent-1.0.14/configurations/ovirt-guest-agent.conf --- old/ovirt-guest-agent-1.0.13/configurations/ovirt-guest-agent.conf 2016-11-14 10:29:09.000000000 +0100 +++ new/ovirt-guest-agent-1.0.14/configurations/ovirt-guest-agent.conf 2017-10-25 12:14:26.000000000 +0200 @@ -15,8 +15,9 @@ ## Debian Packages: linux-image xserver-xorg-video-qxl ## openSUSE Packages: xf86-video-qxl kernel-desktop kernel-default kernel-trace kernel-vanilla kernel-debug kernel-ec2 kernel-xen kernel-ppc64 # applications_list = kernel ovirt-guest-agent ovirt-guest-agent-common xorg-x11-drv-qxl linux-image xserver-xorg-video-qxl xf86-video-qxl kernel-desktop kernel-default kernel-trace kernel-vanilla kernel-debug kernel-ec2 kernel-xen kernel-ppc64 cloud-init -# ignored_fs = rootfs tmpfs autofs cgroup selinuxfs udev mqueue nfsd proc sysfs devtmpfs hugetlbfs rpc_pipefs devpts securityfs debugfs binfmt_misc fuse.gvfsd-fuse fuse.gvfs-fuse-daemon fusectl usbfs +# ignored_fs = autofs binfmt_misc cgroup cgroup2 configfs debugfs devpts devtmpfs fusectl fuse.gvfsd-fuse fuse.gvfs-fuse-daemon hugetlbfs mqueue nfsd proc pstore rootfs rpc_pipefs securityfs selinuxfs sysfs tmpfs udev usbfs # ignore_zero_size_fs = true +# ignored_nics = docker0 [virtio] # device_prefix = /dev/virtio-ports/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ovirt-guest-agent-1.0.13/configure.ac new/ovirt-guest-agent-1.0.14/configure.ac --- old/ovirt-guest-agent-1.0.13/configure.ac 2016-12-06 12:05:53.000000000 +0100 +++ new/ovirt-guest-agent-1.0.14/configure.ac 2017-10-25 12:14:26.000000000 +0200 @@ -2,7 +2,7 @@ AC_PREREQ([2.63]) AC_INIT([ovirt-guest-agent], - [1.0.13], + [1.0.14], [http://bugzilla.redhat.com]) AM_INIT_AUTOMAKE([1.9 no-dist-gzip dist-bzip2 -Wall]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ovirt-guest-agent-1.0.13/debian/README.source new/ovirt-guest-agent-1.0.14/debian/README.source --- old/ovirt-guest-agent-1.0.13/debian/README.source 2015-12-08 12:08:58.000000000 +0100 +++ new/ovirt-guest-agent-1.0.14/debian/README.source 1970-01-01 01:00:00.000000000 +0100 @@ -1,9 +0,0 @@ -ovirt-guest-agent for Debian ----------------------------- - -<this file describes information about the source package, see Debian policy -manual section 4.14. You WILL either need to modify or delete this file> - - - - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ovirt-guest-agent-1.0.13/debian/changelog new/ovirt-guest-agent-1.0.14/debian/changelog --- old/ovirt-guest-agent-1.0.13/debian/changelog 2016-12-06 12:05:53.000000000 +0100 +++ new/ovirt-guest-agent-1.0.14/debian/changelog 1970-01-01 01:00:00.000000000 +0100 @@ -1,27 +0,0 @@ -ovirt-guest-agent (1.0.13-1) quantal; urgency=low - - * Bump to ovirt-guest-agent 1.0.13 - -ovirt-guest-agent (1.0.12-1) quantal; urgency=low - - * Bump to ovirt-guest-agent 1.0.12 - -ovirt-guest-agent (1.0.11-1) quantal; urgency=low - - * Bump to ovirt-guest-agent 1.0.11 - -ovirt-guest-agent (1.0.10-1) quantal; urgency=low - - * Bump to ovirt-guest-agent 1.0.10 - - -- Vinzenz Feenstra <eviliss...@redhat.com> Tue, 01 Jul 2014 14:17:00 +0200 -ovirt-guest-agent (1.0.9-1) quantal; urgency=low - - * Bump to ovirt-guest-agent 1.0.9 - - -- Vinzenz Feenstra <eviliss...@redhat.com> Wed, 19 Jun 2013 11:08:14 +0200 -ovirt-guest-agent (1.0.8-1) quantal; urgency=low - - * Initial release of the ovirt-guest-agent for Ubuntu - - -- Vinzenz Feenstra <eviliss...@redhat.com> Wed, 19 Jun 2013 11:08:14 +0200 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ovirt-guest-agent-1.0.13/debian/compat new/ovirt-guest-agent-1.0.14/debian/compat --- old/ovirt-guest-agent-1.0.13/debian/compat 2015-12-08 12:08:58.000000000 +0100 +++ new/ovirt-guest-agent-1.0.14/debian/compat 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -8 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ovirt-guest-agent-1.0.13/debian/control new/ovirt-guest-agent-1.0.14/debian/control --- old/ovirt-guest-agent-1.0.13/debian/control 2015-12-08 12:08:58.000000000 +0100 +++ new/ovirt-guest-agent-1.0.14/debian/control 1970-01-01 01:00:00.000000000 +0100 @@ -1,32 +0,0 @@ -Source: ovirt-guest-agent -Section: utils -Priority: extra -Maintainer: Vinzenz Feenstra <eviliss...@redhat.com> -Build-Depends: debhelper (>= 8.0.0), - autoconf, - automake, - autotools-dev, - libtool, - pep8, - pkg-config, - python, - python-nose -Standards-Version: 3.9.3 -Homepage: http://www.ovirt.org/Ovirt_guest_agent -#Vcs-Git: git://git.debian.org/collab-maint/ovirt-guest-agent.git -#Vcs-Browser: http://git.debian.org/?p=collab-maint/ovirt-guest-agent.git;a=summary - -Package: ovirt-guest-agent -Architecture: all -Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, - python-apt, - python-dbus, - python-ethtool, - usermode, - qemu-guest-agent -Description: oVirt Guest Agent - This is the oVirt management agent running inside the guest. The agent - interfaces with the oVirt manager, supplying heart-beat info as well as - run-time data from within the guest itself. The agent also accepts - control commands to be run executed within the OS (like: shutdown and - restart). diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ovirt-guest-agent-1.0.13/debian/copyright new/ovirt-guest-agent-1.0.14/debian/copyright --- old/ovirt-guest-agent-1.0.13/debian/copyright 2016-12-06 12:05:53.000000000 +0100 +++ new/ovirt-guest-agent-1.0.14/debian/copyright 1970-01-01 01:00:00.000000000 +0100 @@ -1,17 +0,0 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ -Upstream-Name: ovirt-guest-agent -Source: http://evilissimo.fedorapeople.org/releases/ovirt-guest-agent/1.0.13/ovirt-guest-agent-1.0.13.tar.bz2 - -Files: * -Copyright: 2009-2016 Red Hat, Inc. and/or its affiliates -License: Apache - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - Refer to the README and COPYING files for full details of the license. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ovirt-guest-agent-1.0.13/debian/docs new/ovirt-guest-agent-1.0.14/debian/docs --- old/ovirt-guest-agent-1.0.13/debian/docs 2015-12-08 12:08:58.000000000 +0100 +++ new/ovirt-guest-agent-1.0.14/debian/docs 1970-01-01 01:00:00.000000000 +0100 @@ -1,4 +0,0 @@ -NEWS -README -README_Fedora.txt -README_Fedora.txt diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ovirt-guest-agent-1.0.13/debian/files new/ovirt-guest-agent-1.0.14/debian/files --- old/ovirt-guest-agent-1.0.13/debian/files 2015-12-08 12:08:58.000000000 +0100 +++ new/ovirt-guest-agent-1.0.14/debian/files 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -ovirt-guest-agent_1.0.8-1_all.deb utils extra diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ovirt-guest-agent-1.0.13/debian/ovirt-guest-agent.upstart new/ovirt-guest-agent-1.0.14/debian/ovirt-guest-agent.upstart --- old/ovirt-guest-agent-1.0.13/debian/ovirt-guest-agent.upstart 2015-12-08 12:08:58.000000000 +0100 +++ new/ovirt-guest-agent-1.0.14/debian/ovirt-guest-agent.upstart 1970-01-01 01:00:00.000000000 +0100 @@ -1,30 +0,0 @@ -# ovirt-guest-agent - oVirt guest agent -# - -description "oVirt guest agent" - -start on runlevel [2345] -stop on runlevel [!2345] - -# Do not setuid ovirtagent, because pre-start needs root permission to touch -# file under /run. If we setuid ovirtagent, pre-start will be run as -# ovirtagent, and fail to touch and chown, then cause the ovirt-guest-agent -# service fail to start. -# setuid ovirtagent -# setgid ovirtagent -chdir /usr/share/ovirt-guest-agent - -console log - -pre-start script - touch /var/run/ovirt-guest-agent.pid - chown ovirtagent:ovirtagent /var/run/ovirt-guest-agent.pid - chown ovirtagent:ovirtagent /var/log/ovirt-guest-agent - chown ovirtagent:ovirtagent /var/log/ovirt-guest-agent/ovirt-guest-agent.log ||: -end script - -exec sudo -u ovirtagent -g ovirtagent python /usr/share/ovirt-guest-agent/ovirt-guest-agent.py - -post-stop script - rm -f /var/run/ovirt-guest-agent.pid -end script diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ovirt-guest-agent-1.0.13/debian/postinst new/ovirt-guest-agent-1.0.14/debian/postinst --- old/ovirt-guest-agent-1.0.13/debian/postinst 2016-11-14 10:29:09.000000000 +0100 +++ new/ovirt-guest-agent-1.0.14/debian/postinst 1970-01-01 01:00:00.000000000 +0100 @@ -1,9 +0,0 @@ -#!/bin/bash -set -e - -udevadm control --reload-rules -udevadm trigger --subsystem-match="virtio-ports" --attr-match="name=com.redhat.rhevm.vdsm" -udevadm trigger --subsystem-match="virtio-ports" --attr-match="name=ovirt-guest-agent.0" -udevadm settle - -#DEBHELPER# diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ovirt-guest-agent-1.0.13/debian/postrm new/ovirt-guest-agent-1.0.14/debian/postrm --- old/ovirt-guest-agent-1.0.13/debian/postrm 2016-11-14 10:29:09.000000000 +0100 +++ new/ovirt-guest-agent-1.0.14/debian/postrm 1970-01-01 01:00:00.000000000 +0100 @@ -1,22 +0,0 @@ -#!/bin/bash -set -e - -#DEBHELPER# - -if test "x$1" == "xremove" || test "x$1" == "xpurge"; then - if [ -w /dev/virtio-ports/com.redhat.rhevm.vdsm ] - then - # 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 || : - fi - if [ -w /dev/virtio-ports/ovirt-guest-agent.0 ] - then - # Non blocking uninstalled notification - echo -e '{"__name__": "uninstalled"}\n' | dd \ - of=/dev/virtio-ports/ovirt-guest-agent.0 \ - oflag=nonblock status=noxfer conv=nocreat 1>& /dev/null || : - fi -fi -exit 0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ovirt-guest-agent-1.0.13/debian/preinst new/ovirt-guest-agent-1.0.14/debian/preinst --- old/ovirt-guest-agent-1.0.13/debian/preinst 2015-12-08 12:08:58.000000000 +0100 +++ new/ovirt-guest-agent-1.0.14/debian/preinst 1970-01-01 01:00:00.000000000 +0100 @@ -1,8 +0,0 @@ -#!/bin/bash -set -e - - -getent group ovirtagent >/dev/null || groupadd -r -g 175 ovirtagent -getent passwd ovirtagent > /dev/null || useradd -u 175 -g 175 -o -r ovirtagent -c "oVirt Guest Agent" -d /usr/share/ovirt-guest-agent -s /sbin/nologin - -#DEBHELPER# diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ovirt-guest-agent-1.0.13/debian/rules new/ovirt-guest-agent-1.0.14/debian/rules --- old/ovirt-guest-agent-1.0.13/debian/rules 2015-12-08 12:08:58.000000000 +0100 +++ new/ovirt-guest-agent-1.0.14/debian/rules 1970-01-01 01:00:00.000000000 +0100 @@ -1,27 +0,0 @@ -#!/usr/bin/make -f -# -*- makefile -*- -# Sample debian/rules that uses debhelper. -# -# This file was originally written by Joey Hess and Craig Small. -# As a special exception, when this file is copied by dh-make into a -# dh-make output file, you may use that output file without restriction. -# This special exception was added by Craig Small in version 0.37 of dh-make. -# -# Modified to make a template file for a multi-binary package with separated -# build-arch and build-indep targets by Bill Allombert 2001 - -# Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 - -# This has to be exported to make some magic below work. -export DH_OPTIONS -DEB_DH_INSTALLINIT_ARGS := --upstart-only - -%: - dh $@ --with autotools-dev --with python2 - -override_dh_auto_configure: - dh_auto_configure -- --without-sso - -override_dh_installudev: - dh_installudev --priority 55 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ovirt-guest-agent-1.0.13/debian/source/format new/ovirt-guest-agent-1.0.14/debian/source/format --- old/ovirt-guest-agent-1.0.13/debian/source/format 2015-12-08 12:08:58.000000000 +0100 +++ new/ovirt-guest-agent-1.0.14/debian/source/format 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -3.0 (quilt) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ovirt-guest-agent-1.0.13/ovirt-guest-agent/GuestAgentLinux2.py new/ovirt-guest-agent-1.0.14/ovirt-guest-agent/GuestAgentLinux2.py --- old/ovirt-guest-agent-1.0.13/ovirt-guest-agent/GuestAgentLinux2.py 2016-05-19 17:05:16.000000000 +0200 +++ new/ovirt-guest-agent-1.0.14/ovirt-guest-agent/GuestAgentLinux2.py 2017-10-25 12:14:26.000000000 +0200 @@ -200,19 +200,20 @@ ipv6_addrs.append(ip.address) return ipv6_addrs - def ethtool_list_nics(self): + def ethtool_list_nics(self, blacklist=()): interfaces = list() try: for dev in self.ethtool.get_devices(): - flags = self.ethtool.get_flags(dev) - if flags & self.ethtool.IFF_UP and \ - not(flags & self.ethtool.IFF_LOOPBACK): - devinfo = self.ethtool.get_interfaces_info(dev)[0] - interfaces.append( - {'name': dev, - 'inet': self._get_ipv4_addresses(devinfo), - 'inet6': self._get_ipv6_addresses(devinfo), - 'hw': self.ethtool.get_hwaddr(dev)}) + if (dev not in blacklist): + flags = self.ethtool.get_flags(dev) + if flags & self.ethtool.IFF_UP and \ + not(flags & self.ethtool.IFF_LOOPBACK): + devinfo = self.ethtool.get_interfaces_info(dev)[0] + interfaces.append( + {'name': dev, + 'inet': self._get_ipv4_addresses(devinfo), + 'inet6': self._get_ipv6_addresses(devinfo), + 'hw': self.ethtool.get_hwaddr(dev)}) except: logging.exception("Error retrieving network interfaces.") return interfaces @@ -273,11 +274,12 @@ try: nicmgr = NicMgr() except NotImplementedError: - self.list_nics = lambda: [] + self.list_nics = lambda _: [] else: self.list_nics = nicmgr.list_nics self.app_list = "" self.ignored_fs = "" + self.ignored_nics = "" self.ignore_zero_size_fs = True self._init_vmstat() DataRetriverBase.__init__(self) @@ -325,7 +327,7 @@ return result def getAllNetworkInterfaces(self): - return self.list_nics() + return self.list_nics(self.ignored_nics.split()) def getApplications(self): return self.list_pkgs(self.app_list) @@ -377,7 +379,8 @@ usages.append({'path': path, 'fs': fs, 'total': total, 'used': used}) except: - logging.exception("Error retrieving disks usages.") + logging.exception("Error retrieving disk usage; " + "mount description: %s", mount) mounts.close() except Exception: logging.exception("Error during reading mounted devices") @@ -466,6 +469,7 @@ AgentLogicBase.__init__(self, config) self.dr = LinuxDataRetriver() self.dr.app_list = config.get("general", "applications_list") + self.dr.ignored_nics = config.get("general", "ignored_nics") self.dr.ignored_fs = set(config.get("general", "ignored_fs").split()) self.dr.ignore_zero_size_fs = config.get("general", "ignore_zero_size_fs") @@ -487,6 +491,7 @@ from pprint import pprint dr = LinuxDataRetriver() dr.app_list = "kernel kernel-headers aspell" + dr.ignored_nics = "docker0" dr.ignored_fs = set("rootfs tmpfs autofs cgroup selinuxfs udev mqueue " "nfsd proc sysfs devtmpfs hugetlbfs rpc_pipefs devpts " "securityfs debugfs binfmt_misc fuse.gvfsd-fuse " diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ovirt-guest-agent-1.0.13/ovirt-guest-agent/GuestAgentWin32.py new/ovirt-guest-agent-1.0.14/ovirt-guest-agent/GuestAgentWin32.py --- old/ovirt-guest-agent-1.0.13/ovirt-guest-agent/GuestAgentWin32.py 2016-10-05 10:55:14.000000000 +0200 +++ new/ovirt-guest-agent-1.0.14/ovirt-guest-agent/GuestAgentWin32.py 2017-10-25 12:14:26.000000000 +0200 @@ -256,6 +256,8 @@ class CommandHandlerWin: + def __init__(self, dr): + self._dr = dr def lock_screen(self): self.LockWorkStation() @@ -289,6 +291,9 @@ self._setSoftwareSASPolicy(oldValue) def login(self, credentials): + if not self._dr.desktopLocked: + logging.debug("Not unlocking screen because it is not locked") + return PIPE_NAME = "\\\\.\\pipe\\VDSMDPipe" BUFSIZE = 1024 RETIRES = 3 @@ -693,7 +698,7 @@ def __init__(self, config, install_dir): AgentLogicBase.__init__(self, config) self.dr = WinDataRetriver() - self.commandHandler = CommandHandlerWin() + self.commandHandler = CommandHandlerWin(self.dr) hooks_dir = os.path.join(install_dir, 'hooks') self.hooks = Hooks(logging.getLogger('Hooks'), hooks_dir) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ovirt-guest-agent-1.0.13/ovirt-guest-agent/Makefile.am new/ovirt-guest-agent-1.0.14/ovirt-guest-agent/Makefile.am --- old/ovirt-guest-agent-1.0.13/ovirt-guest-agent/Makefile.am 2016-05-19 17:05:16.000000000 +0200 +++ new/ovirt-guest-agent-1.0.14/ovirt-guest-agent/Makefile.am 2017-10-25 12:14:26.000000000 +0200 @@ -18,7 +18,6 @@ bytesio.py \ GuestAgentWin32.py \ setup.py \ - version.py \ WinFile.py \ OVirtGuestService.py \ $(NULL) @@ -37,7 +36,6 @@ 55-$(AGENT_NAME).rules: $(AGENT_NAME).rules cp $(AGENT_NAME).rules 55-$(AGENT_NAME).rules - cp $(AGENT_NAME).rules ../debian/$(AGENT_NAME).udev # Conditionally install the systemd service if HAVE_SYSTEMD @@ -62,7 +60,6 @@ CLEANFILES = \ *~ \ 55-$(AGENT_NAME).rules \ - ../debian/ovirt-guest-agent.udev \ $(NULL) MAINTAINERCLEANFILES = \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ovirt-guest-agent-1.0.13/ovirt-guest-agent/OVirtAgentLogic.py new/ovirt-guest-agent-1.0.14/ovirt-guest-agent/OVirtAgentLogic.py --- old/ovirt-guest-agent-1.0.13/ovirt-guest-agent/OVirtAgentLogic.py 2016-11-14 10:29:09.000000000 +0100 +++ new/ovirt-guest-agent-1.0.14/ovirt-guest-agent/OVirtAgentLogic.py 2017-10-25 12:14:26.000000000 +0200 @@ -77,6 +77,7 @@ class DataRetriverBase: def __init__(self): + self.desktopLocked = True self.apiVersion = _DISABLED_API_VALUE self.memStats = { 'mem_total': 0, @@ -432,6 +433,7 @@ def sessionLogon(self): logging.debug("AgentLogicBase::sessionLogon: user logs on the system.") cur_user = self.dr.getActiveUser() + self.dr.desktopLocked = False retries = 0 while (cur_user == 'None') and (retries < 5): time.sleep(1) @@ -441,6 +443,7 @@ self._send('session-logon') def sessionLogoff(self): + self.dr.desktopLocked = True logging.debug("AgentLogicBase::sessionLogoff: " "user logs off from the system.") self.activeUser = 'None' @@ -448,11 +451,13 @@ self._send('active-user', {'name': self.activeUser}) def sessionLock(self): + self.dr.desktopLocked = True logging.debug("AgentLogicBase::sessionLock: " "user locks the workstation.") self._send('session-lock') def sessionUnlock(self): + self.dr.desktopLocked = False logging.debug("AgentLogicBase::sessionUnlock: " "user unlocks the workstation.") self._send('session-unlock') diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ovirt-guest-agent-1.0.13/ovirt-guest-agent/OVirtGuestService.py new/ovirt-guest-agent-1.0.14/ovirt-guest-agent/OVirtGuestService.py --- old/ovirt-guest-agent-1.0.13/ovirt-guest-agent/OVirtGuestService.py 2016-10-24 10:52:02.000000000 +0200 +++ new/ovirt-guest-agent-1.0.14/ovirt-guest-agent/OVirtGuestService.py 2017-10-25 12:14:26.000000000 +0200 @@ -1,4 +1,4 @@ -# qagentservice: Windows service wrapper for Qumranet monitoring agent +# Windows service wrapper for oVirt Guest Agent # The service is converted into an exe-file with py2exe import ConfigParser diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ovirt-guest-agent-1.0.13/ovirt-guest-agent/README-windows.txt new/ovirt-guest-agent-1.0.14/ovirt-guest-agent/README-windows.txt --- old/ovirt-guest-agent-1.0.13/ovirt-guest-agent/README-windows.txt 2015-12-08 12:07:57.000000000 +0100 +++ new/ovirt-guest-agent-1.0.14/ovirt-guest-agent/README-windows.txt 2017-10-25 12:14:26.000000000 +0200 @@ -16,8 +16,8 @@ Install Python 2.7.3 for Windows. (http://www.python.org/ftp/python/2.7.3/python-2.7.3.msi) -Install Python for Windows extension (pywin32) version 216 for Python 2.7 -(http://sourceforge.net/projects/pywin32/files/pywin32/Build216/pywin32-216.win32-py2.7.exe/download) +Install Python for Windows extension (pywin32) version 221 for Python 2.7 +(https://sourceforge.net/projects/pywin32/files/pywin32/Build%20221/pywin32-221.win32-py2.7.exe/download) Optionally install py2exe if you want to build an executable file which doesn't require Python installation for running diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ovirt-guest-agent-1.0.13/ovirt-guest-agent/ovirt-guest-agent.service new/ovirt-guest-agent-1.0.14/ovirt-guest-agent/ovirt-guest-agent.service --- old/ovirt-guest-agent-1.0.13/ovirt-guest-agent/ovirt-guest-agent.service 2015-12-08 12:07:57.000000000 +0100 +++ new/ovirt-guest-agent-1.0.14/ovirt-guest-agent/ovirt-guest-agent.service 2017-10-25 12:14:26.000000000 +0200 @@ -1,5 +1,7 @@ [Unit] Description=oVirt Guest Agent +Wants=qemu-guest-agent.service +After=qemu-guest-agent.service [Service] Type=simple diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ovirt-guest-agent-1.0.13/ovirt-guest-agent/setup.py new/ovirt-guest-agent-1.0.14/ovirt-guest-agent/setup.py --- old/ovirt-guest-agent-1.0.13/ovirt-guest-agent/setup.py 2016-05-19 17:05:12.000000000 +0200 +++ new/ovirt-guest-agent-1.0.14/ovirt-guest-agent/setup.py 2017-10-25 12:14:26.000000000 +0200 @@ -3,19 +3,9 @@ from glob import glob import os import sys -import version import py2exe -dsa_path = os.path.join( - os.path.dirname( - os.path.dirname( - os.path.dirname( - os.path.abspath( - sys.argv[0])))), - "re") -sys.path.append(dsa_path) - if len(sys.argv) == 1: sys.argv.append("py2exe") sys.argv.append("-b 1") @@ -24,8 +14,7 @@ class Target: def __init__(self, **kw): self.__dict__.update(kw) - self.version = "%s.%s" % (version.version_info['software_version'], - version.version_info['software_revision']) + self.version = "1.0.14" self.company_name = "Red Hat" self.copyright = "Copyright(C) Red Hat Inc." self.name = "Guest VDS Agent " diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ovirt-guest-agent-1.0.13/ovirt-guest-agent/version.py new/ovirt-guest-agent-1.0.14/ovirt-guest-agent/version.py --- old/ovirt-guest-agent-1.0.13/ovirt-guest-agent/version.py 2015-12-08 12:07:57.000000000 +0100 +++ new/ovirt-guest-agent-1.0.14/ovirt-guest-agent/version.py 1970-01-01 01:00:00.000000000 +0100 @@ -1,21 +0,0 @@ -#!/usr/bin/python -# -# Copyright 2007 Qumranet, Inc. All rights reserved. -# Use is subject to license terms. -# -""" -This module provides DSA software versioning information for -python based components -""" -version_name = "Ice Coffee" -build_name = "trunk" -software_version = "4.7" -# software_revision should be replaced by build system to the real revision -software_revision = "1" - -version_info = { - 'version_name': version_name, - 'build_name': build_name, - 'software_version': software_version, - 'software_revision': software_revision -} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ovirt-guest-agent-1.0.13/ovirt-guest-agent.rhel6.spec new/ovirt-guest-agent-1.0.14/ovirt-guest-agent.rhel6.spec --- old/ovirt-guest-agent-1.0.13/ovirt-guest-agent.rhel6.spec 2016-12-06 12:05:53.000000000 +0100 +++ new/ovirt-guest-agent-1.0.14/ovirt-guest-agent.rhel6.spec 2017-10-25 12:14:26.000000000 +0200 @@ -2,13 +2,13 @@ %global release_version 1 Name: ovirt-guest-agent -Version: 1.0.13 +Version: 1.0.14 Release: %{release_version}%{?release_suffix}%{?dist} Summary: The oVirt Guest Agent Group: Applications/System License: ASL 2.0 URL: http://wiki.ovirt.org/wiki/Category:Ovirt_guest_agent -Source0: http://ovirt.org/releases/stable/src/%{name}-%{version}.tar.bz2 +Source0: http:///resources.ovirt.org/pub/src/ovirt-guest-agent/%{name}-%{version}.tar.bz2 BuildArch: noarch BuildRequires: python2-devel BuildRequires: python-pep8 @@ -190,6 +190,9 @@ %changelog +* Mon Oct 23 2017 Tomáš Golembiovský <tgole...@redhat.com> - 1.0.14-1 +- New upstream version 1.0.14 + * Tue Dec 06 2016 Vinzenz Feenstra <vfeen...@redhat.com> - 1.0.13-1 - New upstream version 1.0.13 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ovirt-guest-agent-1.0.13/ovirt-guest-agent.spec new/ovirt-guest-agent-1.0.14/ovirt-guest-agent.spec --- old/ovirt-guest-agent-1.0.13/ovirt-guest-agent.spec 2016-12-06 12:05:53.000000000 +0100 +++ new/ovirt-guest-agent-1.0.14/ovirt-guest-agent.spec 2017-10-25 12:14:26.000000000 +0200 @@ -5,13 +5,13 @@ %global _kdmrc /etc/kde/kdm/kdmrc Name: ovirt-guest-agent -Version: 1.0.13 +Version: 1.0.14 Release: %{release_version}%{?release_suffix}%{?dist} Summary: The oVirt Guest Agent Group: Applications/System License: ASL 2.0 URL: http://wiki.ovirt.org/wiki/Category:Ovirt_guest_agent -Source0: https://evilissimo.fedorapeople.org/releases/ovirt-guest-agent/%{version}/%{name}-%{version}.tar.bz2 +Source0: http:///resources.ovirt.org/pub/src/ovirt-guest-agent/%{name}-%{version}.tar.bz2 BuildRequires: libtool BuildRequires: pam-devel BuildRequires: python2-devel @@ -25,7 +25,9 @@ %package common Summary: Commonly used files of the oVirt Guest Agent BuildArch: noarch +%if !0%{?rhel} BuildRequires: python-pep8 +%endif Requires: dbus-python Requires: rpm-python Requires: qemu-guest-agent @@ -33,7 +35,6 @@ Requires: udev >= 095-14.23 Requires: kernel > 2.6.18-238.5.0 Requires: usermode -Requires: tuned >= 0.2.19-10 Provides: %{name} = %{version}-%{release} %if 0%{?fc16} @@ -48,18 +49,7 @@ Requires: %{name} = %{version}-%{release} Requires: pam -%if 0%{?fedora} < 19 -%package gdm-plugin -Summary: GDM plug-in for the oVirt Guest Agent -BuildRequires: dbus-glib-devel -BuildRequires: gdm-devel -BuildRequires: gobject-introspection-devel -BuildRequires: gtk2-devel -Requires: %{name} = %{version}-%{release} -Requires: %{name}-pam-module = %{version}-%{release} -Requires: gdm -%endif - +%if !0%{?rhel} %package kdm-plugin Summary: KDM plug-in for the oVirt Guest Agent BuildRequires: kdebase-workspace-devel @@ -67,6 +57,7 @@ Requires: %{name} = %{version}-%{release} Requires: %{name}-pam-module = %{version}-%{release} Requires: kdm +%endif %description This is the oVirt management agent running inside the guest. The agent @@ -86,15 +77,11 @@ The oVirt PAM module provides the functionality necessary to use the oVirt automatic log-in system. -%if 0%{?fedora} < 19 -%description gdm-plugin -The GDM plug-in provides the functionality necessary to use the -oVirt automatic log-in system. -%endif - +%if !0%{?rhel} %description kdm-plugin The KDM plug-in provides the functionality necessary to use the oVirt automatic log-in system. +%endif %prep %setup -q -n ovirt-guest-agent-%{version} @@ -103,8 +90,9 @@ %configure \ --enable-securedir=%{_moduledir} \ --includedir=%{_includedir}/security \ -%if 0%{?fedora} >= 19 --without-gdm \ +%if 0%{?rhel} + --without-kdm \ %endif --with-pam-prefix=%{_sysconfdir} @@ -129,29 +117,13 @@ /bin/systemctl daemon-reload -TUNED_ADM=/usr/sbin/tuned-adm -TUNED_PROFILE=virtual-guest - -%if 0%{?rhel} == 6 -if $TUNED_ADM active | grep -q -e "default$" -e "off$" && $TUNED_ADM list | grep -q $TUNED_PROFILE; then - $TUNED_ADM profile $TUNED_PROFILE -fi -%endif - -%if 0%{?rhel} == 7 -if ! /bin/systemctl status tuned.service > /dev/null 2>&1; then - /bin/systemctl start tuned.service -fi -if (! $TUNED_ADM active > /dev/null 2>&1 || $TUNED_ADM active | grep -q "balanced$") && $TUNED_ADM list | grep -q $TUNED_PROFILE; then - $TUNED_ADM profile $TUNED_PROFILE -fi -%endif - +%if !0%{?rhel} %post kdm-plugin if ! grep -q "^PluginsLogin=" "%{_kdmrc}"; then sed -i "s~^#PluginsLogin=winbind~PluginsLogin=ovirtcred,classic~" "%{_kdmrc}" fi +%endif %preun common if [ "$1" -eq 0 ] @@ -191,11 +163,14 @@ /bin/systemctl try-restart ovirt-guest-agent.service >/dev/null 2>&1 || : fi + +%if !0%{?rhel} %postun kdm-plugin if [ "$1" -eq 0 ] then sed -i "s~PluginsLogin=ovirtcred,classic~#PluginsLogin=winbind~" "%{_kdmrc}" fi +%endif %files common %dir %attr (755,ovirtagent,ovirtagent) %{_localstatedir}/log/ovirt-guest-agent @@ -283,25 +258,16 @@ %exclude %{_moduledir}/pam_ovirt_cred.a %exclude %{_moduledir}/pam_ovirt_cred.la -%if 0%{?fedora} < 19 -%files gdm-plugin -# This is intentionally NOT 'noreplace' If this is modified by an user, -# this actually might break it. -%config %{_sysconfdir}/pam.d/gdm-ovirtcred -%{_datadir}/icons/hicolor/*/*/*.png -%dir %{_datadir}/gdm/simple-greeter/extensions/ovirtcred -%{_datadir}/gdm/simple-greeter/extensions/ovirtcred/page.ui -%{_libdir}/gdm/simple-greeter/extensions/libovirtcred.so -# Unwanted files -%exclude %{_libdir}/gdm/simple-greeter/extensions/libovirtcred.a -%exclude %{_libdir}/gdm/simple-greeter/extensions/libovirtcred.la -%endif - +%if !0%{?rhel} %files kdm-plugin %config %{_sysconfdir}/pam.d/kdm-ovirtcred %attr (755,root,root) %{_libdir}/kde4/kgreet_ovirtcred.so +%endif %changelog +* Mon Oct 23 2017 Tomáš Golembiovský <tgole...@redhat.com> - 1.0.14-1 +- New upstream version 1.0.14 + * Tue Dec 06 2016 Vinzenz Feenstra <vfeen...@redhat.com> - 1.0.13-1 - New upstream version 1.0.13 @@ -326,7 +292,7 @@ - Python 2.4 compatability fix - Some build fixes applied -* Thu Aug 28 2013 Amador Pahim <apa...@redhat.com> - 1.0.8-2 +* Wed Aug 28 2013 Amador Pahim <apa...@redhat.com> - 1.0.8-2 - Solved: Configure tuned only if current profile is off or default. performance Resolves: BZ#991538 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ovirt-guest-agent-1.0.13/scripts/sudoers.ovirt-guest-agent new/ovirt-guest-agent-1.0.14/scripts/sudoers.ovirt-guest-agent --- old/ovirt-guest-agent-1.0.13/scripts/sudoers.ovirt-guest-agent 2016-05-19 17:05:16.000000000 +0200 +++ new/ovirt-guest-agent-1.0.14/scripts/sudoers.ovirt-guest-agent 2017-10-25 12:14:26.000000000 +0200 @@ -1,7 +1,7 @@ Cmnd_Alias OVIRTAGENT_SCRIPTS =\ /usr/share/ovirt-guest-agent/ovirt-hibernate-wrapper.sh *,\ /usr/share/ovirt-guest-agent/ovirt-shutdown-wrapper.sh *,\ - /usr/share/ovirt-guest-agent/ovirt-container-list.sh,\ + /usr/share/ovirt-guest-agent/ovirt-container-list-wrapper.sh,\ /usr/share/ovirt-guest-agent/ovirt-locksession-wrapper.sh,\ /usr/share/ovirt-guest-agent/scripts/hooks/defaults/ovirt-flush-caches-wrapper.sh diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ovirt-guest-agent-1.0.13/tests/guest_agent_test.py new/ovirt-guest-agent-1.0.14/tests/guest_agent_test.py --- old/ovirt-guest-agent-1.0.13/tests/guest_agent_test.py 2016-11-14 10:29:09.000000000 +0100 +++ new/ovirt-guest-agent-1.0.14/tests/guest_agent_test.py 2017-10-25 12:14:26.000000000 +0200 @@ -29,6 +29,7 @@ 'securityfs debugfs binfmt_misc fuse.gvfsd-fuse ' 'fuse.gvfs-fuse-daemon fusectl usbfs') conf.set('general', 'ignore_zero_size_fs', 'true') + conf.set('general', 'ignored_nics', 'docker0') import GuestAgentLinux2 GuestAgentLinux2._GUEST_SCRIPTS_INSTALL_PATH = _get_scripts_path() return port_name, GuestAgentLinux2.LinuxVdsAgent