summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergei Trofimovich <slyfox@gentoo.org>2019-10-15 23:27:24 +0100
committerSergei Trofimovich <slyfox@gentoo.org>2019-10-15 23:27:59 +0100
commit8dadce6a213a385c9e347260745c52ca84b7580c (patch)
tree6d5a1b2531dd31eaab38b87e683bd35ddd0e6e58 /net-ftp/proftpd
parentnet-misc/youtube-dl: Version 2019.10.16 (diff)
downloadgentoo-8dadce6a213a385c9e347260745c52ca84b7580c.tar.gz
gentoo-8dadce6a213a385c9e347260745c52ca84b7580c.tar.bz2
gentoo-8dadce6a213a385c9e347260745c52ca84b7580c.zip
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>
Diffstat (limited to 'net-ftp/proftpd')
-rw-r--r--net-ftp/proftpd/files/proftpd-1.3.6a-fix-libcheck.patch28
-rw-r--r--net-ftp/proftpd/proftpd-1.3.6a.ebuild1
2 files changed, 29 insertions, 0 deletions
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