Version bump for gnutls

5 files changed, 149 insertions, 0 deletions

diff --git a/net-libs/gnutls/Manifest b/net-libs/gnutls/Manifest
index 1e33a08..feb6fc4 100644
--- a/net-libs/gnutls/Manifest
+++ b/net-libs/gnutls/Manifest
@@ -1,6 +1,11 @@
+AUX gnutls-2.2.5-CVE-2008-4989-V2.patch 650 RMD160 71ef81981ad1a95480c189145dab1ecc278b67b6 SHA1 09e53cac6797767128c745ab147db2b06aa245c6 SHA256 14c531bec64d75b3dedea801cc4f52cd884c335d95bd08c5e9e190f6170ebb5f
 AUX gnutls-2.3.11+gcc-4.3.patch 349 RMD160 192c663f741c6a2b6681b3873c199c64996d0000 SHA1 657ed9b73f7cfcbf348b94cff9f1ab9c2f8c7b59 SHA256 30dc6126ffa85a4765ca4724355759932990545c962ef2239fdb692af631e018
 AUX gnutls-2.5.4-cross-compile-paths.patch 884 RMD160 8c29c5be4d60d822cb3ffdebd22930a3412ee564 SHA1 0d2ac83c3e1f43bdd618888c77c8a70d16cd313f SHA256 e91ee5982b321e0d552bb23f9e2669630e49617d7721e724d373223d180d28c3
+AUX gnutls-2.6.0-cxx-configure.in.patch 502 RMD160 fdd7f402f2a9122f8d7db9b165670c42d83abeb8 SHA1 748b7a0f0b689169054970993d7b4a6331f52c33 SHA256 c7a3ff932c467d08b27eee7e8b5bd1ce97b200328fc90478dee5ea3a59b18f71
+AUX gnutls-2.6.0-openpgp-selftest.patch 508 RMD160 dcd254a8078c4ab21662377e4f53176a541292e4 SHA1 f73103e1aa5dcccd4449b42123c00b0e782cac67 SHA256 235e0a1e588548eb52627d9fae528c680aeaf260e6cb87afa86a624f134fbd08
 DIST gnutls-2.5.4.tar.bz2 5035669 RMD160 ca8a46f2ead196fbf8b0bb85ba26a039bb189e10 SHA1 f73374eed8ff703834979558af1e0cf2d61919b2 SHA256 5309671f0eef1fcb5599d975c544f91b7d8ab19330838e1da0bcd08b152d9ff4
 DIST gnutls-2.6.2.tar.bz2 5113586 RMD160 10a37efe6bd90add75e338ca98eb09cc4ab69dc7 SHA1 2c7701b61c86d5cec8305f8741bc18bc64f33b31 SHA256 00b1f84bd2d5d10a457c3abf22371b5829fe6f0a2b2886eaf7f0a58f1cabe7c9
+DIST gnutls-2.6.4.tar.bz2 5115205 RMD160 771fd64026df69d770a0a681141591b21f9be751 SHA1 11dd1e11599906a32b3ff92308f4c4dbaadbad58 SHA256 728a5f9aa4b746d281a442e783caabcdd9df2292a2919ce3330cf75ac4ce0441
 EBUILD gnutls-2.5.4.ebuild 2281 RMD160 ca2328d378bae60f36e5f2f2786e18a4aba6b788 SHA1 6a2013f050b1a844531840c086a695ecbd253f73 SHA256 b2377a3193bd158a6d49356d38ca4de932cc6c0d18ae687ad3ed5f5d87a3ee74
 EBUILD gnutls-2.6.2.ebuild 2288 RMD160 b2354e1c6a0226592410170362216d64b32150b5 SHA1 26906a233107df858c11583f3b311fda73d63b4c SHA256 604848749eac98925e931beb15e778ec0507c8dcd9976ad681624063af87c195
+EBUILD gnutls-2.6.4.ebuild 2498 RMD160 71599069c9565267c8467e31aa496e5b53009dfd SHA1 ca82458d97e93ace9203119c44f50cec67a61cb4 SHA256 5103c07cf22923e5d117da35c40c8c8eb5715382b9c43c066a4501613a55e4af
diff --git a/net-libs/gnutls/files/gnutls-2.2.5-CVE-2008-4989-V2.patch b/net-libs/gnutls/files/gnutls-2.2.5-CVE-2008-4989-V2.patch
new file mode 100644
index 0000000..154f1ba
--- /dev/null
+++ b/net-libs/gnutls/files/gnutls-2.2.5-CVE-2008-4989-V2.patch
@@ -0,0 +1,20 @@
+--- gnutls-2.4.1/lib/x509/verify.c.orig	2008-07-01 06:45:51.000000000 +1000
++++ gnutls-2.4.1/lib/x509/verify.c	2008-11-07 16:48:08.000000000 +1100
+@@ -414,17 +425,6 @@
+     }
+ #endif
+ 
+-  /* Check if the last certificate in the path is self signed.
+-   * In that case ignore it (a certificate is trusted only if it
+-   * leads to a trusted party by us, not the server's).
+-   */
+-  if (gnutls_x509_crt_check_issuer (certificate_list[clist_size - 1],
+-				    certificate_list[clist_size - 1]) > 0
+-      && clist_size > 0)
+-    {
+-      clist_size--;
+-    }
+-
+   /* Verify the certificate path (chain) 
+    */
+   for (i = clist_size - 1; i > 0; i--)
diff --git a/net-libs/gnutls/files/gnutls-2.6.0-cxx-configure.in.patch b/net-libs/gnutls/files/gnutls-2.6.0-cxx-configure.in.patch
new file mode 100644
index 0000000..8b884b7
--- /dev/null
+++ b/net-libs/gnutls/files/gnutls-2.6.0-cxx-configure.in.patch
@@ -0,0 +1,20 @@
+--- configure.in.orig	2008-11-04 22:27:44.000000000 +1100
++++ configure.in	2008-11-04 22:31:13.000000000 +1100
+@@ -79,7 +79,6 @@
+ 
+ dnl Checks for programs.
+ AC_PROG_CC
+-AC_PROG_CXX
+ AC_PROG_LN_S
+ GTK_DOC_CHECK(1.1)
+ AC_PATH_PROG([GAA], [gaa])
+@@ -114,6 +113,9 @@
+   AC_LANG_PUSH(C++)
+   AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[])], use_cxx=yes, use_cxx=no)
+   AC_LANG_POP(C++)
++  AC_PROG_CXX
++else
++  AM_CONDITIONAL([am__fastdepCXX], [false])
+ fi
+ 
+ AC_MSG_CHECKING([whether C99 macros are supported])
diff --git a/net-libs/gnutls/files/gnutls-2.6.0-openpgp-selftest.patch b/net-libs/gnutls/files/gnutls-2.6.0-openpgp-selftest.patch
new file mode 100644
index 0000000..661ca87
--- /dev/null
+++ b/net-libs/gnutls/files/gnutls-2.6.0-openpgp-selftest.patch
@@ -0,0 +1,14 @@
+--- tests/openpgp/Makefile.am.orig	2009-01-10 11:48:55.000000000 +1100
++++ tests/openpgp/Makefile.am	2009-01-10 11:49:13.000000000 +1100
+@@ -30,10 +30,7 @@
+ 
+ AM_CPPFLAGS = -I$(top_srcdir)/includes -I$(top_builddir)/includes	\
+ 	      -I$(top_srcdir)/tests
+-LDADD = -L$(top_builddir)/libextra -lgnutls-extra	\
+-        -L$(top_builddir)/lib      -lgnutls		\
+-	-L$(top_builddir)/tests    -lutils
+-
++LDADD = ../lib/libgnutls.la ../lib/libgnutls-extra.la ../libutils.la
+ else
+ 
+ EXTRA_DIST = $(openpgp_sources)
diff --git a/net-libs/gnutls/gnutls-2.6.4.ebuild b/net-libs/gnutls/gnutls-2.6.4.ebuild
new file mode 100644
index 0000000..783aec9
--- /dev/null
+++ b/net-libs/gnutls/gnutls-2.6.4.ebuild
@@ -0,0 +1,90 @@
+# 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.6.4.ebuild,v 1.1 2009/03/01 20:01:43 dragonheart Exp $
+
+EAPI="2"
+inherit eutils libtool autotools
+
+DESCRIPTION="A TLS 1.0 and SSL 3.0 implementation for the GNU project"
+HOMEPAGE="http://www.gnutls.org/"
+
+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
+
+# 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 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 )"
+
+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() {
+	for dir in m4 lib/m4 libextra/m4 ; do
+		rm -f ${dir}/lt* ${dir}/libtool.m4
+	done
+	find . -name ltmain.sh -exec rm {} \;
+
+	# the below patch is in 2.7.* as per
+	# https://savannah.gnu.org/support/?106542
+	epatch "${FILESDIR}"/gnutls-2.6.0-cxx-configure.in.patch
+	epatch "${FILESDIR}"/gnutls-2.6.0-openpgp-selftest.patch
+
+	# For cross-compilation make sure we don't have nhost paths in there
+	if tc-is-cross-compiler ; then
+		epatch "${FILESDIR}/${PN}-2.5.4-cross-compile-paths.patch"
+	fi
+
+	eautoreconf
+
+	elibtoolize # for sane .so versioning on FreeBSD
+}
+
+src_configure() {
+	local myconf
+	use bindist && myconf="--without-lzo" || myconf="$(use_with lzo)"
+	econf  \
+		$(use_with zlib) \
+		$(use_enable nls) \
+		$(use_enable guile) \
+		$(use_enable cxx) \
+		$(use_enable doc gtk-doc) \
+		${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/README.autoconf doc/tex/gnutls.ps
+		docinto examples
+		dodoc doc/examples/*.c
+	fi
+}