summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFabian Groffen <grobian@gentoo.org>2013-10-22 18:41:24 +0000
committerFabian Groffen <grobian@gentoo.org>2013-10-22 18:41:24 +0000
commit015c1542fd3aa8d52efba34455caa24485fe8864 (patch)
tree2098707af2e650fc1a62ea2b9100739b3121a3b0 /net-libs/gnutls
parentReturn to git-2.eclass, reverting previous commit. (diff)
downloadgentoo-2-015c1542fd3aa8d52efba34455caa24485fe8864.tar.gz
gentoo-2-015c1542fd3aa8d52efba34455caa24485fe8864.tar.bz2
gentoo-2-015c1542fd3aa8d52efba34455caa24485fe8864.zip
Add patch from upstream to fix compilation on Darwin, bug #488498
(Portage version: 2.2.7-prefix/cvs/SunOS i386, signed Manifest commit with key 0x5F75F607C5C74E89)
Diffstat (limited to 'net-libs/gnutls')
-rw-r--r--net-libs/gnutls/ChangeLog5
-rw-r--r--net-libs/gnutls/gnutls-3.2.4.ebuild8
2 files changed, 10 insertions, 3 deletions
diff --git a/net-libs/gnutls/ChangeLog b/net-libs/gnutls/ChangeLog
index 4f97fa9774d3..b6d4239d53a0 100644
--- a/net-libs/gnutls/ChangeLog
+++ b/net-libs/gnutls/ChangeLog
@@ -1,6 +1,9 @@
# 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.449 2013/09/22 14:06:38 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/ChangeLog,v 1.450 2013/10/22 18:41:24 grobian Exp $
+
+ 22 Oct 2013; Fabian Groffen <grobian@gentoo.org> gnutls-3.2.4.ebuild:
+ Add patch from upstream to fix compilation on Darwin, bug #488498
22 Sep 2013; Chris Reffett <creffett@gentoo.org> -gnutls-2.12.20.ebuild:
Drop affected version wrt bug 455560
diff --git a/net-libs/gnutls/gnutls-3.2.4.ebuild b/net-libs/gnutls/gnutls-3.2.4.ebuild
index 5e04e180165f..97d7a023efb6 100644
--- a/net-libs/gnutls/gnutls-3.2.4.ebuild
+++ b/net-libs/gnutls/gnutls-3.2.4.ebuild
@@ -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.4.ebuild,v 1.1 2013/09/01 18:51:32 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-3.2.4.ebuild,v 1.2 2013/10/22 18:41:24 grobian Exp $
EAPI=5
@@ -8,7 +8,8 @@ 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.xz"
+SRC_URI="ftp://ftp.gnutls.org/gcrypt/gnutls/v$(get_version_component_range 1-2)/${P}.tar.xz
+ https://gitorious.org/gnutls/gnutls/commit/1df1b0f7b28c733bf01e5d1faa2f8ccdb3db1665.patch -> ${P}-no-error.patch"
# LGPL-3 for libgnutls library and GPL-3 for libgnutls-extra library.
# soon to be relicensed as LGPL-2.1 unless heartbeat extension enabled.
@@ -62,6 +63,9 @@ src_prepare() {
rm src/$(basename ${file} .c).{c,h} || die
done
+ # from upstream, #488498
+ epatch "${DISTDIR}"/${P}-no-error.patch
+
# support user patches
epatch_user