summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Schlemmer <azarah@gentoo.org>2004-01-11 13:45:46 +0000
committerMartin Schlemmer <azarah@gentoo.org>2004-01-11 13:45:46 +0000
commit7dce2edbf949f536c02672c1a185648f77a19ca2 (patch)
treec6650b65b2197c910853adf2c93824dfbaa7100c /app-arch/tar/files
parentDo not strip './' in path elements, as they are valid, bug #37132. This is (diff)
downloadgentoo-2-7dce2edbf949f536c02672c1a185648f77a19ca2.tar.gz
gentoo-2-7dce2edbf949f536c02672c1a185648f77a19ca2.tar.bz2
gentoo-2-7dce2edbf949f536c02672c1a185648f77a19ca2.zip
Do not strip './' in path elements, as they are valid, bug #37132. This is
the proper fix from CVS.
Diffstat (limited to 'app-arch/tar/files')
-rw-r--r--app-arch/tar/files/digest-tar-1.13.92-r21
-rw-r--r--app-arch/tar/files/tar-1.13.92-dont-strip-dot_slash.patch34
2 files changed, 35 insertions, 0 deletions
diff --git a/app-arch/tar/files/digest-tar-1.13.92-r2 b/app-arch/tar/files/digest-tar-1.13.92-r2
new file mode 100644
index 000000000000..6590deb15c11
--- /dev/null
+++ b/app-arch/tar/files/digest-tar-1.13.92-r2
@@ -0,0 +1 @@
+MD5 fdfffdd8141a00ea72c16c34b486a00a tar-1.13.92.tar.bz2 1043316
diff --git a/app-arch/tar/files/tar-1.13.92-dont-strip-dot_slash.patch b/app-arch/tar/files/tar-1.13.92-dont-strip-dot_slash.patch
new file mode 100644
index 000000000000..aae49762c6a0
--- /dev/null
+++ b/app-arch/tar/files/tar-1.13.92-dont-strip-dot_slash.patch
@@ -0,0 +1,34 @@
+===================================================================
+RCS file: /cvsroot/tar/cvsroot/tar/tar/src/names.c,v
+retrieving revision 1.36
+retrieving revision 1.37
+diff -u -r1.36 -r1.37
+--- tar/tar/src/names.c 2003/11/17 07:39:33 1.36
++++ tar/tar/src/names.c 2003/12/25 10:19:40 1.37
+@@ -1021,13 +1021,8 @@
+
+ for (p = file_name + prefix_len; *p; )
+ {
+- if (p[0] == '.')
+- {
+- if (p[1] == '.' && (ISSLASH (p[2]) || !p[2]))
+- prefix_len = p + 2 - file_name;
+- else if (ISSLASH (p[1]))
+- prefix_len = p + 1 - file_name;
+- }
++ if (p[0] == '.' && p[1] == '.' && (ISSLASH (p[2]) || !p[2]))
++ prefix_len = p + 2 - file_name;
+
+ do
+ {
+@@ -1072,8 +1067,8 @@
+ };
+ WARN ((0, 0, _(diagnostic[link_target])));
+ }
+-
+- p = ISSLASH (file_name[strlen(file_name)-1]) ? "./" : ".";
++
++ p = ".";
+ }
+
+ return (char *) p;