diff options
| author |   Sven Vermeulen <swift@gentoo.org> | 2013-09-26 11:50:45 +0000 |
|---|---|---|
| committer | Sven Vermeulen <swift@gentoo.org> | 2013-09-26 11:50:45 +0000 |
| commit | fec20c78a304cdc882f1bcbe7f28e29e4e8a0199 (patch) | |
| tree | 87603f40170fe5b584b087175de221b0c169722c /app-forensics/ovaldi | |
| parent | Stable for amd64 wrt bug #486022 (diff) | |
| download | gentoo-2-fec20c78a304cdc882f1bcbe7f28e29e4e8a0199.tar.gz gentoo-2-fec20c78a304cdc882f1bcbe7f28e29e4e8a0199.tar.bz2 gentoo-2-fec20c78a304cdc882f1bcbe7f28e29e4e8a0199.zip | |
Fix bug #485834 - Fix build failure if USE=-acl is set
(Portage version: 2.2.1/cvs/Linux x86_64, signed Manifest commit with key 0x2EDD52403B68AF47)
Diffstat (limited to 'app-forensics/ovaldi')
| -rw-r--r-- | app-forensics/ovaldi/ChangeLog | 5 | ||||
| -rw-r--r-- | app-forensics/ovaldi/files/disable-acl.patch | 23 |
2 files changed, 27 insertions, 1 deletions
diff --git a/app-forensics/ovaldi/ChangeLog b/app-forensics/ovaldi/ChangeLog index fe91d6aa5527..4ceed08b3b1b 100644 --- a/app-forensics/ovaldi/ChangeLog +++ b/app-forensics/ovaldi/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for app-forensics/ovaldi # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-forensics/ovaldi/ChangeLog,v 1.4 2013/01/30 18:53:05 hwoarang Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-forensics/ovaldi/ChangeLog,v 1.5 2013/09/26 11:50:45 swift Exp $ + + 26 Sep 2013; Sven Vermeulen <swift@gentoo.org> +files/disable-acl.patch: + Fix bug #485834 - Fix build failure if USE=-acl is set *ovaldi-5.10.1.4 (30 Jan 2013) diff --git a/app-forensics/ovaldi/files/disable-acl.patch b/app-forensics/ovaldi/files/disable-acl.patch new file mode 100644 index 000000000000..49ea42c80558 --- /dev/null +++ b/app-forensics/ovaldi/files/disable-acl.patch @@ -0,0 +1,23 @@ +--- src/probes/unix/FileProbe.cpp.old 2013-01-14 16:28:33.000000000 +0100 ++++ src/probes/unix/FileProbe.cpp 2013-01-14 16:30:33.000000000 +0100 +@@ -427,19 +427,8 @@ + 5) If a file doesn't have an ACL, or it matches the standard UNIX permissions, the value will be 'false' (this is covered by acl_extended_file() - thank you openscap)
+ 6) If a file has an ACL, the value will be 'true'.
+ */
+-
+- int hasExtendedAcl = acl_extended_file(filePath.c_str());
+- if(hasExtendedAcl > -1){ // behavior 4, 5, and 6
+- item->AppendElement(new ItemEntity("has_extended_acl",Common::ToString(hasExtendedAcl),OvalEnum::DATATYPE_BOOLEAN,OvalEnum::STATUS_EXISTS,0));
+- }else{
+- if(errno == EOPNOTSUPP){ // behavior 3
+- item->AppendElement(new ItemEntity("has_extended_acl","",OvalEnum::DATATYPE_BOOLEAN,OvalEnum::STATUS_DOES_NOT_EXIST,0));
+- }else{ // behavior 2
+- item->AppendElement(new ItemEntity("has_extended_acl","",OvalEnum::DATATYPE_BOOLEAN,OvalEnum::STATUS_ERROR,0));
+- item->AppendMessage(new OvalMessage(string("Error reading ACL data: ") + strerror(errno)));
+- }
+- }
+
++ item->AppendElement(new ItemEntity("has_extended_acl","",OvalEnum::DATATYPE_BOOLEAN,OvalEnum::STATUS_NOT_COLLECTED,0));
+ # else
+ // behavior 1
+ item->AppendElement(new ItemEntity("has_extended_acl","",OvalEnum::DATATYPE_BOOLEAN,OvalEnum::STATUS_NOT_COLLECTED,0));
|