Attachment #111881 for bug #153215

Lines 6-12 Link Here

(-)Makefile (-2 / +3 lines)
6	#	6	#
7		7
8	PORTNAME= nss_ldapd	8	PORTNAME= nss_ldapd
9	PORTVERSION= 0.7.3	9	PORTVERSION= 0.7.13
10	CATEGORIES= net	10	CATEGORIES= net
11	MASTER_SITES= http://arthurdejong.org/nss-pam-ldapd/ \	11	MASTER_SITES= http://arthurdejong.org/nss-pam-ldapd/ \
12	http://static.ipfw.ru/files/	12	http://static.ipfw.ru/files/
Lines 43-49 Link Here
43		43
44	CONFIGURE_ARGS+= --with-nslcd-pidfile=${NSLCD_PIDFILE} \	44	CONFIGURE_ARGS+= --with-nslcd-pidfile=${NSLCD_PIDFILE} \
45	--with-nslcd-socket=${NSLCD_SOCKET} \	45	--with-nslcd-socket=${NSLCD_SOCKET} \
46	--with-ldap-lib=openldap --disable-kerberos	46	--with-ldap-lib=openldap --disable-kerberos \
		47	--with-nss-ldap-soname=nss_ldap.so.1
47		48
48	.if defined(WITHOUT_NSS)	49	.if defined(WITHOUT_NSS)
49	.undef NSS_COMPAT	50	.undef NSS_COMPAT

Lines 1-3 Link Here

(-)distinfo (-3 / +2 lines)
1	MD5 (nss-pam-ldapd-0.7.3.tar.gz) = 688833d959f1878a139d484e980d160e	1	SHA256 (nss-pam-ldapd-0.7.13.tar.gz) = 1bdba144669ac3220162d59bafe5ba4f83404f520bc9ead58b179745c82b8d4a
2	SHA256 (nss-pam-ldapd-0.7.3.tar.gz) = db300db75fdf7ab74fae8fcb7cfecb5adace49ecf715d308581b22575bc128da	2	SIZE (nss-pam-ldapd-0.7.13.tar.gz) = 478944
3	SIZE (nss-pam-ldapd-0.7.3.tar.gz) = 443042




--- ./nss/nss_ldap.map.orig	2010-09-24 07:07:18.000000000 +0000
+++ ./nss/nss_ldap.map		2010-12-16 13:13:25.000000000 +0000
@@ -81,6 +78,27 @@
     _nss_ldap_getspent_r;
     _nss_ldap_endspent;
 
+    # compat 4 bsd 
+    __nss_compat_getgrnam_r;
+    __nss_compat_getgrgid_r;
+    __nss_compat_getgrent_r;
+    __nss_compat_setgrent;
+    __nss_compat_endgrent;
+
+    __nss_compat_getpwnam_r;
+    __nss_compat_getpwuid_r;
+    __nss_compat_getpwent_r;
+    __nss_compat_setpwent;
+    __nss_compat_endpwent;
+
+    __nss_compat_gethostbyname;
+    __nss_compat_gethostbyname2;
+    __nss_compat_gethostbyaddr;
+    
+    # module init
+    nss_module_register;
+
+
   # everything else should not be exported
   local:
     *;




--- nss/prototypes.h.orig	2009-09-04 15:55:35.000000000 +0400
+++ nss/prototypes.h	2009-12-20 15:37:57.000000000 +0300
@@ -84,6 +86,27 @@
   void *nip; /* changed from `service_user *nip' */
 };
 
+#ifdef __FreeBSD__
+/* 
+ * Import from aliases.h
+ */
+struct aliasent
+  {
+    char *alias_name;
+    size_t alias_members_len;
+    char **alias_members;
+    int alias_local;
+  };
+
+struct rpcent
+{
+  char *r_name;         /* Name of server for this rpc program.  */
+  char **r_aliases;     /* Alias list.  */
+  int r_number;         /* RPC program number.  */
+};
+
+#endif
+
 /*
    These are prototypes for functions exported from the ldap NSS module.
    For more complete definitions of these functions check the GLIBC
@@ -166,10 +189,12 @@
 enum nss_status _nss_ldap_getservent_r(struct servent *result,char *buffer,size_t buflen,int *errnop);
 enum nss_status _nss_ldap_endservent(void);

Return to bug 153215

Line 0 Link Here

(-)files/patch-nss__ldap.map (+30 lines)
	1	--- ./nss/nss_ldap.map.orig 2010-09-24 07:07:18.000000000 +0000
	2	+++ ./nss/nss_ldap.map 2010-12-16 13:13:25.000000000 +0000
	3	@@ -81,6 +78,27 @@
	4	_nss_ldap_getspent_r;
	5	_nss_ldap_endspent;
	6
	7	+ # compat 4 bsd
	8	+ __nss_compat_getgrnam_r;
	9	+ __nss_compat_getgrgid_r;
	10	+ __nss_compat_getgrent_r;
	11	+ __nss_compat_setgrent;
	12	+ __nss_compat_endgrent;
	13	+
	14	+ __nss_compat_getpwnam_r;
	15	+ __nss_compat_getpwuid_r;
	16	+ __nss_compat_getpwent_r;
	17	+ __nss_compat_setpwent;
	18	+ __nss_compat_endpwent;
	19	+
	20	+ __nss_compat_gethostbyname;
	21	+ __nss_compat_gethostbyname2;
	22	+ __nss_compat_gethostbyaddr;
	23	+
	24	+ # module init
	25	+ nss_module_register;
	26	+
	27	+
	28	# everything else should not be exported
	29	local:
	30	*;

Lines 1-33 Link Here

(-)files/patch-nss__prototypes.h (-28 lines)
1	--- nss/prototypes.h.orig 2009-09-04 15:55:35.000000000 +0400	1	--- nss/prototypes.h.orig 2009-09-04 15:55:35.000000000 +0400
2	+++ nss/prototypes.h 2009-12-20 15:37:57.000000000 +0300	2	+++ nss/prototypes.h 2009-12-20 15:37:57.000000000 +0300
3	@@ -84,6 +86,27 @@
4	void nip; / changed from `service_user nip' /
5	};
6
7	+#ifdef __FreeBSD__
8	+/*
9	+ * Import from aliases.h
10	+ */
11	+struct aliasent
12	+ {
13	+ char *alias_name;
14	+ size_t alias_members_len;
15	+ char **alias_members;
16	+ int alias_local;
17	+ };
18	+
19	+struct rpcent
20	+{
21	+ char r_name; / Name of server for this rpc program. */
22	+ char *r_aliases; / Alias list. */
23	+ int r_number; /* RPC program number. */
24	+};
25	+
26	+#endif
27	+
28	/*
29	These are prototypes for functions exported from the ldap NSS module.
30	For more complete definitions of these functions check the GLIBC
31	@@ -166,10 +189,12 @@	3	@@ -166,10 +189,12 @@
32	enum nss_status _nss_ldap_getservent_r(struct servent result,char buffer,size_t buflen,int *errnop);	4	enum nss_status _nss_ldap_getservent_r(struct servent result,char buffer,size_t buflen,int *errnop);
33	enum nss_status _nss_ldap_endservent(void);	5	enum nss_status _nss_ldap_endservent(void);