Merge branch 'maint-1.3'

Author: ggbecker

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "yaml-filter"]
+	path = yaml-filter
+	url = https://github.com/OpenSCAP/yaml-filter.git

CMakeLists.txt

@@ -143,10 +143,16 @@ find_package(LibXslt REQUIRED)
 find_package(BZip2)
 
 # PThread
+if (WIN32)
+	find_package(ZLIB REQUIRED)
+	find_package(pthread CONFIG REQUIRED)
+	set(CMAKE_THREAD_LIBS_INIT ${PThreads4W_LIBRARY})
+else()
+	find_package(Threads REQUIRED)
+endif()
 set(CMAKE_THREAD_PREFER_PTHREAD)
 set(THREADS_PREFER_PTHREAD_FLAG)
-set(THREADS_USE_PTHREADS_WIN32 true)
-find_package(Threads REQUIRED)
+set(THREADS_USE_PTHREADS_WIN32 TRUE)
 check_library_exists(pthread pthread_timedjoin_np "" HAVE_PTHREAD_TIMEDJOIN_NP)
 check_library_exists(pthread pthread_setname_np "" HAVE_PTHREAD_SETNAME_NP)
 check_library_exists(pthread pthread_getname_np "" HAVE_PTHREAD_GETNAME_NP)
@@ -164,6 +170,15 @@ if(GCRYPT_FOUND OR NSS_FOUND)
 	set(CRYPTO_FOUND TRUE)
 endif()
 
+find_package(Libyaml)
+if(EXISTS ${CMAKE_SOURCE_DIR}/yaml-filter/CMakeLists.txt)
+	message(STATUS "yaml-filter was found")
+	set(YAML_FILTER_FOUND TRUE)
+else()
+	message(STATUS "yaml-filter was not found")
+	set(YAML_FILTER_FOUND FALSE)
+endif()
+
 check_library_exists(rt clock_gettime "" HAVE_CLOCK_GETTIME)
 check_function_exists(posix_memalign HAVE_POSIX_MEMALIGN)
 check_function_exists(memalign HAVE_MEMALIGN)
@@ -235,6 +250,7 @@ cmake_dependent_option(OPENSCAP_PROBE_INDEPENDENT_TEXTFILECONTENT "Independent t
 cmake_dependent_option(OPENSCAP_PROBE_INDEPENDENT_TEXTFILECONTENT54 "Independent textfilecontent54 probe" ON "ENABLE_PROBES_INDEPENDENT; NOT WIN32" OFF)
 cmake_dependent_option(OPENSCAP_PROBE_INDEPENDENT_VARIABLE "Independent variable probe" ON "ENABLE_PROBES_INDEPENDENT" OFF)
 cmake_dependent_option(OPENSCAP_PROBE_INDEPENDENT_XMLFILECONTENT "Independent xmlfilecontent probe" ON "ENABLE_PROBES_INDEPENDENT; NOT WIN32" OFF)
+cmake_dependent_option(OPENSCAP_PROBE_INDEPENDENT_YAMLFILECONTENT "Independent yamlfilecontent probe" ON "ENABLE_PROBES_INDEPENDENT; LIBYAML_FOUND; YAML_FILTER_FOUND; NOT WIN32" OFF)
 
 # UNIX PROBES
 cmake_dependent_option(OPENSCAP_PROBE_UNIX_DNSCACHE "Unix dnscache probe" ON "ENABLE_PROBES_UNIX" OFF)
@@ -358,6 +374,7 @@ message(STATUS "  Independent sql57 probe (depends on opendbx): ${OPENSCAP_PROBE
 message(STATUS "  Independent textfilecontent probe: ${OPENSCAP_PROBE_INDEPENDENT_TEXTFILECONTENT}")
 message(STATUS "  Independent textfilecontent54 probe: ${OPENSCAP_PROBE_INDEPENDENT_TEXTFILECONTENT54}")
 message(STATUS "  Independent xmlfilecontent probe: ${OPENSCAP_PROBE_INDEPENDENT_XMLFILECONTENT}")
+message(STATUS "  Independent yamlfilecontent probe (depends on libyaml, yaml-path): ${OPENSCAP_PROBE_INDEPENDENT_YAMLFILECONTENT}")
 message(STATUS " ")
 
 
@@ -526,6 +543,7 @@ include_directories(
 	"src/XCCDF/public/"
 	"src/XCCDF_POLICY/"
 	"src/XCCDF_POLICY/public/"
+	"yaml-filter"
 	${CMAKE_BINARY_DIR} # config.h is generated to build directory
 	${LIBXML2_INCLUDE_DIR}
 )
@@ -548,6 +566,11 @@ function(set_oscap_generic_properties TARGET_OBJECT)
 	target_compile_definitions(${TARGET_OBJECT} PRIVATE OSCAP_BUILD_SHARED)
 endfunction()
 
+if(OPENSCAP_PROBE_INDEPENDENT_YAMLFILECONTENT)
+	add_library(yamlfilter_object OBJECT yaml-filter/yaml-path.c yaml-filter/yaml-path.h)
+	set_oscap_generic_properties(yamlfilter_object)
+endif()
+
 add_subdirectory("compat")
 add_subdirectory("src")
 add_subdirectory("utils")

appveyor.yml

@@ -7,7 +7,7 @@ image: Visual Studio 2017
 configuration: Release
 clone_folder: c:\projects\openscap
 install:
-- cmd: vcpkg install curl libxml2 libxslt bzip2 pcre pthreads
+- cmd: vcpkg install curl libxml2 libxslt bzip2 pcre pthreads zlib getopt-win32
 cache: c:\tools\vcpkg\installed\
 before_build:
 - cmd: >-

cmake/FindLibyaml.cmake

@@ -0,0 +1,29 @@
+# - Try to find libyaml
+# Once done, this will define
+#
+#  LIBYAML_FOUND - system has libyaml
+#  LIBYAML_INCLUDE_DIRS - the libyaml include directories
+#  LIBYAML_LIBRARIES - link these to use libyaml
+
+include(LibFindMacros)
+
+# Use pkg-config to get hints about paths
+libfind_pkg_check_modules(LIBYAML_PKGCONF yaml-0.1)
+
+# Include dir
+find_path(LIBYAML_INCLUDE_DIR
+	NAMES yaml.h
+	PATHS ${LIBYAML_PKGCONF_INCLUDE_DIRS}
+)
+
+# Finally the library itself
+find_library(LIBYAML_LIBRARY
+	NAMES libyaml.so
+	PATHS ${LIBYAML_PKGCONF_LIBRARY_DIRS}
+)
+
+# Set the include dir variables and the libraries and let libfind_process do the rest.
+# NOTE: Singular variables for this library, plural for libraries this this lib depends on.
+set(LIBYAML_PROCESS_INCLUDES LIBYAML_INCLUDE_DIR)
+set(LIBYAML_PROCESS_LIBS LIBYAML_LIBRARY)
+libfind_process(LIBYAML)

cmake/FindThreads.cmake

@@ -95,6 +95,7 @@
 #cmakedefine OPENSCAP_PROBE_INDEPENDENT_TEXTFILECONTENT54
 #cmakedefine OPENSCAP_PROBE_INDEPENDENT_VARIABLE
 #cmakedefine OPENSCAP_PROBE_INDEPENDENT_XMLFILECONTENT
+#cmakedefine OPENSCAP_PROBE_INDEPENDENT_YAMLFILECONTENT
 #cmakedefine OPENSCAP_PROBE_LINUX_DPKGINFO
 #cmakedefine OPENSCAP_PROBE_LINUX_IFLISTENERS
 #cmakedefine OPENSCAP_PROBE_LINUX_INETLISTENINGSERVERS

config.h.in

@@ -129,6 +129,10 @@
             <title xml:lang="en-us">Fedora 32</title>
             <check system="http://oval.mitre.org/XMLSchema/oval-definitions-5" href="openscap-cpe-oval.xml">oval:org.open-scap.cpe.fedora:def:32</check>
       </cpe-item>
+      <cpe-item name="cpe:/o:fedoraproject:fedora:33">
+            <title xml:lang="en-us">Fedora 33</title>
+            <check system="http://oval.mitre.org/XMLSchema/oval-definitions-5" href="openscap-cpe-oval.xml">oval:org.open-scap.cpe.fedora:def:33</check>
+      </cpe-item>
       <cpe-item name="cpe:/o:suse:sle">
             <title xml:lang="en-us">SUSE Linux Enterprise all versions</title>
             <check system="http://oval.mitre.org/XMLSchema/oval-definitions-5" href="openscap-cpe-oval.xml">oval:org.open-scap.cpe.sle:def:1</check>