diff --git a/openscap-xattr.patch b/openscap-xattr.patch new file mode 100644 index 0000000..1565a8e --- /dev/null +++ b/openscap-xattr.patch @@ -0,0 +1,26 @@ +Index: openscap-1.2.17/configure.ac +=================================================================== +--- openscap-1.2.17.orig/configure.ac ++++ openscap-1.2.17/configure.ac +@@ -476,7 +476,7 @@ AC_CHECK_HEADERS([acl/libacl.h sys/acl.h + + echo + echo ' * Checking presence of required headers for the fileextendedattribute probe' +-AC_CHECK_HEADERS([attr/xattr.h errno.h limits.h pthread.h stdlib.h string.h sys/stat.h sys/types.h ],[],[probe_fileextendedattribute_req_deps_ok=no; probe_fileextendedattribute_req_deps_missing='header files'],[-]) ++AC_CHECK_HEADERS([attr/libattr.h errno.h limits.h pthread.h stdlib.h string.h sys/stat.h sys/types.h ],[],[probe_fileextendedattribute_req_deps_ok=no; probe_fileextendedattribute_req_deps_missing='header files'],[-]) + + echo + echo ' * Checking presence of required headers for the password probe' +Index: openscap-1.2.17/src/OVAL/probes/unix/fileextendedattribute.c +=================================================================== +--- openscap-1.2.17.orig/src/OVAL/probes/unix/fileextendedattribute.c ++++ openscap-1.2.17/src/OVAL/probes/unix/fileextendedattribute.c +@@ -41,7 +41,7 @@ + #include + + #include +-#include ++#include + + #include + #include diff --git a/openscap.changes b/openscap.changes index 2aef3b1..74b5c80 100644 --- a/openscap.changes +++ b/openscap.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Sep 12 05:56:03 UTC 2018 - meissner@suse.com + +- openscap-xattr.patch: build against new libattr + ------------------------------------------------------------------- Thu Jun 7 08:46:23 UTC 2018 - meissner@suse.com diff --git a/openscap.spec b/openscap.spec index b3f9c29..7c3ca1b 100644 --- a/openscap.spec +++ b/openscap.spec @@ -37,6 +37,7 @@ Source4: scap-yast2sec-oval.xml Source5: oscap-scan.service Source6: oscap-scan.sh Patch0: openscap-new-suse.patch +Patch1: openscap-xattr.patch Url: http://www.open-scap.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: doxygen @@ -176,6 +177,7 @@ commonly used and require additional dependencies. %prep %setup -q %patch0 -p1 +%patch1 -p1 %build