diff --git a/ncurses-6.4-makeuseof_secure_open.dif b/ncurses-6.4-makeuseof_secure_open.dif deleted file mode 100644 index ba9764c..0000000 --- a/ncurses-6.4-makeuseof_secure_open.dif +++ /dev/null @@ -1,15 +0,0 @@ ---- - include/nc_access.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- include/nc_access.h -+++ include/nc_access.h 2023-05-02 07:38:17.837330114 +0000 -@@ -64,7 +64,7 @@ extern NCURSES_EXPORT(int) _nc_env_acces - #else - - #define safe_fopen(name,mode) _nc_safe_fopen(name,mode) --#define safe_open2(name,flags) _nc_safe_open2(name,flags,0) -+#define safe_open2(name,flags) _nc_safe_open3(name,flags,0) - #define safe_open3(name,flags,mode) _nc_safe_open3(name,flags,mode) - extern NCURSES_EXPORT(FILE *) _nc_safe_fopen (const char *, const char *); - extern NCURSES_EXPORT(int) _nc_safe_open3 (const char *, int, mode_t); diff --git a/ncurses-6.4-patches.tar.bz2 b/ncurses-6.4-patches.tar.bz2 index fc63a9b..deb4b76 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:b4a58a90340459329eb97ac6e72c827bf8ed4dc38742fee24f7e016d1fcb44ad -size 637246 +oid sha256:970c62c14e2ab2cd633b98a5fba32f6ca971be82cdcccdd12c5bb8fa9e1fda3a +size 676686 diff --git a/ncurses-6.4.dif b/ncurses-6.4.dif index 772b51e..16ba079 100644 --- a/ncurses-6.4.dif +++ b/ncurses-6.4.dif @@ -139,7 +139,7 @@ done --- configure +++ configure 2023-04-24 06:52:13.042243156 +0000 -@@ -6437,7 +6437,7 @@ echo $ECHO_N "checking for an rpath opti +@@ -6438,7 +6438,7 @@ echo $ECHO_N "checking for an rpath opti fi ;; (linux*|gnu*|k*bsd*-gnu|freebsd*) @@ -148,7 +148,7 @@ ;; (openbsd[2-9].*|mirbsd*) LD_RPATH_OPT="-Wl,-rpath," -@@ -6810,8 +6810,8 @@ echo "${ECHO_T}$cf_cv_ldflags_search_pat +@@ -6811,8 +6811,8 @@ echo "${ECHO_T}$cf_cv_ldflags_search_pat else cf_cv_shared_soname='`basename $@`' fi @@ -159,7 +159,7 @@ ;; (mingw*msvc*) cf_cv_shlib_version=msvcdll -@@ -8050,7 +8050,7 @@ echo "${ECHO_T}$with_pcre2" >&6 +@@ -8051,7 +8051,7 @@ echo "${ECHO_T}$with_pcre2" >&6 if test "x$with_pcre2" != xno ; then cf_with_pcre2_ok=no @@ -168,7 +168,7 @@ do if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "$cf_with_pcre2"; then -@@ -15236,12 +15236,15 @@ cat >>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <\$TMP CF_EOF if test -n "$cf_manpage_compress" ; then -@@ -15366,9 +15369,9 @@ cat >>$cf_edit_man <>$cf_edit_man <>$cf_edit_man <>$cf_edit_man < + +- Add ncurses patch 20230506 + > build-fixes related to configure-options and/or platform: + + fix for --enable-fvisibility + + fix for unusual values of --with-rel-version + + fix for unusual values of --with-abi-version + + fix for --disable-tcap-names + + fix for termcap in nc_access.h (report by Werner Fink). +- Delete patch ncurses-6.4-makeuseof_secure_open.dif as now upstream + ------------------------------------------------------------------- Wed May 3 08:47:27 UTC 2023 - Dr. Werner Fink diff --git a/ncurses.spec b/ncurses.spec index dc9305f..4d8cae6 100644 --- a/ncurses.spec +++ b/ncurses.spec @@ -100,7 +100,6 @@ Patch0: ncurses-6.4.dif Patch1: ncurses-5.9-ibm327x.dif Patch2: ncurses-5.7-tack.dif Patch3: FORTIFY_SOURCE_3-fix.patch -Patch4: ncurses-6.4-makeuseof_secure_open.dif BuildRoot: %{_tmppath}/%{name}-%{version}-build %global _miscdir %{_datadir}/misc %global _incdir %{_includedir} @@ -353,7 +352,6 @@ rm -fr tack mv tack-* tack %patch1 -p0 -b .327x %patch2 -p0 -b .hs -%patch4 -p0 %patch0 -p0 -b .p0 %patch3 -p1