fix bug 102356

Package-Manager: portage-2.1_pre3-r1

4 files changed, 48 insertions, 15 deletions

diff --git a/app-misc/mc/ChangeLog b/app-misc/mc/ChangeLog
index d0051180b4d9..a940c07d2a91 100644
--- a/app-misc/mc/ChangeLog
+++ b/app-misc/mc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-misc/mc
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/mc/ChangeLog,v 1.85 2006/01/03 22:02:11 sekretarz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/mc/ChangeLog,v 1.86 2006/01/28 10:26:33 blubb Exp $
+
+  28 Jan 2006; Simon Stelling <blubb@gentoo.org>
+  +files/mc-4.6.0-bug-102356.patch, mc-4.6.0-r14.ebuild:
+  fix bug 102356
 
   03 Jan 2006; Karol Wojtaszek <sekretarz@gentoo.org> mc-4.6.0-r14.ebuild:
   Add modular X dependencies, bug #117639
diff --git a/app-misc/mc/Manifest b/app-misc/mc/Manifest
index 4d8228edc441..8431e2352c9d 100644
--- a/app-misc/mc/Manifest
+++ b/app-misc/mc/Manifest
@@ -1,13 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 3a3c409cb2baf54fd9f252f06f340b89 ChangeLog 12622
+MD5 94ad7cab3a22934e46cd79b2ca380545 ChangeLog 12742
 MD5 9f528fa7b6b4d2c202ce5f4e3a5173ba files/chdir-4.6.0.gentoo 159
 MD5 d576baf06c64df107664f4724b7632a2 files/digest-mc-4.6.0-r12 139
 MD5 d576baf06c64df107664f4724b7632a2 files/digest-mc-4.6.0-r13 139
 MD5 947a18b172bf06ad72d511b62cfc0ad8 files/digest-mc-4.6.0-r14 203
 MD5 33aafc4a9c8134eb13d62fed6b81888e files/ebuild.syntax 2588
 MD5 d157d2a6836514f758dc3ae9149ae178 files/mc-4.6.0-7zip.patch 631
+MD5 d9519efa7db0aaf795556ac29cadd4ad files/mc-4.6.0-bug-102356.patch 1378
 MD5 23a5069637af088015fe5f0de8c42883 files/mc-4.6.0-can-2004-0226-0231-0232.patch.bz2 20610
 MD5 cc807a7e72b64d07dd856c6dd9099e3a files/mc-4.6.0-can-2004-1004-1005-1092-1176.patch.bz2 1550
 MD5 2a6c3ed30597eadaa19a6dbdd3ce168d files/mc-4.6.0-cpan-2003-1023.patch 475
@@ -23,12 +21,5 @@ MD5 835695dda387b59a2497658f3f5af1d5 files/mc.gentoo 322
 MD5 7fadf4867e255f1d7254181267759775 files/mc.ini 43
 MD5 cbab313c52ad5cde562cf360d4e7582b mc-4.6.0-r12.ebuild 3147
 MD5 555d357fd8ed626786ac81e143c5fc00 mc-4.6.0-r13.ebuild 3297
-MD5 ea3b82a26cfeb47ab721f0a144e8ac64 mc-4.6.0-r14.ebuild 3933
+MD5 981e691c02dfc4783e0d73236ca4ae41 mc-4.6.0-r14.ebuild 3970
 MD5 503ccb1138f9c49f0855884d830988a6 metadata.xml 253
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFDuwKbZ/iYVBmujdURAiI9AKDPHI8+y2G6Er++C8PrVRXu++DhegCePoZT
-kjXW72UbDKS5TkkwmJ1JWtA=
-=vhpG
------END PGP SIGNATURE-----
diff --git a/app-misc/mc/files/mc-4.6.0-bug-102356.patch b/app-misc/mc/files/mc-4.6.0-bug-102356.patch
new file mode 100644
index 000000000000..1ba83fea4ccb
--- /dev/null
+++ b/app-misc/mc/files/mc-4.6.0-bug-102356.patch
@@ -0,0 +1,38 @@
+--- mc-4.6.0-orig/vfs/smb/configure	2005-08-13 13:00:45.000000000 +0200
++++ mc-4.6.0/vfs/smb/configure	2005-08-13 13:34:45.000000000 +0200
+@@ -3546,6 +3546,8 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ 
++#include <stdlib.h>
++#include <string.h>
+ #include <unistd.h>
+ #include <sys/utsname.h>
+ main() {
+diff -urN mc-4.6.0-orig/vfs/smb/configure.in mc-4.6.0/vfs/smb/configure.in
+--- mc-4.6.0-orig/vfs/smb/configure.in	2005-08-13 13:00:45.000000000 +0200
++++ mc-4.6.0/vfs/smb/configure.in	2005-08-13 13:34:16.000000000 +0200
+@@ -458,6 +458,8 @@
+         old_CPPFLAGS="$CPPFLAGS"
+         CPPFLAGS="-D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE $CPPFLAGS"
+        AC_TRY_RUN([
++#include <stdlib.h>
++#include <string.h>
+ #include <unistd.h>
+ #include <sys/utsname.h>
+ main() {
+diff -urN mc-4.6.0-orig/vfs/smb/tests/crypttest.c mc-4.6.0/vfs/smb/tests/crypttest.c
+--- mc-4.6.0-orig/vfs/smb/tests/crypttest.c	2005-08-13 13:00:45.000000000 +0200
++++ mc-4.6.0/vfs/smb/tests/crypttest.c	2005-08-13 13:35:23.000000000 +0200
+@@ -803,9 +803,9 @@
+ 	strcpy(passwd, "12345678");
+ 	strcpy(salt, "12345678");
+ 	
+-	strcpy(c_out1, crypt(passwd, salt));
++	strcpy(c_out1, (const char *) crypt(passwd, salt));
+ 	salt[2] = '\0';
+-	strcpy(c_out2, crypt(passwd, salt));
++	strcpy(c_out2, (const char *) crypt(passwd, salt));
+ 
+ 	/*
+ 	 * If the non-trucated salt fails but the
diff --git a/app-misc/mc/mc-4.6.0-r14.ebuild b/app-misc/mc/mc-4.6.0-r14.ebuild
index 13e03501b4e6..e663075d22f4 100644
--- a/app-misc/mc/mc-4.6.0-r14.ebuild
+++ b/app-misc/mc/mc-4.6.0-r14.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/mc/mc-4.6.0-r14.ebuild,v 1.6 2006/01/03 22:02:11 sekretarz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/mc/mc-4.6.0-r14.ebuild,v 1.7 2006/01/28 10:26:33 blubb Exp $
 
 inherit flag-o-matic eutils
 
@@ -65,7 +65,7 @@ src_unpack() {
 	epatch ${FILESDIR}/${P}-key.c.patch
 	# Fix building with gcc4.
 	epatch ${FILESDIR}/${P}-gcc4.patch
-
+	epatch ${FILESDIR}/${P}-bug-102356.patch
 	if use slang && use unicode; then
 		epatch ${FILESDIR}/${P}-utf8.patch.bz2
 	fi