From 217c9b5e521f988d03779f69f698aa8a7f638e19 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Apr 10 2018 12:07:27 +0000
Subject: import openscap-daemon-0.1.10-1.el7


---

diff --git a/.gitignore b/.gitignore
index 5d1a9df..ed4aa94 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/openscap_daemon-0.1.6.tar.gz
+SOURCES/openscap_daemon-0.1.10.tar.gz
diff --git a/.openscap-daemon.metadata b/.openscap-daemon.metadata
index 90a4850..3041b18 100644
--- a/.openscap-daemon.metadata
+++ b/.openscap-daemon.metadata
@@ -1 +1 @@
-63520a9c4c1fb9dd2538653caf8b40a7d410778e SOURCES/openscap_daemon-0.1.6.tar.gz
+18baa77d0870bd20dd49a6aea51445f2b97c646f SOURCES/openscap_daemon-0.1.10.tar.gz
diff --git a/SOURCES/config.ini b/SOURCES/config.ini
new file mode 100644
index 0000000..4dacef7
--- /dev/null
+++ b/SOURCES/config.ini
@@ -0,0 +1,24 @@
+[General]
+tasks-dir = /var/lib/oscapd/tasks
+results-dir = /var/lib/oscapd/results
+work-in-progress-dir = /var/lib/oscapd/work_in_progress
+cve-feeds-dir = /var/lib/oscapd/cve_feeds
+jobs = 4
+
+[Tools]
+oscap = /usr/bin/oscap
+oscap-ssh = /usr/bin/oscap-ssh
+oscap-vm = /usr/bin/oscap-vm
+oscap-docker = /usr/bin/oscap-docker
+oscap-chroot = /usr/bin/oscap-chroot
+container-support = yes
+
+[Content]
+cpe-oval = /usr/share/openscap/cpe/openscap-cpe-oval.xml
+ssg = /usr/share/xml/scap/ssg/content
+
+[CVEScanner]
+fetch-cve = no
+fetch-cve-url = https://www.redhat.com/security/data/oval/
+fetch-cve-timeout = 600
+
diff --git a/SPECS/openscap-daemon.spec b/SPECS/openscap-daemon.spec
index b3764e5..a4a32e7 100644
--- a/SPECS/openscap-daemon.spec
+++ b/SPECS/openscap-daemon.spec
@@ -12,13 +12,14 @@
 %endif
 
 Name:           openscap-daemon
-Version:        0.1.6
+Version:        0.1.10
 Release:        1%{?dist}
 Summary:        Manages continuous SCAP scans of your infrastructure
 
 License:        LGPLv2+
 URL:            http://open-scap.org
 Source0:        https://github.com/OpenSCAP/openscap-daemon/releases/download/%{version}/openscap_daemon-%{version}.tar.gz
+Source1:        config.ini
 BuildArch:      noarch
 
 BuildRequires:  systemd-units
@@ -28,7 +29,7 @@ Requires:       %{pgobject}
 Requires:       dbus
 Requires:       dbus-python
 
-# for the oscap tool
+# for the oscap tool and oscap-chroot
 Requires:       openscap-scanner
 # for oscap-ssh, oscap-docker, oscap-vm
 Requires:       openscap-utils
@@ -47,11 +48,15 @@ using the provided oscapd-cli tool or via the DBus interface.
 
 %install
 %{__python} setup.py install --skip-build --root $RPM_BUILD_ROOT
+mkdir -p %{buildroot}/%{_sysconfdir}/oscapd/
+install -m 644 %{SOURCE1} %{buildroot}/%{_sysconfdir}/oscapd/
 
 %files
 %doc %{_docdir}/%{name}/README.md
 %doc %{_docdir}/%{name}/LICENSE
 
+%config %{_sysconfdir}/oscapd/config.ini
+
 %dir %{pysitelib}/openscap_daemon
 %{pysitelib}/openscap_daemon/*
 
@@ -68,6 +73,22 @@ using the provided oscapd-cli tool or via the DBus interface.
 %{_unitdir}/oscapd.service
 
 %changelog
+* Thu Feb 08 2018 Matěj Týč <matyc@redhat.com> - 0.1.10-1
+- New upstream release.
+
+* Fri Feb 02 2018 Matěj Týč <matyc@redhat.com> - 0.1.9-2
+- added config file to the package
+
+* Tue Jan 16 2018 Matěj Týč <matyc@redhat.com> - 0.1.9-1
+- upgrade to the latest upstream release
+
+* Wed Aug 23 2017 Jan Černý <jcerny@redhat.com> - 0.1.7-1
+- upgrade to the latest upstream release
+- scanning of any XCCDF profile in oscapd-evaluate
+- detecting XCCDF profiles applicable to a given target
+- generating remediation scripts based on scan results
+- shortened profile IDs are accepted
+
 * Tue Sep 06 2016 Martin Preisler <mpreisle@redhat.com> - 0.1.6-1
 - upgrade to the latest upstream release