From 78aa0d74d6a7befe994ca31cc934d6223a7ca397cd6e75d68ac9fd6f704570e0 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Fri, 10 Jan 2014 10:41:10 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/security/openscap?expand=0&rev=93 --- fix-return.patch | 12 ++++++++++++ openscap.spec | 4 ++-- 2 files changed, 14 insertions(+), 2 deletions(-) create mode 100644 fix-return.patch diff --git a/fix-return.patch b/fix-return.patch new file mode 100644 index 0000000..6d80595 --- /dev/null +++ b/fix-return.patch @@ -0,0 +1,12 @@ +Index: openscap-1.0.2/src/OVAL/results/oval_cmp_ip_address.c +=================================================================== +--- openscap-1.0.2.orig/src/OVAL/results/oval_cmp_ip_address.c ++++ openscap-1.0.2/src/OVAL/results/oval_cmp_ip_address.c +@@ -58,6 +58,7 @@ static inline int ipaddr_cmp(int af, con + return memcmp(addr1, addr2, sizeof(struct in6_addr)); + + assert(false); ++ return 42; + } + + static inline void ipaddr_mask(int af, const void *ip_addr, uint32_t mask) diff --git a/openscap.spec b/openscap.spec index 6c26ede..9495699 100644 --- a/openscap.spec +++ b/openscap.spec @@ -31,9 +31,8 @@ Source2: sysconfig.oscap-scan # Generated from http://gitorious.org/test-suite/scap Source3: scap-yast2sec-xccdf.xml Source4: scap-yast2sec-oval.xml -# -# Patch0: fix-missing-include.dif +Patch1: fix-return.patch Url: http://www.open-scap.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: libacl-devel @@ -149,6 +148,7 @@ commonly used and require additional dependencies. %prep %setup -q %patch0 -p1 +%patch1 -p1 %build