[tar/f13/master] use the appropriate version of tar-1.22-longnames.patch

[Kamil Dudka]

commit c10bc28fa29cabcf17c091ca65cab364924124c1
Author: Kamil Dudka <kdudka at redhat.com>
Date:   Mon Sep 20 22:24:26 2010 +0200

    use the appropriate version of tar-1.22-longnames.patch

 ....23-longnames.patch => tar-1.22-longnames.patch |   42 ++++++++++----------
 1 files changed, 21 insertions(+), 21 deletions(-)
---
diff --git a/tar-1.23-longnames.patch b/tar-1.22-longnames.patch
similarity index 85%
rename from tar-1.23-longnames.patch
rename to tar-1.22-longnames.patch
index f7f2840..0bbcc2d 100644
--- a/tar-1.23-longnames.patch
+++ b/tar-1.22-longnames.patch
@@ -7,7 +7,7 @@
  6 files changed, 52 insertions(+), 7 deletions(-)
 
 diff --git a/src/compare.c b/src/compare.c
-index f4e92da..437ffb3 100644
+index 66205cb..cce9f22 100644
 --- a/src/compare.c
 +++ b/src/compare.c
 @@ -452,7 +452,6 @@ diff_archive (void)
@@ -19,11 +19,11 @@ index f4e92da..437ffb3 100644
    /* Print the block from current_header and current_stat_info.  */
  
 diff --git a/src/extract.c b/src/extract.c
-index 947e3ed..71f4e4f 100644
+index 58c413e..95a23b7 100644
 --- a/src/extract.c
 +++ b/src/extract.c
-@@ -1349,7 +1349,7 @@ extract_archive (void)
-   priv_set_remove_linkdir ();
+@@ -1263,7 +1263,7 @@ extract_archive (void)
+   tar_extractor_t fun;
  
    set_next_block_after (current_header);
 -  decode_header (current_header, &current_stat_info, &current_format, 1);
@@ -32,10 +32,10 @@ index 947e3ed..71f4e4f 100644
        || (interactive_option
  	  && !confirm ("extract", current_stat_info.file_name)))
 diff --git a/src/list.c b/src/list.c
-index 6e1971f..1edd504 100644
+index 5ef007b..2bbfe73 100644
 --- a/src/list.c
 +++ b/src/list.c
-@@ -90,7 +90,8 @@ read_and (void (*do_something) (void))
+@@ -88,7 +88,8 @@ read_and (void (*do_something) (void))
  
  	  /* Valid header.  We should decode next field (mode) first.
  	     Ensure incoming names are null terminated.  */
@@ -45,7 +45,7 @@ index 6e1971f..1edd504 100644
  	  if (! name_match (current_stat_info.file_name)
  	      || (NEWER_OPTION_INITIALIZED (newer_mtime_option)
  		  /* FIXME: We get mtime now, and again later; this causes
-@@ -116,8 +117,6 @@ read_and (void (*do_something) (void))
+@@ -114,8 +115,6 @@ read_and (void (*do_something) (void))
  			   quotearg_colon (current_stat_info.file_name)));
  		  /* Fall through.  */
  		default:
@@ -54,23 +54,23 @@ index 6e1971f..1edd504 100644
  		  skip_member ();
  		  continue;
  		}
-@@ -221,8 +220,6 @@ list_archive (void)
+@@ -215,8 +214,6 @@ list_archive (void)
+ {
    off_t block_ordinal = current_block_ordinal ();
- 
    /* Print the header block.  */
--  
+-
 -  decode_header (current_header, &current_stat_info, &current_format, 0);
    if (verbose_option)
-     print_header (&current_stat_info, current_header, block_ordinal);
+     print_header (&current_stat_info, block_ordinal);
  
 diff --git a/tests/Makefile.am b/tests/Makefile.am
-index e9b753c..fe2535a 100644
+index cad0dfe..735a71d 100644
 --- a/tests/Makefile.am
 +++ b/tests/Makefile.am
-@@ -66,6 +66,7 @@ TESTSUITE_AT = \
-  exclude03.at\
-  exclude04.at\
-  exclude05.at\
+@@ -60,6 +60,7 @@ TESTSUITE_AT = \
+  delete04.at\
+  delete05.at\
+  exclude.at\
 + exclude06.at\
   extrac01.at\
   extrac02.at\
@@ -129,13 +129,13 @@ index 0000000..f7ab141
 +
 +AT_CLEANUP
 diff --git a/tests/testsuite.at b/tests/testsuite.at
-index f581071..ef70b99 100644
+index a12477d..9e8c1db 100644
 --- a/tests/testsuite.at
 +++ b/tests/testsuite.at
-@@ -130,6 +130,7 @@ m4_include([exclude02.at])
- m4_include([exclude03.at])
- m4_include([exclude04.at])
- m4_include([exclude05.at])
+@@ -123,6 +123,7 @@ m4_include([append01.at])
+ m4_include([append02.at])
+ 
+ m4_include([exclude.at])
 +m4_include([exclude06.at])
  
  m4_include([delete01.at])