summaryrefslogtreecommitdiff
path: root/archivers/xmill
diff options
context:
space:
mode:
authortnn <tnn@pkgsrc.org>2008-05-24 23:00:18 +0000
committertnn <tnn@pkgsrc.org>2008-05-24 23:00:18 +0000
commit4c9df771ae0e9e540fb78b706571ee6fde0efdcc (patch)
tree525bea45470882cc2e053ba11454f2c13853c6c7 /archivers/xmill
parent4d41d841f5a759eff7c548edfea7b60c53b4874d (diff)
downloadpkgsrc-4c9df771ae0e9e540fb78b706571ee6fde0efdcc.tar.gz
Fix unsafe LP64 pointer arithmetics spotted in bulk build.
Diffstat (limited to 'archivers/xmill')
-rw-r--r--archivers/xmill/Makefile4
-rw-r--r--archivers/xmill/distinfo4
-rw-r--r--archivers/xmill/patches/patch-ac13
-rw-r--r--archivers/xmill/patches/patch-ad13
4 files changed, 31 insertions, 3 deletions
diff --git a/archivers/xmill/Makefile b/archivers/xmill/Makefile
index 3078b317877..25f6761211c 100644
--- a/archivers/xmill/Makefile
+++ b/archivers/xmill/Makefile
@@ -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 @@ NO_BIN_ON_CDROM= ${RESTRICTED}
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 --git a/archivers/xmill/distinfo b/archivers/xmill/distinfo
index e16c3daf5ae..549713e6b31 100644
--- a/archivers/xmill/distinfo
+++ b/archivers/xmill/distinfo
@@ -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 --git a/archivers/xmill/patches/patch-ac b/archivers/xmill/patches/patch-ac
new file mode 100644
index 00000000000..4f193dbd94f
--- /dev/null
+++ b/archivers/xmill/patches/patch-ac
@@ -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 --git a/archivers/xmill/patches/patch-ad b/archivers/xmill/patches/patch-ad
new file mode 100644
index 00000000000..ed4f7af8645
--- /dev/null
+++ b/archivers/xmill/patches/patch-ad
@@ -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;
+ }
+