Gentoo Archives: gentoo-commits

From: "Markos Chandras (hwoarang)" <hwoarang@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in app-forensics/openscap/files: openscap-0.9.3-policy.patch
Date: Wed, 30 Jan 2013 18:43:55
Message-Id: 20130130184326.2717F2171E@flycatcher.gentoo.org
1 hwoarang 13/01/30 18:43:26
2
3 Added: openscap-0.9.3-policy.patch
4 Log:
5 Revbump with patch to fix bug #450328. Thanks to Anton Bolshakov <anton.bugs@×××××.com>
6
7 (Portage version: 2.1.11.50/cvs/Linux x86_64, signed Manifest commit with key B4AFF2C2)
8
9 Revision Changes Path
10 1.1 app-forensics/openscap/files/openscap-0.9.3-policy.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-forensics/openscap/files/openscap-0.9.3-policy.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-forensics/openscap/files/openscap-0.9.3-policy.patch?rev=1.1&content-type=text/plain
14
15 Index: openscap-0.9.3-policy.patch
16 ===================================================================
17 https://bugs.gentoo.org/show_bug.cgi?id=450328
18 --- src/XCCDF_POLICY/xccdf_policy.c.orig 2012-12-14 18:13:18.000000000 +0800
19 +++ src/XCCDF_POLICY/xccdf_policy.c 2013-01-07 22:31:10.417704932 +0800
20 @@ -389,8 +389,8 @@
21 __attribute__nonnull__(policy);
22 __attribute__nonnull__(item);
23
24 - static bool TRUE = true;
25 - static bool FALSE = false;
26 + static bool TRUE2 = true;
27 + static bool FALSE2 = false;
28 bool result;
29
30 oscap_htable_detach(policy->selected_final, xccdf_item_get_id(item));
31 @@ -408,7 +408,7 @@
32 xccdf_item_iterator_free(child_it);
33 }
34
35 - assume_ex(oscap_htable_add(policy->selected_final, xccdf_item_get_id(item), result ? &TRUE : &FALSE), NULL);
36 + assume_ex(oscap_htable_add(policy->selected_final, xccdf_item_get_id(item), result ? &TRUE2 : &FALSE2), NULL);
37 }
38
39 /**