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 D35261395E2 for ; Tue, 29 Nov 2016 10:48:49 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 10C86E0B87; Tue, 29 Nov 2016 10:48:49 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B321AE0B87 for ; Tue, 29 Nov 2016 10:48:48 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 47C8933D3CE for ; Tue, 29 Nov 2016 10:48:46 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0DD4249A for ; Tue, 29 Nov 2016 10:48:45 +0000 (UTC) From: "Akinori Hattori" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Akinori Hattori" Message-ID: <1480416511.5d83e860ea62e3fb89adf982df0c03c81d2df1ea.hattya@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-scheme/gauche/files/, dev-scheme/gauche/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-scheme/gauche/files/gauche-0.9-rfc.tls.patch dev-scheme/gauche/files/gauche-0.9.3.3-file.util.patch dev-scheme/gauche/gauche-0.9.3.3.ebuild X-VCS-Directories: dev-scheme/gauche/files/ dev-scheme/gauche/ X-VCS-Committer: hattya X-VCS-Committer-Name: Akinori Hattori X-VCS-Revision: 5d83e860ea62e3fb89adf982df0c03c81d2df1ea X-VCS-Branch: master Date: Tue, 29 Nov 2016 10:48:45 +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-Archives-Salt: 77e9d0d1-1b0d-49d8-a400-8eb31859f705 X-Archives-Hash: 28b78ac1908a6eb1bccf0a140f68eed7 commit: 5d83e860ea62e3fb89adf982df0c03c81d2df1ea Author: Akinori Hattori gentoo org> AuthorDate: Tue Nov 29 10:48:31 2016 +0000 Commit: Akinori Hattori gentoo org> CommitDate: Tue Nov 29 10:48:31 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d83e860 dev-scheme/gauche: fix tests Package-Manager: portage-2.3.0 dev-scheme/gauche/files/gauche-0.9-rfc.tls.patch | 5 +++-- .../gauche/files/gauche-0.9.3.3-file.util.patch | 21 +++++++++++++++++++++ dev-scheme/gauche/gauche-0.9.3.3.ebuild | 1 + 3 files changed, 25 insertions(+), 2 deletions(-) diff --git a/dev-scheme/gauche/files/gauche-0.9-rfc.tls.patch b/dev-scheme/gauche/files/gauche-0.9-rfc.tls.patch index 662ab43..0bce39a 100644 --- a/dev-scheme/gauche/files/gauche-0.9-rfc.tls.patch +++ b/dev-scheme/gauche/files/gauche-0.9-rfc.tls.patch @@ -1,11 +1,12 @@ --- Gauche-0.9.3.2.orig/ext/tls/Makefile.in +++ Gauche-0.9.3.2/ext/tls/Makefile.in -@@ -77,6 +77,8 @@ +@@ -77,6 +77,9 @@ @sed -e "s@\.\./ssl/@../../$(srcdir)/axTLS/ssl/@g" \ -e "s/system/safe_system/g" \ -e "s@openssl @sh ../../$(srcdir)/kick_openssl @g" \ + -e "/do_reneg = 1;/i#if 0" \ -+ -e "/do_reneg = 0;/a#endif" \ ++ -e "/do_reneg = 0;/a#endif" \ ++ -e "/SSL_server_test(/,/)/s/ -tls1//" \ $(srcdir)/axTLS/ssl/test/ssltest.c >> $(SSLTEST_GENERATED) @cat $(srcdir)/system-fix.c >> $(SSLTEST_GENERATED) diff --git a/dev-scheme/gauche/files/gauche-0.9.3.3-file.util.patch b/dev-scheme/gauche/files/gauche-0.9.3.3-file.util.patch new file mode 100644 index 00000000..1e4cd5d --- /dev/null +++ b/dev-scheme/gauche/files/gauche-0.9.3.3-file.util.patch @@ -0,0 +1,21 @@ +commit 15fb279dccb83d66d7e866a0e6f4e3f9ff64fd8d +Author: Shiro Kawai +Date: Thu Nov 29 23:17:55 2012 -1000 + + Fix file.util test + + The current test may fail when a size of a directory happens to + 100. Patch from NIIBE Yutaka. + +--- a/ext/file/test.scm ++++ b/ext/file/test.scm +@@ -290,7 +290,8 @@ + (reverse + (directory-fold "test.out" + (^[path result] +- (if (= (file-size path) 100) ++ (if (and (file-is-regular? path) ++ (= (file-size path) 100)) + (cons path result) + result)) + '() diff --git a/dev-scheme/gauche/gauche-0.9.3.3.ebuild b/dev-scheme/gauche/gauche-0.9.3.3.ebuild index 675346c..5ccedde 100644 --- a/dev-scheme/gauche/gauche-0.9.3.3.ebuild +++ b/dev-scheme/gauche/gauche-0.9.3.3.ebuild @@ -29,6 +29,7 @@ PATCHES=( "${FILESDIR}"/${PN}-0.9-xz-info.patch "${FILESDIR}"/${PN}-0.9-rfc.tls.patch "${FILESDIR}"/${P}-gauche.threads.patch + "${FILESDIR}"/${P}-file.util.patch ) src_prepare() {