Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
path: root/net-libs/gnutls
diff options
context:
space:
mode:
Diffstat (limited to 'net-libs/gnutls')
-rw-r--r--net-libs/gnutls/ChangeLog10
-rw-r--r--net-libs/gnutls/gnutls-2.4.1-r1.ebuild3
-rw-r--r--net-libs/gnutls/gnutls-2.4.1.ebuild75
-rw-r--r--net-libs/gnutls/gnutls-2.6.0-r1.ebuild (renamed from net-libs/gnutls/gnutls-2.6.0.ebuild)4
-rw-r--r--net-libs/gnutls/gnutls-2.6.1.ebuild (renamed from net-libs/gnutls/gnutls-2.5.4.ebuild)31
5 files changed, 31 insertions, 92 deletions
diff --git a/net-libs/gnutls/ChangeLog b/net-libs/gnutls/ChangeLog
index 41265a123b31..595cf04698f1 100644
--- a/net-libs/gnutls/ChangeLog
+++ b/net-libs/gnutls/ChangeLog
@@ -1,6 +1,14 @@
# ChangeLog for net-libs/gnutls
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/ChangeLog,v 1.168 2008/11/10 15:00:56 hoffie Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/ChangeLog,v 1.169 2008/11/10 19:55:29 dragonheart Exp $
+
+*gnutls-2.6.1 (10 Nov 2008)
+*gnutls-2.6.0-r1 (10 Nov 2008)
+
+ 10 Nov 2008; Daniel Black <dragonheart@gentoo.org> -gnutls-2.4.1.ebuild,
+ gnutls-2.4.1-r1.ebuild, -gnutls-2.5.4.ebuild, -gnutls-2.6.0.ebuild,
+ +gnutls-2.6.0-r1.ebuild, +gnutls-2.6.1.ebuild:
+ more bumps for CVE. Remove old versions
*gnutls-2.4.1-r1 (10 Nov 2008)
diff --git a/net-libs/gnutls/gnutls-2.4.1-r1.ebuild b/net-libs/gnutls/gnutls-2.4.1-r1.ebuild
index 23286a635b70..ca60990614f0 100644
--- a/net-libs/gnutls/gnutls-2.4.1-r1.ebuild
+++ b/net-libs/gnutls/gnutls-2.4.1-r1.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.4.1-r1.ebuild,v 1.1 2008/11/10 15:00:56 hoffie Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-2.4.1-r1.ebuild,v 1.2 2008/11/10 19:55:29 dragonheart Exp $
inherit libtool eutils
@@ -45,7 +45,6 @@ src_unpack() {
cd "${S}"
epatch "${FILESDIR}"/${PN}-2.3.11+gcc-4.3.patch
- pwd
epatch "${FILESDIR}"/gnutls-2.2.5-CVE-2008-4989.patch
elibtoolize # for sane .so versioning on FreeBSD
diff --git a/net-libs/gnutls/gnutls-2.4.1.ebuild b/net-libs/gnutls/gnutls-2.4.1.ebuild
deleted file mode 100644
index 7312d4f2571b..000000000000
--- a/net-libs/gnutls/gnutls-2.4.1.ebuild
+++ /dev/null
@@ -1,75 +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.1.ebuild,v 1.2 2008/08/17 07:06:46 dragonheart Exp $
-
-inherit libtool 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
-
- 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.6.0.ebuild b/net-libs/gnutls/gnutls-2.6.0-r1.ebuild
index 637fdbbc4e3b..681e4bbfad18 100644
--- a/net-libs/gnutls/gnutls-2.6.0.ebuild
+++ b/net-libs/gnutls/gnutls-2.6.0-r1.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.6.0.ebuild,v 1.3 2008/11/05 10:39:09 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-2.6.0-r1.ebuild,v 1.1 2008/11/10 19:55:29 dragonheart Exp $
inherit eutils libtool autotools
@@ -55,7 +55,7 @@ src_unpack() {
rm m4/lt* m4/libtool.m4 build-aux/ltmain.sh
epatch "${FILESDIR}"/${P}-cxx-configure.in.patch
eautoreconf
-
+ epatch "${FILESDIR}"/gnutls-2.2.5-CVE-2008-4989.patch
elibtoolize # for sane .so versioning on FreeBSD
}
diff --git a/net-libs/gnutls/gnutls-2.5.4.ebuild b/net-libs/gnutls/gnutls-2.6.1.ebuild
index 1979c6510284..a1ab3a4908c8 100644
--- a/net-libs/gnutls/gnutls-2.5.4.ebuild
+++ b/net-libs/gnutls/gnutls-2.6.1.ebuild
@@ -1,20 +1,28 @@
# 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.5.4.ebuild,v 1.3 2008/11/04 12:53:11 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-2.6.1.ebuild,v 1.1 2008/11/10 19:55:29 dragonheart Exp $
-inherit libtool eutils
+inherit eutils libtool autotools
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"
+
+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"
EAPI=1
-IUSE="zlib lzo doc nls guile bindist +cxx"
+IUSE="bindist +cxx doc guile lzo nls zlib"
RDEPEND="dev-libs/libgpg-error
>=dev-libs/libgcrypt-1.4.0
@@ -44,9 +52,9 @@ pkg_setup() {
src_unpack() {
unpack ${A}
cd "${S}"
-
- epatch "${FILESDIR}"/${PN}-2.3.11+gcc-4.3.patch
-
+ rm m4/lt* m4/libtool.m4 build-aux/ltmain.sh
+ epatch "${FILESDIR}"/gnutls-2.6.0-cxx-configure.in.patch
+ eautoreconf
elibtoolize # for sane .so versioning on FreeBSD
}
@@ -60,14 +68,13 @@ src_compile() {
$(use_enable cxx) \
$(use_enable doc gtk-doc) \
${myconf}
- emake || die
+ emake || die "emake failed"
}
src_install() {
- emake DESTDIR="${D}" install || die
+ emake DESTDIR="${D}" install || die "emake install failed"
- dodoc AUTHORS ChangeLog NEWS \
- README THANKS doc/TODO
+ dodoc AUTHORS ChangeLog NEWS README THANKS doc/TODO
if use doc ; then
dodoc doc/README.autoconf doc/tex/gnutls.ps