Author: baggins Date: Fri May 18 06:48:08 2012 GMT
Module: packages Tag: HEAD
---- Log message:
- rel 2
- fix error message when entering into compressed tar and cpio archives (#2785)
---- Files affected:
packages/mc:
mc.spec (1.342 -> 1.343) , bug-2785.patch (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: packages/mc/mc.spec
diff -u packages/mc/mc.spec:1.342 packages/mc/mc.spec:1.343
--- packages/mc/mc.spec:1.342 Tue Apr 24 08:24:42 2012
+++ packages/mc/mc.spec Fri May 18 08:48:03 2012
@@ -22,7 +22,7 @@
Summary(zh_CN.UTF-8): 一个方便实用的文件管理器和虚拟Shell
Name: mc
Version: 4.8.3
-Release: 1
+Release: 2
Epoch: 1
License: GPL v3+
Group: Applications/Shells
@@ -38,6 +38,7 @@
Patch3: %{name}-noperl-vfs.patch
# at now syntax highligthing for PLD-update-TODO and CVSROOT/users
Patch4: %{name}-pld-developerfriendly.patch
+Patch5: bug-2785.patch
URL: http://www.midnight-commander.org/
BuildRequires: autoconf >= 2.60
BuildRequires: automake >= 1.5
@@ -165,6 +166,7 @@
%patch2 -p1
%{!?with_perl_vfs:%patch3 -p1}
%patch4 -p1
+%patch5 -p0
%{__rm} po/stamp-po
@@ -320,6 +322,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.343 2012/05/18 06:48:03 baggins
+- rel 2
+- fix error message when entering into compressed tar and cpio archives (#2785)
+
Revision 1.342 2012/04/24 06:24:42 arekm
- up to 4.8.3
================================================================
Index: packages/mc/bug-2785.patch
diff -u /dev/null packages/mc/bug-2785.patch:1.1
--- /dev/null Fri May 18 08:48:08 2012
+++ packages/mc/bug-2785.patch Fri May 18 08:48:03 2012
@@ -0,0 +1,22 @@
+Index: src/vfs/cpio/cpio.c
+===================================================================
+--- src/vfs/cpio/cpio.c (revision
764cdf2497ac1fe79b4237e9c75d600f7d868351)
++++ src/vfs/cpio/cpio.c (revision
8607bcc103ce2f9449b6b9736a9709cdb62a7178)
+@@ -250,5 +250,5 @@
+ mc_close (fd);
+ s = g_strconcat (super->name, decompress_extension (type), (char *)
NULL);
+- tmp_vpath = vfs_path_from_str (s);
++ tmp_vpath = vfs_path_from_str_flags (s, VPF_NO_CANON);
+ fd = mc_open (tmp_vpath, O_RDONLY);
+ vfs_path_free (tmp_vpath);
+Index: src/vfs/tar/tar.c
+===================================================================
+--- src/vfs/tar/tar.c (revision 764cdf2497ac1fe79b4237e9c75d600f7d868351)
++++ src/vfs/tar/tar.c (revision 8607bcc103ce2f9449b6b9736a9709cdb62a7178)
+@@ -317,5 +317,5 @@
+ mc_close (result);
+ s = g_strconcat (archive->name, decompress_extension (type), (char *)
NULL);
+- tmp_vpath = vfs_path_from_str (s);
++ tmp_vpath = vfs_path_from_str_flags (s, VPF_NO_CANON);
+ result = mc_open (tmp_vpath, O_RDONLY);
+ vfs_path_free (tmp_vpath);
================================================================
---- CVS-web:
http://cvs.pld-linux.org/packages/mc/mc.spec?r1=1.342&r2=1.343
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
