From bed152ba1fc2f1316eaefb5c3d24d48195560f76 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 23 Nov 2022 07:07:57 +0000 Subject: gentoo auto-resync : 23:11:2022 - 07:07:57 --- net-ftp/Manifest.gz | Bin 3341 -> 3339 bytes net-ftp/proftpd/Manifest | 3 - .../proftpd/files/proftpd-1.3.7a-no-ncurses.patch | 269 --------------------- .../proftpd/files/proftpd-1.3.7a-slibtool.patch | 34 --- .../proftpd/files/proftpd-1.3.7a-tinfow-segv.patch | 197 --------------- 5 files changed, 503 deletions(-) delete mode 100644 net-ftp/proftpd/files/proftpd-1.3.7a-no-ncurses.patch delete mode 100644 net-ftp/proftpd/files/proftpd-1.3.7a-slibtool.patch delete mode 100644 net-ftp/proftpd/files/proftpd-1.3.7a-tinfow-segv.patch (limited to 'net-ftp') diff --git a/net-ftp/Manifest.gz b/net-ftp/Manifest.gz index 7eac378cf321..6734e8981ecb 100644 Binary files a/net-ftp/Manifest.gz and b/net-ftp/Manifest.gz differ diff --git a/net-ftp/proftpd/Manifest b/net-ftp/proftpd/Manifest index 51b424f15f65..9d0ac8a0f452 100644 --- a/net-ftp/proftpd/Manifest +++ b/net-ftp/proftpd/Manifest @@ -3,9 +3,6 @@ AUX proftpd-1.3.6_rc4-diskuse-refresh-api.patch 576 BLAKE2B ce4522896a81fed326ae AUX proftpd-1.3.6_rc4-gss-refresh-api.patch 1868 BLAKE2B ff50d3834d6cc0970256dcada8a14db6681440494abc24ccbf53ea5baef2362a9174de3bf7e3e07d562f30a55492735137efa91a9dd09676dbb95e624f3ae77f SHA512 4cc235bdb60ea4c84794d4347826b040057067d8283dcfcb795d5d25a156de480df7d897078ab8ab4faf12d4fc9e714a55f723ce27c9397bc2223550597df674 AUX proftpd-1.3.6_rc4-msg-refresh-api.patch 903 BLAKE2B e335f81685552b0b9a05af3700ce4a09d7f31ca9b24c66e1a1306bbe26c243b553c1cb81c13cc9593ae36e93b03f28faeb64fe2ae2f834575e9dee402f73ee55 SHA512 d0dcc467289b4107aecee66edf122667b2fbb9b1f1a6a6ecea517f286090d22682200b9d11f503465cb9b5387e8fb749cc09c3033825282450fe1d6c0a4bb11d AUX proftpd-1.3.6_rc4-vroot-refresh-api.patch 736 BLAKE2B 9f3c4a1f80a27ce7e6f9348153584bc1134e63ad4c839927b7680439966003c76c7a25821be0f3431c472092ef5c8386166b372645f498fb655559fd683c3e6e SHA512 9cd98e2fb8c17d2ca38f5f7a20f5c6ffb03da7f51e53542237992bd2b98b2ef5b5fc0634cd7f5eef24fba8a601703b70ff7d0404e1c5103394e9fda260b815cd -AUX proftpd-1.3.7a-no-ncurses.patch 7787 BLAKE2B 0122a91623bb9a3207a5eb9f53767e555f08810eaa9b0a97585725345dfe1798174c8534d72fbaab1aa8259a66e74bd972a38243064c2e5c7c4d9f986eb13a06 SHA512 061e1692304856136763478aea35d0668216dba07450b6b87af51d2464857f62df25e92173a9e889065b2f5f9e6b960433d591ecf1649735b36fd97be9de947d -AUX proftpd-1.3.7a-slibtool.patch 1183 BLAKE2B 4ae52ed9cd0e3ed8a1627a06ac8d3f9cd098d2c1c2761da04888b7162b6df5250a55b7d83cfa7f643449f664706b9999b6734cabe776a106bb5f3bb4bf96175f SHA512 4d363488e12a0f691272303f09271c862d28eefe5189a9a8a0e9ec725fd788f0e40bbe021efa281eefcba351d08809b17d581b2868015d9e5a5b52292bb3972f -AUX proftpd-1.3.7a-tinfow-segv.patch 5918 BLAKE2B 526e3e83c946e61445f32281054a768fe9eca5027c49d2f9e915810f15c4ac3a16b53de6e16886a52fc3d891fda4882ef74df1f0fc8c4774e8bac35f50ff6adb SHA512 688a0f4e79ff9089329e56f0dffffa346152f5508e1bc403ef11fb65c117403ab74660f5bc2719939f88df70518f34f7eb8f69735cb9a8a28ec0906b73a516d6 AUX proftpd-tmpfiles.d.conf 34 BLAKE2B 03da2e04c7e0d4c6e889e4414a205942f0762a1ae856d16f95abb1d2e927d68f583ad5bbdbf142b32b141cd82e9288f2ef1faf459cbe8433e2e1127d3b30d686 SHA512 aa6ffbf15e4275941837306259fb426608e82e45a2da4b99c5d7778d11b8c9341e3a12ae9b751d0e173635239b6f1b20f0431be17296c005a83525a48327fa52 AUX proftpd-tmpfiles.d.conf-r1 30 BLAKE2B 0eb931370872ef78732d23179f20a3fe1289f8e601478c1b4709755748416f9283cdadcb2c43765019a9f6b5407e7c9db1aba8b1c1524db1e702b52898aa7602 SHA512 c85a6bc1375ebb44d88114c5c6f46d9c2e207e9d9555d9dc599f69a6485e2d5b2a161ac151f8b9e76f8e385f9dc3b811128db68f5d45648d960c8e8fbeb0050b AUX proftpd.conf.sample 1275 BLAKE2B db10306f79544b344856e065946e9ae0fa37d43507185f7d2407f23a962750a05bb2682e7c97e3979ca42dfe35921c3db7e98c095431796d82144869df0e324e SHA512 1c26f3e98ed07d89192c640f7823af168c045abee6ab076791aee9d50be5446be870a189979df4b828e7ae907dd40a346f1b92998fa39195195bfada4061c5df diff --git a/net-ftp/proftpd/files/proftpd-1.3.7a-no-ncurses.patch b/net-ftp/proftpd/files/proftpd-1.3.7a-no-ncurses.patch deleted file mode 100644 index be18a9954590..000000000000 --- a/net-ftp/proftpd/files/proftpd-1.3.7a-no-ncurses.patch +++ /dev/null @@ -1,269 +0,0 @@ -https://github.com/proftpd/proftpd/commit/8fc570bc13e771d3ecafe53ab94ada0be2b6646a -https://bugs.gentoo.org/777531 - -From 8fc570bc13e771d3ecafe53ab94ada0be2b6646a Mon Sep 17 00:00:00 2001 -From: TJ Saunders -Date: Tue, 23 Mar 2021 19:50:49 -0700 -Subject: [PATCH] Issue #1207: Properly honor the `--disable-curses`, - `--disable-ncurses` configure options. - ---- - configure | 156 +++++++++++++++++++++++++++++++++++++++++++++++---- - configure.in | 39 +++++++++---- - 2 files changed, 172 insertions(+), 23 deletions(-) - -diff --git a/configure b/configure -index 86cf1360e..59df363fa 100755 ---- a/configure -+++ b/configure -@@ -22970,7 +22970,7 @@ $as_echo "#define SETGRENT_VOID 1" >>confdefs.h - fi - - --if test x"$ac_cv_header_curses_h" = xyes; then -+if test x"$enable_curses" != xno ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for initscr in -lcurses" >&5 - $as_echo_n "checking for initscr in -lcurses... " >&6; } - if ${ac_cv_lib_curses_initscr+:} false; then : -@@ -23013,12 +23013,154 @@ if test "x$ac_cv_lib_curses_initscr" = xyes; then : - $as_echo "#define HAVE_LIBCURSES 1" >>confdefs.h - - -+$as_echo "#define PR_USE_CURSES 1" >>confdefs.h -+ -+ - fi - -+ -+ if test x"$enable_nls" = xyes ; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for halfdelay in -ltinfow" >&5 -+$as_echo_n "checking for halfdelay in -ltinfow... " >&6; } -+if ${ac_cv_lib_tinfow_halfdelay+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ ac_check_lib_save_LIBS=$LIBS -+LIBS="-ltinfow $LIBS" -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char halfdelay (); -+int -+main () -+{ -+return halfdelay (); -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_link "$LINENO"; then : -+ ac_cv_lib_tinfow_halfdelay=yes -+else -+ ac_cv_lib_tinfow_halfdelay=no -+fi -+rm -f core conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext -+LIBS=$ac_check_lib_save_LIBS - fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_tinfow_halfdelay" >&5 -+$as_echo "$ac_cv_lib_tinfow_halfdelay" >&6; } -+if test "x$ac_cv_lib_tinfow_halfdelay" = xyes; then : -+ UTILS_LIBS="$UTILS_LIBS -ltinfow" -+ -+$as_echo "#define HAVE_LIBTINFOW 1" >>confdefs.h -+ -+ -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for halfdelay in -ltinfo" >&5 -+$as_echo_n "checking for halfdelay in -ltinfo... " >&6; } -+if ${ac_cv_lib_tinfo_halfdelay+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ ac_check_lib_save_LIBS=$LIBS -+LIBS="-ltinfo $LIBS" -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char halfdelay (); -+int -+main () -+{ -+return halfdelay (); -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_link "$LINENO"; then : -+ ac_cv_lib_tinfo_halfdelay=yes -+else -+ ac_cv_lib_tinfo_halfdelay=no -+fi -+rm -f core conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext -+LIBS=$ac_check_lib_save_LIBS -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_tinfo_halfdelay" >&5 -+$as_echo "$ac_cv_lib_tinfo_halfdelay" >&6; } -+if test "x$ac_cv_lib_tinfo_halfdelay" = xyes; then : -+ UTILS_LIBS="$UTILS_LIBS -ltinfo" -+ -+$as_echo "#define HAVE_LIBTINFO 1" >>confdefs.h -+ -+ -+fi -+ -+ -+fi -+ -+ else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for halfdelay in -ltinfo" >&5 -+$as_echo_n "checking for halfdelay in -ltinfo... " >&6; } -+if ${ac_cv_lib_tinfo_halfdelay+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ ac_check_lib_save_LIBS=$LIBS -+LIBS="-ltinfo $LIBS" -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char halfdelay (); -+int -+main () -+{ -+return halfdelay (); -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_link "$LINENO"; then : -+ ac_cv_lib_tinfo_halfdelay=yes -+else -+ ac_cv_lib_tinfo_halfdelay=no -+fi -+rm -f core conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext -+LIBS=$ac_check_lib_save_LIBS -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_tinfo_halfdelay" >&5 -+$as_echo "$ac_cv_lib_tinfo_halfdelay" >&6; } -+if test "x$ac_cv_lib_tinfo_halfdelay" = xyes; then : -+ UTILS_LIBS="$UTILS_LIBS -ltinfo" -+ -+$as_echo "#define HAVE_LIBTINFO 1" >>confdefs.h -+ -+ -+fi -+ -+ fi -+fi -+ -+if test x"$enable_ncurses" != xno ; then -+ pr_have_ncursesw="no" - --pr_have_ncursesw="no" --if test x"$ac_cv_header_ncurses_h" = xyes; then - - if test x"$enable_nls" = xyes ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for initscr in -lncursesw" >&5 -@@ -23160,15 +23302,7 @@ $as_echo "#define HAVE_LIBNCURSES 1" >>confdefs.h - fi - - fi --fi - --if test x"$enable_curses" != xno ; then -- --$as_echo "#define PR_USE_CURSES 1" >>confdefs.h -- --fi -- --if test x"$enable_ncurses" != xno ; then - - if test x"$pr_have_ncursesw" = xyes ; then - -diff --git a/configure.in b/configure.in -index 4bd0f7c19..01ec7863e 100644 ---- a/configure.in -+++ b/configure.in -@@ -2749,17 +2749,38 @@ fi - dnl Custom-rolled macro for checking return type of setgrent(3) - PR_FUNC_SETGRENT_VOID - --dnl Perform checks for curses/ncurses libraries only if the corresponding --dnl headers have been found. --if test x"$ac_cv_header_curses_h" = xyes; then -+if test x"$enable_curses" != xno ; then - AC_CHECK_LIB(curses, initscr, - [ CURSES_LIBS="-lcurses" - AC_DEFINE(HAVE_LIBCURSES, 1, [Define if you have curses]) -+ AC_DEFINE(PR_USE_CURSES, 1, [Define if using curses support]) - ]) -+ -+ dnl Check for the libtinfo library, which contains the stdscr symbol, -+ dnl halfdelay curses function on some systems (e.g. Gentoo); see -+ dnl Issue #1207. Note that on some systems, this may need to be libtinfow -+ dnl instead. -+ if test x"$enable_nls" = xyes ; then -+ AC_CHECK_LIB(tinfow, halfdelay, -+ [ UTILS_LIBS="$UTILS_LIBS -ltinfow" -+ AC_DEFINE(HAVE_LIBTINFOW, 1, [Define if you have libtinfow]) -+ ], -+ [ AC_CHECK_LIB(tinfo, halfdelay, -+ [ UTILS_LIBS="$UTILS_LIBS -ltinfo" -+ AC_DEFINE(HAVE_LIBTINFO, 1, [Define if you have libtinfo]) -+ ]) -+ ]) -+ else -+ AC_CHECK_LIB(tinfo, halfdelay, -+ [ UTILS_LIBS="$UTILS_LIBS -ltinfo" -+ AC_DEFINE(HAVE_LIBTINFO, 1, [Define if you have libtinfo]) -+ ]) -+ fi - fi - --pr_have_ncursesw="no" --if test x"$ac_cv_header_ncurses_h" = xyes; then -+if test x"$enable_ncurses" != xno ; then -+ pr_have_ncursesw="no" -+ - dnl If NLS support has been enabled, then check for the locale-sensitive - dnl libncursesw library first; if not found, or if no NLS support, then - dnl check for libncurses. -@@ -2776,19 +2797,13 @@ if test x"$ac_cv_header_ncurses_h" = xyes; then - ]) - ]) - -- else -+ else - AC_CHECK_LIB(ncurses, initscr, - [ CURSES_LIBS="-lncurses" - AC_DEFINE(HAVE_LIBNCURSES, 1, [Define if you have ncurses]) - ]) - fi --fi -- --if test x"$enable_curses" != xno ; then -- AC_DEFINE(PR_USE_CURSES, 1, [Define if using curses support]) --fi - --if test x"$enable_ncurses" != xno ; then - dnl Check for the libtinfo library, which contains the halfdelay() curses - dnl function on some systems (e.g. OpenSuSE); see Bug#3718. Note that on - dnl some systems, this may need to be libtinfow instead; see Issue #1174. diff --git a/net-ftp/proftpd/files/proftpd-1.3.7a-slibtool.patch b/net-ftp/proftpd/files/proftpd-1.3.7a-slibtool.patch deleted file mode 100644 index 35676777da05..000000000000 --- a/net-ftp/proftpd/files/proftpd-1.3.7a-slibtool.patch +++ /dev/null @@ -1,34 +0,0 @@ -https://bugs.gentoo.org/778332 -https://github.com/proftpd/proftpd/commit/4ffe04158840130e023ed3d3e558b8d70e28e20e - -From 2a15ce409f70c67ba9b1e09de67c3fca0b38eff8 Mon Sep 17 00:00:00 2001 -From: orbea -Date: Sun, 21 Mar 2021 12:38:52 -0700 -Subject: [PATCH] build: Fix linking the static libsupp.a library. - ---- - configure.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/configure.in -+++ b/configure.in -@@ -88,7 +88,7 @@ if test $ac_cv_prog_gcc = no -a "$OSTYPE" = "-DHPUX10"; then - CFLAGS="$CFLAGS -Ae" - fi - --LDFLAGS="-L\$(top_srcdir)/lib -L\$(top_builddir)/lib $LDFLAGS" -+LDFLAGS="-Wl,-L\$(top_srcdir)/lib,-L\$(top_builddir)/lib $LDFLAGS" - - # AIX has issues with the -rdynamic linker flag. How many different AIX - # versions should we support here? ---- a/configure -+++ b/configure -@@ -14932,7 +14944,7 @@ if test $ac_cv_c_compiler_gnu = no -a "$OSTYPE" = "-DHPUX10"; then - CFLAGS="$CFLAGS -Ae" - fi - --LDFLAGS="-L\$(top_srcdir)/lib -L\$(top_builddir)/lib $LDFLAGS" -+LDFLAGS="-Wl,-L\$(top_srcdir)/lib,-L\$(top_builddir)/lib $LDFLAGS" - - # AIX has issues with the -rdynamic linker flag. How many different AIX - # versions should we support here? diff --git a/net-ftp/proftpd/files/proftpd-1.3.7a-tinfow-segv.patch b/net-ftp/proftpd/files/proftpd-1.3.7a-tinfow-segv.patch deleted file mode 100644 index b904c5dbe5ae..000000000000 --- a/net-ftp/proftpd/files/proftpd-1.3.7a-tinfow-segv.patch +++ /dev/null @@ -1,197 +0,0 @@ -https://github.com/proftpd/proftpd/commit/ff413723328da726d1042c7d2067d088765eca57 -https://bugs.gentoo.org/777432 - -From ff413723328da726d1042c7d2067d088765eca57 Mon Sep 17 00:00:00 2001 -From: TJ Saunders -Date: Sun, 14 Mar 2021 10:08:02 -0700 -Subject: [PATCH] Issue #1174: Check for the libtinfow library when ncursesw is - being used. - -On some systems, such as Gentoo, linking against libtinfo with libncursesw, -rather than libtinfow, leads to segfaults. ---- - config.h.in | 3 ++ - configure | 98 +++++++++++++++++++++++++++++++++++++++++++++++++--- - configure.in | 24 +++++++++---- - 3 files changed, 114 insertions(+), 11 deletions(-) - -diff --git a/config.h.in b/config.h.in -index 1ba33caf9..775b7a294 100644 ---- a/config.h.in -+++ b/config.h.in -@@ -966,6 +966,9 @@ - /* Define if you have the libtinfo library (-ltinfo). */ - #undef HAVE_LIBTINFO - -+/* Define if you have the libtinfow library (-ltinfow). */ -+#undef HAVE_LIBTINFOW -+ - /* Define if you have the addrinfo struct. */ - #undef HAVE_STRUCT_ADDRINFO - -diff --git a/configure b/configure -index 64080483f..86cf1360e 100755 ---- a/configure -+++ b/configure -@@ -23169,18 +23169,106 @@ $as_echo "#define PR_USE_CURSES 1" >>confdefs.h - fi - - if test x"$enable_ncurses" != xno ; then -+ - if test x"$pr_have_ncursesw" = xyes ; then - - $as_echo "#define PR_USE_NCURSESW 1" >>confdefs.h - -- else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for halfdelay in -ltinfow" >&5 -+$as_echo_n "checking for halfdelay in -ltinfow... " >&6; } -+if ${ac_cv_lib_tinfow_halfdelay+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ ac_check_lib_save_LIBS=$LIBS -+LIBS="-ltinfow $LIBS" -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ - --$as_echo "#define PR_USE_NCURSES 1" >>confdefs.h -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char halfdelay (); -+int -+main () -+{ -+return halfdelay (); -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_link "$LINENO"; then : -+ ac_cv_lib_tinfow_halfdelay=yes -+else -+ ac_cv_lib_tinfow_halfdelay=no -+fi -+rm -f core conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext -+LIBS=$ac_check_lib_save_LIBS -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_tinfow_halfdelay" >&5 -+$as_echo "$ac_cv_lib_tinfow_halfdelay" >&6; } -+if test "x$ac_cv_lib_tinfow_halfdelay" = xyes; then : -+ UTILS_LIBS="$UTILS_LIBS -ltinfow" - -- fi -+$as_echo "#define HAVE_LIBTINFOW 1" >>confdefs.h -+ -+ -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for halfdelay in -ltinfo" >&5 -+$as_echo_n "checking for halfdelay in -ltinfo... " >&6; } -+if ${ac_cv_lib_tinfo_halfdelay+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ ac_check_lib_save_LIBS=$LIBS -+LIBS="-ltinfo $LIBS" -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char halfdelay (); -+int -+main () -+{ -+return halfdelay (); -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_link "$LINENO"; then : -+ ac_cv_lib_tinfo_halfdelay=yes -+else -+ ac_cv_lib_tinfo_halfdelay=no -+fi -+rm -f core conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext -+LIBS=$ac_check_lib_save_LIBS - fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_tinfo_halfdelay" >&5 -+$as_echo "$ac_cv_lib_tinfo_halfdelay" >&6; } -+if test "x$ac_cv_lib_tinfo_halfdelay" = xyes; then : -+ UTILS_LIBS="$UTILS_LIBS -ltinfo" -+ -+$as_echo "#define HAVE_LIBTINFO 1" >>confdefs.h - --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for halfdelay in -ltinfo" >&5 -+ -+fi -+ -+ -+fi -+ -+ else -+ -+$as_echo "#define PR_USE_NCURSES 1" >>confdefs.h -+ -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for halfdelay in -ltinfo" >&5 - $as_echo_n "checking for halfdelay in -ltinfo... " >&6; } - if ${ac_cv_lib_tinfo_halfdelay+:} false; then : - $as_echo_n "(cached) " >&6 -@@ -23224,6 +23312,8 @@ $as_echo "#define HAVE_LIBTINFO 1" >>confdefs.h - - fi - -+ fi -+fi - - if test x"$enable_nonblocking_log_open" != xno; then - -diff --git a/configure.in b/configure.in -index 59793a00c..4bd0f7c19 100644 ---- a/configure.in -+++ b/configure.in -@@ -2789,20 +2789,30 @@ if test x"$enable_curses" != xno ; then - fi - - if test x"$enable_ncurses" != xno ; then -+ dnl Check for the libtinfo library, which contains the halfdelay() curses -+ dnl function on some systems (e.g. OpenSuSE); see Bug#3718. Note that on -+ dnl some systems, this may need to be libtinfow instead; see Issue #1174. -+ - if test x"$pr_have_ncursesw" = xyes ; then - AC_DEFINE(PR_USE_NCURSESW, 1, [Define if using ncursesw support]) -+ AC_CHECK_LIB(tinfow, halfdelay, -+ [ UTILS_LIBS="$UTILS_LIBS -ltinfow" -+ AC_DEFINE(HAVE_LIBTINFOW, 1, [Define if you have libtinfow]) -+ ], -+ [ AC_CHECK_LIB(tinfo, halfdelay, -+ [ UTILS_LIBS="$UTILS_LIBS -ltinfo" -+ AC_DEFINE(HAVE_LIBTINFO, 1, [Define if you have libtinfo]) -+ ]) -+ ]) - else - AC_DEFINE(PR_USE_NCURSES, 1, [Define if using ncurses support]) -+ AC_CHECK_LIB(tinfo, halfdelay, -+ [ UTILS_LIBS="$UTILS_LIBS -ltinfo" -+ AC_DEFINE(HAVE_LIBTINFO, 1, [Define if you have libtinfo]) -+ ]) - fi - fi - --dnl Check for the libtinfo library, which contains the halfdelay() curses --dnl function on some systems (e.g. OpenSuSE); see Bug#3718. --AC_CHECK_LIB(tinfo, halfdelay, -- [ UTILS_LIBS="$UTILS_LIBS -ltinfo" -- AC_DEFINE(HAVE_LIBTINFO, 1, [Define if you have libtinfo]) -- ]) -- - if test x"$enable_nonblocking_log_open" != xno; then - AC_DEFINE(PR_USE_NONBLOCKING_LOG_OPEN, 1, [Define if using nonblocking open of log files]) - fi -- cgit v1.2.3