rpms/tar/devel tar-1.19-xattrs-conf.patch, 1.5, 1.6 tar-1.19-xattrs.patch, 1.8, 1.9 tar-1.21-testsuite.patch, 1.1, NONE
Ondrej Vasik
ovasik at fedoraproject.org
Thu Mar 5 09:07:33 UTC 2009
Author: ovasik
Update of /cvs/extras/rpms/tar/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17373
Modified Files:
tar-1.19-xattrs-conf.patch tar-1.19-xattrs.patch
Removed Files:
tar-1.21-testsuite.patch
Log Message:
rediffed to defuzz :(
tar-1.19-xattrs-conf.patch:
Index: tar-1.19-xattrs-conf.patch
===================================================================
RCS file: /cvs/extras/rpms/tar/devel/tar-1.19-xattrs-conf.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- tar-1.19-xattrs-conf.patch 5 Mar 2009 08:34:12 -0000 1.5
+++ tar-1.19-xattrs-conf.patch 5 Mar 2009 09:07:03 -0000 1.6
@@ -1,7 +1,7 @@
-diff -up tar-1.19/config.hin.xattrs-conf tar-1.19/config.hin
---- tar-1.19/config.hin.xattrs-conf 2007-10-10 13:01:17.000000000 +0200
-+++ tar-1.19/config.hin 2007-12-17 11:47:38.000000000 +0100
-@@ -121,6 +121,9 @@
+diff -urNp tar-1.22-orig/config.hin tar-1.22/config.hin
+--- tar-1.22-orig/config.hin 2009-03-05 08:08:07.000000000 +0100
++++ tar-1.22/config.hin 2009-03-05 09:57:06.000000000 +0100
+@@ -131,6 +131,9 @@
*/
#undef HAVE_ALLOCA_H
@@ -11,7 +11,7 @@
/* Define to 1 if you have the `btowc' function. */
#undef HAVE_BTOWC
-@@ -354,12 +357,21 @@
+@@ -372,12 +375,21 @@
/* Define to 1 if you have the <features.h> header file. */
#undef HAVE_FEATURES_H
@@ -33,7 +33,7 @@
/* Define to 1 if fseeko (and presumably ftello) exists and is declared. */
#undef HAVE_FSEEKO
-@@ -399,6 +411,9 @@
+@@ -423,6 +435,9 @@
/* Define to 1 if you have the `gettimeofday' function. */
#undef HAVE_GETTIMEOFDAY
@@ -43,7 +43,7 @@
/* Define to 1 if you have the <grp.h> header file. */
#undef HAVE_GRP_H
-@@ -444,15 +459,30 @@
+@@ -468,15 +483,30 @@
/* Define to 1 if you have the `lchown' function. */
#undef HAVE_LCHOWN
@@ -55,10 +55,10 @@
+
/* Define to 1 if you have the <libintl.h> header file. */
#undef HAVE_LIBINTL_H
-+
+
+/* Define to 1 if you have the `selinux' library (-lselinux). */
+#undef HAVE_LIBSELINUX
-
++
/* Define to 1 if you have the <linewrap.h> header file. */
#undef HAVE_LINEWRAP_H
@@ -74,7 +74,7 @@
/* Define to 1 if you have the <locale.h> header file. */
#undef HAVE_LOCALE_H
-@@ -462,6 +492,9 @@
+@@ -486,6 +516,9 @@
/* Define to 1 if the system has the type `long long int'. */
#undef HAVE_LONG_LONG_INT
@@ -84,7 +84,7 @@
/* Define to 1 if you have the `lstat' function. */
#undef HAVE_LSTAT
-@@ -568,12 +601,18 @@
+@@ -589,12 +622,18 @@
/* Define to 1 if you have the <search.h> header file. */
#undef HAVE_SEARCH_H
@@ -103,7 +103,7 @@
/* Define to 1 if you have the <sgtty.h> header file. */
#undef HAVE_SGTTY_H
-@@ -713,6 +752,9 @@
+@@ -734,6 +773,9 @@
/* Define to 1 if you have the <sysexits.h> header file. */
#undef HAVE_SYSEXITS_H
@@ -113,7 +113,7 @@
/* Define to 1 if you have the <sys/bitypes.h> header file. */
#undef HAVE_SYS_BITYPES_H
-@@ -861,6 +903,9 @@
+@@ -891,6 +933,9 @@
/* Define if utimes works properly. */
#undef HAVE_WORKING_UTIMES
@@ -123,10 +123,10 @@
/* Define to 1 if the system has the type `_Bool'. */
#undef HAVE__BOOL
-diff -up tar-1.19/configure.xattrs-conf tar-1.19/configure
---- tar-1.19/configure.xattrs-conf 2007-10-10 13:00:16.000000000 +0200
-+++ tar-1.19/configure 2007-12-17 11:47:14.000000000 +0100
-@@ -1963,6 +1964,9 @@ ac_header_list="$ac_header_list sys/tpri
+diff -urNp tar-1.22-orig/configure tar-1.22/configure
+--- tar-1.22-orig/configure 2009-03-05 08:05:20.000000000 +0100
++++ tar-1.22/configure 2009-03-05 09:57:06.000000000 +0100
+@@ -2127,6 +2127,9 @@ ac_header_list="$ac_header_list sys/tpri
ac_header_list="$ac_header_list sys/tape.h"
ac_header_list="$ac_header_list unistd.h"
ac_header_list="$ac_header_list locale.h"
@@ -136,7 +136,7 @@
ac_func_list="$ac_func_list flockfile"
ac_func_list="$ac_func_list funlockfile"
ac_header_list="$ac_header_list features.h"
-@@ -5614,7 +5633,14 @@ return strerror ();
+@@ -6022,7 +6025,14 @@ return strerror ();
return 0;
}
_ACEOF
@@ -152,7 +152,7 @@
if { (ac_try="$ac_link"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-@@ -5632,25 +5658,35 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -6040,25 +6050,35 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
test ! -s conftest.err
} && test -s conftest$ac_exeext &&
$as_test_x conftest$ac_exeext; then
@@ -197,7 +197,7 @@
{ echo "$as_me:$LINENO: checking for inline" >&5
echo $ECHO_N "checking for inline... $ECHO_C" >&6; }
-@@ -32646,6 +32690,257 @@ _ACEOF
+@@ -38773,6 +38793,257 @@ _ACEOF
fi
done
@@ -455,7 +455,7 @@
{ echo "$as_me:$LINENO: checking whether getgrgid is declared" >&5
echo $ECHO_N "checking whether getgrgid is declared... $ECHO_C" >&6; }
if test "${ac_cv_have_decl_getgrgid+set}" = set; then
-@@ -34374,6 +34669,296 @@ fi
+@@ -40571,6 +40842,296 @@ fi
done
@@ -752,10 +752,10 @@
{ echo "$as_me:$LINENO: checking for iconv_t" >&5
echo $ECHO_N "checking for iconv_t... $ECHO_C" >&6; }
if test "${ac_cv_type_iconv_t+set}" = set; then
-diff -urNp tar-1.20-orig/src/Makefile.in tar-1.20/src/Makefile.in
---- tar-1.20-orig/src/Makefile.in 2008-04-14 14:04:00.000000000 +0200
-+++ tar-1.20/src/Makefile.in 2008-05-26 18:18:42.000000000 +0200
-@@ -137,7 +137,8 @@ am_tar_OBJECTS = buffer.$(OBJEXT) checkp
+diff -urNp tar-1.22-orig/src/Makefile.in tar-1.22/src/Makefile.in
+--- tar-1.22-orig/src/Makefile.in 2009-03-05 08:05:26.000000000 +0100
++++ tar-1.22/src/Makefile.in 2009-03-05 09:57:06.000000000 +0100
+@@ -143,7 +143,8 @@ am_tar_OBJECTS = buffer.$(OBJEXT) checkp
extract.$(OBJEXT) xheader.$(OBJEXT) incremen.$(OBJEXT) \
list.$(OBJEXT) misc.$(OBJEXT) names.$(OBJEXT) sparse.$(OBJEXT) \
suffix.$(OBJEXT) system.$(OBJEXT) tar.$(OBJEXT) \
@@ -765,7 +765,7 @@
tar_OBJECTS = $(am_tar_OBJECTS)
am__DEPENDENCIES_1 =
am__DEPENDENCIES_2 = ../lib/libtar.a $(am__DEPENDENCIES_1) \
-@@ -526,7 +527,7 @@ sysconfdir = @sysconfdir@
+@@ -653,7 +654,7 @@ sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
@@ -774,7 +774,7 @@
tar_SOURCES = \
buffer.c\
checkpoint.c\
-@@ -545,11 +546,12 @@ tar_SOURCES = \
+@@ -672,11 +673,12 @@ tar_SOURCES = \
tar.c\
transform.c\
update.c\
@@ -789,7 +789,7 @@
all: all-am
.SUFFIXES:
-@@ -649,6 +651,7 @@ distclean-compile:
+@@ -776,6 +778,7 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/transform.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/update.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/utf8.Po at am__quote@
tar-1.19-xattrs.patch:
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.8 -r 1.9 tar-1.19-xattrs.patch
Index: tar-1.19-xattrs.patch
===================================================================
RCS file: /cvs/extras/rpms/tar/devel/tar-1.19-xattrs.patch,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- tar-1.19-xattrs.patch 5 Jan 2009 16:13:30 -0000 1.8
+++ tar-1.19-xattrs.patch 5 Mar 2009 09:07:03 -0000 1.9
@@ -1,6 +1,6 @@
-diff -up tar-1.17/configure.ac.xattrs tar-1.17/configure.ac
---- tar-1.17/configure.ac.xattrs 2007-06-08 10:28:04.000000000 +0200
-+++ tar-1.17/configure.ac 2007-12-10 15:31:54.000000000 +0100
+diff -urp tar-1.22-orig/configure.ac tar-1.22/configure.ac
+--- tar-1.22-orig/configure.ac 2009-03-05 08:01:58.000000000 +0100
++++ tar-1.22/configure.ac 2009-03-05 09:45:42.000000000 +0100
@@ -40,7 +40,7 @@ AC_CHECK_HEADERS_ONCE(fcntl.h linux/fd.h
sys/param.h sys/device.h sys/filio.h sys/gentape.h \
sys/inet.h sys/io/trioctl.h \
@@ -33,9 +33,9 @@
AC_CHECK_TYPE(iconv_t,:,
AC_DEFINE(iconv_t, int,
[Conversion descriptor type]),
-diff -up tar-1.17/doc/tar.texi.xattrs tar-1.17/doc/tar.texi
---- tar-1.17/doc/tar.texi.xattrs 2007-06-08 10:25:19.000000000 +0200
-+++ tar-1.17/doc/tar.texi 2007-12-10 15:31:54.000000000 +0100
+diff -urp tar-1.22-orig/doc/tar.texi tar-1.22/doc/tar.texi
+--- tar-1.22-orig/doc/tar.texi 2009-03-05 08:04:13.000000000 +0100
++++ tar-1.22/doc/tar.texi 2009-03-05 09:45:42.000000000 +0100
@@ -2345,6 +2345,10 @@ Normally when creating an archive, @comm
@samp{/} from member names. This option disables that behavior.
@xref{absolute}.
@@ -47,7 +47,7 @@
@opsummary{after-date}
@item --after-date
-@@ -2838,6 +2842,10 @@ contents have changed (as opposed to jus
+@@ -2844,6 +2848,10 @@ contents have changed (as opposed to jus
also back up files for which any status information has
changed). @xref{after}.
@@ -58,7 +58,7 @@
@opsummary{no-anchored}
@item --no-anchored
An exclude pattern can match any subsequence of the name's components.
-@@ -2900,11 +2908,21 @@ When extracting an archive, subtract the
+@@ -2919,11 +2927,21 @@ When extracting an archive, subtract the
the permissions specified in the archive. This is the default behavior
for ordinary users.
@@ -80,7 +80,7 @@
@opsummary{no-wildcards}
@item --no-wildcards
Do not use wildcards.
-@@ -3132,6 +3150,11 @@ locations. Usually @command{tar} determ
+@@ -3151,6 +3169,11 @@ locations. Usually @command{tar} determ
the archive can be seeked or not. This option is intended for use
in cases when such recognition fails.
@@ -92,7 +92,7 @@
@opsummary{show-defaults}
@item --show-defaults
-@@ -3328,6 +3351,11 @@ Used in conjunction with @option{--multi
+@@ -3349,6 +3372,11 @@ Used in conjunction with @option{--multi
keep track of which volume of a multi-volume archive it is working in
@var{file}. @xref{volno-file}.
@@ -104,7 +104,7 @@
@opsummary{wildcards}
@item --wildcards
Use wildcards when matching member names with patterns.
-@@ -7845,6 +7845,8 @@ implementation able to read @samp{ustar}
+@@ -8350,6 +8378,8 @@ implementation able to read @samp{ustar}
most @samp{posix} archives as well, with the only exception that any
additional information (such as long file names etc.) will in such
case be extracted as plain text files along with the files it refers to.
@@ -113,9 +113,9 @@
This archive format will be the default format for future versions
of @GNUTAR{}.
-@@ -8333,6 +8335,51 @@ It is equivalent to @option{--same-permi
- @FIXME{I do not see the purpose of such an option. (Neither I. FP.)
- Neither do I. --Sergey}
+@@ -8902,6 +8932,51 @@ Same as both @option{--same-permissions}
+
+ This option is deprecated, and will be removed in @GNUTAR{} version 1.23.
+ at opindex acls
+ at item --acls
@@ -165,10 +165,10 @@
@end table
@node Portability
-diff -up tar-1.17/src/common.h.xattrs tar-1.17/src/common.h
---- tar-1.17/src/common.h.xattrs 2007-06-08 10:14:42.000000000 +0200
-+++ tar-1.17/src/common.h 2007-12-10 15:31:54.000000000 +0100
-@@ -255,6 +255,15 @@ GLOBAL int same_owner_option;
+diff -urp tar-1.22-orig/src/common.h tar-1.22/src/common.h
+--- tar-1.22-orig/src/common.h 2008-11-30 13:30:29.000000000 +0100
++++ tar-1.22/src/common.h 2009-03-05 09:45:42.000000000 +0100
+@@ -248,6 +248,15 @@ GLOBAL int same_owner_option;
/* If positive, preserve permissions when extracting. */
GLOBAL int same_permissions_option;
@@ -184,7 +184,7 @@
/* When set, strip the given number of file name components from the file name
before extracting */
GLOBAL size_t strip_name_components;
-@@ -666,6 +675,9 @@ extern char *output_start;
+@@ -673,6 +682,9 @@ extern char *output_start;
void update_archive (void);
@@ -194,7 +194,7 @@
/* Module xheader.c. */
void xheader_init (struct xheader *xhdr);
-@@ -687,6 +699,12 @@ bool xheader_string_end (struct xheader
+@@ -694,6 +706,12 @@ bool xheader_string_end (struct xheader
bool xheader_keyword_deleted_p (const char *kw);
char *xheader_format_name (struct tar_stat_info *st, const char *fmt,
size_t n);
@@ -207,1061 +207,1233 @@
/* Module system.c */
-diff -up /dev/null tar-1.17/src/xattrs.c
---- /dev/null 2007-12-10 11:30:31.504001819 +0100
-+++ tar-1.17/src/xattrs.c 2007-12-10 15:31:54.000000000 +0100
-@@ -0,0 +1,491 @@
-+/* Create a tar archive.
-+
-+ Copyright (C) 2006 Free Software Foundation, Inc.
-+
-+ Written by James Antill, on 2006-07-27.
-+
-+ This program is free software; you can redistribute it and/or modify it
-+ under the terms of the GNU General Public License as published by the
-+ Free Software Foundation; either version 2, or (at your option) any later
-+ version.
-+
-+ This program is distributed in the hope that it will be useful, but
-+ WITHOUT ANY WARRANTY; without even the implied warranty of
-+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
-+ Public License for more details.
-+
-+ You should have received a copy of the GNU General Public License along
-+ with this program; if not, write to the Free Software Foundation, Inc.,
-+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
-+
-+#include <system.h>
-+
-+#include <quotearg.h>
-+
-+#include "common.h"
-+
-+
-+#ifndef HAVE_SELINUX_SELINUX_H
-+# undef HAVE_LIBSELINUX
-+#endif
-+
-+#ifndef HAVE_ATTR_XATTR_H
-+# undef HAVE_XATTRS
-+#endif
-+
-+#ifndef HAVE_SYS_ACL_H
-+# undef HAVE_LIBACL
-+#endif
-+
-+#ifdef HAVE_SELINUX_SELINUX_H
-+# include <selinux/selinux.h>
-+#endif
+diff -urp tar-1.22-orig/src/create.c tar-1.22/src/create.c
+--- tar-1.22-orig/src/create.c 2008-10-30 11:58:04.000000000 +0100
++++ tar-1.22/src/create.c 2009-03-05 09:45:42.000000000 +0100
+@@ -24,6 +24,7 @@
+ #include <quotearg.h>
+
+ #include "common.h"
+
-+#ifdef HAVE_ATTR_XATTR_H
-+# include <attr/xattr.h>
-+#endif
+ #include <hash.h>
+
+ struct link
+@@ -944,6 +945,30 @@ start_header (struct tar_stat_info *st)
+ GNAME_TO_CHARS (st->gname, header->header.gname);
+ }
+
++ if (archive_format == POSIX_FORMAT)
++ {
++ if (acls_option > 0)
++ {
++ if (st->acls_a_ptr)
++ xheader_store ("SCHILY.acl.access", st, NULL);
++ if (st->acls_d_ptr)
++ xheader_store ("SCHILY.acl.default", st, NULL);
++ }
++ if ((selinux_context_option > 0) && st->cntx_name)
[...2069 lines suppressed...]
++ st->xattr_map[scan].xval_len);
++
++ ++scan;
+ }
++#endif
+ }
++}
+
- return header;
- }
-
-@@ -1572,6 +1597,10 @@ dump_file0 (struct tar_stat_info *st, co
- }
- }
-
-+ xattrs_acls_get(st, p, fd, !is_dir);
-+ xattrs_selinux_get(st, p, fd);
-+ xattrs_xattrs_get(st, p, fd);
-+
- if (is_dir)
- {
- const char *tag_file_name;
diff -up /dev/null tar-1.17/src/xattrs.h
--- /dev/null 2007-12-10 11:30:31.504001819 +0100
+++ tar-1.17/src/xattrs.h 2007-12-10 15:31:54.000000000 +0100
@@ -1280,174 +1452,3 @@
+ char const *file_name, char typeflag);
+extern void xattrs_xattrs_set(struct tar_stat_info const *st,
+ char const *file_name, char typeflag);
-diff -up tar-1.17/src/tar.h.xattrs tar-1.17/src/tar.h
---- tar-1.17/src/tar.h.xattrs 2007-06-01 12:17:10.000000000 +0200
-+++ tar-1.17/src/tar.h 2007-12-10 15:31:54.000000000 +0100
-@@ -276,6 +276,14 @@ struct xheader
- uintmax_t string_length;
- };
-
-+/* Information about xattrs for a file. */
-+struct xattr_array
-+ {
-+ char *xkey;
-+ char *xval_ptr;
-+ size_t xval_len;
-+ };
-+
- struct tar_stat_info
- {
- char *orig_file_name; /* name of file read from the archive header */
-@@ -287,6 +295,15 @@ struct tar_stat_info
-
- char *uname; /* user name of owner */
- char *gname; /* group name of owner */
-+
-+ char *cntx_name; /* SELinux context for the current archive entry. */
-+
-+ char *acls_a_ptr; /* Access ACLs for the current archive entry. */
-+ size_t acls_a_len; /* Access ACLs for the current archive entry. */
-+
-+ char *acls_d_ptr; /* Default ACLs for the current archive entry. */
-+ size_t acls_d_len; /* Default ACLs for the current archive entry. */
-+
- struct stat stat; /* regular filesystem stat */
-
- /* STAT doesn't always have access, data modification, and status
-@@ -309,6 +326,9 @@ struct tar_stat_info
- size_t sparse_map_size; /* Size of the sparse map */
- struct sp_array *sparse_map;
-
-+ size_t xattr_map_size; /* Size of the xattr map */
-+ struct xattr_array *xattr_map;
-+
- /* Extended headers */
- struct xheader xhdr;
-
---- tar-1.19/src/extract.c.xattrs 2007-08-26 10:56:55.000000000 +0200
-+++ tar-1.19/src/extract.c 2007-12-17 10:32:56.000000000 +0100
-@@ -69,6 +69,13 @@ struct delayed_set_stat
- mode_t invert_permissions;
- enum permstatus permstatus;
- bool after_links;
-+ char *cntx_name;
-+ char *acls_a_ptr;
-+ size_t acls_a_len;
-+ char *acls_d_ptr;
-+ size_t acls_d_len;
-+ size_t xattr_map_size; /* Size of the xattr map */
-+ struct xattr_array *xattr_map;
- char file_name[1];
- };
-
-@@ -96,6 +103,18 @@ struct delayed_link
- hard-linked together. */
- struct string_list *sources;
-
-+ /* SELinux context */
-+ char *cntx_name;
-+
-+ /* ACLs */
-+ char *acls_a_ptr;
-+ size_t acls_a_len;
-+ char *acls_d_ptr;
-+ size_t acls_d_len;
-+
-+ size_t xattr_map_size; /* Size of the xattr map */
-+ struct xattr_array *xattr_map;
-+
- /* The desired target of the desired link. */
- char target[1];
- };
-@@ -276,6 +295,10 @@ set_stat (char const *file_name,
- give files away. */
- }
-
-+ xattrs_acls_set(st, file_name, typeflag);
-+ xattrs_selinux_set(st, file_name, typeflag);
-+ xattrs_xattrs_set(st, file_name, typeflag);
-+
- if (0 < same_owner_option && permstatus != INTERDIR_PERMSTATUS)
- {
- /* When lchown exists, it should be used to change the attributes of
-@@ -352,6 +375,29 @@ delay_set_stat (char const *file_name, s
- data->invert_permissions = invert_permissions;
- data->permstatus = permstatus;
- data->after_links = 0;
-+ data->cntx_name = NULL;
-+ assign_string (&data->cntx_name, st->cntx_name);
-+ if (st->acls_a_ptr)
-+ {
-+ data->acls_a_ptr = xmemdup(st->acls_a_ptr, st->acls_a_len + 1);
-+ data->acls_a_len = st->acls_a_len;
-+ }
-+ else
-+ {
-+ data->acls_a_ptr = NULL;
-+ data->acls_a_len = 0;
-+ }
-+ if (st->acls_d_ptr)
-+ {
-+ data->acls_d_ptr = xmemdup(st->acls_d_ptr, st->acls_d_len + 1);
-+ data->acls_d_len = st->acls_d_len;
-+ }
-+ else
-+ {
-+ data->acls_d_ptr = NULL;
-+ data->acls_d_len = 0;
-+ }
-+ xheader_xattr_copy (st, &data->xattr_map, &data->xattr_map_size);
- strcpy (data->file_name, file_name);
- delayed_set_stat_head = data;
- }
-@@ -599,11 +639,22 @@ apply_nonancestor_delayed_set_stat (char
- sb.stat.st_gid = data->gid;
- sb.atime = data->atime;
- sb.mtime = data->mtime;
-+ sb.cntx_name = data->cntx_name;
-+ sb.acls_a_ptr = data->acls_a_ptr;
-+ sb.acls_a_len = data->acls_a_len;
-+ sb.acls_d_ptr = data->acls_d_ptr;
-+ sb.acls_d_len = data->acls_d_len;
-+ sb.xattr_map = data->xattr_map;
-+ sb.xattr_map_size = data->xattr_map_size;
- set_stat (data->file_name, &sb, cur_info,
- data->invert_permissions, data->permstatus, DIRTYPE);
- }
-
- delayed_set_stat_head = data->next;
-+ xheader_xattr_free (data->xattr_map, data->xattr_map_size);
-+ free (data->cntx_name);
-+ free (data->acls_a_ptr);
-+ free (data->acls_d_ptr);
- free (data);
- }
- }
-@@ -882,6 +933,13 @@ create_placeholder_file (char *file_name
- + strlen (file_name) + 1);
- p->sources->next = 0;
- strcpy (p->sources->string, file_name);
-+ p->cntx_name = NULL;
-+ p->acls_a_ptr = NULL;
-+ p->acls_a_len = 0;
-+ p->acls_d_ptr = NULL;
-+ p->acls_d_len = 0;
-+ p->xattr_map = NULL;
-+ p->xattr_map_size = 0;
- strcpy (p->target, current_stat_info.link_name);
-
- h = delayed_set_stat_head;
-@@ -1291,6 +1349,13 @@ apply_delayed_links (void)
- struct tar_stat_info st1;
- st1.stat.st_uid = ds->uid;
- st1.stat.st_gid = ds->gid;
-+ st1.cntx_name = ds->cntx_name;
-+ st1.acls_a_ptr = ds->acls_a_ptr;
-+ st1.acls_a_len = ds->acls_a_len;
-+ st1.acls_d_ptr = ds->acls_d_ptr;
-+ st1.acls_d_len = ds->acls_d_len;
-+ st1.xattr_map = ds->xattr_map;
-+ st1.xattr_map_size = ds->xattr_map_size;
- set_stat (source, &st1, NULL, 0, 0, SYMTYPE);
- valid_source = source;
- }
--- tar-1.21-testsuite.patch DELETED ---
More information about the fedora-extras-commits
mailing list