开源软件构建与测试

We truncated the diff of some files because they were too big. If you want to see the full diff for every file, click here.

Changes of Revision 2

_service:tar_scm:ncurses.spec Changed

@@ -1,6 +1,6 @@
 Name:          ncurses
-Version:       6.3
-Release:       4
+Version:       6.4
+Release:       2
 Summary:       Terminal control library
 License:       MIT
 URL:           https://invisible-island.net/ncurses/ncurses.html
@@ -10,9 +10,8 @@
 Patch9:        ncurses-libs.patch
 Patch11:       ncurses-urxvt.patch
 Patch12:       ncurses-kbs.patch
-Patch13:       backport-CVE-2022-29458.patch
 
-BuildRequires: gcc gcc-c++ gpm-devel pkgconfig
+BuildRequires: make gcc gcc-c++ gpm-devel pkgconfig
 
 Requires:      %{name}-base = %{version}-%{release}
 Requires:      %{name}-libs = %{version}-%{release}
@@ -49,8 +48,6 @@
 Requires:      %{name}-libs = %{version}-%{release}
 Requires:      %{name}-c++-libs = %{version}-%{release}
 Requires:      pkgconfig
-Provides:      %{name}-static = %{version}-%{release}
-Obsoletes:     %{name}-static < %{version}-%{release}
 Provides:      libtermcap-devel = 2.0.8-48
 Obsoletes:     libtermcap-devel < 2.0.8-48
 
@@ -74,6 +71,13 @@
 This package contains the ABI version 5 of the ncurses libraries for
 compatibility.
 
+%package static
+Summary: Static libraries for the ncurses library
+Requires: %{name}-devel = %{version}-%{release}
+ 
+%description static
+The ncurses-static package includes static libraries of the ncurses library.
+
 %package       help
 Summary: Ncurse help document
 Requires: %{name} = %{version}-%{release}
@@ -98,7 +102,11 @@
     --with-shared \
     --with-terminfo-dirs=%{_sysconfdir}/terminfo:%{_datadir}/terminfo \
     --with-termlib=tinfo --with-ticlib=tic --with-xterm-kbs=DEL \
-    --without-ada"
+    --without-ada \
+    %if 0%{?build_cross} == 1
+    --with-build-cc=/usr/bin/gcc \
+    %endif
+    "
 abi5_options="--with-chtype=long"
 
 for abi in 5 6; do
@@ -116,8 +124,8 @@
              $progs = yes  || echo --without-progs
         )
 
-        make %{?_smp_mflags} libs
-         $progs = yes  && make %{?_smp_mflags} -C progs
+        %make_build libs
+         $progs = yes  && %make_build -C progs
 
         popd
     done
@@ -197,7 +205,6 @@
 %files -f terms.term
 %doc ANNOUNCE AUTHORS
 %doc c++/README*
-%{!?_licensedir:%global license %%doc}
 %license COPYING
 %{_bindir}/cirt*
 %{_libdir}/libncurses++*.so.6*
@@ -214,7 +221,6 @@
 %files devel
 %{_bindir}/ncurses*-config
 %{_libdir}/lib*.so
-%{_libdir}/lib*.a
 %{_libdir}/pkgconfig/*.pc
 %{_includedir}/ncurses/*.h
 %{_includedir}/ncursesw/*.h
@@ -223,6 +229,9 @@
 %files compat-libs
 %{_libdir}/lib*.so.5*
 
+%files static
+%{_libdir}/lib*.a
+
 %files help
 %doc NEWS.xz README TO-DO
 %doc doc/html/hackguide.html
@@ -235,6 +244,24 @@
 %{_mandir}/man7/*
 
 %changelog
+* Tue Feb 28 2023 zhujunhao <zhujunhao11@huawei.com> - 6.4-2
+- Type:requirement
+- CVE:NA
+- SUG:NA
+- DESC:add options for cross build
+
+* Thu Feb 02 2023 yanglu <yanglu72@h-partners.com> - 6.4-1
+- Type:requirement
+- CVE:NA
+- SUG:NA
+- DESC:update ncurses version to 6.4
+
+* Thu Nov 10 2022 yanglu <yanglu72@h-partners.com> - 6.3-5
+- Type:bugfix
+- CVE:NA
+- SUG:NA
+- DESC:split static from ncurses-devel
+
 * Thu Jun 16 2022 yanglu <yanglu72@h-partners.com> - 6.3-4
 - Type:bugfix
 - CVE:NA

_service:tar_scm:backport-CVE-2022-29458.patch Deleted

@@ -1,81 +0,0 @@
-From 4c9f63c460cb7134f142aa65f6866c175ed77605 Mon Sep 17 00:00:00 2001
-From: "Thomas E. Dickey" <dickey@invisible-island.net>
-Date: Sun, 17 Apr 2022 00:27:48 +0000
-Subject: PATCH ncurses 6.3 - patch 20220416
-
- ncurses/tinfo/alloc_entry.c           |   12 +-
- ncurses/tinfo/read_entry.c            |   21 +-
- 2 files changed, 19 insertions(+), 8 deletions(-)
-
-diff --git a/ncurses/tinfo/alloc_entry.c b/ncurses/tinfo/alloc_entry.c
-index 0bc93942c..aed739436 100644
---- a/ncurses/tinfo/alloc_entry.c
-+++ b/ncurses/tinfo/alloc_entry.c
-@@ -48,8 +48,6 @@
- #define ABSENT_OFFSET    -1
- #define CANCELLED_OFFSET -2
- 
--#define MAX_STRTAB	4096	/* documented maximum entry size */
--
- static char *stringbuf;		/* buffer for string capabilities */
- static size_t next_free;	/* next free character in stringbuf */
- 
-@@ -74,7 +72,7 @@ _nc_init_entry(ENTRY * const tp)
- #endif
- 
-     if (stringbuf == 0)
--	TYPE_MALLOC(char, (size_t) MAX_STRTAB, stringbuf);
-+	TYPE_MALLOC(char, (size_t) MAX_ENTRY_SIZE, stringbuf);
- 
-     next_free = 0;
- 
-@@ -111,11 +109,11 @@ _nc_save_str(const char *string)
- 	 * Cheat a little by making an empty string point to the end of the
- 	 * previous string.
- 	 */
--	if (next_free < MAX_STRTAB) {
-+	if (next_free < MAX_ENTRY_SIZE) {
- 	    result = (stringbuf + next_free - 1);
- 	}
--    } else if (next_free + len < MAX_STRTAB) {
--	_nc_STRCPY(&stringbufnext_free, string, MAX_STRTAB);
-+    } else if (next_free + len < MAX_ENTRY_SIZE) {
-+	_nc_STRCPY(&stringbufnext_free, string, MAX_ENTRY_SIZE);
- 	DEBUG(7, ("Saved string %s", _nc_visbuf(string)));
- 	DEBUG(7, ("at location %d", (int) next_free));
- 	next_free += len;
-diff --git a/ncurses/tinfo/read_entry.c b/ncurses/tinfo/read_entry.c
-index 41ef0d0aa..66e3d31ee 100644
---- a/ncurses/tinfo/read_entry.c
-+++ b/ncurses/tinfo/read_entry.c
-@@ -145,6 +145,7 @@ convert_strings(char *buf, char **Strings, int count, int size, char *table)
- {
-     int i;
-     char *p;
-+    bool corrupt = FALSE;
- 
-     for (i = 0; i < count; i++) {
- 	if (IS_NEG1(buf + 2 * i)) {
-@@ -154,8 +155,20 @@ convert_strings(char *buf, char **Strings, int count, int size, char *table)
- 	} else if (MyNumber(buf + 2 * i) > size) {
- 	    Stringsi = ABSENT_STRING;
- 	} else {
--	    Stringsi = (MyNumber(buf + 2 * i) + table);
--	    TR(TRACE_DATABASE, ("Strings%d = %s", i, _nc_visbuf(Stringsi)));
-+	    int nn = MyNumber(buf + 2 * i);
-+	    if (nn >= 0 && nn < size) {
-+		Stringsi = (nn + table);
-+		TR(TRACE_DATABASE, ("Strings%d = %s", i,
-+				    _nc_visbuf(Stringsi)));
-+	    } else {
-+		if (!corrupt) {
-+		    corrupt = TRUE;
-+		    TR(TRACE_DATABASE,
-+		       ("ignore out-of-range index %d to Strings", nn));
-+		    _nc_warning("corrupt data found in convert_strings");
-+		}
-+		Stringsi = ABSENT_STRING;
-+	    }
- 	}
- 
- 	/* make sure all strings are NUL terminated */

_service:tar_scm:ncurses-config.patch Changed

_service:tar_scm:ncurses-kbs.patch Changed

@@ -1,26 +1,26 @@
 diff --git a/misc/terminfo.src b/misc/terminfo.src
-index 650428a..855e644 100644
+index 06d46f0..70e213e 100644
 --- a/misc/terminfo.src
 +++ b/misc/terminfo.src
-@@ -6425,7 +6425,7 @@ rxvt-basic|rxvt terminal base (X Window System),
+@@ -6698,7 +6698,7 @@ rxvt-basic|rxvt terminal base (X Window System),
  	enacs=\E(B\E)0, flash=\E?5h$<100/>\E?5l, home=\EH,
  	ht=^I, hts=\EH, ich=\E%p1%d@, il=\E%p1%dL, il1=\EL,
  	ind=\n, is1=\E?47l\E=\E?1l,
 -	is2=\Er\Em\E2J\EH\E?7h\E?1;3;4;6l\E4l, kbs=^H,
 +	is2=\Er\Em\E2J\EH\E?7h\E?1;3;4;6l\E4l,
  	kcbt=\EZ, kmous=\EM, rc=\E8, rev=\E7m, ri=\EM, rmacs=^O,
- 	rmcup=\E2J\E?47l\E8, rmir=\E4l, rmkx=\E>, rmso=\E27m,
- 	rmul=\E24m,
-@@ -6437,7 +6437,7 @@ rxvt-basic|rxvt terminal base (X Window System),
+ 	rmir=\E4l, rmkx=\E>, rmso=\E27m, rmul=\E24m,
+ 	rs1=\E>\E1;3;4;5;6l\E?7h\Em\Er\E2J\EH,
+@@ -6709,7 +6709,7 @@ rxvt-basic|rxvt terminal base (X Window System),
  	    %p9%t\016%e\017%;,
- 	sgr0=\E0m\017, smacs=^N, smcup=\E7\E?47h, smir=\E4h,
- 	smkx=\E=, smso=\E7m, smul=\E4m, tbc=\E3g, use=vt100+enq,
+ 	sgr0=\E0m\017, smacs=^N, smir=\E4h, smkx=\E=, smso=\E7m,
+ 	smul=\E4m, tbc=\E3g, use=xterm+alt47, use=vt100+enq,
 -	use=rxvt+pcfkeys, use=vt220+cvis, use=vt220+keypad,
 +	use=rxvt+pcfkeys, use=vt220+cvis, use=vt220+keypad, use=xterm+kbs,
  # Key Codes from rxvt reference:
  #
  # Note: Shift + F1-F10 generates F11-F20
-@@ -8074,7 +8074,7 @@ screen|VT 100/ANSI X3.64 virtual terminal,
+@@ -8361,7 +8361,7 @@ screen-base|VT 100/ANSI X3.64 virtual terminal (base),
  	dl=\E%p1%dM, dl1=\EM, ed=\EJ, el=\EK, el1=\E1K,
  	enacs=\E(B\E)0, flash=\Eg, home=\EH, hpa=\E%i%p1%dG,
  	ht=^I, hts=\EH, ich=\E%p1%d@, il=\E%p1%dL, il1=\EL,
@@ -29,15 +29,15 @@
  	kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, kf1=\EOP,
  	kf10=\E21~, kf11=\E23~, kf12=\E24~, kf2=\EOQ, kf3=\EOR,
  	kf4=\EOS, kf5=\E15~, kf6=\E17~, kf7=\E18~, kf8=\E19~,
-@@ -8087,6 +8087,7 @@ screen|VT 100/ANSI X3.64 virtual terminal,
+@@ -8374,6 +8374,7 @@ screen-base|VT 100/ANSI X3.64 virtual terminal (base),
  	smso=\E3m, smul=\E4m, tbc=\E3g, vpa=\E%i%p1%dd,
  	E0=\E(B, S0=\E(%p1%c, use=vt220+pcedit,
  	use=xterm+alt1049, use=ecma+color, use=vt100+enq,
 +	use=xterm+kbs,
- # The bce and status-line entries are from screen 3.9.13 (and require some
- # changes to .screenrc).
- screen-bce|VT 100/ANSI X3.64 virtual terminal with bce,
-@@ -8202,6 +8203,7 @@ screen.xterm-r6|screen customized for X11R6 xterm,
+ 
+ screen|VT 100/ANSI X3.64 virtual terminal,
+ 	use=screen4,
+@@ -8503,6 +8504,7 @@ screen.xterm-r6|screen customized for X11R6 xterm,
  # on Solaris because Sun's curses implementation gets confused.
  screen.teraterm|disable ncv in teraterm,
  	ncv#127,
@@ -46,4 +46,5 @@
  	     \316j\331k\277l\332m\300n\305o~p\304q\304r\304s_t\303u
  	     \264v\301w\302x\263y\363z\362{\343|\330}\234~\376,
 -- 
-2.33.0
\ No newline at end of file
+2.39.1
+

_service Changed

_service:tar_scm:ncurses-6.3.tar.gz -> _service:tar_scm:ncurses-6.4.tar.gz Changed