Attachment #146215 for bug #192967

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




# $FreeBSD$

PORTNAME=	dbmail
PORTVERSION=	3.2.0
CATEGORIES=	mail
MASTER_SITES=	http://git.dbmail.eu/paul/dbmail/snapshot/ \
		http://www.dbmail.org/download/3.2/

MAINTAINER=	ahicks@p-o.co.uk
COMMENT=	SQL database-based mail system (POP3 and IMAP)


CONFLICTS=	dbmail22-[0-9]*

OPTIONS_DEFINE=	DOCS LDAP SIEVE
OPTIONS_DEFAULT=	SIEVE
SIEVE_DESC=	Sieve mail sorting language support

OPTIONS_SUB=	yes

LDAP_CONFIGURE_WITH=	ldap
LDAP_USE=		OPENLDAP=yes

THREADS_EXTRA_PATCHES=	${FILESDIR}/extra-patch-acinclude.m4

DBMAIL_USER?=	mailnull
DBMAIL_GROUP?=	mail
PIDDIR?=	/var/run/dbmail

		PIDDIR="${PIDDIR}"

post-install:
	${INSTALL_DATA} ${WRKSRC}/dbmail.conf ${STAGEDIR}${PREFIX}/etc/dbmail.conf.sample
	@${MKDIR} ${STAGEDIR}${DATADIR}
	${INSTALL_DATA} ${WRKSRC}/dbmail.schema ${STAGEDIR}${DATADIR}
	(cd ${WRKSRC}/sql && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR})
	#@for f in mysql oracle postgresql sqlite; do \
	#	${MKDIR} ${STAGEDIR}${DATADIR}/$$f ; \
	#	${INSTALL_DATA} ${WRKSRC}/sql/$$f/* ${STAGEDIR}${DATADIR}/$$f; \
	#done
	@${MKDIR} ${STAGEDIR}${PIDDIR}
	@${MKDIR} ${STAGEDIR}${DOCSDIR}
	${INSTALL_DATA} ${DOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}

Lines 1-2 Link Here

(-)distinfo (-2 / +2 lines)
1	SHA256 (dbmail-3.1.17.tar.bz2) = d5cb070d1e042b51aa324b9c54de129189b65ec79aa227eecbf5d052aa318432	1	SHA256 (dbmail-3.2.0.tar.bz2) = c532221cce22a43b43fb7fe5f80a2ac4aca0e9737cb4bf8a30909edd6e58009e
2	SIZE (dbmail-3.1.17.tar.bz2) = 2238540	2	SIZE (dbmail-3.2.0.tar.bz2) = 2261235




--- acinclude.m4.orig
+++ acinclude.m4
@@ -236,7 +236,7 @@ if ( test [ "x$lookforldap" != "xno" ] || test [ "x$lookforauthldap" != "xno" ]
         dnl See if we already have the paths we need in the environment.
 	dnl ...but only if --with-ldap was given without a specific path.
         if ( test [ "x$lookforldap" = "xyes" ] || test [ "x$lookforauthldap" = "xyes" ] ); then
-            AC_CHECK_HEADERS([ldap.h],[LDAPLIB="-lldap"], [LDAPLIB="failed"])
+            AC_CHECK_HEADERS([ldap.h],[LDAPLIB="-lldap_r"], [LDAPLIB="failed"])
             if test [ "x$LDAPLIB" != "xfailed" ]; then
                 break
             fi
@@ -248,7 +248,7 @@ if ( test [ "x$lookforldap" != "xno" ] || test [ "x$lookforauthldap" != "xno" ]
             SAVE_CFLAGS=$CFLAGS
 	    dnl The headers might be in a funny place, so we need to use -Ipath
             CFLAGS="$CFLAGS -L$TEST_PATH $LDAPINC"
-            AC_CHECK_HEADERS([ldap.h],[LDAPLIB="-L$TEST_PATH -lldap"], [LDAPLIB="failed"])
+            AC_CHECK_HEADERS([ldap.h],[LDAPLIB="-L$TEST_PATH -lldap_r"], [LDAPLIB="failed"])
             CFLAGS=$SAVE_CFLAGS
             if test [ "x$LDAPLIB" != "xfailed" ]; then
                 break 2
@@ -262,7 +262,7 @@ if ( test [ "x$lookforldap" != "xno" ] || test [ "x$lookforauthldap" != "xno" ]
         AC_MSG_ERROR([Could not find LDAP library.])
     else
         AC_DEFINE([AUTHLDAP], 1, [Define if LDAP will be used.])
-        AC_SEARCH_LIBS(ldap_initialize, ldap, AC_DEFINE([HAVE_LDAP_INITIALIZE], 1, [ldap_initialize() can be used instead of ldap_init()]))
+        AC_SEARCH_LIBS(ldap_initialize, ldap_r, AC_DEFINE([HAVE_LDAP_INITIALIZE], 1, [ldap_initialize() can be used instead of ldap_init()]))
         AC_SUBST(LDAPLIB)
         AC_SUBST(LDAPINC)
         AUTHALIB="modules/.libs/libauth_ldap.a"




--- acinclude.m4.orig
+++ acinclude.m4
@@ -236,7 +236,7 @@ if ( test [ "x$lookforldap" != "xno" ] || test [ "x$lookforauthldap" != "xno" ]
         dnl See if we already have the paths we need in the environment.
 	dnl ...but only if --with-ldap was given without a specific path.
         if ( test [ "x$lookforldap" = "xyes" ] || test [ "x$lookforauthldap" = "xyes" ] ); then
-            AC_CHECK_HEADERS([ldap.h],[LDAPLIB="-lldap"], [LDAPLIB="failed"])
+            AC_CHECK_HEADERS([ldap.h],[LDAPLIB="-lldap_r"], [LDAPLIB="failed"])
             if test [ "x$LDAPLIB" != "xfailed" ]; then
                 break
             fi
@@ -248,7 +248,7 @@ if ( test [ "x$lookforldap" != "xno" ] || test [ "x$lookforauthldap" != "xno" ]
             SAVE_CFLAGS=$CFLAGS
 	    dnl The headers might be in a funny place, so we need to use -Ipath
             CFLAGS="$CFLAGS -L$TEST_PATH $LDAPINC"
-            AC_CHECK_HEADERS([ldap.h],[LDAPLIB="-L$TEST_PATH -lldap"], [LDAPLIB="failed"])
+            AC_CHECK_HEADERS([ldap.h],[LDAPLIB="-L$TEST_PATH -lldap_r"], [LDAPLIB="failed"])
             CFLAGS=$SAVE_CFLAGS
             if test [ "x$LDAPLIB" != "xfailed" ]; then
                 break 2
@@ -262,7 +262,7 @@ if ( test [ "x$lookforldap" != "xno" ] || test [ "x$lookforauthldap" != "xno" ]
         AC_MSG_ERROR([Could not find LDAP library.])
     else
         AC_DEFINE([AUTHLDAP], 1, [Define if LDAP will be used.])
-        AC_SEARCH_LIBS(ldap_initialize, ldap, AC_DEFINE([HAVE_LDAP_INITIALIZE], 1, [ldap_initialize() can be used instead of ldap_init()]))
+        AC_SEARCH_LIBS(ldap_initialize, ldap_r, AC_DEFINE([HAVE_LDAP_INITIALIZE], 1, [ldap_initialize() can be used instead of ldap_init()]))
         AC_SUBST(LDAPLIB)
         AC_SUBST(LDAPINC)
         AUTHALIB="modules/.libs/libauth_ldap.a"




--- src/clientbase.c.orig	2014-08-23 14:01:38.000000000 +0100
+++ src/clientbase.c	2014-08-24 10:12:06.000000000 +0100
@@ -151,7 +151,7 @@
 		client->tx		= STDOUT_FILENO;
 	} else {
 		/* server-side */
-		if ((serr = getnameinfo(&c->saddr, c->saddr_len, client->dst_ip, 
+		if ((serr = getnameinfo(&c->saddr, c->saddr.sa_len, client->dst_ip, 
 						NI_MAXHOST, client->dst_port, 
 						NI_MAXSERV, NI_NUMERICHOST | NI_NUMERICSERV))) {
 			TRACE(TRACE_INFO, "getnameinfo::error [%s]", gai_strerror(serr));
@@ -159,7 +159,7 @@
 
 		/* client-side */
 		if (server_conf->resolveIP) {
-			if ((serr = getnameinfo(&c->caddr, c->caddr_len, client->clientname,
+			if ((serr = getnameinfo(&c->caddr, c->caddr.sa_len, client->clientname,
 						       	NI_MAXHOST-1, NULL, 0, NI_NAMEREQD))) {
 				TRACE(TRACE_INFO, "getnameinfo:error [%s]", gai_strerror(serr));
 			} 
@@ -170,7 +170,7 @@
 					client->clientname[0] ? client->clientname : "Lookup failed");
 		} else {
 
-			if ((serr = getnameinfo(&c->caddr, c->caddr_len, client->src_ip,
+			if ((serr = getnameinfo(&c->caddr, c->caddr.sa_len, client->src_ip,
 						       	NI_MAXHOST-1, client->src_port,
 						       	NI_MAXSERV-1, NI_NUMERICHOST | NI_NUMERICSERV))) {
 				TRACE(TRACE_INFO, "getnameinfo:error [%s]", gai_strerror(serr));
 			} 

Lines 1-6 Link Here

(-)pkg-plist (-3 / +17 lines)
1	@unexec if cmp -s %D/etc/dbmail.conf-dist %D/etc/dbmail.conf; then rm -f %D/etc/dbmail.conf; fi	1	@sample etc/dbmail.conf.sample
2	etc/dbmail.conf-dist
3	@exec if [ ! -f %D/etc/dbmail.conf ] ; then cp -p %D/%F %B/dbmail.conf; fi
4	%%LDAP%%lib/dbmail/libauth_ldap.so	2	%%LDAP%%lib/dbmail/libauth_ldap.so
5	%%LDAP%%lib/dbmail/libauth_ldap.so.0	3	%%LDAP%%lib/dbmail/libauth_ldap.so.0
6	%%LDAP%%lib/dbmail/libauth_ldap.so.0.0.0	4	%%LDAP%%lib/dbmail/libauth_ldap.so.0.0.0
Lines 49-54 Link Here
49	%%DATADIR%%/mysql/migrate_from_1.x_to_2.0_innodb.mysql	47	%%DATADIR%%/mysql/migrate_from_1.x_to_2.0_innodb.mysql
50	%%DATADIR%%/mysql/migrate_from_2.0_to_2.2.mysql	48	%%DATADIR%%/mysql/migrate_from_2.0_to_2.2.mysql
51	%%DATADIR%%/mysql/update_headervalue_01.mysql	49	%%DATADIR%%/mysql/update_headervalue_01.mysql
		50	%%DATADIR%%/mysql/upgrades/32001.mysql
		51	%%DATADIR%%/mysql/upgrades/32002.mysql
		52	%%DATADIR%%/mysql/upgrades/32003.mysql
		53	%%DATADIR%%/mysql/upgrades/32004.mysql
52	%%DATADIR%%/oracle/dbmail_grant.sql	54	%%DATADIR%%/oracle/dbmail_grant.sql
53	%%DATADIR%%/oracle/dbmail_schema.sql	55	%%DATADIR%%/oracle/dbmail_schema.sql
54	%%DATADIR%%/oracle/dbmail_ts.sql	56	%%DATADIR%%/oracle/dbmail_ts.sql
Lines 62-67 Link Here
62	%%DATADIR%%/postgresql/create_tables.pgsql	64	%%DATADIR%%/postgresql/create_tables.pgsql
63	%%DATADIR%%/postgresql/migrate_from_1.x_to_2.0.pgsql	65	%%DATADIR%%/postgresql/migrate_from_1.x_to_2.0.pgsql
64	%%DATADIR%%/postgresql/migrate_from_2.0_to_2.2.pgsql	66	%%DATADIR%%/postgresql/migrate_from_2.0_to_2.2.pgsql
		67	%%DATADIR%%/postgresql/upgrades/32001.psql
		68	%%DATADIR%%/postgresql/upgrades/32002.psql
		69	%%DATADIR%%/postgresql/upgrades/32003.psql
		70	%%DATADIR%%/postgresql/upgrades/32004.psql
65	%%DATADIR%%/sqlite/2_1_7-2_2_0.sqlite	71	%%DATADIR%%/sqlite/2_1_7-2_2_0.sqlite
66	%%DATADIR%%/sqlite/2_2-3_0.sqlite	72	%%DATADIR%%/sqlite/2_2-3_0.sqlite
67	%%DATADIR%%/sqlite/2_2_5-2_3_0.sqlite	73	%%DATADIR%%/sqlite/2_2_5-2_3_0.sqlite
Lines 71-76 Link Here
71	%%DATADIR%%/sqlite/3_0_2-3_1_0.sqlite	77	%%DATADIR%%/sqlite/3_0_2-3_1_0.sqlite
72	%%DATADIR%%/sqlite/create_tables.sqlite	78	%%DATADIR%%/sqlite/create_tables.sqlite
73	%%DATADIR%%/sqlite/trigger.tmpl.sql	79	%%DATADIR%%/sqlite/trigger.tmpl.sql
		80	%%DATADIR%%/sqlite/upgrades/32001.sqlite
		81	%%DATADIR%%/sqlite/upgrades/32002.sqlite
		82	%%DATADIR%%/sqlite/upgrades/32003.sqlite
		83	%%DATADIR%%/sqlite/upgrades/32004.sqlite
74	%%PORTDOCS%%%%DOCSDIR%%/AUTHORS	84	%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
75	%%PORTDOCS%%%%DOCSDIR%%/BUGS	85	%%PORTDOCS%%%%DOCSDIR%%/BUGS
76	%%PORTDOCS%%%%DOCSDIR%%/INSTALL	86	%%PORTDOCS%%%%DOCSDIR%%/INSTALL
Lines 83-95 Link Here
83	%%PORTDOCS%%%%DOCSDIR%%/README.qmail	93	%%PORTDOCS%%%%DOCSDIR%%/README.qmail
84	%%PORTDOCS%%%%DOCSDIR%%/README.sieve	94	%%PORTDOCS%%%%DOCSDIR%%/README.sieve
85	%%PORTDOCS%%%%DOCSDIR%%/README.smtp	95	%%PORTDOCS%%%%DOCSDIR%%/README.smtp
		96	%%PORTDOCS%%%%DOCSDIR%%/README.security-password
86	%%PORTDOCS%%%%DOCSDIR%%/README.solaris	97	%%PORTDOCS%%%%DOCSDIR%%/README.solaris
87	%%PORTDOCS%%%%DOCSDIR%%/README.usermap	98	%%PORTDOCS%%%%DOCSDIR%%/README.usermap
88	%%PORTDOCS%%%%DOCSDIR%%/THANKS	99	%%PORTDOCS%%%%DOCSDIR%%/THANKS
89	%%PORTDOCS%%%%DOCSDIR%%/UPGRADING	100	%%PORTDOCS%%%%DOCSDIR%%/UPGRADING
		101	@dirrm %%DATADIR%%/sqlite/upgrades
90	@dirrm %%DATADIR%%/sqlite	102	@dirrm %%DATADIR%%/sqlite
		103	@dirrm %%DATADIR%%/postgresql/upgrades
91	@dirrm %%DATADIR%%/postgresql	104	@dirrm %%DATADIR%%/postgresql
92	@dirrm %%DATADIR%%/oracle	105	@dirrm %%DATADIR%%/oracle
		106	@dirrm %%DATADIR%%/mysql/upgrades
93	@dirrm %%DATADIR%%/mysql	107	@dirrm %%DATADIR%%/mysql
94	@dirrm %%DATADIR%%	108	@dirrm %%DATADIR%%
95	@dirrm lib/dbmail	109	@dirrm lib/dbmail

Return to bug 192967

Lines 2-10 Link Here

(-)Makefile (-11 / +11 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= dbmail	4	PORTNAME= dbmail
5	PORTVERSION= 3.1.17	5	PORTVERSION= 3.2.0
6	CATEGORIES= mail	6	CATEGORIES= mail
7	MASTER_SITES= http://git.dbmail.eu/paul/dbmail/snapshot/	7	MASTER_SITES= http://git.dbmail.eu/paul/dbmail/snapshot/ \
		8	http://www.dbmail.org/download/3.2/
8		9
9	MAINTAINER= ahicks@p-o.co.uk	10	MAINTAINER= ahicks@p-o.co.uk
10	COMMENT= SQL database-based mail system (POP3 and IMAP)	11	COMMENT= SQL database-based mail system (POP3 and IMAP)
Lines 22-29 Link Here
22		23
23	CONFLICTS= dbmail22-[0-9]*	24	CONFLICTS= dbmail22-[0-9]*
24		25
25	OPTIONS_DEFINE= DOCS LDAP SIEVE THREADS	26	OPTIONS_DEFINE= DOCS LDAP SIEVE
26	OPTIONS_DEFAULT= SIEVE THREADS	27	OPTIONS_DEFAULT= SIEVE
27	SIEVE_DESC= Sieve mail sorting language support	28	SIEVE_DESC= Sieve mail sorting language support
28		29
29	OPTIONS_SUB= yes	30	OPTIONS_SUB= yes
Lines 50-57 Link Here
50	LDAP_CONFIGURE_WITH= ldap	51	LDAP_CONFIGURE_WITH= ldap
51	LDAP_USE= OPENLDAP=yes	52	LDAP_USE= OPENLDAP=yes
52		53
53	THREADS_EXTRA_PATCHES= ${FILESDIR}/extra-patch-acinclude.m4
54
55	DBMAIL_USER?= mailnull	54	DBMAIL_USER?= mailnull
56	DBMAIL_GROUP?= mail	55	DBMAIL_GROUP?= mail
57	PIDDIR?= /var/run/dbmail	56	PIDDIR?= /var/run/dbmail
Lines 61-73 Link Here
61	PIDDIR="${PIDDIR}"	60	PIDDIR="${PIDDIR}"
62		61
63	post-install:	62	post-install:
64	${INSTALL_DATA} ${WRKSRC}/dbmail.conf ${STAGEDIR}${PREFIX}/etc/dbmail.conf-dist	63	${INSTALL_DATA} ${WRKSRC}/dbmail.conf ${STAGEDIR}${PREFIX}/etc/dbmail.conf.sample
65	@${MKDIR} ${STAGEDIR}${DATADIR}	64	@${MKDIR} ${STAGEDIR}${DATADIR}
66	${INSTALL_DATA} ${WRKSRC}/dbmail.schema ${STAGEDIR}${DATADIR}	65	${INSTALL_DATA} ${WRKSRC}/dbmail.schema ${STAGEDIR}${DATADIR}
67	@for f in mysql oracle postgresql sqlite; do \	66	(cd ${WRKSRC}/sql && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR})
68	${MKDIR} ${STAGEDIR}${DATADIR}/$$f ; \	67	#@for f in mysql oracle postgresql sqlite; do \
69	${INSTALL_DATA} ${WRKSRC}/sql/$$f/* ${STAGEDIR}${DATADIR}/$$f; \	68	# ${MKDIR} ${STAGEDIR}${DATADIR}/$$f ; \
70	done	69	# ${INSTALL_DATA} ${WRKSRC}/sql/$$f/* ${STAGEDIR}${DATADIR}/$$f; \
		70	#done
71	@${MKDIR} ${STAGEDIR}${PIDDIR}	71	@${MKDIR} ${STAGEDIR}${PIDDIR}
72	@${MKDIR} ${STAGEDIR}${DOCSDIR}	72	@${MKDIR} ${STAGEDIR}${DOCSDIR}
73	${INSTALL_DATA} ${DOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}	73	${INSTALL_DATA} ${DOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}

Lines 1-29 Link Here

(-)files/extra-patch-acinclude.m4 (-29 lines)
1	--- acinclude.m4.orig
2	+++ acinclude.m4
3	@@ -236,7 +236,7 @@ if ( test [ "x$lookforldap" != "xno" ] \|\| test [ "x$lookforauthldap" != "xno" ]
4	dnl See if we already have the paths we need in the environment.
5	dnl ...but only if --with-ldap was given without a specific path.
6	if ( test [ "x$lookforldap" = "xyes" ] \|\| test [ "x$lookforauthldap" = "xyes" ] ); then
7	- AC_CHECK_HEADERS([ldap.h],[LDAPLIB="-lldap"], [LDAPLIB="failed"])
8	+ AC_CHECK_HEADERS([ldap.h],[LDAPLIB="-lldap_r"], [LDAPLIB="failed"])
9	if test [ "x$LDAPLIB" != "xfailed" ]; then
10	break
11	fi
12	@@ -248,7 +248,7 @@ if ( test [ "x$lookforldap" != "xno" ] \|\| test [ "x$lookforauthldap" != "xno" ]
13	SAVE_CFLAGS=$CFLAGS
14	dnl The headers might be in a funny place, so we need to use -Ipath
15	CFLAGS="$CFLAGS -L$TEST_PATH $LDAPINC"
16	- AC_CHECK_HEADERS([ldap.h],[LDAPLIB="-L$TEST_PATH -lldap"], [LDAPLIB="failed"])
17	+ AC_CHECK_HEADERS([ldap.h],[LDAPLIB="-L$TEST_PATH -lldap_r"], [LDAPLIB="failed"])
18	CFLAGS=$SAVE_CFLAGS
19	if test [ "x$LDAPLIB" != "xfailed" ]; then
20	break 2
21	@@ -262,7 +262,7 @@ if ( test [ "x$lookforldap" != "xno" ] \|\| test [ "x$lookforauthldap" != "xno" ]
22	AC_MSG_ERROR([Could not find LDAP library.])
23	else
24	AC_DEFINE([AUTHLDAP], 1, [Define if LDAP will be used.])
25	- AC_SEARCH_LIBS(ldap_initialize, ldap, AC_DEFINE([HAVE_LDAP_INITIALIZE], 1, [ldap_initialize() can be used instead of ldap_init()]))
26	+ AC_SEARCH_LIBS(ldap_initialize, ldap_r, AC_DEFINE([HAVE_LDAP_INITIALIZE], 1, [ldap_initialize() can be used instead of ldap_init()]))
27	AC_SUBST(LDAPLIB)
28	AC_SUBST(LDAPINC)
29	AUTHALIB="modules/.libs/libauth_ldap.a"

Line 0 Link Here

(-)files/patch-acinclude.m4 (+29 lines)
	1	--- acinclude.m4.orig
	2	+++ acinclude.m4
	3	@@ -236,7 +236,7 @@ if ( test [ "x$lookforldap" != "xno" ] \|\| test [ "x$lookforauthldap" != "xno" ]
	4	dnl See if we already have the paths we need in the environment.
	5	dnl ...but only if --with-ldap was given without a specific path.
	6	if ( test [ "x$lookforldap" = "xyes" ] \|\| test [ "x$lookforauthldap" = "xyes" ] ); then
	7	- AC_CHECK_HEADERS([ldap.h],[LDAPLIB="-lldap"], [LDAPLIB="failed"])
	8	+ AC_CHECK_HEADERS([ldap.h],[LDAPLIB="-lldap_r"], [LDAPLIB="failed"])
	9	if test [ "x$LDAPLIB" != "xfailed" ]; then
	10	break
	11	fi
	12	@@ -248,7 +248,7 @@ if ( test [ "x$lookforldap" != "xno" ] \|\| test [ "x$lookforauthldap" != "xno" ]
	13	SAVE_CFLAGS=$CFLAGS
	14	dnl The headers might be in a funny place, so we need to use -Ipath
	15	CFLAGS="$CFLAGS -L$TEST_PATH $LDAPINC"
	16	- AC_CHECK_HEADERS([ldap.h],[LDAPLIB="-L$TEST_PATH -lldap"], [LDAPLIB="failed"])
	17	+ AC_CHECK_HEADERS([ldap.h],[LDAPLIB="-L$TEST_PATH -lldap_r"], [LDAPLIB="failed"])
	18	CFLAGS=$SAVE_CFLAGS
	19	if test [ "x$LDAPLIB" != "xfailed" ]; then
	20	break 2
	21	@@ -262,7 +262,7 @@ if ( test [ "x$lookforldap" != "xno" ] \|\| test [ "x$lookforauthldap" != "xno" ]
	22	AC_MSG_ERROR([Could not find LDAP library.])
	23	else
	24	AC_DEFINE([AUTHLDAP], 1, [Define if LDAP will be used.])
	25	- AC_SEARCH_LIBS(ldap_initialize, ldap, AC_DEFINE([HAVE_LDAP_INITIALIZE], 1, [ldap_initialize() can be used instead of ldap_init()]))
	26	+ AC_SEARCH_LIBS(ldap_initialize, ldap_r, AC_DEFINE([HAVE_LDAP_INITIALIZE], 1, [ldap_initialize() can be used instead of ldap_init()]))
	27	AC_SUBST(LDAPLIB)
	28	AC_SUBST(LDAPINC)
	29	AUTHALIB="modules/.libs/libauth_ldap.a"

Lines 1-28 Link Here

(-)files/patch-src_clientbase.c (-15 / +16 lines)
1	--- src/clientbase.c.orig 2013-07-22 20:03:36.000000000 +0100	1	--- src/clientbase.c.orig 2014-08-23 14:01:38.000000000 +0100
2	+++ src/clientbase.c 2013-07-23 13:14:56.000000000 +0100	2	+++ src/clientbase.c 2014-08-24 10:12:06.000000000 +0100
3	@@ -159,14 +159,14 @@	3	@@ -151,7 +151,7 @@
4	client->tx = STDOUT_FILENO;	4	client->tx = STDOUT_FILENO;
5	} else {	5	} else {
6	/* server-side */	6	/* server-side */
7	- if ((serr = getnameinfo(c->saddr, c->saddr_len, client->dst_ip, NI_MAXHOST, client->dst_port, NI_MAXSERV,	7	- if ((serr = getnameinfo(&c->saddr, c->saddr_len, client->dst_ip,
8	+ if ((serr = getnameinfo(c->saddr, c->saddr->sa_len, client->dst_ip, NI_MAXHOST, client->dst_port, NI_MAXSERV,	8	+ if ((serr = getnameinfo(&c->saddr, c->saddr.sa_len, client->dst_ip,
9	NI_NUMERICHOST \| NI_NUMERICSERV))) {	9	NI_MAXHOST, client->dst_port,
		10	NI_MAXSERV, NI_NUMERICHOST \| NI_NUMERICSERV))) {
10	TRACE(TRACE_INFO, "getnameinfo::error [%s]", gai_strerror(serr));	11	TRACE(TRACE_INFO, "getnameinfo::error [%s]", gai_strerror(serr));
11	}	12	@@ -159,7 +159,7 @@
12		13
13	/* client-side */	14	/* client-side */
14	if (server_conf->resolveIP) {	15	if (server_conf->resolveIP) {
15	- if ((serr = getnameinfo(c->caddr, c->caddr_len, client->clientname, NI_MAXHOST, NULL, 0,	16	- if ((serr = getnameinfo(&c->caddr, c->caddr_len, client->clientname,
16	+ if ((serr = getnameinfo(c->caddr, c->caddr->sa_len, client->clientname, NI_MAXHOST, NULL, 0,	17	+ if ((serr = getnameinfo(&c->caddr, c->caddr.sa_len, client->clientname,
17	NI_NAMEREQD))) {	18	NI_MAXHOST-1, NULL, 0, NI_NAMEREQD))) {
18	TRACE(TRACE_INFO, "getnameinfo:error [%s]", gai_strerror(serr));	19	TRACE(TRACE_INFO, "getnameinfo:error [%s]", gai_strerror(serr));
19	}	20	}
20	@@ -177,7 +177,7 @@	21	@@ -170,7 +170,7 @@
21	client->clientname[0] ? client->clientname : "Lookup failed");	22	client->clientname[0] ? client->clientname : "Lookup failed");
22	} else {	23	} else {
23		24
24	- if ((serr = getnameinfo(c->caddr, c->caddr_len, client->src_ip, NI_MAXHOST, client->src_port,	25	- if ((serr = getnameinfo(&c->caddr, c->caddr_len, client->src_ip,
25	+ if ((serr = getnameinfo(c->caddr, c->caddr->sa_len, client->src_ip, NI_MAXHOST, client->src_port,	26	+ if ((serr = getnameinfo(&c->caddr, c->caddr.sa_len, client->src_ip,
26	NI_MAXSERV, NI_NUMERICHOST \| NI_NUMERICSERV))) {	27	NI_MAXHOST-1, client->src_port,
		28	NI_MAXSERV-1, NI_NUMERICHOST \| NI_NUMERICSERV))) {
27	TRACE(TRACE_INFO, "getnameinfo:error [%s]", gai_strerror(serr));	29	TRACE(TRACE_INFO, "getnameinfo:error [%s]", gai_strerror(serr));
28	}