From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 8D23E138247 for ; Fri, 20 Dec 2013 13:56:05 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BC8CBE0AEC; Fri, 20 Dec 2013 13:56:04 +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 15868E0AE8 for ; Fri, 20 Dec 2013 13:56:04 +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 0D60C33F66C for ; Fri, 20 Dec 2013 13:56:03 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id B009AE579B for ; Fri, 20 Dec 2013 13:56:01 +0000 (UTC) From: "Sven Vermeulen" 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" Message-ID: <1387546715.ba0efd919ff2b536cba4588eed154c01482bf200.swift@gentoo> Subject: [gentoo-commits] proj/hardened-docs:master commit in: xml/SCAP/ X-VCS-Repository: proj/hardened-docs X-VCS-Files: xml/SCAP/Makefile X-VCS-Directories: xml/SCAP/ X-VCS-Committer: swift X-VCS-Committer-Name: Sven Vermeulen X-VCS-Revision: ba0efd919ff2b536cba4588eed154c01482bf200 X-VCS-Branch: master Date: Fri, 20 Dec 2013 13:56:01 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 6d0d9381-d102-4dc6-929c-f9243a80b3e2 X-Archives-Hash: 675715ad01a0f6132a5c8e37e5c87c62 commit: ba0efd919ff2b536cba4588eed154c01482bf200 Author: Sven Vermeulen siphos be> AuthorDate: Fri Dec 20 13:38:35 2013 +0000 Commit: Sven Vermeulen gentoo org> CommitDate: Fri Dec 20 13:38:35 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/hardened-docs.git;a=commit;h=ba0efd91 Move generated docs to tmp location --- xml/SCAP/Makefile | 40 ++++++++++++++-------------------------- 1 file changed, 14 insertions(+), 26 deletions(-) diff --git a/xml/SCAP/Makefile b/xml/SCAP/Makefile index 387ae3e..42028e0 100644 --- a/xml/SCAP/Makefile +++ b/xml/SCAP/Makefile @@ -1,32 +1,20 @@ -all: report.html guide.html remediate.sh #guide.pdf +all: report-gentoo-xccdf.html guide-gentoo-xccdf.html remediate-gentoo-xccdf.sh guide-gentoo-xccdf.docbook -report.html: gentoo-cpe.xml gentoo-xccdf.xml gentoo-oval.xml - -oscap xccdf eval --cpe gentoo-cpe.xml --profile xccdf_org.gentoo.dev.swift_profile_default --results results-xccdf.xml --oval-results --report report.html gentoo-xccdf.xml +report-gentoo-xccdf.html: gentoo-cpe.xml gentoo-xccdf.xml gentoo-oval.xml + -oscap xccdf eval --cpe gentoo-cpe.xml --profile xccdf_org.gentoo.dev.swift_profile_default-oval --results ~/tmp/results-gentoo-xccdf.xml --oval-results --report ~/tmp/report-gentoo-xccdf.html gentoo-xccdf.xml -guide.html: gentoo-cpe.xml gentoo-xccdf.xml gentoo-oval.xml - oscap xccdf generate guide --profile xccdf_org.gentoo.dev.swift_profile_default --output guide.html gentoo-xccdf.xml +guide-gentoo-xccdf.html: gentoo-cpe.xml gentoo-xccdf.xml gentoo-oval.xml + oscap xccdf generate guide --profile xccdf_org.gentoo.dev.swift_profile_default-oval --output ~/tmp/guide-gentoo-xccdf.html gentoo-xccdf.xml -guide.docbook: gentoo-cpe.xml gentoo-xccdf.xml gentoo-oval.xml - oscap xccdf generate guide --profile xccdf_org.gentoo.dev.swift_profile_default --format docbook --output guide.docbook gentoo-xccdf.xml +guide-gentoo-xccdf.docbook: gentoo-cpe.xml gentoo-xccdf.xml gentoo-oval.xml + oscap xccdf generate guide --profile xccdf_org.gentoo.dev.swift_profile_default-oval --format docbook --output ~/tmp/guide-gentoo-xccdf.docbook gentoo-xccdf.xml -guide.fo: guide.docbook - xsltproc --output guide.fo --stringparam paper.type A4 /usr/share/sgml/docbook/xsl-stylesheets/fo/docbook.xsl guide.docbook +remediate-gentoo-xccdf.sh: + oscap xccdf generate fix --output ~/tmp/remediate-gentoo-xccdf.sh ~/tmp/results-gentoo-xccdf.xml + chmod 0644 ~/tmp/remediate-gentoo-xccdf.sh -guide.pdf: guide.fo - fop guide.fo guide.pdf +gentoo-ds.xml: + oscap ds sds-compose gentoo-xccdf.xml ~/tmp/gentoo-ds.xml + oscap ds sds-add gentoo-cpe.xml ~/tmp/gentoo-ds.xml -remediate.sh: results-xccdf.xml - oscap xccdf generate fix --output remediate.sh results-xccdf.xml - chmod 0644 remediate.sh - -ds: - oscap ds sds-compose gentoo-xccdf.xml ds.xml - oscap ds sds-add gentoo-cpe.xml ds.xml - -eval: - oscap xccdf eval --cpe gentoo-cpe.xml --profile xccdf_org.gentoo.dev.swift_profile_default gentoo-xccdf.xml - -clean: - -rm results-xccdf.xml report.html guide.html gentoo-oval.xml.results.xml remediate.sh guide.docbook guide.pdf guide.fo - -.PHONY: all eval clean +.PHONY: all