Add and enable zip1 (PKZIP 1.x compatible zip), with encryption support.

Not conflicting with `zip' program.

11 files changed, 203 insertions, 3 deletions

diff --git a/archivers/Makefile b/archivers/Makefile
index a2bb45cb39c..93c5124749d 100644
--- a/archivers/Makefile
+++ b/archivers/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 1998/05/08 10:30:52 agc Exp $
+# $NetBSD: Makefile,v 1.10 1998/06/20 23:27:48 tv Exp $
 # FreeBSD Id: Makefile,v 1.18 1997/05/16 01:42:31 asami Exp 
 #
 
@@ -18,9 +18,8 @@
     SUBDIR += unarj
     SUBDIR += unrar
     SUBDIR += unzip
-#    SUBDIR += unzip.with_encryption
     SUBDIR += zip
-#    SUBDIR += zip.with_encryption
+    SUBDIR += zip1
     SUBDIR += zoo
 
 .include "../mk/bsd.pkg.subdir.mk"
diff --git a/archivers/zip1/Makefile b/archivers/zip1/Makefile
new file mode 100644
index 00000000000..fc1c729ea34
--- /dev/null
+++ b/archivers/zip1/Makefile
@@ -0,0 +1,44 @@
+# $NetBSD: Makefile,v 1.1 1998/06/20 23:27:49 tv Exp $
+#
+
+DISTNAME=	zip1-1.1
+CATEGORIES=	archivers
+MASTER_SITES=	ftp://ftp.cdrom.com/pub/infozip/src/ \
+		ftp://ftp.icce.rug.nl/infozip/src/
+DISTFILES=	zip11.zip
+
+MAINTAINER=	tv@netbsd.org
+
+FETCH_DEPENDS=	unzip:../../archivers/unzip
+
+EXTRACT_CMD=	unzip
+EXTRACT_BEFORE_ARGS=	-qo
+
+MAKEFILE=	makefile
+MAKE_FLAGS=	CFLAGS="${CFLAGS} -DDIRENT" LFLAGS2="-lcompat"
+ALL_TARGET=	zip
+
+NO_WRKSUBDIR=	yes
+PLIST_SRC=	${WRKSRC}/PLIST
+
+.include "../../mk/bsd.prefs.mk"
+
+.if defined(ZIP_ENCRYPTION)
+DISTFILES+=	zcrypt10.zip
+ALL_TARGET+=	zipcloak
+RESTRICTED=	crypto
+MIRROR_DISTFILE=no
+.endif
+
+do-install:
+	@${CP} ${PKGDIR}/PLIST.pre ${PLIST_SRC}
+	cd ${WRKSRC} && ${INSTALL_PROGRAM} zip ${PREFIX}/bin/zip1
+	cd ${WRKSRC} && ${INSTALL_MAN} zip.1 ${PREFIX}/man/man1/zip1.1
+.if defined(ZIP_ENCRYPTION)
+	cd ${WRKSRC} && ${INSTALL_PROGRAM} zipcloak ${PREFIX}/bin/zipcloak1
+	ln -fs zip1.1 ${PREFIX}/man/man1/zipcloak1.1
+	@${ECHO} >>${PLIST_SRC} "bin/zipcloak1"
+	@${ECHO} >>${PLIST_SRC} "man/man1/zipcloak1.1"
+.endif
+
+.include "../../mk/bsd.pkg.mk"
diff --git a/archivers/zip1/files/md5 b/archivers/zip1/files/md5
new file mode 100644
index 00000000000..f24bd5e0fd3
--- /dev/null
+++ b/archivers/zip1/files/md5
@@ -0,0 +1,2 @@
+MD5 (zip11.zip) = 08b09095afbf481cb658f0a2e789d7a9
+MD5 (zcrypt10.zip) = f8045f0607272f4b95daeb6f8ac892c4
diff --git a/archivers/zip1/patches/patch-aa b/archivers/zip1/patches/patch-aa
new file mode 100644
index 00000000000..6190066a2ee
--- /dev/null
+++ b/archivers/zip1/patches/patch-aa
@@ -0,0 +1,70 @@
+--- fileio.c.orig	Sat Aug 29 21:51:00 1992
++++ fileio.c	Sat Jun 20 17:26:18 1998
+@@ -59,16 +59,6 @@
+ #endif /* ?VMS */
+ 
+ 
+-/* For now, assume DIRENT implies System V implies TERMIO */
+-#ifdef DIRENT
+-#  ifndef MINIX
+-#    ifndef TERMIO
+-#      define TERMIO
+-#    endif /* !TERMIO */
+-#  endif /* !MINIX */
+-#endif /* DIRENT */
+-
+-
+ #ifndef EXPORT
+ #  ifdef MSVMS
+ #    ifdef MSDOS
+@@ -99,11 +89,16 @@
+ #      define GTTY gtty
+ #      define STTY stty
+ #    endif /* ?TERMIO */
++#ifdef MODERN
++#include <fcntl.h>
++#include <unistd.h>
++#else
+      int isatty OF((int));
+      char *ttyname OF((int));
+      int open OF((char *, int, ...));
+      int close OF((int));
+      int read OF((int, voidp *, int));
++#endif
+ #  endif /* ?MSVMS */
+ #endif /* !EXPORT */
+ 
+@@ -197,6 +192,9 @@
+ #endif /* !UTIL */
+ 
+ 
++#ifdef MODERN
++#include <unistd.h>
++#else
+ /* Library functions not in (most) header files */
+ char *mktemp OF((char *));
+ int link OF((char *, char *));
+@@ -207,6 +205,7 @@
+     * parameter is an unsigned long.
+     */
+ #endif /* !CONVEX */
++#endif
+ 
+ 
+ #ifndef UTIL    /* the companion #endif is a bit of ways down ... */
+@@ -215,11 +214,15 @@
+    int utime OF((char *, time_t *));
+ #endif /* !__TURBOC__ */
+ #ifndef MSDOS
++#ifdef MODERN
++#include <fcntl.h>
++#else
+    int open OF((char *, int, ...));
+    int close OF((int));
+ #  ifndef RMDIR
+      int rmdir OF((char *));
+ #  endif /* !RMDIR */
++#endif
+ #endif /* !MSDOS */
+ 
+ 
diff --git a/archivers/zip1/patches/patch-ab b/archivers/zip1/patches/patch-ab
new file mode 100644
index 00000000000..a494d9d5d1d
--- /dev/null
+++ b/archivers/zip1/patches/patch-ab
@@ -0,0 +1,13 @@
+--- tailor.h.orig	Mon Oct 21 13:34:28 1991
++++ tailor.h	Sat Jun 20 17:18:04 1998
+@@ -1,10 +1,5 @@
+ /* tailor.h -- Not copyrighted 1991 Mark Adler */
+ 
+-/* const's are inconsistently used across ANSI libraries--kill for all
+-   header files. */
+-#define const
+-
+-
+ /* Use prototypes and ANSI libraries if __STDC__ */
+ #ifdef __STDC__
+ #  ifndef PROTO
diff --git a/archivers/zip1/patches/patch-ac b/archivers/zip1/patches/patch-ac
new file mode 100644
index 00000000000..913c10841b4
--- /dev/null
+++ b/archivers/zip1/patches/patch-ac
@@ -0,0 +1,34 @@
+--- zip.1.orig	Mon Oct 21 13:33:32 1991
++++ zip.1	Sat Jun 20 17:36:55 1998
+@@ -6,11 +6,11 @@
+ .\"
+ .\" zip.1 by Mark Adler.
+ .\"
+-.TH ZIP 1
++.TH ZIP1 1
+ .SH NAME
+-zip \- package and compress (archive) files
++zip1 \- package and compress (archive) files in Zip 1.x format
+ .SH SYNOPSIS
+-.B zip
++.B zip1
+ [
+ .B \-cdefghijklmnoqrsuwyz
+ ] [
+@@ -22,11 +22,14 @@
+ list ]
+ .br
+ .SH DESCRIPTION
+-.I Zip
++.I Zip1
++(hereafter called Zip)
+ is a compression and file packaging utility for Unix, MSDOS, OS/2, and VMS.
+ It is
+ analogous to a combination of tar and compress and is compatible with PKZIP
+-(Phil Katz ZIP) for MSDOS systems.
++(Phil Katz ZIP) for MSDOS systems (version 1).  Use the zip(1) utility to
++create Zip version 2 archives, which include better compression but are
++incompatible with PKUNZIP version 1.
+ .PP
+ There is a companion to
+ .I Zip
diff --git a/archivers/zip1/patches/patch-ad b/archivers/zip1/patches/patch-ad
new file mode 100644
index 00000000000..7c70defd00b
--- /dev/null
+++ b/archivers/zip1/patches/patch-ad
@@ -0,0 +1,12 @@
+--- zip.h.orig	Mon Oct 21 13:34:06 1991
++++ zip.h	Sat Jun 20 17:21:28 1998
+@@ -176,7 +176,9 @@
+    int issymlnk OF((ulg a));
+ #  ifdef S_IFLNK
+ #    define rdsymlnk(p,b,n) readlink(p,b,n)
++#ifndef MODERN
+      extern int readlink OF((char *, char *, int));
++#endif
+ #  else /* !S_IFLNK */
+ #    define rdsymlnk(p,b,n) (0)
+ #  endif /* !S_IFLNK */
diff --git a/archivers/zip1/patches/patch-ae b/archivers/zip1/patches/patch-ae
new file mode 100644
index 00000000000..61d69bab1ad
--- /dev/null
+++ b/archivers/zip1/patches/patch-ae
@@ -0,0 +1,18 @@
+--- zipup.c.orig	Mon Oct 21 13:33:48 1991
++++ zipup.c	Sat Jun 20 17:03:09 1998
+@@ -34,10 +34,15 @@
+ #    include <fcntl.h>
+ #    define fhow (O_RDONLY|O_BINARY)
+ #  else /* !MSDOS */
++#ifdef MODERN
++#include <fcntl.h>
++#include <unistd.h>
++#else
+      int open OF((char *, int));
+      int read OF((int, char *, int));
+      int close OF((int));
+      int lseek OF((int,long,int));
++#endif
+ #    define fhow 0
+ #  endif /* ?MSDOS */
+    typedef int ftype;
diff --git a/archivers/zip1/pkg/COMMENT b/archivers/zip1/pkg/COMMENT
new file mode 100644
index 00000000000..1c011616c30
--- /dev/null
+++ b/archivers/zip1/pkg/COMMENT
@@ -0,0 +1 @@
+Create/update ZIP files compatabile with pkzip version 1.
diff --git a/archivers/zip1/pkg/DESCR b/archivers/zip1/pkg/DESCR
new file mode 100644
index 00000000000..1aa5b8142a8
--- /dev/null
+++ b/archivers/zip1/pkg/DESCR
@@ -0,0 +1,4 @@
+Zip is a compression and file packaging utility.  It is compatible with
+PKZIP 1.x (Phil Katz ZIP) for MSDOS systems.  There is a companion to zip
+called unzip (of course) which you should be able to find the same place
+you got zip.
diff --git a/archivers/zip1/pkg/PLIST.pre b/archivers/zip1/pkg/PLIST.pre
new file mode 100644
index 00000000000..399c17d9ef1
--- /dev/null
+++ b/archivers/zip1/pkg/PLIST.pre
@@ -0,0 +1,3 @@
+@comment $NetBSD: PLIST.pre,v 1.1 1998/06/20 23:27:51 tv Exp $
+bin/zip1
+man/man1/zip1.1