diff options
| author |   Eray Aslan <eras@gentoo.org> | 2014-06-20 09:51:49 +0000 |
|---|---|---|
| committer | Eray Aslan <eras@gentoo.org> | 2014-06-20 09:51:49 +0000 |
| commit | 0d690425ead951b1ee0965a7298f3545332e582c (patch) | |
| tree | 10e649fe8ba6d9248ec090941ceb59730a271ec8 /app-crypt/mit-krb5-appl | |
| parent | Update waf version and SRC_URI in 9999, thanks to Nikoli. (diff) | |
| download | historical-0d690425ead951b1ee0965a7298f3545332e582c.tar.gz historical-0d690425ead951b1ee0965a7298f3545332e582c.tar.bz2 historical-0d690425ead951b1ee0965a7298f3545332e582c.zip | |
Fix build failure - bug #513762
Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0x77F1F175586A3B1F
Diffstat (limited to 'app-crypt/mit-krb5-appl')
| -rw-r--r-- | app-crypt/mit-krb5-appl/ChangeLog | 8 | ||||
| -rw-r--r-- | app-crypt/mit-krb5-appl/Manifest | 27 | ||||
| -rw-r--r-- | app-crypt/mit-krb5-appl/files/mit-krb5-appl-sig_t.patch | 55 | ||||
| -rw-r--r-- | app-crypt/mit-krb5-appl/mit-krb5-appl-1.0.3.ebuild | 7 |
4 files changed, 82 insertions, 15 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/Manifest b/app-crypt/mit-krb5-appl/Manifest index e3c577bf4df4..465d61ebc75e 100644 --- a/app-crypt/mit-krb5-appl/Manifest +++ b/app-crypt/mit-krb5-appl/Manifest @@ -1,19 +1,26 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 +AUX mit-krb5-appl-sig_t.patch 1411 SHA256 81d681fcbf96f7baf8452cbaa089de931cc3915f1a1202a16ef1808ac0a08150 SHA512 a25ca113d8cae969ef370aa28b274dc4573964eb78e340a86ff4e3b130c6f7a73c97a41e657a5fabb634604a3bfb8f5a04c8925a248a8f9e45a22979fd8395f3 WHIRLPOOL e92b0b5ca3cd8be2f8e7fe15dc8cd1719784b6d79e70e0d239b90f73833ca53d26fda6c9c70bc1e3a504c7eedb4b6480f8ac9eb11719db5f567166d8b9d58321 AUX mit-krb5-appl-tinfo.patch 575 SHA256 c75e6ebf90a691680ccb37459342de5004eeaa1b88214dddf5100bd795144cb2 SHA512 076f34d70f43ae34fa6bc5e23171b2b31f579812527b7f78ba40ac3fca0cd92000b8caa40b8773bd2f9cc3ce0f6bcc6815f83422d5f8d320d34c4feb580231ab WHIRLPOOL 0c8321e40373869c76a9b4883c603dcc5cec14dffddb9b8645823b0ffd7b7a6fcca7885c9401c8f9b841569680fae74543a47d0eb839baf58dc68bcae122962f DIST krb5-appl-1.0.3-signed.tar 634880 SHA256 feb88581eba566554ad515a6fcf18cee11e8409a2c4755bf5188db96f0b7f039 SHA512 1d85be6eb39a01c21308f6b159a375ae4ee331de8052c3990c9252f708d717b8b518f92c424bd6beebe344d940b4813e6ea11dd18df5d7caa4b5effc2513dd23 WHIRLPOOL 091525cd162375b383f41f0627fa3dba2468459e2aa8fdaf8fff6c01f2bfd27af45990fc68ec0a0eea13288e3288c967e55346c53165ea1238ddea9b94a94364 -EBUILD mit-krb5-appl-1.0.3.ebuild 1723 SHA256 7706a60abd941b695aca4379e06c147c896381e4848127c0457293b7f7260670 SHA512 da7710b2cf6207d8405440260cdb4e520ccdbf00ce9ab569771a360aa8a7d0847df73d47cef591b5f07a9d57e28ec950bf71ab068ebfb06805ad8a4d38d94c59 WHIRLPOOL 230ac63e83298d535c3baa4168607bd8341dff1043d8c6ef6ae80b0106c7949f0f2bb23227e653f692c92afa38b4d460e6f79af0f6b35276b421286e1f04b654 -MISC ChangeLog 4900 SHA256 f827a88538dfec9a67f89cd34b516b8b0d47b12fde12d6fd26a9f8ac5979726c SHA512 2719936d3657af437a2370da4f40015c0f157748183a224acb742e5888f65eac13b67e5f82de568e09ec5258b732e84ded361801d3b7c4176b2912262c3917b6 WHIRLPOOL c6be595755a271aaa9a059188e790c35594d0c4aebb9038a7669f8a4f039ac2f2270a19b4bc3ac5662dcceb622dbf42e175c5f239e6e1cbbb6d2300dc758f91a +EBUILD mit-krb5-appl-1.0.3.ebuild 1766 SHA256 2fe91ff8b92bb8aab37a29f5232c5a14b7f9ba8d31cc455f1661f8bbeff52521 SHA512 98b3ee5fa7f66021b71bc5d291e395cb9b5531ca57f9e6909ed906e520311bed407bcb32d66c6bdc8dc5a3aa0e93df505fbc2c9ed47e1f58184981a67efae4b6 WHIRLPOOL 71960e2bbb6d9e9950a3163148db149e1959b1b7f137fefe8b86ec16d04ff87a2d9bdc6fb8b7a27261c2c3e3099672df6acadaf3e9c17ea1d9dad5b1730fafc3 +MISC ChangeLog 5041 SHA256 09837683a44cbd0c5a96c60622e5a4c101dfe403390d342570c1a5a6bd041ec8 SHA512 9d5b9a75e36aa6ab0387cf07d0fde01efa93de57789671a3d3588bd9972b3349f77396295e3fb54fbb3f7c7c02f177115e78a2e19c2c46532e6723e786ec6b07 WHIRLPOOL e05d7e4eed2cc9c5e72f9fca23574909cedf8ed1c4c18b4c918813958290918db7f4ffd63a2c7f9cde4dfccb087bba2a6feb9148883bb0038719c57576b271e0 MISC metadata.xml 161 SHA256 24dcbc1b12d6ed52621a4edec3764c838cab1b32f5fc982ce0fe305822c562c7 SHA512 10bf05a8a91f8c333e10c8c205f93e680443f7f4b84d07d86af59b30d4e3165040339ef99315cb44b35f090ab8454d06b010e44cf3ac0152a672806e2068c641 WHIRLPOOL 7bccd82cacd36cf74ec8736514d7c5445981af35a53b90d288ed109e6babcaea26e9bc3de8b5a64c5d71f1e0da4cdae613040f65f8e52d1bfc52b0294d70e11f -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.22 (GNU/Linux) +Version: GnuPG v2 -iQEcBAEBCAAGBQJSvfSsAAoJEJWyH81tNOV92iYH/i4mkeYxOdczXI+wjdlFUgXS -y3eTymd7sCQbu93wmx3ZG7zdGmeMXkKQaWwwMnJVougYsstaaMXqk8nnnWbRaEgi -Lx03mvtn7wdZvodmSbDPhe+A2Mx2acie5uS5ZvdrVF6q9FYZiHkdnUtVavS1UQyz -QQeY3ECKhYbHtI7LT1CLChn1KkrEbtEcbb3gt7qDCVioektuDkc+i61Xwcqgy0Rq -qkH85rDpSJGqEsPL+6E0qaqby3+nEtKdZV0EWnKrF9AJI5R7tK5DbhClNERx8F0g -brq+ilbpYubLfQUOtLVqIiOnewOVSubvK7eOg62RNlUnooZ8yJ7GTRh57nq3Eg8= -=DXya +iQIcBAEBCAAGBQJTpAQ1AAoJEHfx8XVYajsftMUP/04NipdQv7889qOuTCX7y1ui +p1R6vL4rFjA525/1ef2vOHglt7zmhmOpeIEAS/Zp99ZLWUgDxAJrPseK2otvnPOR +RlwDGiJJ6K2HdDIULncirUga7D4rHTcwRuZbQwZLpeDqevOIDHhhs4V8IwEusHR7 +vpUGipWK4OfPOu1Xk86tDmYtny7uiiraOI7KKJiy+1xL73ZCxfVFLxRCp0SuhWic +eep0et7bVJo4KRpsjNo0qrSpfSNjfY6zTQ1SL/TTueIHzkA88Pgg5ccZwUXIxOQw +kJ9cLov/GW8eL9sDnDgx4QHkk/IsbEtPS3YUNFzauZnhuhT5BXgG5vQGWzHcSZm4 +3bKxsTLZgIM8E4DheyNeb1ecCgiTMv5U6LIPlE8xZxnqzVkGrCYriNXNlZgHKymQ +JnKv8fJehBeUIoDTZcAo+eKjpMDjcEqX+VXCXdUjQqi2E5eGvr0AnsKrZSoNpus4 +hAkT4FLy5MTiKgLdKzgPpVFJPIwyPsx7Yxu8wXthKiR/C9Ui89oBzOBQ+7QinOud +v5p/LFaQSQaDBS2vr6xb0utNA9THijBk+gElIEK08BZmGKRncSbsGNRNci0BFSwN +H+w8CMEDwQFgdqGzhgEt4rXUnvB/HL2Sre9knIJ8GSEiYiIJGlkE6EC+ZGVOI2Jx +O89MQu4vDgDwIE254Fwp +=7gCa -----END PGP SIGNATURE----- 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 |