diff --git a/.github/workflows/automatus-cs8.yaml b/.github/workflows/automatus-cs8.yaml index 896dc2a96bc..8ec4b75d2f7 100644 --- a/.github/workflows/automatus-cs8.yaml +++ b/.github/workflows/automatus-cs8.yaml @@ -68,7 +68,7 @@ jobs: - name: Install Deps uses: mstksg/get-package@master with: - apt-get: cmake ninja-build libopenscap8 libxml2-utils expat xsltproc python3-jinja2 python3-yaml ansible-lint podman + apt-get: cmake ninja-build libopenscap8 libxml2-utils xsltproc python3-jinja2 python3-yaml ansible-lint podman - name: Checkout uses: actions/checkout@v2 - name: Get cached CTF output diff --git a/.github/workflows/automatus-cs9.yaml b/.github/workflows/automatus-cs9.yaml index ed4b54fdcb1..4ba95830f3c 100644 --- a/.github/workflows/automatus-cs9.yaml +++ b/.github/workflows/automatus-cs9.yaml @@ -68,7 +68,7 @@ jobs: - name: Install Deps uses: mstksg/get-package@master with: - apt-get: cmake ninja-build libopenscap8 libxml2-utils expat xsltproc python3-jinja2 python3-yaml ansible-lint podman + apt-get: cmake ninja-build libopenscap8 libxml2-utils xsltproc python3-jinja2 python3-yaml ansible-lint podman - name: Checkout uses: actions/checkout@v2 - name: Get cached CTF output diff --git a/.github/workflows/automatus.yaml b/.github/workflows/automatus.yaml index 78661a0a7c4..2643d54409f 100644 --- a/.github/workflows/automatus.yaml +++ b/.github/workflows/automatus.yaml @@ -66,7 +66,7 @@ jobs: - name: Install Deps uses: mstksg/get-package@master with: - apt-get: cmake ninja-build libopenscap8 libxml2-utils expat xsltproc python3-jinja2 python3-yaml ansible-lint podman + apt-get: cmake ninja-build libopenscap8 libxml2-utils xsltproc python3-jinja2 python3-yaml ansible-lint podman - name: Checkout uses: actions/checkout@v2 - name: Get cached CTF output diff --git a/.github/workflows/gate-lint-ansible-roles.yaml b/.github/workflows/gate-lint-ansible-roles.yaml index a7723a123f9..7082a9ab939 100644 --- a/.github/workflows/gate-lint-ansible-roles.yaml +++ b/.github/workflows/gate-lint-ansible-roles.yaml @@ -10,7 +10,7 @@ jobs: image: fedora:latest steps: - name: Install Deps - run: dnf install -y cmake make ninja-build openscap-utils python3-pyyaml python3-setuptools python3-jinja2 python3-pygithub ansible ansible-lint expat libxslt git + run: dnf install -y cmake make ninja-build openscap-utils python3-pyyaml python3-setuptools python3-jinja2 python3-pygithub ansible ansible-lint libxslt git - name: Checkout uses: actions/checkout@v2 - name: Configure diff --git a/.github/workflows/gate.yaml b/.github/workflows/gate.yaml index ee43e6e2e40..b29d9234c0e 100644 --- a/.github/workflows/gate.yaml +++ b/.github/workflows/gate.yaml @@ -12,7 +12,7 @@ jobs: image: centos:7 steps: - name: Install Deps - run: yum install -y cmake make openscap-utils PyYAML libxslt expat xml-common python-jinja2 python-setuptools + run: yum install -y cmake make openscap-utils PyYAML libxslt xml-common python-jinja2 python-setuptools - name: Checkout uses: actions/checkout@v2 - name: Build @@ -40,7 +40,7 @@ jobs: image: opensuse/leap:15 steps: - name: Install Deps - run: zypper install -y git cmake make openscap-utils python3-PyYAML bats python3-pytest python3-pytest-cov python3-Jinja2 python3-setuptools libxslt-tools libxml2-tools libexpat1 libexpat-devel libexpat1 expat ShellCheck + run: zypper install -y git cmake make openscap-utils python3-PyYAML bats python3-pytest python3-pytest-cov python3-Jinja2 python3-setuptools libxslt-tools libxml2-tools ShellCheck - name: Checkout uses: actions/checkout@v2 - name: Build @@ -58,7 +58,7 @@ jobs: - name: Update the package repository run: apt-get update - name: Install Deps - run: apt-get install -y ansible-lint bats check cmake expat libopenscap8 libxml2-utils ninja-build python3-github python3-jinja2 python3-setuptools python3-pip python3-pytest python3-pytest-cov xsltproc + run: apt-get install -y ansible-lint bats check cmake libopenscap8 libxml2-utils ninja-build python3-github python3-jinja2 python3-setuptools python3-pip python3-pytest python3-pytest-cov xsltproc - name: Install deps python run: pip3 install ruamel.yaml yamlpath pyyaml==5.4.1 - name: Checkout @@ -79,7 +79,7 @@ jobs: - name: Install Deps uses: mstksg/get-package@master with: - apt-get: cmake ninja-build libopenscap8 libxml2-utils expat xsltproc python3-jinja2 python3-yaml python3-setuptools ansible-lint python3-github bats python3-pytest python3-pytest-cov shellcheck + apt-get: cmake ninja-build libopenscap8 libxml2-utils xsltproc python3-jinja2 python3-yaml python3-setuptools ansible-lint python3-github bats python3-pytest python3-pytest-cov shellcheck - name: Checkout uses: actions/checkout@v2 - name: Build @@ -112,7 +112,7 @@ jobs: - name: Install Deps uses: mstksg/get-package@master with: - apt-get: cmake ninja-build libopenscap8 libxml2-utils expat xsltproc python3-jinja2 python3-yaml python3-setuptools ansible-lint python3-github bats python3-pytest python3-pytest-cov shellcheck + apt-get: cmake ninja-build libopenscap8 libxml2-utils xsltproc python3-jinja2 python3-yaml python3-setuptools ansible-lint python3-github bats python3-pytest python3-pytest-cov shellcheck - name: Checkout uses: actions/checkout@v2 - name: Build diff --git a/.github/workflows/gh-pages.yaml b/.github/workflows/gh-pages.yaml index 16181e348e4..f081970f7d9 100644 --- a/.github/workflows/gh-pages.yaml +++ b/.github/workflows/gh-pages.yaml @@ -14,7 +14,7 @@ jobs: PAGES_DIR: __pages steps: - name: Install Deps - run: dnf install -y cmake git ninja-build openscap-utils python3-pyyaml python3-jinja2 python3-pytest ansible-lint expat libxslt python3-pip rsync + run: dnf install -y cmake git ninja-build openscap-utils python3-pyyaml python3-jinja2 python3-pytest ansible-lint libxslt python3-pip rsync - name: Install deps python run: pip3 install json2html - name: Checkout diff --git a/.github/workflows/nightly_build.yml b/.github/workflows/nightly_build.yml index e92e64edceb..215495c5d54 100644 --- a/.github/workflows/nightly_build.yml +++ b/.github/workflows/nightly_build.yml @@ -11,7 +11,7 @@ jobs: image: fedora:latest steps: - name: Install Dependencies - run: dnf install -y cmake ninja-build openscap-utils python3-pyyaml python3-jinja2 python3-pytest ansible-lint expat libxslt ansible + run: dnf install -y cmake ninja-build openscap-utils python3-pyyaml python3-jinja2 python3-pytest ansible-lint libxslt ansible - name: Checkout uses: actions/checkout@v2 - name: Configure diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 1de42b39107..ee07889cb69 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -10,7 +10,7 @@ jobs: image: fedora:latest steps: - name: Install Deps - run: dnf install -y cmake ninja-build openscap-utils python3-pyyaml python3-jinja2 python3-pytest ansible ansible-lint expat libxslt + run: dnf install -y cmake ninja-build openscap-utils python3-pyyaml python3-jinja2 python3-pytest ansible ansible-lint libxslt - name: Checkout uses: actions/checkout@v2 - name: Configure diff --git a/.github/workflows/srg-mapping-table.yaml b/.github/workflows/srg-mapping-table.yaml index ba3b0d1d972..46d0ad26bca 100644 --- a/.github/workflows/srg-mapping-table.yaml +++ b/.github/workflows/srg-mapping-table.yaml @@ -14,7 +14,7 @@ jobs: PAGES_DIR: __srg_mapping steps: - name: Install Deps - run: dnf install -y cmake git ninja-build openscap-utils python3-pyyaml python3-jinja2 python3-pytest ansible-lint expat libxslt python3-pip rsync + run: dnf install -y cmake git ninja-build openscap-utils python3-pyyaml python3-jinja2 python3-pytest ansible-lint libxslt python3-pip rsync - name: Install deps python run: pip3 install pandas openpyxl - name: Checkout diff --git a/.github/workflows/stabilize.yaml b/.github/workflows/stabilize.yaml index 8dc485a2d16..fe55c1bbaa6 100644 --- a/.github/workflows/stabilize.yaml +++ b/.github/workflows/stabilize.yaml @@ -17,7 +17,7 @@ jobs: image: fedora:latest steps: - name: Install Deps - run: dnf install -y cmake ninja-build openscap-utils python3-pyyaml python3-jinja2 python3-pytest ansible expat libxslt python3-ansible-lint linkchecker java-1.8.0-openjdk unar wget python-unversioned-command + run: dnf install -y cmake ninja-build openscap-utils python3-pyyaml python3-jinja2 python3-pytest ansible libxslt python3-ansible-lint linkchecker java-1.8.0-openjdk unar wget python-unversioned-command - name: Checkout uses: actions/checkout@v2 - name: Configure diff --git a/.gitpod.Dockerfile b/.gitpod.Dockerfile index efb9d9c03c8..f5f04bb4e87 100644 --- a/.gitpod.Dockerfile +++ b/.gitpod.Dockerfile @@ -8,7 +8,6 @@ RUN sudo apt-get update -q && \ cmake \ ninja-build \ libxml2-utils \ - expat \ xsltproc \ python3-jinja2 \ python3-yaml \ diff --git a/CMakeLists.txt b/CMakeLists.txt index c11f46d59e3..d7b32a38a72 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -188,11 +188,6 @@ if (NOT XMLLINT_EXECUTABLE) message(SEND_ERROR "xmllint is required!") endif() -find_program(XMLWF_EXECUTABLE NAMES xmlwf) -if (NOT XMLWF_EXECUTABLE) - message(SEND_ERROR "xmlwf is required!") -endif() - find_program(SED_EXECUTABLE NAMES sed) if (NOT SED_EXECUTABLE) message(SEND_ERROR "sed is required!") @@ -224,7 +219,6 @@ message(STATUS "python jinja2 module: ${PY_JINJA2}") message(STATUS "oscap: ${OPENSCAP_OSCAP_EXECUTABLE} (version: ${OSCAP_VERSION})") message(STATUS "xsltproc: ${XSLTPROC_EXECUTABLE}") message(STATUS "xmllint: ${XMLLINT_EXECUTABLE}") -message(STATUS "xmlwf: ${XMLWF_EXECUTABLE}") message(STATUS "sed: ${SED_EXECUTABLE}") message(STATUS "shellcheck (optional): ${SHELLCHECK_EXECUTABLE}") message(STATUS "linkchecker (optional): ${LINKCHECKER_EXECUTABLE}") diff --git a/Dockerfiles/opensuse_leap_15_2 b/Dockerfiles/opensuse_leap_15_2 index f5c319c1e52..93bf0bbf24d 100644 --- a/Dockerfiles/opensuse_leap_15_2 +++ b/Dockerfiles/opensuse_leap_15_2 @@ -5,7 +5,7 @@ ENV OSCAP_DIR content ENV BUILD_JOBS 4 RUN true \ - && zypper --non-interactive in cmake ninja expat openscap-utils libxml2-tools libxslt-tools python3-PyYAML python3-Jinja2 python3-pytest python3-pytest-cov python3-Sphinx python3-sphinx_rtd_theme python3-pip python3-myst-parser \ + && zypper --non-interactive in cmake ninja openscap-utils libxml2-tools libxslt-tools python3-PyYAML python3-Jinja2 python3-pytest python3-pytest-cov python3-Sphinx python3-sphinx_rtd_theme python3-pip python3-myst-parser \ && pip install pip --upgrade \ && pip install json2html sphinxcontrib.jinjadomain \ && mkdir -p /home/$OSCAP_USERNAME \ diff --git a/Dockerfiles/ubuntu b/Dockerfiles/ubuntu index 4065d08998f..e53ec04776f 100644 --- a/Dockerfiles/ubuntu +++ b/Dockerfiles/ubuntu @@ -6,7 +6,7 @@ ENV BUILD_JOBS 4 RUN true \ && apt-get -qq update \ - && apt-get -qq install cmake ninja-build libopenscap8 libxml2-utils expat xsltproc python3-jinja2 python3-yaml \ + && apt-get -qq install cmake ninja-build libopenscap8 libxml2-utils xsltproc python3-jinja2 python3-yaml \ && mkdir -p /home/$OSCAP_USERNAME \ && rm -rf /usr/share/doc /usr/share/doc-base \ /usr/share/man /usr/share/locale /usr/share/zoneinfo \ diff --git a/docs/manual/developer/02_building_complianceascode.md b/docs/manual/developer/02_building_complianceascode.md index 3f2759de3a4..f8af4003913 100644 --- a/docs/manual/developer/02_building_complianceascode.md +++ b/docs/manual/developer/02_building_complianceascode.md @@ -48,7 +48,7 @@ On *Ubuntu* and *Debian*, make sure the packages `libopenscap8`, installed: ```bash -apt-get install cmake make expat libopenscap8 libxml2-utils ninja-build python3-jinja2 python3-yaml python3-setuptools xsltproc +apt-get install cmake make libopenscap8 libxml2-utils ninja-build python3-jinja2 python3-yaml python3-setuptools xsltproc ``` IMPORTANT: Version `1.0.8` or later of `openscap-utils` is required to build the content. diff --git a/scap-security-guide.spec b/scap-security-guide.spec index 01590ca2e88..19110f9cabb 100644 --- a/scap-security-guide.spec +++ b/scap-security-guide.spec @@ -15,9 +15,9 @@ Source0: https://github.com/ComplianceAsCode/content/releases/download/v%{versio BuildArch: noarch %if 0%{?centos} == 7 -BuildRequires: libxslt, expat, openscap-scanner >= 1.2.5, cmake >= 2.8, python, python-jinja2, PyYAML, python-setuptools +BuildRequires: libxslt, openscap-scanner >= 1.2.5, cmake >= 2.8, python, python-jinja2, PyYAML, python-setuptools %else -BuildRequires: libxslt, expat, openscap-scanner >= 1.2.5, cmake >= 2.8, /usr/bin/python3, python%{python3_pkgversion}, python%{python3_pkgversion}-jinja2, python%{python3_pkgversion}-PyYAML, python%{python3_pkgversion}-setuptools +BuildRequires: libxslt, openscap-scanner >= 1.2.5, cmake >= 2.8, /usr/bin/python3, python%{python3_pkgversion}, python%{python3_pkgversion}-jinja2, python%{python3_pkgversion}-PyYAML, python%{python3_pkgversion}-setuptools %endif Requires: xml-common, openscap-scanner >= 1.2.5