diff -Naurp /home/benda/gentoo/usr/portage/sys-auth/nss_ldap/files/nss_ldap-265-installdir.patch sys-auth/nss_ldap/files/nss_ldap-265-installdir.patch --- /home/benda/gentoo/usr/portage/sys-auth/nss_ldap/files/nss_ldap-265-installdir.patch 1970-01-01 00:00:00.000000000 +0000 +++ sys-auth/nss_ldap/files/nss_ldap-265-installdir.patch 2013-06-18 04:39:05.772895000 +0000 @@ -0,0 +1,35 @@ +Index: nss_ldap-265/Makefile.am +=================================================================== +--- nss_ldap-265.orig/Makefile.am ++++ nss_ldap-265/Makefile.am +@@ -38,17 +38,13 @@ NSS_LDAP_LDFLAGS = @NSS_LDAP_LDFLAGS@ + DEFS = @DEFS@ + #INCLUDES = -I$(top_builddir) -I$(srcdir) + +-if GCC +-MULTI_OS_DIRECTORY=$(shell $(CC) $(CFLAGS) -print-multi-os-directory) +-else + MULTI_OS_DIRECTORY=. +-endif + + if GLIBC +-LIBC_VERS = $(shell ls /lib/$(MULTI_OS_DIRECTORY)/libc-*.so | tail -n 1 | sed -e 's|.*libc-\(.*\)\.so|\1|') ++LIBC_VERS = $(shell ls @GENTOO_PORTAGE_EPREFIX@/lib/$(MULTI_OS_DIRECTORY)/libc-*.so | tail -n 1 | sed -e 's|.*libc-\(.*\)\.so|\1|') + NSS_LDAP_LIBC_VERSIONED = libnss_ldap-$(LIBC_VERS).so + +-NSS_VERS = $(shell ls /lib/$(MULTI_OS_DIRECTORY)/libnss_files.so.? | tail -n 1 | sed -e 's|.*libnss_files\.so\.\(.*\)|\1|') ++NSS_VERS = $(shell ls @GENTOO_PORTAGE_EPREFIX@/lib/$(MULTI_OS_DIRECTORY)/libnss_files.so.? | tail -n 1 | sed -e 's|.*libnss_files\.so\.\(.*\)|\1|') + NSS_LDAP_NSS_VERSIONED = libnss_ldap.so.$(NSS_VERS) + endif + +@@ -83,8 +79,8 @@ if GLIBC + $(mkinstalldirs) $(DESTDIR)$(libdir) + $(INSTALL_PROGRAM) -o $(INST_UID) -g $(INST_GID) nss_ldap.so $(DESTDIR)$(libdir)/$(NSS_LDAP_LIBC_VERSIONED) + (cd $(DESTDIR)$(libdir); ln -sf $(NSS_LDAP_LIBC_VERSIONED) $(NSS_LDAP_NSS_VERSIONED)) +- $(mkinstalldirs) $(DESTDIR)/usr$(libdir) +- (cd $(DESTDIR)/usr$(libdir); ln -sf ../..$(libdir)/$(NSS_LDAP_NSS_VERSIONED) .) ++ $(mkinstalldirs) $(DESTDIR)$(libdir:/lib=/usr/lib) ++ (cd $(DESTDIR)/$(libdir:/lib=/usr/lib); ln -sf ../../lib/$(NSS_LDAP_NSS_VERSIONED) .) + else + $(mkinstalldirs) $(DESTDIR)$(libdir) + if HPUX diff -Naurp /home/benda/gentoo/usr/portage/sys-auth/nss_ldap/files/nss_ldap-265-pthread.patch sys-auth/nss_ldap/files/nss_ldap-265-pthread.patch --- /home/benda/gentoo/usr/portage/sys-auth/nss_ldap/files/nss_ldap-265-pthread.patch 1970-01-01 00:00:00.000000000 +0000 +++ sys-auth/nss_ldap/files/nss_ldap-265-pthread.patch 2013-06-18 04:16:42.297458000 +0000 @@ -0,0 +1,481 @@ +Index: ldap-nss.c +=================================================================== +--- ldap-nss.c.orig ++++ ldap-nss.c +@@ -142,7 +142,7 @@ static void (*__sigpipe_handler) (int) = + */ + static ldap_session_t __session = { NULL, NULL, 0, LS_UNINITIALIZED }; + +-#if defined(HAVE_PTHREAD_ATFORK) || defined(HAVE_LIBC_LOCK_H) || defined(HAVE_BITS_LIBC_LOCK_H) ++#if defined(HAVE_PTHREAD_ATFORK) || defined(HAVE___LIBC_ONCE) + static pthread_once_t __once = PTHREAD_ONCE_INIT; + #endif + +@@ -150,7 +150,7 @@ static pthread_once_t __once = PTHREAD_O + static FILE *__debugfile; + #endif /* LBER_OPT_LOG_PRINT_FILE */ + +-#ifndef HAVE_PTHREAD_ATFORK ++#if !defined(HAVE_PTHREAD_ATFORK) || !defined(HAVE___LIBC_ONCE) + /* + * Process ID that opened the session. + */ +@@ -162,7 +162,7 @@ static uid_t __euid = -1; + static int __ssl_initialized = 0; + #endif /* HAVE_LDAPSSL_CLIENT_INIT */ + +-#if defined(HAVE_PTHREAD_ATFORK) || defined(HAVE_LIBC_LOCK_H) || defined(HAVE_BITS_LIBC_LOCK_H) ++#if defined(HAVE_PTHREAD_ATFORK) || defined(HAVE___LIBC_ONCE) + /* + * Prepare for fork(); lock mutex. + */ +@@ -513,7 +513,7 @@ _nss_ldap_default_constr (nss_ldap_backe + } + #endif /* HAVE_NSSWITCH_H */ + +-#if defined(HAVE_PTHREAD_ATFORK) || defined(HAVE_LIBC_LOCK_H) || defined(HAVE_BITS_LIBC_LOCK_H) ++#if defined(HAVE_PTHREAD_ATFORK) || defined(HAVE___LIBC_ONCE) + static void + do_atfork_prepare (void) + { +@@ -547,7 +547,7 @@ do_atfork_setup (void) + #ifdef HAVE_PTHREAD_ATFORK + (void) pthread_atfork (do_atfork_prepare, do_atfork_parent, + do_atfork_child); +-#elif defined(HAVE_LIBC_LOCK_H) || defined(HAVE_BITS_LIBC_LOCK_H) ++#elif defined(HAVE___LIBC_ATFORK) + (void) __libc_atfork (do_atfork_prepare, do_atfork_parent, do_atfork_child); + #endif + +@@ -1096,7 +1096,7 @@ static NSS_STATUS + do_init (void) + { + ldap_config_t *cfg; +-#ifndef HAVE_PTHREAD_ATFORK ++#if !defined(HAVE_PTHREAD_ATFORK) || !defined(HAVE___LIBC_ONCE) + pid_t pid; + #endif + uid_t euid; +@@ -1113,7 +1113,7 @@ do_init (void) + } + + #ifndef HAVE_PTHREAD_ATFORK +-#if defined(HAVE_LIBC_LOCK_H) || defined(HAVE_BITS_LIBC_LOCK_H) ++#if defined(HAVE___LIBC_ONCE) + /* + * This bogosity is necessary because Linux uses different + * PIDs for different threads (like IRIX, which we don't +@@ -1145,7 +1145,7 @@ do_init (void) + pid = -1; /* linked against libpthreads, don't care */ + #else + pid = getpid (); +-#endif /* HAVE_LIBC_LOCK_H || HAVE_BITS_LIBC_LOCK_H */ ++#endif /* HAVE___LIBC_ONCE */ + #endif /* HAVE_PTHREAD_ATFORK */ + + euid = geteuid (); +@@ -1155,7 +1155,7 @@ do_init (void) + syslog (LOG_DEBUG, + "nss_ldap: __session.ls_state=%d, __session.ls_conn=%p, __euid=%i, euid=%i", + __session.ls_state, __session.ls_conn, __euid, euid); +-#elif defined(HAVE_LIBC_LOCK_H) || defined(HAVE_BITS_LIBC_LOCK_H) ++#elif defined(HAVE___LIBC_ONCE) + syslog (LOG_DEBUG, + "nss_ldap: libpthreads=%s, __session.ls_state=%d, __session.ls_conn=%p, __pid=%i, pid=%i, __euid=%i, euid=%i", + ((__pthread_once == NULL || __pthread_atfork == NULL) ? "FALSE" : "TRUE"), +@@ -1179,11 +1179,11 @@ do_init (void) + } + else + #ifndef HAVE_PTHREAD_ATFORK +-#if defined(HAVE_LIBC_LOCK_H) || defined(HAVE_BITS_LIBC_LOCK_H) ++#if defined(HAVE___LIBC_ONCE) + if ((__pthread_once == NULL || __pthread_atfork == NULL) && __pid != pid) + #else + if (__pid != pid) +-#endif /* HAVE_LIBC_LOCK_H || HAVE_BITS_LIBC_LOCK_H */ ++#endif /* HAVE___LIBC_ONCE */ + { + do_close_no_unbind (); + } +@@ -1244,9 +1244,9 @@ do_init (void) + debug ("<== do_init (pthread_once failed)"); + return NSS_UNAVAIL; + } +-#elif defined(HAVE_PTHREAD_ATFORK) && ( defined(HAVE_LIBC_LOCK_H) || defined(HAVE_BITS_LIBC_LOCK_H) ) ++#elif defined(HAVE_PTHREAD_ATFORK) && defined(HAVE___LIBC_ONCE) + __libc_once (__once, do_atfork_setup); +-#elif defined(HAVE_LIBC_LOCK_H) || defined(HAVE_BITS_LIBC_LOCK_H) ++#elif defined(HAVE___LIBC_ONCE) + /* + * Only install the pthread_atfork() handlers i + * we are linked against libpthreads. Otherwise, +Index: ldap-nss.h +=================================================================== +--- ldap-nss.h.orig ++++ ldap-nss.h +@@ -670,7 +670,7 @@ extern int __multi_threaded; + #define NSS_LDAP_LOCK(m) mutex_lock(&m) + #define NSS_LDAP_UNLOCK(m) mutex_unlock(&m) + #define NSS_LDAP_DEFINE_LOCK(m) static mutex_t m = DEFAULTMUTEX +-#elif defined(HAVE_LIBC_LOCK_H) || defined(HAVE_BITS_LIBC_LOCK_H) ++#elif defined(HAVE___LIBC_LOCK_LOCK) && defined(HAVE___LIBC_LOCK_UNLOCK) + #define NSS_LDAP_LOCK(m) __libc_lock_lock(m) + #define NSS_LDAP_UNLOCK(m) __libc_lock_unlock(m) + #define NSS_LDAP_DEFINE_LOCK(m) static pthread_mutex_t m = PTHREAD_MUTEX_INITIALIZER +Index: configure.in +=================================================================== +--- configure.in.orig ++++ configure.in +@@ -1,6 +1,7 @@ + AC_INIT(ldap-nss.c) + AC_CANONICAL_SYSTEM + AC_PREFIX_DEFAULT() ++AC_CONFIG_MACRO_DIR([m4]) + + AM_INIT_AUTOMAKE(nss_ldap, 265) + AM_CONFIG_HEADER(config.h) +@@ -229,11 +230,18 @@ fi + AC_CHECK_FUNCS(snprintf) + AC_CHECK_FUNCS(gethostbyname) + AC_CHECK_FUNCS(nsdispatch) ++AC_CHECK_FUNCS(ether_aton) ++AC_CHECK_FUNCS(ether_ntoa) ++ ++AX_PTHREAD ++LIBS="$PTHREAD_LIBS $LIBS" ++CFLAGS="$CFLAGS $PTHREAD_CFLAGS" ++CC="$PTHREAD_CC" ++ + AC_CHECK_LIB(pthread_nonshared, main) + AC_CHECK_FUNCS(pthread_atfork) + AC_CHECK_FUNCS(pthread_once) +-AC_CHECK_FUNCS(ether_aton) +-AC_CHECK_FUNCS(ether_ntoa) ++AC_CHECK_FUNCS(__libc_once __libc_atfork __libc_lock_lock __libc_lock_unlock) + + AC_MSG_CHECKING(for struct ether_addr) + AC_TRY_COMPILE([#include +Index: m4/ax_pthread.m4 +=================================================================== +--- /dev/null ++++ m4/ax_pthread.m4 +@@ -0,0 +1,309 @@ ++# =========================================================================== ++# http://www.gnu.org/software/autoconf-archive/ax_pthread.html ++# =========================================================================== ++# ++# SYNOPSIS ++# ++# AX_PTHREAD([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]]) ++# ++# DESCRIPTION ++# ++# This macro figures out how to build C programs using POSIX threads. It ++# sets the PTHREAD_LIBS output variable to the threads library and linker ++# flags, and the PTHREAD_CFLAGS output variable to any special C compiler ++# flags that are needed. (The user can also force certain compiler ++# flags/libs to be tested by setting these environment variables.) ++# ++# Also sets PTHREAD_CC to any special C compiler that is needed for ++# multi-threaded programs (defaults to the value of CC otherwise). (This ++# is necessary on AIX to use the special cc_r compiler alias.) ++# ++# NOTE: You are assumed to not only compile your program with these flags, ++# but also link it with them as well. e.g. you should link with ++# $PTHREAD_CC $CFLAGS $PTHREAD_CFLAGS $LDFLAGS ... $PTHREAD_LIBS $LIBS ++# ++# If you are only building threads programs, you may wish to use these ++# variables in your default LIBS, CFLAGS, and CC: ++# ++# LIBS="$PTHREAD_LIBS $LIBS" ++# CFLAGS="$CFLAGS $PTHREAD_CFLAGS" ++# CC="$PTHREAD_CC" ++# ++# In addition, if the PTHREAD_CREATE_JOINABLE thread-attribute constant ++# has a nonstandard name, defines PTHREAD_CREATE_JOINABLE to that name ++# (e.g. PTHREAD_CREATE_UNDETACHED on AIX). ++# ++# Also HAVE_PTHREAD_PRIO_INHERIT is defined if pthread is found and the ++# PTHREAD_PRIO_INHERIT symbol is defined when compiling with ++# PTHREAD_CFLAGS. ++# ++# ACTION-IF-FOUND is a list of shell commands to run if a threads library ++# is found, and ACTION-IF-NOT-FOUND is a list of commands to run it if it ++# is not found. If ACTION-IF-FOUND is not specified, the default action ++# will define HAVE_PTHREAD. ++# ++# Please let the authors know if this macro fails on any platform, or if ++# you have any other suggestions or comments. This macro was based on work ++# by SGJ on autoconf scripts for FFTW (http://www.fftw.org/) (with help ++# from M. Frigo), as well as ac_pthread and hb_pthread macros posted by ++# Alejandro Forero Cuervo to the autoconf macro repository. We are also ++# grateful for the helpful feedback of numerous users. ++# ++# Updated for Autoconf 2.68 by Daniel Richard G. ++# ++# LICENSE ++# ++# Copyright (c) 2008 Steven G. Johnson ++# Copyright (c) 2011 Daniel Richard G. ++# ++# This program is free software: you can redistribute it and/or modify it ++# under the terms of the GNU General Public License as published by the ++# Free Software Foundation, either version 3 of the License, or (at your ++# option) any later version. ++# ++# This program is distributed in the hope that it will be useful, but ++# WITHOUT ANY WARRANTY; without even the implied warranty of ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General ++# Public License for more details. ++# ++# You should have received a copy of the GNU General Public License along ++# with this program. If not, see . ++# ++# As a special exception, the respective Autoconf Macro's copyright owner ++# gives unlimited permission to copy, distribute and modify the configure ++# scripts that are the output of Autoconf when processing the Macro. You ++# need not follow the terms of the GNU General Public License when using ++# or distributing such scripts, even though portions of the text of the ++# Macro appear in them. The GNU General Public License (GPL) does govern ++# all other use of the material that constitutes the Autoconf Macro. ++# ++# This special exception to the GPL applies to versions of the Autoconf ++# Macro released by the Autoconf Archive. When you make and distribute a ++# modified version of the Autoconf Macro, you may extend this special ++# exception to the GPL to apply to your modified version as well. ++ ++#serial 18 ++ ++AU_ALIAS([ACX_PTHREAD], [AX_PTHREAD]) ++AC_DEFUN([AX_PTHREAD], [ ++AC_REQUIRE([AC_CANONICAL_HOST]) ++AC_LANG_PUSH([C]) ++ax_pthread_ok=no ++ ++# We used to check for pthread.h first, but this fails if pthread.h ++# requires special compiler flags (e.g. on True64 or Sequent). ++# It gets checked for in the link test anyway. ++ ++# First of all, check if the user has set any of the PTHREAD_LIBS, ++# etcetera environment variables, and if threads linking works using ++# them: ++if test x"$PTHREAD_LIBS$PTHREAD_CFLAGS" != x; then ++ save_CFLAGS="$CFLAGS" ++ CFLAGS="$CFLAGS $PTHREAD_CFLAGS" ++ save_LIBS="$LIBS" ++ LIBS="$PTHREAD_LIBS $LIBS" ++ AC_MSG_CHECKING([for pthread_join in LIBS=$PTHREAD_LIBS with CFLAGS=$PTHREAD_CFLAGS]) ++ AC_TRY_LINK_FUNC(pthread_join, ax_pthread_ok=yes) ++ AC_MSG_RESULT($ax_pthread_ok) ++ if test x"$ax_pthread_ok" = xno; then ++ PTHREAD_LIBS="" ++ PTHREAD_CFLAGS="" ++ fi ++ LIBS="$save_LIBS" ++ CFLAGS="$save_CFLAGS" ++fi ++ ++# We must check for the threads library under a number of different ++# names; the ordering is very important because some systems ++# (e.g. DEC) have both -lpthread and -lpthreads, where one of the ++# libraries is broken (non-POSIX). ++ ++# Create a list of thread flags to try. Items starting with a "-" are ++# C compiler flags, and other items are library names, except for "none" ++# which indicates that we try without any flags at all, and "pthread-config" ++# which is a program returning the flags for the Pth emulation library. ++ ++ax_pthread_flags="pthreads none -Kthread -kthread lthread -pthread -pthreads -mthreads pthread --thread-safe -mt pthread-config" ++ ++# The ordering *is* (sometimes) important. Some notes on the ++# individual items follow: ++ ++# pthreads: AIX (must check this before -lpthread) ++# none: in case threads are in libc; should be tried before -Kthread and ++# other compiler flags to prevent continual compiler warnings ++# -Kthread: Sequent (threads in libc, but -Kthread needed for pthread.h) ++# -kthread: FreeBSD kernel threads (preferred to -pthread since SMP-able) ++# lthread: LinuxThreads port on FreeBSD (also preferred to -pthread) ++# -pthread: Linux/gcc (kernel threads), BSD/gcc (userland threads) ++# -pthreads: Solaris/gcc ++# -mthreads: Mingw32/gcc, Lynx/gcc ++# -mt: Sun Workshop C (may only link SunOS threads [-lthread], but it ++# doesn't hurt to check since this sometimes defines pthreads too; ++# also defines -D_REENTRANT) ++# ... -mt is also the pthreads flag for HP/aCC ++# pthread: Linux, etcetera ++# --thread-safe: KAI C++ ++# pthread-config: use pthread-config program (for GNU Pth library) ++ ++case ${host_os} in ++ solaris*) ++ ++ # On Solaris (at least, for some versions), libc contains stubbed ++ # (non-functional) versions of the pthreads routines, so link-based ++ # tests will erroneously succeed. (We need to link with -pthreads/-mt/ ++ # -lpthread.) (The stubs are missing pthread_cleanup_push, or rather ++ # a function called by this macro, so we could check for that, but ++ # who knows whether they'll stub that too in a future libc.) So, ++ # we'll just look for -pthreads and -lpthread first: ++ ++ ax_pthread_flags="-pthreads pthread -mt -pthread $ax_pthread_flags" ++ ;; ++ ++ darwin*) ++ ax_pthread_flags="-pthread $ax_pthread_flags" ++ ;; ++esac ++ ++if test x"$ax_pthread_ok" = xno; then ++for flag in $ax_pthread_flags; do ++ ++ case $flag in ++ none) ++ AC_MSG_CHECKING([whether pthreads work without any flags]) ++ ;; ++ ++ -*) ++ AC_MSG_CHECKING([whether pthreads work with $flag]) ++ PTHREAD_CFLAGS="$flag" ++ ;; ++ ++ pthread-config) ++ AC_CHECK_PROG(ax_pthread_config, pthread-config, yes, no) ++ if test x"$ax_pthread_config" = xno; then continue; fi ++ PTHREAD_CFLAGS="`pthread-config --cflags`" ++ PTHREAD_LIBS="`pthread-config --ldflags` `pthread-config --libs`" ++ ;; ++ ++ *) ++ AC_MSG_CHECKING([for the pthreads library -l$flag]) ++ PTHREAD_LIBS="-l$flag" ++ ;; ++ esac ++ ++ save_LIBS="$LIBS" ++ save_CFLAGS="$CFLAGS" ++ LIBS="$PTHREAD_LIBS $LIBS" ++ CFLAGS="$CFLAGS $PTHREAD_CFLAGS" ++ ++ # Check for various functions. We must include pthread.h, ++ # since some functions may be macros. (On the Sequent, we ++ # need a special flag -Kthread to make this header compile.) ++ # We check for pthread_join because it is in -lpthread on IRIX ++ # while pthread_create is in libc. We check for pthread_attr_init ++ # due to DEC craziness with -lpthreads. We check for ++ # pthread_cleanup_push because it is one of the few pthread ++ # functions on Solaris that doesn't have a non-functional libc stub. ++ # We try pthread_create on general principles. ++ AC_LINK_IFELSE([AC_LANG_PROGRAM([#include ++ static void routine(void *a) { a = 0; } ++ static void *start_routine(void *a) { return a; }], ++ [pthread_t th; pthread_attr_t attr; ++ pthread_create(&th, 0, start_routine, 0); ++ pthread_join(th, 0); ++ pthread_attr_init(&attr); ++ pthread_cleanup_push(routine, 0); ++ pthread_cleanup_pop(0) /* ; */])], ++ [ax_pthread_ok=yes], ++ []) ++ ++ LIBS="$save_LIBS" ++ CFLAGS="$save_CFLAGS" ++ ++ AC_MSG_RESULT($ax_pthread_ok) ++ if test "x$ax_pthread_ok" = xyes; then ++ break; ++ fi ++ ++ PTHREAD_LIBS="" ++ PTHREAD_CFLAGS="" ++done ++fi ++ ++# Various other checks: ++if test "x$ax_pthread_ok" = xyes; then ++ save_LIBS="$LIBS" ++ LIBS="$PTHREAD_LIBS $LIBS" ++ save_CFLAGS="$CFLAGS" ++ CFLAGS="$CFLAGS $PTHREAD_CFLAGS" ++ ++ # Detect AIX lossage: JOINABLE attribute is called UNDETACHED. ++ AC_MSG_CHECKING([for joinable pthread attribute]) ++ attr_name=unknown ++ for attr in PTHREAD_CREATE_JOINABLE PTHREAD_CREATE_UNDETACHED; do ++ AC_LINK_IFELSE([AC_LANG_PROGRAM([#include ], ++ [int attr = $attr; return attr /* ; */])], ++ [attr_name=$attr; break], ++ []) ++ done ++ AC_MSG_RESULT($attr_name) ++ if test "$attr_name" != PTHREAD_CREATE_JOINABLE; then ++ AC_DEFINE_UNQUOTED(PTHREAD_CREATE_JOINABLE, $attr_name, ++ [Define to necessary symbol if this constant ++ uses a non-standard name on your system.]) ++ fi ++ ++ AC_MSG_CHECKING([if more special flags are required for pthreads]) ++ flag=no ++ case ${host_os} in ++ aix* | freebsd* | darwin*) flag="-D_THREAD_SAFE";; ++ osf* | hpux*) flag="-D_REENTRANT";; ++ solaris*) ++ if test "$GCC" = "yes"; then ++ flag="-D_REENTRANT" ++ else ++ flag="-mt -D_REENTRANT" ++ fi ++ ;; ++ esac ++ AC_MSG_RESULT(${flag}) ++ if test "x$flag" != xno; then ++ PTHREAD_CFLAGS="$flag $PTHREAD_CFLAGS" ++ fi ++ ++ AC_CACHE_CHECK([for PTHREAD_PRIO_INHERIT], ++ ax_cv_PTHREAD_PRIO_INHERIT, [ ++ AC_LINK_IFELSE([ ++ AC_LANG_PROGRAM([[#include ]], [[int i = PTHREAD_PRIO_INHERIT;]])], ++ [ax_cv_PTHREAD_PRIO_INHERIT=yes], ++ [ax_cv_PTHREAD_PRIO_INHERIT=no]) ++ ]) ++ AS_IF([test "x$ax_cv_PTHREAD_PRIO_INHERIT" = "xyes"], ++ AC_DEFINE([HAVE_PTHREAD_PRIO_INHERIT], 1, [Have PTHREAD_PRIO_INHERIT.])) ++ ++ LIBS="$save_LIBS" ++ CFLAGS="$save_CFLAGS" ++ ++ # More AIX lossage: must compile with xlc_r or cc_r ++ if test x"$GCC" != xyes; then ++ AC_CHECK_PROGS(PTHREAD_CC, xlc_r cc_r, ${CC}) ++ else ++ PTHREAD_CC=$CC ++ fi ++else ++ PTHREAD_CC="$CC" ++fi ++ ++AC_SUBST(PTHREAD_LIBS) ++AC_SUBST(PTHREAD_CFLAGS) ++AC_SUBST(PTHREAD_CC) ++ ++# Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND: ++if test x"$ax_pthread_ok" = xyes; then ++ ifelse([$1],,AC_DEFINE(HAVE_PTHREAD,1,[Define if you have POSIX threads libraries and header files.]),[$1]) ++ : ++else ++ ax_pthread_ok=no ++ $2 ++fi ++AC_LANG_POP ++])dnl AX_PTHREAD +Index: Makefile.am +=================================================================== +--- Makefile.am.orig ++++ Makefile.am +@@ -1,3 +1,5 @@ ++ACLOCAL_AMFLAGS = -I m4 ++ + if AIX + authmod = NSS_LDAP + else diff -Naurp /home/benda/gentoo/usr/portage/sys-auth/nss_ldap/Manifest sys-auth/nss_ldap/Manifest --- /home/benda/gentoo/usr/portage/sys-auth/nss_ldap/Manifest 2012-09-30 17:33:53.000000000 +0000 +++ sys-auth/nss_ldap/Manifest 2013-06-18 04:40:40.820180000 +0000 @@ -1,6 +1,3 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 - AUX nss_ldap-239-tls-security-bug.patch 1022 SHA256 4915f034328c69dc1323cfec3a8d2e2e4eeb2a57590b0aeafa06f0cb3fafe5b4 SHA512 9700962f0844ed4e4695dd31efe2b654a646a644b401b282a0b23cb80a3eedde95b54a79cd7a9c25ea3ed319c178aef7edf84953a5cf6edbc5a4ac5bf805c603 WHIRLPOOL 18aa455bb4df4915dc75c37721d0a7682c1dcdd3d6cbf1b377789a8a9ec13ace19a4f70954afd9394033336c2d03ad7e69282bf8d48117ba28b05be21c1cd2cc AUX nss_ldap-249-sasl-compile.patch 282 SHA256 3da93087461fb970d5da9fe6b169f5493ca83ae2149cb03be9e8486bfcf437d6 SHA512 74af8f635a2bae5d901e685d0a9df3b92583b4480f0736b095df6091eac059226b91149d4b8a30a2ee60b948b55b87b8e6402d0e8fdcf1e84d384781c4880cea WHIRLPOOL 270c76def84be520d6c03296f186ad60eeb0cf7480682b099dc3f8ee9b6bbc86b3fdf8d199ebe907ea8f377d2a0289d609cf8b7cf9cc5115b5aaee3b1e823dc6 AUX nss_ldap-252-reconnect-timeouts.patch 3169 SHA256 9867267fb7ae1e08f3aa872f3682b12855465bf5bfc9407d75935e54678ab90f SHA512 c3a282d422792830e8572baa05ec58868c3cda7a80591e06c54bc3fc07cabba32f2a9fbe428a5a2f9c6e76eca5c475d200ca113c58ad2cbba290adadf41de4b9 WHIRLPOOL f03073d41a71730ce1a38d90fc2ce19b1dfc63d1dc04c93b6684a6437943333c971528caa1f73f53afe0639b11d869906ab35654167a2c0361d8430f0edc226c @@ -9,6 +6,8 @@ AUX nss_ldap-254-soname.patch 604 SHA256 AUX nss_ldap-257-nss_max_group_depth.patch 3551 SHA256 66286a3d097b2ac425bd7f6078701a8f5b357ee535284d3faa4e0783b974fa37 SHA512 7810f8c053c8f6b01cc61bb1953441d457bc6d90b4e985d03f6c7e8a7ef60225c86dfa0248fe1107955418a3ed205b52510fd2bee07fefc1c559300a1417d1de WHIRLPOOL afdcf317d8fad283f66008546c0858a78c0e259aa2cc5dcb881d527b3e5a319e1c0ee41bd2e429e0057aeecfa22eeacce5b2eee88e1c98c09b42e302f4409dd2 AUX nss_ldap-257.2-gssapi-headers.patch 2343 SHA256 1b920cfc6b5d62408fee019cdf8491a8cbc9884344775d9fb57cd8a419d32fd5 SHA512 51acfb4879c242582fc6f4d8543b96ff5e2e36e5bfacc3e8d8f1648f77a16957bbb7da0fa8d09ee1eea0ea19d81b0511ce72cc1c91ca2c68709203ec60369dde WHIRLPOOL b2e40760256bf9805b718d0aba40c9d00dcd6e9a5183491ccaa4398ec580c74aa53b7025d2ab460cdaa2dee13a04bbae391f21605ba3eaae27482bb7e66845bd AUX nss_ldap-264-disable-automagic.patch 4357 SHA256 7e8fbaa80a3174b68991d232a214af9e6f7eae7e7aaedd92d200828a8510d0e6 SHA512 4d7fc328f90dfc189ee0784db0298434b9a91ed5a9b2828dd94c2632c2116193e22df737de9ff7044746b337c47744284371aa4f32b83be61c5f0ec86edb7d35 WHIRLPOOL 85770ba891d1e11937d253a71d8e9b3939f62fcebc82dfacabf82f7a5cfdc8ff343f58f8438a130c500c1598e7ab60cce84b87f5c073a1b00087e588fc62252d +AUX nss_ldap-265-installdir.patch 1626 SHA256 68614bf9b3c6599e06a8ee2300ab9ab7266395605c683844b5ef4dd68d252b6e SHA512 7e86ff4fff320ef8132fff6f317dc58641845327c4de9be3b0d41004d27dab41fcc8752987682cee0b8e22230ab1034f0cf45a84ec405706aa37d499bbcc70b8 WHIRLPOOL 9ccd812f8a4f6d404d7fa1c6da0d9fa55caeef18e0d78b81298cc8a0468affef5dc6d9601ebb0ee1761be7a1098c12cded51ce5c4a1a47bc02a8c96aea68e855 +AUX nss_ldap-265-pthread.patch 18698 SHA256 403d00a198f48fe5edda31fba3b09ab8898007e2885e110870b50400cb274610 SHA512 2afc8a8ee20043985b739923a4c7472f0e13c6854de6d3023ac6c843d3ba6ecf4cf7ee21da4d8dad907f27ab476eec646fa4603d8be725f079f60a4a220c025d WHIRLPOOL 4e37264f2dee13846cfac74e88d0b09ac7020e4fc04a04f1bdca0c5fab431852cd8028959ad43478ff5cc06731f6a4b8f41a29d21e1372abec98e60f9ef9a170 AUX nss_ldap-265-reconnect-timeouts.patch 2806 SHA256 f1d3a308aac80fc1f33d4087a7839e01e45ece3aed284378adecb537bdcc53c3 SHA512 d9767cfaf32b9041d222c7b313c327a72ac2766d26fed7ce19cc1acff56cf2493d4e1e83b33852083505952f983ba64c00409e3cf09dcbf74676390968dd935b WHIRLPOOL c92858995a2d9950f47ad56a848d88470d829ecda81d5c83a55f9eb179d89750d382b05185502fae116aec9073a2115a2ceb70e13048d99b66ebf2126b656281 AUX nsswitch.ldap.diff 575 SHA256 f3bf121d1fa4e3c0119d36ddd2445bcbbd955e2b7fe2f0fe65ebaa6d2808c43e SHA512 0d08d4dacea0213714cab864300e625158106245eeb34a7d4b983749dd4fa4156d3f36d6c2dd214efdf80cf926c37657eb00651bceb89907286a3310123399a0 WHIRLPOOL f03a8bbda19e40a4d4d6352c0f496bd32ed6e4001b14c5e169fd16638467602c2ca4620d819cfd3aa29844192f1cb5367190f2df30f920ddeec716062558cb80 DIST nss_ldap-258.tar.gz 274694 SHA256 afa3bb64cd29557e775219585655721ac220de5804d95d0c307dab86f2308346 @@ -23,14 +22,7 @@ EBUILD nss_ldap-261.ebuild 2499 SHA256 1 EBUILD nss_ldap-262.ebuild 2499 SHA256 36846bd0eeccab737c054f2f94f4e8fdb14b545993bd70c910425e0bb6f15c29 SHA512 8a30cba2b7d45e5df949e802aa6f988f5a422379140781a40154bff9b2100ecf5d3c194fff252aa36db60965f5ade53ead27dc8149ace5510daccc69ffa7eb28 WHIRLPOOL 875696aefe62cd5002023d52f30e825e737476197345e7a0cc21fc9c5a8faf523dec852ed6f884414720489d0670e570abe395ca6d24a5d5c9bba5b622c1356a EBUILD nss_ldap-264-r1.ebuild 2732 SHA256 ee3d43ad22bd71718fa710c55c3c0cb5ef976ceb08c95618a3fd7bcc72672caf SHA512 d59e852705ee60629f420ecb2534348e0c3054c379749ba38096cba0fbd7c1801de215f101684ad657665beeeb6cc246da483982a256b91a7c06c4b71a966bf9 WHIRLPOOL d9e1728c814c4f99fe9f178383c72b32c8bdaa7df20761b28a37fa120bf2fb32088dee49c66071e6de290ed54baa4f4a4ed1748487174a539bbc5960cf535bb2 EBUILD nss_ldap-264.ebuild 2670 SHA256 ca86d085fe02f4d5fd723ac6d7b1c9f8ee87296e6e695d2d3437c9fbfdca81ef SHA512 6f5442086ee653310bd553c1a9071300d741bf13b4e6fdb6e6ff03051e580537a70f8fa07f39b9395d8bf7d8903692bb694fb14df2a897a085273a0857d20a10 WHIRLPOOL c9ad055b7c7f1553679cf4dff8798a2b4ace11a690130ff7cbda6a032d799103ea612f5782d150ceeb6d24931e03a297f04aacef406d0a8b3c486d30b7c73f41 -EBUILD nss_ldap-265-r1.ebuild 3070 SHA256 1443cfc59b95bc122408f718004809b695e260d2c46be82a6d5e76eaf1c19cd7 SHA512 1dd3e117f96a53b9d1600fdc0cd606dfaac2e8391ad2eaf49f1e283075e1df88d9601b760928baeb35dde00c474619da02af13c1cd52a21773dd2cae5632e8fe WHIRLPOOL 94a17838db43446afbdcf28705df2b226d346fcedc4dd27209c6db23da565b3c230dbb75a6d8f33a4a9b6291544468ec53535dc63c9482f11b7c5da7d46d4141 +EBUILD nss_ldap-265-r1.ebuild 3215 SHA256 45ef92aae7124285da308bb6bbac635450a22bab2ff0117c0903c62c90fe2ad4 SHA512 4230ff3ed9e93577f811eab387e2d94ee1615fa60dc12db65d727afbe26e32a5330de8b746d16a583bac409fdaee0e71f98372ac10d163aedac0abe65ee7e75d WHIRLPOOL 45c9ae48ffa127e6037ff7141fa1f031b69afe3d4a725847652a44e939b9a56146eaccdb750eb1519571f6c5efdce304c2e4859e9c05bb9e52fb3d808e2fd519 EBUILD nss_ldap-265.ebuild 2814 SHA256 ed202b2c56cd1f1951c189d821e2ea3fa39b037ccdcbf2d80c4fae4b1ef76f03 SHA512 a1ff63edc5968f1a5697658bdd00d7eefa598da0c341b306612ee18c5bf97eda3363cbe74e191a9cd1a7b69135e45957618cb78675dc109e963491b9105d89d7 WHIRLPOOL dd1d0aef260c530eeaf1edeb05f0dc740c5ddb0f65a05e305a56f7a802d3cd38b18bdcb6483c783b284cb6cdec279dd5ebea86f9b057e5e69e18c171f80e234d MISC ChangeLog 17540 SHA256 0813e560491eb4da02424469630c47fd610dac1f6b73486197259ea8cdf4a24b SHA512 fe237a8eb95158fcb5a2ac24aec516ad23054385f200f3390a49436c4bc247058b6ceec7a8a017c7eeb76c50dd70e86e356d818c2a5396b9b4e6c970367bb21c WHIRLPOOL 007ad54451b90019c2aa2bdf635f4570de265285860c008292b19e60f0f1e9f6988d3f18cc25122a1e20111359fd6bc310732fa55d747089cfc2c74d6bf3bee2 MISC metadata.xml 353 SHA256 15eaadcd2984ab57a485030b49064540994a63df14ec3b6ce0dc18f65044fb00 SHA512 7c6c055419cc9b7e9cfd9b80398f5ec80f5db1306a3af235759acdb0255b6dc9c50a3d1e175ebfca4cae98d37e620201617fa33845bb3d7b8d54074c911ca5a1 WHIRLPOOL 7da63e48fb2e42a4e9ddac030b4fc57793e86faba11a6ee43d49b9b4cc3e71d92ae5454c0bc3eed68253798ca93e7b13ef5986078e1d9cc961dea318fca48ee0 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.19 (GNU/Linux) - -iEYEAREIAAYFAlBofdIACgkQuQc30/atMkCgVACfc1iYXUjWy+UOxjosil//G8V/ -AEQAoMCs3OvdScmsThAEtx/sP2JWNPXT -=k8xi ------END PGP SIGNATURE----- diff -Naurp /home/benda/gentoo/usr/portage/sys-auth/nss_ldap/nss_ldap-265-r1.ebuild sys-auth/nss_ldap/nss_ldap-265-r1.ebuild --- /home/benda/gentoo/usr/portage/sys-auth/nss_ldap/nss_ldap-265-r1.ebuild 2012-09-30 17:33:53.000000000 +0000 +++ sys-auth/nss_ldap/nss_ldap-265-r1.ebuild 2013-06-18 04:40:28.699212000 +0000 @@ -2,8 +2,8 @@ # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/sys-auth/nss_ldap/nss_ldap-265-r1.ebuild,v 1.8 2012/09/30 17:13:47 armin76 Exp $ -EAPI=2 -inherit fixheadtails eutils multilib autotools +EAPI=5 +inherit fixheadtails eutils multilib autotools prefix IUSE="debug ssl sasl kerberos" @@ -13,7 +13,7 @@ SRC_URI="http://www.padl.com/download/${ SLOT="0" LICENSE="LGPL-2" -KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86" +KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux" DEPEND=">=net-nds/openldap-2.1.30-r5 sasl? ( dev-libs/cyrus-sasl ) @@ -23,6 +23,14 @@ RDEPEND="${DEPEND} !>"${D}"/etc/ldap.conf - echo >>"${D}"/etc/ldap.conf - sed -i "${D}"/etc/ldap.conf \ - -e '$inss_initgroups_ignoreusers ldap,openldap,mysql,syslog,root,postgres' \ - || die "failed to sed /etc/ldap.conf" + echo >>"${ED}"/etc/ldap.conf + echo >>"${ED}"/etc/ldap.conf + sed -i "${ED}"/etc/ldap.conf \ + -e '$inss_initgroups_ignoreusers ldap,openldap,mysql,syslog,root,postgres' dodoc ldap.conf ANNOUNCE NEWS ChangeLog AUTHORS \ COPYING CVSVersionInfo.txt README nsswitch.ldap certutil