diff options
Diffstat (limited to 'archivers/arc')
| -rw-r--r-- | archivers/arc/Makefile | 16 | ||||
| -rw-r--r-- | archivers/arc/distinfo | 17 | ||||
| -rw-r--r-- | archivers/arc/patches/patch-aa | 26 | ||||
| -rw-r--r-- | archivers/arc/patches/patch-ab | 10 | ||||
| -rw-r--r-- | archivers/arc/patches/patch-ac | 23 | ||||
| -rw-r--r-- | archivers/arc/patches/patch-ad | 10 | ||||
| -rw-r--r-- | archivers/arc/patches/patch-ae | 30 |
7 files changed, 45 insertions, 87 deletions
diff --git a/archivers/arc/Makefile b/archivers/arc/Makefile index 34d97dee8e9..fff1c331a10 100644 --- a/archivers/arc/Makefile +++ b/archivers/arc/Makefile @@ -1,15 +1,17 @@ -# $NetBSD: Makefile,v 1.27 2006/05/02 01:30:58 gdt Exp $ +# $NetBSD: Makefile,v 1.28 2006/05/02 19:06:45 wiz Exp $ -DISTNAME= arc521e.pl8 -PKGNAME= arc-5.21e -PKGREVISION= 2 +DISTNAME= arc-5.21o CATEGORIES= archivers -MASTER_SITES= ftp://ftp.kiarchive.ru/pub/unix/arcers/ -EXTRACT_SUFX= .tar.Z +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=arc/} +EXTRACT_SUFX= .tgz MAINTAINER= pkgsrc-users@NetBSD.org +HOMEPAGE= http://arc.sourceforge.net/ COMMENT= Create & extract files from DOS .ARC files +# Is under GPL as of 2003, but the README still contains +# another clause -- in contact with author about it. +# wiz -- 20060502 LICENSE= arc-license RESTRICTED= Do not modify. Do not charge for redistribution. NO_SRC_ON_CDROM=${RESTRICTED} @@ -17,8 +19,6 @@ NO_BIN_ON_CDROM=${RESTRICTED} PKG_INSTALLATION_TYPES= overwrite pkgviews -WRKSRC= ${WRKDIR} - INSTALLATION_DIRS= bin man/man1 do-install: diff --git a/archivers/arc/distinfo b/archivers/arc/distinfo index 518a4cc7b60..84abff0c7ba 100644 --- a/archivers/arc/distinfo +++ b/archivers/arc/distinfo @@ -1,10 +1,9 @@ -$NetBSD: distinfo,v 1.9 2005/10/06 14:23:39 salo Exp $ +$NetBSD: distinfo,v 1.10 2006/05/02 19:06:45 wiz Exp $ -SHA1 (arc521e.pl8.tar.Z) = 34210f9aeaac39a15b34e6aa400b38127b6a2a20 -RMD160 (arc521e.pl8.tar.Z) = 1fcd823b93b4e633244797ed231318c5bc741965 -Size (arc521e.pl8.tar.Z) = 100821 bytes -SHA1 (patch-aa) = 62324f346559b2997eba56698b1c0c1c29a328c3 -SHA1 (patch-ab) = 64fba2f0b5d03f26e427ecddc70e2a9b6b2fc521 -SHA1 (patch-ac) = 64d87af431c6bc0ded0b26167782309a7bfadd8a -SHA1 (patch-ad) = 6f82d17b8eb2f2353d7ebfffaec1d52673acc7a0 -SHA1 (patch-ae) = bb176dee99c3fbc43e0fa00a2ae2ebe00865cc72 +SHA1 (arc-5.21o.tgz) = 4b803eae04976072fae88d4dbfc4b3e45796f8f3 +RMD160 (arc-5.21o.tgz) = 2897f62452f59efcb757cd5447d6d330df0cfdd1 +Size (arc-5.21o.tgz) = 82386 bytes +SHA1 (patch-aa) = 2222318794a68a913e80cb808e3881a4fdc07fb0 +SHA1 (patch-ab) = e85c2698747106a7319db07185bfe0b6e2480974 +SHA1 (patch-ac) = 3332d9db5c41fb205ab9f5123b0de0704ae634b3 +SHA1 (patch-ad) = 3b43c7b64d0e926677dc8d1b20f3afbf0c854a5b diff --git a/archivers/arc/patches/patch-aa b/archivers/arc/patches/patch-aa index 44a5285104b..f729536cc5e 100644 --- a/archivers/arc/patches/patch-aa +++ b/archivers/arc/patches/patch-aa @@ -1,20 +1,22 @@ -$NetBSD: patch-aa,v 1.3 1999/05/22 19:54:09 tv Exp $ +$NetBSD: patch-aa,v 1.4 2006/05/02 19:06:45 wiz Exp $ ---- Makefile.orig Tue Apr 14 18:57:58 1992 -+++ Makefile Sat May 22 15:44:36 1999 -@@ -32,14 +32,7 @@ +--- Makefile.orig 2005-10-09 03:30:24.000000000 +0200 ++++ Makefile +@@ -41,14 +41,14 @@ SYSTEM = -DSYSV=1 OPT = -O # For MWC 3.0 on the Atari ST, use: #CFLAGS = -VCOMPAC -VPEEP -CFLAGS = $(OPT) $(SYSTEM) -- --# GNU's gcc is very nice, if you've got it. Otherwise just cc. --#CC = cgcc -mshort ++CFLAGS += ${SYSTEM} + + # GNU's gcc is very nice, if you've got it. Otherwise just cc. + #CC = cgcc -mshort -mbaserel -CC = cc -- --# tmclock is only needed on Unix systems... ++#CC = cc + + # tmclock is only needed on Unix systems... -TMCLOCK = tmclock.o -+CFLAGS += $(SYSTEM) ++#TMCLOCK = tmclock.o - # Files needed for System V - #SYSVOBJ = getwd.o rename.o scandir.o utimes.o + # Integer-only stdio routines for Atari ST. + #LIBS=-liio16 diff --git a/archivers/arc/patches/patch-ab b/archivers/arc/patches/patch-ab index 60a75155b6b..f0aac36a235 100644 --- a/archivers/arc/patches/patch-ab +++ b/archivers/arc/patches/patch-ab @@ -1,6 +1,6 @@ -$NetBSD: patch-ab,v 1.4 2005/01/16 16:39:08 tv Exp $ +$NetBSD: patch-ab,v 1.5 2006/05/02 19:06:45 wiz Exp $ ---- arcdos.c.orig 1992-04-14 18:58:21.000000000 -0400 +--- arcdos.c.orig 2003-10-31 03:32:19.000000000 +0100 +++ arcdos.c @@ -31,7 +31,11 @@ #include <sys/types.h> @@ -13,8 +13,8 @@ $NetBSD: patch-ab,v 1.4 2005/01/16 16:39:08 tv Exp $ +#endif #else #include <time.h> /* Sys V. Bleah. */ - struct timeval { -@@ -50,6 +54,11 @@ struct timeval { + #if NEED_TIMEVAL +@@ -52,6 +56,11 @@ struct timeval { char *malloc(); #endif @@ -26,7 +26,7 @@ $NetBSD: patch-ab,v 1.4 2005/01/16 16:39:08 tv Exp $ VOID getstamp(f, date, time) /* get a file's date/time stamp */ #if !_MTS -@@ -171,20 +180,29 @@ setstamp(f, date, time) /* set a file's +@@ -173,20 +182,29 @@ setstamp(f, date, time) /* set a file's #endif #if UNIX struct tm tm; diff --git a/archivers/arc/patches/patch-ac b/archivers/arc/patches/patch-ac index 6ed600c2707..66ff5d8440a 100644 --- a/archivers/arc/patches/patch-ac +++ b/archivers/arc/patches/patch-ac @@ -1,7 +1,7 @@ -$NetBSD: patch-ac,v 1.1 2005/01/01 11:43:27 kristerw Exp $ +$NetBSD: patch-ac,v 1.2 2006/05/02 19:06:45 wiz Exp $ ---- arcmisc.c.orig Wed Apr 15 00:59:12 1992 -+++ arcmisc.c Sat Jan 1 12:36:08 2005 +--- arcmisc.c.orig 2005-10-09 03:38:22.000000000 +0200 ++++ arcmisc.c @@ -5,6 +5,7 @@ #include <stdio.h> @@ -10,24 +10,11 @@ $NetBSD: patch-ac,v 1.1 2005/01/01 11:43:27 kristerw Exp $ #include "arc.h" #include <string.h> -@@ -233,16 +234,16 @@ +@@ -245,7 +246,6 @@ gcdir(dirname) char *dirname; { -- char *getwd(); -+ size_t buf_size = 0; +- char *getcwd(); #if GEMDOS int drv; char *buf; - #endif -- if (dirname == NULL || strlen(dirname) == 0) -- dirname = (char *) malloc(1024); -+ if (dirname == NULL || (buf_size = strlen(dirname)) == 0) -+ dirname = (char *) malloc(buf_size = 1024); - - #if !GEMDOS -- getwd(dirname); -+ getcwd(dirname, buf_size); - #else - buf = dirname; - *buf++ = (drv = Dgetdrv()) + 'A'; diff --git a/archivers/arc/patches/patch-ad b/archivers/arc/patches/patch-ad index 1acfb1c760f..a0a01d500c3 100644 --- a/archivers/arc/patches/patch-ad +++ b/archivers/arc/patches/patch-ad @@ -1,19 +1,19 @@ -$NetBSD: patch-ad,v 1.1 2005/05/08 05:45:42 minskim Exp $ +$NetBSD: patch-ad,v 1.2 2006/05/02 19:06:45 wiz Exp $ ---- marc.c.orig 1992-04-14 17:59:21.000000000 -0500 +--- marc.c.orig 2005-10-09 03:38:22.000000000 +0200 +++ marc.c -@@ -42,12 +42,13 @@ char srcname[STRLEN]; /* source +@@ -48,12 +48,13 @@ char *pinbuf; /* block input buffer * static char **lst; /* files list */ static int lnum; /* length of files list */ -+char *makefnam(char*, char*, char*); /* filename fixup routine */ ++char *makefnam(char*, char*, char*); /* filename fixup routine */ + int main(nargs,arg) /* system entry point */ int nargs; /* number of arguments */ char *arg[]; /* pointers to arguments */ { -- char *makefnam(); /* filename fixup routine */ +- char *makefnam(); char *envfind(); #if !_MTS char *arctemp2, *mktemp(); /* temp file stuff */ diff --git a/archivers/arc/patches/patch-ae b/archivers/arc/patches/patch-ae deleted file mode 100644 index 759c05fe3bf..00000000000 --- a/archivers/arc/patches/patch-ae +++ /dev/null @@ -1,30 +0,0 @@ -$NetBSD: patch-ae,v 1.1 2005/10/06 14:23:39 salo Exp $ - -Security fix for CAN-2005-2945 and CAN-2005-2992, from Debian. - ---- arcsvc.c.orig 1992-04-15 00:58:40.000000000 +0200 -+++ arcsvc.c 2005-10-06 16:07:28.000000000 +0200 -@@ -17,6 +17,9 @@ - Computer Innovations Optimizing C86 - */ - #include <stdio.h> -+#include <sys/types.h> -+#include <sys/stat.h> -+#include <fcntl.h> - #include "arc.h" - #if _MTS - #include <mts.h> -@@ -52,7 +55,12 @@ - } - #endif - if (chg) { /* if opening for changes */ -- if (!(new = fopen(newname, OPEN_W))) -+ int fd; -+ -+ if ((fd = open(newname, O_CREAT|O_EXCL|O_RDWR, S_IREAD|S_IWRITE)) == -1) -+ arcdie("Cannot create archive copy: %s", newname); -+ -+ if (!(new = fdopen(fd, OPEN_W))) - arcdie("Cannot create archive copy: %s", newname); - - changing = chg; /* note if open for changes */ |