Accepting request 358734 from home:rguenther:branches:Base:System

- Add efivar-0.21-gcc6.diff to fix strict-aliasing issue.
- Build with -Wno-nonnull as efivar tests nonnull args for zero
  and that breaks with its use of -Werror.

OBS-URL: https://build.opensuse.org/request/show/358734
OBS-URL: https://build.opensuse.org/package/show/Base:System/efivar?expand=0&rev=13

efivar-0.21-gcc6.diff

@@ -0,0 +1,19 @@
+--- src/util.h.orig	2016-02-10 15:29:15.245050330 +0000
++++ src/util.h	2016-02-10 15:29:18.957092775 +0000
+@@ -175,14 +175,14 @@
+ 			}						\
+ 		}							\
+ 		if (_rc >= 0) {						\
+-			uint8_t *_buf2 = alloca(_bufsize);		\
++			void *_buf2 = alloca(_bufsize);		\
+ 			_saved_errno = errno;				\
+ 			if (_buf2) {					\
+ 				memcpy(_buf2, _buf, _bufsize);		\
+ 				_rc = _bufsize;				\
+ 			}						\
+ 			free(_buf);					\
+-			*((uint8_t **)buf) = _buf2;			\
++			*((void **)buf) = _buf2;			\
+ 			errno = _saved_errno;				\
+ 		}							\
+ 		_rc;							\

efivar.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Feb 10 15:31:35 UTC 2016 - rguenther@suse.com
+
+- Add efivar-0.21-gcc6.diff to fix strict-aliasing issue.
+- Build with -Wno-nonnull as efivar tests nonnull args for zero
+  and that breaks with its use of -Werror.
+
 -------------------------------------------------------------------
 Tue Dec  1 09:08:28 UTC 2015 - glin@suse.com
 

efivar.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package efivar
 #
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -25,6 +25,7 @@ Group:          Development/Libraries/Other
 Url:            https://github.com/rhinstaller/efivar
 Source0:        https://github.com/rhinstaller/efivar/releases/download/%{version}/%{name}-%{version}.tar.bz2
 Patch1:         efivar-fix-initializer.patch
+Patch2:         efivar-0.21-gcc6.diff
 BuildRequires:  fdupes
 BuildRequires:  pkg-config
 BuildRequires:  popt-devel
@@ -51,9 +52,10 @@ development headers required to use libefivar.
 %prep
 %setup -q
 %patch1 -p1
+%patch2
 
 %build
-export CFLAGS="%{optflags}"
+export CFLAGS="%{optflags} -Wno-nonnull"
 make \
   %{?_smp_mflags} \
   libdir=%{_libdir} \