Date: Tue, 29 Jun 2010 20:40:04 GMT From: "Alexander V. Chernikov" <melifaro@ipfw.ru> To: freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/147293: [PATCH] net/nss_ldapd: update to 0.7.6 Message-ID: <201006292040.o5TKe4n7051808@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/147293; it has been noted by GNATS. From: "Alexander V. Chernikov" <melifaro@ipfw.ru> To: bug-followup@FreeBSD.org, ports@christianserving.org Cc: Subject: Re: ports/147293: [PATCH] net/nss_ldapd: update to 0.7.6 Date: Wed, 30 Jun 2010 00:37:16 +0400 This is a multi-part message in MIME format. --------------050601090804030605010206 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Sorry for a long reply. Port should be renamed to nss-pam-ldapd (due to original software renaming) Changes: * Move to 0.7.6 (originally submitted by Jim Riggs <ports@christianserving.org>) * Fix plist * Prepare for NSS_COMPAT hack deprecation * define LICENSE Alternative link: http://static.ipfw.ru/patches/pam_ldapd_20100630.diff --------------050601090804030605010206 Content-Type: text/plain; name="pam_ldapd.diff" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="pam_ldapd.diff" diff -urN net/nss_ldapd/Makefile net/nss-pam-ldapd/Makefile --- net/nss_ldapd/Makefile 2010-05-15 14:35:30.000000000 +0400 +++ net/nss-pam-ldapd/Makefile 2010-06-30 00:32:31.000000000 +0400 @@ -5,12 +5,13 @@ # $FreeBSD: ports/net/nss_ldapd/Makefile,v 1.4 2010/05/14 13:23:00 pav Exp $ # -PORTNAME= nss_ldapd -PORTVERSION= 0.7.3 +PORTNAME= nss-pam-ldapd +PORTVERSION= 0.7.6 CATEGORIES= net MASTER_SITES= http://arthurdejong.org/nss-pam-ldapd/ \ http://static.ipfw.ru/files/ -DISTNAME= nss-pam-ldapd-${PORTVERSION} +LICENSE= LGPL21 LGPL3 +LICENSE_COMB= dual MAINTAINER= melifaro@ipfw.ru COMMENT= Advanced fork of nss_ldap @@ -24,9 +25,9 @@ NSLCD_PIDFILE?= /var/run/nslcd.pid NSLCD_SOCKET?= /var/run/nslcd.ctl -OPTIONS= NSS_COMPAT "Enable nss_ldap compatibility" on \ - SASL "Enable SASL" off \ - PAM "Build pam_ldap" on +OPTIONS= SASL "Enable SASL" off \ + PAM "Build pam_ldap" on \ + NSS_COMPAT "Enable nss_ldap compatibility (DEPRECATED)" off USERS= nslcd GROUPS= nslcd @@ -50,6 +51,7 @@ .if defined(WITH_NSS_COMPAT) CONFIGURE_ARGS+= --enable-nss_compat --disable-configfile-checking --with-ldap-conf-file=${PREFIX}/etc/nss_ldap.conf +EXTRA_PATCHES+= ${FILESDIR}/nss_patch.diff PLIST_SUB+= CONFIG="nss_ldap" .else CONFIGURE_ARGS+= --with-ldap-conf-file=${PREFIX}/etc/nss_ldapd.conf @@ -104,6 +106,7 @@ @${ECHO_MSG} .if defined(WITH_NSS_COMPAT) @${ECHO_MSG} " NSS_LDAP compatibility ENABLED." + @${ECHO_MSG} " It is DEPRECATED now and will be removed." @${ECHO_MSG} @${ECHO_MSG} " LDAP configuration: ${PREFIX}/etc/nss_ldap.conf" @${ECHO_MSG} " Secret file: ${PREFIX}/etc/nss_ldap.secret" diff -urN net/nss_ldapd/distinfo net/nss-pam-ldapd/distinfo --- net/nss_ldapd/distinfo 2010-05-15 14:35:30.000000000 +0400 +++ net/nss-pam-ldapd/distinfo 2010-06-29 22:33:18.000000000 +0400 @@ -1,3 +1,3 @@ -MD5 (nss-pam-ldapd-0.7.3.tar.gz) = 688833d959f1878a139d484e980d160e -SHA256 (nss-pam-ldapd-0.7.3.tar.gz) = db300db75fdf7ab74fae8fcb7cfecb5adace49ecf715d308581b22575bc128da -SIZE (nss-pam-ldapd-0.7.3.tar.gz) = 443042 +MD5 (nss-pam-ldapd-0.7.6.tar.gz) = 44aab952978fe193d65a14d3631c7957 +SHA256 (nss-pam-ldapd-0.7.6.tar.gz) = 32cf64f73744c35cae5de987fb4ee158476434b84a6f6be28bbbd478e1cbc30d +SIZE (nss-pam-ldapd-0.7.6.tar.gz) = 452598 diff -urN net/nss_ldapd/files/nss_patch.diff net/nss-pam-ldapd/files/nss_patch.diff --- net/nss_ldapd/files/nss_patch.diff 2010-01-10 01:45:55.000000000 +0300 +++ net/nss-pam-ldapd/files/nss_patch.diff 2010-06-29 23:57:18.000000000 +0400 @@ -81,3 +81,215 @@ } /* SASL authentication options */ else if (strcasecmp(keyword,"sasl_authcid")==0) +--- config.h.in.orig 2009-12-20 17:49:41.000000000 +0300 ++++ config.h.in 2009-12-20 17:41:46.000000000 +0300 +@@ -3,6 +3,9 @@ + /* Whether to check configfile options. */ + #undef ENABLE_CONFIGFILE_CHECKING + ++/* Whether to check nss_compat options. */ ++#undef ENABLE_NSS_COMPAT ++ + /* Define to 1 if you have the <aliases.h> header file. */ + #undef HAVE_ALIASES_H + +--- configure.orig 2010-02-27 09:17:45.000000000 -0600 ++++ configure 2010-04-29 07:28:11.044647697 -0500 +@@ -738,6 +738,7 @@ + enable_sasl + enable_kerberos + enable_configfile_checking ++enable_nss_compat + with_ldap_conf_file + with_bindpw_file + with_nslcd_pidfile +@@ -1386,6 +1387,7 @@ + --disable-kerberos disable Kerberos support [[default=enabled]] + --disable-configfile-checking + check configfile options [[default=enabled]] ++ --enable-nss_compat check nss_compat option [[default=disabled]] + + Optional Packages: + --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] +@@ -4782,6 +4784,181 @@ + + fi + ++# check whether nss_compat options should be checked ++{ $as_echo "$as_me:$LINENO: checking whether to check nss_compat option" >&5 ++$as_echo_n "checking whether to check nss_compat option... " >&6; } ++# Check whether --enable-nss_compat was given. ++if test "${enable_nss_compat+set}" = set; then ++ enableval=$enable_nss_compat; nss_compat=$enableval ++else ++ nss_compat="no" ++fi ++ ++{ $as_echo "$as_me:$LINENO: result: $nss_compat" >&5 ++$as_echo "$nss_compat" >&6; } ++if test "x$nss_compat" = "xyes" ++then ++ ++for ac_header in libgen.h ++do ++as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then ++ { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 ++$as_echo_n "checking for $ac_header... " >&6; } ++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then ++ $as_echo_n "(cached) " >&6 ++fi ++ac_res=`eval 'as_val=${'$as_ac_Header'} ++ $as_echo "$as_val"'` ++ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 ++$as_echo "$ac_res" >&6; } ++else ++ # Is the header compilable? ++{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 ++$as_echo_n "checking $ac_header usability... " >&6; } ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++$ac_includes_default ++#include <$ac_header> ++_ACEOF ++rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" ++$as_echo "$ac_try_echo") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then ++ ac_header_compiler=yes ++else ++ $as_echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_header_compiler=no ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 ++$as_echo "$ac_header_compiler" >&6; } ++ ++# Is the header present? ++{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 ++$as_echo_n "checking $ac_header presence... " >&6; } ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++#include <$ac_header> ++_ACEOF ++if { (ac_try="$ac_cpp conftest.$ac_ext" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" ++$as_echo "$ac_try_echo") >&5 ++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } >/dev/null && { ++ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || ++ test ! -s conftest.err ++ }; then ++ ac_header_preproc=yes ++else ++ $as_echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_header_preproc=no ++fi ++ ++rm -f conftest.err conftest.$ac_ext ++{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 ++$as_echo "$ac_header_preproc" >&6; } ++ ++# So? What about this header? ++case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in ++ yes:no: ) ++ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 ++$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} ++ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 ++$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} ++ ac_header_preproc=yes ++ ;; ++ no:yes:* ) ++ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 ++$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} ++ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 ++$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} ++ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 ++$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} ++ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 ++$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} ++ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 ++$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} ++ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 ++$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} ++ ( cat <<\_ASBOX ++## -------------------------------------- ## ++## Report this to arthur@arthurdejong.org ## ++## -------------------------------------- ## ++_ASBOX ++ ) | sed "s/^/$as_me: WARNING: /" >&2 ++ ;; ++esac ++{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 ++$as_echo_n "checking for $ac_header... " >&6; } ++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then ++ $as_echo_n "(cached) " >&6 ++else ++ eval "$as_ac_Header=\$ac_header_preproc" ++fi ++ac_res=`eval 'as_val=${'$as_ac_Header'} ++ $as_echo "$as_val"'` ++ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 ++$as_echo "$ac_res" >&6; } ++ ++fi ++if test `eval 'as_val=${'$as_ac_Header'} ++ $as_echo "$as_val"'` = yes; then ++ cat >>confdefs.h <<_ACEOF ++#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 ++_ACEOF ++ ++else ++ { { $as_echo "$as_me:$LINENO: error: libgen.h is required for nss_compat" >&5 ++$as_echo "$as_me: error: libgen.h is required for nss_compat" >&2;} ++ { (exit 1); exit 1; }; } ++fi ++ ++done ++ ++ ++cat >>confdefs.h <<\_ACEOF ++#define ENABLE_NSS_COMPAT 1 ++_ACEOF ++ ++fi ++ + # check the name of the configuration file + + # Check whether --with-ldap-conf-file was given. diff -urN net/nss_ldapd/files/patch-Makefile.in net/nss-pam-ldapd/files/patch-Makefile.in --- net/nss_ldapd/files/patch-Makefile.in 1970-01-01 03:00:00.000000000 +0300 +++ net/nss-pam-ldapd/files/patch-Makefile.in 2010-06-29 23:27:48.000000000 +0400 @@ -0,0 +1,18 @@ +--- Makefile.in.orig 2010-06-29 23:25:51.000000000 +0400 ++++ Makefile.in 2010-06-29 23:26:53.000000000 +0400 +@@ -759,13 +759,14 @@ + + # install a default configuration file if it is not already there + install-nslcd_conf: ++ $(INSTALL_DATA) $(srcdir)/nslcd.conf $(DESTDIR)$(NSLCD_CONF_PATH).sample + @if [ -f $(DESTDIR)$(NSLCD_CONF_PATH) ]; then \ + echo "$(DESTDIR)$(NSLCD_CONF_PATH) already exists, install will not overwrite"; \ + else \ + $(INSTALL_DATA) $(srcdir)/nslcd.conf $(DESTDIR)$(NSLCD_CONF_PATH) || true; \ + fi + uninstall-nslcd_conf: +- -rm -f $(DESTDIR)$(NSLCD_CONF_PATH) ++ -rm -f $(DESTDIR)$(NSLCD_CONF_PATH).sample + + # target for easily creating a Debian package + # the find is an ugly hack to fix a bug if being built on an nfs filesystem diff -urN net/nss_ldapd/files/patch-configure net/nss-pam-ldapd/files/patch-configure --- net/nss_ldapd/files/patch-configure 2010-05-14 17:23:00.000000000 +0400 +++ net/nss-pam-ldapd/files/patch-configure 1970-01-01 03:00:00.000000000 +0300 @@ -1,212 +0,0 @@ ---- config.h.in.orig 2009-12-20 17:49:41.000000000 +0300 -+++ config.h.in 2009-12-20 17:41:46.000000000 +0300 -@@ -3,6 +3,9 @@ - /* Whether to check configfile options. */ - #undef ENABLE_CONFIGFILE_CHECKING - -+/* Whether to check nss_compat options. */ -+#undef ENABLE_NSS_COMPAT -+ - /* Define to 1 if you have the <aliases.h> header file. */ - #undef HAVE_ALIASES_H - ---- configure.orig 2010-02-27 09:17:45.000000000 -0600 -+++ configure 2010-04-29 07:28:11.044647697 -0500 -@@ -738,6 +738,7 @@ - enable_sasl - enable_kerberos - enable_configfile_checking -+enable_nss_compat - with_ldap_conf_file - with_bindpw_file - with_nslcd_pidfile -@@ -1386,6 +1387,7 @@ - --disable-kerberos disable Kerberos support [[default=enabled]] - --disable-configfile-checking - check configfile options [[default=enabled]] -+ --enable-nss_compat check nss_compat option [[default=disabled]] - - Optional Packages: - --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] -@@ -4782,6 +4784,181 @@ - - fi - -+# check whether nss_compat options should be checked -+{ $as_echo "$as_me:$LINENO: checking whether to check nss_compat option" >&5 -+$as_echo_n "checking whether to check nss_compat option... " >&6; } -+# Check whether --enable-nss_compat was given. -+if test "${enable_nss_compat+set}" = set; then -+ enableval=$enable_nss_compat; nss_compat=$enableval -+else -+ nss_compat="no" -+fi -+ -+{ $as_echo "$as_me:$LINENO: result: $nss_compat" >&5 -+$as_echo "$nss_compat" >&6; } -+if test "x$nss_compat" = "xyes" -+then -+ -+for ac_header in libgen.h -+do -+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -+ { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -+$as_echo_n "checking for $ac_header... " >&6; } -+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -+ $as_echo_n "(cached) " >&6 -+fi -+ac_res=`eval 'as_val=${'$as_ac_Header'} -+ $as_echo "$as_val"'` -+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -+$as_echo "$ac_res" >&6; } -+else -+ # Is the header compilable? -+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 -+$as_echo_n "checking $ac_header usability... " >&6; } -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+$ac_includes_default -+#include <$ac_header> -+_ACEOF -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then -+ ac_header_compiler=yes -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_header_compiler=no -+fi -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -+$as_echo "$ac_header_compiler" >&6; } -+ -+# Is the header present? -+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 -+$as_echo_n "checking $ac_header presence... " >&6; } -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+#include <$ac_header> -+_ACEOF -+if { (ac_try="$ac_cpp conftest.$ac_ext" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } >/dev/null && { -+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || -+ test ! -s conftest.err -+ }; then -+ ac_header_preproc=yes -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_header_preproc=no -+fi -+ -+rm -f conftest.err conftest.$ac_ext -+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -+$as_echo "$ac_header_preproc" >&6; } -+ -+# So? What about this header? -+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in -+ yes:no: ) -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} -+ ac_header_preproc=yes -+ ;; -+ no:yes:* ) -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -+$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -+$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} -+ ( cat <<\_ASBOX -+## -------------------------------------- ## -+## Report this to arthur@arthurdejong.org ## -+## -------------------------------------- ## -+_ASBOX -+ ) | sed "s/^/$as_me: WARNING: /" >&2 -+ ;; -+esac -+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -+$as_echo_n "checking for $ac_header... " >&6; } -+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -+ $as_echo_n "(cached) " >&6 -+else -+ eval "$as_ac_Header=\$ac_header_preproc" -+fi -+ac_res=`eval 'as_val=${'$as_ac_Header'} -+ $as_echo "$as_val"'` -+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -+$as_echo "$ac_res" >&6; } -+ -+fi -+if test `eval 'as_val=${'$as_ac_Header'} -+ $as_echo "$as_val"'` = yes; then -+ cat >>confdefs.h <<_ACEOF -+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 -+_ACEOF -+ -+else -+ { { $as_echo "$as_me:$LINENO: error: libgen.h is required for nss_compat" >&5 -+$as_echo "$as_me: error: libgen.h is required for nss_compat" >&2;} -+ { (exit 1); exit 1; }; } -+fi -+ -+done -+ -+ -+cat >>confdefs.h <<\_ACEOF -+#define ENABLE_NSS_COMPAT 1 -+_ACEOF -+ -+fi -+ - # check the name of the configuration file - - # Check whether --with-ldap-conf-file was given. diff -urN net/nss_ldapd/files/patch-nslcd__cfg.c net/nss-pam-ldapd/files/patch-nslcd__cfg.c --- net/nss_ldapd/files/patch-nslcd__cfg.c 2010-05-15 14:35:30.000000000 +0400 +++ net/nss-pam-ldapd/files/patch-nslcd__cfg.c 1970-01-01 03:00:00.000000000 +0300 @@ -1,60 +0,0 @@ ---- nslcd/cfg.c.orig 2009-10-05 21:47:47.000000000 +0400 -+++ nslcd/cfg.c 2009-12-20 18:10:37.000000000 +0300 -@@ -33,6 +33,9 @@ - #include <sys/types.h> - #include <sys/stat.h> - #include <unistd.h> -+#ifdef ENABLE_NSS_COMPAT -+#include <libgen.h> -+#endif - #include <errno.h> - #include <netdb.h> - #include <sys/socket.h> -@@ -665,6 +668,25 @@ - int rc; - char *value; - #endif -+#ifdef ENABLE_NSS_COMPAT -+ /* get secret password */ -+ snprintf(linebuf, sizeof(linebuf), "%s/nss_ldap.secret", dirname(filename)); -+ if ((fp=fopen(linebuf,"r"))==NULL) -+ { -+ log_log(LOG_ERR,"cannot open secret file (%s): %s",linebuf,strerror(errno)); -+ /* exit(EXIT_FAILURE); */ -+ } -+ else if (fgets(linebuf,MAX_LINE_LENGTH,fp)!=NULL) -+ { -+ i=strlen(linebuf); -+ if (i>0) -+ linebuf[i-1]='\0'; -+ cfg->ldc_bindpw=strdup(linebuf); -+ } -+ if (fp!=NULL) -+ fclose(fp); -+#endif -+ - /* open config file */ - if ((fp=fopen(filename,"r"))==NULL) - { -@@ -733,13 +755,20 @@ - get_int(filename,lnr,keyword,&line,&cfg->ldc_version); - get_eol(filename,lnr,keyword,&line); - } -+#ifdef ENABLE_NSS_COMPAT -+ else if (strcasecmp(keyword,"rootbinddn")==0) -+#else - else if (strcasecmp(keyword,"binddn")==0) -+#endif - { - get_restdup(filename,lnr,keyword,&line,&cfg->ldc_binddn); - } - else if (strcasecmp(keyword,"bindpw")==0) - { -- get_restdup(filename,lnr,keyword,&line,&cfg->ldc_bindpw); -+#ifdef ENABLE_NSS_COMPAT -+ if (cfg->ldc_bindpw == NULL) -+#endif -+ get_restdup(filename,lnr,keyword,&line,&cfg->ldc_bindpw); - } - /* SASL authentication options */ - else if (strcasecmp(keyword,"sasl_authcid")==0) diff -urN net/nss_ldapd/files/patch-nss__prototypes.h net/nss-pam-ldapd/files/patch-nss__prototypes.h --- net/nss_ldapd/files/patch-nss__prototypes.h 2010-05-15 14:35:30.000000000 +0400 +++ net/nss-pam-ldapd/files/patch-nss__prototypes.h 2010-06-29 22:59:13.000000000 +0400 @@ -4,7 +4,7 @@ void *nip; /* changed from `service_user *nip' */ }; -+#ifdef __FreeBSD__ ++#ifndef HAVE_ALIASES_H +/* + * Import from aliases.h + */ diff -urN net/nss_ldapd/pkg-descr net/nss-pam-ldapd/pkg-descr --- net/nss_ldapd/pkg-descr 2009-08-14 05:46:44.000000000 +0400 +++ net/nss-pam-ldapd/pkg-descr 2010-06-30 00:22:21.000000000 +0400 @@ -1,11 +1,14 @@ -nss_ldapd is a NSS module which provides an LDAP backend for C library -functions such as getpwnam(3), getgrnam(3), and gethostbyname(3). It -is compliant with RFC 2307, ``An Approach for Using LDAP as a Network -Information Service''. +nss-pam-ldapd, a Name Service Switch (NSS) module and Pluggable Authentication +Module (PAM) that allows your LDAP server to provide user account, group, host +name, alias, netgroup, and basically any other information that you would +normally get from /etc flat files or NIS. It also alows you to do +authentication to an LDAP server. Key differences from nss_ldap: -* lighter nss library (no ldap* dependings) -* server-side connection caching +* lighter NSS library +* lighter PAM library +* simpler internal semantics +* clear separation between NSS, PAM and LDAP code (the server part could easily be implemented in another language) +* less connections to the LDAP server - -WWW: http://arthurdejong.org/nss-ldapd/ +WWW: http://arthurdejong.org/nss-pam-ldapd/ diff -urN net/nss_ldapd/pkg-plist net/nss-pam-ldapd/pkg-plist --- net/nss_ldapd/pkg-plist 2010-05-15 14:35:30.000000000 +0400 +++ net/nss-pam-ldapd/pkg-plist 2010-06-29 23:28:11.000000000 +0400 @@ -1,4 +1,4 @@ -etc/%%CONFIG%%.conf +etc/%%CONFIG%%.conf.sample %%NSS%%lib/nss_ldap.so.1 %%NSLCD%%sbin/nslcd %%PAM%%lib/pam_ldap.so --------------050601090804030605010206--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201006292040.o5TKe4n7051808>