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 38EC71382C5 for ; Thu, 26 Apr 2018 15:14:23 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A88DEE0949; Thu, 26 Apr 2018 15:14:18 +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 89E1CE0949 for ; Thu, 26 Apr 2018 15:14:18 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 813B9335C43 for ; Thu, 26 Apr 2018 15:14:16 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4452C2A4 for ; Thu, 26 Apr 2018 15:14:13 +0000 (UTC) From: "Mike Gilbert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Gilbert" Message-ID: <1524755537.b5bd242b0ee5b96c7fe39c765caf261c1a674088.floppym@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-db/sqlite/files/, dev-db/sqlite/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-db/sqlite/files/sqlite-3.23.1-full_archive-tests.patch dev-db/sqlite/sqlite-3.23.1.ebuild X-VCS-Directories: dev-db/sqlite/ dev-db/sqlite/files/ X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert X-VCS-Revision: b5bd242b0ee5b96c7fe39c765caf261c1a674088 X-VCS-Branch: master Date: Thu, 26 Apr 2018 15:14:13 +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: 2b92f1dc-1ce3-403e-a65f-545523df7b50 X-Archives-Hash: dc1442c810f6e9bdf0f9d042894591a4 commit: b5bd242b0ee5b96c7fe39c765caf261c1a674088 Author: Arfrever Frehtes Taifersar Arahesis Apache Org> AuthorDate: Wed Apr 25 18:59:04 2018 +0000 Commit: Mike Gilbert gentoo org> CommitDate: Thu Apr 26 15:12:17 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b5bd242b dev-db/sqlite: Fix zipfile2-2.0 test on some filesystems. Closes: https://bugs.gentoo.org/653450 .../files/sqlite-3.23.1-full_archive-tests.patch | 27 ++++++++++++++++++++++ dev-db/sqlite/sqlite-3.23.1.ebuild | 1 + 2 files changed, 28 insertions(+) diff --git a/dev-db/sqlite/files/sqlite-3.23.1-full_archive-tests.patch b/dev-db/sqlite/files/sqlite-3.23.1-full_archive-tests.patch new file mode 100644 index 00000000000..7237fbfc0f3 --- /dev/null +++ b/dev-db/sqlite/files/sqlite-3.23.1-full_archive-tests.patch @@ -0,0 +1,27 @@ +https://sqlite.org/src/info/893e6089c875e947 + +--- /test/zipfile2.test ++++ /test/zipfile2.test +@@ -52,17 +52,15 @@ + CREATE VIRTUAL TABLE fff USING zipfile('test''zip'); + } + +-if {$::tcl_platform(platform)=="windows"} { +- set res {1 {cannot open file: testdir}} +-} else { +- set res {1 {error in fread()}} +-} + do_test 2.0 { + forcedelete testdir + file mkdir testdir + execsql { CREATE VIRTUAL TABLE hhh USING zipfile('testdir') } +- catchsql { SELECT * FROM hhh } +-} $res ++ lindex [catchsql { ++ SELECT * FROM hhh; ++ INSERT INTO hhh(name, data) VALUES('1.txt', 'file data'); ++ }] 0 ++} 1 + + + set archive { diff --git a/dev-db/sqlite/sqlite-3.23.1.ebuild b/dev-db/sqlite/sqlite-3.23.1.ebuild index 863c3cd57b6..88f7d9dfd71 100644 --- a/dev-db/sqlite/sqlite-3.23.1.ebuild +++ b/dev-db/sqlite/sqlite-3.23.1.ebuild @@ -52,6 +52,7 @@ src_prepare() { if full_archive; then eapply "${FILESDIR}/${PN}-3.23.0-full_archive-build.patch" eapply "${FILESDIR}/${PN}-3.23.1-full_archive-prohibit_bound_parameters_in_arguments_to_table-valued_functions_within_triggers.patch" + eapply "${FILESDIR}/${PN}-3.23.1-full_archive-tests.patch" eapply_user