From 78004f591344379b74617d856064219af2d6e06f Mon Sep 17 00:00:00 2001 From: Yury Martynov Date: Sun, 19 Jul 2020 19:39:00 +0300 Subject: [PATCH] app-forensics/scap-security-guide: drop old Package-Manager: Portage-2.3.103, Repoman-2.3.23 Signed-off-by: Yury Martynov --- app-forensics/scap-security-guide/Manifest | 2 - .../scap-security-guide/metadata.xml | 1 - .../scap-security-guide-0.1.46.ebuild | 119 ------------------ .../scap-security-guide-0.1.49.ebuild | 91 -------------- 4 files changed, 213 deletions(-) delete mode 100644 app-forensics/scap-security-guide/scap-security-guide-0.1.46.ebuild delete mode 100644 app-forensics/scap-security-guide/scap-security-guide-0.1.49.ebuild diff --git a/app-forensics/scap-security-guide/Manifest b/app-forensics/scap-security-guide/Manifest index 812190a2a..281d94cca 100644 --- a/app-forensics/scap-security-guide/Manifest +++ b/app-forensics/scap-security-guide/Manifest @@ -1,3 +1 @@ -DIST scap-security-guide-0.1.46.tar.gz 2870849 BLAKE2B 81e88fbb71e5f909199131dbde93f53fbd9badfde126f3f641593077430fbd393e33a2846b489d8583b426b4689f843c06d426f4ca5d4bafd4ba68fbf0aa2118 SHA512 8257a5e02038b9095046e26c0475448c367b237c26ea60ad389bd31af4d83ce868e4d50c34dd1162040d81c3246e437fdeaf5a6e63e1f7fc967768e04de04db2 -DIST scap-security-guide-0.1.49.tar.gz 3023378 BLAKE2B 92bec140ef348116eaffb5ccd37fcd0fbb886b436f3ffd44793595e9e893544ed4c9ac884a463c2e76b360d139f967e6506d08ed6bd9d829a61e0d62c7b68212 SHA512 5de5aaf833e8579ec9a71506e70cb805477fc666c4574b00bf882cec42238702c77d8a4c81fbee6aeaeea845c8accdd880f2ac6e88506f079289b8505942288c DIST scap-security-guide-0.1.50.tar.gz 9101036 BLAKE2B 083b239b01dd3a8fd9ebbf7f63abde7fee4e5c922d69cfdfa3a0e32c6525ea85995853e1fc6128b7dfbc939a1f5c4ecfb503bdb8f1fd5c61f6b238fcd522472a SHA512 679743f36dd83d802d9664e225c9de88bafe9ccb7c05784ab890cc65c1213a8b07b4ce622b2a61ddda20da56e3bf71a6f121a48a3e8de8c7ceac426f84a1877a diff --git a/app-forensics/scap-security-guide/metadata.xml b/app-forensics/scap-security-guide/metadata.xml index 56b1b8fd1..cd3bd2496 100644 --- a/app-forensics/scap-security-guide/metadata.xml +++ b/app-forensics/scap-security-guide/metadata.xml @@ -33,7 +33,6 @@ If enabled, CentOS derivative content will be built from the RHEL content If enabled, Scientific Linux derivative content will be built from the RHEL content If enabled, the jinja2 templating files will be cached into bytecode - If enabled, linkchecker will be used to validate URLs in all the HTML guides and tables If enabled, shellcheck validation of bash fixes will be performed as part of the ctest tests diff --git a/app-forensics/scap-security-guide/scap-security-guide-0.1.46.ebuild b/app-forensics/scap-security-guide/scap-security-guide-0.1.46.ebuild deleted file mode 100644 index f79847070..000000000 --- a/app-forensics/scap-security-guide/scap-security-guide-0.1.46.ebuild +++ /dev/null @@ -1,119 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{5,6} ) - -SSG_PRODUCTS=( - +chromium +debian8 eap6 example +fedora +firefox fuse6 - jre ocp3 ol7 ol8 +opensuse rhel6 rhel7 rhel8 rhosp13 - rhv4 sle11 sle12 ubuntu1404 +ubuntu1604 +ubuntu1804 - wrlinux8 wrlinux1019 -) - -inherit cmake-utils python-r1 - -DESCRIPTION="Security compliance content in SCAP, Bash, Ansible, and other formats" -HOMEPAGE="https://www.open-scap.org/security-policies/scap-security-guide" - -SRC_URI="https://github.com/ComplianceAsCode/content/archive/v${PV}.tar.gz -> ${P}.tar.gz" -# ol8? ( https://linux.oracle.com/security/oval/com.oracle.elsa-all.xml.bz2 -> ${P}_com.oracle.elsa-all.xml.bz2 ) -# ol7? ( https://linux.oracle.com/security/oval/com.oracle.elsa-all.xml.bz2 -> ${P}_com.oracle.elsa-all.xml.bz2 ) -# ubuntu1604? ( https://people.canonical.com/~ubuntu-security/oval/com.ubuntu.xenial.cve.oval.xml.bz2 -> ${P}_com.ubuntu.xenial.cve.oval.xml.bz2 ) -# ubuntu1404? ( https://people.canonical.com/~ubuntu-security/oval/com.ubuntu.trusty.cve.oval.xml.bz2 -> ${P}_com.ubuntu.trusty.cve.oval.xml.bz2 ) -# rhel8? ( https://www.redhat.com/security/data/oval/com.redhat.rhsa-RHEL8.xml.bz2 -> ${P}_com.redhat.rhsa-RHEL8.xml.bz2 ) -# rhel7? ( https://www.redhat.com/security/data/oval/com.redhat.rhsa-RHEL7.xml.bz2 -> ${P}_com.redhat.rhsa-RHEL7.xml.bz2 ) -# rhel6? ( https://www.redhat.com/security/data/oval/com.redhat.rhsa-RHEL6.xml.bz2 -> ${P}_com.redhat.rhsa-RHEL6.xml.bz2 )" - -KEYWORDS="~amd64" -LICENSE="BSD" -SLOT=0 -IUSE="${SSG_PRODUCTS[*]} centos +jinja2 linkchecker shellcheck scientific-linux test" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -RDEPEND="" -DEPEND="${PYTHON_DEPS} - app-forensics/openscap - dev-libs/expat - dev-libs/libxslt - dev-libs/libxml2:2= - app-admin/ansible[${PYTHON_USEDEP}] - app-admin/ansible-lint[${PYTHON_USEDEP}] - dev-python/json2html[${PYTHON_USEDEP}] - dev-python/pyyaml[${PYTHON_USEDEP}] - dev-python/yamllint[${PYTHON_USEDEP}] - jinja2? ( dev-python/jinja[${PYTHON_USEDEP}] ) - linkchecker? ( net-analyzer/linkchecker ) - shellcheck? ( - || ( - dev-util/shellcheck-bin - dev-util/shellcheck - ) - ) - test? ( - dev-python/pytest[${PYTHON_USEDEP}] - )" - -S="${WORKDIR}"/content-${PV} -BUILD_DIR="${S}/build" - -#src_unpack() { -# local oval_db p -# -# default -# -# find "${WORKDIR}" -maxdepth 1 -name "${P}_*.xml" | while read p; do -# oval_db=$(basename ${p}) -# elog "Vendoring: ${oval_db}" -# mv "${p}" "${S}/${oval_db#${P}_}" || die -# done -#} - -src_prepare() { - cmake-utils_src_prepare -} - -src_configure() { - local product - local mycmakeargs=( - -DCMAKE_INSTALL_DOCDIR="/usr/share/doc/${P}" - -DSSG_JINJA2_CACHE_DIR="${T}/jinja2_cache" - -DSSG_SVG_IN_XCCDF_ENABLED='TRUE' - -DSSG_SEPARATE_SCAP_FILES_ENABLED='TRUE' - - $(usex jinja2 \ - "-DSSG_JINJA2_CACHE_ENABLED='TRUE'" \ - "-DSSG_JINJA2_CACHE_ENABLED='FALSE'") - $(usex centos \ - "-DSSG_CENTOS_DERIVATIVES_ENABLED='TRUE'" \ - "-DSSG_CENTOS_DERIVATIVES_ENABLED='FALSE'") - $(usex scientific-linux \ - "-DSSG_SCIENTIFIC_LINUX_DERIVATIVES_ENABLED='TRUE'" \ - "-DSSG_SCIENTIFIC_LINUX_DERIVATIVES_ENABLED='FALSE'") - $(usex test \ - "-DENABLE_PYTHON_COVERAGE='ON'" \ - "-DENABLE_PYTHON_COVERAGE='OFF'") - $(usex linkchecker \ - "-DSSG_LINKCHECKER_VALIDATION_ENABLED='TRUE'" \ - "-DSSG_LINKCHECKER_VALIDATION_ENABLED='FALSE'") - $(usex shellcheck \ - "-DSSG_SHELLCHECK_BASH_FIXES_VALIDATION_ENABLED='TRUE'" \ - "-DSSG_SHELLCHECK_BASH_FIXES_VALIDATION_ENABLED='FALSE'") - ) - - for x in ${SSG_PRODUCTS[@]}; do - product="${x//[[:punct:]]/}" - mycmakeargs+=( - $(usex $product \ - "-DSSG_PRODUCT_${product^^}='TRUE'" \ - "-DSSG_PRODUCT_${product^^}='FALSE'") - ) - done - - cmake-utils_src_configure -} - -src_test() { - cmake-utils_src_test -} diff --git a/app-forensics/scap-security-guide/scap-security-guide-0.1.49.ebuild b/app-forensics/scap-security-guide/scap-security-guide-0.1.49.ebuild deleted file mode 100644 index c186bbc77..000000000 --- a/app-forensics/scap-security-guide/scap-security-guide-0.1.49.ebuild +++ /dev/null @@ -1,91 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{6,7} ) - -SSG_PRODUCTS=( - +chromium +debian8 eap6 example +fedora +firefox fuse6 - jre ocp3 ol7 ol8 +opensuse rhel6 rhel7 rhel8 rhosp13 - rhv4 sle11 sle12 ubuntu1404 +ubuntu1604 +ubuntu1804 - wrlinux8 wrlinux1019 -) - -inherit cmake python-single-r1 - -DESCRIPTION="Security compliance content in SCAP, Bash, Ansible, and other formats" -HOMEPAGE="https://www.open-scap.org/security-policies/scap-security-guide" -SRC_URI="https://github.com/ComplianceAsCode/content/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64" - -IUSE="${SSG_PRODUCTS[*]} centos +jinja2 shellcheck scientific-linux test" -REQUIRED_USE="${PYTHON_REQUIRED_USE} - shellcheck? ( test )" - -DEPEND="${PYTHON_DEPS} - >=app-forensics/openscap-1.3.0 - dev-libs/expat - dev-libs/libxslt - dev-libs/libxml2:2 - $(python_gen_cond_dep ' - app-admin/ansible[${PYTHON_MULTI_USEDEP}] - app-admin/ansible-lint[${PYTHON_MULTI_USEDEP}] - dev-python/json2html[${PYTHON_MULTI_USEDEP}] - dev-python/pyyaml[${PYTHON_MULTI_USEDEP}] - dev-python/yamllint[${PYTHON_MULTI_USEDEP}] - ') - jinja2? ( $(python_gen_cond_dep 'dev-python/jinja[${PYTHON_MULTI_USEDEP}]') ) - test? ( - $(python_gen_cond_dep 'dev-python/pytest[${PYTHON_MULTI_USEDEP}]') - shellcheck? ( - || ( dev-util/shellcheck-bin dev-util/shellcheck ) - ) - )" - -S="${WORKDIR}/content-${PV}" - -pkg_setup() { - python-single-r1_pkg_setup -} - -src_prepare() { - find "${S}" -name "*.py" | while read x; do - sed -i -e "/^#!/s/python\(.*\)/python/" "$x" || die - done - - python_fix_shebang -q "${S}" - - cmake_src_prepare -} - -src_configure() { - local product - local mycmakeargs=( - -DPYTHON_EXECUTABLE="${PYTHON}" - -DCMAKE_INSTALL_DOCDIR="/usr/share/doc/${PF}" - -DSSG_SVG_IN_XCCDF_ENABLED="yes" - -DSSG_SEPARATE_SCAP_FILES_ENABLED="yes" - -DSSG_JINJA2_CACHE_ENABLED="$(usex jinja2)" - -DSSG_JINJA2_CACHE_DIR="${T}/jinja2_cache" - -DSSG_CENTOS_DERIVATIVES_ENABLED="$(usex centos)" - -DSSG_SCIENTIFIC_LINUX_DERIVATIVES_ENABLED="$(usex scientific-linux)" - -DENABLE_PYTHON_COVERAGE="$(usex test)" - -DSSG_SHELLCHECK_BASH_FIXES_VALIDATION_ENABLED="$(usex shellcheck)" - -DSSG_LINKCHECKER_VALIDATION_ENABLED="no" # network is required - ) - - for x in ${SSG_PRODUCTS[@]}; do - product="${x//[[:punct:]]/}" - mycmakeargs+=( "-DSSG_PRODUCT_${product^^}=$(usex ${product})" ) - done - - # support building only in ./build directory - # do not remove it without testing - BUILD_DIR="${S}/build" - - cmake_src_configure -}