rpms/tar
7
0
Fork 0
Code Issues Pull Requests Releases Activity

fix xattrs patch, use upstream version of stripcomponents patch

Browse Source
This commit is contained in:
Ondřej Vašík 2010-10-27 12:47:41 +02:00
parent ef1451d533
commit 68aae18d42
2 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
tar-1.24-xattrs.patch
View File

@ -361,13 +361,14 @@ diff -urNp tar-1.24-orig/src/extract.c tar-1.24/src/extract.c
if (0 < same_owner_option && ! interdir) if (0 < same_owner_option && ! interdir)
{ {
/* Some systems allow non-root users to give files away. Once this /* Some systems allow non-root users to give files away. Once this
@@ -431,6 +455,29 @@ delay_set_stat (char const *file_name, s @@ -431,6 +455,36 @@ delay_set_stat (char const *file_name, s
data->atflag = atflag; data->atflag = atflag;
data->after_links = 0; data->after_links = 0;
data->change_dir = chdir_current; data->change_dir = chdir_current;
+ data->cntx_name = NULL; + data->cntx_name = NULL;
+ assign_string (&data->cntx_name, st->cntx_name); + if (st)
+ if (st->acls_a_ptr) + assign_string (&data->cntx_name, st->cntx_name);
+ if (st && st->acls_a_ptr)
+ { + {
+ data->acls_a_ptr = xmemdup(st->acls_a_ptr, st->acls_a_len + 1); + data->acls_a_ptr = xmemdup(st->acls_a_ptr, st->acls_a_len + 1);
+ data->acls_a_len = st->acls_a_len; + data->acls_a_len = st->acls_a_len;
@ -377,7 +378,7 @@ diff -urNp tar-1.24-orig/src/extract.c tar-1.24/src/extract.c
+ data->acls_a_ptr = NULL; + data->acls_a_ptr = NULL;
+ data->acls_a_len = 0; + data->acls_a_len = 0;
+ } + }
+ if (st->acls_d_ptr) + if (st && st->acls_d_ptr)
+ { + {
+ data->acls_d_ptr = xmemdup(st->acls_d_ptr, st->acls_d_len + 1); + data->acls_d_ptr = xmemdup(st->acls_d_ptr, st->acls_d_len + 1);
+ data->acls_d_len = st->acls_d_len; + data->acls_d_len = st->acls_d_len;
@ -387,7 +388,13 @@ diff -urNp tar-1.24-orig/src/extract.c tar-1.24/src/extract.c
+ data->acls_d_ptr = NULL; + data->acls_d_ptr = NULL;
+ data->acls_d_len = 0; + data->acls_d_len = 0;
+ } + }
+ xheader_xattr_copy (st, &data->xattr_map, &data->xattr_map_size); + if (st)
+ xheader_xattr_copy (st, &data->xattr_map, &data->xattr_map_size);
+ else
+ {
+ data->xattr_map = NULL;
+ data->xattr_map_size = 0;
+ }
strcpy (data->file_name, file_name); strcpy (data->file_name, file_name);
delayed_set_stat_head = data; delayed_set_stat_head = data;
if (must_be_dot_or_slash (file_name)) if (must_be_dot_or_slash (file_name))
@ -406,7 +413,7 @@ diff -urNp tar-1.24-orig/src/extract.c tar-1.24/src/extract.c
+ mode_t invert_permissions, char typeflag, int *file_created) + mode_t invert_permissions, char typeflag, int *file_created)
+{ +{
+ int status = 0; + int status = 0;
+ int interdir_made = 0; + bool interdir_made = false;
+ +
+ if ((xattrs_option >= 0) && st->xattr_map_size) { + if ((xattrs_option >= 0) && st->xattr_map_size) {
+ mode_t mode = current_stat_info.stat.st_mode & MODE_RWX & ~ current_umask; + mode_t mode = current_stat_info.stat.st_mode & MODE_RWX & ~ current_umask;

4
tar.spec
View File

@ -32,7 +32,7 @@ Patch6: tar-1.22-fortifysourcessigabrt.patch
#oldarchive option was not working(#594044) #oldarchive option was not working(#594044)
Patch7: tar-1.23-oldarchive.patch Patch7: tar-1.23-oldarchive.patch
#match non-stripped file names (#637085) #match non-stripped file names (#637085)
Patch8: tar-1.23-stripcomponents.patch Patch8: tar-1.24-stripcomponents.patch
#fix bug with -C and extracting directories #fix bug with -C and extracting directories
Patch9: tar-1.24-extractingdirs.patch Patch9: tar-1.24-extractingdirs.patch
Requires: info Requires: info
@ -65,8 +65,8 @@ the rmt package.
%patch5 -p1 -b .rofs %patch5 -p1 -b .rofs
%patch6 -p1 -b .fortify %patch6 -p1 -b .fortify
%patch7 -p1 -b .oldarchive %patch7 -p1 -b .oldarchive
%patch8 -p1 -b .stripcomponents
%patch9 -p1 -b .extractC %patch9 -p1 -b .extractC
%patch8 -p1 -b .stripcomponents
autoreconf autoreconf