1 |
commit: b95dfb460fcfa4e34b412d81336cd2316cdd0e2d |
2 |
Author: Alon Bar-Lev <alonbl <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Apr 3 21:09:23 2017 +0000 |
4 |
Commit: Alon Bar-Lev <alonbl <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Apr 3 21:09:41 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b95dfb46 |
7 |
|
8 |
app-crypt/gnupg: version bump |
9 |
|
10 |
Package-Manager: Portage-2.3.3, Repoman-2.3.1 |
11 |
|
12 |
app-crypt/gnupg/Manifest | 1 + |
13 |
...shorter-socket-path-lengts-to-improve-tes.patch | 33 ++++++ |
14 |
app-crypt/gnupg/gnupg-2.1.20.ebuild | 120 +++++++++++++++++++++ |
15 |
3 files changed, 154 insertions(+) |
16 |
|
17 |
diff --git a/app-crypt/gnupg/Manifest b/app-crypt/gnupg/Manifest |
18 |
index 5604c65f8f2..77390597d02 100644 |
19 |
--- a/app-crypt/gnupg/Manifest |
20 |
+++ b/app-crypt/gnupg/Manifest |
21 |
@@ -2,3 +2,4 @@ DIST gnupg-1.4.21.tar.bz2 3689305 SHA256 6b47a3100c857dcab3c60e6152e56a997f2c786 |
22 |
DIST gnupg-2.1.15.tar.bz2 5723689 SHA256 c28c1a208f1b8ad63bdb6b88d252f6734ff4d33de6b54e38494b11d49e00ffdd SHA512 69c943e853e1a37e8b17b3bc34e1503f14bc8f189fa9f3ac6644bcc98ccce6eaef64da20ff9dd1c8de3a7789ea577167984ccf3ac286cac50752e6f7c2f42ab1 WHIRLPOOL 4c5a8cd4e8b7196f4a355ce7739cf6e23c43817414e10bbba219117e4e51c4c618ffb5dbce27cb836a2171eda58e003d5ddf78d4af09a813c2a1729963413151 |
23 |
DIST gnupg-2.1.18.tar.bz2 6308666 SHA256 d04c6fab7e5562ce4b915b22020e34d4c1a256847690cf149842264fc7cef994 SHA512 b8357f0a883a33c2e4f6ab5a8f5ddb171c899b7a2899e8ce4cac232938fe1dffb789a54980dfc4b758c4cb47f11f1fc570fea905244735048dfc6f06b3353baf WHIRLPOOL c5f132beb3b454146747fe14cd12576fb4d9a9adb8cfd80fcae4482b111672fd38e412dba72caa75af717069d7182a99c7f30ea03dc9adf190f5aa1f01748247 |
24 |
DIST gnupg-2.1.19.tar.bz2 6404836 SHA256 46cced1f5641ce29cc28250f52fadf6e417e649b3bfdec49a5a0d0b22a639bf0 SHA512 c6d0a2cb7f1f7ce851729559edab08d2356dffe00ee836fc1d71eb4c4e34b566e214a0352934d2985fb0183b9e7ecc1221422d258f3bd467e735c0a5c8a3d0ca WHIRLPOOL 3fd482da52b2d4e6c2b2b8427df6b68fe9df9e49dd53b91d74757b14b7c59ab5697c7f2309283c0d05774c1d405574796a4d0267b9cf85d61aec8b4095addd97 |
25 |
+DIST gnupg-2.1.20.tar.bz2 6456128 SHA256 24cf9a69369be64a9f6f8cc11a1be33ab7780ad77a6a1b93719438f49f69960d SHA512 14a9890bc64e143f87cff121dd298d490d78dbd34e36883e0f25763ff9064e5706a7632893d7c5d0e8e9b8cf9cdb0d378b4ce1715348729f0fc080455b61eca9 WHIRLPOOL fa6cbd66031cac41db308b10bebec87e37a19d3c63219d22fb874d7d016bcad057b93eeece7a64001718ee1f881199e3d3eebc8ef6625691f553b0d2dbc92624 |
26 |
|
27 |
diff --git a/app-crypt/gnupg/files/gnupg-2.1.20-gpgscm-Use-shorter-socket-path-lengts-to-improve-tes.patch b/app-crypt/gnupg/files/gnupg-2.1.20-gpgscm-Use-shorter-socket-path-lengts-to-improve-tes.patch |
28 |
new file mode 100644 |
29 |
index 00000000000..dd75e3a5e96 |
30 |
--- /dev/null |
31 |
+++ b/app-crypt/gnupg/files/gnupg-2.1.20-gpgscm-Use-shorter-socket-path-lengts-to-improve-tes.patch |
32 |
@@ -0,0 +1,33 @@ |
33 |
+From e3bdb7d17264b8d5bd9abab97c96d9c4a50e4f61 Mon Sep 17 00:00:00 2001 |
34 |
+From: Kristian Fiskerstrand <kf@××××××××××××××××.com> |
35 |
+Date: Mon, 3 Apr 2017 23:44:56 +0300 |
36 |
+Subject: [PATCH] gpgscm: Use shorter socket path lengts to improve test |
37 |
+ reliability |
38 |
+ |
39 |
+-- |
40 |
+As socket lengths are normally restricted to 108 characters |
41 |
+(UNIX_PATH_MAX variable in /usr/include/linux/un.h), using 42 characters |
42 |
+by default easily results in errors. |
43 |
+--- |
44 |
+ tests/gpgscm/tests.scm | 4 ++-- |
45 |
+ 1 file changed, 2 insertions(+), 2 deletions(-) |
46 |
+ |
47 |
+diff --git a/tests/gpgscm/tests.scm b/tests/gpgscm/tests.scm |
48 |
+index 592b36f..f54a387 100644 |
49 |
+--- a/tests/gpgscm/tests.scm |
50 |
++++ b/tests/gpgscm/tests.scm |
51 |
+@@ -273,9 +273,9 @@ |
52 |
+ (canonical-path (_mkdtemp (if (null? components) |
53 |
+ (path-join |
54 |
+ (get-temp-path) |
55 |
+- (string-append "gpgscm-" (get-isotime) "-" |
56 |
++ (string-append "gscm" |
57 |
+ (basename-suffix *scriptname* ".scm") |
58 |
+- "-XXXXXX")) |
59 |
++ "XXXXXX")) |
60 |
+ (apply path-join components))))) |
61 |
+ |
62 |
+ ;; Make a temporary directory and remove it at interpreter shutdown. |
63 |
+-- |
64 |
+2.10.2 |
65 |
+ |
66 |
|
67 |
diff --git a/app-crypt/gnupg/gnupg-2.1.20.ebuild b/app-crypt/gnupg/gnupg-2.1.20.ebuild |
68 |
new file mode 100644 |
69 |
index 00000000000..86bb2664662 |
70 |
--- /dev/null |
71 |
+++ b/app-crypt/gnupg/gnupg-2.1.20.ebuild |
72 |
@@ -0,0 +1,120 @@ |
73 |
+# Copyright 1999-2017 Gentoo Foundation |
74 |
+# Distributed under the terms of the GNU General Public License v2 |
75 |
+ |
76 |
+EAPI="6" |
77 |
+ |
78 |
+inherit toolchain-funcs |
79 |
+ |
80 |
+DESCRIPTION="The GNU Privacy Guard, a GPL OpenPGP implementation" |
81 |
+HOMEPAGE="http://www.gnupg.org/" |
82 |
+LICENSE="GPL-3" |
83 |
+ |
84 |
+MY_P="${P/_/-}" |
85 |
+SRC_URI="mirror://gnupg/gnupg/${MY_P}.tar.bz2" |
86 |
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
87 |
+ |
88 |
+SLOT="0" |
89 |
+IUSE="bzip2 doc +gnutls ldap nls readline selinux +smartcard tofu tools usb wks-server" |
90 |
+ |
91 |
+COMMON_DEPEND_LIBS=" |
92 |
+ >=dev-libs/npth-1.2 |
93 |
+ >=dev-libs/libassuan-2.4.3 |
94 |
+ >=dev-libs/libgcrypt-1.7.3 |
95 |
+ >=dev-libs/libgpg-error-1.24 |
96 |
+ >=dev-libs/libksba-1.3.4 |
97 |
+ >=net-misc/curl-7.10 |
98 |
+ gnutls? ( >=net-libs/gnutls-3.0:0= ) |
99 |
+ sys-libs/zlib |
100 |
+ ldap? ( net-nds/openldap ) |
101 |
+ bzip2? ( app-arch/bzip2 ) |
102 |
+ readline? ( sys-libs/readline:0= ) |
103 |
+ smartcard? ( usb? ( virtual/libusb:0 ) ) |
104 |
+ tofu? ( >=dev-db/sqlite-3.7 ) |
105 |
+ " |
106 |
+COMMON_DEPEND_BINS="app-crypt/pinentry |
107 |
+ !app-crypt/dirmngr" |
108 |
+ |
109 |
+# Existence of executables is checked during configuration. |
110 |
+DEPEND="${COMMON_DEPEND_LIBS} |
111 |
+ ${COMMON_DEPEND_BINS} |
112 |
+ nls? ( sys-devel/gettext ) |
113 |
+ doc? ( sys-apps/texinfo )" |
114 |
+ |
115 |
+RDEPEND="${COMMON_DEPEND_LIBS} |
116 |
+ ${COMMON_DEPEND_BINS} |
117 |
+ selinux? ( sec-policy/selinux-gpg ) |
118 |
+ nls? ( virtual/libintl )" |
119 |
+ |
120 |
+S="${WORKDIR}/${MY_P}" |
121 |
+ |
122 |
+DOCS=( |
123 |
+ ChangeLog NEWS README THANKS TODO VERSION |
124 |
+ doc/FAQ doc/DETAILS doc/HACKING doc/TRANSLATE doc/OpenPGP doc/KEYSERVER |
125 |
+) |
126 |
+ |
127 |
+PATCHES=( |
128 |
+ "${FILESDIR}/${P}-gpgscm-Use-shorter-socket-path-lengts-to-improve-tes.patch" |
129 |
+) |
130 |
+ |
131 |
+src_configure() { |
132 |
+ local myconf=() |
133 |
+ |
134 |
+ if use smartcard; then |
135 |
+ myconf+=( |
136 |
+ --enable-scdaemon |
137 |
+ $(use_enable usb ccid-driver) |
138 |
+ ) |
139 |
+ else |
140 |
+ myconf+=( --disable-scdaemon ) |
141 |
+ fi |
142 |
+ |
143 |
+ if use elibc_SunOS || use elibc_AIX; then |
144 |
+ myconf+=( --disable-symcryptrun ) |
145 |
+ else |
146 |
+ myconf+=( --enable-symcryptrun ) |
147 |
+ fi |
148 |
+ |
149 |
+ # glib fails and picks up clang's internal stdint.h causing weird errors |
150 |
+ [[ ${CC} == *clang ]] && \ |
151 |
+ export gl_cv_absolute_stdint_h=/usr/include/stdint.h |
152 |
+ |
153 |
+ econf \ |
154 |
+ "${myconf[@]}" \ |
155 |
+ $(use_enable bzip2) \ |
156 |
+ $(use_enable gnutls) \ |
157 |
+ $(use_enable nls) \ |
158 |
+ $(use_enable tofu) \ |
159 |
+ $(use_enable wks-server wks-tools) \ |
160 |
+ $(use_with ldap) \ |
161 |
+ $(use_with readline) \ |
162 |
+ --enable-gpg \ |
163 |
+ --enable-gpgsm \ |
164 |
+ --enable-large-secmem \ |
165 |
+ CC_FOR_BUILD="$(tc-getBUILD_CC)" |
166 |
+} |
167 |
+ |
168 |
+src_compile() { |
169 |
+ default |
170 |
+ |
171 |
+ use doc && emake -C doc html |
172 |
+} |
173 |
+ |
174 |
+src_install() { |
175 |
+ default |
176 |
+ |
177 |
+ use tools && |
178 |
+ dobin \ |
179 |
+ tools/{convert-from-106,gpg-check-pattern} \ |
180 |
+ tools/{gpg-zip,gpgconf,gpgsplit,lspgpot,mail-signed-keys} \ |
181 |
+ tools/make-dns-cert |
182 |
+ |
183 |
+ dosym gpg2 /usr/bin/gpg |
184 |
+ dosym gpgv2 /usr/bin/gpgv |
185 |
+ echo ".so man1/gpg2.1" > "${ED}"/usr/share/man/man1/gpg.1 |
186 |
+ echo ".so man1/gpgv2.1" > "${ED}"/usr/share/man/man1/gpgv.1 |
187 |
+ |
188 |
+ dodir /etc/env.d |
189 |
+ echo "CONFIG_PROTECT=/usr/share/gnupg/qualified.txt" >> "${ED}"/etc/env.d/30gnupg |
190 |
+ |
191 |
+ use doc && dodoc doc/gnupg.html/* doc/*.png |
192 |
+} |