summaryrefslogtreecommitdiff
path: root/meta-security/meta-security-compliance/recipes-openscap
diff options
context:
space:
mode:
Diffstat (limited to 'meta-security/meta-security-compliance/recipes-openscap')
-rw-r--r--meta-security/meta-security-compliance/recipes-openscap/openscap-daemon/openscap-daemon_0.1.10.bb (renamed from meta-security/meta-security-compliance/recipes-openscap/openscap-daemon/openscap-daemon_0.1.6.bb)4
-rw-r--r--meta-security/meta-security-compliance/recipes-openscap/openscap/openscap_1.2.17.bb (renamed from meta-security/meta-security-compliance/recipes-openscap/openscap/openscap_1.2.15.bb)3
2 files changed, 3 insertions, 4 deletions
diff --git a/meta-security/meta-security-compliance/recipes-openscap/openscap-daemon/openscap-daemon_0.1.6.bb b/meta-security/meta-security-compliance/recipes-openscap/openscap-daemon/openscap-daemon_0.1.10.bb
index fb01a1134..a6a9373ea 100644
--- a/meta-security/meta-security-compliance/recipes-openscap/openscap-daemon/openscap-daemon_0.1.6.bb
+++ b/meta-security/meta-security-compliance/recipes-openscap/openscap-daemon/openscap-daemon_0.1.10.bb
@@ -8,11 +8,9 @@ LICENSE = "LGPL-2.1"
DEPENDS = "python3-dbus"
-SRCREV = "3fd5c75a08223de35a865d026d2a6980ec9c1d74"
+SRCREV = "f25b16afb6ac761fea13132ff406fba4cdfd2b76"
SRC_URI = "git://github.com/OpenSCAP/openscap-daemon.git"
-PV = "0.1.6+git${SRCPV}"
-
inherit setuptools3
S = "${WORKDIR}/git"
diff --git a/meta-security/meta-security-compliance/recipes-openscap/openscap/openscap_1.2.15.bb b/meta-security/meta-security-compliance/recipes-openscap/openscap/openscap_1.2.17.bb
index 7cbb1e2ec..e2a4fa2e6 100644
--- a/meta-security/meta-security-compliance/recipes-openscap/openscap/openscap_1.2.15.bb
+++ b/meta-security/meta-security-compliance/recipes-openscap/openscap/openscap_1.2.17.bb
@@ -11,7 +11,7 @@ DEPENDS = "autoconf-archive pkgconfig gconf procps curl libxml2 rpm \
DEPENDS_class-native = "autoconf-archive-native pkgconfig-native swig-native curl-native libxml2-native libxslt-native dpkg-native libgcrypt-native nss-native"
-SRCREV = "240930d42611983c65ecae16dbca3248ce130921"
+SRCREV = "59c234b3e9907480c89dfbd1b466a6bf72a2d2ed"
SRC_URI = "git://github.com/akuster/openscap.git;branch=oe \
file://crypto_pkgconfig.patch \
file://run-ptest \
@@ -46,6 +46,7 @@ do_configure_prepend () {
sed -i 's:-I/usr/include:-I${STAGING_INCDIR}:' ${S}/swig/perl/Makefile.am
sed -i 's:-I/usr/include:-I${STAGING_INCDIR}:' ${S}/swig/python3/Makefile.am
sed -i 's:-I/usr/include:-I${STAGING_INCDIR}:' ${S}/swig/python2/Makefile.am
+ sed -i 's:python2:python:' ${S}/utils/scap-as-rpm
}