diff options
| author |   Simon Stelling <blubb@gentoo.org> | 2006-01-28 10:26:33 +0000 |
|---|---|---|
| committer | Simon Stelling <blubb@gentoo.org> | 2006-01-28 10:26:33 +0000 |
| commit | bbdcb64755bf364f4de74d987ec6a013b9a5a5a1 (patch) | |
| tree | ca25904448a5d1a28f6bb02a488eff5d7a62c8e9 /app-misc | |
| parent | ppc stable, bug #117494 (diff) | |
| download | gentoo-2-bbdcb64755bf364f4de74d987ec6a013b9a5a5a1.tar.gz gentoo-2-bbdcb64755bf364f4de74d987ec6a013b9a5a5a1.tar.bz2 gentoo-2-bbdcb64755bf364f4de74d987ec6a013b9a5a5a1.zip | |
fix bug 102356
(Portage version: 2.1_pre3-r1)
Diffstat (limited to 'app-misc')
| -rw-r--r-- | app-misc/mc/ChangeLog | 6 | ||||
| -rw-r--r-- | app-misc/mc/files/mc-4.6.0-bug-102356.patch | 38 | ||||
| -rw-r--r-- | app-misc/mc/mc-4.6.0-r14.ebuild | 4 |
3 files changed, 45 insertions, 3 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/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 |