From e506143656e90f7f705f9727d128d176e1700b2a Mon Sep 17 00:00:00 2001 From: Zentaro Kavanagh Date: Wed, 16 Nov 2016 18:21:13 -0500 Subject: [PATCH] app-crypt/mit-krb5: fix clang build due to ttyname redecl --- .../mit-krb5-1.14.2-redeclared-ttyname.patch | 26 +++++++++++++++++++ app-crypt/mit-krb5/mit-krb5-1.14.2.ebuild | 1 + app-crypt/mit-krb5/mit-krb5-1.14.3.ebuild | 1 + app-crypt/mit-krb5/mit-krb5-1.14.4.ebuild | 1 + 4 files changed, 29 insertions(+) create mode 100644 app-crypt/mit-krb5/files/mit-krb5-1.14.2-redeclared-ttyname.patch diff --git a/app-crypt/mit-krb5/files/mit-krb5-1.14.2-redeclared-ttyname.patch b/app-crypt/mit-krb5/files/mit-krb5-1.14.2-redeclared-ttyname.patch new file mode 100644 index 0000000000000..a76cd3a7f8436 --- /dev/null +++ b/app-crypt/mit-krb5/files/mit-krb5-1.14.2-redeclared-ttyname.patch @@ -0,0 +1,26 @@ +Fixes the redeclaration of ttyname which was preventing +enabling clang fortify. + +The error was; + +main.c:858:15: error: redeclaration of 'ttyname' must have the 'overloadable' attribute + char *p, *ttyname(); + ^ +/build/samus/usr/include/unistd.h:784:14: note: previous overload of function is here +extern char *ttyname (int __fd) __THROW __CLANG_NO_MANGLE (ttyname); + +https://github.com/krb5/krb5/pull/568 + +Patch by Zentaro Kavanagh + +--- clients/ksu/main.c ++++ clients/ksu/main.c +@@ -855,7 +855,7 @@ + + static char * ontty() + { +- char *p, *ttyname(); ++ char *p; + static char buf[MAXPATHLEN + 5]; + int result; + diff --git a/app-crypt/mit-krb5/mit-krb5-1.14.2.ebuild b/app-crypt/mit-krb5/mit-krb5-1.14.2.ebuild index 60d7a5b162f90..8a3c7c30a4f19 100644 --- a/app-crypt/mit-krb5/mit-krb5-1.14.2.ebuild +++ b/app-crypt/mit-krb5/mit-krb5-1.14.2.ebuild @@ -58,6 +58,7 @@ MULTILIB_CHOST_TOOLS=( src_prepare() { epatch "${FILESDIR}/${PN}-1.12_warn_cflags.patch" epatch "${FILESDIR}/${PN}-config_LDFLAGS.patch" + epatch "${FILESDIR}/${PN}-1.14.2-redeclared-ttyname.patch" eautoreconf } diff --git a/app-crypt/mit-krb5/mit-krb5-1.14.3.ebuild b/app-crypt/mit-krb5/mit-krb5-1.14.3.ebuild index 4a050ddc01edb..0a8a33547b964 100644 --- a/app-crypt/mit-krb5/mit-krb5-1.14.3.ebuild +++ b/app-crypt/mit-krb5/mit-krb5-1.14.3.ebuild @@ -58,6 +58,7 @@ MULTILIB_CHOST_TOOLS=( src_prepare() { epatch "${FILESDIR}/${PN}-1.12_warn_cflags.patch" epatch "${FILESDIR}/${PN}-config_LDFLAGS.patch" + epatch "${FILESDIR}/${PN}-1.14.2-redeclared-ttyname.patch" eautoreconf } diff --git a/app-crypt/mit-krb5/mit-krb5-1.14.4.ebuild b/app-crypt/mit-krb5/mit-krb5-1.14.4.ebuild index 9e3078865792d..0eff67b0c128f 100644 --- a/app-crypt/mit-krb5/mit-krb5-1.14.4.ebuild +++ b/app-crypt/mit-krb5/mit-krb5-1.14.4.ebuild @@ -58,6 +58,7 @@ MULTILIB_CHOST_TOOLS=( src_prepare() { epatch "${FILESDIR}/${PN}-1.12_warn_cflags.patch" epatch "${FILESDIR}/${PN}-config_LDFLAGS.patch" + epatch "${FILESDIR}/${PN}-1.14.2-redeclared-ttyname.patch" # Make sure we always use the system copies. rm -rf util/{et,ss,verto}