!67 fix CVE-2011-2501 CVE-2011-2690 CVE-2011-2691 CVE-2011-2692 CVE-2011-3045 CVE-2011-3048 CVE-2012-3425 CVE-2015-7981 CVE-2015-8126 CVE-2015-8472 CVE-2015-8540 CVE-2016-10087 CVE-2017-12652

From: @ultra_planet 
Reviewed-by: @t_feng 
Signed-off-by: @t_feng

backport-tweak-for-gcc-10.patch

@@ -0,0 +1,83 @@
+From 8284530f4bd86a38b9867f847bd844f5d8d08e87 Mon Sep 17 00:00:00 2001
+From: Sergei Trofimovich <slyfox@gentoo.org>
+Date: Mon, 6 Apr 2020 23:46:03 +0100
+Subject: sys-boot/syslinux: tweak for gcc-10, bug #705730
+
+Closes: https://bugs.gentoo.org/705730
+Package-Manager: Portage-2.3.96, Repoman-2.3.22
+Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
+
+Reference:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8284530f4bd86a38b9867f847bd844f5d8d08e87
+https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=53c31ce51ace223e4439cde2b6b2a395e40ae9d5
+---
+ mk/com32.mk    | 1 +
+ mk/efi.mk      | 2 +-
+ mk/elf.mk      | 1 +
+ mk/embedded.mk | 1 +
+ mk/lib.mk      | 1 +
+ 5 files changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/mk/com32.mk b/mk/com32.mk
+index aeb8a2c..5ae14fe 100644
+--- a/mk/com32.mk
++++ b/mk/com32.mk
+@@ -47,6 +47,7 @@ GCCOPT += $(call gcc_ok,-falign-functions=0,-malign-functions=0)
+ GCCOPT += $(call gcc_ok,-falign-jumps=0,-malign-jumps=0)
+ GCCOPT += $(call gcc_ok,-falign-labels=0,-malign-labels=0)
+ GCCOPT += $(call gcc_ok,-falign-loops=0,-malign-loops=0)
++GCCOPT += $(call gcc_ok,-fcommon)
+ 
+ ifeq ($(FWCLASS),EFI)
+ GCCOPT += -mno-red-zone
+diff --git a/mk/efi.mk b/mk/efi.mk
+index f097ad2..a082bad 100644
+--- a/mk/efi.mk
++++ b/mk/efi.mk
+@@ -7,7 +7,7 @@ core = $(topdir)/core
+ # Set up architecture specifics; for cross compilation, set ARCH as apt
+ # gnuefi sets up architecture specifics in ia32 or x86_64 sub directories
+ # set up the LIBDIR and EFIINC for building for the appropriate architecture
+-GCCOPT := $(call gcc_ok,-fno-stack-protector,)
++GCCOPT := $(call gcc_ok,-fno-stack-protector,) $(call gcc_ok,-fcommon)
+ EFIINC = $(objdir)/include/efi
+ LIBDIR  = $(objdir)/lib
+ 
+diff --git a/mk/elf.mk b/mk/elf.mk
+index b46dbd0..7ac7600 100644
+--- a/mk/elf.mk
++++ b/mk/elf.mk
+@@ -42,6 +42,7 @@ GCCOPT += $(call gcc_ok,-falign-functions=0,-malign-functions=0)
+ GCCOPT += $(call gcc_ok,-falign-jumps=0,-malign-jumps=0)
+ GCCOPT += $(call gcc_ok,-falign-labels=0,-malign-labels=0)
+ GCCOPT += $(call gcc_ok,-falign-loops=0,-malign-loops=0)
++GCCOPT += $(call gcc_ok,-fcommon)
+ 
+ com32 = $(topdir)/com32
+ core = $(topdir)/core
+diff --git a/mk/embedded.mk b/mk/embedded.mk
+index 488dc0f..bfca1a8 100644
+--- a/mk/embedded.mk
++++ b/mk/embedded.mk
+@@ -51,6 +51,7 @@ GCCOPT    += $(call gcc_ok,-falign-jumps=0,-malign-jumps=0)
+ GCCOPT    += $(call gcc_ok,-falign-labels=0,-malign-labels=0)
+ GCCOPT    += $(call gcc_ok,-falign-loops=0,-malign-loops=0)
+ GCCOPT    += $(call gcc_ok,-fvisibility=hidden)
++GCCOPT    += $(call gcc_ok,-fcommon)
+ 
+ LIBGCC    := $(shell $(CC) $(GCCOPT) --print-libgcc)
+ 
+diff --git a/mk/lib.mk b/mk/lib.mk
+index 54f1fd5..baad194 100644
+--- a/mk/lib.mk
++++ b/mk/lib.mk
+@@ -28,6 +28,7 @@ GCCOPT += $(call gcc_ok,-falign-functions=0,-malign-functions=0)
+ GCCOPT += $(call gcc_ok,-falign-jumps=0,-malign-jumps=0)
+ GCCOPT += $(call gcc_ok,-falign-labels=0,-malign-labels=0)
+ GCCOPT += $(call gcc_ok,-falign-loops=0,-malign-loops=0)
++GCCOPT += $(call gcc_ok,-fcommon)
+ 
+ INCLUDE	= -I$(SRC)
+ STRIP	= strip --strip-all -R .comment -R .note
+-- 
+2.27.0
+

syslinux.spec

@@ -2,7 +2,7 @@
 
 Name:           syslinux
 Version:        6.04
-Release:        9
+Release:        14
 License:        GPLv2+
 Summary:        The Syslinux boot loader collection
 URL:            http://syslinux.zytor.com/wiki/index.php/The_Syslinux_Project
@@ -25,6 +25,9 @@ Patch0003:      0003-include-sysmacros-h.patch
 
 Patch0004:      backport-replace-builtin-strlen-that-appears-to-get-optimized.patch
 Patch0005:      backport-add-RPMOPTFLAGS-to-CFLAGS-for-some-stuff.patch
+Patch0006:      backport-tweak-for-gcc-10.patch
+Patch0007:      backport-zlib-update.patch
+Patch0008:      backport-libpng-update-to-1.6.36.patch
 
 %description
 The Syslinux Project covers lightweight bootloaders for MS-DOS FAT filesystems (SYSLINUX),
@@ -120,7 +123,7 @@ fi
 %files
 %doc COPYING NEWS README*
 %doc doc/* sample
-%{_mandir}/man1/{gethostip*,syslinux*,extlinux*,isohybrid*,memdiskfind*}
+%{_mandir}/man1/{gethostip*,extlinux*,isohybrid*,memdiskfind*,syslinux.1.gz}
 %{_datadir}/doc/syslinux/sample/sample.msg 
 %{_bindir}/{gethostip,isohybrid,memdiskfind,syslinux}
 %dir %{_datadir}/syslinux/dosutil
@@ -159,28 +162,45 @@ fi
 %{_datadir}/syslinux/efi64
 
 %changelog
-* Mon Sep 6 2021 yangcheng<yangcheng87@huawei.com> - 6.04-9  
+* Thu Aug 29 2024 lingsheng <lingsheng1@h-partners.com> - 6.04-14
+- update libpng 1.6.36 to fix CVE-2011-2501 CVE-2011-2690 CVE-2011-2691
+- CVE-2011-2692 CVE-2011-3045 CVE-2011-3048 CVE-2012-3425 CVE-2015-7981
+- CVE-2015-8126 CVE-2015-8472 CVE-2015-8540 CVE-2016-10087 CVE-2017-12652
+
+* Thu Aug 29 2024 lingsheng <lingsheng1@h-partners.com> - 6.04-13
+- Clean changelog format, fix bogus date
+
+* Tue Jul 11 2023 zhangpan <zhangpan103@h-partners.com> - 6.04-12
+- fix CVE-2016-9840 CVE-2016-9841 CVE-2016-9842 CVE-2016-9843
+
+* Sat May 07 2022 wangkerong <wangkerong@h-partners.com> - 6.04-11
+- slove duplicate package files
+
+* Mon Sep 6 2021 yangcheng <yangcheng87@huawei.com> - 6.04-10
+- fix build failed due to gcc-10
+
+* Mon Sep 6 2021 yangcheng <yangcheng87@huawei.com> - 6.04-9
 - Streamline the build dependency and fix the compiling stuck
 
-* Sat Jul 16 2021 hanhui<hanhui15@huawei.com> - 6.04-8
+* Fri Jul 16 2021 hanhui <hanhui15@huawei.com> - 6.04-8
 - solves the problem of compiling stuck
 
-* Sat Mar 20 2021 hanhui<hanhui15@huawei.com> - 6.04-7
+* Sat Mar 20 2021 hanhui <hanhui15@huawei.com> - 6.04-7
 - slove the problem of security scanning of options
 
-* Sun Feb 7 2021 jinzhimin<jinzhimin2@huawei.com> - 6.04-6
+* Sun Feb 7 2021 jinzhimin <jinzhimin2@huawei.com> - 6.04-6
 - add patch to replace builtin strlen
 
-* Mon Mar 2 2020 songnannan<songnannan2@huawei.com> -6.04-5
+* Mon Mar 2 2020 songnannan <songnannan2@huawei.com> - 6.04-5
 - change the path of file
 
-* Mon Mar 2 2020 songnannan<songnannan2@huawei.com> - 6.04-4 
+* Mon Mar 2 2020 songnannan <songnannan2@huawei.com> - 6.04-4
 - change files
 
-* Mon Mar 2 2020 songnannan<songnannan2@huawei.com> - 6.04-3
+* Mon Mar 2 2020 songnannan <songnannan2@huawei.com> - 6.04-3
 - add sample.msg file to help package
 
-* Mon Mar 2 2020 songnannan<songnannan2@huawei.com> - 6.04-2
+* Mon Mar 2 2020 songnannan <songnannan2@huawei.com> - 6.04-2
 - change the mingw64-gcc to gcc in buildrequires
 
 * Thu Feb 27 2020 Ling Yang <lingyang2@huawei.com> - 6.04-1