[pkgsrc/trunk]: pkgsrc/archivers/xmill Fix unsafe LP64 pointer arithmetics sp...

[tnn <tnn%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/5de0f46f6f00
branches:  trunk
changeset: 542669:5de0f46f6f00
user:      tnn <tnn%pkgsrc.org@localhost>
date:      Sat May 24 23:00:18 2008 +0000

description:
Fix unsafe LP64 pointer arithmetics spotted in bulk build.

diffstat:

 archivers/xmill/Makefile         |   4 ++--
 archivers/xmill/distinfo         |   4 +++-
 archivers/xmill/patches/patch-ac |  13 +++++++++++++
 archivers/xmill/patches/patch-ad |  13 +++++++++++++
 4 files changed, 31 insertions(+), 3 deletions(-)

diffs (66 lines):

diff -r 8f75f92c06e7 -r 5de0f46f6f00 archivers/xmill/Makefile
--- a/archivers/xmill/Makefile  Sat May 24 22:11:20 2008 +0000
+++ b/archivers/xmill/Makefile  Sat May 24 23:00:18 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2008/03/02 03:48:37 jlam Exp $
+# $NetBSD: Makefile,v 1.25 2008/05/24 23:00:18 tnn Exp $
 
 DISTNAME=              xmill-0.9.1
 PKGREVISION=           3
@@ -29,7 +29,7 @@
 INSTALLATION_DIRS=     bin
 
 do-install:
-       ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/xmill
+       ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/xmill
        ${INSTALL_DATA} ${WRKSRC}/documentation/COPYRIGHT.txt \
                ${WRKSRC}/documentation/LICENSE.txt \
                ${WRKSRC}/documentation/MANUAL.txt \
diff -r 8f75f92c06e7 -r 5de0f46f6f00 archivers/xmill/distinfo
--- a/archivers/xmill/distinfo  Sat May 24 22:11:20 2008 +0000
+++ b/archivers/xmill/distinfo  Sat May 24 23:00:18 2008 +0000
@@ -1,7 +1,9 @@
-$NetBSD: distinfo,v 1.6 2005/10/03 11:25:25 joerg Exp $
+$NetBSD: distinfo,v 1.7 2008/05/24 23:00:18 tnn Exp $
 
 SHA1 (xmill-0.9.1.tar.gz) = 491e44ea9a66293af6837db4dc54ed63065c0d67
 RMD160 (xmill-0.9.1.tar.gz) = 7ca0e60b16e609997010a94f2bffd3a5c2ab60ff
 Size (xmill-0.9.1.tar.gz) = 1021363 bytes
 SHA1 (patch-aa) = b4f10f11906bdcc927214823f93ef597c0d4b750
 SHA1 (patch-ab) = 1d615fa8446139215d7f53cb2d2c91915786aa9f
+SHA1 (patch-ac) = f105a84458fdb2527341d05ce612b73450077894
+SHA1 (patch-ad) = 0001395677ed27329de2c3b63e55618529a4efc1
diff -r 8f75f92c06e7 -r 5de0f46f6f00 archivers/xmill/patches/patch-ac
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/archivers/xmill/patches/patch-ac  Sat May 24 23:00:18 2008 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.3 2008/05/24 23:00:18 tnn Exp $
+
+--- XMill/CompressMan.cpp.orig 2003-01-05 00:40:42.000000000 +0100
++++ XMill/CompressMan.cpp
+@@ -423,7 +423,7 @@ void BothCompressMan::DebugPrint()
+    UserCompressorFactory *compressor=compressorlist;
+    while(compressor!=NULL)
+    {
+-      printf("%lu =>",(unsigned int)compressor);
++      printf("%lu =>",(unsigned long)compressor);
+       printf("%s\n",compressor->GetName());
+       compressor=compressor->next;
+    }
diff -r 8f75f92c06e7 -r 5de0f46f6f00 archivers/xmill/patches/patch-ad
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/archivers/xmill/patches/patch-ad  Sat May 24 23:00:18 2008 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.4 2008/05/24 23:00:18 tnn Exp $
+
+--- XMill/PPMDI.cpp.orig       2003-03-20 03:12:58.000000000 +0100
++++ XMill/PPMDI.cpp
+@@ -245,7 +245,7 @@ int PPMDI::uncompress(unsigned char *dst
+ 
+ cleanup:
+    *outused = j;
+-   *inused = inlen - (int)endptr + (int)src;
++   *inused = inlen - (int)(src - endptr);
+    return ret;
+ }
+