Hi! About #503820, do you think that it's OK (and allow me) to upload a fix to unstable (targeted at Lenny), fixing it, please?
The changes: diff -u pngtools-0.3/debian/changelog pngtools-0.3/debian/changelog --- pngtools-0.3/debian/changelog +++ pngtools-0.3/debian/changelog @@ -1,3 +1,9 @@ +pngtools (0.3-2) unstable; urgency=low + + * Fix pngchunks on 64 bits platforms (Closes: #503820). + + -- Nelson A. de Oliveira <[EMAIL PROTECTED]> Thu, 04 Dec 2008 11:21:09 -0200 + pngtools (0.3-1) unstable; urgency=low * Initial release (Closes: #405139). diff -u pngtools-0.3/debian/rules pngtools-0.3/debian/rules --- pngtools-0.3/debian/rules +++ pngtools-0.3/debian/rules @@ -1,5 +1,6 @@ #!/usr/bin/make -f - + +include /usr/share/cdbs/1/rules/simple-patchsys.mk include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/autotools.mk only in patch2: unchanged: --- pngtools-0.3.orig/debian/patches/pngchunks.diff +++ pngtools-0.3/debian/patches/pngchunks.diff @@ -0,0 +1,40 @@ +diff -ur pngtools-0.3/pngchunks.c pngtools-0.4/pngchunks.c +--- pngtools-0.3/pngchunks.c 2005-04-07 22:23:35.000000000 -0300 ++++ pngtools-0.4/pngchunks.c 2008-11-26 21:14:17.000000000 -0200 +@@ -14,10 +14,9 @@ + const char magic[] = {137, 'P', 'N', 'G', '\r', '\n', 26, '\n'}; + typedef struct pngchunks_internal_header + { +- // We are assuming here that ints are 4 bytes... +- unsigned int len; ++ int32_t len; + union{ +- unsigned int i; ++ int32_t i; + char c[4]; + } type; + } pngchunks_header; +@@ -31,8 +30,8 @@ + + typedef struct pngchunks_internal_IHDR + { +- int width; +- int height; ++ int32_t width; ++ int32_t height; + unsigned char bitdepth; + unsigned char colortype; + unsigned char compression; +@@ -47,12 +46,6 @@ + struct stat stat; + pngchunks_header *head; + +- if((sizeof(int) != 4) || (sizeof(long) != 4)) +- { +- fprintf(stderr, "Int or long is not the assumed four byte size...\n"); +- exit(1); +- } +- + if(argc != 2) + usage(); Only the patch: diff -ur pngtools-0.3/pngchunks.c pngtools-0.4/pngchunks.c --- pngtools-0.3/pngchunks.c 2005-04-07 22:23:35.000000000 -0300 +++ pngtools-0.4/pngchunks.c 2008-11-26 21:14:17.000000000 -0200 @@ -14,10 +14,9 @@ const char magic[] = {137, 'P', 'N', 'G', '\r', '\n', 26, '\n'}; typedef struct pngchunks_internal_header { - // We are assuming here that ints are 4 bytes... - unsigned int len; + int32_t len; union{ - unsigned int i; + int32_t i; char c[4]; } type; } pngchunks_header; @@ -31,8 +30,8 @@ typedef struct pngchunks_internal_IHDR { - int width; - int height; + int32_t width; + int32_t height; unsigned char bitdepth; unsigned char colortype; unsigned char compression; @@ -47,12 +46,6 @@ struct stat stat; pngchunks_header *head; - if((sizeof(int) != 4) || (sizeof(long) != 4)) - { - fprintf(stderr, "Int or long is not the assumed four byte size...\n"); - exit(1); - } - if(argc != 2) usage(); Thank you! Best regards, Nelson
signature.asc
Description: PGP signature