diff options
author | Andrey A. Chernov <ache@FreeBSD.org> | 2005-11-13 12:38:50 +0000 |
---|---|---|
committer | Andrey A. Chernov <ache@FreeBSD.org> | 2005-11-13 12:38:50 +0000 |
commit | 60b645f390e4545d86337e43d9fa19bf5aeaf5ee (patch) | |
tree | 82857a768917876eaf072cf0b7ecdaf4cf0db43d /archivers/zip | |
parent | - Build with -fPIC on amd64 to fix build of net/p5-Net-Pcap module (diff) |
Upgrade to 2.31
PR: 88896
Notes
Notes:
svn path=/head/; revision=148098
Diffstat (limited to 'archivers/zip')
-rw-r--r-- | archivers/zip/Makefile | 15 | ||||
-rw-r--r-- | archivers/zip/distinfo | 7 | ||||
-rw-r--r-- | archivers/zip/files/patch-over | 25 |
3 files changed, 6 insertions, 41 deletions
diff --git a/archivers/zip/Makefile b/archivers/zip/Makefile index d2bc4b9825dd..d7e405f72a21 100644 --- a/archivers/zip/Makefile +++ b/archivers/zip/Makefile @@ -7,29 +7,20 @@ # PORTNAME= zip -PORTVERSION= 2.3 -PORTREVISION= 2 +PORTVERSION= 2.31 CATEGORIES= archivers -MASTER_SITES= ftp://ftp.uu.net/pub/archiving/zip/src/ \ +MASTER_SITES= http://ftp.info-zip.org/pub/infozip/src/ \ ${MASTER_SITE_TEX_CTAN:S,%SUBDIR%,tools/zip/info-zip/src/,} -DISTFILES= zip23${EXTRACT_SUFX} ${ZCRYPT_SRC} -EXTRACT_ONLY= zip23${EXTRACT_SUFX} +DISTFILES= zip231${EXTRACT_SUFX} MAINTAINER= ache@FreeBSD.org COMMENT= Create/update ZIP files compatible with pkzip -EXTRACT_DEPENDS=unzip:${PORTSDIR}/archivers/unzip - -ZCRYPT_SRC= zcrypt29-exportable.zip WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} MAKEFILE= unix/Makefile -MAKE_FLAGS= LOCAL_ZIP="-DUSE_CRYPT" -f ALL_TARGET= generic MAN1= zip.1 -post-extract: - unzip -q -aa -o ${_DISTDIR}${ZCRYPT_SRC} -d ${WRKSRC} -x WHERE - do-install: .for file in zip zipcloak zipnote zipsplit ${INSTALL_PROGRAM} ${WRKSRC}/${file} ${PREFIX}/bin diff --git a/archivers/zip/distinfo b/archivers/zip/distinfo index 12353025b0ae..0ebf70ef0a5c 100644 --- a/archivers/zip/distinfo +++ b/archivers/zip/distinfo @@ -1,4 +1,3 @@ -MD5 (zip23.tar.gz) = 5206a99541f3b0ab90f1baa167392c4f -SIZE (zip23.tar.gz) = 723283 -MD5 (zcrypt29-exportable.zip) = 0c969ba1661183b041a142945ed2710e -SIZE (zcrypt29-exportable.zip) = 20248 +MD5 (zip231.tar.gz) = 6bfc076664416251d7624ab3538d1cb9 +SHA256 (zip231.tar.gz) = 2d21c0ed60346bcaa47ff0c3369219602dca1733b83ec503e9e8108dc119f719 +SIZE (zip231.tar.gz) = 781641 diff --git a/archivers/zip/files/patch-over b/archivers/zip/files/patch-over deleted file mode 100644 index ec03a1e132a4..000000000000 --- a/archivers/zip/files/patch-over +++ /dev/null @@ -1,25 +0,0 @@ ---- zip-2.3/unix/unix.c.orig 2004-11-05 15:44:41.000000000 -0500 -+++ unix/unix.c 2004-11-05 15:50:28.000000000 -0500 -@@ -319,8 +319,8 @@ iztimes *t; /* return value: - a file size of -1 */ - { - struct stat s; /* results of stat() */ -- char name[FNMAX]; -- int len = strlen(f); -+ char *name; -+ size_t len = strlen(f); - - if (f == label) { - if (a != NULL) -@@ -331,6 +331,11 @@ iztimes *t; /* return value: - t->atime = t->mtime = t->ctime = label_utim; - return label_time; - } -+ -+ name = malloc(len+1); -+ if (!name) -+ return 0; -+ - strcpy(name, f); - if (name[len - 1] == '/') - name[len - 1] = '\0'; |