Sun Feb 15 20:12:18 2009 UTC ()
Update to 1.6.

pkgsrc changes:

- Destdir support.
- Include fixes for implicit function declarations probably broken on LP64.
- Fix for 64-bit time_t world in netbsd-current.
- Fix some pkglint.
- Suppress warning about mktemp() on NetBSD; usage checked.

Upstream changes:

1.6 -- Jul 21 2003
Use automake and a little bit of autoconf

convert K&R declarations/definitions to ANSI

Fixed buffer overflow in getParam and getDispositionFilename (debian patch)
Fixed possible crash in ParseContent (debian patch)

fix typo in getDispositionFilename (from Steve Friedl)

use system strcasecmp and getopt where possible.

use O_EXCL where available when creating files.


(dholland)
diff -r1.18 -r1.19 pkgsrc/converters/mpack/Makefile
diff -r1.1 -r1.2 pkgsrc/converters/mpack/PLIST
diff -r1.7 -r1.8 pkgsrc/converters/mpack/distinfo
diff -r1.6 -r0 pkgsrc/converters/mpack/patches/patch-aa
diff -r1.6 -r1.7 pkgsrc/converters/mpack/patches/patch-ab
diff -r1.1 -r1.2 pkgsrc/converters/mpack/patches/patch-ae
diff -r1.1 -r1.2 pkgsrc/converters/mpack/patches/patch-af
cvs diff -r1.18 -r1.19 pkgsrc/converters/mpack/Makefile (expand / switch to unified diff)

--- pkgsrc/converters/mpack/Makefile 2006/03/04 21:29:06 1.18
+++ pkgsrc/converters/mpack/Makefile 2009/02/15 20:12:17 1.19
@@ -1,16 +1,14 @@ @@ -1,16 +1,14 @@
1# $NetBSD: Makefile,v 1.18 2006/03/04 21:29:06 jlam Exp $ 1# $NetBSD: Makefile,v 1.19 2009/02/15 20:12:17 dholland Exp $
2 2
3DISTNAME= mpack-1.5-src 3DISTNAME= mpack-1.6
4PKGNAME= mpack-1.5 
5CATEGORIES= converters mail news 4CATEGORIES= converters mail news
6MASTER_SITES= ftp://ftp.andrew.cmu.edu/pub/mpack/ 5MASTER_SITES= ftp://ftp.andrew.cmu.edu/pub/mpack/
7EXTRACT_SUFX= .tar.Z 
8 6
9MAINTAINER= pkgsrc-users@NetBSD.org 7MAINTAINER= pkgsrc-users@NetBSD.org
10COMMENT= External MIME packer/unpacker 8COMMENT= External MIME packer/unpacker
11 9
12WRKSRC= ${WRKDIR}/mpack 10PKG_DESTDIR_SUPPORT= user-destdir
13 11
14LDFLAGS.SunOS+= -lsocket -lnsl 12GNU_CONFIGURE= yes
15 13
16.include "../../mk/bsd.pkg.mk" 14.include "../../mk/bsd.pkg.mk"
cvs diff -r1.1 -r1.2 pkgsrc/converters/mpack/PLIST (expand / switch to unified diff)

--- pkgsrc/converters/mpack/PLIST 2001/10/31 21:50:55 1.1
+++ pkgsrc/converters/mpack/PLIST 2009/02/15 20:12:17 1.2
@@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
1@comment $NetBSD: PLIST,v 1.1 2001/10/31 21:50:55 zuntum Exp $ 1@comment $NetBSD: PLIST,v 1.2 2009/02/15 20:12:17 dholland Exp $
2bin/mpack 2bin/mpack
3bin/munpack 3bin/munpack
4man/man1/mpack.1.gz 4man/man1/mpack.1
5man/man1/munpack.1.gz 5man/man1/munpack.1
cvs diff -r1.7 -r1.8 pkgsrc/converters/mpack/distinfo (expand / switch to unified diff)

--- pkgsrc/converters/mpack/distinfo 2006/06/09 15:34:31 1.7
+++ pkgsrc/converters/mpack/distinfo 2009/02/15 20:12:17 1.8
@@ -1,11 +1,10 @@ @@ -1,11 +1,10 @@
1$NetBSD: distinfo,v 1.7 2006/06/09 15:34:31 minskim Exp $ 1$NetBSD: distinfo,v 1.8 2009/02/15 20:12:17 dholland Exp $
2 2
3SHA1 (mpack-1.5-src.tar.Z) = 1c5081edd9c7152d2a8c4585af2c5a3fc9f17d60 3SHA1 (mpack-1.6.tar.gz) = 7fd3a73e0f131412920b6ff34872e7e7fa03e03b
4RMD160 (mpack-1.5-src.tar.Z) = 614c35b1f63c2a6027c978946941cd8755cba774 4RMD160 (mpack-1.6.tar.gz) = a83330aa15437dc3ca6475cbf6e35b09ab9cef07
5Size (mpack-1.5-src.tar.Z) = 285360 bytes 5Size (mpack-1.6.tar.gz) = 179850 bytes
6SHA1 (patch-aa) = d08d4f7f3e44b1ddc71c0838c014b4a2aed61811 6SHA1 (patch-ab) = 7c11f3ddbd39deaf0e8eed51fe38219c3b6b1217
7SHA1 (patch-ab) = 38c17a6a9cbe71528300ebc3d74720f986a7d3b4 
8SHA1 (patch-ac) = a69986a5c1b7659fac6df05f4db9a44df3110892 7SHA1 (patch-ac) = a69986a5c1b7659fac6df05f4db9a44df3110892
9SHA1 (patch-ad) = 76f32d163021a81d73d8316f72b141ef3edf4f14 8SHA1 (patch-ad) = 76f32d163021a81d73d8316f72b141ef3edf4f14
10SHA1 (patch-ae) = 46ca4ac43cd049399fc8b05e566bd6968a6dc019 9SHA1 (patch-ae) = 884e38efa3a975c6a1090d6ecddc4e535d1db59c
11SHA1 (patch-af) = 9d2b3ad72a9a6491ef95b94b389813058ecc5103 10SHA1 (patch-af) = 2b38171d450ddbe1f9bb7a520d5e114a15afab9d
File Deleted: pkgsrc/converters/mpack/patches/Attic/patch-aa
cvs diff -r1.6 -r1.7 pkgsrc/converters/mpack/patches/patch-ab (expand / switch to unified diff)

--- pkgsrc/converters/mpack/patches/patch-ab 2005/12/19 00:13:39 1.6
+++ pkgsrc/converters/mpack/patches/patch-ab 2009/02/15 20:12:18 1.7
@@ -1,35 +1,49 @@ @@ -1,35 +1,49 @@
1$NetBSD: patch-ab,v 1.6 2005/12/19 00:13:39 joerg Exp $ 1$NetBSD: patch-ab,v 1.7 2009/02/15 20:12:18 dholland Exp $
2 2
3--- unixos.c.orig 1995-02-16 21:39:50.000000000 +0000 3--- unixos.c.orig 2003-07-21 16:54:05.000000000 -0400
4+++ unixos.c 4+++ unixos.c 2009-02-15 14:56:48.000000000 -0500
5@@ -23,6 +23,7 @@ 5@@ -23,9 +23,11 @@
6 * SOFTWARE. 6 * SOFTWARE.
7 */ 7 */
8 #include <stdio.h> 8 #include <stdio.h>
9+#include <stdlib.h> 9+#include <stdlib.h>
10 #include <ctype.h> 10 #include <ctype.h>
11 #include <string.h> 11 #include <string.h>
12 #include <errno.h> 12 #include <errno.h>
13@@ -36,10 +37,6 @@ 13+#include <time.h>
 14 #include <sys/types.h>
 15 #include <sys/param.h>
 16 #include <netdb.h>
 17@@ -38,10 +40,6 @@
14 #define MAXHOSTNAMELEN 64 18 #define MAXHOSTNAMELEN 64
15 #endif 19 #endif
16  20
17-extern int errno; 21-extern int errno;
18-extern char *malloc(); 22-extern char *malloc();
19-extern char *getenv(); 23-extern char *getenv();
20- 24-
21 int overwrite_files = 0; 25 int overwrite_files = 0;
22 int didchat; 26 int didchat;
23  27
24@@ -89,7 +86,11 @@ char *id; 28@@ -76,7 +74,7 @@ char *os_genid(void)
 29 }
 30
 31 result = malloc(25+strlen(hostname));
 32- sprintf(result, "%d.%d@%s", pid, curtime++, hostname);
 33+ sprintf(result, "%d.%lld@%s", pid, (long long) curtime++, hostname);
 34 return result;
 35 }
 36
 37@@ -90,7 +88,11 @@ char *os_idtodir(char *id)
25 strcpy(buf, getenv("TMPDIR")); 38 strcpy(buf, getenv("TMPDIR"));
26 } 39 }
27 else { 40 else {
 41- strcpy(buf, "/usr/tmp");
28+#if defined(P_tmpdir) 42+#if defined(P_tmpdir)
29+ strcpy(buf, P_tmpdir); 43+ strcpy(buf, P_tmpdir);
30+#else 44+#else
31 strcpy(buf, "/usr/tmp"); 45+ strcpy(buf, "/var/tmp");
32+#endif 46+#endif
33 } 47 }
34 strcat(buf, "/m-prts-"); 48 strcat(buf, "/m-prts-");
35 p = getenv("USER"); 49 p = getenv("USER");
cvs diff -r1.1 -r1.2 pkgsrc/converters/mpack/patches/patch-ae (expand / switch to unified diff)

--- pkgsrc/converters/mpack/patches/patch-ae 2005/12/19 00:13:39 1.1
+++ pkgsrc/converters/mpack/patches/patch-ae 2009/02/15 20:12:18 1.2
@@ -1,12 +1,31 @@ @@ -1,12 +1,31 @@
1$NetBSD: patch-ae,v 1.1 2005/12/19 00:13:39 joerg Exp $ 1$NetBSD: patch-ae,v 1.2 2009/02/15 20:12:18 dholland Exp $
2 2
3--- unixpk.c.orig 2005-12-19 00:09:00.000000000 +0000 3--- unixpk.c.orig 2003-07-21 16:50:41.000000000 -0400
4+++ unixpk.c 4+++ unixpk.c 2009-02-15 15:09:47.000000000 -0500
5@@ -33,7 +33,6 @@ ww * Permission to use, copy, modify, di 5@@ -22,8 +22,16 @@
 6 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 7 * SOFTWARE.
 8 */
 9+
 10+#ifdef __NetBSD__
 11+/* Use of mktemp() below is ok - resulting names are opened with O_EXCL. */
 12+#define __MKTEMP_OK__
 13+#endif
 14+
 15 #include <stdio.h>
 16+#include <stdlib.h>
 17 #include <string.h>
 18+#include <unistd.h>
 19 #include <errno.h>
 20 #include "common.h"
 21 #include "version.h"
 22@@ -31,9 +39,6 @@
6  23
7 extern char *getenv(); 24 #define MAXADDRESS 100
8  25
 26-extern char *getenv();
 27-
9-extern int errno; 28-extern int errno;
10 extern int optind; 29 extern int optind;
11 extern char *optarg; 30 extern char *optarg;
12  31
cvs diff -r1.1 -r1.2 pkgsrc/converters/mpack/patches/patch-af (expand / switch to unified diff)

--- pkgsrc/converters/mpack/patches/patch-af 2006/06/09 15:34:31 1.1
+++ pkgsrc/converters/mpack/patches/patch-af 2009/02/15 20:12:18 1.2
@@ -1,13 +1,14 @@ @@ -1,13 +1,14 @@
1$NetBSD: patch-af,v 1.1 2006/06/09 15:34:31 minskim Exp $ 1$NetBSD: patch-af,v 1.2 2009/02/15 20:12:18 dholland Exp $
2 2
3--- xmalloc.c.orig 1995-02-16 21:39:50.000000000 +0000 3--- xmalloc.c.orig 2003-07-21 16:35:31.000000000 -0400
4+++ xmalloc.c 4+++ xmalloc.c 2009-02-15 14:47:02.000000000 -0500
5@@ -24,7 +24,7 @@ 5@@ -23,8 +23,8 @@
 6 * SOFTWARE.
6 */ 7 */
7 #include <stdio.h> 8 #include <stdio.h>
 9+#include <stdlib.h>
8 #include <string.h> 10 #include <string.h>
9-extern char *malloc(), *realloc(); 11-extern char *malloc(), *realloc();
10+#include <stdlib.h> 
11  12
12 char *xmalloc (size) 13 char *xmalloc (int size)
13 int size; 14 {