[pkgsrc/trunk]: pkgsrc/converters/mpack Update to 1.6.

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/6dbd422a2210
branches:  trunk
changeset: 554531:6dbd422a2210
user:      dholland <dholland%pkgsrc.org@localhost>
date:      Sun Feb 15 20:12:17 2009 +0000

description:
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.

diffstat:

 converters/mpack/Makefile         |  10 +++----
 converters/mpack/PLIST            |   6 ++--
 converters/mpack/distinfo         |  15 +++++------
 converters/mpack/patches/patch-aa |  50 ---------------------------------------
 converters/mpack/patches/patch-ab |  28 ++++++++++++++++-----
 converters/mpack/patches/patch-ae |  29 ++++++++++++++++++---
 converters/mpack/patches/patch-af |  15 ++++++-----
 7 files changed, 67 insertions(+), 86 deletions(-)

diffs (232 lines):

diff -r 9fcdbcbe74f7 -r 6dbd422a2210 converters/mpack/Makefile
--- a/converters/mpack/Makefile Sun Feb 15 19:58:12 2009 +0000
+++ b/converters/mpack/Makefile Sun Feb 15 20:12:17 2009 +0000
@@ -1,16 +1,14 @@
-# $NetBSD: Makefile,v 1.18 2006/03/04 21:29:06 jlam Exp $
+# $NetBSD: Makefile,v 1.19 2009/02/15 20:12:17 dholland Exp $
 
-DISTNAME=      mpack-1.5-src
-PKGNAME=       mpack-1.5
+DISTNAME=      mpack-1.6
 CATEGORIES=    converters mail news
 MASTER_SITES=  ftp://ftp.andrew.cmu.edu/pub/mpack/
-EXTRACT_SUFX=  .tar.Z
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 COMMENT=       External MIME packer/unpacker
 
-WRKSRC=                ${WRKDIR}/mpack
+PKG_DESTDIR_SUPPORT=   user-destdir
 
-LDFLAGS.SunOS+=        -lsocket -lnsl
+GNU_CONFIGURE=         yes
 
 .include "../../mk/bsd.pkg.mk"
diff -r 9fcdbcbe74f7 -r 6dbd422a2210 converters/mpack/PLIST
--- a/converters/mpack/PLIST    Sun Feb 15 19:58:12 2009 +0000
+++ b/converters/mpack/PLIST    Sun Feb 15 20:12:17 2009 +0000
@@ -1,5 +1,5 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 21:50:55 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2009/02/15 20:12:17 dholland Exp $
 bin/mpack
 bin/munpack
-man/man1/mpack.1.gz
-man/man1/munpack.1.gz
+man/man1/mpack.1
+man/man1/munpack.1
diff -r 9fcdbcbe74f7 -r 6dbd422a2210 converters/mpack/distinfo
--- a/converters/mpack/distinfo Sun Feb 15 19:58:12 2009 +0000
+++ b/converters/mpack/distinfo Sun Feb 15 20:12:17 2009 +0000
@@ -1,11 +1,10 @@
-$NetBSD: distinfo,v 1.7 2006/06/09 15:34:31 minskim Exp $
+$NetBSD: distinfo,v 1.8 2009/02/15 20:12:17 dholland Exp $
 
-SHA1 (mpack-1.5-src.tar.Z) = 1c5081edd9c7152d2a8c4585af2c5a3fc9f17d60
-RMD160 (mpack-1.5-src.tar.Z) = 614c35b1f63c2a6027c978946941cd8755cba774
-Size (mpack-1.5-src.tar.Z) = 285360 bytes
-SHA1 (patch-aa) = d08d4f7f3e44b1ddc71c0838c014b4a2aed61811
-SHA1 (patch-ab) = 38c17a6a9cbe71528300ebc3d74720f986a7d3b4
+SHA1 (mpack-1.6.tar.gz) = 7fd3a73e0f131412920b6ff34872e7e7fa03e03b
+RMD160 (mpack-1.6.tar.gz) = a83330aa15437dc3ca6475cbf6e35b09ab9cef07
+Size (mpack-1.6.tar.gz) = 179850 bytes
+SHA1 (patch-ab) = 7c11f3ddbd39deaf0e8eed51fe38219c3b6b1217
 SHA1 (patch-ac) = a69986a5c1b7659fac6df05f4db9a44df3110892
 SHA1 (patch-ad) = 76f32d163021a81d73d8316f72b141ef3edf4f14
-SHA1 (patch-ae) = 46ca4ac43cd049399fc8b05e566bd6968a6dc019
-SHA1 (patch-af) = 9d2b3ad72a9a6491ef95b94b389813058ecc5103
+SHA1 (patch-ae) = 884e38efa3a975c6a1090d6ecddc4e535d1db59c
+SHA1 (patch-af) = 2b38171d450ddbe1f9bb7a520d5e114a15afab9d
diff -r 9fcdbcbe74f7 -r 6dbd422a2210 converters/mpack/patches/patch-aa
--- a/converters/mpack/patches/patch-aa Sun Feb 15 19:58:12 2009 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,50 +0,0 @@
-$NetBSD: patch-aa,v 1.6 2002/12/05 16:45:21 is Exp $
---- Makefile.orig      Thu Feb 16 22:39:41 1995
-+++ Makefile   Thu Dec  5 16:57:10 2002
-@@ -1,6 +1,7 @@
--CFLAGS=$(OPT) $(DEFINES)
--OPT=-O
--
-+CFLAGS+=$(OPT) $(DEFINES)
-+#OPT=-O
-+DEFINES=-Dunix
-+LIBS=${LDFLAGS}
- 
- #Uncomment the following line if your system does not have strchr()
- #DEFINES=-Dstrchr=index -Dstrrchr=rindex
-@@ -24,11 +25,11 @@
- 
- 
- PACKOBJS = unixpk.o encode.o codes.o magic.o unixos.o string.o \
--              xmalloc.o md5c.o getopt.o
-+              xmalloc.o md5c.o
- UNPACKOBJS = unixunpk.o decode.o uudecode.o codes.o unixos.o string.o \
--              part.o xmalloc.o md5c.o getopt.o
-+              part.o xmalloc.o md5c.o
- 
--DESTDIR=/usr/local
-+DESTDIR=${PREFIX}
- 
- all: mpack munpack
- 
-@@ -39,13 +40,13 @@
-       $(CC) $(CFLAGS) -o munpack $(UNPACKOBJS) $(LIBS)
- 
- install: all
--      -mkdir $(DESTDIR)/bin
--      -mkdir $(DESTDIR)/man
--      -mkdir $(DESTDIR)/man/man1
--      install -s -m 755 mpack $(DESTDIR)/bin
--      install -s -m 755 munpack $(DESTDIR)/bin
--      install -m 644 unixpk.man $(DESTDIR)/man/man1/mpack.1
--      install -m 644 unixunpk.man $(DESTDIR)/man/man1/munpack.1
-+      -${BSD_INSTALL_PROGRAM_DIR} $(DESTDIR)/bin
-+      -${BSD_INSTALL_MAN_DIR} $(DESTDIR)/man
-+      -${BSD_INSTALL_MAN_DIR} $(DESTDIR)/man/man1
-+      ${BSD_INSTALL_PROGRAM} mpack $(DESTDIR)/bin
-+      ${BSD_INSTALL_PROGRAM} munpack $(DESTDIR)/bin
-+      ${BSD_INSTALL_MAN} unixpk.man $(DESTDIR)/man/man1/mpack.1
-+      ${BSD_INSTALL_MAN} unixunpk.man $(DESTDIR)/man/man1/munpack.1
- 
- clean:
-       rm -f *.o mpack munpack
diff -r 9fcdbcbe74f7 -r 6dbd422a2210 converters/mpack/patches/patch-ab
--- a/converters/mpack/patches/patch-ab Sun Feb 15 19:58:12 2009 +0000
+++ b/converters/mpack/patches/patch-ab Sun Feb 15 20:12:17 2009 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.6 2005/12/19 00:13:39 joerg Exp $
+$NetBSD: patch-ab,v 1.7 2009/02/15 20:12:18 dholland Exp $
 
---- unixos.c.orig      1995-02-16 21:39:50.000000000 +0000
-+++ unixos.c
-@@ -23,6 +23,7 @@
+--- unixos.c.orig      2003-07-21 16:54:05.000000000 -0400
++++ unixos.c   2009-02-15 14:56:48.000000000 -0500
+@@ -23,9 +23,11 @@
   * SOFTWARE.
   */
  #include <stdio.h>
@@ -10,7 +10,11 @@
  #include <ctype.h>
  #include <string.h>
  #include <errno.h>
-@@ -36,10 +37,6 @@
++#include <time.h>
+ #include <sys/types.h>
+ #include <sys/param.h>
+ #include <netdb.h>
+@@ -38,10 +40,6 @@
  #define MAXHOSTNAMELEN 64
  #endif
  
@@ -21,14 +25,24 @@
  int overwrite_files = 0;
  int didchat;
  
-@@ -89,7 +86,11 @@ char *id;
+@@ -76,7 +74,7 @@ char *os_genid(void)
+     }
+ 
+     result = malloc(25+strlen(hostname));
+-    sprintf(result, "%d.%d@%s", pid, curtime++, hostname);
++    sprintf(result, "%d.%lld@%s", pid, (long long) curtime++, hostname);
+     return result;
+ }
+ 
+@@ -90,7 +88,11 @@ char *os_idtodir(char *id)
        strcpy(buf, getenv("TMPDIR"));
      }
      else {
+-      strcpy(buf, "/usr/tmp");
 +#if defined(P_tmpdir)
 +      strcpy(buf, P_tmpdir);
 +#else
-       strcpy(buf, "/usr/tmp");
++      strcpy(buf, "/var/tmp");
 +#endif
      }
      strcat(buf, "/m-prts-");
diff -r 9fcdbcbe74f7 -r 6dbd422a2210 converters/mpack/patches/patch-ae
--- a/converters/mpack/patches/patch-ae Sun Feb 15 19:58:12 2009 +0000
+++ b/converters/mpack/patches/patch-ae Sun Feb 15 20:12:17 2009 +0000
@@ -1,11 +1,30 @@
-$NetBSD: patch-ae,v 1.1 2005/12/19 00:13:39 joerg Exp $
+$NetBSD: patch-ae,v 1.2 2009/02/15 20:12:18 dholland Exp $
 
---- unixpk.c.orig      2005-12-19 00:09:00.000000000 +0000
-+++ unixpk.c
-@@ -33,7 +33,6 @@ ww * Permission to use, copy, modify, di
+--- unixpk.c.orig      2003-07-21 16:50:41.000000000 -0400
++++ unixpk.c   2009-02-15 15:09:47.000000000 -0500
+@@ -22,8 +22,16 @@
+  * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
+  * SOFTWARE.
+  */
++
++#ifdef __NetBSD__
++/* Use of mktemp() below is ok - resulting names are opened with O_EXCL. */
++#define __MKTEMP_OK__
++#endif
++
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <string.h>
++#include <unistd.h>
+ #include <errno.h>
+ #include "common.h"
+ #include "version.h"
+@@ -31,9 +39,6 @@
  
- extern char *getenv();
+ #define MAXADDRESS 100
  
+-extern char *getenv();
+-
 -extern int errno;
  extern int optind;
  extern char *optarg;
diff -r 9fcdbcbe74f7 -r 6dbd422a2210 converters/mpack/patches/patch-af
--- a/converters/mpack/patches/patch-af Sun Feb 15 19:58:12 2009 +0000
+++ b/converters/mpack/patches/patch-af Sun Feb 15 20:12:17 2009 +0000
@@ -1,13 +1,14 @@
-$NetBSD: patch-af,v 1.1 2006/06/09 15:34:31 minskim Exp $
+$NetBSD: patch-af,v 1.2 2009/02/15 20:12:18 dholland Exp $
 
---- xmalloc.c.orig     1995-02-16 21:39:50.000000000 +0000
-+++ xmalloc.c
-@@ -24,7 +24,7 @@
+--- xmalloc.c.orig     2003-07-21 16:35:31.000000000 -0400
++++ xmalloc.c  2009-02-15 14:47:02.000000000 -0500
+@@ -23,8 +23,8 @@
+  * SOFTWARE.
   */
  #include <stdio.h>
++#include <stdlib.h>
  #include <string.h>
 -extern char *malloc(), *realloc();
-+#include <stdlib.h>
  
- char *xmalloc (size)
- int size;
+ char *xmalloc (int size)
+ {