[gentoo-commits] gentoo-x86 commit in sci-geosciences/grass: ChangeLog grass-6.3.0.ebuild

[Steve Arnold (nerdboy)]

nerdboy     09/03/23 03:51:42

  Modified:             ChangeLog grass-6.3.0.ebuild
  Log:
  Updated with fix for fortify_source error and buffer size.
  (Portage version: 2.2_rc25/cvs/Linux x86_64)

Revision  Changes    Path
1.67                 sci-geosciences/grass/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-geosciences/grass/ChangeLog?rev=1.67&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-geosciences/grass/ChangeLog?rev=1.67&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-geosciences/grass/ChangeLog?r1=1.66&r2=1.67

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-geosciences/grass/ChangeLog,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- ChangeLog	19 Dec 2008 05:57:29 -0000	1.66
+++ ChangeLog	23 Mar 2009 03:51:42 -0000	1.67
@@ -1,6 +1,12 @@
 # ChangeLog for sci-geosciences/grass
-# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/ChangeLog,v 1.66 2008/12/19 05:57:29 nerdboy Exp $
+# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/ChangeLog,v 1.67 2009/03/23 03:51:42 nerdboy Exp $
+
+  23 Mar 2009; Steve Arnold <nerdboy@g.o>
+  +files/grass-6.3.0-o_creat.patch, grass-6.3.0.ebuild:
+  Updated with fix for fortify_source error and buffer size.  Thanks to
+  Martin von Gagern <Martin.vGagern@×××.net> for the o_creat patch; it
+  seems cleaner than the upstream equivalent.
 
   19 Dec 2008; Steve Arnold <nerdboy@g.o>
   +files/grass-6.2.1-gcc43.patch, grass-6.2.1.ebuild:



1.6                  sci-geosciences/grass/grass-6.3.0.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-geosciences/grass/grass-6.3.0.ebuild?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-geosciences/grass/grass-6.3.0.ebuild?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-geosciences/grass/grass-6.3.0.ebuild?r1=1.5&r2=1.6

Index: grass-6.3.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-geosciences/grass/grass-6.3.0.ebuild,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- grass-6.3.0.ebuild	8 Nov 2008 22:19:39 -0000	1.5
+++ grass-6.3.0.ebuild	23 Mar 2009 03:51:42 -0000	1.6
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/grass-6.3.0.ebuild,v 1.5 2008/11/08 22:19:39 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/grass-6.3.0.ebuild,v 1.6 2009/03/23 03:51:42 nerdboy Exp $
 
 inherit eutils distutils fdo-mime versionator wxwidgets
 
@@ -108,6 +108,10 @@
 	cd "${S}"
 
 	epatch rpm/fedora/grass-readline.patch
+	# fix the fortify_source and buffer issues (see bug #261283)
+	epatch "${FILESDIR}"/${P}-o_creat.patch
+	sed -i -e "s:buff\[12:buff\[16:g" general/g.parser/main.c \
+	    || die "sed failed"
 
 	if ! use opengl; then
 	    epatch "${FILESDIR}"/${P}-html-nonviz.patch
@@ -214,14 +218,14 @@
 
 	if use wxwindows; then
 	    # can't use die here since we need to hack the vdigit build
-	    emake
+	    emake -j1
 	    ln -sf "${LIBGDI}" dist.${CHOST}/lib/libgdi.so \
 		|| die "making libgdi link failed"
 	    cd gui/wxpython/vdigit
 	    # now we're OK
 	    make default -j1 || die "make vdigit failed!"
 	else
-	    emake || die "make failed!"
+	    emake -j1 || die "make failed!"
 	fi
 }