Fix symlink creation crash. Thanks to Lars Wendler (Polynomial-C) for the fix (bug #413691).

Package-Manager: portage-2.2.0_alpha101/cvs/Linux x86_64

4 files changed, 58 insertions, 19 deletions

diff --git a/app-misc/mc/ChangeLog b/app-misc/mc/ChangeLog
index 7c34655de082..3a30c113537b 100644
--- a/app-misc/mc/ChangeLog
+++ b/app-misc/mc/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-misc/mc
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/mc/ChangeLog,v 1.253 2012/04/23 15:59:12 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/mc/ChangeLog,v 1.254 2012/04/28 19:55:27 slyfox Exp $
+
+*mc-4.8.3-r2 (28 Apr 2012)
+
+  28 Apr 2012; Sergei Trofimovich <slyfox@gentoo.org>
+  +files/mc-4.8.3-fix-relative-symlink-creation-crash.patch,
+  +mc-4.8.3-r2.ebuild, -mc-4.8.3-r1.ebuild:
+  Fix symlink creation crash. Thanks to Lars Wendler (Polynomial-C) for the fix
+  (bug #413691).
 
 *mc-4.8.3-r1 (23 Apr 2012)
 
diff --git a/app-misc/mc/Manifest b/app-misc/mc/Manifest
index f86a9f3ea99d..23b9b3198672 100644
--- a/app-misc/mc/Manifest
+++ b/app-misc/mc/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA1
 
 AUX mc-4.8.0-fix-ftp-spaces.patch 1047 RMD160 8bfc6c0ffdcaded6a7f1382f0fee80d78fb928f0 SHA1 d6e1f843ce85a7351fd485cc6ec141ecd2a9c9fc SHA256 4285ba9907b4460739802876e39c8e2df858264214ef81ed8c2291b22f039515
 AUX mc-4.8.0-fix-nls.patch 949 RMD160 24627543ec6744b1b1d710a306dce4d5782e360e SHA1 d70b0ec63f65b72e414efcac2cc04e75740848d1 SHA256 504856248f6c3ab21870c7555f31cdcd9ac509c883ab6cc2929440fb9d1e2216
@@ -11,6 +11,7 @@ AUX mc-4.8.2-fix-existing.patch 1277 RMD160 d51f9df0191716f607c00a2570c21ff4c4b8
 AUX mc-4.8.2-mcedit-without-file-param-fix.patch 1550 RMD160 20e35f42aebd4caca8d2179a4ef5db1a3da3757c SHA1 0194743dc79f0b60493a33d00fc8b9aef3959b82 SHA256 c511bd9184176a80a44640e896774a5bda9240f95e21e0335047f1b56d5d26ca
 AUX mc-4.8.2-missing-do_panel_cd_stub_env.c 5448 RMD160 d892fd88563d6a1d21ad075d729307d7830cebfb SHA1 a5742a2fbe4529e5a5bdd0654f4873c714aa4adb SHA256 9338fc4b8c6f48e97c2f604bd07dd7d11d4fd367184c8907758f7ddf85cc6c13
 AUX mc-4.8.3-fix-chown-crash.patch 649 RMD160 1d6f2dab67b316da6b565eef58a1fca96f0b51c4 SHA1 92c04a9a96fe73e8169d49e77fdd2ac13887751a SHA256 c0d73faaea8742d8c7f38d499a98ecce4043051c5336bc669e6f0dff5fe481c4
+AUX mc-4.8.3-fix-relative-symlink-creation-crash.patch 978 RMD160 9d9a8e8dbd0da74a5c740b86a8ca49cafab419a1 SHA1 7e482d9da3afe245eb79f7f91265e6a451c3ae5d SHA256 76a25722091b5468066ebcb48b8b6146bc002ebd8ad3e29fffe6c4cfdf1c2e48
 AUX mc-4.8.3-missing-do_panel_cd_stub_env.c 5456 RMD160 44294799cde0c3f135a41d828f7b84a4f08da38e SHA1 a12866362fd72a19ae4b1eaa6b24977b66e96528 SHA256 1ea801331225e268f9c458aa14fc654413c55e3f9b4d0f8e163ad8c40f5d10c3
 DIST mc-4.7.0.10.tar.bz2 2862849 RMD160 83a527a94a81f886eb7f80b8965554bf927cad65 SHA1 2bc13f963780eaddac2f675b9145656d759f974e SHA256 99136c447a718c6bd681cb0f7d3ab9df4f5494d35cb3682f01ccf004873e56fb
 DIST mc-4.7.0.3.tar.bz2 2793651 RMD160 ecda5e6befe4b1e0442044b732e7903b01ed73ae SHA1 2d319fc940283e4327cd5bc2f977b724461f1305 SHA256 71caeaf00606c45228362fb6a4d2f1b6d47b6c1056db46b975255aac5af45ef7
@@ -26,24 +27,14 @@ EBUILD mc-4.7.5.6-r1.ebuild 2045 RMD160 270e8616950482b443dc4d0d982353511084f871
 EBUILD mc-4.8.1-r1.ebuild 2407 RMD160 d3cfbcc14a3bcde7449b1380994bc1943863c54d SHA1 bcdd9e44d882b47a18ab557461a84b1672c7c597 SHA256 cc7c39d41759259dcc79996c57c23fedbdd673e5c637a24a51618a6c3a4167fb
 EBUILD mc-4.8.1-r2.ebuild 2367 RMD160 8ef9c92e9eb37289bbcf82c00291fb2633567cd6 SHA1 69f005824abd578dd8354ba2a785414eff1e2f4e SHA256 7328db03cfaf7e45213a611b7e7b48236a028cadc4c44f58c0d57da9b1d40947
 EBUILD mc-4.8.2-r2.ebuild 2334 RMD160 eda970445a1a87a61a497ca7f5f2b423d0c14d34 SHA1 399cc23c26c008432381755b89f703b8e0ce2a57 SHA256 82ec2b8854498f7d99469dc85f5fe5b213cc09991a7d5836c706e23fd11b54ab
-EBUILD mc-4.8.3-r1.ebuild 2270 RMD160 bd127ac21df3111944143fe02fe8d3e4a7f8fdfe SHA1 856609f386f45cac8f2b2adaee25392c3bd6dfb5 SHA256 11114f6975ca8324cfaaf37441713348cfdb354884d5470335aa39224d5350c3
+EBUILD mc-4.8.3-r2.ebuild 2341 RMD160 9375e2a29f0a27df2d1236efd67e42ded160668b SHA1 346762cbca6a5335d31ebb00b88c60dc55325eea SHA256 8b74eee9da0e3b80a1ba4045383efd21908e70015f5cdfde754bafd1349fab93
 EBUILD mc-9999.ebuild 2818 RMD160 545d1177af8c5040028b20591e997795d21f02d8 SHA1 fdcb74c3aedeab7ac7778960cca432d9ea54f336 SHA256 7e613f9a317cdda295a300646c0919010e163952d09a127879cbec1c6ec863af
-MISC ChangeLog 36929 RMD160 25d248ee33a4b0dfb889e5d325b856db5548d84e SHA1 86cfbfcf9a5ff1542fdc7799a7477ab23612516d SHA256 404f228ea0aab75c076d86784a646b99e1077411396d8b4590286542794555d0
+MISC ChangeLog 37208 RMD160 b6cd2b1590df1343416ca22778a38798280705cd SHA1 3bdc482782691632d114f26580c60cfa7c04e6be SHA256 fd5d26b519d4bdae0f42ac1ba076a52ad73f274224972913af13ced6c62eef23
 MISC metadata.xml 753 RMD160 411d630a4ac61019ad5154441b0afdbab8d807a2 SHA1 18bdba03c04541cc8294f3f19caeb2ec216a58be SHA256 002f3cef4b01416e6d67722b3784251c37ed8d70583a69f53fb305a64ef30d52
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJPlXxWAAoJEPiazRVxLXTFJoYQAMieoRX4qgaXgKZbrVkJrhpk
-3w9f3v0Uqlr9rqk5vSzYMSBWtCy3WR5vNXnLRVYUvHVi0WdMKbj9SwzWb/6nNAaz
-vhAoY8iFZfV3Z4FYyZ/9GpgFLFI5zi8vOSSQ4UIwY3a/ob5To/QiXTrmvLCsuHPQ
-B4efXkCpP7APCZDVec+E6ddISs1fmz5PROv3dwzEad5EUaCuEwFeJdAVz9mdYbSM
-zZy1KCBMD2gqa15iRpmmIbpsCkdtrfg0e/BHYyH2XH5TthoCx09dZ/5POfWP+llZ
-ESxrvqpJtl+oq3Cc8Ok+AgvGKegNszmVy9CsZtBurpVoqroMScRmWA57olGfr/1W
-1Wn1xhY3vx3eb0av8Q8mW4i6vGvUsLh9xH//tWOTDvWbIfljvyaV7MI//NGv7N0k
-c6C9/lDMGY6iR9peF02YpRzrHoshid3se2DQERx7+8KdMTJp50lL3awoYF86jCcu
-MSqR0nJz3Ziwqdo6jNCyz8uz18LrQxjci/tkoPp4cTl9Tt4O4ySxuULtTCokW2tE
-5gVlM2B6ThZfK+SxvqXcGynPgde+/yQJeISG4hD6Yav8/PR2I4t//ANsF6HzXPky
-fFFVDjCdyOz1ChPv1jQETUWWwjMX4XRiwA5n4r6EUic1myGosNC8KX3mtS6tkFVa
-P+CjrzYwh+pz9CatMKYE
-=iTtX
+iEYEARECAAYFAk+cTHEACgkQcaHudmEf86oxPACdFYx0gjPjWEtlqpjEm8yh+gVT
+eSQAnA5N8eQzHQ+iy4Br5Kbk65ezjokZ
+=jt6t
 -----END PGP SIGNATURE-----
diff --git a/app-misc/mc/files/mc-4.8.3-fix-relative-symlink-creation-crash.patch b/app-misc/mc/files/mc-4.8.3-fix-relative-symlink-creation-crash.patch
new file mode 100644
index 000000000000..cd2cda67f81c
--- /dev/null
+++ b/app-misc/mc/files/mc-4.8.3-fix-relative-symlink-creation-crash.patch
@@ -0,0 +1,39 @@
+Gentoo-bug: https://bugs.gentoo.org/413691
+
+commit 038b5e7406d177792d3e2cd904f6d32e5f392903
+Author: Andrew Borodin <aborodin@vmail.ru>
+Date:   Tue Apr 24 20:41:37 2012 +0400
+
+    Ticket #2787: crash when creating relative symlink.
+    
+    Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
+diff --git a/lib/util.c b/lib/util.c
+index 2c6011b..490bdfc 100644
+--- a/lib/util.c
++++ b/lib/util.c
+@@ -112,14 +112,14 @@ is_8bit_printable (unsigned char c)
+ static char *
+ resolve_symlinks (const vfs_path_t *vpath)
+ {
+-    char *p;
++    char *p, *p2;
+     char *buf, *buf2, *q, *r, c;
+     struct stat mybuf;
+ 
+     if (vpath->relative)
+         return NULL;
+ 
+-    p = vfs_path_to_str (vpath);
++    p = p2 = vfs_path_to_str (vpath);
+     r = buf = g_malloc (MC_MAXPATHLEN);
+     buf2 = g_malloc (MC_MAXPATHLEN);
+     *r++ = PATH_SEP;
+@@ -181,7 +181,7 @@ resolve_symlinks (const vfs_path_t *vpath)
+ 
+   ret:
+     g_free (buf2);
+-    g_free (p);
++    g_free (p2);
+     return buf;
+ }
+ 
diff --git a/app-misc/mc/mc-4.8.3-r1.ebuild b/app-misc/mc/mc-4.8.3-r2.ebuild
index 0e72f8a89b72..b8ffecdf8750 100644
--- a/app-misc/mc/mc-4.8.3-r1.ebuild
+++ b/app-misc/mc/mc-4.8.3-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/mc/mc-4.8.3-r1.ebuild,v 1.1 2012/04/23 15:59:12 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/mc/mc-4.8.3-r2.ebuild,v 1.1 2012/04/28 19:55:27 slyfox Exp $
 
 EAPI=4
 
@@ -43,6 +43,7 @@ src_prepare() {
 
 	# bug #413259
 	epatch "${FILESDIR}"/${P}-fix-chown-crash.patch
+	epatch "${FILESDIR}"/${P}-fix-relative-symlink-creation-crash.patch #413691
 }
 
 src_configure() {