head	1.2;
access;
symbols
	pkgsrc-2013Q2:1.2.0.8
	pkgsrc-2013Q2-base:1.2
	pkgsrc-2012Q4:1.2.0.6
	pkgsrc-2012Q4-base:1.2
	pkgsrc-2011Q4:1.2.0.4
	pkgsrc-2011Q4-base:1.2
	pkgsrc-2011Q2:1.2.0.2
	pkgsrc-2011Q2-base:1.2
	pkgsrc-2011Q1:1.1.0.4
	pkgsrc-2011Q1-base:1.1
	pkgsrc-2010Q4:1.1.0.2
	pkgsrc-2010Q4-base:1.1;
locks; strict;
comment	@# @;


1.2
date	2011.05.11.07.49.59;	author adam;	state dead;
branches;
next	1.1;

1.1
date	2010.12.15.20.37.38;	author tez;	state Exp;
branches;
next	;


desc
@@


1.2
log
@Changes 1.26:
* Fix the --verify option, which broke in version 1.24.
* Fix storing long sparse file names in PAX archives.
* Fix correctness of --atime-preserve=replace.
* Work around POSIX incompatibilities on FreeBSD, NetBSD and Tru64.
* Fix bug with --one-file-system --listed-incremental.
@
text
@$NetBSD: patch-am,v 1.1 2010/12/15 20:37:38 tez Exp $

fix bug with --one-file-system --listed-incremental 
(used by amanda)

--- src/incremen.c.orig	2010-12-15 13:53:32.763202200 -0600
+++ src/incremen.c	2010-12-15 13:57:33.751064600 -0600
@@@@ -426,7 +426,6 @@@@
 {
   struct directory *directory;
   struct stat *stat_data = &st->stat;
-  dev_t device = st->parent ? st->parent->stat.st_dev : 0;
   bool nfs = NFS_FILE_STAT (*stat_data);
 
   if ((directory = find_directory (name_buffer)) != NULL)
@@@@ -540,11 +539,8 @@@@
 	}
     }
 
-  /* If the directory is on another device and --one-file-system was given,
-     omit it... */
-  if (one_file_system_option && device != stat_data->st_dev
-      /* ... except if it was explicitely given in the command line */
-      && !is_individual_file (name_buffer))
+  if (one_file_system_option && st->parent
+      && stat_data->st_dev != st->parent->stat.st_dev)
     /* FIXME:
 	WARNOPT (WARN_XDEV,
 		 (0, 0,
@


1.1
log
@Fix bug with --one-file-system --listed-incremental (used by amanda)
per: http://www.mail-archive.com/bug-tar@@gnu.org/msg03019.html

Pass FORCE_UNSAFE_CONFIGURE=1 in the configure env to allow
building of this package as root.
@
text
@d1 1
a1 1
$NetBSD$
@