diff --git a/get_version_number.sh b/get_version_number.sh index 26f2b51..17fba41 100644 --- a/get_version_number.sh +++ b/get_version_number.sh @@ -10,6 +10,6 @@ test -e ${sourcedir}/ncurses-${version}-patches.tar.bz2 || echo ${last[2]} tar --wildcards -tf ${sourcedir}/ncurses-${version}-patches.tar.bz2 '*/*.patch' &> /dev/null || echo ${last[2]} OFS="$IFS" IFS=- -last=($(tar -tf ${sourcedir}/ncurses-${version}-patches.tar.bz2 | sed -r 's@\.patch$@@'| sort -t '-' -k 3,3 -n | tail -n 1)) +last=($(tar -tf ${sourcedir}/ncurses-${version}-patches.tar.bz2 | grep -v 'gz.asc' | sed -r 's@\.patch$@@'| sort -t '-' -k 3,3 -n | tail -n 1)) IFS="$OFS" echo ${last[2]} diff --git a/ncurses-6.4-patches.tar.bz2 b/ncurses-6.4-patches.tar.bz2 index 9800a9a..7851e82 100644 --- a/ncurses-6.4-patches.tar.bz2 +++ b/ncurses-6.4-patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9e3357981055850fe671017487d1be06bdf141cc3a2a4d3e6b586584afeee0ce -size 505925 +oid sha256:10e3f68a2278238977619b02d30b1dd23903cb6ab03ab0fe5fd3979a04851d3f +size 550221 diff --git a/ncurses-6.4.dif b/ncurses-6.4.dif index 7167e1d..94229bf 100644 --- a/ncurses-6.4.dif +++ b/ncurses-6.4.dif @@ -806,12 +806,12 @@ --- test/test.priv.h +++ test/test.priv.h 2023-01-23 13:00:47.043268809 +0000 -@@ -1132,12 +1132,12 @@ extern char *_nc_strstr(const char *, co +@@ -1135,12 +1135,12 @@ extern char *_nc_strstr(const char *, co #endif /* out-of-band values for representing absent capabilities */ -#define ABSENT_BOOLEAN ((signed char)-1) /* 255 */ -+#define ABSENT_BOOLEAN (char)-1) /* 255 */ ++#define ABSENT_BOOLEAN ((char)-1) /* 255 */ #define ABSENT_NUMERIC (-1) #define ABSENT_STRING (char *)0 diff --git a/ncurses.changes b/ncurses.changes index 59782ef..51bbe11 100644 --- a/ncurses.changes +++ b/ncurses.changes @@ -1,7 +1,43 @@ +------------------------------------------------------------------- +Wed Apr 19 09:16:10 UTC 2023 - Dr. Werner Fink + +- Fix get_version_number.sh to show version without suffix gz.asc + +------------------------------------------------------------------- +Wed Apr 19 07:39:41 UTC 2023 - Dr. Werner Fink + +- Add ncurses patch 20230418 (boo#1210485, (boo#1210434) + + improve checks for limits on privileged execution: + + modify _nc_syserr_abort() to use _nc_env_access(), rather than + only checking root uid. + + use getauxval() when available, to improve setuid/setgid checks. + + modify test packages to disable root access/environ options. + + modify tgoto() to accept no-parameter capabilities, for joe editor + (OpenSUSE #1210485, Gentoo #904263). + +------------------------------------------------------------------- +Tue Apr 18 09:01:36 UTC 2023 - Dr. Werner Fink + +- Add signatures of the patches as well in patch tar ball + +------------------------------------------------------------------- +Mon Apr 17 06:14:32 UTC 2023 - Dr. Werner Fink + +- Add ncurses patch 20230415 (boo#1210485) + + configure script fixes: + + fix copy/paste error in configure option --disable-root-access + (report/patch by Sven Joachim). + + modify CF_XOPEN_SOURCE macro's amend default case to avoid + undefining _XOPEN_SOURCE if _POSIX_C_SOURCE is defined. + + modify test_tparm to account for extended capabilities. + + add checks in tparm() and tiparm() for misuse of numeric parameters, + overlooked in 20230408. + + fix errata in clear.1 and curs_terminfo.3x + ------------------------------------------------------------------- Tue Apr 11 09:24:59 UTC 2023 - Dr. Werner Fink -- Add ncurses patch 20230408 +- Add ncurses patch 20230408 (boo#1210434) + document limitations of tparm, and error-returns in curs_terminfo.3x + document limitations of tgoto, and error-returns in curs_termcap.3x + add xterm+focus to alacritty+common (patch by Christian Duerr). diff --git a/ncurses.spec b/ncurses.spec index d6d26c6..4a1c5e2 100644 --- a/ncurses.spec +++ b/ncurses.spec @@ -330,22 +330,22 @@ timings needed to ensure that screen updates do not fall behind the incoming data stream. %prep -%setup -q -n %{name}-%{basevers} -tar -xjf %{S:1} +%setup -q -n %{name}-%{basevers} -b1 -a5 set +x -for patch in patches/ncurses*.patch +for patch in ../patches/ncurses*.patch do test -e "$patch" || continue echo Apply patch: $patch patch -f -T -p1 -s < $patch done set -x -rm -rf patches/ +%if ! %{defined donttouch} +rm -rf ../patches/ +%endif find -name '*.orig' -delete # replace tack from ncurses tarball with the latest version in # separate tarball rm -fr tack -tar -xzf %{S:5} mv tack-* tack %patch1 -p0 -b .327x %patch2 -p0 -b .hs