Attachment #351284 for bug #438692




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




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 <sys/types.h>
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 <stevenj@alum.mit.edu>
+#   Copyright (c) 2011 Daniel Richard G. <skunk@iSKUNK.ORG>
+#
+#   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 <http://www.gnu.org/licenses/>.
+#
+#   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 <pthread.h>
+                        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 <pthread.h>],
+                           [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 <pthread.h>]], [[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

Lines 1-6 Link Here

(-)/home/benda/gentoo/usr/portage/sys-auth/nss_ldap/Manifest (-11 / +3 lines)
1	-----BEGIN PGP SIGNED MESSAGE-----
2	Hash: SHA256
3
4	AUX nss_ldap-239-tls-security-bug.patch 1022 SHA256 4915f034328c69dc1323cfec3a8d2e2e4eeb2a57590b0aeafa06f0cb3fafe5b4 SHA512 9700962f0844ed4e4695dd31efe2b654a646a644b401b282a0b23cb80a3eedde95b54a79cd7a9c25ea3ed319c178aef7edf84953a5cf6edbc5a4ac5bf805c603 WHIRLPOOL 18aa455bb4df4915dc75c37721d0a7682c1dcdd3d6cbf1b377789a8a9ec13ace19a4f70954afd9394033336c2d03ad7e69282bf8d48117ba28b05be21c1cd2cc	1	AUX nss_ldap-239-tls-security-bug.patch 1022 SHA256 4915f034328c69dc1323cfec3a8d2e2e4eeb2a57590b0aeafa06f0cb3fafe5b4 SHA512 9700962f0844ed4e4695dd31efe2b654a646a644b401b282a0b23cb80a3eedde95b54a79cd7a9c25ea3ed319c178aef7edf84953a5cf6edbc5a4ac5bf805c603 WHIRLPOOL 18aa455bb4df4915dc75c37721d0a7682c1dcdd3d6cbf1b377789a8a9ec13ace19a4f70954afd9394033336c2d03ad7e69282bf8d48117ba28b05be21c1cd2cc
5	AUX nss_ldap-249-sasl-compile.patch 282 SHA256 3da93087461fb970d5da9fe6b169f5493ca83ae2149cb03be9e8486bfcf437d6 SHA512 74af8f635a2bae5d901e685d0a9df3b92583b4480f0736b095df6091eac059226b91149d4b8a30a2ee60b948b55b87b8e6402d0e8fdcf1e84d384781c4880cea WHIRLPOOL 270c76def84be520d6c03296f186ad60eeb0cf7480682b099dc3f8ee9b6bbc86b3fdf8d199ebe907ea8f377d2a0289d609cf8b7cf9cc5115b5aaee3b1e823dc6	2	AUX nss_ldap-249-sasl-compile.patch 282 SHA256 3da93087461fb970d5da9fe6b169f5493ca83ae2149cb03be9e8486bfcf437d6 SHA512 74af8f635a2bae5d901e685d0a9df3b92583b4480f0736b095df6091eac059226b91149d4b8a30a2ee60b948b55b87b8e6402d0e8fdcf1e84d384781c4880cea WHIRLPOOL 270c76def84be520d6c03296f186ad60eeb0cf7480682b099dc3f8ee9b6bbc86b3fdf8d199ebe907ea8f377d2a0289d609cf8b7cf9cc5115b5aaee3b1e823dc6
6	AUX nss_ldap-252-reconnect-timeouts.patch 3169 SHA256 9867267fb7ae1e08f3aa872f3682b12855465bf5bfc9407d75935e54678ab90f SHA512 c3a282d422792830e8572baa05ec58868c3cda7a80591e06c54bc3fc07cabba32f2a9fbe428a5a2f9c6e76eca5c475d200ca113c58ad2cbba290adadf41de4b9 WHIRLPOOL f03073d41a71730ce1a38d90fc2ce19b1dfc63d1dc04c93b6684a6437943333c971528caa1f73f53afe0639b11d869906ab35654167a2c0361d8430f0edc226c	3	AUX nss_ldap-252-reconnect-timeouts.patch 3169 SHA256 9867267fb7ae1e08f3aa872f3682b12855465bf5bfc9407d75935e54678ab90f SHA512 c3a282d422792830e8572baa05ec58868c3cda7a80591e06c54bc3fc07cabba32f2a9fbe428a5a2f9c6e76eca5c475d200ca113c58ad2cbba290adadf41de4b9 WHIRLPOOL f03073d41a71730ce1a38d90fc2ce19b1dfc63d1dc04c93b6684a6437943333c971528caa1f73f53afe0639b11d869906ab35654167a2c0361d8430f0edc226c
Lines 9-14 AUX nss_ldap-254-soname.patch 604 SHA256 Link Here
9	AUX nss_ldap-257-nss_max_group_depth.patch 3551 SHA256 66286a3d097b2ac425bd7f6078701a8f5b357ee535284d3faa4e0783b974fa37 SHA512 7810f8c053c8f6b01cc61bb1953441d457bc6d90b4e985d03f6c7e8a7ef60225c86dfa0248fe1107955418a3ed205b52510fd2bee07fefc1c559300a1417d1de WHIRLPOOL afdcf317d8fad283f66008546c0858a78c0e259aa2cc5dcb881d527b3e5a319e1c0ee41bd2e429e0057aeecfa22eeacce5b2eee88e1c98c09b42e302f4409dd2	6	AUX nss_ldap-257-nss_max_group_depth.patch 3551 SHA256 66286a3d097b2ac425bd7f6078701a8f5b357ee535284d3faa4e0783b974fa37 SHA512 7810f8c053c8f6b01cc61bb1953441d457bc6d90b4e985d03f6c7e8a7ef60225c86dfa0248fe1107955418a3ed205b52510fd2bee07fefc1c559300a1417d1de WHIRLPOOL afdcf317d8fad283f66008546c0858a78c0e259aa2cc5dcb881d527b3e5a319e1c0ee41bd2e429e0057aeecfa22eeacce5b2eee88e1c98c09b42e302f4409dd2
10	AUX nss_ldap-257.2-gssapi-headers.patch 2343 SHA256 1b920cfc6b5d62408fee019cdf8491a8cbc9884344775d9fb57cd8a419d32fd5 SHA512 51acfb4879c242582fc6f4d8543b96ff5e2e36e5bfacc3e8d8f1648f77a16957bbb7da0fa8d09ee1eea0ea19d81b0511ce72cc1c91ca2c68709203ec60369dde WHIRLPOOL b2e40760256bf9805b718d0aba40c9d00dcd6e9a5183491ccaa4398ec580c74aa53b7025d2ab460cdaa2dee13a04bbae391f21605ba3eaae27482bb7e66845bd	7	AUX nss_ldap-257.2-gssapi-headers.patch 2343 SHA256 1b920cfc6b5d62408fee019cdf8491a8cbc9884344775d9fb57cd8a419d32fd5 SHA512 51acfb4879c242582fc6f4d8543b96ff5e2e36e5bfacc3e8d8f1648f77a16957bbb7da0fa8d09ee1eea0ea19d81b0511ce72cc1c91ca2c68709203ec60369dde WHIRLPOOL b2e40760256bf9805b718d0aba40c9d00dcd6e9a5183491ccaa4398ec580c74aa53b7025d2ab460cdaa2dee13a04bbae391f21605ba3eaae27482bb7e66845bd
11	AUX nss_ldap-264-disable-automagic.patch 4357 SHA256 7e8fbaa80a3174b68991d232a214af9e6f7eae7e7aaedd92d200828a8510d0e6 SHA512 4d7fc328f90dfc189ee0784db0298434b9a91ed5a9b2828dd94c2632c2116193e22df737de9ff7044746b337c47744284371aa4f32b83be61c5f0ec86edb7d35 WHIRLPOOL 85770ba891d1e11937d253a71d8e9b3939f62fcebc82dfacabf82f7a5cfdc8ff343f58f8438a130c500c1598e7ab60cce84b87f5c073a1b00087e588fc62252d	8	AUX nss_ldap-264-disable-automagic.patch 4357 SHA256 7e8fbaa80a3174b68991d232a214af9e6f7eae7e7aaedd92d200828a8510d0e6 SHA512 4d7fc328f90dfc189ee0784db0298434b9a91ed5a9b2828dd94c2632c2116193e22df737de9ff7044746b337c47744284371aa4f32b83be61c5f0ec86edb7d35 WHIRLPOOL 85770ba891d1e11937d253a71d8e9b3939f62fcebc82dfacabf82f7a5cfdc8ff343f58f8438a130c500c1598e7ab60cce84b87f5c073a1b00087e588fc62252d
		9	AUX nss_ldap-265-installdir.patch 1626 SHA256 68614bf9b3c6599e06a8ee2300ab9ab7266395605c683844b5ef4dd68d252b6e SHA512 7e86ff4fff320ef8132fff6f317dc58641845327c4de9be3b0d41004d27dab41fcc8752987682cee0b8e22230ab1034f0cf45a84ec405706aa37d499bbcc70b8 WHIRLPOOL 9ccd812f8a4f6d404d7fa1c6da0d9fa55caeef18e0d78b81298cc8a0468affef5dc6d9601ebb0ee1761be7a1098c12cded51ce5c4a1a47bc02a8c96aea68e855
		10	AUX nss_ldap-265-pthread.patch 18698 SHA256 403d00a198f48fe5edda31fba3b09ab8898007e2885e110870b50400cb274610 SHA512 2afc8a8ee20043985b739923a4c7472f0e13c6854de6d3023ac6c843d3ba6ecf4cf7ee21da4d8dad907f27ab476eec646fa4603d8be725f079f60a4a220c025d WHIRLPOOL 4e37264f2dee13846cfac74e88d0b09ac7020e4fc04a04f1bdca0c5fab431852cd8028959ad43478ff5cc06731f6a4b8f41a29d21e1372abec98e60f9ef9a170
12	AUX nss_ldap-265-reconnect-timeouts.patch 2806 SHA256 f1d3a308aac80fc1f33d4087a7839e01e45ece3aed284378adecb537bdcc53c3 SHA512 d9767cfaf32b9041d222c7b313c327a72ac2766d26fed7ce19cc1acff56cf2493d4e1e83b33852083505952f983ba64c00409e3cf09dcbf74676390968dd935b WHIRLPOOL c92858995a2d9950f47ad56a848d88470d829ecda81d5c83a55f9eb179d89750d382b05185502fae116aec9073a2115a2ceb70e13048d99b66ebf2126b656281	11	AUX nss_ldap-265-reconnect-timeouts.patch 2806 SHA256 f1d3a308aac80fc1f33d4087a7839e01e45ece3aed284378adecb537bdcc53c3 SHA512 d9767cfaf32b9041d222c7b313c327a72ac2766d26fed7ce19cc1acff56cf2493d4e1e83b33852083505952f983ba64c00409e3cf09dcbf74676390968dd935b WHIRLPOOL c92858995a2d9950f47ad56a848d88470d829ecda81d5c83a55f9eb179d89750d382b05185502fae116aec9073a2115a2ceb70e13048d99b66ebf2126b656281
13	AUX nsswitch.ldap.diff 575 SHA256 f3bf121d1fa4e3c0119d36ddd2445bcbbd955e2b7fe2f0fe65ebaa6d2808c43e SHA512 0d08d4dacea0213714cab864300e625158106245eeb34a7d4b983749dd4fa4156d3f36d6c2dd214efdf80cf926c37657eb00651bceb89907286a3310123399a0 WHIRLPOOL f03a8bbda19e40a4d4d6352c0f496bd32ed6e4001b14c5e169fd16638467602c2ca4620d819cfd3aa29844192f1cb5367190f2df30f920ddeec716062558cb80	12	AUX nsswitch.ldap.diff 575 SHA256 f3bf121d1fa4e3c0119d36ddd2445bcbbd955e2b7fe2f0fe65ebaa6d2808c43e SHA512 0d08d4dacea0213714cab864300e625158106245eeb34a7d4b983749dd4fa4156d3f36d6c2dd214efdf80cf926c37657eb00651bceb89907286a3310123399a0 WHIRLPOOL f03a8bbda19e40a4d4d6352c0f496bd32ed6e4001b14c5e169fd16638467602c2ca4620d819cfd3aa29844192f1cb5367190f2df30f920ddeec716062558cb80
14	DIST nss_ldap-258.tar.gz 274694 SHA256 afa3bb64cd29557e775219585655721ac220de5804d95d0c307dab86f2308346	13	DIST nss_ldap-258.tar.gz 274694 SHA256 afa3bb64cd29557e775219585655721ac220de5804d95d0c307dab86f2308346
Lines 23-36 EBUILD nss_ldap-261.ebuild 2499 SHA256 1 Link Here
23	EBUILD nss_ldap-262.ebuild 2499 SHA256 36846bd0eeccab737c054f2f94f4e8fdb14b545993bd70c910425e0bb6f15c29 SHA512 8a30cba2b7d45e5df949e802aa6f988f5a422379140781a40154bff9b2100ecf5d3c194fff252aa36db60965f5ade53ead27dc8149ace5510daccc69ffa7eb28 WHIRLPOOL 875696aefe62cd5002023d52f30e825e737476197345e7a0cc21fc9c5a8faf523dec852ed6f884414720489d0670e570abe395ca6d24a5d5c9bba5b622c1356a	22	EBUILD nss_ldap-262.ebuild 2499 SHA256 36846bd0eeccab737c054f2f94f4e8fdb14b545993bd70c910425e0bb6f15c29 SHA512 8a30cba2b7d45e5df949e802aa6f988f5a422379140781a40154bff9b2100ecf5d3c194fff252aa36db60965f5ade53ead27dc8149ace5510daccc69ffa7eb28 WHIRLPOOL 875696aefe62cd5002023d52f30e825e737476197345e7a0cc21fc9c5a8faf523dec852ed6f884414720489d0670e570abe395ca6d24a5d5c9bba5b622c1356a
24	EBUILD nss_ldap-264-r1.ebuild 2732 SHA256 ee3d43ad22bd71718fa710c55c3c0cb5ef976ceb08c95618a3fd7bcc72672caf SHA512 d59e852705ee60629f420ecb2534348e0c3054c379749ba38096cba0fbd7c1801de215f101684ad657665beeeb6cc246da483982a256b91a7c06c4b71a966bf9 WHIRLPOOL d9e1728c814c4f99fe9f178383c72b32c8bdaa7df20761b28a37fa120bf2fb32088dee49c66071e6de290ed54baa4f4a4ed1748487174a539bbc5960cf535bb2	23	EBUILD nss_ldap-264-r1.ebuild 2732 SHA256 ee3d43ad22bd71718fa710c55c3c0cb5ef976ceb08c95618a3fd7bcc72672caf SHA512 d59e852705ee60629f420ecb2534348e0c3054c379749ba38096cba0fbd7c1801de215f101684ad657665beeeb6cc246da483982a256b91a7c06c4b71a966bf9 WHIRLPOOL d9e1728c814c4f99fe9f178383c72b32c8bdaa7df20761b28a37fa120bf2fb32088dee49c66071e6de290ed54baa4f4a4ed1748487174a539bbc5960cf535bb2
25	EBUILD nss_ldap-264.ebuild 2670 SHA256 ca86d085fe02f4d5fd723ac6d7b1c9f8ee87296e6e695d2d3437c9fbfdca81ef SHA512 6f5442086ee653310bd553c1a9071300d741bf13b4e6fdb6e6ff03051e580537a70f8fa07f39b9395d8bf7d8903692bb694fb14df2a897a085273a0857d20a10 WHIRLPOOL c9ad055b7c7f1553679cf4dff8798a2b4ace11a690130ff7cbda6a032d799103ea612f5782d150ceeb6d24931e03a297f04aacef406d0a8b3c486d30b7c73f41	24	EBUILD nss_ldap-264.ebuild 2670 SHA256 ca86d085fe02f4d5fd723ac6d7b1c9f8ee87296e6e695d2d3437c9fbfdca81ef SHA512 6f5442086ee653310bd553c1a9071300d741bf13b4e6fdb6e6ff03051e580537a70f8fa07f39b9395d8bf7d8903692bb694fb14df2a897a085273a0857d20a10 WHIRLPOOL c9ad055b7c7f1553679cf4dff8798a2b4ace11a690130ff7cbda6a032d799103ea612f5782d150ceeb6d24931e03a297f04aacef406d0a8b3c486d30b7c73f41
26	EBUILD nss_ldap-265-r1.ebuild 3070 SHA256 1443cfc59b95bc122408f718004809b695e260d2c46be82a6d5e76eaf1c19cd7 SHA512 1dd3e117f96a53b9d1600fdc0cd606dfaac2e8391ad2eaf49f1e283075e1df88d9601b760928baeb35dde00c474619da02af13c1cd52a21773dd2cae5632e8fe WHIRLPOOL 94a17838db43446afbdcf28705df2b226d346fcedc4dd27209c6db23da565b3c230dbb75a6d8f33a4a9b6291544468ec53535dc63c9482f11b7c5da7d46d4141	25	EBUILD nss_ldap-265-r1.ebuild 3215 SHA256 45ef92aae7124285da308bb6bbac635450a22bab2ff0117c0903c62c90fe2ad4 SHA512 4230ff3ed9e93577f811eab387e2d94ee1615fa60dc12db65d727afbe26e32a5330de8b746d16a583bac409fdaee0e71f98372ac10d163aedac0abe65ee7e75d WHIRLPOOL 45c9ae48ffa127e6037ff7141fa1f031b69afe3d4a725847652a44e939b9a56146eaccdb750eb1519571f6c5efdce304c2e4859e9c05bb9e52fb3d808e2fd519
27	EBUILD nss_ldap-265.ebuild 2814 SHA256 ed202b2c56cd1f1951c189d821e2ea3fa39b037ccdcbf2d80c4fae4b1ef76f03 SHA512 a1ff63edc5968f1a5697658bdd00d7eefa598da0c341b306612ee18c5bf97eda3363cbe74e191a9cd1a7b69135e45957618cb78675dc109e963491b9105d89d7 WHIRLPOOL dd1d0aef260c530eeaf1edeb05f0dc740c5ddb0f65a05e305a56f7a802d3cd38b18bdcb6483c783b284cb6cdec279dd5ebea86f9b057e5e69e18c171f80e234d	26	EBUILD nss_ldap-265.ebuild 2814 SHA256 ed202b2c56cd1f1951c189d821e2ea3fa39b037ccdcbf2d80c4fae4b1ef76f03 SHA512 a1ff63edc5968f1a5697658bdd00d7eefa598da0c341b306612ee18c5bf97eda3363cbe74e191a9cd1a7b69135e45957618cb78675dc109e963491b9105d89d7 WHIRLPOOL dd1d0aef260c530eeaf1edeb05f0dc740c5ddb0f65a05e305a56f7a802d3cd38b18bdcb6483c783b284cb6cdec279dd5ebea86f9b057e5e69e18c171f80e234d
28	MISC ChangeLog 17540 SHA256 0813e560491eb4da02424469630c47fd610dac1f6b73486197259ea8cdf4a24b SHA512 fe237a8eb95158fcb5a2ac24aec516ad23054385f200f3390a49436c4bc247058b6ceec7a8a017c7eeb76c50dd70e86e356d818c2a5396b9b4e6c970367bb21c WHIRLPOOL 007ad54451b90019c2aa2bdf635f4570de265285860c008292b19e60f0f1e9f6988d3f18cc25122a1e20111359fd6bc310732fa55d747089cfc2c74d6bf3bee2	27	MISC ChangeLog 17540 SHA256 0813e560491eb4da02424469630c47fd610dac1f6b73486197259ea8cdf4a24b SHA512 fe237a8eb95158fcb5a2ac24aec516ad23054385f200f3390a49436c4bc247058b6ceec7a8a017c7eeb76c50dd70e86e356d818c2a5396b9b4e6c970367bb21c WHIRLPOOL 007ad54451b90019c2aa2bdf635f4570de265285860c008292b19e60f0f1e9f6988d3f18cc25122a1e20111359fd6bc310732fa55d747089cfc2c74d6bf3bee2
29	MISC metadata.xml 353 SHA256 15eaadcd2984ab57a485030b49064540994a63df14ec3b6ce0dc18f65044fb00 SHA512 7c6c055419cc9b7e9cfd9b80398f5ec80f5db1306a3af235759acdb0255b6dc9c50a3d1e175ebfca4cae98d37e620201617fa33845bb3d7b8d54074c911ca5a1 WHIRLPOOL 7da63e48fb2e42a4e9ddac030b4fc57793e86faba11a6ee43d49b9b4cc3e71d92ae5454c0bc3eed68253798ca93e7b13ef5986078e1d9cc961dea318fca48ee0	28	MISC metadata.xml 353 SHA256 15eaadcd2984ab57a485030b49064540994a63df14ec3b6ce0dc18f65044fb00 SHA512 7c6c055419cc9b7e9cfd9b80398f5ec80f5db1306a3af235759acdb0255b6dc9c50a3d1e175ebfca4cae98d37e620201617fa33845bb3d7b8d54074c911ca5a1 WHIRLPOOL 7da63e48fb2e42a4e9ddac030b4fc57793e86faba11a6ee43d49b9b4cc3e71d92ae5454c0bc3eed68253798ca93e7b13ef5986078e1d9cc961dea318fca48ee0
30	-----BEGIN PGP SIGNATURE-----
31	Version: GnuPG v2.0.19 (GNU/Linux)
32
33	iEYEAREIAAYFAlBofdIACgkQuQc30/atMkCgVACfc1iYXUjWy+UOxjosil//G8V/
34	AEQAoMCs3OvdScmsThAEtx/sP2JWNPXT
35	=k8xi
36	-----END PGP SIGNATURE-----




# 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=5
inherit fixheadtails eutils multilib autotools prefix

IUSE="debug ssl sasl kerberos"



SLOT="0"
LICENSE="LGPL-2"
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 )

		!<net-fs/autofs-4.1.3"

src_prepare() {
	if use prefix; then
		epatch "${FILESDIR}"/${P}-installdir.patch
		eprefixify Makefile.am
	fi
	
	# bug 438692
	epatch "${FILESDIR}"/${P}-pthread.patch

	epatch "${FILESDIR}"/nsswitch.ldap.diff

	# Applied by upstream


	sed -i.orig \
		-e '/^ @(#)\$Id: ldap.conf,v/s,^,#,' \
		"${S}"/ldap.conf

	# fix head/tail stuff
	ht_fix_file "${S}"/Makefile.am "${S}"/Makefile.in "${S}"/depcomp

	sed -i \
		-e 's, vers_string , ./vers_string ,g' \
		"${S}"/Makefile.am
	
	eautoreconf
}


	# --enable-schema-mapping \
	econf \
		--with-ldap-lib=openldap \
		--libdir="${EPREFIX}/$(get_libdir)" \
		--with-ldap-conf-file="${EPREFIX}/etc/ldap.conf" \
		--enable-paged-results \
		--enable-rfc2307bis \
		$(use_enable ssl) \
		$(use_enable sasl) \
		$(use_enable kerberos krb) \
		${myconf}
}

src_install() {
	dodir /$(get_libdir)

	emake -j1 DESTDIR="${D}" install INST_UID=${PORTAGE_USER} INST_GID=${PORTAGE_GROUP}

	insinto /etc
	doins ldap.conf

	# Append two blank lines and some skip entries
	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'
		|| die "failed to sed /etc/ldap.conf"

	dodoc ldap.conf ANNOUNCE NEWS ChangeLog AUTHORS \
		COPYING CVSVersionInfo.txt README nsswitch.ldap certutil

Return to bug 438692

Line 0 Link Here

(-)/home/benda/gentoo/usr/portage/sys-auth/nss_ldap/files/nss_ldap-265-installdir.patch (+35 lines)
	1	Index: nss_ldap-265/Makefile.am
	2	===================================================================
	3	--- nss_ldap-265.orig/Makefile.am
	4	+++ nss_ldap-265/Makefile.am
	5	@@ -38,17 +38,13 @@ NSS_LDAP_LDFLAGS = @NSS_LDAP_LDFLAGS@
	6	DEFS = @DEFS@
	7	#INCLUDES = -I$(top_builddir) -I$(srcdir)
	8
	9	-if GCC
	10	-MULTI_OS_DIRECTORY=$(shell $(CC) $(CFLAGS) -print-multi-os-directory)
	11	-else
	12	MULTI_OS_DIRECTORY=.
	13	-endif
	14
	15	if GLIBC
	16	-LIBC_VERS = $(shell ls /lib/$(MULTI_OS_DIRECTORY)/libc-.so \| tail -n 1 \| sed -e 's\|.libc-\(.*\)\.so\|\1\|')
	17	+LIBC_VERS = $(shell ls @GENTOO_PORTAGE_EPREFIX@/lib/$(MULTI_OS_DIRECTORY)/libc-.so \| tail -n 1 \| sed -e 's\|.libc-\(.*\)\.so\|\1\|')
	18	NSS_LDAP_LIBC_VERSIONED = libnss_ldap-$(LIBC_VERS).so
	19
	20	-NSS_VERS = $(shell ls /lib/$(MULTI_OS_DIRECTORY)/libnss_files.so.? \| tail -n 1 \| sed -e 's\|.libnss_files\.so\.\(.\)\|\1\|')
	21	+NSS_VERS = $(shell ls @GENTOO_PORTAGE_EPREFIX@/lib/$(MULTI_OS_DIRECTORY)/libnss_files.so.? \| tail -n 1 \| sed -e 's\|.libnss_files\.so\.\(.\)\|\1\|')
	22	NSS_LDAP_NSS_VERSIONED = libnss_ldap.so.$(NSS_VERS)
	23	endif
	24
	25	@@ -83,8 +79,8 @@ if GLIBC
	26	$(mkinstalldirs) $(DESTDIR)$(libdir)
	27	$(INSTALL_PROGRAM) -o $(INST_UID) -g $(INST_GID) nss_ldap.so $(DESTDIR)$(libdir)/$(NSS_LDAP_LIBC_VERSIONED)
	28	(cd $(DESTDIR)$(libdir); ln -sf $(NSS_LDAP_LIBC_VERSIONED) $(NSS_LDAP_NSS_VERSIONED))
	29	- $(mkinstalldirs) $(DESTDIR)/usr$(libdir)
	30	- (cd $(DESTDIR)/usr$(libdir); ln -sf ../..$(libdir)/$(NSS_LDAP_NSS_VERSIONED) .)
	31	+ $(mkinstalldirs) $(DESTDIR)$(libdir:/lib=/usr/lib)
	32	+ (cd $(DESTDIR)/$(libdir:/lib=/usr/lib); ln -sf ../../lib/$(NSS_LDAP_NSS_VERSIONED) .)
	33	else
	34	$(mkinstalldirs) $(DESTDIR)$(libdir)
	35	if HPUX

Line 0 Link Here

(-)/home/benda/gentoo/usr/portage/sys-auth/nss_ldap/files/nss_ldap-265-pthread.patch (+481 lines)
		1	Index: ldap-nss.c
		2	===================================================================
		3	--- ldap-nss.c.orig
		4	+++ ldap-nss.c
		5	@@ -142,7 +142,7 @@ static void (*__sigpipe_handler) (int) =
		6	*/
		7	static ldap_session_t __session = { NULL, NULL, 0, LS_UNINITIALIZED };
		8
		9	-#if defined(HAVE_PTHREAD_ATFORK) \|\| defined(HAVE_LIBC_LOCK_H) \|\| defined(HAVE_BITS_LIBC_LOCK_H)
		10	+#if defined(HAVE_PTHREAD_ATFORK) \|\| defined(HAVE___LIBC_ONCE)
		11	static pthread_once_t __once = PTHREAD_ONCE_INIT;
		12	#endif
		13
		14	@@ -150,7 +150,7 @@ static pthread_once_t __once = PTHREAD_O
		15	static FILE *__debugfile;
		16	#endif /* LBER_OPT_LOG_PRINT_FILE */
		17
		18	-#ifndef HAVE_PTHREAD_ATFORK
		19	+#if !defined(HAVE_PTHREAD_ATFORK) \|\| !defined(HAVE___LIBC_ONCE)
		20	/*
		21	* Process ID that opened the session.
		22	*/
		23	@@ -162,7 +162,7 @@ static uid_t __euid = -1;
		24	static int __ssl_initialized = 0;
		25	#endif /* HAVE_LDAPSSL_CLIENT_INIT */
		26
		27	-#if defined(HAVE_PTHREAD_ATFORK) \|\| defined(HAVE_LIBC_LOCK_H) \|\| defined(HAVE_BITS_LIBC_LOCK_H)
		28	+#if defined(HAVE_PTHREAD_ATFORK) \|\| defined(HAVE___LIBC_ONCE)
		29	/*
		30	* Prepare for fork(); lock mutex.
		31	*/
		32	@@ -513,7 +513,7 @@ _nss_ldap_default_constr (nss_ldap_backe
		33	}
		34	#endif /* HAVE_NSSWITCH_H */
		35
		36	-#if defined(HAVE_PTHREAD_ATFORK) \|\| defined(HAVE_LIBC_LOCK_H) \|\| defined(HAVE_BITS_LIBC_LOCK_H)
		37	+#if defined(HAVE_PTHREAD_ATFORK) \|\| defined(HAVE___LIBC_ONCE)
		38	static void
		39	do_atfork_prepare (void)
		40	{
		41	@@ -547,7 +547,7 @@ do_atfork_setup (void)
		42	#ifdef HAVE_PTHREAD_ATFORK
		43	(void) pthread_atfork (do_atfork_prepare, do_atfork_parent,
		44	do_atfork_child);
		45	-#elif defined(HAVE_LIBC_LOCK_H) \|\| defined(HAVE_BITS_LIBC_LOCK_H)
		46	+#elif defined(HAVE___LIBC_ATFORK)
		47	(void) __libc_atfork (do_atfork_prepare, do_atfork_parent, do_atfork_child);
		48	#endif
		49
		50	@@ -1096,7 +1096,7 @@ static NSS_STATUS
		51	do_init (void)
		52	{
		53	ldap_config_t *cfg;
		54	-#ifndef HAVE_PTHREAD_ATFORK
		55	+#if !defined(HAVE_PTHREAD_ATFORK) \|\| !defined(HAVE___LIBC_ONCE)
		56	pid_t pid;
		57	#endif
		58	uid_t euid;
		59	@@ -1113,7 +1113,7 @@ do_init (void)
		60	}
		61
		62	#ifndef HAVE_PTHREAD_ATFORK
		63	-#if defined(HAVE_LIBC_LOCK_H) \|\| defined(HAVE_BITS_LIBC_LOCK_H)
		64	+#if defined(HAVE___LIBC_ONCE)
65	/*
66	* This bogosity is necessary because Linux uses different
67	* PIDs for different threads (like IRIX, which we don't
68	@@ -1145,7 +1145,7 @@ do_init (void)
69	pid = -1; /* linked against libpthreads, don't care */
70	#else
71	pid = getpid ();
72	-#endif /* HAVE_LIBC_LOCK_H \|\| HAVE_BITS_LIBC_LOCK_H */
73	+#endif /* HAVE___LIBC_ONCE */
74	#endif /* HAVE_PTHREAD_ATFORK */
75
76	euid = geteuid ();
77	@@ -1155,7 +1155,7 @@ do_init (void)
78	syslog (LOG_DEBUG,
79	"nss_ldap: __session.ls_state=%d, __session.ls_conn=%p, __euid=%i, euid=%i",
80	__session.ls_state, __session.ls_conn, __euid, euid);
81	-#elif defined(HAVE_LIBC_LOCK_H) \|\| defined(HAVE_BITS_LIBC_LOCK_H)
82	+#elif defined(HAVE___LIBC_ONCE)
83	syslog (LOG_DEBUG,
84	"nss_ldap: libpthreads=%s, __session.ls_state=%d, __session.ls_conn=%p, __pid=%i, pid=%i, __euid=%i, euid=%i",
85	((__pthread_once == NULL \|\| __pthread_atfork == NULL) ? "FALSE" : "TRUE"),
86	@@ -1179,11 +1179,11 @@ do_init (void)
87	}
88	else
89	#ifndef HAVE_PTHREAD_ATFORK
90	-#if defined(HAVE_LIBC_LOCK_H) \|\| defined(HAVE_BITS_LIBC_LOCK_H)
91	+#if defined(HAVE___LIBC_ONCE)
92	if ((__pthread_once == NULL \|\| __pthread_atfork == NULL) && __pid != pid)
93	#else
94	if (__pid != pid)
95	-#endif /* HAVE_LIBC_LOCK_H \|\| HAVE_BITS_LIBC_LOCK_H */
96	+#endif /* HAVE___LIBC_ONCE */
97	{
98	do_close_no_unbind ();
99	}
100	@@ -1244,9 +1244,9 @@ do_init (void)
101	debug ("<== do_init (pthread_once failed)");
102	return NSS_UNAVAIL;
103	}
104	-#elif defined(HAVE_PTHREAD_ATFORK) && ( defined(HAVE_LIBC_LOCK_H) \|\| defined(HAVE_BITS_LIBC_LOCK_H) )
105	+#elif defined(HAVE_PTHREAD_ATFORK) && defined(HAVE___LIBC_ONCE)
106	__libc_once (__once, do_atfork_setup);
107	-#elif defined(HAVE_LIBC_LOCK_H) \|\| defined(HAVE_BITS_LIBC_LOCK_H)
108	+#elif defined(HAVE___LIBC_ONCE)
109	/*
110	* Only install the pthread_atfork() handlers i
111	* we are linked against libpthreads. Otherwise,
112	Index: ldap-nss.h
113	===================================================================
114	--- ldap-nss.h.orig
115	+++ ldap-nss.h
116	@@ -670,7 +670,7 @@ extern int __multi_threaded;
117	#define NSS_LDAP_LOCK(m) mutex_lock(&m)
118	#define NSS_LDAP_UNLOCK(m) mutex_unlock(&m)
119	#define NSS_LDAP_DEFINE_LOCK(m) static mutex_t m = DEFAULTMUTEX
120	-#elif defined(HAVE_LIBC_LOCK_H) \|\| defined(HAVE_BITS_LIBC_LOCK_H)
121	+#elif defined(HAVE___LIBC_LOCK_LOCK) && defined(HAVE___LIBC_LOCK_UNLOCK)
122	#define NSS_LDAP_LOCK(m) __libc_lock_lock(m)
123	#define NSS_LDAP_UNLOCK(m) __libc_lock_unlock(m)
124	#define NSS_LDAP_DEFINE_LOCK(m) static pthread_mutex_t m = PTHREAD_MUTEX_INITIALIZER
125	Index: configure.in
126	===================================================================
127	--- configure.in.orig
128	+++ configure.in
129	@@ -1,6 +1,7 @@
130	AC_INIT(ldap-nss.c)
131	AC_CANONICAL_SYSTEM
132	AC_PREFIX_DEFAULT()
133	+AC_CONFIG_MACRO_DIR([m4])
134
135	AM_INIT_AUTOMAKE(nss_ldap, 265)
136	AM_CONFIG_HEADER(config.h)
137	@@ -229,11 +230,18 @@ fi
138	AC_CHECK_FUNCS(snprintf)
139	AC_CHECK_FUNCS(gethostbyname)
140	AC_CHECK_FUNCS(nsdispatch)
141	+AC_CHECK_FUNCS(ether_aton)
142	+AC_CHECK_FUNCS(ether_ntoa)
143	+
144	+AX_PTHREAD
145	+LIBS="$PTHREAD_LIBS $LIBS"
146	+CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
147	+CC="$PTHREAD_CC"
148	+
149	AC_CHECK_LIB(pthread_nonshared, main)
150	AC_CHECK_FUNCS(pthread_atfork)
151	AC_CHECK_FUNCS(pthread_once)
152	-AC_CHECK_FUNCS(ether_aton)
153	-AC_CHECK_FUNCS(ether_ntoa)
154	+AC_CHECK_FUNCS(__libc_once __libc_atfork __libc_lock_lock __libc_lock_unlock)
155
156	AC_MSG_CHECKING(for struct ether_addr)
157	AC_TRY_COMPILE([#include <sys/types.h>
158	Index: m4/ax_pthread.m4
159	===================================================================
160	--- /dev/null
161	+++ m4/ax_pthread.m4
162	@@ -0,0 +1,309 @@
163	+# ===========================================================================
164	+# http://www.gnu.org/software/autoconf-archive/ax_pthread.html
165	+# ===========================================================================
166	+#
167	+# SYNOPSIS
168	+#
169	+# AX_PTHREAD([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
170	+#
171	+# DESCRIPTION
172	+#
173	+# This macro figures out how to build C programs using POSIX threads. It
174	+# sets the PTHREAD_LIBS output variable to the threads library and linker
175	+# flags, and the PTHREAD_CFLAGS output variable to any special C compiler
176	+# flags that are needed. (The user can also force certain compiler
177	+# flags/libs to be tested by setting these environment variables.)
178	+#
179	+# Also sets PTHREAD_CC to any special C compiler that is needed for
180	+# multi-threaded programs (defaults to the value of CC otherwise). (This
181	+# is necessary on AIX to use the special cc_r compiler alias.)
182	+#
183	+# NOTE: You are assumed to not only compile your program with these flags,
184	+# but also link it with them as well. e.g. you should link with
185	+# $PTHREAD_CC $CFLAGS $PTHREAD_CFLAGS $LDFLAGS ... $PTHREAD_LIBS $LIBS
186	+#
187	+# If you are only building threads programs, you may wish to use these
188	+# variables in your default LIBS, CFLAGS, and CC:
189	+#
190	+# LIBS="$PTHREAD_LIBS $LIBS"
191	+# CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
192	+# CC="$PTHREAD_CC"
193	+#
194	+# In addition, if the PTHREAD_CREATE_JOINABLE thread-attribute constant
195	+# has a nonstandard name, defines PTHREAD_CREATE_JOINABLE to that name
196	+# (e.g. PTHREAD_CREATE_UNDETACHED on AIX).
197	+#
198	+# Also HAVE_PTHREAD_PRIO_INHERIT is defined if pthread is found and the
199	+# PTHREAD_PRIO_INHERIT symbol is defined when compiling with
200	+# PTHREAD_CFLAGS.
201	+#
202	+# ACTION-IF-FOUND is a list of shell commands to run if a threads library
203	+# is found, and ACTION-IF-NOT-FOUND is a list of commands to run it if it
204	+# is not found. If ACTION-IF-FOUND is not specified, the default action
205	+# will define HAVE_PTHREAD.
206	+#
207	+# Please let the authors know if this macro fails on any platform, or if
208	+# you have any other suggestions or comments. This macro was based on work
209	+# by SGJ on autoconf scripts for FFTW (http://www.fftw.org/) (with help
210	+# from M. Frigo), as well as ac_pthread and hb_pthread macros posted by
211	+# Alejandro Forero Cuervo to the autoconf macro repository. We are also
212	+# grateful for the helpful feedback of numerous users.
213	+#
214	+# Updated for Autoconf 2.68 by Daniel Richard G.
215	+#
216	+# LICENSE
217	+#
218	+# Copyright (c) 2008 Steven G. Johnson <stevenj@alum.mit.edu>
219	+# Copyright (c) 2011 Daniel Richard G. <skunk@iSKUNK.ORG>
220	+#
221	+# This program is free software: you can redistribute it and/or modify it
222	+# under the terms of the GNU General Public License as published by the
223	+# Free Software Foundation, either version 3 of the License, or (at your
224	+# option) any later version.
225	+#
226	+# This program is distributed in the hope that it will be useful, but
227	+# WITHOUT ANY WARRANTY; without even the implied warranty of
228	+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
229	+# Public License for more details.
230	+#
231	+# You should have received a copy of the GNU General Public License along
232	+# with this program. If not, see <http://www.gnu.org/licenses/>.
233	+#
234	+# As a special exception, the respective Autoconf Macro's copyright owner
235	+# gives unlimited permission to copy, distribute and modify the configure
236	+# scripts that are the output of Autoconf when processing the Macro. You
237	+# need not follow the terms of the GNU General Public License when using
238	+# or distributing such scripts, even though portions of the text of the
239	+# Macro appear in them. The GNU General Public License (GPL) does govern
240	+# all other use of the material that constitutes the Autoconf Macro.
241	+#
242	+# This special exception to the GPL applies to versions of the Autoconf
243	+# Macro released by the Autoconf Archive. When you make and distribute a
244	+# modified version of the Autoconf Macro, you may extend this special
245	+# exception to the GPL to apply to your modified version as well.
246	+
247	+#serial 18
248	+
249	+AU_ALIAS([ACX_PTHREAD], [AX_PTHREAD])
250	+AC_DEFUN([AX_PTHREAD], [
251	+AC_REQUIRE([AC_CANONICAL_HOST])
252	+AC_LANG_PUSH([C])
253	+ax_pthread_ok=no
254	+
255	+# We used to check for pthread.h first, but this fails if pthread.h
256	+# requires special compiler flags (e.g. on True64 or Sequent).
257	+# It gets checked for in the link test anyway.
258	+
259	+# First of all, check if the user has set any of the PTHREAD_LIBS,
260	+# etcetera environment variables, and if threads linking works using
261	+# them:
262	+if test x"$PTHREAD_LIBS$PTHREAD_CFLAGS" != x; then
263	+ save_CFLAGS="$CFLAGS"
264	+ CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
265	+ save_LIBS="$LIBS"
266	+ LIBS="$PTHREAD_LIBS $LIBS"
267	+ AC_MSG_CHECKING([for pthread_join in LIBS=$PTHREAD_LIBS with CFLAGS=$PTHREAD_CFLAGS])
268	+ AC_TRY_LINK_FUNC(pthread_join, ax_pthread_ok=yes)
269	+ AC_MSG_RESULT($ax_pthread_ok)
270	+ if test x"$ax_pthread_ok" = xno; then
271	+ PTHREAD_LIBS=""
272	+ PTHREAD_CFLAGS=""
273	+ fi
274	+ LIBS="$save_LIBS"
275	+ CFLAGS="$save_CFLAGS"
276	+fi
277	+
278	+# We must check for the threads library under a number of different
279	+# names; the ordering is very important because some systems
280	+# (e.g. DEC) have both -lpthread and -lpthreads, where one of the
281	+# libraries is broken (non-POSIX).
282	+
283	+# Create a list of thread flags to try. Items starting with a "-" are
284	+# C compiler flags, and other items are library names, except for "none"
285	+# which indicates that we try without any flags at all, and "pthread-config"
286	+# which is a program returning the flags for the Pth emulation library.
287	+
288	+ax_pthread_flags="pthreads none -Kthread -kthread lthread -pthread -pthreads -mthreads pthread --thread-safe -mt pthread-config"
289	+
290	+# The ordering is (sometimes) important. Some notes on the
291	+# individual items follow:
292	+
293	+# pthreads: AIX (must check this before -lpthread)
294	+# none: in case threads are in libc; should be tried before -Kthread and
295	+# other compiler flags to prevent continual compiler warnings
296	+# -Kthread: Sequent (threads in libc, but -Kthread needed for pthread.h)
297	+# -kthread: FreeBSD kernel threads (preferred to -pthread since SMP-able)
298	+# lthread: LinuxThreads port on FreeBSD (also preferred to -pthread)
299	+# -pthread: Linux/gcc (kernel threads), BSD/gcc (userland threads)
300	+# -pthreads: Solaris/gcc
301	+# -mthreads: Mingw32/gcc, Lynx/gcc
302	+# -mt: Sun Workshop C (may only link SunOS threads [-lthread], but it
303	+# doesn't hurt to check since this sometimes defines pthreads too;
304	+# also defines -D_REENTRANT)
305	+# ... -mt is also the pthreads flag for HP/aCC
306	+# pthread: Linux, etcetera
307	+# --thread-safe: KAI C++
308	+# pthread-config: use pthread-config program (for GNU Pth library)
309	+
310	+case ${host_os} in
311	+ solaris*)
312	+
313	+ # On Solaris (at least, for some versions), libc contains stubbed
314	+ # (non-functional) versions of the pthreads routines, so link-based
315	+ # tests will erroneously succeed. (We need to link with -pthreads/-mt/
316	+ # -lpthread.) (The stubs are missing pthread_cleanup_push, or rather
317	+ # a function called by this macro, so we could check for that, but
318	+ # who knows whether they'll stub that too in a future libc.) So,
319	+ # we'll just look for -pthreads and -lpthread first:
320	+
321	+ ax_pthread_flags="-pthreads pthread -mt -pthread $ax_pthread_flags"
322	+ ;;
323	+
324	+ darwin*)
325	+ ax_pthread_flags="-pthread $ax_pthread_flags"
326	+ ;;
327	+esac
328	+
329	+if test x"$ax_pthread_ok" = xno; then
330	+for flag in $ax_pthread_flags; do
331	+
332	+ case $flag in
333	+ none)
334	+ AC_MSG_CHECKING([whether pthreads work without any flags])
335	+ ;;
336	+
337	+ -*)
338	+ AC_MSG_CHECKING([whether pthreads work with $flag])
339	+ PTHREAD_CFLAGS="$flag"
340	+ ;;
341	+
342	+ pthread-config)
343	+ AC_CHECK_PROG(ax_pthread_config, pthread-config, yes, no)
344	+ if test x"$ax_pthread_config" = xno; then continue; fi
345	+ PTHREAD_CFLAGS="`pthread-config --cflags`"
346	+ PTHREAD_LIBS="`pthread-config --ldflags` `pthread-config --libs`"
347	+ ;;
348	+
349	+ *)
350	+ AC_MSG_CHECKING([for the pthreads library -l$flag])
351	+ PTHREAD_LIBS="-l$flag"
352	+ ;;
353	+ esac
354	+
355	+ save_LIBS="$LIBS"
356	+ save_CFLAGS="$CFLAGS"
357	+ LIBS="$PTHREAD_LIBS $LIBS"
358	+ CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
359	+
360	+ # Check for various functions. We must include pthread.h,
361	+ # since some functions may be macros. (On the Sequent, we
362	+ # need a special flag -Kthread to make this header compile.)
363	+ # We check for pthread_join because it is in -lpthread on IRIX
364	+ # while pthread_create is in libc. We check for pthread_attr_init
365	+ # due to DEC craziness with -lpthreads. We check for
366	+ # pthread_cleanup_push because it is one of the few pthread
367	+ # functions on Solaris that doesn't have a non-functional libc stub.
368	+ # We try pthread_create on general principles.
369	+ AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <pthread.h>
370	+ static void routine(void *a) { a = 0; }
371	+ static void start_routine(void a) { return a; }],
372	+ [pthread_t th; pthread_attr_t attr;
373	+ pthread_create(&th, 0, start_routine, 0);
374	+ pthread_join(th, 0);
375	+ pthread_attr_init(&attr);
376	+ pthread_cleanup_push(routine, 0);
377	+ pthread_cleanup_pop(0) /* ; */])],
378	+ [ax_pthread_ok=yes],
379	+ [])
380	+
381	+ LIBS="$save_LIBS"
382	+ CFLAGS="$save_CFLAGS"
383	+
384	+ AC_MSG_RESULT($ax_pthread_ok)
385	+ if test "x$ax_pthread_ok" = xyes; then
386	+ break;
387	+ fi
388	+
389	+ PTHREAD_LIBS=""
390	+ PTHREAD_CFLAGS=""
391	+done
392	+fi
393	+
394	+# Various other checks:
395	+if test "x$ax_pthread_ok" = xyes; then
396	+ save_LIBS="$LIBS"
397	+ LIBS="$PTHREAD_LIBS $LIBS"
398	+ save_CFLAGS="$CFLAGS"
399	+ CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
400	+
401	+ # Detect AIX lossage: JOINABLE attribute is called UNDETACHED.
402	+ AC_MSG_CHECKING([for joinable pthread attribute])
403	+ attr_name=unknown
404	+ for attr in PTHREAD_CREATE_JOINABLE PTHREAD_CREATE_UNDETACHED; do
405	+ AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <pthread.h>],
406	+ [int attr = $attr; return attr /* ; */])],
407	+ [attr_name=$attr; break],
408	+ [])
409	+ done
410	+ AC_MSG_RESULT($attr_name)
411	+ if test "$attr_name" != PTHREAD_CREATE_JOINABLE; then
412	+ AC_DEFINE_UNQUOTED(PTHREAD_CREATE_JOINABLE, $attr_name,
413	+ [Define to necessary symbol if this constant
414	+ uses a non-standard name on your system.])
415	+ fi
416	+
417	+ AC_MSG_CHECKING([if more special flags are required for pthreads])
418	+ flag=no
419	+ case ${host_os} in
420	+ aix* \| freebsd* \| darwin*) flag="-D_THREAD_SAFE";;
421	+ osf* \| hpux*) flag="-D_REENTRANT";;
422	+ solaris*)
423	+ if test "$GCC" = "yes"; then
424	+ flag="-D_REENTRANT"
425	+ else
426	+ flag="-mt -D_REENTRANT"
427	+ fi
428	+ ;;
429	+ esac
430	+ AC_MSG_RESULT(${flag})
431	+ if test "x$flag" != xno; then
432	+ PTHREAD_CFLAGS="$flag $PTHREAD_CFLAGS"
433	+ fi
434	+
435	+ AC_CACHE_CHECK([for PTHREAD_PRIO_INHERIT],
436	+ ax_cv_PTHREAD_PRIO_INHERIT, [
437	+ AC_LINK_IFELSE([
438	+ AC_LANG_PROGRAM([[#include <pthread.h>]], [[int i = PTHREAD_PRIO_INHERIT;]])],
439	+ [ax_cv_PTHREAD_PRIO_INHERIT=yes],
440	+ [ax_cv_PTHREAD_PRIO_INHERIT=no])
441	+ ])
442	+ AS_IF([test "x$ax_cv_PTHREAD_PRIO_INHERIT" = "xyes"],
443	+ AC_DEFINE([HAVE_PTHREAD_PRIO_INHERIT], 1, [Have PTHREAD_PRIO_INHERIT.]))
444	+
445	+ LIBS="$save_LIBS"
446	+ CFLAGS="$save_CFLAGS"
447	+
448	+ # More AIX lossage: must compile with xlc_r or cc_r
449	+ if test x"$GCC" != xyes; then
450	+ AC_CHECK_PROGS(PTHREAD_CC, xlc_r cc_r, ${CC})
451	+ else
452	+ PTHREAD_CC=$CC
453	+ fi
454	+else
455	+ PTHREAD_CC="$CC"
456	+fi
457	+
458	+AC_SUBST(PTHREAD_LIBS)
459	+AC_SUBST(PTHREAD_CFLAGS)
460	+AC_SUBST(PTHREAD_CC)
461	+
462	+# Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND:
463	+if test x"$ax_pthread_ok" = xyes; then
464	+ ifelse([$1],,AC_DEFINE(HAVE_PTHREAD,1,[Define if you have POSIX threads libraries and header files.]),[$1])
465	+ :
466	+else
467	+ ax_pthread_ok=no
468	+ $2
469	+fi
470	+AC_LANG_POP
471	+])dnl AX_PTHREAD
472	Index: Makefile.am
473	===================================================================
474	--- Makefile.am.orig
475	+++ Makefile.am
476	@@ -1,3 +1,5 @@
477	+ACLOCAL_AMFLAGS = -I m4
478	+
479	if AIX
480	authmod = NSS_LDAP
481	else

Lines 2-9 Link Here

(-)/home/benda/gentoo/usr/portage/sys-auth/nss_ldap/nss_ldap-265-r1.ebuild (-13 / +21 lines)
2	# Distributed under the terms of the GNU General Public License v2	2	# Distributed under the terms of the GNU General Public License v2
3	# $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 $	3	# $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 $
4		4
5	EAPI=2	5	EAPI=5
6	inherit fixheadtails eutils multilib autotools	6	inherit fixheadtails eutils multilib autotools prefix
7		7
8	IUSE="debug ssl sasl kerberos"	8	IUSE="debug ssl sasl kerberos"
9		9
Lines 13-19 SRC_URI="http://www.padl.com/download/${ Link Here
13		13
14	SLOT="0"	14	SLOT="0"
15	LICENSE="LGPL-2"	15	LICENSE="LGPL-2"
16	KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86"	16	KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux"
17		17
18	DEPEND=">=net-nds/openldap-2.1.30-r5	18	DEPEND=">=net-nds/openldap-2.1.30-r5
19	sasl? ( dev-libs/cyrus-sasl )	19	sasl? ( dev-libs/cyrus-sasl )
Lines 23-28 RDEPEND="${DEPEND} Link Here
23	!<net-fs/autofs-4.1.3"	23	!<net-fs/autofs-4.1.3"
24		24
25	src_prepare() {	25	src_prepare() {
		26	if use prefix; then
		27	epatch "${FILESDIR}"/${P}-installdir.patch
		28	eprefixify Makefile.am
		29	fi
		30
		31	# bug 438692
		32	epatch "${FILESDIR}"/${P}-pthread.patch
		33
26	epatch "${FILESDIR}"/nsswitch.ldap.diff	34	epatch "${FILESDIR}"/nsswitch.ldap.diff
27		35
28	# Applied by upstream	36	# Applied by upstream
Lines 39-45 src_prepare() { Link Here
39		47
40	sed -i.orig \	48	sed -i.orig \
41	-e '/^ @(#)\$Id: ldap.conf,v/s,^,#,' \	49	-e '/^ @(#)\$Id: ldap.conf,v/s,^,#,' \
42	"${S}"/ldap.conf \|\| die "failed to clean up initial version marker"	50	"${S}"/ldap.conf
43		51
44	# fix head/tail stuff	52	# fix head/tail stuff
45	ht_fix_file "${S}"/Makefile.am "${S}"/Makefile.in "${S}"/depcomp	53	ht_fix_file "${S}"/Makefile.am "${S}"/Makefile.in "${S}"/depcomp
Lines 67-73 src_prepare() { Link Here
67	sed -i \	75	sed -i \
68	-e 's, vers_string , ./vers_string ,g' \	76	-e 's, vers_string , ./vers_string ,g' \
69	"${S}"/Makefile.am	77	"${S}"/Makefile.am
70		78
71	eautoreconf	79	eautoreconf
72	}	80	}
73		81
Lines 78-106 src_configure() { Link Here
78	# --enable-schema-mapping \	86	# --enable-schema-mapping \
79	econf \	87	econf \
80	--with-ldap-lib=openldap \	88	--with-ldap-lib=openldap \
81	--libdir=/$(get_libdir) \	89	--libdir="${EPREFIX}/$(get_libdir)" \
		90	--with-ldap-conf-file="${EPREFIX}/etc/ldap.conf" \
82	--enable-paged-results \	91	--enable-paged-results \
83	--enable-rfc2307bis \	92	--enable-rfc2307bis \
84	$(use_enable ssl) \	93	$(use_enable ssl) \
85	$(use_enable sasl) \	94	$(use_enable sasl) \
86	$(use_enable kerberos krb) \	95	$(use_enable kerberos krb) \
87	${myconf} \|\| die "configure failed"	96	${myconf}
88	}	97	}
89		98
90	src_install() {	99	src_install() {
91	dodir /$(get_libdir)	100	dodir /$(get_libdir)
92		101
93	emake -j1 DESTDIR="${D}" install \|\| die "make install failed"	102	emake -j1 DESTDIR="${D}" install INST_UID=${PORTAGE_USER} INST_GID=${PORTAGE_GROUP}
94		103
95	insinto /etc	104	insinto /etc
96	doins ldap.conf	105	doins ldap.conf
97		106
98	# Append two blank lines and some skip entries	107	# Append two blank lines and some skip entries
99	echo >>"${D}"/etc/ldap.conf	108	echo >>"${ED}"/etc/ldap.conf
100	echo >>"${D}"/etc/ldap.conf	109	echo >>"${ED}"/etc/ldap.conf
101	sed -i "${D}"/etc/ldap.conf \	110	sed -i "${ED}"/etc/ldap.conf \
102	-e '$inss_initgroups_ignoreusers ldap,openldap,mysql,syslog,root,postgres' \	111	-e '$inss_initgroups_ignoreusers ldap,openldap,mysql,syslog,root,postgres'
103	\|\| die "failed to sed /etc/ldap.conf"
104		112
105	dodoc ldap.conf ANNOUNCE NEWS ChangeLog AUTHORS \	113	dodoc ldap.conf ANNOUNCE NEWS ChangeLog AUTHORS \
106	COPYING CVSVersionInfo.txt README nsswitch.ldap certutil	114	COPYING CVSVersionInfo.txt README nsswitch.ldap certutil