diff --git a/ncurses-add-sw.patch b/ncurses-add-sw.patch new file mode 100644 index 0000000000000000000000000000000000000000..649c526fc7064bf0fff31ed1e25c1476725fca7d --- /dev/null +++ b/ncurses-add-sw.patch @@ -0,0 +1,53 @@ +From ad7e4be5c0a098bced266ab6fea6eef207fca00d Mon Sep 17 00:00:00 2001 +From: wxiat +Date: Mon, 17 Jul 2023 14:08:46 +0800 +Subject: [PATCH] add sw + +Signed-off-by: wxiat +--- + config.guess | 8 ++++++++ + config.sub | 2 ++ + 2 files changed, 10 insertions(+) + +diff --git a/config.guess b/config.guess +index 31e01ef..3eb10f9 100755 +--- a/config.guess ++++ b/config.guess +@@ -894,6 +894,14 @@ EOF + UNAME_MACHINE=aarch64_be + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; ++ sw_64:Linux:*:*) ++ case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in ++ sw) UNAME_MACHINE=sw_64 ;; ++ esac ++ objdump --private-headers /bin/sh | grep -q ld.so.1 ++ if test "$?" = 0 ; then LIBC=gnulibc1 ; fi ++ echo ${UNAME_MACHINE}-sunway-linux-${LIBC} ++ exit ;; + alpha:Linux:*:*) + case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in + EV5) UNAME_MACHINE=alphaev5 ;; +diff --git a/config.sub b/config.sub +index 00f68b8..c6e1e1e 100755 +--- a/config.sub ++++ b/config.sub +@@ -245,6 +245,7 @@ case $basic_machine in + 1750a | 580 \ + | a29k \ + | aarch64 | aarch64_be \ ++ | sw_64 \ + | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ + | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ + | am33_2.0 \ +@@ -369,6 +370,7 @@ case $basic_machine in + 580-* \ + | a29k-* \ + | aarch64-* | aarch64_be-* \ ++ | sw_64-* \ + | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ + | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ + | alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \ +-- +2.31.1 + diff --git a/ncurses.spec b/ncurses.spec index 7a2d64b3a1451ebc77f7807f745044e52cfa3ac6..0dbf71367134c46fb51d90316079d6cd386a0b5c 100644 --- a/ncurses.spec +++ b/ncurses.spec @@ -1,4 +1,4 @@ -%define anolis_release .0.1 +%define anolis_release .0.2 %global revision 20180224 Summary: Ncurses support utilities Name: ncurses @@ -18,6 +18,9 @@ Patch13: ncurses-cve-2019-17594.patch Patch14: ncurses-cve-2019-17595.patch Patch15: ncurses-tputx.patch Patch16: ncurses-cve-2023-29491.patch + +Patch1000: ncurses-add-sw.patch + BuildRequires: gcc gcc-c++ gpm-devel pkgconfig Requires: %{name}-libs%{?_isa} = %{version}-%{release} @@ -137,6 +140,8 @@ The ncurses-static package includes static libraries of the ncurses library. %patch15 -p1 -b .tputx %patch16 -p1 -b .cve-2023-29491 +%patch1000 -p1 + for f in ANNOUNCE; do iconv -f iso8859-1 -t utf8 -o ${f}{_,} && touch -r ${f}{,_} && mv -f ${f}{_,} @@ -306,6 +311,9 @@ bzip2 NEWS %{_libdir}/lib*.a %changelog +* Wed Mar 20 2024 wxiat - 6.1-10.20180224.0.2 +- cherry-pick `add sw arch #d07c94b920e4383d4efa2430dfdddbb05c7f75e8`. + * Wed Sep 20 2023 Wang Kaiqiang - 6.1-10.20180224.0.1 - Add judgment criteria (CVE-2023-29491)