1 |
alonbl 13/10/04 22:24:41 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: gnupg-2.0.21-r2.ebuild |
5 |
Removed: gnupg-2.0.21-r1.ebuild |
6 |
Log: |
7 |
Fix CVE-2013-4351, bug#484836 |
8 |
|
9 |
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key BF20DC51) |
10 |
|
11 |
Revision Changes Path |
12 |
1.488 app-crypt/gnupg/ChangeLog |
13 |
|
14 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-crypt/gnupg/ChangeLog?rev=1.488&view=markup |
15 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-crypt/gnupg/ChangeLog?rev=1.488&content-type=text/plain |
16 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-crypt/gnupg/ChangeLog?r1=1.487&r2=1.488 |
17 |
|
18 |
Index: ChangeLog |
19 |
=================================================================== |
20 |
RCS file: /var/cvsroot/gentoo-x86/app-crypt/gnupg/ChangeLog,v |
21 |
retrieving revision 1.487 |
22 |
retrieving revision 1.488 |
23 |
diff -u -r1.487 -r1.488 |
24 |
--- ChangeLog 3 Oct 2013 19:20:06 -0000 1.487 |
25 |
+++ ChangeLog 4 Oct 2013 22:24:40 -0000 1.488 |
26 |
@@ -1,6 +1,13 @@ |
27 |
# ChangeLog for app-crypt/gnupg |
28 |
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
29 |
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/ChangeLog,v 1.487 2013/10/03 19:20:06 alonbl Exp $ |
30 |
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/ChangeLog,v 1.488 2013/10/04 22:24:40 alonbl Exp $ |
31 |
+ |
32 |
+*gnupg-2.0.21-r2 (04 Oct 2013) |
33 |
+ |
34 |
+ 04 Oct 2013; Alon Bar-Lev <alonbl@g.o> |
35 |
+ +files/gnupg-2.0.21-CVE-2013-4351.patch, +gnupg-2.0.21-r2.ebuild, |
36 |
+ -gnupg-2.0.21-r1.ebuild: |
37 |
+ Fix CVE-2013-4351, bug#484836 |
38 |
|
39 |
*gnupg-2.0.21-r1 (03 Oct 2013) |
40 |
|
41 |
|
42 |
|
43 |
|
44 |
1.1 app-crypt/gnupg/gnupg-2.0.21-r2.ebuild |
45 |
|
46 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-crypt/gnupg/gnupg-2.0.21-r2.ebuild?rev=1.1&view=markup |
47 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-crypt/gnupg/gnupg-2.0.21-r2.ebuild?rev=1.1&content-type=text/plain |
48 |
|
49 |
Index: gnupg-2.0.21-r2.ebuild |
50 |
=================================================================== |
51 |
# Copyright 1999-2013 Gentoo Foundation |
52 |
# Distributed under the terms of the GNU General Public License v2 |
53 |
# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-2.0.21-r2.ebuild,v 1.1 2013/10/04 22:24:40 alonbl Exp $ |
54 |
|
55 |
EAPI="5" |
56 |
|
57 |
inherit eutils flag-o-matic toolchain-funcs |
58 |
|
59 |
DESCRIPTION="The GNU Privacy Guard, a GPL pgp replacement" |
60 |
HOMEPAGE="http://www.gnupg.org/" |
61 |
SRC_URI="mirror://gnupg/gnupg/${P}.tar.bz2" |
62 |
# SRC_URI="ftp://ftp.gnupg.org/gcrypt/${PN}/${P}.tar.bz2" |
63 |
|
64 |
LICENSE="GPL-3" |
65 |
SLOT="0" |
66 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
67 |
IUSE="adns bzip2 doc ldap nls mta readline static selinux smartcard usb" |
68 |
|
69 |
COMMON_DEPEND_LIBS=" |
70 |
>=dev-libs/libassuan-2 |
71 |
>=dev-libs/libgcrypt-1.4 |
72 |
>=dev-libs/libgpg-error-1.11 |
73 |
>=dev-libs/libksba-1.0.7 |
74 |
>=dev-libs/pth-1.3.7 |
75 |
>=net-misc/curl-7.10 |
76 |
sys-libs/zlib |
77 |
adns? ( >=net-libs/adns-1.4 ) |
78 |
bzip2? ( app-arch/bzip2 ) |
79 |
readline? ( sys-libs/readline ) |
80 |
smartcard? ( usb? ( virtual/libusb:0 ) ) |
81 |
ldap? ( net-nds/openldap )" |
82 |
COMMON_DEPEND_BINS="|| ( app-crypt/pinentry app-crypt/pinentry-qt )" |
83 |
|
84 |
# Existence of executables is checked during configuration. |
85 |
DEPEND="${COMMON_DEPEND_LIBS} |
86 |
${COMMON_DEPEND_BINS} |
87 |
static? ( |
88 |
>=dev-libs/libassuan-2[static-libs] |
89 |
>=dev-libs/libgcrypt-1.4[static-libs] |
90 |
>=dev-libs/libgpg-error-1.7[static-libs] |
91 |
>=dev-libs/libksba-1.0.7[static-libs] |
92 |
>=dev-libs/pth-1.3.7[static-libs] |
93 |
>=net-misc/curl-7.10[static-libs] |
94 |
sys-libs/zlib[static-libs] |
95 |
bzip2? ( app-arch/bzip2[static-libs] ) |
96 |
) |
97 |
nls? ( sys-devel/gettext ) |
98 |
doc? ( sys-apps/texinfo )" |
99 |
|
100 |
RDEPEND="!static? ( ${COMMON_DEPEND_LIBS} ) |
101 |
${COMMON_DEPEND_BINS} |
102 |
mta? ( virtual/mta ) |
103 |
!<=app-crypt/gnupg-2.0.1 |
104 |
selinux? ( sec-policy/selinux-gpg ) |
105 |
nls? ( virtual/libintl )" |
106 |
|
107 |
REQUIRED_USE="smartcard? ( !static )" |
108 |
|
109 |
src_prepare() { |
110 |
epatch "${FILESDIR}/${PN}-2.0.17-gpgsm-gencert.patch" |
111 |
epatch "${FILESDIR}/${P}-CVE-2013-4351.patch" |
112 |
epatch_user |
113 |
} |
114 |
|
115 |
src_configure() { |
116 |
local myconf=() |
117 |
|
118 |
# 'USE=static' support was requested: |
119 |
# gnupg1: bug #29299 |
120 |
# gnupg2: bug #159623 |
121 |
use static && append-ldflags -static |
122 |
|
123 |
if use smartcard; then |
124 |
myconf+=( |
125 |
--enable-scdaemon |
126 |
$(use_enable usb ccid-driver) |
127 |
) |
128 |
else |
129 |
myconf+=( --disable-scdaemon ) |
130 |
fi |
131 |
|
132 |
econf \ |
133 |
--docdir="${EPREFIX}/usr/share/doc/${PF}" \ |
134 |
--enable-gpg \ |
135 |
--enable-gpgsm \ |
136 |
--enable-agent \ |
137 |
"${myconf[@]}" \ |
138 |
$(use_with adns) \ |
139 |
$(use_enable bzip2) \ |
140 |
$(use_enable !elibc_SunOS symcryptrun) \ |
141 |
$(use_enable nls) \ |
142 |
$(use_enable mta mailto) \ |
143 |
$(use_enable ldap) \ |
144 |
$(use_with readline) \ |
145 |
CC_FOR_BUILD="$(tc-getBUILD_CC)" |
146 |
} |
147 |
|
148 |
src_compile() { |
149 |
default |
150 |
|
151 |
if use doc; then |
152 |
cd doc |
153 |
emake html |
154 |
fi |
155 |
} |
156 |
|
157 |
src_install() { |
158 |
default |
159 |
|
160 |
emake DESTDIR="${D}" -f doc/Makefile uninstall-nobase_dist_docDATA |
161 |
rm "${ED}"/usr/share/gnupg/help* || die |
162 |
|
163 |
dodoc ChangeLog NEWS README THANKS TODO VERSION doc/FAQ doc/DETAILS \ |
164 |
doc/HACKING doc/TRANSLATE doc/OpenPGP doc/KEYSERVER doc/help* |
165 |
|
166 |
dosym gpg2 /usr/bin/gpg |
167 |
dosym gpgv2 /usr/bin/gpgv |
168 |
dosym gpg2keys_hkp /usr/libexec/gpgkeys_hkp |
169 |
dosym gpg2keys_finger /usr/libexec/gpgkeys_finger |
170 |
dosym gpg2keys_curl /usr/libexec/gpgkeys_curl |
171 |
if use ldap; then |
172 |
dosym gpg2keys_ldap /usr/libexec/gpgkeys_ldap |
173 |
fi |
174 |
echo ".so man1/gpg2.1" > "${ED}"/usr/share/man/man1/gpg.1 |
175 |
echo ".so man1/gpgv2.1" > "${ED}"/usr/share/man/man1/gpgv.1 |
176 |
|
177 |
dodir /etc/env.d |
178 |
echo "CONFIG_PROTECT=/usr/share/gnupg/qualified.txt" >> "${ED}"/etc/env.d/30gnupg |
179 |
|
180 |
if use doc; then |
181 |
dohtml doc/gnupg.html/* doc/*.png |
182 |
fi |
183 |
} |
184 |
|
185 |
pkg_postinst() { |
186 |
elog "If you wish to view images emerge:" |
187 |
elog "media-gfx/xloadimage, media-gfx/xli or any other viewer" |
188 |
elog "Remember to use photo-viewer option in configuration file to activate" |
189 |
elog "the right viewer." |
190 |
elog |
191 |
|
192 |
if use smartcard; then |
193 |
elog "To use your OpenPGP smartcard (or token) with GnuPG you need one of" |
194 |
use usb && elog " - a CCID-compatible reader, used directly through libusb;" |
195 |
elog " - sys-apps/pcsc-lite and a compatible reader device;" |
196 |
elog " - dev-libs/openct and a compatible reader device;" |
197 |
elog " - a reader device and drivers exporting either PC/SC or CT-API interfaces." |
198 |
elog "" |
199 |
elog "General hint: you probably want to try installing sys-apps/pcsc-lite and" |
200 |
elog "app-crypt/ccid first." |
201 |
fi |
202 |
|
203 |
ewarn "Please remember to restart gpg-agent if a different version" |
204 |
ewarn "of the agent is currently used. If you are unsure of the gpg" |
205 |
ewarn "agent you are using please run 'killall gpg-agent'," |
206 |
ewarn "and to start a fresh daemon just run 'gpg-agent --daemon'." |
207 |
} |