Accepting request 313395 from Base:System

- Update to 0.20
- adjust the linker order which caused the compilation error in pesign
- fix a bug which cause the error in deletion
- Use default CFLAGS
- Drop upstreamed patche

OBS-URL: https://build.opensuse.org/request/show/313395
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/efivar?expand=0&rev=2

efivar-0.15.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:08251e10dbee8a5a9851d859b98fc6cb479acfced38695a101bd8ed2a447051e
-size 26936

efivar-0.20.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:cf699c1406c6d012ab0665f653b2f1a14d99edd8e2bf06f5ac2caa1b10e030a9
+size 66165

efivar-correct-license-header.patch

@@ -1,47 +0,0 @@
-From f41c4b36f83cd33f7eeef0daa76712073d6aec5f Mon Sep 17 00:00:00 2001
-From: Peter Jones <pjones@redhat.com>
-Date: Thu, 6 Nov 2014 12:14:59 -0500
-Subject: [PATCH] Make the license terms of util.h be right.
-
-This code is all mine, so there's nothing weird going on here, I just
-put the wrong license blurb in the file.
-
-Signed-off-by: Peter Jones <pjones@redhat.com>
----
- src/util.h | 17 +++++++++--------
- 1 file changed, 9 insertions(+), 8 deletions(-)
-
-diff --git a/src/util.h b/src/util.h
-index 1cd59d2..189350c 100644
---- a/src/util.h
-+++ b/src/util.h
-@@ -2,17 +2,18 @@
-  * Copyright 2011-2014 Red Hat, Inc.
-  * All rights reserved.
-  *
-- * This program is free software; you can redistribute it and/or modify
-- * it under the terms of the GNU General Public License as published by
-- * the Free Software Foundation; version 2 of the License.
-+ * This library is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License as published by the Free Software Foundation;
-+ * version 2.1 of the License.
-  *
-- * This program is distributed in the hope that it will be useful,
-+ * This library is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-- * GNU General Public License for more details.
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ * Lesser General Public License for more details.
-  *
-- * You should have received a copy of the GNU General Public License
-- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * along with this library.  If not, see <http://www.gnu.org/licenses/>.
-  *
-  * Author(s): Peter Jones <pjones@redhat.com>
-  */
--- 
-1.8.4.5
-

efivar-fix-vars_del_variable.patch

@@ -0,0 +1,31 @@
+From 734994cb0b66020277f9972baa9fa211a85aa582 Mon Sep 17 00:00:00 2001
+From: Gary Ching-Pang Lin <glin@suse.com>
+Date: Wed, 24 Jun 2015 17:51:44 +0800
+Subject: [PATCH] Exclude the padded NULL when comparing the file size
+
+In vars_del_variable(), this "if" statement always failed because
+read_file() returned the actual file size +1.
+
+if (rc < 0 || (buf_size != sizeof(efi_kernel_variable_64_t) &&
+               buf_size != sizeof(efi_kernel_variable_32_t)))
+
+Signed-off-by: Gary Ching-Pang Lin <glin@suse.com>
+---
+ src/vars.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/vars.c b/src/vars.c
+index ca0236e..b0006e1 100644
+--- a/src/vars.c
++++ b/src/vars.c
+@@ -344,6 +344,7 @@ vars_del_variable(efi_guid_t guid, const char *name)
+ 		goto err;
+ 
+ 	rc = read_file(fd, &buf, &buf_size);
++	buf_size -= 1; /* read_file pads out 1 extra byte to NUL it */
+ 	if (rc < 0 || (buf_size != sizeof(efi_kernel_variable_64_t) &&
+ 		       buf_size != sizeof(efi_kernel_variable_32_t)))
+ 		goto err;
+-- 
+2.1.4
+

efivar-revert-linker-order.patch

@@ -0,0 +1,37 @@
+From 1335ffbe3c83dacbadce38b19b07aaaf3406a1f5 Mon Sep 17 00:00:00 2001
+From: Gary Ching-Pang Lin <chingpang@gmail.com>
+Date: Tue, 16 Jun 2015 15:28:54 +0800
+Subject: [PATCH] Revert "Adjust linker order for pkg-config to fix FTBFS on
+ Ubuntu toolchain."
+
+This reverts commit 624237e6d5c8b84cbf7aeaf8d43b5d38f63da66d.
+---
+ src/efiboot.pc.in | 2 +-
+ src/efivar.pc.in  | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/efiboot.pc.in b/src/efiboot.pc.in
+index 6e51346..a5776d5 100644
+--- a/src/efiboot.pc.in
++++ b/src/efiboot.pc.in
+@@ -7,5 +7,5 @@ Name: efiboot
+ Description: UEFI Boot variable support
+ Version: @@VERSION@@
+ Requires:
+-Libs: -L${libdir} -ldl -lefivar -lefiboot
++Libs: -L${libdir} -lefivar -lefiboot -ldl
+ Cflags: -I${includedir}/efivar
+diff --git a/src/efivar.pc.in b/src/efivar.pc.in
+index 0cb3c23..6bbdaf9 100644
+--- a/src/efivar.pc.in
++++ b/src/efivar.pc.in
+@@ -7,5 +7,5 @@ Name: efivar
+ Description: UEFI Variable Management
+ Version: @@VERSION@@
+ Requires:
+-Libs: -L${libdir} -ldl -lefivar
++Libs: -L${libdir} -lefivar -ldl
+ Cflags: -I${includedir}/efivar
+-- 
+2.1.4
+

efivar-suse-build.patch

@@ -1,26 +0,0 @@
-diff --git a/Make.defaults b/Make.defaults
-index a6f2ea0..e559fec 100644
---- a/Make.defaults
-+++ b/Make.defaults
-@@ -6,7 +6,7 @@ bindir	?= /usr/bin/
- PCDIR	?= $(libdir)/pkgconfig/
- CC	:= $(if $(filter default,$(origin CC)),gcc,$(CC))
- CCLD	:= $(if $(filter undefined,$(origin CCLD)),$(CC),$(CCLD))
--CFLAGS	?= -O0 -g
-+CFLAGS	:= $(OPT_FLAGS)
- 
- ARCH = $(shell uname -m)
- clang_cflags =
-diff --git a/src/Makefile b/src/Makefile
-index d5bd885..5a767cd 100644
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -22,7 +22,7 @@ libefivar.a :: $(OBJECTS)
- libefivar.so.$(SONAME_VERSION) :: $(OBJECTS)
- 
- efivar : efivar.o libefivar.so
--	$(CCLD) $(ccldflags) -L. -lefivar -o $@ $^ -lpopt $(foreach lib,$(LIBS),-l$(lib))
-+	$(CCLD) $(ccldflags) -L. $^ -lefivar -o $@ -lpopt $(foreach lib,$(LIBS),-l$(lib))
- 
- efivar.pc : efivar.pc.in
- 	sed -e "s,@@VERSION@@,$(VERSION),g" \

efivar.changes

@@ -1,3 +1,51 @@
+-------------------------------------------------------------------
+Wed Jun 24 09:58:16 UTC 2015 - glin@suse.com
+
+- Add efivar-fix-vars_del_variable.patch to fix the deletion of
+  the variable with the old efivar kernel modules
+
+-------------------------------------------------------------------
+Tue Jun 16 07:30:20 UTC 2015 - glin@suse.com
+
+- Add efivar-revert-linker-order.patch to adjust the linker order
+  which caused the compilation error in pesign
+
+-------------------------------------------------------------------
+Thu Jun 11 06:59:41 UTC 2015 - mpluskal@suse.com
+
+- Use default CFLAGS
+
+-------------------------------------------------------------------
+Wed Jun  3 07:46:58 UTC 2015 - mpluskal@suse.com
+
+- Update to 0.20
+  * Make sure tester is build with the right link order for 
+    libraries.
+  * Adjust linker order for pkg-config
+  * Work around LocateDevicePath() not grokking PcieRoot() devices
+    properly.
+  * Rectify some missing changelog entries
+- Changes for 0.19
+  * Lots of debugging in this release, as well as some of the 
+    documentation that's planned. There's more of that to come.
+- Changes for 0.18
+  * This release is mostly about adding the efidp and libefiboot 
+    APIs available.Next release will feature documentation for 
+    them, verification that various different device path types 
+    work, etc. Right now efi device path generation is basically 
+    limited to:
+    + full file paths on sata devices
+    + full file paths on sas devices
+    + HD() paths for SATA and SAS devices
+    + ipv4 dhcp device paths that don't specify their own 
+      filenames
+- Drop upstreamed patche
+  * efivar-correct-license-header.patch
+- Drop as Makefiles have been restructured, CFLAGS no longer
+  defined in them
+  * efivar-suse-build.patch
+- Use fdupes to reduce amount of duplicate files
+
 -------------------------------------------------------------------
 Fri Nov  7 02:20:06 UTC 2014 - glin@suse.com
 

efivar.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package efivar
 #
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 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
@@ -17,15 +17,16 @@
 
 
 Name:           efivar
-Version:        0.15
+Version:        0.20
 Release:        0
 Summary:        Tools to manage UEFI variables
 License:        LGPL-2.1
 Group:          Development/Libraries/Other
 Url:            https://github.com/vathpela/efivar
 Source0:        https://github.com/vathpela/efivar/releases/download/%{version}/%{name}-%{version}.tar.bz2
-Patch0:         efivar-suse-build.patch
+Patch1:         efivar-revert-linker-order.patch
-Patch1:         efivar-correct-license-header.patch
+Patch2:         efivar-fix-vars_del_variable.patch
+BuildRequires:  fdupes
 BuildRequires:  pkg-config
 BuildRequires:  popt-devel
 Requires:       libefivar0 = %{version}-%{release}
@@ -50,14 +51,19 @@ development headers required to use libefivar.
 
 %prep
 %setup -q
-%patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
-make %{?_smp_mflags} libdir=%{_libdir} bindir=%{_bindir} OPT_FLAGS="%{optflags}"
+export CFLAGS="%{optflags}"
+make \
+  %{?_smp_mflags} \
+  libdir=%{_libdir} \
+  bindir=%{_bindir}
 
 %install
 make DESTDIR=%{buildroot} libdir=%{_libdir} install
+%fdupes -s %{buildroot}
 
 %post -n libefivar0 -p /sbin/ldconfig