From 5184b3d6f6dbb40e03fd00539f1963858075fde1 Mon Sep 17 00:00:00 2001 From: anray Date: Sat, 27 May 2006 16:31:57 +0000 Subject: Update to 1.250 Submitted by: maintainer via email --- net/nss_ldap/Makefile | 3 +- net/nss_ldap/distinfo | 6 +- net/nss_ldap/files/patch-Makefile.in | 183 +++++++++++++--------------------- net/nss_ldap/files/patch-configure | 186 ++++++++++++++--------------------- net/nss_ldap/files/patch-ldap-nss.c | 8 +- 5 files changed, 150 insertions(+), 236 deletions(-) (limited to 'net') diff --git a/net/nss_ldap/Makefile b/net/nss_ldap/Makefile index 595099ef1028..00dc1437c655 100644 --- a/net/nss_ldap/Makefile +++ b/net/nss_ldap/Makefile @@ -7,7 +7,6 @@ PORTNAME= nss_ldap PORTVERSION= 1.${NSS_LDAP_VERSION} -PORTREVISION= 1 CATEGORIES= net MASTER_SITES= http://www.padl.com/download/ \ ${MASTER_SITE_LOCAL} @@ -19,7 +18,7 @@ COMMENT= RFC 2307 NSS module USE_OPENLDAP= yes -NSS_LDAP_VERSION=249 +NSS_LDAP_VERSION=250 GNU_CONFIGURE= yes USE_GMAKE= yes diff --git a/net/nss_ldap/distinfo b/net/nss_ldap/distinfo index e570502a7b4f..702c7f7c8506 100644 --- a/net/nss_ldap/distinfo +++ b/net/nss_ldap/distinfo @@ -1,3 +1,3 @@ -MD5 (nss_ldap-249.tar.gz) = 1ce2d14601f94013c8ab15cb0eebc9e7 -SHA256 (nss_ldap-249.tar.gz) = 2733473e2305e48227b4762ba7c14fb0cc6eb717ee2c3165915fb07ece6733e1 -SIZE (nss_ldap-249.tar.gz) = 262800 +MD5 (nss_ldap-250.tar.gz) = ac1bcdaf0765b57b7d9023aa9cd07fb6 +SHA256 (nss_ldap-250.tar.gz) = 555c8fc9585478bc31b25349469685fbb6036cc6895e3761731c2c0e7accf2f0 +SIZE (nss_ldap-250.tar.gz) = 240122 diff --git a/net/nss_ldap/files/patch-Makefile.in b/net/nss_ldap/files/patch-Makefile.in index 5e495bcf9fd9..01480efd657b 100644 --- a/net/nss_ldap/files/patch-Makefile.in +++ b/net/nss_ldap/files/patch-Makefile.in @@ -1,133 +1,82 @@ ---- Makefile.in.orig Fri Feb 24 08:02:50 2006 -+++ Makefile.in Thu Mar 2 01:53:39 2006 -@@ -98,16 +98,13 @@ +--- Makefile.in.orig Sat May 27 16:26:52 2006 ++++ Makefile.in Sat May 27 16:46:05 2006 +@@ -82,7 +82,7 @@ man_MANS = nss_ldap.5 --nss_ldap_so_SOURCES = ldap-nss.c ldap-pwd.c ldap-grp.c ldap-netgrp.c ldap-rpc.c \ -- ldap-hosts.c ldap-network.c ldap-proto.c ldap-spwd.c \ -- ldap-alias.c ldap-service.c ldap-schema.c ldap-ethers.c \ -- ldap-bp.c ldap-automount.c util.c ltf.c snprintf.c resolve.c \ -- dnsconfig.c irs-nss.c pagectrl.c ldap-sldap.c -- -+nss_ldap_so_SOURCES = ldap-nss.c ldap-pwd.c ldap-grp.c \ -+ ldap-schema.c utils.c ltf.c snprintf.c resolve.c \ -+ dnsconfig.c irs-nss.c pagectrl.c bsdnss.c ldap-hosts.c - - NSS_LDAP_SOURCES = ldap-nss.c ldap-grp.c ldap-pwd.c ldap-netgrp.c ldap-schema.c \ - util.c ltf.c snprintf.c resolve.c dnsconfig.c \ -- irs-nss.c pagectrl.c aix_authmeth.c -+ irs-nss.c pagectrl.c aix_authmeth.c bsdnss.c ldap-hosts.c +-nss_ldap_so_SOURCES = ldap-nss.c ldap-pwd.c ldap-grp.c ldap-netgrp.c ldap-rpc.c ldap-hosts.c ldap-network.c ldap-proto.c ldap-spwd.c ldap-alias.c ldap-service.c ldap-schema.c ldap-ethers.c ldap-bp.c ldap-automount.c util.c ltf.c snprintf.c resolve.c dnsconfig.c irs-nss.c pagectrl.c ldap-sldap.c ++nss_ldap_so_SOURCES = ldap-nss.c ldap-pwd.c ldap-grp.c ldap-hosts.c ldap-schema.c util.c ltf.c snprintf.c resolve.c dnsconfig.c irs-nss.c pagectrl.c bsdnss.c - DEFS = @DEFS@ -@@ -137,19 +134,15 @@ - ldap-pwd.$(OBJEXT) ldap-netgrp.$(OBJEXT) ldap-schema.$(OBJEXT) \ - util.$(OBJEXT) ltf.$(OBJEXT) snprintf.$(OBJEXT) \ - resolve.$(OBJEXT) dnsconfig.$(OBJEXT) irs-nss.$(OBJEXT) \ -- pagectrl.$(OBJEXT) aix_authmeth.$(OBJEXT) -+ pagectrl.$(OBJEXT) aix_authmeth.$(OBJEXT) bsdnss.${OBJEXT} - NSS_LDAP_OBJECTS = $(am_NSS_LDAP_OBJECTS) - NSS_LDAP_LDADD = $(LDADD) - NSS_LDAP_DEPENDENCIES = - am_nss_ldap_so_OBJECTS = ldap-nss.$(OBJEXT) ldap-pwd.$(OBJEXT) \ -- ldap-grp.$(OBJEXT) ldap-netgrp.$(OBJEXT) ldap-rpc.$(OBJEXT) \ -- ldap-hosts.$(OBJEXT) ldap-network.$(OBJEXT) \ -- ldap-proto.$(OBJEXT) ldap-spwd.$(OBJEXT) ldap-alias.$(OBJEXT) \ -- ldap-service.$(OBJEXT) ldap-schema.$(OBJEXT) \ -- ldap-ethers.$(OBJEXT) ldap-bp.$(OBJEXT) \ -- ldap-automount.$(OBJEXT) util.$(OBJEXT) ltf.$(OBJEXT) \ -+ ldap-grp.$(OBJEXT) ldap-schema.$(OBJEXT) \ -+ util.$(OBJEXT) ltf.$(OBJEXT) \ - snprintf.$(OBJEXT) resolve.$(OBJEXT) dnsconfig.$(OBJEXT) \ -- irs-nss.$(OBJEXT) pagectrl.$(OBJEXT) ldap-sldap.$(OBJEXT) -+ irs-nss.$(OBJEXT) pagectrl.$(OBJEXT) bsdnss.$(OBJEXT) ldap-hosts.$(OBJEXT) - nss_ldap_so_OBJECTS = $(am_nss_ldap_so_OBJECTS) - nss_ldap_so_LDADD = $(LDADD) - nss_ldap_so_DEPENDENCIES = -@@ -159,17 +152,16 @@ + nss_ldap_so_LDFLAGS = @nss_ldap_so_LDFLAGS@ +@@ -118,11 +118,9 @@ + CPPFLAGS = @CPPFLAGS@ + LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ - depcomp = $(SHELL) $(top_srcdir)/depcomp - @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/aix_authmeth.Po $(DEPDIR)/dnsconfig.Po \ --@AMDEP_TRUE@ $(DEPDIR)/irs-nss.Po $(DEPDIR)/ldap-alias.Po \ --@AMDEP_TRUE@ $(DEPDIR)/ldap-automount.Po $(DEPDIR)/ldap-bp.Po \ --@AMDEP_TRUE@ $(DEPDIR)/ldap-ethers.Po $(DEPDIR)/ldap-grp.Po \ --@AMDEP_TRUE@ $(DEPDIR)/ldap-hosts.Po $(DEPDIR)/ldap-netgrp.Po \ --@AMDEP_TRUE@ $(DEPDIR)/ldap-network.Po $(DEPDIR)/ldap-nss.Po \ --@AMDEP_TRUE@ $(DEPDIR)/ldap-proto.Po $(DEPDIR)/ldap-pwd.Po \ --@AMDEP_TRUE@ $(DEPDIR)/ldap-rpc.Po $(DEPDIR)/ldap-schema.Po \ --@AMDEP_TRUE@ $(DEPDIR)/ldap-service.Po $(DEPDIR)/ldap-sldap.Po \ --@AMDEP_TRUE@ $(DEPDIR)/ldap-spwd.Po $(DEPDIR)/ltf.Po \ -+@AMDEP_TRUE@ $(DEPDIR)/irs-nss.Po \ -+@AMDEP_TRUE@ $(DEPDIR)/ldap-grp.Po \ -+@AMDEP_TRUE@ $(DEPDIR)/ldap-nss.Po \ -+@AMDEP_TRUE@ $(DEPDIR)/ldap-pwd.Po \ -+@AMDEP_TRUE@ $(DEPDIR)/ldap-schema.Po \ -+@AMDEP_TRUE@ $(DEPDIR)/ldap-sldap.Po \ -+@AMDEP_TRUE@ $(DEPDIR)/ltf.Po \ - @AMDEP_TRUE@ $(DEPDIR)/pagectrl.Po $(DEPDIR)/resolve.Po \ --@AMDEP_TRUE@ $(DEPDIR)/snprintf.Po $(DEPDIR)/util.Po -+@AMDEP_TRUE@ $(DEPDIR)/snprintf.Po $(DEPDIR)/util.Po \ -+@AMDEP_TRUE@ $(DEPDIR)/bsdnss.Po $(DEPDIR)/ldap-hosts.Po - COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) - CCLD = $(CC) -@@ -189,21 +181,21 @@ +-nss_ldap_so_OBJECTS = ldap-nss.o ldap-pwd.o ldap-grp.o ldap-netgrp.o \ +-ldap-rpc.o ldap-hosts.o ldap-network.o ldap-proto.o ldap-spwd.o \ +-ldap-alias.o ldap-service.o ldap-schema.o ldap-ethers.o ldap-bp.o \ +-ldap-automount.o util.o ltf.o snprintf.o resolve.o dnsconfig.o \ +-irs-nss.o pagectrl.o ldap-sldap.o ++nss_ldap_so_OBJECTS = ldap-nss.o ldap-pwd.o ldap-grp.o \ ++ldap-hosts.o ldap-schema.o util.o ltf.o snprintf.o resolve.o dnsconfig.o \ ++irs-nss.o pagectrl.o bsdnss.o + nss_ldap_so_LDADD = $(LDADD) + nss_ldap_so_DEPENDENCIES = + NSS_LDAP_OBJECTS = ldap-nss.o ldap-grp.o ldap-pwd.o ldap-netgrp.o \ +@@ -147,34 +145,34 @@ + + TAR = tar + GZIP_ENV = --best +-DEP_FILES = .deps/aix_authmeth.P .deps/dnsconfig.P .deps/irs-nss.P \ +-.deps/ldap-alias.P .deps/ldap-automount.P .deps/ldap-bp.P \ +-.deps/ldap-ethers.P .deps/ldap-grp.P .deps/ldap-hosts.P \ +-.deps/ldap-netgrp.P .deps/ldap-network.P .deps/ldap-nss.P \ +-.deps/ldap-proto.P .deps/ldap-pwd.P .deps/ldap-rpc.P \ +-.deps/ldap-schema.P .deps/ldap-service.P .deps/ldap-sldap.P \ +-.deps/ldap-spwd.P .deps/ltf.P .deps/pagectrl.P .deps/resolve.P \ +-.deps/snprintf.P .deps/util.P ++DEP_FILES = .deps/aix_authmeth.P .deps/dnsconfig.P \ ++.deps/ldap-grp.P .deps/ldap-hosts.P \ ++.deps/irs-nss.P \ ++.deps/ldap-nss.P \ ++.deps/ldap-pwd.P \ ++.deps/ldap-schema.P \ ++.deps/ltf.P .deps/pagectrl.P .deps/resolve.P \ ++.deps/snprintf.P .deps/util.P .deps/bsdnss.Po + SOURCES = $(nss_ldap_so_SOURCES) $(NSS_LDAP_SOURCES) + OBJECTS = $(nss_ldap_so_OBJECTS) $(NSS_LDAP_OBJECTS) + all: all-redirect .SUFFIXES: - .SUFFIXES: .c .o .obj --$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) -- cd $(top_srcdir) && \ -- $(AUTOMAKE) --gnu Makefile --Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -- cd $(top_builddir) && \ -- CONFIG_HEADERS= CONFIG_LINKS= \ -- CONFIG_FILES=$@ $(SHELL) ./config.status + .SUFFIXES: .S .c .o .s +-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +- cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile ++#$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) ++# cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile + +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) +- cd $(top_builddir) \ +- && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status - --$(top_builddir)/config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +-$(ACLOCAL_M4): configure.in +- cd $(srcdir) && $(ACLOCAL) +- +-config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - $(SHELL) ./config.status --recheck --$(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) +-$(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) - cd $(srcdir) && $(AUTOCONF) -+#$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) -+# cd $(top_srcdir) && \ -+# $(AUTOMAKE) --gnu Makefile -+#Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -+# cd $(top_builddir) && \ -+# CONFIG_HEADERS= CONFIG_LINKS= \ -+# CONFIG_FILES=$@ $(SHELL) ./config.status -+# -+#$(top_builddir)/config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) ++#Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) ++# cd $(top_builddir) \ ++# && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status ++ ++#$(ACLOCAL_M4): configure.in ++# cd $(srcdir) && $(ACLOCAL) ++ ++#config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +# $(SHELL) ./config.status --recheck -+#$(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) ++#$(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) +# cd $(srcdir) && $(AUTOCONF) --$(ACLOCAL_M4): configure.in -- cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) -+#$(ACLOCAL_M4): configure.in -+# cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) config.h: stamp-h @if test ! -f $@; then \ - rm -f stamp-h; \ -@@ -248,21 +240,11 @@ - @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/aix_authmeth.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/dnsconfig.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/irs-nss.Po@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/ldap-alias.Po@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/ldap-automount.Po@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/ldap-bp.Po@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/ldap-ethers.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/ldap-grp.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/ldap-hosts.Po@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/ldap-netgrp.Po@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/ldap-network.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/ldap-nss.Po@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/ldap-proto.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/ldap-pwd.Po@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/ldap-rpc.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/ldap-schema.Po@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/ldap-service.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/ldap-sldap.Po@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/ldap-spwd.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/ltf.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/pagectrl.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/resolve.Po@am__quote@ diff --git a/net/nss_ldap/files/patch-configure b/net/nss_ldap/files/patch-configure index 22cdcd374514..c1b61123f4aa 100644 --- a/net/nss_ldap/files/patch-configure +++ b/net/nss_ldap/files/patch-configure @@ -1,123 +1,89 @@ ---- configure.orig Fri Feb 24 08:02:50 2006 -+++ configure Thu Mar 2 02:34:29 2006 -@@ -3884,120 +3884,6 @@ +--- configure.orig Sat May 27 17:06:27 2006 ++++ configure Sat May 27 17:10:45 2006 +@@ -1729,46 +1729,46 @@ + fi done - --for ac_header in nsswitch.h +- for ac_hdr in nsswitch.h -do --as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` --if eval "test \"\${$as_ac_Header+set}\" = set"; then -- echo "$as_me:$LINENO: checking for $ac_header" >&5 --echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 --if eval "test \"\${$as_ac_Header+set}\" = set"; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --fi --echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 --echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 --else -- # Is the header compilable? --echo "$as_me:$LINENO: checking $ac_header usability" >&5 --echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 --cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" --#include "confdefs.h" --$ac_includes_default --#include <$ac_header> --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_header_compiler=yes +-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` +-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +-echo "configure:1737: checking for $ac_hdr" >&5 +-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 -else -- echo "$as_me: failed program was:" >&5 --cat conftest.$ac_ext >&5 --ac_header_compiler=no --fi --rm -f conftest.$ac_objext conftest.$ac_ext --echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 --echo "${ECHO_T}$ac_header_compiler" >&6 -- --# Is the header present? --echo "$as_me:$LINENO: checking $ac_header presence" >&5 --echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 --cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" +- cat > conftest.$ac_ext < --_ACEOF --if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 -- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -- ac_status=$? -- egrep -v '^ *\+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null; then -- if test -s conftest.err; then -- ac_cpp_err=$ac_c_preproc_warn_flag -- else -- ac_cpp_err= -- fi --else -- ac_cpp_err=yes --fi --if test -z "$ac_cpp_err"; then -- ac_header_preproc=yes +-#include <$ac_hdr> +-EOF +-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:1747: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` +-if test -z "$ac_err"; then +- rm -rf conftest* +- eval "ac_cv_header_$ac_safe=yes" -else -- echo "$as_me: failed program was:" >&5 +- echo "$ac_err" >&5 +- echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 -- ac_header_preproc=no +- rm -rf conftest* +- eval "ac_cv_header_$ac_safe=no" -fi --rm -f conftest.err conftest.$ac_ext --echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 --echo "${ECHO_T}$ac_header_preproc" >&6 -- --# So? What about this header? --case $ac_header_compiler:$ac_header_preproc in -- yes:no ) -- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 --echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 --echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; -- no:yes ) -- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 --echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 --echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 --echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; --esac --echo "$as_me:$LINENO: checking for $ac_header" >&5 --echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 --if eval "test \"\${$as_ac_Header+set}\" = set"; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- eval "$as_ac_Header=$ac_header_preproc" --fi --echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 --echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -- +-rm -f conftest* -fi --if test `eval echo '${'$as_ac_Header'}'` = yes; then -- cat >>confdefs.h <<_ACEOF --#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 --_ACEOF -- +-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then +- echo "$ac_t""yes" 1>&6 +- ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` +- cat >> confdefs.h <&6 -fi -- -done - -- - for ac_header in irs.h ++# for ac_hdr in nsswitch.h ++#do ++#ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` ++#echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 ++#echo "configure:1737: checking for $ac_hdr" >&5 ++#if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then ++# echo $ac_n "(cached) $ac_c" 1>&6 ++#else ++# cat > conftest.$ac_ext < ++#EOF ++#ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ++#{ (eval echo configure:1747: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++#ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` ++#if test -z "$ac_err"; then ++# rm -rf conftest* ++# eval "ac_cv_header_$ac_safe=yes" ++#else ++# echo "$ac_err" >&5 ++# echo "configure: failed program was:" >&5 ++# cat conftest.$ac_ext >&5 ++# rm -rf conftest* ++# eval "ac_cv_header_$ac_safe=no" ++#fi ++#rm -f conftest* ++#fi ++#if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then ++# echo "$ac_t""yes" 1>&6 ++# ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` ++# cat >> confdefs.h <&6 ++#fi ++#done ++# + for ac_hdr in irs.h do - as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` + ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` diff --git a/net/nss_ldap/files/patch-ldap-nss.c b/net/nss_ldap/files/patch-ldap-nss.c index 000f0058bf1b..2622dc3b1726 100644 --- a/net/nss_ldap/files/patch-ldap-nss.c +++ b/net/nss_ldap/files/patch-ldap-nss.c @@ -1,11 +1,11 @@ ---- ldap-nss.c.orig Sat Mar 25 00:26:47 2006 -+++ ldap-nss.c Sat Mar 25 00:26:53 2006 -@@ -68,7 +68,7 @@ +--- ldap-nss.c.orig Sat May 27 16:23:40 2006 ++++ ldap-nss.c Sat May 27 16:23:52 2006 +@@ -69,7 +69,7 @@ #endif /* Try to handle systems with both SASL libraries installed */ -#if defined(HAVE_SASL_SASL_H) && defined(HAVE_SASL_AUXPROP_REQUEST) -+#if defined(HAVE_SASL_SASL_H) ++#if defined(HAVE_SASL_SASL_H) #include #elif defined(HAVE_SASL_H) #include -- cgit