commit: 43d6457f839fb1b1a3ef83c2c4214c3b9414613b Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at> AuthorDate: Mon Nov 21 18:17:44 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Wed Nov 23 01:42:26 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=43d6457f
net-ftp/proftpd: remove unused patches Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at> Closes: https://github.com/gentoo/gentoo/pull/28369 Signed-off-by: Sam James <sam <AT> gentoo.org> .../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 --------------- 3 files changed, 500 deletions(-) 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 <t...@castaglia.org> -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 <or...@riseup.net> -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 <t...@castaglia.org> -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
