[gentoo-commits] gentoo-x86 commit in net-libs/gnutls: gnutls-2.12.23-r1.ebuild gnutls-3.1.10.ebuild gnutls-3.2.0.ebuild gnutls-3.1.11.ebuild ChangeLog

[Tim Harder (radhermit)]

radhermit    13/05/30 19:56:09

  Modified:             gnutls-3.1.10.ebuild gnutls-3.2.0.ebuild
                        gnutls-3.1.11.ebuild ChangeLog
  Added:                gnutls-2.12.23-r1.ebuild
  Log:
  Revision bump to fix CVE-2013-2116 (bug #471788), drop redundant --disable-silent-rules econf option for EAPI 5 ebuilds, and run tests serially since they often fail in parallel.
  
  (Portage version: 2.2.0_alpha177/cvs/Linux x86_64, signed Manifest commit with key 4AB3E85B4F064CA3)

Revision  Changes    Path
1.3                  net-libs/gnutls/gnutls-3.1.10.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/gnutls/gnutls-3.1.10.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/gnutls/gnutls-3.1.10.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/gnutls/gnutls-3.1.10.ebuild?r1=1.2&r2=1.3

Index: gnutls-3.1.10.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-3.1.10.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gnutls-3.1.10.ebuild	22 May 2013 10:10:43 -0000	1.2
+++ gnutls-3.1.10.ebuild	30 May 2013 19:56:09 -0000	1.3
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-3.1.10.ebuild,v 1.2 2013/05/22 10:10:43 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-3.1.10.ebuild,v 1.3 2013/05/30 19:56:09 radhermit Exp $
 
 EAPI=5
 
@@ -76,7 +76,6 @@
 	# TPM needs to be tested before being enabled
 	econf \
 		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
-		--disable-silent-rules \
 		--disable-valgrind-tests \
 		--enable-heartbeat-support \
 		$(use_enable cxx) \
@@ -91,6 +90,11 @@
 		--without-tpm
 }
 
+src_test() {
+	# parallel testing often fails
+	emake -j1 check
+}
+
 src_install() {
 	default
 



1.4                  net-libs/gnutls/gnutls-3.2.0.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/gnutls/gnutls-3.2.0.ebuild?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/gnutls/gnutls-3.2.0.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/gnutls/gnutls-3.2.0.ebuild?r1=1.3&r2=1.4

Index: gnutls-3.2.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-3.2.0.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gnutls-3.2.0.ebuild	22 May 2013 18:32:22 -0000	1.3
+++ gnutls-3.2.0.ebuild	30 May 2013 19:56:09 -0000	1.4
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-3.2.0.ebuild,v 1.3 2013/05/22 18:32:22 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-3.2.0.ebuild,v 1.4 2013/05/30 19:56:09 radhermit Exp $
 
 EAPI=5
 
@@ -76,7 +76,6 @@
 	# TPM needs to be tested before being enabled
 	econf \
 		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
-		--disable-silent-rules \
 		--disable-valgrind-tests \
 		--enable-heartbeat-support \
 		$(use_enable cxx) \
@@ -91,6 +90,11 @@
 		--without-tpm
 }
 
+src_test() {
+	# parallel testing often fails
+	emake -j1 check
+}
+
 src_install() {
 	default
 



1.3                  net-libs/gnutls/gnutls-3.1.11.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/gnutls/gnutls-3.1.11.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/gnutls/gnutls-3.1.11.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/gnutls/gnutls-3.1.11.ebuild?r1=1.2&r2=1.3

Index: gnutls-3.1.11.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-3.1.11.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gnutls-3.1.11.ebuild	22 May 2013 10:10:43 -0000	1.2
+++ gnutls-3.1.11.ebuild	30 May 2013 19:56:09 -0000	1.3
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-3.1.11.ebuild,v 1.2 2013/05/22 10:10:43 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-3.1.11.ebuild,v 1.3 2013/05/30 19:56:09 radhermit Exp $
 
 EAPI=5
 
@@ -76,7 +76,6 @@
 	# TPM needs to be tested before being enabled
 	econf \
 		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
-		--disable-silent-rules \
 		--disable-valgrind-tests \
 		--enable-heartbeat-support \
 		$(use_enable cxx) \
@@ -91,6 +90,11 @@
 		--without-tpm
 }
 
+src_test() {
+	# parallel testing often fails
+	emake -j1 check
+}
+
 src_install() {
 	default
 



1.429                net-libs/gnutls/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/gnutls/ChangeLog?rev=1.429&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/gnutls/ChangeLog?rev=1.429&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/gnutls/ChangeLog?r1=1.428&r2=1.429

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-libs/gnutls/ChangeLog,v
retrieving revision 1.428
retrieving revision 1.429
diff -u -r1.428 -r1.429
--- ChangeLog	22 May 2013 18:32:22 -0000	1.428
+++ ChangeLog	30 May 2013 19:56:09 -0000	1.429
@@ -1,6 +1,15 @@
 # ChangeLog for net-libs/gnutls
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/ChangeLog,v 1.428 2013/05/22 18:32:22 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/ChangeLog,v 1.429 2013/05/30 19:56:09 radhermit Exp $
+
+*gnutls-2.12.23-r1 (30 May 2013)
+
+  30 May 2013; Tim Harder <radhermit@g.o> +gnutls-2.12.23-r1.ebuild,
+  gnutls-3.1.10.ebuild, gnutls-3.1.11.ebuild, gnutls-3.2.0.ebuild,
+  +files/gnutls-2.12.23-CVE-2013-2116.patch:
+  Revision bump to fix CVE-2013-2116 (bug #471788), drop redundant
+  --disable-silent-rules econf option for EAPI 5 ebuilds, and run tests
+  serially since they often fail in parallel.
 
   22 May 2013; Tim Harder <radhermit@g.o> gnutls-3.2.0.ebuild:
   Update nettle dep (bug #471022).



1.1                  net-libs/gnutls/gnutls-2.12.23-r1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/gnutls/gnutls-2.12.23-r1.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/gnutls/gnutls-2.12.23-r1.ebuild?rev=1.1&content-type=text/plain

Index: gnutls-2.12.23-r1.ebuild
===================================================================
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-2.12.23-r1.ebuild,v 1.1 2013/05/30 19:56:09 radhermit Exp $

EAPI=5

inherit autotools libtool eutils versionator

DESCRIPTION="A TLS 1.2 and SSL 3.0 implementation for the GNU project"
HOMEPAGE="http://www.gnutls.org/"
SRC_URI="ftp://ftp.gnutls.org/gcrypt/gnutls/v$(get_version_component_range 1-2)/${P}.tar.bz2"

# LGPL-2.1 for libgnutls library and GPL-3 for libgnutls-extra library.
LICENSE="GPL-3 LGPL-2.1"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE="bindist +cxx doc examples guile lzo +nettle nls pkcs11 static-libs test zlib"

RDEPEND=">=dev-libs/libtasn1-0.3.4
	<dev-libs/libtasn1-3
	guile? ( >=dev-scheme/guile-1.8[networking] )
	nettle? ( >=dev-libs/nettle-2.1[gmp] )
	!nettle? ( >=dev-libs/libgcrypt-1.4.0 )
	nls? ( virtual/libintl )
	pkcs11? ( >=app-crypt/p11-kit-0.11 )
	zlib? ( >=sys-libs/zlib-1.2.3.1 )
	!bindist? ( lzo? ( >=dev-libs/lzo-2 ) )"
DEPEND="${RDEPEND}
	virtual/pkgconfig
	sys-devel/libtool
	doc? ( dev-util/gtk-doc )
	nls? ( sys-devel/gettext )
	test? ( app-misc/datefudge )"

DOCS=( AUTHORS ChangeLog NEWS README THANKS doc/TODO )

pkg_setup() {
	if use lzo && use bindist; then
		ewarn "lzo support is disabled for binary distribution of GnuTLS due to licensing issues."
	fi
}

src_prepare() {
	# tests/suite directory is not distributed
	sed -i -e 's|AC_CONFIG_FILES(\[tests/suite/Makefile\])|:|' \
		configure.ac || die

	sed -i -e 's/imagesdir = $(infodir)/imagesdir = $(htmldir)/' \
		doc/Makefile.am || die

	local dir
	for dir in m4 lib/m4 libextra/m4; do
		rm -f "${dir}/lt"* "${dir}/libtool.m4"
	done
	find . -name ltmain.sh -exec rm {} \;

	epatch "${FILESDIR}"/${PN}-2.12.20-AF_UNIX.patch
	epatch "${FILESDIR}"/${PN}-2.12.20-libadd.patch
	epatch "${FILESDIR}"/${PN}-2.12.20-guile-parallelmake.patch
	epatch "${FILESDIR}"/${PN}-2.12.23-CVE-2013-2116.patch

	# support user patches
	epatch_user

	for dir in . lib libextra; do
		pushd "${dir}" > /dev/null
		sed -i -e '/^AM_INIT_AUTOMAKE/s/-Werror//' configure.ac || die
		eautoreconf
		popd > /dev/null
	done

	# Use sane .so versioning on FreeBSD.
	elibtoolize
}

src_configure() {
	local myconf
	use bindist && myconf="--without-lzo" || myconf="$(use_with lzo)"
	[[ "${VALGRIND_TESTS}" != "1" ]] && myconf+=" --disable-valgrind-tests"

	econf \
		--htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
		$(use_enable cxx) \
		$(use_enable doc gtk-doc) \
		$(use_enable doc gtk-doc-pdf) \
		$(use_enable guile) \
		$(use_with !nettle libgcrypt) \
		$(use_enable nls) \
		$(use_with pkcs11 p11-kit) \
		$(use_enable static-libs static) \
		$(use_with zlib) \
		${myconf}
}

src_test() {
	if has_version dev-util/valgrind && [[ ${VALGRIND_TESTS} != 1 ]]; then
		elog
		elog "You can set VALGRIND_TESTS=\"1\" to enable Valgrind tests."
		elog
	fi

	# parallel testing often fails
	emake -j1 check
}

src_install() {
	default

	prune_libtool_files

	if use doc; then
		dodoc doc/gnutls.{pdf,ps}
		dohtml doc/gnutls.html
	fi

	if use examples; then
		docinto examples
		dodoc doc/examples/*.c
	fi
}