[gentoo-commits] gentoo-x86 commit in app-dicts/wordnet: wordnet-3.0.ebuild ChangeLog wordnet-3.0-r2.ebuild wordnet-3.0-r1.ebuild

[Peter Volkov (pva)]

pva         08/09/12 19:36:30

  Modified:             wordnet-3.0.ebuild ChangeLog
  Added:                wordnet-3.0-r2.ebuild
  Removed:              wordnet-3.0-r1.ebuild
  Log:
  Applying fix for CVE-2008-2149, again bug #211491, thank you Robert Buchholz.
  (Portage version: 2.2_rc8/cvs/Linux 2.6.25-gentoo-r7 i686)

Revision  Changes    Path
1.3                  app-dicts/wordnet/wordnet-3.0.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-dicts/wordnet/wordnet-3.0.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-dicts/wordnet/wordnet-3.0.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-dicts/wordnet/wordnet-3.0.ebuild?r1=1.2&r2=1.3

Index: wordnet-3.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-dicts/wordnet/wordnet-3.0.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- wordnet-3.0.ebuild	22 Oct 2007 16:42:18 -0000	1.2
+++ wordnet-3.0.ebuild	12 Sep 2008 19:36:30 -0000	1.3
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-dicts/wordnet/wordnet-3.0.ebuild,v 1.2 2007/10/22 16:42:18 cla Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-dicts/wordnet/wordnet-3.0.ebuild,v 1.3 2008/09/12 19:36:30 pva Exp $
 
 inherit flag-o-matic autotools
 
@@ -48,13 +48,11 @@
 	WN_MANDIR="${T}/usr/share/man" \
 	WN_DOCDIR="${T}/usr/share/doc/wordnet-${PV}" \
 	WNHOME="/usr/share/wordnet" \
-	econf || die "econf failed"
+	econf
 	emake || die "emake Failed"
 }
 
 src_install() {
 	emake install DESTDIR="${D}" || die "install failed"
-
-	# We don't install COPYING because it's identical to LICENSE
-	dodoc AUTHORS ChangeLog INSTALL LICENSE README || die "dodoc failed"
+	dodoc AUTHORS ChangeLog INSTALL README || die "dodoc failed"
 }



1.16                 app-dicts/wordnet/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-dicts/wordnet/ChangeLog?rev=1.16&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-dicts/wordnet/ChangeLog?rev=1.16&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-dicts/wordnet/ChangeLog?r1=1.15&r2=1.16

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-dicts/wordnet/ChangeLog,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- ChangeLog	10 Sep 2008 06:57:39 -0000	1.15
+++ ChangeLog	12 Sep 2008 19:36:30 -0000	1.16
@@ -1,6 +1,14 @@
 # ChangeLog for app-dicts/wordnet
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-dicts/wordnet/ChangeLog,v 1.15 2008/09/10 06:57:39 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-dicts/wordnet/ChangeLog,v 1.16 2008/09/12 19:36:30 pva Exp $
+
+*wordnet-3.0-r2 (12 Sep 2008)
+
+  12 Sep 2008; Peter Volkov <pva@g.o>
+  -files/wordnet-3.0-CVE-2008-3908.patch, wordnet-3.0.ebuild,
+  -wordnet-3.0-r1.ebuild, +wordnet-3.0-r2.ebuild:
+  Applying fix for CVE-2008-2149, again bug #211491, thank you Robert
+  Buchholz.
 
 *wordnet-3.0-r1 (10 Sep 2008)
 



1.1                  app-dicts/wordnet/wordnet-3.0-r2.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-dicts/wordnet/wordnet-3.0-r2.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-dicts/wordnet/wordnet-3.0-r2.ebuild?rev=1.1&content-type=text/plain

Index: wordnet-3.0-r2.ebuild
===================================================================
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-dicts/wordnet/wordnet-3.0-r2.ebuild,v 1.1 2008/09/12 19:36:30 pva Exp $

inherit flag-o-matic autotools

DESCRIPTION="A lexical database for the English language"
HOMEPAGE="http://wordnet.princeton.edu/"
SRC_URI="ftp://ftp.cogsci.princeton.edu/pub/wordnet/${PV}/WordNet-${PV}.tar.gz
		mirrors://gentoo/${P}-patchset-1.tar.bz2"
LICENSE="Princeton"

SLOT="0"
KEYWORDS="~amd64 ~ppc ~x86"
IUSE="doc"

# In contrast to what the configure script seems to imply, Tcl/Tk is NOT optional.
# cf. bug 163478 for details. (Yes, it's about 2.1 but it's still the same here.)
DEPEND="dev-lang/tcl
		dev-lang/tk"
RDEPEND="${DEPEND}"

S=${WORKDIR}/WordNet-${PV}

src_unpack() {
	unpack ${A}
	cd "${S}"
	# Don't install into PREFIX/dict but PREFIX/share/wordnet/dict
	epatch "${WORKDIR}/${P}-dict-location.patch"
	# Fixes bug 130024, make an additional shared lib
	epatch "${WORKDIR}/${P}-shared-lib.patch"
	# Don't install the docs directly into PREFIX/doc but PREFIX/doc/PN
	epatch "${WORKDIR}/${P}-docs-path.patch"
	epatch "${WORKDIR}"/${P}-CVE-2008-3908.patch #211491
	epatch "${WORKDIR}"/${P}-CVE-2008-2149.patch #211491

	# Don't install all the extra docs (html, pdf, ps) without doc USE flag.
	use doc || sed -i -e "s:SUBDIRS =.*:SUBDIRS = man:" doc/Makefile.am

	rm -f configure
	eautoreconf
}

src_compile() {
	append-flags -DUNIX -I${T}/usr/include

	MAKEOPTS="-e"
	PLATFORM=linux WN_ROOT="${T}/usr" \
	WN_DICTDIR="${T}/usr/share/wordnet/dict" \
	WN_MANDIR="${T}/usr/share/man" \
	WN_DOCDIR="${T}/usr/share/doc/wordnet-${PV}" \
	WNHOME="/usr/share/wordnet" \
	econf
	emake || die "emake Failed"
}

src_install() {
	emake install DESTDIR="${D}" || die "install failed"
	dodoc AUTHORS ChangeLog INSTALL README || die "dodoc failed"
}