gentoo resync : 28.04.2021

3 files changed, 273 insertions, 2 deletions

diff --git a/net-ftp/proftpd/Manifest b/net-ftp/proftpd/Manifest
index 26c9f0bac12b..47a668a4d319 100644
--- a/net-ftp/proftpd/Manifest
+++ b/net-ftp/proftpd/Manifest
@@ -3,6 +3,7 @@ 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-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
@@ -19,6 +20,6 @@ DIST proftpd-mod-case-0.7.tar.gz 13184 BLAKE2B bf2118d9b8ed97a5b192b92b515d17ac7
 DIST proftpd-mod-diskuse-0.9.tar.gz 18596 BLAKE2B 38c704c8607f0f93b080e77fe793cfe0125c88acc6f818ecb059c6c21a983e040ff5f2c1b91e34ef4ba2666a808d896018c364d1f12ea38f0c477e79bdaa2120 SHA512 d41976bf2810e4b783e775e8c767ca2030c3b5df116219fd31cbbac7feaf9922c315bf4ea092881b0d6cf43f2f4c5dbcae61be3c3a833058d12f962a3024b975
 DIST proftpd-mod-msg-0.4.1.tar.gz 8082 BLAKE2B 970b46b19d25bac22ecb01495270a523997a0b7d5b53b9470b4744b919adcf03d5bcee2df85ba88c4a4c20a9fc30dc01459ffb58c5dae8e78a52a7379bf36f11 SHA512 38ea63b1d355e1e10a6a4477596bf3fa28529a871c9fb8dbf093b5317f0743ef9cb59b986d0b8c1c7ed932dad5d5d571883d596fad2d3b793431824db4487012
 DIST proftpd-mod_clamav-0.14rc2.tar.gz 19710 BLAKE2B 3435e198cf029337904d4666910414124a3b7e1529d4b12f7acd8a9be563009fff4d9a30eb132a2d7361d2c830e5601c4a00a8814282585b6915e991cc29bc13 SHA512 b8e56880fadf36513215fa4c20be6db7cdf1274337072a9b29c3c3477b3de4743ebcdb1179572ec4cb1501fac0064330c855b1f818bf0cc52f0e91170f059772
-EBUILD proftpd-1.3.7a-r1.ebuild 8663 BLAKE2B 6fb976e733b88f597377002013f0777ed6045add297ff5aae73f532990e861ae494398b12bb8fb9e0677cdabea233fc9ae68ff2178539a5d7cea44a30248f23a SHA512 84721b8bb9a88d18a324c009b80358ee8f936aba84ac837c2a394fe9531c891e655f1d10dc4a6d35aaa94e4324dd93fc1d9f0c3533b201edaa1abea33af68f8b
+EBUILD proftpd-1.3.7a-r1.ebuild 8694 BLAKE2B 12076f3e626c51edb25e29722a13726fa4fcf4437495210e4f9d4483afc829ee794a4db24f30178adfa4eb897dbad7cc43cca8c361ed57c673dbfc2141241c1f SHA512 812d17de61a5735e6cab1e344bc96dbf0c37da6b0f0ab8cc0a8a234fc2a11cb8c7f328f00cdc9c95970d678eff43ec15965f8290b7b5f30149a9c75a6c4d7506
 EBUILD proftpd-1.3.7a.ebuild 8619 BLAKE2B 86d5f5a14fbbc9392e5e5f92da7377c657e5edb2560717cad90a8e0d9e77354a34ecf8db16477e83fd3cf7c7fe6187f349d07bb9d0fcaf06d1b8c014dc185114 SHA512 a6b0a8e3d58bc35a25aeac2e2745f6e6dae3a8112cd138c1785f51329542f2cb95b2a247214e4e1fbb2b8f0a5798fefd78ff4861cbde5714d117e73ba806cbaf
 MISC metadata.xml 2930 BLAKE2B f3f8218a737f50599ff687030bd8c84f1818b290d6d89bd6627ab8eb02598d196f1bae03d7b15e4eb02967fb7e0d826cdda10588c8bfe4f8a387a49d70d9cab0 SHA512 c90941671532512e4d085f3c6b4f56f3c2a252a613bf5c978d763fb0f8f9190431a41816f4fddde47e28eaeddcd17a7aef52064e5825499801bcdfbd72745be8
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
new file mode 100644
index 000000000000..be18a9954590
--- /dev/null
+++ b/net-ftp/proftpd/files/proftpd-1.3.7a-no-ncurses.patch
@@ -0,0 +1,269 @@
+https://github.com/proftpd/proftpd/commit/8fc570bc13e771d3ecafe53ab94ada0be2b6646a
+https://bugs.gentoo.org/777531
+
+From 8fc570bc13e771d3ecafe53ab94ada0be2b6646a Mon Sep 17 00:00:00 2001
+From: TJ Saunders <tj@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/proftpd-1.3.7a-r1.ebuild b/net-ftp/proftpd/proftpd-1.3.7a-r1.ebuild
index 17be3df4415b..249498784d2c 100644
--- a/net-ftp/proftpd/proftpd-1.3.7a-r1.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.7a-r1.ebuild
@@ -26,7 +26,7 @@ SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P/_/}.tar.gz
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
 IUSE="acl authfile ban +caps case clamav copy ctrls deflate diskuse dso dynmasq exec ifsession ifversion ident ipv6
 	kerberos ldap libressl log-forensic memcache msg mysql ncurses nls pam +pcre postgres qos radius
 	ratio readme rewrite selinux sftp shaper sitemisc snmp sodium softquota sqlite ssl tcpd test unique-id vroot"
@@ -71,6 +71,7 @@ S="${WORKDIR}/${P/_/}"
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.3.6-use-trace.patch
 	"${FILESDIR}"/${P}-tinfow-segv.patch
+	"${FILESDIR}"/${P}-no-ncurses.patch
 )
 
 RESTRICT=test # Some tests are ran in chroot. Confuse sandbox.