From b6d850e9bbf8fa7bfa3005aa57a992ca47cf17b689e47cce58f28fbf373e5c46 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Sat, 31 Dec 2011 22:22:54 +0000 Subject: [PATCH] Fix implicit definitions OBS-URL: https://build.opensuse.org/package/show/security:netfilter/iproute2?expand=0&rev=40 --- iproute2-implicit-definition-of-memcpy.diff | 22 +++++++++++++++++++++ iproute2.spec | 14 +++++++------ 2 files changed, 30 insertions(+), 6 deletions(-) create mode 100644 iproute2-implicit-definition-of-memcpy.diff diff --git a/iproute2-implicit-definition-of-memcpy.diff b/iproute2-implicit-definition-of-memcpy.diff new file mode 100644 index 0000000..056150b --- /dev/null +++ b/iproute2-implicit-definition-of-memcpy.diff @@ -0,0 +1,22 @@ +From: Jan Engelhardt +Date: 2011-12-31 23:16:27.428349795 +0100 + +gcc -DLIBDIR=\"/usr/lib64\" -D_GNU_SOURCE -fmessage-length=0 -O2 -Wall -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables -g -Wstrict-prototypes -fPIC -DXT_LIB_DIR=\"/usr/lib64/xtables\" -I../include -DRESOLVE_HOSTNAMES -DLIBDIR=\"/usr/lib64\" -fPIC -c -o ipx_pton.o ipx_pton.c +In file included from ../include/utils.h:8:0, + from ipx_ntop.c:5: +../include/libnetlink.h: In function 'rta_getattr_u64': +../include/libnetlink.h:84:2: warning: implicit declaration of function 'memcpy' +../include/libnetlink.h:84:2: warning: incompatible implicit declaration of built-in function 'memcpy' + +diff --git a/include/libnetlink.h b/include/libnetlink.h +index b237579..b0656ce 100644 +--- a/include/libnetlink.h ++++ b/include/libnetlink.h +@@ -1,6 +1,7 @@ + #ifndef __LIBNETLINK_H__ + #define __LIBNETLINK_H__ 1 + ++#include + #include + #include + #include diff --git a/iproute2.spec b/iproute2.spec index 87ac5f9..59025f9 100644 --- a/iproute2.spec +++ b/iproute2.spec @@ -29,14 +29,16 @@ License: GPL-2.0 #Git-Clone: git://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2 Source0: %name-%version.tar.xz -# PATCH-FIX-UPSTREAM iproute2-libdir-1.diff +# PATCH-FIX-UPSTREAM iproute2-libdir-1.diff status=unknown Patch0: iproute2-libdir-1.diff -# PATCH-??-OPENSUSE iproute2-HZ.diff +# PATCH-??-OPENSUSE iproute2-HZ.diff status=noidea Patch1: iproute2-HZ.diff -# PATCH-FIX-UPSTREAM iproute2-xt.diff +# iproute2-xt.diff status=sent,waiting Patch4: iproute2-xt.diff -# PATCH-FIX-UPSTREAM iproute2-xt-detect.diff +# iproute2-xt-detect.diff status=sent,waiting Patch6: iproute2-xt-detect.diff +# iproute2-implicit-definition-of-memcpy.diff status=sent,waiting +Patch7: iproute2-implicit-definition-of-memcpy.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: bison db-devel flex BuildRequires: libpng-devel libtiff-devel pkgconfig >= 0.23 @@ -88,7 +90,7 @@ tar -xf "%{S:0}" --use=xz; %endif %patch0 %patch1 -%patch -P 4 -P 6 -p1 +%patch -P 4 -P 6 -P 7 -p1 find . -name *.orig -print0 | xargs -r0 rm -v %build @@ -131,7 +133,7 @@ rm %buildroot%_sbindir/ifcfg %defattr(-,root,root) %doc doc/api-ip6-flowlabels.pdf doc/arpd.pdf doc/ip-cref.pdf %doc doc/ip-tunnels.pdf doc/nstat.pdf doc/rtstat.pdf doc/ss.pdf -%doc ChangeLog examples/ ip/ifcfg ip/routef ip/routel +%doc examples/ ip/ifcfg ip/routef ip/routel %files -n libnetlink-devel %defattr(-,root,root)