[pkgsrc/pkgsrc-2005Q3]: pkgsrc/archivers/gcpio Pullup ticket 887 - requested ...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/1b0bd97b4d25
branches:  pkgsrc-2005Q3
changeset: 499652:1b0bd97b4d25
user:      salo <salo%pkgsrc.org@localhost>
date:      Thu Nov 03 22:11:27 2005 +0000

description:
Pullup ticket 887 - requested by Adrian Portelli
security update for gcpio

Revisions pulled up:
- pkgsrc/archivers/gcpio/Makefile               1.26
- pkgsrc/archivers/gcpio/PLIST                  1.6
- pkgsrc/archivers/gcpio/distinfo               1.9
- pkgsrc/archivers/gcpio/patches/patch-aa       removed
- pkgsrc/archivers/gcpio/patches/patch-ab       removed
- pkgsrc/archivers/gcpio/patches/patch-ac       1.4
- pkgsrc/archivers/gcpio/patches/patch-ad       removed
- pkgsrc/archivers/gcpio/patches/patch-ae       1.2
- pkgsrc/archivers/gcpio/patches/patch-af       removed
- pkgsrc/archivers/gcpio/patches/patch-ag       1.2
- pkgsrc/archivers/gcpio/patches/patch-ah       1.2
- pkgsrc/archivers/gcpio/patches/patch-ai       1.1
- pkgsrc/archivers/gcpio/patches/patch-aj       1.1
- pkgsrc/archivers/gcpio/patches/patch-ak       1.1
- pkgsrc/archivers/gcpio/patches/patch-al       1.1
- pkgsrc/archivers/gcpio/patches/patch-am       1.1
- pkgsrc/archivers/gcpio/patches/patch-an       1.1
- pkgsrc/archivers/gcpio/patches/patch-ao       1.1

   Module Name:         pkgsrc
   Committed By:        adrianp
   Date:                Thu Nov  3 19:38:51 UTC 2005

   Modified Files:
        pkgsrc/archivers/gcpio: Makefile PLIST distinfo
        pkgsrc/archivers/gcpio/patches: patch-ac patch-ae patch-ag patch-ah
   Added Files:
        pkgsrc/archivers/gcpio/patches: patch-ai patch-aj patch-ak patch-al
            patch-am patch-an patch-ao
   Removed Files:
        pkgsrc/archivers/gcpio/patches: patch-aa patch-ab

   Log Message:
   Fixes for CAN-2005-1111 and CAN-2005-1229
---
   Module Name:         pkgsrc
   Committed By:        adrianp
   Date:                Thu Nov  3 19:40:12 UTC 2005

   Removed Files:
        pkgsrc/archivers/gcpio/patches: patch-ad patch-af

   Log Message:
   Remove obsolete patches

diffstat:

 archivers/gcpio/Makefile         |    6 +-
 archivers/gcpio/PLIST            |    4 +-
 archivers/gcpio/distinfo         |   27 +++--
 archivers/gcpio/patches/patch-aa |   44 ---------
 archivers/gcpio/patches/patch-ab |   12 --
 archivers/gcpio/patches/patch-ac |    6 +-
 archivers/gcpio/patches/patch-ad |   12 --
 archivers/gcpio/patches/patch-ae |    8 +-
 archivers/gcpio/patches/patch-af |   45 ----------
 archivers/gcpio/patches/patch-ag |   16 +-
 archivers/gcpio/patches/patch-ah |   62 ++++++++++++-
 archivers/gcpio/patches/patch-ai |  174 +++++++++++++++++++++++++++++++++++++++
 archivers/gcpio/patches/patch-aj |   13 ++
 archivers/gcpio/patches/patch-ak |   13 ++
 archivers/gcpio/patches/patch-al |   26 +++++
 archivers/gcpio/patches/patch-am |   13 ++
 archivers/gcpio/patches/patch-an |   31 ++++++
 archivers/gcpio/patches/patch-ao |   35 +++++++
 18 files changed, 396 insertions(+), 151 deletions(-)

diffs (truncated from 651 to 300 lines):

diff -r a748b08e04c0 -r 1b0bd97b4d25 archivers/gcpio/Makefile
--- a/archivers/gcpio/Makefile  Thu Nov 03 13:27:52 2005 +0000
+++ b/archivers/gcpio/Makefile  Thu Nov 03 22:11:27 2005 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.24 2005/04/11 21:44:48 tv Exp $
+# $NetBSD: Makefile,v 1.24.4.1 2005/11/03 22:11:27 salo Exp $
 #
 
-DISTNAME=       cpio-2.5
+DISTNAME=       cpio-2.6
+PKGREVISION=   1
 PKGNAME=       g${DISTNAME}
-PKGREVISION=   1
 CATEGORIES=    archivers
 MASTER_SITES=   ${MASTER_SITE_GNU:=cpio/}
 
diff -r a748b08e04c0 -r 1b0bd97b4d25 archivers/gcpio/PLIST
--- a/archivers/gcpio/PLIST     Thu Nov 03 13:27:52 2005 +0000
+++ b/archivers/gcpio/PLIST     Thu Nov 03 22:11:27 2005 +0000
@@ -1,3 +1,5 @@
-@comment $NetBSD: PLIST,v 1.5 2004/01/02 16:03:11 seb Exp $
+@comment $NetBSD: PLIST,v 1.5.14.1 2005/11/03 22:11:27 salo Exp $
 bin/${GNU_PROGRAM_PREFIX}cpio
+libexec/${GNU_PROGRAM_PREFIX}rmt
 man/man1/${GNU_PROGRAM_PREFIX}cpio.1
+man/man1/${GNU_PROGRAM_PREFIX}mt.1
diff -r a748b08e04c0 -r 1b0bd97b4d25 archivers/gcpio/distinfo
--- a/archivers/gcpio/distinfo  Thu Nov 03 13:27:52 2005 +0000
+++ b/archivers/gcpio/distinfo  Thu Nov 03 22:11:27 2005 +0000
@@ -1,13 +1,16 @@
-$NetBSD: distinfo,v 1.8 2005/03/20 19:53:09 salo Exp $
+$NetBSD: distinfo,v 1.8.6.1 2005/11/03 22:11:27 salo Exp $
 
-SHA1 (cpio-2.5.tar.gz) = d5908ee20484f092e591a430620feec33060528c
-RMD160 (cpio-2.5.tar.gz) = 92ab8152b03eae064f24909d76bad31a331d283d
-Size (cpio-2.5.tar.gz) = 185480 bytes
-SHA1 (patch-aa) = 2d6b714be46f26782b1a6e6af47710c6e20f50b8
-SHA1 (patch-ab) = e3529142851ebe87b6df37ab33571209512b0f17
-SHA1 (patch-ac) = 404dcc134a0c8b9007a3efdc8caf6b36efcf125b
-SHA1 (patch-ad) = 854df599fa330ae2b07ab6cae4c2a1f2e0988ff5
-SHA1 (patch-ae) = 5de604f8278756e1ef8d4b72f9cd7638cb0496ab
-SHA1 (patch-af) = d42ed286fa508dc2be2415614412cac8929f19f8
-SHA1 (patch-ag) = aadb8f4fa2ec467905ad83558227dcc244405b3e
-SHA1 (patch-ah) = 6de4e6d3a4965a8dd59929360865c2b0b3b877ca
+SHA1 (cpio-2.6.tar.gz) = 5a4ea156519909994fe05933dc823abcf07e3e21
+RMD160 (cpio-2.6.tar.gz) = 8246bdd08ab8727f9a8042d33ddfe3a6332476b8
+Size (cpio-2.6.tar.gz) = 556018 bytes
+SHA1 (patch-ac) = df24b60d612ac59ef82a5d09a16a8be5a6d674ec
+SHA1 (patch-ae) = c5f7d7f0574d37951caba9de05b9017c842c5980
+SHA1 (patch-ag) = 04364ee26f2301f6ddefd2a2bc2b1fff3686411f
+SHA1 (patch-ah) = f7e17682c2f6783e72310ef1d82a1bfca376e5ce
+SHA1 (patch-ai) = c3ad35aa4fe9c82e5110c52c61ca3405915e19ab
+SHA1 (patch-aj) = 1a4f796692cdad64297590acea33f371c903fa66
+SHA1 (patch-ak) = fb1a4d78901b419e370609e28efe67bdb72cdbd5
+SHA1 (patch-al) = 3c1e71ad7a10c80e8ec82718ee44d138641eb18e
+SHA1 (patch-am) = d380ee141b218c568abc69ad90def03add91cde5
+SHA1 (patch-an) = 943fe81aba7846bd8349cc2e31ab9525e019e99f
+SHA1 (patch-ao) = 53c7b6bc1e00a0203665e12807b3388204f838c3
diff -r a748b08e04c0 -r 1b0bd97b4d25 archivers/gcpio/patches/patch-aa
--- a/archivers/gcpio/patches/patch-aa  Thu Nov 03 13:27:52 2005 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +0,0 @@
-$NetBSD: patch-aa,v 1.5 2004/06/06 21:29:33 minskim Exp $
-
---- Makefile.in.orig   Wed Dec 20 11:28:30 1995
-+++ Makefile.in
-@@ -66,9 +66,9 @@
- exec_prefix = @exec_prefix@
- 
- # Prefix for each installed program, normally empty or `g'.
--binprefix = 
-+binprefix = @program_prefix@
- # Prefix for each installed man page, normally empty or `g'.
--manprefix = 
-+manprefix = @program_prefix@
- 
- 
- # Where to install the cpio and mt executables.
-@@ -101,7 +101,7 @@
- SRCS = copyin.c copyout.c copypass.c defer.c dstring.c global.c \
- main.c tar.c util.c error.c getopt.c getopt1.c filemode.c version.c \
- rtapelib.c dirname.c idcache.c makepath.c xmalloc.c stripslash.c \
--userspec.c xstrdup.c bcopy.c fnmatch.c mkdir.c strdup.c
-+userspec.c xstrdup.c bcopy.c fnmatch.c mkdir.c
- OBJS = copyin.o copyout.o copypass.o defer.o dstring.o global.o \
- main.o tar.o util.o error.o getopt.o getopt1.o filemode.o version.o \
- $(RTAPELIB) dirname.o idcache.o makepath.o xmalloc.o stripslash.o \
-@@ -117,17 +117,14 @@
- configure configure.in mkinstalldirs install-sh $(MT_SRCS) rmt.c tcexparg.c \
- alloca.c cpio.texi cpio.info texinfo.tex
- 
--all:  @PROGS@
-+all:  cpio
- 
- .c.o:
-       $(CC) -c $(CPPFLAGS) $(DEFS) -I$(srcdir) $(CFLAGS) $<
- 
- install:: installdirs all $(srcdir)/cpio.1 $(srcdir)/mt.1
-       $(INSTALL_PROGRAM) cpio $(bindir)/$(binprefix)cpio
--      test ! -f mt || $(INSTALL_PROGRAM) mt $(bindir)/$(binprefix)mt
--      -test ! -f rmt || $(INSTALL_PROGRAM) rmt $(libexecdir)/rmt
-       -$(INSTALL_DATA) $(srcdir)/cpio.1 $(mandir)/$(manprefix)cpio.$(manext)
--      -test ! -f mt || $(INSTALL_DATA) $(srcdir)/mt.1 $(mandir)/$(manprefix)mt.$(manext)
- 
- installdirs:
-       $(srcdir)/mkinstalldirs $(bindir) $(libexecdir) $(mandir) $(infodir)
diff -r a748b08e04c0 -r 1b0bd97b4d25 archivers/gcpio/patches/patch-ab
--- a/archivers/gcpio/patches/patch-ab  Thu Nov 03 13:27:52 2005 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-$NetBSD: patch-ab,v 1.4 2004/06/06 21:29:33 minskim Exp $
-
---- configure.orig     2001-08-29 22:37:00.000000000 -0500
-+++ configure
-@@ -2118,6 +2118,7 @@ s%@LDFLAGS@%$LDFLAGS%g
- s%@LIBS@%$LIBS%g
- s%@exec_prefix@%$exec_prefix%g
- s%@prefix@%$prefix%g
-+s%@program_prefix@%$program_prefix%g
- s%@program_transform_name@%$program_transform_name%g
- s%@bindir@%$bindir%g
- s%@sbindir@%$sbindir%g
diff -r a748b08e04c0 -r 1b0bd97b4d25 archivers/gcpio/patches/patch-ac
--- a/archivers/gcpio/patches/patch-ac  Thu Nov 03 13:27:52 2005 +0000
+++ b/archivers/gcpio/patches/patch-ac  Thu Nov 03 22:11:27 2005 +0000
@@ -1,7 +1,7 @@
-$NetBSD: patch-ac,v 1.3 2004/06/06 21:29:33 minskim Exp $
+$NetBSD: patch-ac,v 1.3.12.1 2005/11/03 22:11:27 salo Exp $
 
---- filetypes.h.orig   Sun Jul 19 01:53:46 1992
-+++ filetypes.h        Thu Mar  5 13:20:46 1998
+--- src/filetypes.h.orig       2005-11-03 18:45:32.000000000 +0000
++++ src/filetypes.h
 @@ -80,5 +80,3 @@
  #ifndef S_ISLNK
  #define lstat stat
diff -r a748b08e04c0 -r 1b0bd97b4d25 archivers/gcpio/patches/patch-ad
--- a/archivers/gcpio/patches/patch-ad  Thu Nov 03 13:27:52 2005 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2004/06/06 21:29:33 minskim Exp $
-
---- error.c.orig       2001-12-05 22:52:45.000000000 -0600
-+++ error.c
-@@ -68,7 +68,6 @@ static char *
- private_strerror (errnum)
-      int errnum;
- {
--  extern char *sys_errlist[];
-   extern int sys_nerr;
- 
-   if (errnum > 0 && errnum <= sys_nerr)
diff -r a748b08e04c0 -r 1b0bd97b4d25 archivers/gcpio/patches/patch-ae
--- a/archivers/gcpio/patches/patch-ae  Thu Nov 03 13:27:52 2005 +0000
+++ b/archivers/gcpio/patches/patch-ae  Thu Nov 03 22:11:27 2005 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.1 2004/06/06 21:29:33 minskim Exp $
+$NetBSD: patch-ae,v 1.1.12.1 2005/11/03 22:11:27 salo Exp $
 
---- mkdir.c.orig       2001-12-05 22:54:41.000000000 -0600
-+++ mkdir.c
-@@ -51,8 +51,8 @@ extern int errno;
+--- lib/mkdir.c.orig   2005-11-03 18:48:32.000000000 +0000
++++ lib/mkdir.c
+@@ -52,8 +52,8 @@ extern int errno;
  
  int
  mkdir (dpath, dmode)
diff -r a748b08e04c0 -r 1b0bd97b4d25 archivers/gcpio/patches/patch-af
--- a/archivers/gcpio/patches/patch-af  Thu Nov 03 13:27:52 2005 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,45 +0,0 @@
-$NetBSD: patch-af,v 1.1 2004/06/06 21:29:33 minskim Exp $
-
---- tar.c.orig 2004-03-15 19:58:03.504727318 +0100
-+++ tar.c      2004-03-15 19:59:41.803936327 +0100
-@@ -27,6 +27,7 @@
- #include "tarhdr.h"
- 
- static void to_oct ();
-+static void to_oct_no_nul ();
- static char *stash_tar_linkname ();
- static char *stash_tar_filename ();
- 
-@@ -97,8 +98,8 @@
-   to_oct (file_hdr->c_mode, 8, tar_hdr->mode);
-   to_oct (file_hdr->c_uid, 8, tar_hdr->uid);
-   to_oct (file_hdr->c_gid, 8, tar_hdr->gid);
--  to_oct (file_hdr->c_filesize, 12, tar_hdr->size);
--  to_oct (file_hdr->c_mtime, 12, tar_hdr->mtime);
-+  to_oct_no_nul (file_hdr->c_filesize, 12, tar_hdr->size);
-+  to_oct_no_nul (file_hdr->c_mtime, 12, tar_hdr->mtime);
- 
-   switch (file_hdr->c_mode & CP_IFMT)
-     {
-@@ -446,6 +447,21 @@
-     where[--digits] = ' ';
- }
- 
-+/* Convert a number into a string of octal digits.
-+   Convert long VALUE into a DIGITS-digit field at WHERE,
-+   including a trailing space.  DIGITS==2 means
-+   1 digit, and a space.
-+*/
-+
-+static void
-+to_oct_no_nul (value, digits, where)
-+     register long value;
-+     register int digits;
-+     register char *where;
-+{
-+  to_oct (value, digits + 1, where);
-+}
-+
- /* Return
-    2 if BUF is a valid POSIX tar header (the checksum is correct
-    and it has the "ustar" magic string),
diff -r a748b08e04c0 -r 1b0bd97b4d25 archivers/gcpio/patches/patch-ag
--- a/archivers/gcpio/patches/patch-ag  Thu Nov 03 13:27:52 2005 +0000
+++ b/archivers/gcpio/patches/patch-ag  Thu Nov 03 22:11:27 2005 +0000
@@ -1,14 +1,14 @@
-$NetBSD: patch-ag,v 1.1 2005/01/18 16:04:39 tv Exp $
+$NetBSD: patch-ag,v 1.1.6.1 2005/11/03 22:11:27 salo Exp $
 
---- system.h.orig      2005-01-18 11:03:19.000000000 -0500
-+++ system.h
-@@ -59,6 +59,9 @@ off_t lseek ();
- /* Since major is a function on SVR4, we can't use `ifndef major'.  */
- #ifdef MAJOR_IN_MKDEV
- #include <sys/mkdev.h>
+--- lib/system.h.orig  2005-11-03 18:51:50.000000000 +0000
++++ lib/system.h
+@@ -282,6 +282,9 @@ extern int errno;
+ 
+ #if MAJOR_IN_MKDEV
+ # include <sys/mkdev.h>
 +# if !defined(makedev) && defined(mkdev)
 +#  define makedev(a,b) mkdev((a),(b))
 +# endif
- #define HAVE_MAJOR
+ # define GOT_MAJOR
  #endif
  
diff -r a748b08e04c0 -r 1b0bd97b4d25 archivers/gcpio/patches/patch-ah
--- a/archivers/gcpio/patches/patch-ah  Thu Nov 03 13:27:52 2005 +0000
+++ b/archivers/gcpio/patches/patch-ah  Thu Nov 03 22:11:27 2005 +0000
@@ -1,16 +1,64 @@
-$NetBSD: patch-ah,v 1.1 2005/03/20 19:53:09 salo Exp $
+$NetBSD: patch-ah,v 1.1.6.1 2005/11/03 22:11:27 salo Exp $
 
---- main.c.orig        2001-12-06 05:54:06.000000000 +0100
-+++ main.c     2005-03-20 20:34:33.000000000 +0100
-@@ -512,7 +512,6 @@
-      char *argv[];
- {
+--- src/main.c.orig    2005-11-03 19:08:15.000000000 +0000
++++ src/main.c
+@@ -41,6 +41,7 @@
+ 
+ enum cpio_options {
+   NO_ABSOLUTE_FILENAMES_OPTION=256,  
++  ABSOLUTE_FILENAMES_OPTION,  
+   NO_PRESERVE_OWNER_OPTION,      
+   ONLY_VERIFY_CRC_OPTION,        
+   RENAME_BATCH_FILE_OPTION,      
+@@ -134,6 +135,8 @@ static struct argp_option options[] = {
+    N_("In copy-in mode, read additional patterns specifying filenames to extract or list from FILE"), 210},
+   {"no-absolute-filenames", NO_ABSOLUTE_FILENAMES_OPTION, 0, 0,
+    N_("Create all files relative to the current directory"), 210},
++  {"absolute-filenames", ABSOLUTE_FILENAMES_OPTION, 0, 0,
++   N_("do not strip leading file name components that contain \"..\" and leading slashes from file names"), 210},
+   {"only-verify-crc", ONLY_VERIFY_CRC_OPTION, 0, 0,
+    N_("When reading a CRC format archive in copy-in mode, only verify the CRC's of each file in the archive, don't actually extract the files"), 210},
+   {"rename", 'r', 0, 0,
+@@ -392,7 +395,11 @@ crc newc odc bin ustar tar (all-caps als
+       break;
+ 
+     case NO_ABSOLUTE_FILENAMES_OPTION:                /* --no-absolute-filenames */
+-      no_abs_paths_flag = true;
++      abs_paths_flag = false;
++      break;
++      
++    case ABSOLUTE_FILENAMES_OPTION:           /* --absolute-filenames */
++      abs_paths_flag = true;
+       break;
+       
+     case NO_PRESERVE_OWNER_OPTION:            /* --no-preserve-owner */
+@@ -631,7 +638,7 @@ process_args (int argc, char *argv[])
+                     _("--append is used but no archive file name is given (use -F or -O options")));
+ 
+       CHECK_USAGE(rename_batch_file, "--rename-batch-file", "--create");
+-      CHECK_USAGE(no_abs_paths_flag, "--no-absolute-pathnames", "--create");
++      CHECK_USAGE(abs_paths_flag, "--absolute-pathnames", "--create");
+       CHECK_USAGE(input_archive_name, "-I", "--create");
+       if (archive_name && output_archive_name)
+       USAGE_ERROR ((0, 0, _("Both -O and -F are used in copy-out mode")));
+@@ -658,7 +665,7 @@ process_args (int argc, char *argv[])
+       CHECK_USAGE(rename_flag, "--rename", "--pass-through");
+       CHECK_USAGE(append_flag, "--append", "--pass-through");
+       CHECK_USAGE(rename_batch_file, "--rename-batch-file", "--pass-through");