tags 572326 + pending tags 625433 + patch tags 625433 + pending thanks Dear maintainer,
I've prepared an NMU for simulavr (versioned as 0.1.2.2-6.2) and uploaded it to DELAYED/2. Please feel free to tell me if I should delay it longer. Regards. -- .''`. Homepage: http://info.comodo.priv.at/ - OpenPGP key ID: 0x8649AA06 : :' : Debian GNU/Linux user, admin, & developer - http://www.debian.org/ `. `' Member of VIBE!AT & SPI, fellow of Free Software Foundation Europe `- NP: Rolling Stones: Nospare
diff -u simulavr-0.1.2.2/debian/changelog simulavr-0.1.2.2/debian/changelog
--- simulavr-0.1.2.2/debian/changelog
+++ simulavr-0.1.2.2/debian/changelog
@@ -1,3 +1,20 @@
+simulavr (0.1.2.2-6.2) unstable; urgency=low
+
+ * NMU.
+ * Add patches from Ubuntu:
+
+ [ Ilya Barygin ]
+ * src/{eeprom,flash,memory}.c: fix possible buffer overflow detected
+ by FORTIFY_SOURCE, see http://savannah.nongnu.org/bugs/?29049
+ * Add missing ${misc:Depends} to binary package dependencies.
+ (Closes: #572326)
+
+ [ Daniel T Chen ]
+ * src/disp-vcd/disp.c: Fix FTBFS from unused-but-set-variable error.
+ (LP: #832944) (Closes: #625433)
+
+ -- gregor herrmann <[email protected]> Mon, 24 Oct 2011 16:18:29 +0200
+
simulavr (0.1.2.2-6.1) unstable; urgency=low
* Non-maintainer upload.
diff -u simulavr-0.1.2.2/debian/control simulavr-0.1.2.2/debian/control
--- simulavr-0.1.2.2/debian/control
+++ simulavr-0.1.2.2/debian/control
@@ -8,7 +8,7 @@
Package: simulavr
Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
Recommends: xterm, gcc-avr, binutils-avr
Description: Atmel AVR simulator
simulavr simulates the Atmel AVR family of micro-controllers,
only in patch2:
unchanged:
--- simulavr-0.1.2.2.orig/src/flash.c
+++ simulavr-0.1.2.2/src/flash.c
@@ -252,7 +252,7 @@
line[0] = '\0';
}
snprintf (buf, 80, "%04x ", flash_read (flash, i));
- strncat (line, buf, 80);
+ strncat (line, buf, 80 - strlen(line) - 1);
}
if (dup > 0)
{
only in patch2:
unchanged:
--- simulavr-0.1.2.2.orig/src/eeprom.c
+++ simulavr-0.1.2.2/src/eeprom.c
@@ -392,7 +392,7 @@
line[0] = '\0';
}
snprintf (buf, 80, "%02x ", storage_readb (eeprom->stor, i));
- strncat (line, buf, 80);
+ strncat (line, buf, 80 - strlen(line) - 1);
}
if (dup > 0)
{
only in patch2:
unchanged:
--- simulavr-0.1.2.2.orig/src/memory.c
+++ simulavr-0.1.2.2/src/memory.c
@@ -416,7 +416,7 @@
line[0] = '\0';
}
snprintf (buf, 80, "%02x ", mem_read (mem, i));
- strncat (line, buf, 80);
+ strncat (line, buf, 80 - strlen(line) - 1);
}
if (dup > 0)
{
only in patch2:
unchanged:
--- simulavr-0.1.2.2.orig/src/disp-vcd/disp.c
+++ simulavr-0.1.2.2/src/disp-vcd/disp.c
@@ -243,28 +243,27 @@
}
if ((val >= 26) && (val <= 31))
{
- unsigned int areg;
switch (val)
{
case 26:
- areg = xreg = (xreg & 0xff00) | (bval & 0xff);
+ xreg = (xreg & 0xff00) | (bval & 0xff);
break;
case 27:
- areg = xreg =
+ xreg =
(xreg & 0xff) | ((bval << 8) & 0xff00);
break;
case 28:
- areg = yreg = (yreg & 0xff00) | (bval & 0xff);
+ yreg = (yreg & 0xff00) | (bval & 0xff);
break;
case 29:
- areg = yreg =
+ yreg =
(yreg & 0xff) | ((bval << 8) & 0xff00);
break;
case 30:
- areg = zreg = (zreg & 0xff00) | (bval & 0xff);
+ zreg = (zreg & 0xff00) | (bval & 0xff);
break;
case 31:
- areg = zreg =
+ zreg =
(zreg & 0xff) | ((bval << 8) & 0xff00);
break;
}
signature.asc
Description: Digital signature
