Index: contrib/bzip2/bzip2.c
===================================================================
RCS file: /home/ncvs/src/contrib/bzip2/bzip2.c,v
retrieving revision 1.1.1.2
diff -u -r1.1.1.2 bzip2.c
--- contrib/bzip2/bzip2.c	1 Feb 2002 16:26:13 -0000	1.1.1.2
+++ contrib/bzip2/bzip2.c	14 Nov 2002 12:32:55 -0000
@@ -161,12 +161,18 @@
 #if BZ_UNIX
 #   include <fcntl.h>
 #   include <sys/types.h>
+#   ifdef WANT_ACL_SUPPORT
+#     include <sys/acl.h>
+#   endif
 #   include <utime.h>
 #   include <unistd.h>
 #   include <sys/stat.h>
 #   include <sys/times.h>
 
 #   define PATH_SEP    '/'
+#   ifdef WANT_ACL_SUPPORT
+#     define MY_ACL_T  acl_t
+#   endif
 #   define MY_LSTAT    lstat
 #   define MY_STAT     stat
 #   define MY_S_ISREG  S_ISREG
@@ -1039,10 +1045,22 @@
 {
 #  if BZ_UNIX
    FILE*     fp;
+#ifdef WANT_ACL_SUPPORT
+   MY_ACL_T       acl;
+#endif
    IntNative fh;
    fh = open(name, O_WRONLY|O_CREAT|O_EXCL, S_IWUSR|S_IRUSR);
    if (fh == -1) return NULL;
    fp = fdopen(fh, mode);
+#ifdef WANT_ACL_SUPPORT
+   /* Copy the ACL */
+   acl = acl_get_file(inName, ACL_TYPE_ACCESS);
+   if (acl != NULL) {
+      if (acl_set_fd(fh, acl) == -1 && errno != EOPNOTSUPP)
+         fprintf(stderr, "failed to set the ACL on %s\n", outName);
+      acl_free(acl);
+   }
+#endif
    if (fp == NULL) close(fh);
    return fp;
 #  else
Index: usr.bin/bzip2/Makefile
===================================================================
RCS file: /home/ncvs/src/usr.bin/bzip2/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile
--- usr.bin/bzip2/Makefile	12 Jul 2001 14:44:17 -0000	1.5
+++ usr.bin/bzip2/Makefile	14 Nov 2002 12:32:55 -0000
@@ -7,7 +7,7 @@
 
 PROG=	bzip2
 MAN=	bzip2.1
-CFLAGS+= -D_FILE_OFFSET_BITS=64
+CFLAGS+= -D_FILE_OFFSET_BITS=64 -DWANT_ACL_SUPPORT
 
 SUBDIR+= doc