rpm/openscap
SHA256
1
0
Fork 0
forked from pool/openscap
Code Pull Requests Activity

Accepting request 635251 from security

Browse Source 
- openscap-xattr.patch: build against new libattr

OBS-URL: https://build.opensuse.org/request/show/635251
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/openscap?expand=0&rev=58
This commit is contained in:
Yuchen Lin 2018-09-13 10:11:29 +00:00 committed by Git OBS Bridge
commit 102cbbd841
3 changed files with 33 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
openscap-xattr.patch Normal file
View File

@ -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 <limits.h>
#include <sys/types.h>
-#include <attr/xattr.h>
+#include <attr/libattr.h>
#include <probe/probe.h>
#include <probe/option.h>

5
openscap.changes
View File

@ -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

2
openscap.spec
View File

@ -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