Fix build failure - bug #513762

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 0x77F1F175586A3B1F)

3 files changed, 65 insertions, 5 deletions

diff --git a/app-crypt/mit-krb5-appl/ChangeLog b/app-crypt/mit-krb5-appl/ChangeLog
index 26a917ba1e73..8b8ed1e5cb08 100644
--- a/app-crypt/mit-krb5-appl/ChangeLog
+++ b/app-crypt/mit-krb5-appl/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-crypt/mit-krb5-appl
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/mit-krb5-appl/ChangeLog,v 1.37 2013/12/27 21:44:29 tomwij Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/mit-krb5-appl/ChangeLog,v 1.38 2014/06/20 09:51:39 eras Exp $
+
+  20 Jun 2014; Eray Aslan <eras@gentoo.org> +files/mit-krb5-appl-sig_t.patch,
+  mit-krb5-appl-1.0.3.ebuild:
+  Fix build failure - bug #513762
 
   27 Dec 2013; Tom Wijsman <TomWij@gentoo.org> -files/CVE-2011-4862.patch:
   [QA] Remove unused files.
diff --git a/app-crypt/mit-krb5-appl/files/mit-krb5-appl-sig_t.patch b/app-crypt/mit-krb5-appl/files/mit-krb5-appl-sig_t.patch
new file mode 100644
index 000000000000..ebdaf6b5b3d2
--- /dev/null
+++ b/app-crypt/mit-krb5-appl/files/mit-krb5-appl-sig_t.patch
@@ -0,0 +1,55 @@
+Bug #513762
+
+From 4b45a32ba7c4f7b447919de6ce28a14150584290 Mon Sep 17 00:00:00 2001
+From: Russ Allbery <rra@stanford.edu>
+Date: Wed, 21 Mar 2012 04:16:36 +0000
+Subject: [PATCH] Move redeclaration of sig_t after all system includes
+
+Move some internal messing about with sig_t done by gssftp/ftp/ftp_var.h
+after the last system include to keep from stomping on system headers.
+Required for kFreeBSD and Hurd.
+
+git-svn-id: svn://anonsvn.mit.edu/krb5-appl/trunk@3331 dc483132-0cff-0310-8789-dd5450dbe970
+---
+ gssftp/ftp/ftp_var.h | 18 +++++++++---------
+ 1 file changed, 9 insertions(+), 9 deletions(-)
+
+diff --git a/gssftp/ftp/ftp_var.h b/gssftp/ftp/ftp_var.h
+index 3efbdb1..e478961 100644
+--- a/gssftp/ftp/ftp_var.h
++++ b/gssftp/ftp/ftp_var.h
+@@ -53,15 +53,6 @@ FILE* fdopen_socket(SOCKET s, char* mode);
+ #define PERROR_SOCKET(str) perror(str)
+ #endif
+ 
+-#ifdef _WIN32
+-typedef void (*sig_t)(int);
+-typedef void sigtype;
+-#else
+-#define sig_t my_sig_t
+-#define sigtype krb5_sigtype
+-typedef sigtype (*sig_t)();
+-#endif
+-
+ /*
+  * FTP global variables.
+  */
+@@ -168,6 +159,15 @@ extern int macnum;		/* number of defined macros */
+ extern struct macel macros[16];
+ extern char macbuf[4096];
+ 
++#ifdef _WIN32
++typedef void (*sig_t)(int);
++typedef void sigtype;
++#else
++#define sig_t my_sig_t
++#define sigtype krb5_sigtype
++typedef sigtype (*sig_t)();
++#endif
++
+ #ifdef DEFINITIONS
+ #undef extern
+ #endif
+-- 
+1.9.3
+
diff --git a/app-crypt/mit-krb5-appl/mit-krb5-appl-1.0.3.ebuild b/app-crypt/mit-krb5-appl/mit-krb5-appl-1.0.3.ebuild
index 985077d5b724..9285a3ecd23e 100644
--- a/app-crypt/mit-krb5-appl/mit-krb5-appl-1.0.3.ebuild
+++ b/app-crypt/mit-krb5-appl/mit-krb5-appl-1.0.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/mit-krb5-appl/mit-krb5-appl-1.0.3.ebuild,v 1.10 2013/02/28 13:43:44 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/mit-krb5-appl/mit-krb5-appl-1.0.3.ebuild,v 1.11 2014/06/20 09:51:39 eras Exp $
 
 EAPI=4
 
@@ -32,12 +32,13 @@ src_unpack() {
 
 src_prepare() {
 	epatch "${FILESDIR}/${PN}-tinfo.patch"
+	epatch "${FILESDIR}/${PN}-sig_t.patch"
 	sed -i -e "s/-lncurses/$($(tc-getPKG_CONFIG) --libs ncurses)/" configure.ac
 	eautoreconf
 }
 
 src_configure() {
-	append-flags "-I/usr/include/et"
+	append-cppflags "-I/usr/include/et"
 	append-cppflags -fno-strict-aliasing
 	append-cppflags -fno-strict-overflow
 	econf