updated for Tk vulnerability and QA fixes (see bug #208464)

(Portage version: 2.1.4.1)

4 files changed, 89 insertions, 50 deletions

diff --git a/dev-util/sourcenav/ChangeLog b/dev-util/sourcenav/ChangeLog
index 2f7382f2b5f3..e27365822662 100644
--- a/dev-util/sourcenav/ChangeLog
+++ b/dev-util/sourcenav/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/sourcenav
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/sourcenav/ChangeLog,v 1.19 2007/07/22 07:18:14 graaff Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/sourcenav/ChangeLog,v 1.20 2008/02/10 22:39:36 nerdboy Exp $
+
+  10 Feb 2008; Steve Arnold <nerdboy@gentoo.org>
+  +files/sourcenav-5.2_beta2-tk-size.patch, sourcenav-5.2_beta2.ebuild,
+  sourcenav-5.1.4.ebuild:
+  Updated for Tk vulnerability and QA fixes (see bug #208464), added
+  desktop entry for latest version.
 
   22 Jul 2007; Hans de Graaff <graaff@gentoo.org> sourcenav-5.1.4.ebuild,
   sourcenav-5.2_beta2.ebuild:
diff --git a/dev-util/sourcenav/files/sourcenav-5.2_beta2-tk-size.patch b/dev-util/sourcenav/files/sourcenav-5.2_beta2-tk-size.patch
new file mode 100644
index 000000000000..0dc8e6ad7cca
--- /dev/null
+++ b/dev-util/sourcenav/files/sourcenav-5.2_beta2-tk-size.patch
@@ -0,0 +1,15 @@
+--- tk/generic/tkImgGIF.c.orig	2008-02-09 16:44:04.000000000 -0800
++++ tk/generic/tkImgGIF.c	2008-02-09 16:47:47.000000000 -0800
+@@ -804,6 +804,12 @@
+ 		Tcl_PosixError(interp), (char *) NULL);
+ 	return TCL_ERROR;
+     }
++
++    if (initialCodeSize > MAX_LWZ_BITS) {
++    	Tcl_SetResult(interp, "malformed image", TCL_STATIC);
++	return TCL_ERROR;
++    }
++
+     if (transparent!=-1) {
+ 	cmap[transparent][CM_RED] = 0;
+ 	cmap[transparent][CM_GREEN] = 0;
diff --git a/dev-util/sourcenav/sourcenav-5.1.4.ebuild b/dev-util/sourcenav/sourcenav-5.1.4.ebuild
index 70d3f9757b3f..59704c53a47e 100644
--- a/dev-util/sourcenav/sourcenav-5.1.4.ebuild
+++ b/dev-util/sourcenav/sourcenav-5.1.4.ebuild
@@ -1,14 +1,13 @@
-# 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/dev-util/sourcenav/sourcenav-5.1.4.ebuild,v 1.11 2007/07/22 07:18:14 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/sourcenav/sourcenav-5.1.4.ebuild,v 1.12 2008/02/10 22:39:36 nerdboy Exp $
 
 inherit eutils libtool toolchain-funcs flag-o-matic
 
 S=${WORKDIR}/build
 
-DESCRIPTION="Source-Navigator is a source code analysis tool"
-SRC_URI="mirror://sourceforge/sourcenav/${P}.tar.gz
-mirror://gentoo/${P}-gentoo.diff.gz"
+DESCRIPTION="Source-Navigator is a source code analysis and development tool"
+SRC_URI="mirror://sourceforge/sourcenav/${P}.tar.gz mirror://gentoo/${P}-gentoo.diff.gz"
 HOMEPAGE="http://sourcenav.sourceforge.net"
 
 SLOT="0"
@@ -27,36 +26,37 @@ DEPEND="${RDEPEND}
 
 src_unpack() {
 	unpack ${A}
-	mkdir ${WORKDIR}/build
-	cd ${WORKDIR}/${P}
-	epatch ${DISTDIR}/${PF}-gentoo.diff.gz || die "big patch failed"
-	epatch ${FILESDIR}/${P}-bash3.patch || die "bash3 patch failed"
+	mkdir "${WORKDIR}"/build
+	cd "${WORKDIR}/${P}"
+	epatch "${FILESDIR}"/${PN}-5.2_beta2-tk-size.patch
+	epatch "${DISTDIR}"/${PF}-gentoo.diff.gz
+	epatch "${FILESDIR}"/${P}-bash3.patch
 	# Backported from 5.2
 	if [ $(gcc-major-version) -ge 4 ]; then
-	    epatch ${FILESDIR}/${P}-gcc4.patch || die "gcc4 patch failed"
+	    epatch "${FILESDIR}"/${P}-gcc4.patch || die "gcc4 patch failed"
 	fi
 }
 
 src_compile() {
-	cd ${WORKDIR}/build
+	cd "${WORKDIR}"/build
 	../${P}/configure \
-		--host=${CHOST} \
-		--prefix=${SN} \
-		--exec-prefix=${SN} \
-		--bindir=${SN}/bin \
-		--sbindir=${SN}/sbin \
-		--mandir=${SN}/share/man \
-		--infodir=${SN}/share/info \
-		--datadir=${SN}/share \
-		--libdir=${SN}/$(get_libdir) || die "configure failed"
-
-	make || die
+		--host="${CHOST}" \
+		--prefix="${SN}" \
+		--exec-prefix="${SN}" \
+		--bindir="${SN}"/bin \
+		--sbindir="${SN}"/sbin \
+		--mandir="${SN}"/share/man \
+		--infodir="${SN}"/share/info \
+		--datadir="${SN}"/share \
+		--libdir="${SN}"/$(get_libdir) || die "configure failed"
+
+	make || die "build failed"
 }
 
 src_install() {
-	make DESTDIR=${D} install || die
+	make DESTDIR="${D}" install || die
 
-	chmod -Rf 755 ${D}/${SN}/share/doc/${P}/demos
+	chmod -Rf 755 "${D}/${SN}"/share/doc/${P}/demos
 	dodir /etc/env.d
-	echo "PATH=${SN}/bin" > ${D}/etc/env.d/10snavigator
+	echo "PATH=${SN}/bin" > "${D}"/etc/env.d/10snavigator
 }
diff --git a/dev-util/sourcenav/sourcenav-5.2_beta2.ebuild b/dev-util/sourcenav/sourcenav-5.2_beta2.ebuild
index 9275ec53fd54..32bb26d73e25 100644
--- a/dev-util/sourcenav/sourcenav-5.2_beta2.ebuild
+++ b/dev-util/sourcenav/sourcenav-5.2_beta2.ebuild
@@ -1,10 +1,8 @@
-# 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/dev-util/sourcenav/sourcenav-5.2_beta2.ebuild,v 1.9 2007/07/22 07:18:14 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/sourcenav/sourcenav-5.2_beta2.ebuild,v 1.10 2008/02/10 22:39:36 nerdboy Exp $
 
-inherit eutils toolchain-funcs
-
-IUSE="debug"
+inherit autotools flag-o-matic eutils toolchain-funcs fdo-mime
 
 MY_P="5.2b2"
 S=${WORKDIR}/sourcenav-${MY_P}
@@ -18,6 +16,7 @@ HOMEPAGE="http://sourcenav.sourceforge.net"
 SLOT="0"
 LICENSE="GPL-2 LGPL-2"
 KEYWORDS="~amd64 ~sparc ~ppc ~ppc64 ~x86"
+IUSE="debug"
 
 RDEPEND="x11-libs/libX11
 	x11-libs/libXdmcp
@@ -27,40 +26,59 @@ RDEPEND="x11-libs/libX11
 DEPEND="${RDEPEND}
 	x11-proto/xproto"
 
+WANT_AUTOCONF="2.5"
+AT_M4DIR="${S}/config"
+
 src_unpack() {
 	unpack ${A}
-#	mkdir ${SB} || die "mkdir build failed"
-	cd ${S}
-	epatch ${FILESDIR}/sourcenav_destdir.patch || die "epatch failed"
+	cd "${S}"
+
+	epatch "${FILESDIR}"/sourcenav_destdir.patch
+	epatch "${FILESDIR}"/${P}-tk-size.patch
 	sed -i -e "s/relid'/relid/" tcl/unix/configure
 	sed -i -e "s/relid'/relid/" tk/unix/configure
 	# Bug 131412
 	if [ $(gcc-major-version) -ge 4 ]; then
-	    epatch ${FILESDIR}/${P}-gcc4.patch || die "gcc4 patch failed"
+	    epatch "${FILESDIR}"/${P}-gcc4.patch
 	fi
+	eaclocal
 }
 
 src_compile() {
-	cd ${S}
-	./configure ${MY_CONF} \
-		--host=${CHOST} \
-		--prefix=${SN} \
-		--bindir=${SN}/bin \
-		--sbindir=${SN}/sbin \
-		--exec-prefix=${SN} \
-		--mandir=${SN}/share/man \
-		--infodir=${SN}/share/info \
-		--datadir=${SN}/share \
+	append-flags -DHAVE_STDLIB_H=1 -D_GNU_SOURCE=1
+	sh ./configure "${MY_CONF}" \
+		--host="${CHOST}" \
+		--prefix="${SN}" \
+		--bindir="${SN}"/bin \
+		--sbindir="${SN}"/sbin \
+		--exec-prefix="${SN}" \
+		--mandir="${SN}"/share/man \
+		--infodir="${SN}"/share/info \
+		--datadir="${SN}"/share \
 		$(use_enable debug symbols) || die "configure failed"
 
 	make all || die "make failed"
 }
 
 src_install() {
-	cd ${SB}
-	make DESTDIR=${D} install || die "install failed"
+	make DESTDIR="${D}" install || die "install failed"
 
-	chmod -Rf 755 ${D}/${SN}/share/doc/${P}/demos
+	chmod -Rf 755 "${D}/${SN}/share/doc/${P}/demos"
 	dodir /etc/env.d
-	echo "PATH=${SN}/bin" > ${D}/etc/env.d/10snavigator
+	echo "PATH=${SN}/bin" > "${D}"/etc/env.d/10snavigator
+
+	make_desktop_entry \
+	    /opt/sourcenav/bin/snavigator \
+	    "Source Navigator ${PV}" \
+	    "/opt/sourcenav/share/bitmaps/ide_icon.xpm" \
+	    "Application;Development"
 }
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+}
+