Merge branch 'upstream'

Conflicts:

	Makefile
	ar_io.c
	cpio.1
	options.c
	pat_rep.c
	pax.1
	pax.c
	tar.1
	tar.c

diff --cc Makefile
Simple merge

diff --cc ar_io.c
index 4cc4a97a3be09019a9aae35a11444b2f20d6b237,2a833bb2f65d333c5b285d553cc8d7de916d01ab..6679547a0de7e12ff50f37ca69d31fd8cb2a1b13
--- 1/ar_io.c
--- 2/ar_io.c
+++ b/ar_io.c
@@@ -1305,21 -1248,14 +1248,15 @@@ ar_next(void
  
  /*
   * ar_start_gzip()
 - * starts the gzip compression/decompression process as a child, using magic
 - * to keep the fd the same in the calling function (parent).
 + * starts the compress, gzip or bzip2 compression/decompression process
 + * as a child, using magic to keep the fd the same in the calling function
 + * (parent).
   */
  void
- #ifdef __STDC__
- ar_start_gzip(int fd)
- #else
- ar_start_gzip(fd)
-       int fd;
- #endif
+ ar_start_gzip(int fd, const char *gzip_program, int wr)
  {
-       pid_t pid;
        int fds[2];
-       char *gzip_flags;
+       const char *gzip_flags;
  
        if (pipe(fds) < 0)
                err(1, "could not pipe");

diff --cc ar_subs.c
Simple merge

diff --cc cache.c
Simple merge

diff --cc cpio.c
Simple merge

diff --cc gen_subs.c
Simple merge

diff --cc options.c
Simple merge

diff --cc sel_subs.c
index d11b50cd007d818778d866a1a61fda21b828b163,55d3a0017c1504aef483bfaa9e2518696232efd5..b12c3edf50e4e3dda05f85654402caaf033b1279
--- 1/sel_subs.c
--- 2/sel_subs.c
+++ b/sel_subs.c
@@@ -48,15 -44,16 +44,17 @@@ static const char rcsid[] = "$OpenBSD: 
  
  #include <sys/types.h>
  #include <sys/time.h>
 +#include <time.h>
  #include <sys/stat.h>
  #include <sys/param.h>
- #include <pwd.h>
+ #include <ctype.h>
  #include <grp.h>
+ #include <pwd.h>
  #include <stdio.h>
+ #include <stdlib.h>
  #include <string.h>
+ #include <tzfile.h>
  #include <unistd.h>
- #include <stdlib.h>
  #include "pax.h"
  #include "sel_subs.h"
  #include "extern.h"

diff --cc tar.c
Simple merge