From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id B31B3138334 for ; Tue, 15 Oct 2019 22:28:10 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C1800E088A; Tue, 15 Oct 2019 22:28:09 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A0ED0E088A for ; Tue, 15 Oct 2019 22:28:09 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6584F34BE4A for ; Tue, 15 Oct 2019 22:28:08 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E8ED52A5 for ; Tue, 15 Oct 2019 22:28:05 +0000 (UTC) From: "Sergei Trofimovich" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sergei Trofimovich" Message-ID: <1571178479.8dadce6a213a385c9e347260745c52ca84b7580c.slyfox@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/, net-ftp/proftpd/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-ftp/proftpd/files/proftpd-1.3.6a-fix-libcheck.patch net-ftp/proftpd/proftpd-1.3.6a.ebuild X-VCS-Directories: net-ftp/proftpd/ net-ftp/proftpd/files/ X-VCS-Committer: slyfox X-VCS-Committer-Name: Sergei Trofimovich X-VCS-Revision: 8dadce6a213a385c9e347260745c52ca84b7580c X-VCS-Branch: master Date: Tue, 15 Oct 2019 22:28:05 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: e298fdeb-e457-4174-94fb-fcddcbefeea1 X-Archives-Hash: bdcdaaffc392d2b3c10d3277e32a605b commit: 8dadce6a213a385c9e347260745c52ca84b7580c Author: Sergei Trofimovich gentoo org> AuthorDate: Tue Oct 15 22:27:24 2019 +0000 Commit: Sergei Trofimovich gentoo 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 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