From ff455840a43c8f57292179a6e8f3771227aa1705 Mon Sep 17 00:00:00 2001 From: tv Date: Sat, 20 Jun 1998 23:26:05 +0000 Subject: Add encryption support to zip and unzip pkgs using ZIP_ENCRYPTION make variable. --- archivers/unzip/Makefile | 33 +++++++++++++++++++++++++-------- archivers/unzip/files/md5 | 1 + archivers/unzip/patches/patch-aa | 18 ++++++++++++++++++ archivers/unzip/pkg/PLIST | 12 ++++++------ archivers/zip/Makefile | 18 ++++++++++++++++-- archivers/zip/files/md5 | 1 + archivers/zip/pkg/PLIST | 10 +++++----- 7 files changed, 72 insertions(+), 21 deletions(-) create mode 100644 archivers/unzip/patches/patch-aa (limited to 'archivers') diff --git a/archivers/unzip/Makefile b/archivers/unzip/Makefile index 2423def57f4..3cb3ec2b702 100644 --- a/archivers/unzip/Makefile +++ b/archivers/unzip/Makefile @@ -1,17 +1,34 @@ -# $NetBSD: Makefile,v 1.9 1998/06/18 16:06:38 agc Exp $ +# $NetBSD: Makefile,v 1.10 1998/06/20 23:26:06 tv Exp $ # FreeBSD Id: Makefile,v 1.14 1997/06/19 05:30:04 ache Exp # -DISTNAME= unzip-5.32 +DISTNAME= unzip-5.32 CATEGORIES= archivers -MASTER_SITES= ftp://ftp.cdrom.com/pub/infozip/src/ -DISTFILES= unzip532.tar.gz +MASTER_SITES= ftp://ftp.cdrom.com/pub/infozip/src/ \ + ftp://ftp.icce.rug.nl/infozip/src/ +DISTFILES= unzip532.tar.gz -MAINTAINER= packages@netbsd.org +MAINTAINER= packages@netbsd.org -MAKEFILE= unix/Makefile -ALL_TARGET= bsd -MAKE_FLAGS= LOCAL_UNZIP="${CFLAGS} -DUSE_UNSHRINK" +MAKEFILE= unix/Makefile +ALL_TARGET= unzips +MAKE_FLAGS= CF="${CFLAGS} -I. -DBSD -DUNIX -DUSE_UNSHRINK -DUSE_ZLIB" LF2=-lz + +.include "../../mk/bsd.prefs.mk" + +.if defined(ZIP_ENCRYPTION) +DISTFILES+= zcrypt27.zip +EXTRACT_ONLY= unzip532.tar.gz +RESTRICTED= crypto +MIRROR_DISTFILE=no + +# This bootstrap is ugly, but zcrypt is only shipped as a zipfile. +pre-build: + @cd ${WRKSRC}; test -f README.CR || ( \ + ${MAKE_PROGRAM} ${MAKE_FLAGS} -f ${MAKEFILE} unzip && \ + ./unzip -qo ${DISTDIR}/zcrypt27.zip && \ + ${RM} -f *.o unzip ) +.endif do-install: cd ${WRKSRC} && \ diff --git a/archivers/unzip/files/md5 b/archivers/unzip/files/md5 index ec7ac31a2b9..deda3b34949 100644 --- a/archivers/unzip/files/md5 +++ b/archivers/unzip/files/md5 @@ -1 +1,2 @@ MD5 (unzip532.tar.gz) = 0481e4c1792de60d9fd70fcb16e2eb9b +MD5 (zcrypt27.zip) = 705945343dae4c9344b3c3cf9b2c5ded diff --git a/archivers/unzip/patches/patch-aa b/archivers/unzip/patches/patch-aa new file mode 100644 index 00000000000..c103401062a --- /dev/null +++ b/archivers/unzip/patches/patch-aa @@ -0,0 +1,18 @@ +--- unzip.h.orig Sat Oct 18 18:58:07 1997 ++++ unzip.h Sat Jun 20 18:33:18 1998 +@@ -175,10 +175,15 @@ + #endif + + /* used to remove arguments in function prototypes for non-ANSI C */ ++#ifdef USE_ZLIB ++#include ++#ifndef OF + #ifdef PROTO + # define OF(a) a + #else + # define OF(a) () ++#endif ++#endif + #endif + + /* enable the "const" keyword only if MODERN and if not otherwise instructed */ diff --git a/archivers/unzip/pkg/PLIST b/archivers/unzip/pkg/PLIST index 7f233a645b5..91f2ecb9265 100644 --- a/archivers/unzip/pkg/PLIST +++ b/archivers/unzip/pkg/PLIST @@ -1,14 +1,14 @@ -@comment $NetBSD: PLIST,v 1.5 1998/06/02 12:02:31 tv Exp $ +@comment $NetBSD: PLIST,v 1.6 1998/06/20 23:26:06 tv Exp $ bin/unzip bin/funzip bin/unzipsfx bin/zipgrep bin/zipinfo -man/man1/funzip.1.gz -man/man1/unzip.1.gz -man/man1/unzipsfx.1.gz -man/man1/zipgrep.1.gz -man/man1/zipinfo.1.gz +man/man1/funzip.1 +man/man1/unzip.1 +man/man1/unzipsfx.1 +man/man1/zipgrep.1 +man/man1/zipinfo.1 share/doc/unzip/README share/doc/unzip/COPYING share/doc/unzip/WHERE diff --git a/archivers/zip/Makefile b/archivers/zip/Makefile index d84fe30cd4b..4a4cb0f2b10 100644 --- a/archivers/zip/Makefile +++ b/archivers/zip/Makefile @@ -1,10 +1,11 @@ -# $NetBSD: Makefile,v 1.10 1998/06/18 16:06:38 agc Exp $ +# $NetBSD: Makefile,v 1.11 1998/06/20 23:26:05 tv Exp $ # FreeBSD Id: Makefile,v 1.10 1997/04/27 16:06:15 ache Exp # DISTNAME= zip-2.2 CATEGORIES= archivers -MASTER_SITES= ftp://ftp.cdrom.com/pub/infozip/src/ +MASTER_SITES= ftp://ftp.cdrom.com/pub/infozip/src/ \ + ftp://ftp.icce.rug.nl/infozip/src/ DISTFILES= zip22.tar.gz MAINTAINER= packages@netbsd.org @@ -13,6 +14,19 @@ MAKEFILE= unix/Makefile MAKE_FLAGS= LOCAL_ZIP="${CFLAGS}" ALL_TARGET= generic +.include "../../mk/bsd.prefs.mk" + +.if defined(ZIP_ENCRYPTION) +DISTFILES+= zcrypt27.zip +EXTRACT_ONLY= zip22.tar.gz +FETCH_DEPENDS= unzip:../../archivers/unzip +RESTRICTED= crypto +MIRROR_DISTFILE=no + +post-extract: + @cd ${WRKSRC} && unzip -qo ${DISTDIR}/zcrypt27.zip +.endif + do-install: cd ${WRKSRC} && \ ${INSTALL_PROGRAM} zip zipnote zipsplit zipcloak ${PREFIX}/bin diff --git a/archivers/zip/files/md5 b/archivers/zip/files/md5 index 0e772b01708..33e10366a91 100644 --- a/archivers/zip/files/md5 +++ b/archivers/zip/files/md5 @@ -1 +1,2 @@ MD5 (zip22.tar.gz) = abfa0cfa13a4813aea02b0414a99ad37 +MD5 (zcrypt27.zip) = 705945343dae4c9344b3c3cf9b2c5ded diff --git a/archivers/zip/pkg/PLIST b/archivers/zip/pkg/PLIST index e879b3b314f..d51ce0394ca 100644 --- a/archivers/zip/pkg/PLIST +++ b/archivers/zip/pkg/PLIST @@ -1,9 +1,9 @@ -@comment $NetBSD: PLIST,v 1.3 1997/11/06 09:57:35 agc Exp $ +@comment $NetBSD: PLIST,v 1.4 1998/06/20 23:26:06 tv Exp $ bin/zip bin/zipnote bin/zipsplit bin/zipcloak -man/man1/zip.1.gz -man/man1/zipnote.1.gz -man/man1/zipcloak.1.gz -man/man1/zipsplit.1.gz +man/man1/zip.1 +man/man1/zipnote.1 +man/man1/zipcloak.1 +man/man1/zipsplit.1 -- cgit v1.2.3