!10 fix date error on 20190823-6

From: @xu_lei_123 
Reviewed-by: @xiezhipeng1 
Signed-off-by: @xiezhipeng1

vboot-utils-00-disable-static-linking.patch

@@ -1,42 +0,0 @@
---- vboot-utils-a1c5f7c/Makefile.orig	2017-06-04 14:06:10.707762796 +0100
-+++ vboot-utils-a1c5f7c/Makefile	2017-06-04 14:07:04.347718848 +0100
-@@ -227,12 +227,6 @@
- CXX ?= g++
- PKG_CONFIG ?= pkg-config
- 
--# Static?
--ifneq (${STATIC},)
--LDFLAGS += -static
--PKG_CONFIG += --static
--endif
--
- # Determine QEMU architecture needed, if any
- ifeq (${ARCH},${HOST_ARCH})
-   # Same architecture; no need for QEMU
-@@ -999,7 +993,6 @@
- # Link tests for external repos
- ${BUILD}/host/linktest/extern: ${HOSTLIB}
- ${BUILD}/host/linktest/extern: LIBS = ${HOSTLIB}
--${BUILD}/host/linktest/extern: LDLIBS += -static
- TEST_OBJS += ${BUILD}/host/linktest/extern.o
- 
- .PHONY: hostlib
-@@ -1090,9 +1083,6 @@
- ${UTIL_BINS} ${UTIL_BINS_STATIC}: ${UTILLIB}
- ${UTIL_BINS} ${UTIL_BINS_STATIC}: LIBS = ${UTILLIB}
- 
--# Utilities for auto-update toolkits must be statically linked.
--${UTIL_BINS_STATIC}: LDFLAGS += -static
--
- 
- .PHONY: utils
- utils: ${UTIL_BINS} ${UTIL_SCRIPTS}
-@@ -1124,7 +1114,7 @@
- 
- ${FUTIL_STATIC_BIN}: ${FUTIL_STATIC_OBJS} ${UTILLIB}
- 	@${PRINTF} "    LD            $(subst ${BUILD}/,,$@)\n"
--	${Q}${LD} -o $@ ${CFLAGS} ${LDFLAGS} -static $^ ${LDLIBS}
-+	${Q}${LD} -o $@ ${CFLAGS} ${LDFLAGS} $^ ${LDLIBS}
- 
- ${FUTIL_BIN}: LDLIBS += ${CRYPTO_LIBS} ${FWLIB20}
- ${FUTIL_BIN}: ${FUTIL_OBJS} ${UTILLIB} ${FWLIB20} ${UTILBDB}

vboot-utils-595108c0-gcc10.patch

@@ -0,0 +1,13 @@
+diff -up vboot-utils-595108c0/futility/futility.h.me vboot-utils-595108c0/futility/futility.h
+--- vboot-utils-595108c0/futility/futility.h.me	2020-02-27 15:17:14.991440799 +0100
++++ vboot-utils-595108c0/futility/futility.h	2020-02-27 15:17:48.392751737 +0100
+@@ -40,7 +40,7 @@ enum vboot_version  {
+ };
+ 
+ /* What's our preferred API & data format? */
+-enum vboot_version vboot_version;
++extern enum vboot_version vboot_version;
+ 
+ /* Here's a structure to define the commands that futility implements. */
+ struct futil_cmd_t {
+diff -up vboot-utils-595108c0/tests/vboot_common_tests.c.me vboot-utils-595108c0/tests/vboot_common_tests.c

vboot-utils-cflags.patch

@@ -1,11 +0,0 @@
---- vboot-utils-a1c5f7c/Makefile.orig	2017-06-04 13:24:39.666009720 +0100
-+++ vboot-utils-a1c5f7c/Makefile	2017-06-04 13:25:23.960977143 +0100
-@@ -158,7 +158,7 @@
- else
- # FIRMWARE_ARCH not defined; assuming local compile.
- CC ?= gcc
--CFLAGS += -DCHROMEOS_ENVIRONMENT -Wall ${WERROR} ${DEBUG_FLAGS}
-+CFLAGS += $(COMMON_FLAGS) -DCHROMEOS_ENVIRONMENT -Wall ${WERROR} ${DEBUG_FLAGS}
- endif
- 
- ifneq (${CUSTOM_MUSIC},)

vboot-utils.spec

@@ -1,39 +1,34 @@
 %define _default_patch_fuzz 2
-
+Name:                vboot-utils
-Name:           vboot-utils
+Version:             20190823
-Version:        20180531
+Release:             6
-Release:        3
+Summary:             Chromium OS verified boot utility
-Summary:        Chromium OS verified boot utility
+License:             BSD
-License:        BSD
+URL:                 https://chromium.googlesource.com/chromiumos/platform/vboot_reference
-URL:            https://chromium.googlesource.com/chromiumos/platform/vboot_reference
+ExclusiveArch:       aarch64 x86_64
-ExclusiveArch:  aarch64 x86_64
+Source0:             %{name}-595108c0.tar.xz
-# https://chromium.googlesource.com/chromiumos/platform/vboot_reference/+archive/2cc35b0f31fe1cf69ce6781e7d502f07c64c93c9.tar.gz
+Patch0001:           vboot-utils-595108c0-gcc10.patch
-Source0:        %{name}-2cc35b0.tar.xz
+BuildRequires:       gcc-c++ openssl-devel trousers-devel libyaml-devel xz-devel libuuid-devel python3
-Patch0001:      vboot-utils-00-disable-static-linking.patch
-Patch0002:      vboot-utils-cflags.patch
-
-BuildRequires:  gcc-c++ openssl-devel trousers-devel libyaml-devel xz-devel libuuid-devel python2
-
 %description
 Verify boot is a collection of utilities for chromebook computers. Package and sign the kernel and
 manage gpt partitions.
 
 %prep
-%autosetup -n vboot-utils-2cc35b0 -p1
+%autosetup -n vboot-utils-595108c0 -p1
 
 %build
 %ifarch aarch64
 %global ARCH arm
 %endif
-
 %ifarch x86_64
 %global ARCH x86_64
 %endif
-
 %make_build V=1 ARCH=%{ARCH} COMMON_FLAGS="$RPM_OPT_FLAGS"
 
 %install
 %make_install V=1 DESTDIR=%{buildroot}/usr ARCH=%{ARCH} COMMON_FLAGS="$RPM_OPT_FLAGS"
+rm -rf %{buildroot}/usr/lib/pkgconfig/
+rm -rf %{buildroot}/usr/default/
 
 %check
 make runtests || true
@@ -41,9 +36,16 @@ make runtests || true
 %files
 %doc README LICENSE
 %{_bindir}/*
-/usr/default/
-/usr/lib/pkgconfig/
 
 %changelog
+* Fri Jul 30 2021 sunguoshuai <sunguoshuai@huawei.com> - 20190823-6
+- upgrade to 20190823
+
+* Tue Oct 27 2020 Anan Fu <fuanan3@huawei.com> - 20180531-5
+- disable python2
+
+* Wed Jan 8 2020 leiju <leiju4@huawei.com> - 20180531-4
+- fix unaligned point value with GCC9
+
 * Wed Jan 8 2020 fengbing <fengbing7@huawei.com> - 20180531-3
 - Package init