[pkgsrc/trunk]: pkgsrc/archivers/zoo Apply massive patch from PR pkgsrc/38449...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/b87c58c4459c
branches:  trunk
changeset: 392103:b87c58c4459c
user:      gdt <gdt%pkgsrc.org@localhost>
date:      Sat Apr 25 23:46:47 2009 +0000

description:
Apply massive patch from PR pkgsrc/38449 by Olaf 'Rhialto' Seibert.

diffstat:

 archivers/zoo/Makefile         |   4 ++--
 archivers/zoo/patches/patch-aa |   8 ++++----
 archivers/zoo/patches/patch-ab |  12 ++++++------
 archivers/zoo/patches/patch-ac |   4 ++--
 archivers/zoo/patches/patch-ad |   8 ++++----
 archivers/zoo/patches/patch-ae |  29 ++++++++++++++++++++++-------
 archivers/zoo/patches/patch-af |  10 +++++-----
 archivers/zoo/patches/patch-ag |   8 ++++----
 archivers/zoo/patches/patch-ah |   8 ++++----
 archivers/zoo/patches/patch-ai |  24 +++++++++++++++++++++---
 archivers/zoo/patches/patch-aj |   4 ++--
 archivers/zoo/patches/patch-ak |   4 ++--
 archivers/zoo/patches/patch-al |   4 ++--
 archivers/zoo/patches/patch-am |  27 +++++++++++++++++++++++++--
 archivers/zoo/patches/patch-an |   4 ++--
 archivers/zoo/patches/patch-ao |   4 ++--
 16 files changed, 109 insertions(+), 53 deletions(-)

diffs (truncated from 341 to 300 lines):

diff -r 0fcc19d12480 -r b87c58c4459c archivers/zoo/Makefile
--- a/archivers/zoo/Makefile    Sat Apr 25 21:32:45 2009 +0000
+++ b/archivers/zoo/Makefile    Sat Apr 25 23:46:47 2009 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.31 2009/02/11 14:23:31 joerg Exp $
+# $NetBSD: Makefile,v 1.32 2009/04/25 23:46:47 gdt Exp $
 
 DISTNAME=      zoo-2.10pl1
 PKGNAME=       zoo-2.10.1
-PKGREVISION=   3
+PKGREVISION=   4
 CATEGORIES=    archivers
 MASTER_SITES=  ftp://ftp.kiarchive.ru/pub/unix/arcers/
 
diff -r 0fcc19d12480 -r b87c58c4459c archivers/zoo/patches/patch-aa
--- a/archivers/zoo/patches/patch-aa    Sat Apr 25 21:32:45 2009 +0000
+++ b/archivers/zoo/patches/patch-aa    Sat Apr 25 23:46:47 2009 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.4 2000/09/04 14:54:06 kim Exp $
+$NetBSD: patch-aa,v 1.5 2009/04/25 23:46:47 gdt Exp $
 
---- ar.h.orig  Sat May  1 00:04:22 1993
-+++ ar.h       Mon Sep  4 10:41:33 2000
-@@ -15,11 +15,15 @@
+--- ar.h.orig  1993-05-01 06:04:22.000000000 +0200
++++ ar.h
+@@ -15,11 +15,15 @@ Adapted from "ar" archiver written by Ha
  /* uchar should be 8 bits or more */
  /* typedef unsigned char  uchar;   -- already in zoo.h */
  
diff -r 0fcc19d12480 -r b87c58c4459c archivers/zoo/patches/patch-ab
--- a/archivers/zoo/patches/patch-ab    Sat Apr 25 21:32:45 2009 +0000
+++ b/archivers/zoo/patches/patch-ab    Sat Apr 25 23:46:47 2009 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.4 1999/11/12 05:17:20 hubertf Exp $
+$NetBSD: patch-ab,v 1.5 2009/04/25 23:46:47 gdt Exp $
 
---- ./bsd.c    Sat May  1 06:21:53 1993
-+++ /usr/pkgsrc/archivers/zoo/work.i386.unpatched/bsd.c        Fri Nov 12 06:19:38 1999
-@@ -69,8 +69,12 @@
+--- bsd.c.orig 1993-05-01 06:21:53.000000000 +0200
++++ bsd.c
+@@ -69,8 +69,12 @@ ZOOFILE f;
  }
  
  /* Function gettz() returns the offset from GMT in seconds */
@@ -16,7 +16,7 @@
  #define SEC_IN_DAY    (24L * 60L * 60L)
  #define INV_VALUE             (SEC_IN_DAY + 1L)
        static long retval = INV_VALUE;      /* cache, init to impossible value */
-@@ -95,6 +99,7 @@
+@@ -95,6 +99,7 @@ long gettz()
        retval = -tm->tm_gmtoff;
  #endif
        return retval;
@@ -24,7 +24,7 @@
  }
  
  /* Standard UNIX-compatible time routines */
-@@ -103,15 +108,19 @@
+@@ -103,15 +108,19 @@ long gettz()
  /* Standard UNIX-specific file attribute routines */
  #include "nixmode.i"
  
diff -r 0fcc19d12480 -r b87c58c4459c archivers/zoo/patches/patch-ac
--- a/archivers/zoo/patches/patch-ac    Sat Apr 25 21:32:45 2009 +0000
+++ b/archivers/zoo/patches/patch-ac    Sat Apr 25 23:46:47 2009 +0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-ac,v 1.5 2009/02/11 14:23:32 joerg Exp $
+$NetBSD: patch-ac,v 1.6 2009/04/25 23:46:47 gdt Exp $
 
---- makefile.orig      1991-07-16 10:52:08.000000000 -0500
+--- makefile.orig      1991-07-16 17:52:08.000000000 +0200
 +++ makefile
 @@ -18,13 +18,12 @@
  
diff -r 0fcc19d12480 -r b87c58c4459c archivers/zoo/patches/patch-ad
--- a/archivers/zoo/patches/patch-ad    Sat Apr 25 21:32:45 2009 +0000
+++ b/archivers/zoo/patches/patch-ad    Sat Apr 25 23:46:47 2009 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.1 1999/11/12 05:17:21 hubertf Exp $
+$NetBSD: patch-ad,v 1.2 2009/04/25 23:46:47 gdt Exp $
 
---- ./misc2.c  Tue Jul 16 17:53:02 1991
-+++ /usr/pkgsrc/archivers/zoo/work.i386.unpatched/misc2.c      Fri Nov 12 06:19:38 1999
-@@ -314,10 +314,12 @@
+--- misc2.c.orig       1991-07-16 17:53:02.000000000 +0200
++++ misc2.c
+@@ -314,10 +314,12 @@ struct direntry *direntry;
  {
        long diff_tz;
        long longtime;
diff -r 0fcc19d12480 -r b87c58c4459c archivers/zoo/patches/patch-ae
--- a/archivers/zoo/patches/patch-ae    Sat Apr 25 21:32:45 2009 +0000
+++ b/archivers/zoo/patches/patch-ae    Sat Apr 25 23:46:47 2009 +0000
@@ -1,20 +1,35 @@
-$NetBSD: patch-ae,v 1.2 2004/06/15 04:24:30 minskim Exp $
+$NetBSD: patch-ae,v 1.3 2009/04/25 23:46:47 gdt Exp $
 
---- nixtime.i.orig     1991-07-16 10:53:46.000000000 -0500
+--- nixtime.i.orig     1991-07-16 17:53:46.000000000 +0200
 +++ nixtime.i
-@@ -1,3 +1,5 @@
+@@ -1,3 +1,6 @@
 +#include <time.h>
++#include <sys/time.h>
 +
  #ifndef LINT
  static char nixtimeid[]="@(#) nixtime.i 2.3 88/01/24 12:49:28";
  #endif /* LINT */
-@@ -52,7 +54,8 @@ unsigned int date, time;
+@@ -35,7 +38,7 @@ unsigned *date, *time;
+       *time = tm->tm_sec / 2 + (tm->tm_min << 5) +
+          (tm->tm_hour << 11);
+    }
+-
++   return 0;
+ }
+ 
+ /*****************
+@@ -51,9 +54,11 @@ unsigned int date, time;
+ {
        long mstonix();
        long gettz();
-       long utimbuf[2];
+-      long utimbuf[2];
 -      utimbuf[0] = utimbuf[1] = gettz() + mstonix (date, time);
+-      return (utime (path, utimbuf));
 +      long t = mstonix (date, time);
-+      utimbuf[0] = utimbuf[1] = t + gettz(t);
-       return (utime (path, utimbuf));
++        struct timeval times[2];
++        times[0].tv_sec = times[1].tv_sec = t + gettz(t);
++        times[0].tv_usec = times[1].tv_usec = 0;
++        return utimes(path, times);
  }
  
+ /****************
diff -r 0fcc19d12480 -r b87c58c4459c archivers/zoo/patches/patch-af
--- a/archivers/zoo/patches/patch-af    Sat Apr 25 21:32:45 2009 +0000
+++ b/archivers/zoo/patches/patch-af    Sat Apr 25 23:46:47 2009 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.1 1999/11/12 05:17:21 hubertf Exp $
+$NetBSD: patch-af,v 1.2 2009/04/25 23:46:47 gdt Exp $
 
---- ./options.h        Sat May  1 06:27:59 1993
-+++ /usr/pkgsrc/archivers/zoo/work.i386.unpatched/options.h    Fri Nov 12 06:19:39 1999
-@@ -96,7 +96,6 @@
+--- options.h.orig     1993-05-01 06:27:59.000000000 +0200
++++ options.h
+@@ -96,7 +96,6 @@ For documentation about this file, see o
  #define NIXTIME
  #define NIXFNAME
  #define NEEDCTYP
@@ -10,7 +10,7 @@
  #define REN_STDC
  #define SETBUF
  #define GETTZ
-@@ -110,6 +109,7 @@
+@@ -110,6 +109,7 @@ For documentation about this file, see o
  #define ANSI_PROTO
  #define VOIDPTR               void *
  #else
diff -r 0fcc19d12480 -r b87c58c4459c archivers/zoo/patches/patch-ag
--- a/archivers/zoo/patches/patch-ag    Sat Apr 25 21:32:45 2009 +0000
+++ b/archivers/zoo/patches/patch-ag    Sat Apr 25 23:46:47 2009 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ag,v 1.1 1999/11/12 05:17:21 hubertf Exp $
+$NetBSD: patch-ag,v 1.2 2009/04/25 23:46:47 gdt Exp $
 
---- ./zooadd2.c        Sat Jul 20 01:38:10 1991
-+++ /usr/pkgsrc/archivers/zoo/work.i386.unpatched/zooadd2.c    Fri Nov 12 06:19:39 1999
-@@ -258,12 +258,15 @@
+--- zooadd2.c.orig     1991-07-20 01:38:10.000000000 +0200
++++ zooadd2.c
+@@ -258,12 +258,15 @@ void newdir (direntry)
  register struct direntry *direntry;
  {
  #ifdef GETTZ
diff -r 0fcc19d12480 -r b87c58c4459c archivers/zoo/patches/patch-ah
--- a/archivers/zoo/patches/patch-ah    Sat Apr 25 21:32:45 2009 +0000
+++ b/archivers/zoo/patches/patch-ah    Sat Apr 25 23:46:47 2009 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ah,v 1.1 1999/11/12 05:17:21 hubertf Exp $
+$NetBSD: patch-ah,v 1.2 2009/04/25 23:46:47 gdt Exp $
 
---- ./zoofns.h Sat May  1 05:57:35 1993
-+++ /usr/pkgsrc/archivers/zoo/work.i386.unpatched/zoofns.h     Fri Nov 12 06:19:39 1999
-@@ -94,7 +94,11 @@
+--- zoofns.h.orig      1993-05-01 05:57:35.000000000 +0200
++++ zoofns.h
+@@ -94,7 +94,11 @@ void exit PARMS ((int));
  void fixslash PARMS ((char *));
  void makelist PARMS ((int, char *[], char *[], int, char *, char *, char *, int *));
  void memerr PARMS ((unsigned int));
diff -r 0fcc19d12480 -r b87c58c4459c archivers/zoo/patches/patch-ai
--- a/archivers/zoo/patches/patch-ai    Sat Apr 25 21:32:45 2009 +0000
+++ b/archivers/zoo/patches/patch-ai    Sat Apr 25 23:46:47 2009 +0000
@@ -1,7 +1,16 @@
-$NetBSD: patch-ai,v 1.3 2007/05/13 16:59:39 taca Exp $
+$NetBSD: patch-ai,v 1.4 2009/04/25 23:46:47 gdt Exp $
 
---- zoolist.c.orig     1991-07-20 07:57:27.000000000 +0900
+--- zoolist.c.orig     1991-07-20 00:57:27.000000000 +0200
 +++ zoolist.c
+@@ -21,7 +21,7 @@ Copyright (C) 1986, 1987 Rahul Dhesi -- 
+ #include "options.h"
+ #include "portable.h"
+ #include "zoomem.h"  /* to get ZOOCOUNT */
+-
++#include <time.h>
+ /* Lists files in archive */
+ #include "zoo.h"
+ #include "errors.i"
 @@ -92,6 +92,7 @@ int genson = 1;                                      /* enable/disable ge
  int show_mode = 0;                            /* show file protection */
  #endif
@@ -20,6 +29,15 @@
     /* Seek to the beginning of the first directory entry */
     if (zooseek (zoo_file, zoo_header.zoo_start, 0) != 0) {
        ercount++;
+@@ -414,7 +418,7 @@ if (fiz_ofs != 0L) {                /* i
+                                       if (direntry.fattr == 0)
+                                               printf ("--- ");
+                                       else if ((direntry.fattr >> 22) == 1)
+-                                              printf ("%03o ", direntry.fattr & 0x1ff);
++                                              printf ("%03o ", (unsigned int)direntry.fattr & 0x1ff);
+                                       else
+                                               printf ("??? ");
+                               }
 @@ -437,6 +441,11 @@ if (fiz_ofs != 0L) {                /* i
           if (verb_list && !fast)
              show_comment (&direntry, zoo_file, 0, (char *) NULL);
@@ -36,7 +54,7 @@
  {
        long gettz();
        int diff_tz;                            /* timezone difference */
-+      long t;
++      time_t t;
        if (file_tz == NO_TZ)   /* if no timezone stored ..*/
                printf ("   ");                 /* .. just pad with blanks */
        else {
diff -r 0fcc19d12480 -r b87c58c4459c archivers/zoo/patches/patch-aj
--- a/archivers/zoo/patches/patch-aj    Sat Apr 25 21:32:45 2009 +0000
+++ b/archivers/zoo/patches/patch-aj    Sat Apr 25 23:46:47 2009 +0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-aj,v 1.1 2006/06/10 17:18:48 adrianp Exp $
+$NetBSD: patch-aj,v 1.2 2009/04/25 23:46:47 gdt Exp $
 
---- parse.c.orig       1991-07-16 16:54:43.000000000 +0100
+--- parse.c.orig       1991-07-16 17:54:43.000000000 +0200
 +++ parse.c
 @@ -39,7 +39,7 @@ char *fname;
     char *namep;                   /* points to relevant part of tempname */
diff -r 0fcc19d12480 -r b87c58c4459c archivers/zoo/patches/patch-ak
--- a/archivers/zoo/patches/patch-ak    Sat Apr 25 21:32:45 2009 +0000
+++ b/archivers/zoo/patches/patch-ak    Sat Apr 25 23:46:47 2009 +0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-ak,v 1.1 2006/07/19 19:34:37 adrianp Exp $
+$NetBSD: patch-ak,v 1.2 2009/04/25 23:46:47 gdt Exp $
 
---- misc.c.orig        1991-07-16 16:52:54.000000000 +0100
+--- misc.c.orig        1991-07-16 17:52:54.000000000 +0200
 +++ misc.c
 @@ -135,11 +135,17 @@ if available, else the short filename is
  char *fullpath (direntry)
diff -r 0fcc19d12480 -r b87c58c4459c archivers/zoo/patches/patch-al
--- a/archivers/zoo/patches/patch-al    Sat Apr 25 21:32:45 2009 +0000
+++ b/archivers/zoo/patches/patch-al    Sat Apr 25 23:46:47 2009 +0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-al,v 1.1 2007/05/13 16:59:39 taca Exp $
+$NetBSD: patch-al,v 1.2 2009/04/25 23:46:47 gdt Exp $
 
---- zooext.c.orig      1993-05-01 12:58:50.000000000 +0900
+--- zooext.c.orig      1993-05-01 05:58:50.000000000 +0200
 +++ zooext.c
 @@ -89,6 +89,7 @@ int alloc_size;                         
  #endif
diff -r 0fcc19d12480 -r b87c58c4459c archivers/zoo/patches/patch-am
--- a/archivers/zoo/patches/patch-am    Sat Apr 25 21:32:45 2009 +0000
+++ b/archivers/zoo/patches/patch-am    Sat Apr 25 23:46:47 2009 +0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-am,v 1.1 2007/05/13 16:59:39 taca Exp $
+$NetBSD: patch-am,v 1.2 2009/04/25 23:46:47 gdt Exp $
 
---- portable.c.orig    1991-07-17 00:55:11.000000000 +0900
+--- portable.c.orig    1991-07-16 17:55:11.000000000 +0200
 +++ portable.c
 @@ -87,6 +87,12 @@ ZOOFILE zoocreate (fname)
  char *fname;
@@ -15,3 +15,26 @@
  #endif /* FIZ */
  
  #ifndef zooseek
+@@ -220,6 +226,13 @@ BYTE data[];
+          ((unsigned long) data[2] << 16) | ((unsigned long) data[3] << 24));
+ }
+ 
++long to_signed_long(data)
++BYTE data[];