[PATCH 13/25] package_aide_installed --> shared/

Shawn Wells shawn at redhat.com
Tue Dec 24 01:59:18 UTC 2013


-------------- next part --------------
>From c90fb85e98d9bb7e859cb5c2bd2269ff7e1ee848 Mon Sep 17 00:00:00 2001
From: Shawn Wells <shawn at redhat.com>
Date: Mon, 23 Dec 2013 06:01:55 -0500
Subject: [PATCH 13/25] package_aide_installed --> shared/

- Updated CPE for RHEL7
- Moved from RHEL6 to shared/

TESTING:
[root at localhost checks]# rpm -qa aide
[root at localhost checks]# ./testcheck.py package_aide_installed.xml
Evaluating with OVAL tempfile : /tmp/package_aide_installedGjmuPc.xml
Writing results to : /tmp/package_aide_installedGjmuPc.xml-results
Definition oval:scap-security-guide.testing:def:129: false
Evaluation done.
[root at localhost checks]# yum -y install aide
Loaded plugins: product-id, subscription-manager
This system is receiving updates from Red Hat Subscription Management.
rhel-7-public-beta-rpms                                                                                                              | 3.4 kB  00:00:00
Resolving Dependencies
--> Running transaction check
---> Package aide.x86_64 0:0.15.1-6.el7 will be installed
--> Finished Dependency Resolution

Dependencies Resolved

============================================================================================================================================================
 Package                       Arch                            Version                               Repository                                        Size
============================================================================================================================================================
Installing:
 aide                          x86_64                          0.15.1-6.el7                          rhel-7-public-beta-rpms                          128 k

Transaction Summary
============================================================================================================================================================
Install  1 Package

Total download size: 128 k
Installed size: 304 k
Downloading packages:
Delta RPMs disabled because /usr/bin/applydeltarpm not installed.
aide-0.15.1-6.el7.x86_64.rpm                                                                                                         | 128 kB  00:00:00
Running transaction check
Running transaction test
Transaction test succeeded
Running transaction
  Installing : aide-0.15.1-6.el7.x86_64                                                                                                                 1/1
  Verifying  : aide-0.15.1-6.el7.x86_64                                                                                                                 1/1

Installed:
  aide.x86_64 0:0.15.1-6.el7

Complete!
[root at localhost checks]# ./testcheck.py package_aide_installed.xml
Evaluating with OVAL tempfile : /tmp/package_aide_installedecAndR.xml
Writing results to : /tmp/package_aide_installedecAndR.xml-results
Definition oval:scap-security-guide.testing:def:129: true
Evaluation done.

Signed-off-by: Shawn Wells <shawn at redhat.com>
---
:100644 120000 413bb7d... b48e508... T	RHEL/6/input/checks/package_aide_installed.xml
:000000 120000 0000000... b48e508... A	RHEL/7/input/checks/package_aide_installed.xml
:000000 100644 0000000... b46f78d... A	shared/oval/package_aide_installed.xml
 RHEL/6/input/checks/package_aide_installed.xml | 27 +-------------------------
 RHEL/7/input/checks/package_aide_installed.xml |  1 +
 shared/oval/package_aide_installed.xml         | 27 ++++++++++++++++++++++++++
 3 files changed, 29 insertions(+), 26 deletions(-)

diff --git a/RHEL/6/input/checks/package_aide_installed.xml b/RHEL/6/input/checks/package_aide_installed.xml
deleted file mode 100644
index 413bb7d..0000000
--- a/RHEL/6/input/checks/package_aide_installed.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<def-group>
- <!-- THIS FILE IS GENERATED by create_package_installed.py.  DO NOT EDIT.  -->
-  <definition class="compliance" id="package_aide_installed"
-  version="1">
-    <metadata>
-      <title>Package aide Installed</title>
-      <affected family="unix">
-        <platform>Red Hat Enterprise Linux 6</platform>
-      </affected>
-      <description>The RPM package aide should be installed.</description>
-      <reference source="swells" ref_id="20130829" ref_url="test_attestation"/>
-    </metadata>
-    <criteria>
-      <criterion comment="package aide is installed"
-      test_ref="test_package_aide_installed" />
-    </criteria>
-  </definition>
-  <linux:rpminfo_test check="all" check_existence="all_exist"
-  id="test_package_aide_installed" version="1"
-  comment="package aide is installed">
-    <linux:object object_ref="obj_package_aide_installed" />
-  </linux:rpminfo_test>
-  <linux:rpminfo_object id="obj_package_aide_installed" version="1">
-    <linux:name>aide</linux:name>
-  </linux:rpminfo_object>
-</def-group>
diff --git a/RHEL/6/input/checks/package_aide_installed.xml b/RHEL/6/input/checks/package_aide_installed.xml
new file mode 120000
index 0000000..b48e508
--- /dev/null
+++ b/RHEL/6/input/checks/package_aide_installed.xml
@@ -0,0 +1 @@
+../../../../shared/oval/package_aide_installed.xml
\ No newline at end of file
diff --git a/RHEL/7/input/checks/package_aide_installed.xml b/RHEL/7/input/checks/package_aide_installed.xml
new file mode 120000
index 0000000..b48e508
--- /dev/null
+++ b/RHEL/7/input/checks/package_aide_installed.xml
@@ -0,0 +1 @@
+../../../../shared/oval/package_aide_installed.xml
\ No newline at end of file
diff --git a/shared/oval/package_aide_installed.xml b/shared/oval/package_aide_installed.xml
new file mode 100644
index 0000000..b46f78d
--- /dev/null
+++ b/shared/oval/package_aide_installed.xml
@@ -0,0 +1,27 @@
+<def-group>
+  <definition class="compliance" id="package_aide_installed"
+  version="1">
+    <metadata>
+      <title>Package aide Installed</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 6</platform>
+        <platform>Red Hat Enterprise Linux 7</platform>
+      </affected>
+      <description>The RPM package aide should be installed.</description>
+      <reference source="swells" ref_id="20130829" ref_url="test_attestation"/>
+      <!-- rhel7 <reference source="swells" ref_id="20131223" ref_url="test_attestation" /> -->
+    </metadata>
+    <criteria>
+      <criterion comment="package aide is installed"
+      test_ref="test_package_aide_installed" />
+    </criteria>
+  </definition>
+  <linux:rpminfo_test check="all" check_existence="all_exist"
+  id="test_package_aide_installed" version="1"
+  comment="package aide is installed">
+    <linux:object object_ref="obj_package_aide_installed" />
+  </linux:rpminfo_test>
+  <linux:rpminfo_object id="obj_package_aide_installed" version="1">
+    <linux:name>aide</linux:name>
+  </linux:rpminfo_object>
+</def-group>
-- 
1.8.3.1



More information about the scap-security-guide mailing list