diff options
| -rw-r--r-- | app-crypt/gnupg/files/gnupg-2.1.16-gpgscm-Use-shorter-socket-path-lengts-to-improve-tes.patch | 33 | ||||
| -rw-r--r-- | app-crypt/gnupg/gnupg-2.1.16.ebuild | 5 |
2 files changed, 36 insertions, 2 deletions
diff --git a/app-crypt/gnupg/files/gnupg-2.1.16-gpgscm-Use-shorter-socket-path-lengts-to-improve-tes.patch b/app-crypt/gnupg/files/gnupg-2.1.16-gpgscm-Use-shorter-socket-path-lengts-to-improve-tes.patch new file mode 100644 index 000000000000..7c7904624916 --- /dev/null +++ b/app-crypt/gnupg/files/gnupg-2.1.16-gpgscm-Use-shorter-socket-path-lengts-to-improve-tes.patch @@ -0,0 +1,33 @@ +From cf3778631f87ad03274ac94dcae7c7fbbd036913 Mon Sep 17 00:00:00 2001 +From: Kristian Fiskerstrand <kf@sumptuouscapital.com> +Date: Tue, 22 Nov 2016 10:07:33 +0100 +Subject: [PATCH] gpgscm: Use shorter socket path lengts to improve test + reliability + +-- +As socket lengths are normally restricted to 108 characters +(UNIX_PATH_MAX variable in /usr/include/linux/un.h), using 42 characters +by default easily results in errors. +--- + tests/gpgscm/tests.scm | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/tests/gpgscm/tests.scm b/tests/gpgscm/tests.scm +index 72afa99..039ea86 100644 +--- a/tests/gpgscm/tests.scm ++++ b/tests/gpgscm/tests.scm +@@ -268,9 +268,9 @@ + (define (mkdtemp . components) + (_mkdtemp (if (null? components) + (path-join (getenv "TMP") +- (string-append "gpgscm-" (get-isotime) "-" ++ (string-append "gscm" + (basename-suffix *scriptname* ".scm") +- "-XXXXXX")) ++ "XXXXXX")) + (apply path-join components)))) + + (macro (with-temporary-working-directory form) +-- +2.7.3 + diff --git a/app-crypt/gnupg/gnupg-2.1.16.ebuild b/app-crypt/gnupg/gnupg-2.1.16.ebuild index 4fc5fd6fc09c..62dc0e9b34d3 100644 --- a/app-crypt/gnupg/gnupg-2.1.16.ebuild +++ b/app-crypt/gnupg/gnupg-2.1.16.ebuild @@ -15,7 +15,7 @@ SRC_URI="mirror://gnupg/gnupg/${MY_P}.tar.bz2" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" SLOT="0" -IUSE="bzip2 doc +gnutls ldap nls readline selinux +smartcard tofu +tools usb wks-server" +IUSE="bzip2 doc +gnutls ldap nls readline selinux +smartcard tofu tools usb wks-server" COMMON_DEPEND_LIBS=" >=dev-libs/npth-1.2 @@ -50,6 +50,7 @@ S="${WORKDIR}/${MY_P}" src_prepare() { default + epatch "${FILESDIR}/${PN}-2.1.16-gpgscm-Use-shorter-socket-path-lengts-to-improve-tes.patch" epatch_user } @@ -88,7 +89,7 @@ src_configure() { $(use_enable nls) \ $(use_with readline) \ $(use_enable tofu) \ - $(use_enable tools) \ + --enable-tools \ $(use_enable wks-server wks-tools) \ CC_FOR_BUILD="$(tc-getBUILD_CC)" } |