The setupterm patch fixes bug #124405 by Juergen Rose. The pthreads and robusgnu patches were submitted in bug #125966 by Jose daLuz. Sorry for the delay on both

Package-Manager: portage-2.1_rc1-r3

5 files changed, 107 insertions, 0 deletions

diff --git a/app-crypt/mit-krb5/files/digest-mit-krb5-1.4.3 b/app-crypt/mit-krb5/files/digest-mit-krb5-1.4.3
index a170b9e504a3..ecbc87ab159a 100644
--- a/app-crypt/mit-krb5/files/digest-mit-krb5-1.4.3
+++ b/app-crypt/mit-krb5/files/digest-mit-krb5-1.4.3
@@ -1 +1,3 @@
 MD5 6c805139a4108fbb82fa4adba557a448 krb5-1.4.3-signed.tar 7290880
+RMD160 838425b59bf37da69c927eb346be78d059fa6db7 krb5-1.4.3-signed.tar 7290880
+SHA256 86f246877cc912ae6a82b6bb16217e54ec31fe46ae33a39a42b3f062bb5e6cbe krb5-1.4.3-signed.tar 7290880
diff --git a/app-crypt/mit-krb5/files/digest-mit-krb5-1.4.3-r1 b/app-crypt/mit-krb5/files/digest-mit-krb5-1.4.3-r1
new file mode 100644
index 000000000000..ecbc87ab159a
--- /dev/null
+++ b/app-crypt/mit-krb5/files/digest-mit-krb5-1.4.3-r1
@@ -0,0 +1,3 @@
+MD5 6c805139a4108fbb82fa4adba557a448 krb5-1.4.3-signed.tar 7290880
+RMD160 838425b59bf37da69c927eb346be78d059fa6db7 krb5-1.4.3-signed.tar 7290880
+SHA256 86f246877cc912ae6a82b6bb16217e54ec31fe46ae33a39a42b3f062bb5e6cbe krb5-1.4.3-signed.tar 7290880
diff --git a/app-crypt/mit-krb5/files/mit-krb5-pthreads.patch b/app-crypt/mit-krb5/files/mit-krb5-pthreads.patch
new file mode 100644
index 000000000000..726dfa4bf323
--- /dev/null
+++ b/app-crypt/mit-krb5/files/mit-krb5-pthreads.patch
@@ -0,0 +1,29 @@
+--- krb5-1.4.3/src/aclocal.m4	2006-01-19 18:56:17.000000000 -0500
++++ krb5-1.4.3/src/aclocal.m4	2006-01-19 18:56:11.000000000 -0500
+@@ -171,7 +171,14 @@
+ dnl reference support we can figure out whether or not the pthread library
+ dnl has been linked in.
+ dnl If we don't add any libraries for thread support, don't bother.
+-AC_CHECK_FUNCS(pthread_once pthread_mutexattr_setrobust_np pthread_rwlock_init)
++for fn in pthread_once pthread_mutexattr_setrobust_np pthread_rwlock_init ; do
++	AC_CHECK_DECLS($fn,,,[
++	#ifdef HAVE_PTHREAD
++	#include <pthread.h>
++	#endif
++	])
++	AC_CHECK_FUNCS($fn)
++done
+ old_CC="$CC"
+ test "$PTHREAD_CC" != "" && test "$ac_cv_c_compiler_gnu" = no && CC=$PTHREAD_CC
+ old_CFLAGS="$CFLAGS"
+--- krb5-1.4.3/src/util/support/threads.c	2005-08-12 16:57:07.000000000 -0400
++++ krb5-1.4.3/src/util/support/threads.c	2006-01-19 19:00:59.000000000 -0500
+@@ -141,7 +141,7 @@
+ 	|| &pthread_equal == 0
+ 	/* This catches Solaris 9.  May be redundant with the above
+ 	   tests now.  */
+-# ifdef HAVE_PTHREAD_MUTEXATTR_SETROBUST_NP_IN_THREAD_LIB
++# if defined(HAVE_PTHREAD_MUTEXATTR_SETROBUST_NP_IN_THREAD_LIB) && HAVE_DECL_PTHREAD_MUTEXATTR_SETROBUST_NP
+ 	|| &pthread_mutexattr_setrobust_np == 0
+ # endif
+ 	/* Any program that's really multithreaded will have to be
diff --git a/app-crypt/mit-krb5/files/mit-krb5-robustgnu.patch b/app-crypt/mit-krb5/files/mit-krb5-robustgnu.patch
new file mode 100644
index 000000000000..73cafbd1a76d
--- /dev/null
+++ b/app-crypt/mit-krb5/files/mit-krb5-robustgnu.patch
@@ -0,0 +1,53 @@
+diff -ru krb5-1.4.3.orig/src/aclocal.m4 krb5-1.4.3/src/aclocal.m4
+--- krb5-1.4.3.orig/src/aclocal.m4	2005-09-22 13:16:11.000000000 -0400
++++ krb5-1.4.3/src/aclocal.m4	2006-03-26 09:50:10.000000000 -0500
+@@ -182,7 +182,10 @@
+ LIBS="$PTHREAD_LIBS $LIBS"
+ AC_MSG_NOTICE(rechecking with PTHREAD_... options)
+ AC_CHECK_LIB(c, pthread_mutexattr_setrobust_np,
+-  [AC_DEFINE(HAVE_PTHREAD_MUTEXATTR_SETROBUST_NP_IN_THREAD_LIB,1,[Define if pthread_mutexattr_setrobust_np is provided in the thread library.])])
++  [AC_DEFINE(HAVE_PTHREAD_MUTEXATTR_SETROBUST_NP_IN_THREAD_LIB,1,[Define if pthread_mutexattr_setrobust_np is provided in the thread library.])
++# pthread_mutexattr_setrobust_np is declared as a GNU extension on GNU libc
++  PTHREAD_CFLAGS="$PTHREAD_CFLAGS -D_GNU_SOURCE"
++  ])
+ AC_CHECK_LIB(c, pthread_rwlock_init,
+   [AC_DEFINE(HAVE_PTHREAD_RWLOCK_INIT_IN_THREAD_LIB,1,[Define if pthread_rwlock_init is provided in the thread library.])])
+ LIBS="$old_LIBS"
+diff -ru krb5-1.4.3.orig/src/configure.in krb5-1.4.3/src/configure.in
+--- krb5-1.4.3.orig/src/configure.in	2005-07-18 18:12:43.000000000 -0400
++++ krb5-1.4.3/src/configure.in	2006-03-26 09:50:16.000000000 -0500
+@@ -66,14 +66,7 @@
+ dnl for kdc
+ AC_CHECK_HEADERS(syslog.h stdarg.h sys/select.h sys/sockio.h ifaddrs.h unistd.h)
+ AC_CHECK_FUNCS(openlog syslog closelog strftime vsprintf)
+-KRB5_NEED_PROTO([#include <string.h>
+-#ifdef HAVE_UNISTD_H
+-#include <unistd.h>
+-#endif
+-/* Solaris 8 declares swab in stdlib.h.  */
+-#include <stdlib.h>
+-],swab,1)
+-dnl
++
+ AC_PROG_AWK
+ KRB5_AC_INET6
+ KRB5_SOCKADDR_SA_LEN
+@@ -160,6 +153,18 @@
+   fi # tsmissing not empty
+ fi # enable_thread_support
+ dnl
++# The _GNU_SOURCE for pthread_mutex_attr_setrobust_np creates a clash with 
++# with the swab declaration 
++if echo "$PTHREAD_CFLAGS" | test ! grep _GNU_SOURCE; then
++KRB5_NEED_PROTO([#include <string.h>
++#ifdef HAVE_UNISTD_H
++#include <unistd.h>
++#endif
++/* Solaris 8 declares swab in stdlib.h.  */
++#include <stdlib.h>
++],swab,1)
++fi
++dnl
+ HOST_TYPE=$krb5_cv_host
+ AC_SUBST(HOST_TYPE)
+ dnl
diff --git a/app-crypt/mit-krb5/files/mit-krb5-setupterm.patch b/app-crypt/mit-krb5/files/mit-krb5-setupterm.patch
new file mode 100644
index 000000000000..3c81382460c9
--- /dev/null
+++ b/app-crypt/mit-krb5/files/mit-krb5-setupterm.patch
@@ -0,0 +1,20 @@
+--- krb5-1.4.3/src/appl/telnet/configure.in.orig	2006-05-21 16:28:39.187870750 -0400
++++ krb5-1.4.3/src/appl/telnet/configure.in	2006-05-21 16:29:26.758843750 -0400
+@@ -50,7 +50,7 @@
+ #endif
+ ])
+ dnl
+-AC_CHECK_LIB(termcap,main,AC_DEFINE(TERMCAP)
++AC_CHECK_LIB(termcap,setupterm,AC_DEFINE(TERMCAP)
+ LIBS="$LIBS -ltermcap",
+   AC_CHECK_LIB(curses,setupterm,LIBS="$LIBS -lcurses",
+   AC_CHECK_LIB(ncurses,setupterm,LIBS="$LIBS -lncurses")
+@@ -96,7 +96,7 @@
+ dnl from old telnetd/configure.in
+ dnl
+ dnl AC_PROG_INSTALL
+-AC_CHECK_LIB(termcap,main,AC_DEFINE(TERMCAP)
++AC_CHECK_LIB(termcap,setupterm,AC_DEFINE(TERMCAP)
+ LIBS="$LIBS -ltermcap",
+   AC_CHECK_LIB(curses,setupterm,LIBS="$LIBS -lcurses",
+   AC_CHECK_LIB(ncurses,setupterm,LIBS="$LIBS -lncurses")