Updated with fix for fortify_source error and buffer size.

(Portage version: 2.2_rc25/cvs/Linux x86_64)

3 files changed, 52 insertions, 6 deletions

diff --git a/sci-geosciences/grass/ChangeLog b/sci-geosciences/grass/ChangeLog
index abefcbd44ffd..6214f991f6b2 100644
--- a/sci-geosciences/grass/ChangeLog
+++ b/sci-geosciences/grass/ChangeLog
@@ -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@gentoo.org>
+  +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@gmx.net> for the o_creat patch; it
+  seems cleaner than the upstream equivalent.
 
   19 Dec 2008; Steve Arnold <nerdboy@gentoo.org>
   +files/grass-6.2.1-gcc43.patch, grass-6.2.1.ebuild:
diff --git a/sci-geosciences/grass/files/grass-6.3.0-o_creat.patch b/sci-geosciences/grass/files/grass-6.3.0-o_creat.patch
new file mode 100644
index 000000000000..32893044a4fc
--- /dev/null
+++ b/sci-geosciences/grass/files/grass-6.3.0-o_creat.patch
@@ -0,0 +1,36 @@
+open with O_CREAT in second argument needs 3 arguments.
+2009-03-05 Martin von Gagern
+Reference: https://bugs.gentoo.org/261283
+
+Index: grass-6.3.0/raster/r.drain/main.c
+===================================================================
+--- grass-6.3.0.orig/raster/r.drain/main.c
++++ grass-6.3.0/raster/r.drain/main.c
+@@ -296,8 +296,8 @@ int main(int argc, char **argv)
+     tempfile1 = G_tempfile();
+     tempfile2 = G_tempfile();
+ 
+-    fe = open(tempfile1, O_RDWR | O_CREAT);
+-    fd = open(tempfile2, O_RDWR | O_CREAT);
++    fe = open(tempfile1, O_RDWR | O_CREAT, S_IRUSR | S_IWUSR);
++    fd = open(tempfile2, O_RDWR | O_CREAT, S_IRUSR | S_IWUSR);
+ 
+     /* transfer the input map to a temp file */
+     for (i = 0; i < nrows; i++) {
+Index: grass-6.3.0/raster/r.fill.dir/main.c
+===================================================================
+--- grass-6.3.0.orig/raster/r.fill.dir/main.c
++++ grass-6.3.0/raster/r.fill.dir/main.c
+@@ -196,9 +196,9 @@ main(int argc, char **argv)
+    tempfile2 = G_tempfile();
+    tempfile3 = G_tempfile();
+ 
+-   fe=open(tempfile1,O_RDWR|O_CREAT); /* elev */
+-   fd=open(tempfile2,O_RDWR|O_CREAT); /* dirn */
+-   fm=open(tempfile3,O_RDWR|O_CREAT); /* problems */
++   fe=open(tempfile1,O_RDWR|O_CREAT, S_IRUSR|S_IWUSR); /* elev */
++   fd=open(tempfile2,O_RDWR|O_CREAT, S_IRUSR|S_IWUSR); /* dirn */
++   fm=open(tempfile3,O_RDWR|O_CREAT, S_IRUSR|S_IWUSR); /* problems */
+ 
+    G_message(_("Reading map..."));
+    for(i=0;i<nrows;i++)
diff --git a/sci-geosciences/grass/grass-6.3.0.ebuild b/sci-geosciences/grass/grass-6.3.0.ebuild
index 339d37ed024b..ce7a140538da 100644
--- a/sci-geosciences/grass/grass-6.3.0.ebuild
+++ b/sci-geosciences/grass/grass-6.3.0.ebuild
@@ -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 @@ src_unpack() {
 	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 @@ src_compile() {
 
 	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
 }