From 61c5603ba0510677417ea9c9545a03a94bde642a3c211008bb0312ba06b1fdb8 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Tue, 14 Jan 2014 17:14:46 +0000 Subject: [PATCH] - fix-return.patch: removed, has upstream fix OBS-URL: https://build.opensuse.org/package/show/security/openscap?expand=0&rev=97 --- fix-return.patch | 12 ------------ openscap.changes | 1 + openscap.spec | 2 -- 3 files changed, 1 insertion(+), 14 deletions(-) delete mode 100644 fix-return.patch diff --git a/fix-return.patch b/fix-return.patch deleted file mode 100644 index 6d80595..0000000 --- a/fix-return.patch +++ /dev/null @@ -1,12 +0,0 @@ -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.changes b/openscap.changes index 214c195..c72be96 100644 --- a/openscap.changes +++ b/openscap.changes @@ -6,6 +6,7 @@ Tue Jan 14 16:42:51 UTC 2014 - meissner@suse.com - a few coverity issues - a few memory leak plugs - broken comparison of huge integet in OVAL +- fix-return.patch: removed, has upstream fix ------------------------------------------------------------------- Fri Jan 10 10:25:19 UTC 2014 - meissner@suse.com diff --git a/openscap.spec b/openscap.spec index 2b0f4d9..aa7224c 100644 --- a/openscap.spec +++ b/openscap.spec @@ -32,7 +32,6 @@ Source2: sysconfig.oscap-scan 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 @@ -148,7 +147,6 @@ commonly used and require additional dependencies. %prep %setup -q %patch0 -p1 -%patch1 -p1 %build