summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Black <dragonheart@gentoo.org>2008-07-01 12:38:39 +0000
committerDaniel Black <dragonheart@gentoo.org>2008-07-01 12:38:39 +0000
commitc120815a8ce92ee9440d653d9d0ae4b322801b40 (patch)
tree9b1a3505739cdcc9853e42f87fb2522dfa6c6aa3 /net-libs/gnutls
parentAdded gnome2_icon_cache_update to postinst and postrm, bug 230299 (diff)
downloadgentoo-2-c120815a8ce92ee9440d653d9d0ae4b322801b40.tar.gz
gentoo-2-c120815a8ce92ee9440d653d9d0ae4b322801b40.tar.bz2
gentoo-2-c120815a8ce92ee9440d653d9d0ae4b322801b40.zip
version bump and older version cleanout as per security bug #230263 thanks rbu
(Portage version: 2.2_rc1/cvs/Linux 2.6.22-vs2.2.0.7-gentoo x86_64)
Diffstat (limited to 'net-libs/gnutls')
-rw-r--r--net-libs/gnutls/ChangeLog9
-rw-r--r--net-libs/gnutls/files/gnutls-2.3.15-qa_gnutls_session_is_psk.patch10
-rw-r--r--net-libs/gnutls/gnutls-2.4.0.ebuild76
-rw-r--r--net-libs/gnutls/gnutls-2.4.1.ebuild (renamed from net-libs/gnutls/gnutls-2.3.11.ebuild)4
4 files changed, 10 insertions, 89 deletions
diff --git a/net-libs/gnutls/ChangeLog b/net-libs/gnutls/ChangeLog
index 59e3c08989a8..d9911cd29b9d 100644
--- a/net-libs/gnutls/ChangeLog
+++ b/net-libs/gnutls/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for net-libs/gnutls
# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/ChangeLog,v 1.158 2008/06/19 09:26:25 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/ChangeLog,v 1.159 2008/07/01 12:38:39 dragonheart Exp $
+
+*gnutls-2.4.1 (01 Jul 2008)
+
+ 01 Jul 2008; Daniel Black <dragonheart@gentoo.org>
+ -files/gnutls-2.3.15-qa_gnutls_session_is_psk.patch,
+ -gnutls-2.3.11.ebuild, -gnutls-2.4.0.ebuild, +gnutls-2.4.1.ebuild:
+ version bump and older version cleanout as per security bug #230263 thanks rbu
*gnutls-2.4.0 (19 Jun 2008)
diff --git a/net-libs/gnutls/files/gnutls-2.3.15-qa_gnutls_session_is_psk.patch b/net-libs/gnutls/files/gnutls-2.3.15-qa_gnutls_session_is_psk.patch
deleted file mode 100644
index c8977c6f3bd5..000000000000
--- a/net-libs/gnutls/files/gnutls-2.3.15-qa_gnutls_session_is_psk.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- ./lib/gnutls_state.h.orig 2008-06-19 18:54:50.000000000 +1000
-+++ ./lib/gnutls_state.h 2008-06-19 18:55:57.000000000 +1000
-@@ -58,6 +58,7 @@
-
- int _gnutls_session_is_resumable (gnutls_session_t session);
- int _gnutls_session_is_export (gnutls_session_t session);
-+int _gnutls_session_is_psk (gnutls_session_t session);
-
- int _gnutls_openpgp_send_fingerprint (gnutls_session_t session);
-
diff --git a/net-libs/gnutls/gnutls-2.4.0.ebuild b/net-libs/gnutls/gnutls-2.4.0.ebuild
deleted file mode 100644
index ddb909b0f64e..000000000000
--- a/net-libs/gnutls/gnutls-2.4.0.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-2.4.0.ebuild,v 1.1 2008/06/19 09:26:25 dragonheart Exp $
-
-inherit libtool autotools eutils
-
-DESCRIPTION="A TLS 1.0 and SSL 3.0 implementation for the GNU project"
-HOMEPAGE="http://www.gnutls.org/"
-SRC_URI="http://www.gnu.org/software/gnutls/releases/${P}.tar.bz2"
-#SRC_URI="mirror://gnu/gnutls/${P}.tar.bz2"
-
-# 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="zlib lzo doc nls guile bindist"
-
-RDEPEND="dev-libs/libgpg-error
- >=dev-libs/libgcrypt-1.2.4
- >=dev-libs/libtasn1-0.3.4
- nls? ( virtual/libintl )
- guile? ( dev-scheme/guile )
- 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 guile && ! built_with_use dev-scheme/guile networking; then
- eerror "You are trying to compile ${PN} package with USE=\"guile\""
- eerror "while dev-scheme/guile does not have USE=\"networking\""
- die
- fi
- 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_unpack() {
- unpack ${A}
- cd "${S}"
-
- epatch "${FILESDIR}"/${PN}-2.3.11+gcc-4.3.patch
- epatch "${FILESDIR}"/${PN}-2.3.15-qa_gnutls_session_is_psk.patch
-
- elibtoolize # for sane .so versioning on FreeBSD
-}
-
-src_compile() {
- local myconf
- use bindist && myconf="--without-lzo" || myconf="$(use_with lzo)"
- econf \
- $(use_with zlib) \
- $(use_enable nls) \
- $(use_enable guile) \
- $(use_enable doc gtk-doc) \
- ${myconf}
- emake || die
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die
-
- 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
-}
diff --git a/net-libs/gnutls/gnutls-2.3.11.ebuild b/net-libs/gnutls/gnutls-2.4.1.ebuild
index 9101260b1878..4a65048ee4f4 100644
--- a/net-libs/gnutls/gnutls-2.3.11.ebuild
+++ b/net-libs/gnutls/gnutls-2.4.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-2.3.11.ebuild,v 1.3 2008/06/19 09:11:03 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-2.4.1.ebuild,v 1.1 2008/07/01 12:38:39 dragonheart Exp $
inherit libtool autotools eutils
@@ -44,7 +44,7 @@ src_unpack() {
unpack ${A}
cd "${S}"
- epatch "${FILESDIR}/${P}+gcc-4.3.patch"
+ epatch "${FILESDIR}"/${PN}-2.3.11+gcc-4.3.patch
elibtoolize # for sane .so versioning on FreeBSD
}