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 A7EAB138330 for ; Sun, 27 May 2018 19:54:13 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D4AA3E08F1; Sun, 27 May 2018 19:54:12 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 908F6E08F1 for ; Sun, 27 May 2018 19:54:12 +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 2EBEE335CC0 for ; Sun, 27 May 2018 19:54:11 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BD4BF2B1 for ; Sun, 27 May 2018 19:54:07 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1527450813.0578a158a4943a264c38f9fc4f68d9060b74190b.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/, app-office/libreoffice/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-office/libreoffice/files/libreoffice-6.0.3.2-testODFEncryptedGPG.patch app-office/libreoffice/files/libreoffice-6.0.3.2-testTdf108947.patch app-office/libreoffice/libreoffice-6.0.3.2.ebuild app-office/libreoffice/libreoffice-6.0.4.2.ebuild app-office/libreoffice/libreoffice-6.0.9999.ebuild app-office/libreoffice/libreoffice-9999.ebuild X-VCS-Directories: app-office/libreoffice/ app-office/libreoffice/files/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 0578a158a4943a264c38f9fc4f68d9060b74190b X-VCS-Branch: master Date: Sun, 27 May 2018 19:54:07 +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: c8eacb7a-f54b-4a70-95f1-b85611f7207d X-Archives-Hash: 43a0bae6a116e9db5b0ab0c8d99c6d4f commit: 0578a158a4943a264c38f9fc4f68d9060b74190b Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun May 27 19:52:46 2018 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun May 27 19:53:33 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0578a158 app-office/libreoffice: Fix testODFEncryptedGPG, fix test deps Thanks-to: Thomas Deutschmann gentoo.org> Closes: https://bugs.gentoo.org/656676 Package-Manager: Portage-2.3.40, Repoman-2.3.9 .../libreoffice-6.0.3.2-testODFEncryptedGPG.patch | 89 ++++++++++++++++++++++ .../files/libreoffice-6.0.3.2-testTdf108947.patch | 2 +- app-office/libreoffice/libreoffice-6.0.3.2.ebuild | 2 + app-office/libreoffice/libreoffice-6.0.4.2.ebuild | 1 + app-office/libreoffice/libreoffice-6.0.9999.ebuild | 1 + app-office/libreoffice/libreoffice-9999.ebuild | 1 + 6 files changed, 95 insertions(+), 1 deletion(-) diff --git a/app-office/libreoffice/files/libreoffice-6.0.3.2-testODFEncryptedGPG.patch b/app-office/libreoffice/files/libreoffice-6.0.3.2-testODFEncryptedGPG.patch new file mode 100644 index 00000000000..9cde8407ab4 --- /dev/null +++ b/app-office/libreoffice/files/libreoffice-6.0.3.2-testODFEncryptedGPG.patch @@ -0,0 +1,89 @@ +From 74d438f716d9cef165c78f950d4c53a46c37503c Mon Sep 17 00:00:00 2001 +From: Rene Engelhard +Date: Sun, 18 Mar 2018 22:25:36 +0100 +Subject: gpg4libre: fix failing gpg test due to over-long filenames +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +This squashes the following commits: + +From f68929ac611fdda19c1ee413effc59d33aa5ef97 Mon Sep 17 00:00:00 2001 +From: Thorsten Behrens +Date: Fri, 9 Mar 2018 01:38:26 +0100 +Subject: gpg4libre: fix failing gpg test due to over-long filenames + +With long workdir path, gpg sometimes fails with 'gpg: can't connect +to the agent: File name too long' error. +WK recommends to create preferred socket dir under /run/user, needs +prepping though via gpgconf. + +See https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=84720 + +From d7ecf4a4e37a9eeffa2b40f9fe5a2e6a8f90c876 Mon Sep 17 00:00:00 2001 +From: Rene Engelhard +Date: Sun, 18 Mar 2018 11:25:41 +0100 +Subject: properly check for gpgconf (and --create-socketdir) working + +From d6ed1d415d36809d784af780231258ea0ee1024f Mon Sep 17 00:00:00 2001 +From: Rene Engelhard +Date: Sun, 18 Mar 2018 19:06:58 +0100 +Subject: actually add GPGCONF to config_host.mk.in + +From 7a95ee8d0badb2cbbd137a6e18af1bada35ae933 Mon Sep 17 00:00:00 2001 +From: Rene Engelhard +Date: Sun, 18 Mar 2018 19:26:45 +0100 +Subject: actually add HAVE_GPGCONF_SOCKETDIR to config_host.mk.in... + +From 5204a5145d8232ea0650144fb4756c38303ef06e Mon Sep 17 00:00:00 2001 +From: Rene Engelhard +Date: Sun, 18 Mar 2018 19:28:55 +0100 +Subject: revert accidentially comitted local changes :( + +From bc358d39ac985914160e8aaa23b29469470c032b Mon Sep 17 00:00:00 2001 +From: Rene Engelhard +Date: Sun, 18 Mar 2018 20:36:45 +0100 +Subject: this is sh, not make... + +Change-Id: I7880fd7eee57cedc19b72348b45f0c1389409fe6 +Reviewed-on: https://gerrit.libreoffice.org/51521 +Tested-by: Jenkins +Reviewed-by: Caolán McNamara +Tested-by: Caolán McNamara +--- + xmlsecurity/CppunitTest_xmlsecurity_signing.mk | 14 +++++++++++++- + 1 file changed, 13 insertions(+), 1 deletion(-) + +(limited to 'xmlsecurity/CppunitTest_xmlsecurity_signing.mk') + +diff --git a/xmlsecurity/CppunitTest_xmlsecurity_signing.mk b/xmlsecurity/CppunitTest_xmlsecurity_signing.mk +index c382e3b..2f3ed41 100644 +--- a/xmlsecurity/CppunitTest_xmlsecurity_signing.mk ++++ b/xmlsecurity/CppunitTest_xmlsecurity_signing.mk +@@ -52,11 +52,23 @@ ifeq ($(ENABLE_PDFIMPORT),TRUE) + $(eval $(call gb_CppunitTest_use_executable,xmlsecurity_signing,xpdfimport)) + endif + +-# reset the LD_LIBRARY_PATH for spawned GPG processes ++# various hacks to make unit test work on Linux more often + ifeq ($(OS),LINUX) ++# reset the LD_LIBRARY_PATH for spawned GPG processes + $(call gb_CppunitTest_get_target,xmlsecurity_signing): \ + EXTRA_ENV_VARS := \ + LIBO_LD_PATH=$$LD_LIBRARY_PATH ++ ++ifneq (,$(HAVE_GPGCONF_SOCKETDIR)) ++# create socket dir below /run/user/ instead of in workdir ++.PHONY : gb_CppunitTest_run_gpgconf ++gb_CppunitTest_run_gpgconf: ++ GNUPGHOME=$(WORKDIR)/CppunitTest/xmlsecurity_signing.test.user \ ++ $(GPGCONF) --create-socketdir ++ ++$(call gb_CppunitTest_get_target,xmlsecurity_signing): \ ++ gb_CppunitTest_run_gpgconf ++endif + endif + + # vim: set noet sw=4 ts=4: +-- +cgit v1.1 diff --git a/app-office/libreoffice/files/libreoffice-6.0.3.2-testTdf108947.patch b/app-office/libreoffice/files/libreoffice-6.0.3.2-testTdf108947.patch index 5973b6ae67c..bd84b316252 100644 --- a/app-office/libreoffice/files/libreoffice-6.0.3.2-testTdf108947.patch +++ b/app-office/libreoffice/files/libreoffice-6.0.3.2-testTdf108947.patch @@ -10,4 +10,4 @@ index 457aedce0acb..4f02cf2b4040 100644 + CPPUNIT_ASSERT_EQUAL(1, getPages()); //Check if Headers/Footers contain what they should in this document - uno::Reference xHeaderTextRight = getProperty>( \ No newline at end of file + uno::Reference xHeaderTextRight = getProperty>( diff --git a/app-office/libreoffice/libreoffice-6.0.3.2.ebuild b/app-office/libreoffice/libreoffice-6.0.3.2.ebuild index b95fd784f38..612ab4bcbaf 100644 --- a/app-office/libreoffice/libreoffice-6.0.3.2.ebuild +++ b/app-office/libreoffice/libreoffice-6.0.3.2.ebuild @@ -226,6 +226,7 @@ DEPEND="${COMMON_DEPEND} ) odk? ( >=app-doc/doxygen-1.8.4 ) test? ( + app-crypt/gnupg dev-util/cppunit media-fonts/dejavu ) @@ -246,6 +247,7 @@ PATCHES=( "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch" # 6.0 branch "${FILESDIR}/${P}-poppler-0.64.patch" + "${FILESDIR}/${PN}-6.0.3.2-testODFEncryptedGPG.patch" #bug 656676 # TODO: upstream "${FILESDIR}/${PN}-5.2.5.1-glibc-2.24.patch" diff --git a/app-office/libreoffice/libreoffice-6.0.4.2.ebuild b/app-office/libreoffice/libreoffice-6.0.4.2.ebuild index f50cbbd0996..4d3bb3a4921 100644 --- a/app-office/libreoffice/libreoffice-6.0.4.2.ebuild +++ b/app-office/libreoffice/libreoffice-6.0.4.2.ebuild @@ -236,6 +236,7 @@ DEPEND="${COMMON_DEPEND} ) odk? ( >=app-doc/doxygen-1.8.4 ) test? ( + app-crypt/gnupg dev-util/cppunit media-fonts/dejavu ) diff --git a/app-office/libreoffice/libreoffice-6.0.9999.ebuild b/app-office/libreoffice/libreoffice-6.0.9999.ebuild index f50cbbd0996..4d3bb3a4921 100644 --- a/app-office/libreoffice/libreoffice-6.0.9999.ebuild +++ b/app-office/libreoffice/libreoffice-6.0.9999.ebuild @@ -236,6 +236,7 @@ DEPEND="${COMMON_DEPEND} ) odk? ( >=app-doc/doxygen-1.8.4 ) test? ( + app-crypt/gnupg dev-util/cppunit media-fonts/dejavu ) diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild index 558cf0dce7d..232eaa56a6b 100644 --- a/app-office/libreoffice/libreoffice-9999.ebuild +++ b/app-office/libreoffice/libreoffice-9999.ebuild @@ -235,6 +235,7 @@ DEPEND="${COMMON_DEPEND} ) odk? ( >=app-doc/doxygen-1.8.4 ) test? ( + app-crypt/gnupg dev-util/cppunit media-fonts/dejavu )