From 8425aa0e6f4bdf1e3238990ee936743b484a3d03 Mon Sep 17 00:00:00 2001 From: starlet-dx <15929766099@163.com> Date: Mon, 1 Apr 2024 15:57:18 +0800 Subject: [PATCH] Sync code --- yasm-1.3.0-sw.patch | 49 +++++++++++++++++++++++++++++++++++++++++++++ yasm.spec | 16 +++++++++------ 2 files changed, 59 insertions(+), 6 deletions(-) create mode 100755 yasm-1.3.0-sw.patch diff --git a/yasm-1.3.0-sw.patch b/yasm-1.3.0-sw.patch new file mode 100755 index 0000000..515ee60 --- /dev/null +++ b/yasm-1.3.0-sw.patch @@ -0,0 +1,49 @@ +diff -Nuar yasm-1.3.0.org/configure yasm-1.3.0.sw/configure +--- yasm-1.3.0.org/configure 2022-05-26 14:47:18.140000000 +0000 ++++ yasm-1.3.0.sw/configure 2022-05-26 14:50:16.340000000 +0000 +@@ -10262,7 +10262,7 @@ + typedef unsigned long long uint64_t; + #endif + +-#elif defined __alpha || (defined __mips && defined _ABIN32) ++#elif defined __alpha || defined __sw_64 || (defined __mips && defined _ABIN32) + #if !defined _NO_LONGLONG + typedef long int64_t; + typedef unsigned long uint64_t; +diff -Nuar yasm-1.3.0.org/m4/ax_create_stdint_h.m4 yasm-1.3.0.sw/m4/ax_create_stdint_h.m4 +--- yasm-1.3.0.org/m4/ax_create_stdint_h.m4 2022-05-26 14:47:18.330000000 +0000 ++++ yasm-1.3.0.sw/m4/ax_create_stdint_h.m4 2022-05-26 14:47:53.800000000 +0000 +@@ -392,7 +392,7 @@ + typedef unsigned long long uint64_t; + #endif + +-#elif defined __alpha || (defined __mips && defined _ABIN32) ++#elif defined __alpha || defined _sw_64 || (defined __mips && defined _ABIN32) + #if !defined _NO_LONGLONG + typedef long int64_t; + typedef unsigned long uint64_t; +diff -Nuar yasm-1.3.0.org/m4/intdiv0.m4 yasm-1.3.0.sw/m4/intdiv0.m4 +--- yasm-1.3.0.org/m4/intdiv0.m4 2022-05-26 14:47:18.330000000 +0000 ++++ yasm-1.3.0.sw/m4/intdiv0.m4 2022-05-26 14:48:19.760000000 +0000 +@@ -54,7 +54,7 @@ + [ + # Guess based on the CPU. + case "$host_cpu" in +- alpha* | i[34567]86 | m68k | s390*) ++ alpha* | sw_64* | i[34567]86 | m68k | s390*) + gt_cv_int_divbyzero_sigfpe="guessing yes";; + *) + gt_cv_int_divbyzero_sigfpe="guessing no";; +diff -Nuar yasm-1.3.0.org/modules/objfmts/elf/elf.h yasm-1.3.0.sw/modules/objfmts/elf/elf.h +--- yasm-1.3.0.org/modules/objfmts/elf/elf.h 2022-05-26 14:47:18.250000000 +0000 ++++ yasm-1.3.0.sw/modules/objfmts/elf/elf.h 2022-05-26 14:56:18.410000000 +0000 +@@ -75,7 +75,8 @@ + EM_SPARCV9 = 43, /* SPARC v9 64-bit */ + EM_IA_64 = 50, /* Intel IA-64 */ + EM_X86_64 = 62, /* AMD x86-64 */ +- EM_ALPHA = 0x9026 /* Alpha (no ABI) */ ++ EM_ALPHA = 0x9026, /* Alpha (no ABI) */ ++ EM_SW_64 = 0x9916 /* Sw_64 (no ABI) */ + } elf_machine; + + typedef enum { diff --git a/yasm.spec b/yasm.spec index d5091e9..02654cc 100644 --- a/yasm.spec +++ b/yasm.spec @@ -1,17 +1,18 @@ Name: yasm Version: 1.3.0 -Release: 11 +Release: 12 Summary: NASM assembler License: BSD URL: http://yasm.tortall.net/ Source0: http://www.tortall.net/projects/yasm/releases/yasm-1.3.0.tar.gz +Patch1: yasm-1.3.0-sw.patch +Patch2: CVE-2023-37732.patch +Patch3: CVE-2023-31975.patch + BuildRequires: gcc bison byacc gettext-devel xmlto Provides: bundled(md5-plumb) -Patch1: CVE-2023-37732.patch -Patch2: CVE-2023-31975.patch - %description Yasm is a complete rewrite of the NASM assembler under the “new” BSD License. @@ -49,11 +50,14 @@ rm -rf %{buildroot} %{_mandir}/* %changelog -* Tue Aug 15 2023 liningjie - 1.3.0-11 +* Tue Aug 15 2023 liningjie - 1.3.0-12 - fix CVE-2023-31975 -* Fri Aug 11 2023 liningjie - 1.3.0-10 +* Fri Aug 11 2023 liningjie - 1.3.0-11 - fix CVE-2023-37732 +* Wed Oct 26 2022 wuzx - 1.3.0-10 +- Add sw64 architecture + * Mon Jan 6 2020 qinjian - 1.3.0-9 - Package init -- Gitee