RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  ____________________________________________________________________________

  Server: rpm5.org                         Name:   Anders F. Björklund
  Root:   /v/rpm/cvs                       Email:  afb@rpm5.org
  Module: xar                              Date:   24-Oct-2007 08:43:53
  Branch: HEAD                             Handle: 2007102407435300

  Modified files:
    xar                     ChangeLog
    xar/lib                 darwinattr.c fbsdattr.c

  Log:
    upstream additions

  Summary:
    Revision    Changes     Path
    1.9         +2  -0      xar/ChangeLog
    1.3         +7  -0      xar/lib/darwinattr.c
    1.2         +3  -0      xar/lib/fbsdattr.c
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: xar/ChangeLog
  ============================================================================
  $ cvs diff -u -r1.8 -r1.9 ChangeLog
  --- xar/ChangeLog	24 Oct 2007 06:40:37 -0000	1.8
  +++ xar/ChangeLog	24 Oct 2007 06:43:53 -0000	1.9
  @@ -1,5 +1,7 @@
   devel
  +	2007-10-22 Rob Braun bbraun@synack.net
   	* src/xar.c src/xar.1: Add -a as a synonym for --compression=lzma
  +	* lib/darwinattr.c lib/fbsdattr.c: Add --prop-exclude support for darwin and fbsd EAs.
   	2007-10-16 Rob Braun bbraun@synack.net
   	* include/xar.h.in src/xar.c lib/io.c lib/lzmaxar.c lib/bzxar.c lib/archive.c lib/zxar.c: Added an option to pass arguments to the compression code.  This to allow specifying compression levels to gzip, bzip2, and lzma.
   	* lib/io.c: Issue 41, fixed a bug where rsize was being used uninitialized.
  @@ .
  patch -p0 <<'@@ .'
  Index: xar/lib/darwinattr.c
  ============================================================================
  $ cvs diff -u -r1.2 -r1.3 darwinattr.c
  --- xar/lib/darwinattr.c	30 Aug 2007 18:35:45 -0000	1.2
  +++ xar/lib/darwinattr.c	24 Oct 2007 06:43:53 -0000	1.3
  @@ -653,6 +653,9 @@
   	struct attrlist attrs;
   	int ret;
   
  +	if( !xar_check_prop(x, "FinderCreateTime") )
  +		return 0;
  +
   	memset(&attrs, 0, sizeof(attrs));
   	attrs.bitmapcount = ATTR_BIT_MAP_COUNT;
   	attrs.commonattr = ATTR_CMN_CRTIME;
  @@ -714,6 +717,10 @@
   		return 0;
   	stragglers_archive(x, f, file, (void *)&context);
   
  +	/* From here on out, props are only EA's */
  +	if( !xar_check_prop(x, "ea") )
  +		return 0;
  +
   #if defined(HAVE_GETXATTR)
   	if( ea_archive(x, f, file, (void *)&context) == 0 )
   		return 0;
  @@ .
  patch -p0 <<'@@ .'
  Index: xar/lib/fbsdattr.c
  ============================================================================
  $ cvs diff -u -r1.1 -r1.2 fbsdattr.c
  --- xar/lib/fbsdattr.c	30 May 2007 03:55:58 -0000	1.1
  +++ xar/lib/fbsdattr.c	24 Oct 2007 06:43:53 -0000	1.2
  @@ -124,6 +124,9 @@
   		return 0;
   	if(file == NULL)
   		return 0;
  +
  +	if( !xar_check_prop(x, "ea") )
  +		return 0;
   	
   TRYAGAIN:
   	/* extattr_list_link()'s man page does not define the return
  @@ .