From: Sergei Trofimovich <slyfox@gentoo.org>
Date: Tue, 15 Oct 2019 22:27:24 +0000 (+0100)
Subject: net-ftp/proftpd: Fix test suite detection, bug #697782
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=8dadce6a213a385c9e347260745c52ca84b7580c;p=gentoo.git

net-ftp/proftpd: Fix test suite detection, bug #697782

Reported-by: Toralf Förster
Closes: https://bugs.gentoo.org/697782
Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
---

diff --git a/net-ftp/proftpd/files/proftpd-1.3.6a-fix-libcheck.patch b/net-ftp/proftpd/files/proftpd-1.3.6a-fix-libcheck.patch
new file mode 100644
index 000000000000..93752c43e926
--- /dev/null
+++ b/net-ftp/proftpd/files/proftpd-1.3.6a-fix-libcheck.patch
@@ -0,0 +1,28 @@
+Fix test suite detection.
+
+https://github.com/proftpd/proftpd/pull/839
+
+Reported-by: Toralf Förster
+Bug: https://bugs.gentoo.org/697782
+--- a/configure.in
++++ b/configure.in
+@@ -991,7 +991,7 @@ AC_ARG_ENABLE(tests,
+     [enable unit tests (default=no)])
+   ],
+   [
+-    if test "$enableval" != xno ; then
++    if test x"$enableval" != xno ; then
+       AC_CHECK_HEADERS(check.h)
+ 
+       AC_CHECK_LIB(check, tcase_create,
+--- a/configure
++++ b/configure
+@@ -20639,7 +20639,7 @@ ENABLE_TESTS="\"\""
+ # Check whether --enable-tests was given.
+ if test "${enable_tests+set}" = set; then
+   enableval=$enable_tests;
+-    if test "$enableval" != xno ; then
++    if test x"$enableval" != xno ; then
+ 
+ for ac_header in check.h
+ do
diff --git a/net-ftp/proftpd/proftpd-1.3.6a.ebuild b/net-ftp/proftpd/proftpd-1.3.6a.ebuild
index cc22d06099af..adb025d7e1fd 100644
--- a/net-ftp/proftpd/proftpd-1.3.6a.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.6a.ebuild
@@ -71,6 +71,7 @@ S="${WORKDIR}/${P/_/}"
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.3.6-use-trace.patch
 	"${FILESDIR}"/${PN}-1.3.6-mysql-8.patch
+	"${FILESDIR}"/${PN}-1.3.6a-fix-libcheck.patch
 )
 
 RESTRICT=test # tests corrupt memory. need to be fixed upstream first