commit: 8dadce6a213a385c9e347260745c52ca84b7580c Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> AuthorDate: Tue Oct 15 22:27:24 2019 +0000 Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> CommitDate: Tue Oct 15 22:27:59 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8dadce6a
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 <AT> gentoo.org> .../files/proftpd-1.3.6a-fix-libcheck.patch | 28 ++++++++++++++++++++++ net-ftp/proftpd/proftpd-1.3.6a.ebuild | 1 + 2 files changed, 29 insertions(+) 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 00000000000..93752c43e92 --- /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 cc22d06099a..adb025d7e1f 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
