View | Details | Raw Unified | Return to bug 129445
Collapse All | Expand All

(-)ports/net/nss_ldap/Makefile (-3 / +5 lines)
Lines 14-27 Link Here
14
MAINTAINER=	kazakov@gmail.com
14
MAINTAINER=	kazakov@gmail.com
15
COMMENT=	RFC 2307 NSS module
15
COMMENT=	RFC 2307 NSS module
16
16
17
NSS_LDAP_VERSION=257
17
NSS_LDAP_VERSION=264
18
18
19
GNU_CONFIGURE=	yes
19
GNU_CONFIGURE=	yes
20
USE_GMAKE=	yes
20
USE_GMAKE=	yes
21
USE_AUTOTOOLS=	automake:19 aclocal:19 autoconf:262 autoheader:262
21
USE_LDCONFIG=	yes
22
USE_LDCONFIG=	yes
22
USE_OPENLDAP=	yes
23
USE_OPENLDAP=	yes
23
24
24
PLIST_FILES=	etc/nss_ldap.conf.sample lib/nss_ldap.so.1
25
26
PLIST_FILES=	etc/nss_ldap.conf.sample \
27
		lib/nss_ldap.so.1
25
28
26
CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
29
CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
27
		LDFLAGS="-L${LOCALBASE}/lib -Wl,-rpath,${LOCALBASE}/lib"
30
		LDFLAGS="-L${LOCALBASE}/lib -Wl,-rpath,${LOCALBASE}/lib"
Lines 29-35 Link Here
29
CONFIGURE_ARGS=	--with-ldap-conf-file=${PREFIX}/etc/nss_ldap.conf \
32
CONFIGURE_ARGS=	--with-ldap-conf-file=${PREFIX}/etc/nss_ldap.conf \
30
		--with-ldap-secret-file=${PREFIX}/etc/nss_ldap.secret \
33
		--with-ldap-secret-file=${PREFIX}/etc/nss_ldap.secret \
31
		--enable-rfc2307bis \
34
		--enable-rfc2307bis \
32
		--enable-schema-mapping \
33
		--enable-paged-results \
35
		--enable-paged-results \
34
		--enable-configurable-krb5-ccname-env
36
		--enable-configurable-krb5-ccname-env
35
37
(-)ports/net/nss_ldap/distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
MD5 (nss_ldap-257.tar.gz) = 8b9c3d91c67ba05d4135f042dd9a35f2
1
MD5 (nss_ldap-264.tar.gz) = eebab40c6ce2f54e5c377b4895c0c93a
2
SHA256 (nss_ldap-257.tar.gz) = 506a89bf9d8fac4182e52cb1a7e9dc5310be865f7c2430b2602d4080c9140dae
2
SHA256 (nss_ldap-264.tar.gz) = 556198f2774bdb61a597da3fa8a5ecc80a3271ed9ab177760df7c4f22d6b1d25
3
SIZE (nss_ldap-257.tar.gz) = 229299
3
SIZE (nss_ldap-264.tar.gz) = 278134
(-)ports/net/nss_ldap/files/patch-Makefile.am (+39 lines)
Added Link Here
1
--- Makefile.am.orig	2007-10-29 06:30:12.000000000 -0700
2
+++ Makefile.am	2008-09-26 20:44:49.000000000 -0700
3
@@ -9,8 +9,12 @@
4
 if AIX
5
 INST_GID=system
6
 else
7
+if FreeBSD
8
+INST_GID=wheel
9
+else
10
 INST_GID=root
11
 endif
12
+endif
13
 
14
 EXTRA_DIST = CVSVersionInfo.txt ChangeLog \
15
 	     AUTHORS ANNOUNCE NEWS INSTALL README LICENSE.OpenLDAP COPYING\
16
@@ -18,11 +22,10 @@
17
 
18
 man_MANS = nss_ldap.5
19
 
20
-nss_ldap_so_SOURCES = ldap-nss.c ldap-pwd.c ldap-grp.c ldap-netgrp.c ldap-rpc.c \
21
-	ldap-hosts.c ldap-network.c ldap-proto.c ldap-spwd.c \
22
-	ldap-alias.c ldap-service.c ldap-schema.c ldap-ethers.c \
23
-	ldap-bp.c ldap-automount.c util.c ltf.c snprintf.c resolve.c \
24
-	dnsconfig.c irs-nss.c pagectrl.c ldap-sldap.c ldap-init-krb5-cache.c
25
+nss_ldap_so_SOURCES = \
26
+	ldap-nss.c ldap-pwd.c ldap-grp.c ldap-hosts.c ldap-schema.c \
27
+	util.c ltf.c snprintf.c resolve.c dnsconfig.c irs-nss.c pagectrl.c \
28
+	ldap-init-krb5-cache.c bsdnss.c
29
 
30
 nss_ldap_so_LDFLAGS = @nss_ldap_so_LDFLAGS@
31
 
32
@@ -102,7 +105,6 @@
33
 		$(mkinstalldirs) $(DESTDIR)$(dir $(NSS_LDAP_PATH_CONF)); \
34
 		$(INSTALL_DATA) -o $(INST_UID) -g $(INST_GID) $(srcdir)/ldap.conf $(DESTDIR)$(NSS_LDAP_PATH_CONF); \
35
 	fi
36
-	$(INSTALL_DATA) -o $(INST_UID) -g $(INST_GID) $(srcdir)/nsswitch.ldap $(DESTDIR)$(sysconfdir)/nsswitch.ldap; 
37
 
38
 uninstall-local:
39
 	@$(NORMAL_UNINSTALL)
(-)ports/net/nss_ldap/files/patch-Makefile.in (-82 lines)
Removed Link Here
1
--- Makefile.in.orig	Sat May 27 16:26:52 2006
2
+++ Makefile.in	Sat May 27 16:46:05 2006
3
@@ -82,7 +82,7 @@
4
 
5
 man_MANS = nss_ldap.5
6
 
7
-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
8
+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
9
 
10
 
11
 nss_ldap_so_LDFLAGS = @nss_ldap_so_LDFLAGS@
12
@@ -118,11 +118,9 @@
13
 CPPFLAGS = @CPPFLAGS@
14
 LDFLAGS = @LDFLAGS@
15
 LIBS = @LIBS@
16
-nss_ldap_so_OBJECTS =  ldap-nss.o ldap-pwd.o ldap-grp.o ldap-netgrp.o \
17
-ldap-rpc.o ldap-hosts.o ldap-network.o ldap-proto.o ldap-spwd.o \
18
-ldap-alias.o ldap-service.o ldap-schema.o ldap-ethers.o ldap-bp.o \
19
-ldap-automount.o util.o ltf.o snprintf.o resolve.o dnsconfig.o \
20
-irs-nss.o pagectrl.o ldap-sldap.o
21
+nss_ldap_so_OBJECTS =  ldap-nss.o ldap-pwd.o ldap-grp.o \
22
+ldap-hosts.o ldap-schema.o util.o ltf.o snprintf.o resolve.o dnsconfig.o \
23
+irs-nss.o pagectrl.o bsdnss.o
24
 nss_ldap_so_LDADD = $(LDADD)
25
 nss_ldap_so_DEPENDENCIES = 
26
 NSS_LDAP_OBJECTS =  ldap-nss.o ldap-grp.o ldap-pwd.o ldap-netgrp.o \
27
@@ -147,34 +145,34 @@
28
 
29
 TAR = tar
30
 GZIP_ENV = --best
31
-DEP_FILES =  .deps/aix_authmeth.P .deps/dnsconfig.P .deps/irs-nss.P \
32
-.deps/ldap-alias.P .deps/ldap-automount.P .deps/ldap-bp.P \
33
-.deps/ldap-ethers.P .deps/ldap-grp.P .deps/ldap-hosts.P \
34
-.deps/ldap-netgrp.P .deps/ldap-network.P .deps/ldap-nss.P \
35
-.deps/ldap-proto.P .deps/ldap-pwd.P .deps/ldap-rpc.P \
36
-.deps/ldap-schema.P .deps/ldap-service.P .deps/ldap-sldap.P \
37
-.deps/ldap-spwd.P .deps/ltf.P .deps/pagectrl.P .deps/resolve.P \
38
-.deps/snprintf.P .deps/util.P
39
+DEP_FILES =  .deps/aix_authmeth.P .deps/dnsconfig.P \
40
+.deps/ldap-grp.P .deps/ldap-hosts.P \
41
+.deps/irs-nss.P \
42
+.deps/ldap-nss.P \
43
+.deps/ldap-pwd.P \
44
+.deps/ldap-schema.P \
45
+.deps/ltf.P .deps/pagectrl.P .deps/resolve.P \
46
+.deps/snprintf.P .deps/util.P .deps/bsdnss.Po
47
 SOURCES = $(nss_ldap_so_SOURCES) $(NSS_LDAP_SOURCES)
48
 OBJECTS = $(nss_ldap_so_OBJECTS) $(NSS_LDAP_OBJECTS)
49
 
50
 all: all-redirect
51
 .SUFFIXES:
52
 .SUFFIXES: .S .c .o .s
53
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
54
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile
55
+#$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
56
+#	cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile
57
 
58
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
59
-	cd $(top_builddir) \
60
-	  && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
61
-
62
-$(ACLOCAL_M4):  configure.in 
63
-	cd $(srcdir) && $(ACLOCAL)
64
-
65
-config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
66
-	$(SHELL) ./config.status --recheck
67
-$(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
68
-	cd $(srcdir) && $(AUTOCONF)
69
+#Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
70
+#	cd $(top_builddir) \
71
+#	  && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
72
+
73
+#$(ACLOCAL_M4):  configure.in 
74
+#	cd $(srcdir) && $(ACLOCAL)
75
+
76
+#config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
77
+#	$(SHELL) ./config.status --recheck
78
+#$(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
79
+#	cd $(srcdir) && $(AUTOCONF)
80
 
81
 config.h: stamp-h
82
 	@if test ! -f $@; then \
(-)ports/net/nss_ldap/files/patch-configure (-89 lines)
Removed Link Here
1
--- configure.orig	Sat May 27 17:06:27 2006
2
+++ configure	Sat May 27 17:10:45 2006
3
@@ -1729,46 +1729,46 @@
4
 fi
5
 done
6
 
7
-     for ac_hdr in nsswitch.h
8
-do
9
-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
10
-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
11
-echo "configure:1737: checking for $ac_hdr" >&5
12
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
13
-  echo $ac_n "(cached) $ac_c" 1>&6
14
-else
15
-  cat > conftest.$ac_ext <<EOF
16
-#line 1742 "configure"
17
-#include "confdefs.h"
18
-#include <$ac_hdr>
19
-EOF
20
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
21
-{ (eval echo configure:1747: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
22
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
23
-if test -z "$ac_err"; then
24
-  rm -rf conftest*
25
-  eval "ac_cv_header_$ac_safe=yes"
26
-else
27
-  echo "$ac_err" >&5
28
-  echo "configure: failed program was:" >&5
29
-  cat conftest.$ac_ext >&5
30
-  rm -rf conftest*
31
-  eval "ac_cv_header_$ac_safe=no"
32
-fi
33
-rm -f conftest*
34
-fi
35
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
36
-  echo "$ac_t""yes" 1>&6
37
-    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
38
-  cat >> confdefs.h <<EOF
39
-#define $ac_tr_hdr 1
40
-EOF
41
- 
42
-else
43
-  echo "$ac_t""no" 1>&6
44
-fi
45
-done
46
-
47
+#     for ac_hdr in nsswitch.h
48
+#do
49
+#ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
50
+#echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
51
+#echo "configure:1737: checking for $ac_hdr" >&5
52
+#if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
53
+#  echo $ac_n "(cached) $ac_c" 1>&6
54
+#else
55
+#  cat > conftest.$ac_ext <<EOF
56
+##line 1742 "configure"
57
+##include "confdefs.h"
58
+##include <$ac_hdr>
59
+#EOF
60
+#ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
61
+#{ (eval echo configure:1747: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
62
+#ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
63
+#if test -z "$ac_err"; then
64
+#  rm -rf conftest*
65
+#  eval "ac_cv_header_$ac_safe=yes"
66
+#else
67
+#  echo "$ac_err" >&5
68
+#  echo "configure: failed program was:" >&5
69
+#  cat conftest.$ac_ext >&5
70
+#  rm -rf conftest*
71
+#  eval "ac_cv_header_$ac_safe=no"
72
+#fi
73
+#rm -f conftest*
74
+#fi
75
+#if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
76
+#  echo "$ac_t""yes" 1>&6
77
+#    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
78
+#  cat >> confdefs.h <<EOF
79
+##define $ac_tr_hdr 1
80
+#EOF
81
+# 
82
+#else
83
+#  echo "$ac_t""no" 1>&6
84
+#fi
85
+#done
86
+#
87
      for ac_hdr in irs.h
88
 do
89
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
(-)ports/net/nss_ldap/files/patch-configure.in (+26 lines)
Added Link Here
1
--- configure.in.orig	2007-10-29 06:30:12.000000000 -0700
2
+++ configure.in	2008-09-26 20:38:20.000000000 -0700
3
@@ -96,11 +96,15 @@
4
 linux*) nss_ldap_so_LDFLAGS="-shared -Wl,-Bdynamic -Wl,--version-script,\$(srcdir)/exports.linux" ;;
5
 *) nss_ldap_so_LDFLAGS="-shared -Wl,-Bdynamic" ;;
6
 esac
7
+case "$target_os" in
8
+freebsd*) TARGET_OS=FreeBSD ;;
9
+esac
10
 
11
 AM_CONDITIONAL(GCC, test "$GCC" = "yes")
12
 AM_CONDITIONAL(GLIBC, test "$target_os" = "linux" -o "$target_os" = "linux-gnu")
13
 AM_CONDITIONAL(AIX, test "$TARGET_OS" = AIX)
14
 AM_CONDITIONAL(HPUX, test "$TARGET_OS" = HPUX)
15
+AM_CONDITIONAL(FreeBSD, test "$TARGET_OS" = FreeBSD)
16
 
17
 AM_CONDITIONAL(USE_NATIVE_LINKER, test -n "$nss_ldap_so_LD")
18
 
19
@@ -152,7 +156,6 @@
20
   aix*) AC_CHECK_HEADERS(irs.h usersec.h) ;;
21
   hpux*) AC_CHECK_HEADERS(nsswitch.h) ;;
22
   *) AC_CHECK_HEADERS(nss.h)
23
-     AC_CHECK_HEADERS(nsswitch.h)
24
      AC_CHECK_HEADERS(irs.h) ;;
25
 esac
26
 AC_CHECK_HEADERS(thread.h)
(-)ports/net/nss_ldap/files/patch-ldap-pwd.c (-3 / +3 lines)
Lines 1-8 Link Here
1
--- ldap-pwd.c.orig	Fri Feb 24 11:02:50 2006
1
--- ldap-pwd.c.orig	2008-10-30 21:50:15.000000000 +0100
2
+++ ldap-pwd.c	Thu May 11 14:52:42 2006
2
+++ ldap-pwd.c	2008-12-06 00:37:30.216966282 +0100
3
@@ -21,7 +21,10 @@
3
@@ -21,7 +21,10 @@
4
 static char rcsId[] =
4
 static char rcsId[] =
5
   "$Id: ldap-pwd.c,v 2.46 2006/01/11 18:03:49 lukeh Exp $";
5
   "$Id: ldap-pwd.c,v 2.48 2008/10/30 20:49:47 lukeh Exp $";
6
 
6
 
7
+#include <sys/types.h>
7
+#include <sys/types.h>
8
+#include <unistd.h>
8
+#include <unistd.h>

Return to bug 129445