Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Tim Harder (radhermit)" <radhermit@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in net-libs/gnutls: gnutls-3.2.15.ebuild ChangeLog gnutls-3.3.4.ebuild
Date: Sun, 01 Jun 2014 07:59:14
Message-Id: 20140601075911.1BBFB20036@flycatcher.gentoo.org
1 radhermit 14/06/01 07:59:11
2
3 Modified: ChangeLog
4 Added: gnutls-3.2.15.ebuild gnutls-3.3.4.ebuild
5 Log:
6 Security bumps (bug #511840).
7
8 (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 4AB3E85B4F064CA3)
9
10 Revision Changes Path
11 1.493 net-libs/gnutls/ChangeLog
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/gnutls/ChangeLog?rev=1.493&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/gnutls/ChangeLog?rev=1.493&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/gnutls/ChangeLog?r1=1.492&r2=1.493
16
17 Index: ChangeLog
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/net-libs/gnutls/ChangeLog,v
20 retrieving revision 1.492
21 retrieving revision 1.493
22 diff -u -r1.492 -r1.493
23 --- ChangeLog 17 May 2014 14:16:42 -0000 1.492
24 +++ ChangeLog 1 Jun 2014 07:59:10 -0000 1.493
25 @@ -1,6 +1,13 @@
26 # ChangeLog for net-libs/gnutls
27 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
28 -# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/ChangeLog,v 1.492 2014/05/17 14:16:42 mgorny Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/ChangeLog,v 1.493 2014/06/01 07:59:10 radhermit Exp $
30 +
31 +*gnutls-3.3.4 (01 Jun 2014)
32 +*gnutls-3.2.15 (01 Jun 2014)
33 +
34 + 01 Jun 2014; Tim Harder <radhermit@g.o> +gnutls-3.2.15.ebuild,
35 + +gnutls-3.3.4.ebuild:
36 + Security bumps (bug #511840).
37
38 17 May 2014; Michał Górny <mgorny@g.o> gnutls-3.3.2.ebuild:
39 Symlink remaining tools necessary for tests for non-native ABIs.
40
41
42
43 1.1 net-libs/gnutls/gnutls-3.2.15.ebuild
44
45 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/gnutls/gnutls-3.2.15.ebuild?rev=1.1&view=markup
46 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/gnutls/gnutls-3.2.15.ebuild?rev=1.1&content-type=text/plain
47
48 Index: gnutls-3.2.15.ebuild
49 ===================================================================
50 # Copyright 1999-2014 Gentoo Foundation
51 # Distributed under the terms of the GNU General Public License v2
52 # $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-3.2.15.ebuild,v 1.1 2014/06/01 07:59:10 radhermit Exp $
53
54 EAPI=5
55
56 inherit autotools libtool eutils versionator
57
58 DESCRIPTION="A TLS 1.2 and SSL 3.0 implementation for the GNU project"
59 HOMEPAGE="http://www.gnutls.org/"
60 SRC_URI="mirror://gnupg/gnutls/v$(get_version_component_range 1-2)/${P}.tar.xz"
61
62 # LGPL-3 for libgnutls library and GPL-3 for libgnutls-extra library.
63 # soon to be relicensed as LGPL-2.1 unless heartbeat extension enabled.
64 LICENSE="GPL-3 LGPL-3"
65 SLOT="0"
66 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
67 IUSE_LINGUAS=" en cs de fi fr it ms nl pl sv uk vi zh_CN"
68 IUSE="+cxx +crywrap dane doc examples guile nls pkcs11 static-libs test zlib ${IUSE_LINGUAS// / linguas_}"
69 # heartbeat support is not disabled until re-licensing happens fullyf
70
71 # NOTICE: sys-devel/autogen is required at runtime as we
72 # use system libopts
73 RDEPEND=">=dev-libs/libtasn1-2.14
74 >=dev-libs/nettle-2.7[gmp]
75 dev-libs/gmp
76 sys-devel/autogen
77 crywrap? ( net-dns/libidn )
78 dane? ( net-dns/unbound )
79 guile? ( >=dev-scheme/guile-1.8[networking] )
80 nls? ( virtual/libintl )
81 pkcs11? ( >=app-crypt/p11-kit-0.19.2 )
82 zlib? ( >=sys-libs/zlib-1.2.3.1 )"
83 DEPEND="${RDEPEND}
84 >=sys-devel/automake-1.11.6
85 virtual/pkgconfig
86 doc? ( dev-util/gtk-doc )
87 nls? ( sys-devel/gettext )
88 test? ( app-misc/datefudge )"
89
90 DOCS=( AUTHORS ChangeLog NEWS README THANKS doc/TODO )
91
92 S=${WORKDIR}/${PN}-$(get_version_component_range 1-3)
93
94 src_prepare() {
95 # tests/suite directory is not distributed
96 sed -i \
97 -e ':AC_CONFIG_FILES(\[tests/suite/Makefile\]):d' \
98 -e '/^AM_INIT_AUTOMAKE/s/-Werror//' \
99 configure.ac || die
100
101 sed -i \
102 -e 's/imagesdir = $(infodir)/imagesdir = $(htmldir)/' \
103 doc/Makefile.am || die
104
105 # force regeneration of autogen-ed files
106 local file
107 for file in $(grep -l AutoGen-ed src/*.c) ; do
108 rm src/$(basename ${file} .c).{c,h} || die
109 done
110
111 epatch "${FILESDIR}/${PN}-2.12.23-gl-tests-getaddrinfo-skip-if-no-network.patch"
112
113 # support user patches
114 epatch_user
115
116 eautoreconf
117
118 # Use sane .so versioning on FreeBSD.
119 elibtoolize
120
121 # bug 497472
122 use cxx || epunt_cxx
123 }
124
125 src_configure() {
126 LINGUAS="${LINGUAS//en/en@boldquot en@quot}"
127
128 # TPM needs to be tested before being enabled
129 # hardware-accell is disabled on OSX because the asm files force
130 # GNU-stack (as doesn't support that) and when that's removed ld
131 # complains about duplicate symbols
132 econf \
133 --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
134 --disable-valgrind-tests \
135 --enable-heartbeat-support \
136 $(use_enable cxx) \
137 $(use_enable dane libdane) \
138 $(use_enable doc gtk-doc) \
139 $(use_enable doc gtk-doc-pdf) \
140 $(use_enable guile) \
141 $(use_enable crywrap) \
142 $(use_enable nls) \
143 $(use_enable static-libs static) \
144 $(use_with pkcs11 p11-kit) \
145 $(use_with zlib) \
146 --without-tpm \
147 $([[ ${CHOST} == *-darwin* ]] && echo --disable-hardware-acceleration)
148 }
149
150 src_test() {
151 # parallel testing often fails
152 emake -j1 check
153 }
154
155 src_install() {
156 default
157
158 find "${ED}" -name '*.la' -delete
159
160 dodoc doc/certtool.cfg
161
162 if use doc; then
163 dodoc doc/gnutls.pdf
164 dohtml doc/gnutls.html
165 fi
166
167 if use examples; then
168 docinto examples
169 dodoc doc/examples/*.c
170 fi
171 }
172
173
174
175 1.1 net-libs/gnutls/gnutls-3.3.4.ebuild
176
177 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/gnutls/gnutls-3.3.4.ebuild?rev=1.1&view=markup
178 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/gnutls/gnutls-3.3.4.ebuild?rev=1.1&content-type=text/plain
179
180 Index: gnutls-3.3.4.ebuild
181 ===================================================================
182 # Copyright 1999-2014 Gentoo Foundation
183 # Distributed under the terms of the GNU General Public License v2
184 # $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-3.3.4.ebuild,v 1.1 2014/06/01 07:59:10 radhermit Exp $
185
186 EAPI=5
187
188 inherit autotools libtool eutils multilib-minimal versionator
189
190 DESCRIPTION="A TLS 1.2 and SSL 3.0 implementation for the GNU project"
191 HOMEPAGE="http://www.gnutls.org/"
192 SRC_URI="mirror://gnupg/gnutls/v$(get_version_component_range 1-2)/${P}.tar.xz"
193
194 # LGPL-3 for libgnutls library and GPL-3 for libgnutls-extra library.
195 # soon to be relicensed as LGPL-2.1 unless heartbeat extension enabled.
196 LICENSE="GPL-3 LGPL-3"
197 SLOT="0"
198 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
199 IUSE_LINGUAS=" en cs de fi fr it ms nl pl sv uk vi zh_CN"
200 IUSE="+cxx +crywrap dane doc examples guile nls pkcs11 static-libs test zlib ${IUSE_LINGUAS// / linguas_}"
201 # heartbeat support is not disabled until re-licensing happens fullyf
202
203 # NOTICE: sys-devel/autogen is required at runtime as we
204 # use system libopts
205 RDEPEND=">=dev-libs/libtasn1-2.14[${MULTILIB_USEDEP}]
206 >=dev-libs/nettle-2.7[gmp,${MULTILIB_USEDEP}]
207 dev-libs/gmp[${MULTILIB_USEDEP}]
208 sys-devel/autogen
209 crywrap? ( net-dns/libidn )
210 dane? ( net-dns/unbound[${MULTILIB_USEDEP}] )
211 guile? ( >=dev-scheme/guile-1.8[networking] )
212 nls? ( virtual/libintl[${MULTILIB_USEDEP}] )
213 pkcs11? ( >=app-crypt/p11-kit-0.19.2[${MULTILIB_USEDEP}] )
214 zlib? ( >=sys-libs/zlib-1.2.3.1[${MULTILIB_USEDEP}] )
215 abi_x86_32? (
216 !<=app-emulation/emul-linux-x86-baselibs-20140508
217 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
218 )"
219 DEPEND="${RDEPEND}
220 >=sys-devel/automake-1.11.6
221 virtual/pkgconfig[${MULTILIB_USEDEP}]
222 doc? ( dev-util/gtk-doc )
223 nls? ( sys-devel/gettext )
224 test? ( app-misc/datefudge )"
225
226 DOCS=( AUTHORS ChangeLog NEWS README THANKS doc/TODO )
227
228 S=${WORKDIR}/${PN}-$(get_version_component_range 1-3)
229
230 src_prepare() {
231 sed -i \
232 -e 's/imagesdir = $(infodir)/imagesdir = $(htmldir)/' \
233 doc/Makefile.am || die
234
235 # force regeneration of autogen-ed files
236 local file
237 for file in $(grep -l AutoGen-ed src/*.c) ; do
238 rm src/$(basename ${file} .c).{c,h} || die
239 done
240
241 # support user patches
242 epatch_user
243
244 eautoreconf
245
246 # Use sane .so versioning on FreeBSD.
247 elibtoolize
248
249 # bug 497472
250 use cxx || epunt_cxx
251 }
252
253 multilib_src_configure() {
254 LINGUAS="${LINGUAS//en/en@boldquot en@quot}"
255
256 # TPM needs to be tested before being enabled
257 # hardware-accell is disabled on OSX because the asm files force
258 # GNU-stack (as doesn't support that) and when that's removed ld
259 # complains about duplicate symbols
260 ECONF_SOURCE=${S} \
261 econf \
262 --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
263 --disable-valgrind-tests \
264 --enable-heartbeat-support \
265 $(use_enable cxx) \
266 $(use_enable dane libdane) \
267 $(multilib_native_use_enable doc gtk-doc) \
268 $(multilib_native_use_enable doc gtk-doc-pdf) \
269 $(multilib_native_use_enable guile) \
270 $(multilib_native_use_enable crywrap) \
271 $(use_enable nls) \
272 $(use_enable static-libs static) \
273 $(use_with pkcs11 p11-kit) \
274 $(use_with zlib) \
275 --without-tpm \
276 $([[ ${CHOST} == *-darwin* ]] && echo --disable-hardware-acceleration)
277 }
278
279 multilib_src_compile() {
280 if multilib_is_native_abi; then
281 default
282
283 # symlink certtool for use in other ABIs
284 if use test; then
285 ln -s "${BUILD_DIR}"/src "${T}"/native-tools || die
286 fi
287 else
288 emake -C gl
289 emake -C lib
290 emake -C extra
291 use dane && emake -C libdane
292 fi
293 }
294
295 multilib_src_test() {
296 if multilib_is_native_abi; then
297 # parallel testing often fails
298 emake -j1 check
299 else
300 # use native ABI tools
301 ln -s "${T}"/native-tools/{certtool,gnutls-{serv,cli}} \
302 "${BUILD_DIR}"/src/ || die
303
304 emake -C gl -j1 check
305 emake -C tests -j1 check
306 fi
307 }
308
309 multilib_src_install() {
310 if multilib_is_native_abi; then
311 emake DESTDIR="${D}" install
312 else
313 emake -C lib DESTDIR="${D}" install
314 emake -C extra DESTDIR="${D}" install
315 use dane && emake -C libdane DESTDIR="${D}" install
316 fi
317 }
318
319 multilib_src_install_all() {
320 einstalldocs
321 prune_libtool_files --all
322
323 dodoc doc/certtool.cfg
324
325 if use doc; then
326 dodoc doc/gnutls.pdf
327 dohtml doc/gnutls.html
328 fi
329
330 if use examples; then
331 docinto examples
332 dodoc doc/examples/*.c
333 fi
334 }
Report Message
Find on MARC Find on Google Groups