Darcsweb-Url:
http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-0.5;a=darcs_commitdiff;h=20061204160657-dd049-167479b367ef1f10702445578b340cdf7bc386e1.gz;
[tar-1.15.1-5siwenna1-i686
voroskoi <[EMAIL PROTECTED]>**20061204160657
secfix relbump, closes #1496
] {
addfile ./source/base/tar/18355.diff
hunk ./source/base/tar/18355.diff 1
+--- tar-1.16.orig/src/common.h
++++ tar-1.16/src/common.h
+@@ -105,6 +105,9 @@
+
+ GLOBAL bool absolute_names_option;
+
++/* Allow GNUTYPE_NAMES type? */
++GLOBAL bool allow_name_mangling_option;
++
+ /* Display file times in UTC */
+ GLOBAL bool utc_option;
+
+--- tar-1.15.1.orig/src/extract.c
++++ tar-1.15.1/src/extract.c
+@@ -1101,7 +1107,13 @@
+ break;
+
+ case GNUTYPE_NAMES:
+- extract_mangle ();
++ if (allow_name_mangling_option) {
++ extract_mangle ();
++ }
++ else {
++ ERROR ((0, 0, _("GNUTYPE_NAMES mangling ignored")));
++ skip_member ();
++ }
+ break;
+
+ case GNUTYPE_MULTIVOL:
+--- tar-1.15.1.orig/src/tar.c
++++ tar-1.15.1/src/tar.c
+@@ -181,6 +181,7 @@
+ enum
+ {
+ ANCHORED_OPTION = CHAR_MAX + 1,
++ ALLOW_NAME_MANGLING_OPTION,
+ ATIME_PRESERVE_OPTION,
+ BACKUP_OPTION,
+ CHECKPOINT_OPTION,
+@@ -528,6 +529,8 @@
+
+ {NULL, 'o', 0, 0,
+ N_("when creating, same as --old-archive. When extracting, same as
--no-same-owner"), 91 },
++ {"allow-name-mangling", ALLOW_NAME_MANGLING_OPTION, 0, 0,
++ N_("when creating, allow GNUTYPE_NAMES mangling -- considered dangerous"),
91 },
+
+ {NULL, 0, NULL, 0,
+ N_("Other options:"), 100 },
+@@ -913,6 +916,10 @@
+ case 'Z':
+ set_use_compress_program_option ("compress");
+ break;
++
++ case ALLOW_NAME_MANGLING_OPTION:
++ allow_name_mangling_option = true;
++ break;
+
+ case ANCHORED_OPTION:
+ args->exclude_options |= EXCLUDE_ANCHORED;
hunk ./source/base/tar/FrugalBuild 1
-# Last Modified: Wed, 10 May 2006 19:43:42 +0200
hunk ./source/base/tar/FrugalBuild 6
-pkgrel=4
+pkgrel=5siwenna1
hunk ./source/base/tar/FrugalBuild 14
- $pkgname-$pkgver-lzma.diff tar-1.15.1-cve_2006_0300.diff)
-sha1sums=('21574ae5d39b698f7f577e2cecc91a5ec89b659c' \
- '4b1ad46664b97bb83de1dc90877a7e5986872806' \
- '675657cae29fd5dae52ad240d03840d32e72ab2d' \
- '2fd2ba3048d2eed952ae8ded5a57b4dcf6370e58')
+ $pkgname-$pkgver-lzma.diff tar-1.15.1-cve_2006_0300.diff 18355.diff)
hunk ./source/base/tar/FrugalBuild 21
+sha1sums=('21574ae5d39b698f7f577e2cecc91a5ec89b659c' \
+ '4b1ad46664b97bb83de1dc90877a7e5986872806' \
+ '675657cae29fd5dae52ad240d03840d32e72ab2d' \
+ '2fd2ba3048d2eed952ae8ded5a57b4dcf6370e58' \
+ '50f557c622192618db5c8f5269c0061e70d1dfa0')
hunk ./source/base/tar/FrugalBuild 27
-# optimization ok
+# optimization OK
}
_______________________________________________
Frugalware-darcs mailing list
Frugalware-darcs@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-darcs
