Fix reading of memory (bug #281249).

Package-Manager: portage-14014-svn/cvs/Linux x86_64

4 files changed, 135 insertions, 2 deletions

diff --git a/net-libs/gnutls/ChangeLog b/net-libs/gnutls/ChangeLog
index 55b6e00f62c3..cfa32a8864c5 100644
--- a/net-libs/gnutls/ChangeLog
+++ b/net-libs/gnutls/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-libs/gnutls
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/ChangeLog,v 1.205 2009/08/10 18:50:07 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/ChangeLog,v 1.206 2009/08/13 01:06:06 arfrever Exp $
+
+*gnutls-2.8.2-r1 (13 Aug 2009)
+
+  13 Aug 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  +gnutls-2.8.2-r1.ebuild, +files/gnutls-2.8.2-fix_reading_of_memory.patch:
+  Fix reading of memory (bug #281249).
 
 *gnutls-2.8.2 (10 Aug 2009)
 
diff --git a/net-libs/gnutls/Manifest b/net-libs/gnutls/Manifest
index ff93273f79c9..14db3459f4a9 100644
--- a/net-libs/gnutls/Manifest
+++ b/net-libs/gnutls/Manifest
@@ -1,11 +1,13 @@
 AUX gnutls-2.6.0-cxx-configure.in.patch 502 RMD160 fdd7f402f2a9122f8d7db9b165670c42d83abeb8 SHA1 748b7a0f0b689169054970993d7b4a6331f52c33 SHA256 c7a3ff932c467d08b27eee7e8b5bd1ce97b200328fc90478dee5ea3a59b18f71
+AUX gnutls-2.8.2-fix_reading_of_memory.patch 751 RMD160 bb42880eb7a2aebbe3672c473710bfae5406abcf SHA1 aa442a84d8b43d29a6e4c76fcc34db5136c0162f SHA256 fa03d46f45f8b3f90667019936a45a8af52879de4ffa76529cb5abee83ab420d
 DIST gnutls-2.6.6.tar.bz2 5116385 RMD160 dc6e717e38741628508208244f07fed8faedb13c SHA1 d1693e611aa7270f14bc500bd56ef529ffcb1703 SHA256 03d85b8b51ca7885740c69b87663963c58fe7c9672da0a43e45732078fabdc9e
 DIST gnutls-2.8.1.tar.bz2 6178662 RMD160 3b0d7a80a60dfc3222357d2c83a7ec32bd2c8e33 SHA1 b5fd364848709393d05def7e926caddd27169525 SHA256 a0300966a9761444b1e583c676f6c5c81e916897ea7d2e44d0c732c9d6e9c1ea
 DIST gnutls-2.8.2.tar.bz2 6190080 RMD160 1d2c7b0a1a7bf203525fbcebfffe48cc7d37d8f2 SHA1 eea59fb972e7d566679645a564a56b58aeffe10b SHA256 a64bfc31c52aee82417c44c0da8ebe697456ac33b531afa760233f2c07c68b19
 DIST gnutls-2.9.1.tar.bz2 6116679 RMD160 e219ca10a3918340c4defe71391af552b48739e4 SHA1 51ec5ed5670593e7a9f9d2c07da4086eef733970 SHA256 6207114a7c476187c9498ca5cf952e5e815932af87cd304eadf0ddf2d4496e7d
 EBUILD gnutls-2.6.6.ebuild 2308 RMD160 61b3ccbbc81ede2805b4343170601af5107596ff SHA1 90c306b4221a31c2423fe96cc1a2dbfce9167293 SHA256 0070991bc9a4408ff8c907be124c3fcddf48e1bb7a08424df3fc587abddfe449
 EBUILD gnutls-2.8.1.ebuild 2524 RMD160 dcb14252b6d8a51681ba0c5ef34279b5c088f60a SHA1 656d8e5894337e460f7b5506a721ee68b05f2775 SHA256 3d51c8d22627477ade5715936c77e796dcc41bc59f10308c09ae430466ff0463
+EBUILD gnutls-2.8.2-r1.ebuild 2583 RMD160 ecab16344617a385afb9c198039aec52cf4db3ec SHA1 9d3d3ee79bd72c4062c01dead5f8f8109c00ea59 SHA256 688b039ff8e856adf665a8e0934d43c3eb4c06ef5049afbe868fcadc0d97a07c
 EBUILD gnutls-2.8.2.ebuild 2524 RMD160 cf99140ffe5e51e3425bbb3d51f5b6b952168ba2 SHA1 21e876bfd51c3b4b2e8dba4dc99385067fa3e5fe SHA256 f8a2f32d47fbb868fc482cbd4319b2ebe8d3c35163e91522bda02ebf7d745747
 EBUILD gnutls-2.9.1.ebuild 2524 RMD160 14184aa042b51dd371c6a00da1e01e6784c89a35 SHA1 420c556d82424b3bd24db3d887b42957ddd08b4b SHA256 b9270ea7f60d33309bd18c678fed43bc55668e24520b2a31af822a9a4725c9b0
-MISC ChangeLog 31687 RMD160 e69234a3d5f824e72e03f308f8f8038ff00b8c76 SHA1 bc6f029ca5ee0be4ddcf134cdccd1625b7f68b7f SHA256 7b8721f676d9d57bacaae5bacee3e07b69ab4dbc0dffd2761a6a24d4f31bac03
+MISC ChangeLog 31908 RMD160 308970bd28a3f6f13b663a52d0aa7df2d54e59bc SHA1 7596362cc930f102fe4b993177603efd9a739a8a SHA256 eeb60fca81fc2e74fb1a38a33a7c82dc78fe8cbbdae91ef95d5c9a0dd15306bf
 MISC metadata.xml 160 RMD160 61ea9f9370afee3db802f40f7c6b2edd2f5347cf SHA1 51cf29a3589cff823294704e225b0de18f65e6dd SHA256 7419f4e73ddd07284403525f1380824fc68280cad69e2dfae0645ad52b33ef10
diff --git a/net-libs/gnutls/files/gnutls-2.8.2-fix_reading_of_memory.patch b/net-libs/gnutls/files/gnutls-2.8.2-fix_reading_of_memory.patch
new file mode 100644
index 000000000000..99bd1b76cbe6
--- /dev/null
+++ b/net-libs/gnutls/files/gnutls-2.8.2-fix_reading_of_memory.patch
@@ -0,0 +1,26 @@
+http://git.savannah.gnu.org/gitweb/?p=gnutls.git;a=commitdiff;h=c12e7507562d5f168330acf1dd7db7cc2079cdf0
+
+--- lib/x509/common.c
++++ lib/x509/common.c
+@@ -181,7 +181,7 @@ _gnutls_x509_oid_data2string (const char *oid, void *value,
+ {
+   char str[MAX_STRING_LEN], tmpname[128];
+   const char *ANAME = NULL;
+-  int CHOICE = -1, len = -1, result, i;
++  int CHOICE = -1, len = -1, result;
+   ASN1_TYPE tmpasn = ASN1_TYPE_EMPTY;
+   char asn1_err[ASN1_MAX_ERROR_DESCRIPTION_SIZE] = "";
+ 
+@@ -317,12 +317,6 @@ _gnutls_x509_oid_data2string (const char *oid, void *value,
+ 	    }
+ 	}
+     }
+-  
+-  /* Convert null char in the name to '?'
+-   * to protect applications */
+-  for (i=0;i<*res_size;i++) {
+-      if (res[i] == 0) res[i]='?';
+-  }
+ 
+   return 0;
+ }
diff --git a/net-libs/gnutls/gnutls-2.8.2-r1.ebuild b/net-libs/gnutls/gnutls-2.8.2-r1.ebuild
new file mode 100644
index 000000000000..13c7e3010059
--- /dev/null
+++ b/net-libs/gnutls/gnutls-2.8.2-r1.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-2.8.2-r1.ebuild,v 1.1 2009/08/13 01:06:06 arfrever Exp $
+
+EAPI="2"
+
+inherit autotools libtool
+
+DESCRIPTION="A TLS 1.0 and SSL 3.0 implementation for the GNU project"
+HOMEPAGE="http://www.gnutls.org/"
+
+if [[ "${PV}" == *pre* ]]; then
+	SRC_URI="http://daily.josefsson.org/${P%.*}/${P%.*}-${PV#*pre}.tar.gz"
+else
+	MINOR_VERSION="${PV#*.}"
+	MINOR_VERSION="${MINOR_VERSION%.*}"
+	if [[ $((MINOR_VERSION % 2)) == 0 ]]; then
+		#SRC_URI="ftp://ftp.gnu.org/pub/gnu/${PN}/${P}.tar.bz2"
+		SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
+	else
+		SRC_URI="ftp://alpha.gnu.org/gnu/${PN}/${P}.tar.bz2"
+	fi
+	unset MINOR_VERSION
+fi
+
+# GPL-3 for the gnutls-extras library and LGPL for the gnutls library.
+LICENSE="LGPL-2.1 GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
+IUSE="bindist +cxx doc examples guile lzo nls zlib"
+
+RDEPEND="dev-libs/libgpg-error
+	>=dev-libs/libgcrypt-1.4.0
+	>=dev-libs/libtasn1-0.3.4
+	nls? ( virtual/libintl )
+	guile? ( dev-scheme/guile[networking] )
+	zlib? ( >=sys-libs/zlib-1.1 )
+	!bindist? ( lzo? ( >=dev-libs/lzo-2 ) )"
+DEPEND="${RDEPEND}
+	sys-devel/libtool
+	doc? ( dev-util/gtk-doc )
+	nls? ( sys-devel/gettext )"
+
+S="${WORKDIR}/${P%_pre*}"
+
+pkg_setup() {
+	if use lzo && use bindist; then
+		ewarn "lzo support was disabled for binary distribution of gnutls"
+		ewarn "due to licensing issues. See Bug 202381 for details."
+		epause 5
+	fi
+}
+
+src_prepare() {
+	sed -e 's/imagesdir = $(infodir)/imagesdir = $(htmldir)/' -i doc/Makefile.am
+
+	epatch "${FILESDIR}/${P}-fix_reading_of_memory.patch"
+
+	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 {} \;
+	for dir in . lib libextra; do
+		pushd "${dir}" > /dev/null
+		eautoreconf
+		popd > /dev/null
+	done
+
+	elibtoolize # for sane .so versioning on FreeBSD
+}
+
+src_configure() {
+	local myconf
+	use bindist && myconf="--without-lzo" || myconf="$(use_with lzo)"
+	econf --htmldir=/usr/share/doc/${P}/html \
+		$(use_enable cxx) \
+		$(use_enable doc gtk-doc) \
+		$(use_enable guile) \
+		$(use_enable nls) \
+		$(use_with zlib) \
+		${myconf}
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	dodoc AUTHORS ChangeLog NEWS README THANKS doc/TODO
+
+	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
+}