Seeking preaproval of reprepro 3.5.2-6
Hi,
I've prepared another update of reprepro 3.5.2 with
the fix for #506674. I think it will only affect files
of at least half an gig of size, but that can happen for
local packages and the change is really minimal
(change of the sparc binaries is 7 instructions each)
and it could go via unstable.
Does this have a chance to get an freeze-expection?
The differences of the unpackaged source packages:
diff -r -u -N reprepro-3.5.2-5/debian/changelog reprepro-3.5.2-6/debian/changelog
--- reprepro-3.5.2-5/debian/changelog 2008-12-05 16:48:27.000000000 +0100
+++ reprepro-3.5.2-6/debian/changelog 2008-12-05 16:48:31.000000000 +0100
@@ -1,3 +1,10 @@
+reprepro (3.5.2-6) unstable; urgency=low
+
+ * backport bugfix from 3.6.3 to 3.5.2:
+ - fix sha256 hash calculation of verly large files (Closes: 506674)
+
+ -- Bernhard R. Link <brlink@debian.org> Fri, 05 Dec 2008 11:01:47 +0100
+
reprepro (3.5.2-5) unstable; urgency=low
* backport some bugfixes of 3.6.2 to 3.5.2:
diff -r -u -N reprepro-3.5.2-5/sha256.c reprepro-3.5.2-6/sha256.c
--- reprepro-3.5.2-5/sha256.c 2008-06-11 15:18:46.000000000 +0200
+++ reprepro-3.5.2-6/sha256.c 2008-12-05 16:48:31.000000000 +0100
@@ -176,6 +176,7 @@
{
/* Take yet unprocessed bytes into account. */
uint32_t bytes = ctx->buflen;
+ uint32_t bitslow, bitshigh;
size_t pad;
int i;
@@ -186,8 +187,10 @@
memcpy (&ctx->buffer[bytes], fillbuf, pad);
/* Put the 64-bit file length in *bits* at the end of the buffer. */
- *(uint32_t *) &ctx->buffer[bytes + pad + 4] = SWAP (ctx->total << 3);
- *(uint32_t *) &ctx->buffer[bytes + pad] = SWAP (ctx->total >> 29);
+ bitslow = ctx->total << 3;
+ bitshigh = ctx->total >> 29;
+ *(uint32_t *) &ctx->buffer[bytes + pad + 4] = SWAP (bitslow);
+ *(uint32_t *) &ctx->buffer[bytes + pad] = SWAP (bitshigh);
/* Process last bytes. */
sha256_process_block (ctx->buffer, bytes + pad + 8, ctx);
and the differences of the binary packages after unpacking all .gz files and
dumping the binaries with objdump -d:
diff -r -u -N reprepro_3.5.2-5/DEBIAN/control reprepro_3.5.2-6/DEBIAN/control
--- reprepro_3.5.2-5/DEBIAN/control 2008-11-09 16:21:24.000000000 +0100
+++ reprepro_3.5.2-6/DEBIAN/control 2008-12-05 11:11:46.000000000 +0100
@@ -1,5 +1,5 @@
Package: reprepro
-Version: 3.5.2-5
+Version: 3.5.2-6
Architecture: sparc
Maintainer: Bernhard R. Link <brlink@debian.org>
Installed-Size: 808
diff -r -u -N reprepro_3.5.2-5/DEBIAN/md5sums reprepro_3.5.2-6/DEBIAN/md5sums
--- reprepro_3.5.2-5/DEBIAN/md5sums 2008-12-05 16:48:25.000000000 +0100
+++ reprepro_3.5.2-6/DEBIAN/md5sums 2008-12-05 16:48:29.000000000 +0100
@@ -1,12 +1,12 @@
-56c956965cd805c32993c77d687f073f usr/bin/changestool
-9792ea10d96734da2261d97703e39a07 usr/bin/reprepro
+f516637931905f791441d46d5c4511f0 usr/bin/changestool
+1ff612396fc0b05cf45e356d4dd3274b usr/bin/reprepro
9eebcd5853c2c8b8e8076e2152c8b41e usr/share/doc-base/reprepro
76f3022cae185ec0699f639099af0332 usr/share/doc/reprepro/FAQ.gz
b2939a3f20ba6352bb18821f17a08622 usr/share/doc/reprepro/NEWS.gz
d2b55189096c9f57539959564c477c7b usr/share/doc/reprepro/README
78da8594101caa835230f4a3159389b9 usr/share/doc/reprepro/README.Debian
eb8d86b5e9f417df39e35dcefe2f2db0 usr/share/doc/reprepro/TODO
-b954f47029c04f2e2ab440e4ce454227 usr/share/doc/reprepro/changelog.Debian.gz
+9761db23f5be66a6af73487051c48d57 usr/share/doc/reprepro/changelog.Debian.gz
ea8d58db459fbecf923c990c0441028f usr/share/doc/reprepro/changelog.gz
d38fa53268967161d45d21a53a0367e9 usr/share/doc/reprepro/copyright
1da86e7265847f906394650ca71c95a8 usr/share/doc/reprepro/examples/bzip.example
Binary files reprepro_3.5.2-5/usr/bin/changestool and reprepro_3.5.2-6/usr/bin/changestool differ
diff -r -u -N reprepro_3.5.2-5/usr/bin/changestool.dump reprepro_3.5.2-6/usr/bin/changestool.dump
--- reprepro_3.5.2-5/usr/bin/changestool.dump 2008-12-05 16:51:00.000000000 +0100
+++ reprepro_3.5.2-6/usr/bin/changestool.dump 2008-12-05 16:50:53.000000000 +0100
@@ -1,5 +1,5 @@
-reprepro_3.5.2-5/usr/bin/changestool: file format elf32-sparc
+reprepro_3.5.2-6/usr/bin/changestool: file format elf32-sparc
Disassembly of section .init:
@@ -14983,13 +14983,13 @@
20574: 90 02 20 2c add %o0, 0x2c, %o0
20578: 40 00 6f 87 call 3c394 <memcpy@plt>
2057c: 92 12 61 48 or %o1, 0x148, %o1
- 20580: c4 06 20 24 ld [ %i0 + 0x24 ], %g2
- 20584: 83 28 a0 03 sll %g2, 3, %g1
- 20588: 88 06 20 2c add %i0, 0x2c, %g4
- 2058c: 9a 04 40 10 add %l1, %l0, %o5
- 20590: 85 30 a0 1d srl %g2, 0x1d, %g2
- 20594: 86 01 00 0d add %g4, %o5, %g3
- 20598: c2 20 e0 04 st %g1, [ %g3 + 4 ]
+ 20580: 88 06 20 2c add %i0, 0x2c, %g4
+ 20584: 9a 04 40 10 add %l1, %l0, %o5
+ 20588: 82 01 00 0d add %g4, %o5, %g1
+ 2058c: c4 06 20 24 ld [ %i0 + 0x24 ], %g2
+ 20590: 87 28 a0 03 sll %g2, 3, %g3
+ 20594: 85 30 a0 1d srl %g2, 0x1d, %g2
+ 20598: c6 20 60 04 st %g3, [ %g1 + 4 ]
2059c: c2 06 20 20 ld [ %i0 + 0x20 ], %g1
205a0: 83 28 60 03 sll %g1, 3, %g1
205a4: 84 10 40 02 or %g1, %g2, %g2
Binary files reprepro_3.5.2-5/usr/bin/reprepro and reprepro_3.5.2-6/usr/bin/reprepro differ
diff -r -u -N reprepro_3.5.2-5/usr/bin/reprepro.dump reprepro_3.5.2-6/usr/bin/reprepro.dump
--- reprepro_3.5.2-5/usr/bin/reprepro.dump 2008-12-05 16:50:06.000000000 +0100
+++ reprepro_3.5.2-6/usr/bin/reprepro.dump 2008-12-05 16:50:17.000000000 +0100
@@ -1,5 +1,5 @@
-reprepro_3.5.2-5/usr/bin/reprepro: file format elf32-sparc
+reprepro_3.5.2-6/usr/bin/reprepro: file format elf32-sparc
Disassembly of section .init:
@@ -8667,13 +8667,13 @@
1ace4: 90 02 20 2c add %o0, 0x2c, %o0
1ace8: 40 01 a1 51 call 8322c <memcpy@plt>
1acec: 92 12 61 30 or %o1, 0x130, %o1
- 1acf0: c4 06 20 24 ld [ %i0 + 0x24 ], %g2
- 1acf4: 83 28 a0 03 sll %g2, 3, %g1
- 1acf8: 88 06 20 2c add %i0, 0x2c, %g4
- 1acfc: 9a 04 40 10 add %l1, %l0, %o5
- 1ad00: 85 30 a0 1d srl %g2, 0x1d, %g2
- 1ad04: 86 01 00 0d add %g4, %o5, %g3
- 1ad08: c2 20 e0 04 st %g1, [ %g3 + 4 ]
+ 1acf0: 88 06 20 2c add %i0, 0x2c, %g4
+ 1acf4: 9a 04 40 10 add %l1, %l0, %o5
+ 1acf8: 82 01 00 0d add %g4, %o5, %g1
+ 1acfc: c4 06 20 24 ld [ %i0 + 0x24 ], %g2
+ 1ad00: 87 28 a0 03 sll %g2, 3, %g3
+ 1ad04: 85 30 a0 1d srl %g2, 0x1d, %g2
+ 1ad08: c6 20 60 04 st %g3, [ %g1 + 4 ]
1ad0c: c2 06 20 20 ld [ %i0 + 0x20 ], %g1
1ad10: 83 28 60 03 sll %g1, 3, %g1
1ad14: 84 10 40 02 or %g1, %g2, %g2
diff -r -u -N reprepro_3.5.2-5/usr/share/doc/reprepro/changelog.Debian reprepro_3.5.2-6/usr/share/doc/reprepro/changelog.Debian
--- reprepro_3.5.2-5/usr/share/doc/reprepro/changelog.Debian 2008-11-09 16:18:20.000000000 +0100
+++ reprepro_3.5.2-6/usr/share/doc/reprepro/changelog.Debian 2008-12-05 11:03:02.000000000 +0100
@@ -1,3 +1,10 @@
+reprepro (3.5.2-6) unstable; urgency=low
+
+ * backport bugfix from 3.6.3 to 3.5.2:
+ - fix sha256 hash calculation of verly large files (Closes: 506674)
+
+ -- Bernhard R. Link <brlink@debian.org> Fri, 05 Dec 2008 11:01:47 +0100
+
reprepro (3.5.2-5) unstable; urgency=low
* backport some bugfixes of 3.6.2 to 3.5.2:
Hochachtungsvoll,
Bernhard R. Link
Reply to: