From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-651229-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
	by finch.gentoo.org (Postfix) with ESMTP id B33E8138247
	for <garchives@archives.gentoo.org>; Fri, 20 Dec 2013 14:15:21 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id 71E24E0A99;
	Fri, 20 Dec 2013 14:15:20 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
	(using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by pigeon.gentoo.org (Postfix) with ESMTPS id 06277E0A9A
	for <gentoo-commits@lists.gentoo.org>; Fri, 20 Dec 2013 14:15:19 +0000 (UTC)
Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163])
	(using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id CF9E233F4A8
	for <gentoo-commits@lists.gentoo.org>; Fri, 20 Dec 2013 14:15:18 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
	by hornbill.gentoo.org (Postfix) with ESMTP id 7F221D0302
	for <gentoo-commits@lists.gentoo.org>; Fri, 20 Dec 2013 14:15:17 +0000 (UTC)
From: "Sven Vermeulen" <swift@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Sven Vermeulen" <swift@gentoo.org>
Message-ID: <1387548791.ac90f2453879ce0a62ac9675d73b6885913f198c.swift@gentoo>
Subject: [gentoo-commits] proj/hardened-docs:master commit in: xml/SCAP/
X-VCS-Repository: proj/hardened-docs
X-VCS-Files: xml/SCAP/gentoo-oval.xml
X-VCS-Directories: xml/SCAP/
X-VCS-Committer: swift
X-VCS-Committer-Name: Sven Vermeulen
X-VCS-Revision: ac90f2453879ce0a62ac9675d73b6885913f198c
X-VCS-Branch: master
Date: Fri, 20 Dec 2013 14:15:17 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: eed54cfd-c487-4a0e-bc1b-f1030ecc2cb9
X-Archives-Hash: da89e1580e7fb9ade5d4027b6f21394c

commit:     ac90f2453879ce0a62ac9675d73b6885913f198c
Author:     Sven Vermeulen <sven.vermeulen <AT> siphos <DOT> be>
AuthorDate: Fri Dec 20 14:13:11 2013 +0000
Commit:     Sven Vermeulen <swift <AT> gentoo <DOT> org>
CommitDate: Fri Dec 20 14:13:11 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/hardened-docs.git;a=commit;h=ac90f245

Make make.conf a variable

---
 xml/SCAP/gentoo-oval.xml | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/xml/SCAP/gentoo-oval.xml b/xml/SCAP/gentoo-oval.xml
index 73b5ec8..7e1a184 100644
--- a/xml/SCAP/gentoo-oval.xml
+++ b/xml/SCAP/gentoo-oval.xml
@@ -870,14 +870,14 @@
 
   <ind-def:textfilecontent54_object id="oval:org.gentoo.dev.swift:obj:17"
     version="2" comment="Portage make.conf global USE settings">
-    <ind-def:filepath>/etc/portage/make.conf</ind-def:filepath>
+    <ind-def:filepath var_ref="oval:org.gentoo.dev.swift:var:1" />
     <ind-def:pattern operation="pattern match">^USE=.*</ind-def:pattern>
     <ind-def:instance operation="greater than or equal" datatype="int">1</ind-def:instance>
   </ind-def:textfilecontent54_object>
 
   <ind-def:textfilecontent54_object id="oval:org.gentoo.dev.swift:obj:18"
     version="1" comment="Portage make.conf FEATURES settings">
-    <ind-def:filepath>/etc/portage/make.conf</ind-def:filepath>
+    <ind-def:filepath var_ref="oval:org.gentoo.dev.swift:var:1" />
     <ind-def:pattern operation="pattern match">^FEATURES=.*</ind-def:pattern>
     <ind-def:instance operation="greater than or equal" datatype="int">1</ind-def:instance>
   </ind-def:textfilecontent54_object>
@@ -943,8 +943,12 @@
 
 </states>
 
-<!--
 <variables>
+
+  <constant_variable id="oval:org.gentoo.dev.swift:var:1" version="1" datatype="string" comment="Path to Portage make.conf">
+    <value>/etc/portage/make.conf</value>
+  </constant_variable>
+
 </variables>
--->
+
 </oval_definitions>