Version bump #275510 by Urriellu.

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

3 files changed, 129 insertions, 2 deletions

diff --git a/dev-embedded/gputils/ChangeLog b/dev-embedded/gputils/ChangeLog
index de742dccb54a..84bfa7e0e3f8 100644
--- a/dev-embedded/gputils/ChangeLog
+++ b/dev-embedded/gputils/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-embedded/gputils
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/gputils/ChangeLog,v 1.37 2009/09/23 16:39:33 patrick Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/gputils/ChangeLog,v 1.38 2010/10/05 00:40:58 vapier Exp $
+
+*gputils-0.13.7 (05 Oct 2010)
+
+  05 Oct 2010; Mike Frysinger <vapier@gentoo.org> +gputils-0.13.7.ebuild,
+  +files/gputils-0.13.7-strncat.patch:
+  Version bump #275510 by Urriellu.
 
   23 Sep 2009; Patrick Lauer <patrick@gentoo.org> gputils-0.12.4.ebuild,
   gputils-0.13.3.ebuild:
diff --git a/dev-embedded/gputils/files/gputils-0.13.7-strncat.patch b/dev-embedded/gputils/files/gputils-0.13.7-strncat.patch
new file mode 100644
index 000000000000..577a4bf0328f
--- /dev/null
+++ b/dev-embedded/gputils/files/gputils-0.13.7-strncat.patch
@@ -0,0 +1,94 @@
+https://sourceforge.net/tracker/?func=detail&aid=3081197&group_id=41924&atid=431665
+https://sourceforge.net/tracker/?func=detail&aid=3081206&group_id=41924&atid=431665
+
+--- a/gpasm/scan.c
++++ b/gpasm/scan.c
+@@ -461,9 +461,7 @@ search_pathes(struct source_context *new, char *name)
+   int i;
+ 
+   for(i = 0; i < state.path_num; i++) {
+-    strncpy(tryname, state.paths[i], sizeof(tryname));
+-    strncat(tryname, COPY_CHAR, sizeof(tryname));
+-    strncat(tryname, name, sizeof(tryname));
++    snprintf(tryname, sizeof(tryname), "%s%s%s", state.paths[i], COPY_CHAR, name);
+     new->f = fopen(tryname, "rt");
+     if(new->f) {
+       new->name = strdup(tryname);
+--- a/gplink/gplink.c
++++ b/gplink/gplink.c
+@@ -340,9 +340,7 @@ void gplink_open_coff(char *name)
+     int i;
+ 
+     for(i = 0; i < state.numpaths; i++) {
+-      strncpy(file_name, state.paths[i], sizeof(file_name));
+-      strncat(file_name, COPY_CHAR, sizeof(file_name));
+-      strncat(file_name, name, sizeof(file_name));
++      snprintf(file_name, sizeof(file_name), "%s%s%s", state.paths[i], COPY_CHAR, name);
+       coff = fopen(file_name, "rb");
+       if (coff != NULL) {
+         break;
+@@ -695,9 +693,7 @@ linker(void)
+       gp_error("linker script not specified and can't determine default script");
+       return EXIT_FAILURE; 
+     }
+-    strncpy(file_name, gp_lkr_path, sizeof(file_name));
+-    strncat(file_name, COPY_CHAR, sizeof(file_name));
+-    strncat(file_name, script_name, sizeof(file_name));
++    snprintf(file_name, sizeof(file_name), "%s%s%s", gp_lkr_path, COPY_CHAR, script_name);
+     gp_message("using default linker script \"%s\"", file_name);
+     open_src(file_name, 0);
+     yyparse();
+--- a/gplink/scan.c
++++ b/gplink/scan.c
+@@ -115,9 +115,7 @@ void open_src(char *name, int isinclude)
+     int i;
+ 
+     for(i = 0; i < state.numpaths; i++) {
+-      strncpy(tryname, state.paths[i], sizeof(tryname));
+-      strncat(tryname, COPY_CHAR, sizeof(tryname));
+-      strncat(tryname, name, sizeof(tryname));
++      snprintf(tryname, sizeof(tryname), "%s%s%s", state.paths[i], COPY_CHAR, name);
+       new->f = fopen(tryname, "rt");
+       if(new->f) {
+         new->name = strdup(tryname);
+--- a/gpasm/lst.c
++++ b/gpasm/lst.c
+@@ -149,22 +149,23 @@ void lst_memory_map(MemBlock *m)
+       }
+ 
+       if(row_used) {
+-        snprintf(buf, sizeof(buf), "%08x :", (i + base) << _16bit_core);
++        int len = sizeof(buf);
++        len -= snprintf(buf, len, "%08x :", (i + base) << _16bit_core);
+ 	for (j = 0; j < num_per_line; j++) {
+           if ((j % num_per_block) == 0) {
+-	    strncat(buf, " ", sizeof(buf));
++	    strncat(buf, " ", len--);
+           }
+           if (m->memory[i + j] & MEM_USED_MASK) {
+-	    strncat(buf, "X", sizeof(buf));
++	    strncat(buf, "X", len--);
+ 	    if (_16bit_core) {
+ 	      /* each word has two bytes */
+-	      strncat(buf, "X", sizeof(buf));
++	      strncat(buf, "X", len--);
+ 	    }
+           } else {
+-	    strncat(buf, "-", sizeof(buf));
++	    strncat(buf, "-", len--);
+ 	    if (_16bit_core) {
+ 	      /* each word has two bytes */
+-	      strncat(buf, "-", sizeof(buf));
++	      strncat(buf, "-", len--);
+ 	    }
+           }
+         }
+@@ -404,7 +405,7 @@ void lst_format_line(char *src_line, int value)
+   } else {		  
+     snprintf(buf, sizeof(buf), "    M ");
+   }
+-  strncat(m, buf, sizeof(m));
++  strncat(m, buf, sizeof(m) - strlen(m));
+ 
+   /* Now copy 'l' to 'e', expanding tabs as required */
+   {
diff --git a/dev-embedded/gputils/gputils-0.13.7.ebuild b/dev-embedded/gputils/gputils-0.13.7.ebuild
new file mode 100644
index 000000000000..26dd5034409d
--- /dev/null
+++ b/dev-embedded/gputils/gputils-0.13.7.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/gputils/gputils-0.13.7.ebuild,v 1.1 2010/10/05 00:40:58 vapier Exp $
+
+EAPI="2"
+
+inherit eutils
+
+DESCRIPTION="Collection of tools including assembler, linker and librarian for PIC microcontrollers"
+HOMEPAGE="http://gputils.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-strncat.patch
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc AUTHORS ChangeLog INSTALL NEWS README TODO doc/gputils.ps
+	insinto /usr/share/doc/${PF}
+	doins doc/gputils.pdf || die
+}