Attachment #80273 for bug #115163

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

Lines 6-12 Link Here

(-)bind9-sdb-ldap/Makefile (-2 / +2 lines)
6	#	6	#
7		7
8	PORTNAME= bind9	8	PORTNAME= bind9
9	PORTVERSION= 9.3.2	9	PORTVERSION= 9.4.1
10	CATEGORIES= dns net ipv6	10	CATEGORIES= dns net ipv6
11	MASTER_SITES= ${MASTER_SITE_ISC}	11	MASTER_SITES= ${MASTER_SITE_ISC}
12	MASTER_SITE_SUBDIR= bind9/${ISCVERSION}	12	MASTER_SITE_SUBDIR= bind9/${ISCVERSION}
Lines 23-29 Link Here
23	CONFLICTS= bind-8.* bind84-8.* bind9-9.* bind9-dlz-* host-* skalibs-*	23	CONFLICTS= bind-8.* bind84-8.* bind9-9.* bind9-dlz-* host-* skalibs-*
24		24
25	# ISC releases things like 9.3.0rc1, which our versioning doesn't like	25	# ISC releases things like 9.3.0rc1, which our versioning doesn't like
26	ISCVERSION= 9.3.2	26	ISCVERSION= 9.4.1-P1
27		27
28	GNU_CONFIGURE= yes	28	GNU_CONFIGURE= yes
29	CONFIGURE_ARGS= --localstatedir=/var --disable-linux-caps --with-openssl \	29	CONFIGURE_ARGS= --localstatedir=/var --disable-linux-caps --with-openssl \

Lines 1-6 Link Here

(-)bind9-sdb-ldap/distinfo (-6 / +6 lines)
1	MD5 (bind-9.3.2.tar.gz) = 55e709501a7780233c36e25ccd15ece2	1	MD5 (bind-9.4.1-P1.tar.gz) = 44e0514e6105ddaa235394045d9aeb0c
2	SHA256 (bind-9.3.2.tar.gz) = 4d4298abd85d06083a0643091dde05ffbe3db051439524dbe4a81c689735c694	2	SHA256 (bind-9.4.1-P1.tar.gz) = 912d07be9a6b4fa180d38637bf32ac4e802b087e46fbbf2a76314ecc3444b693
3	SIZE (bind-9.3.2.tar.gz) = 5302112	3	SIZE (bind-9.4.1-P1.tar.gz) = 6341409
4	MD5 (bind-9.3.2.tar.gz.asc) = 06eccb8a9122e0f6efa9502cc61f5006	4	MD5 (bind-9.4.1-P1.tar.gz.asc) = 2d93fd12d3aa9895c23c09784f7fe0b7
5	SHA256 (bind-9.3.2.tar.gz.asc) = b7a9bc3852bb75e390d457e4449083a90c1c267f68fae00f317b9712ef726cf3	5	SHA256 (bind-9.4.1-P1.tar.gz.asc) = b66a7ad4a8dd2a375fb961ab9b8a744fa55b034c0b7233b4490b6351e36f5030
6	SIZE (bind-9.3.2.tar.gz.asc) = 187	6	SIZE (bind-9.4.1-P1.tar.gz.asc) = 478




diff -ruN ../bind-9.3.1.org/bin/named/main.c ./bin/named/main.c
--- ../bind-9.3.1.org/bin/named/main.c	Wed Jun 22 22:34:55 2005
+++ ./bin/named/main.c	Wed Jun 22 22:47:38 2005
@@ -72,6 +72,7 @@
  * Include header files for database drivers here.
  */
 /* #include "xxdb.h" */
+#include <ldapdb.h> 
 
 /*
  * Include DLZ drivers if appropriate.
@@ -681,6 +682,7 @@
 	 * Add calls to register sdb drivers here.
 	 */
 	/* xxdb_init(); */
+	ldapdb_init();
 
 #ifdef DLZ
 	/*
@@ -707,6 +709,7 @@
 	 * Add calls to unregister sdb drivers here.
 	 */
 	/* xxdb_clear(); */
-
+	ldapdb_clear();
 
 #ifdef DLZ
 	/*

Return to bug 115163

Lines 700-727 Link Here

(-)bind9-sdb-ldap/files/patch-sdb_ldap (-11 / +10 lines)
700	diff -ruN ../bind-9.3.1.org/bin/named/main.c ./bin/named/main.c	700	diff -ruN ../bind-9.3.1.org/bin/named/main.c ./bin/named/main.c
701	--- ../bind-9.3.1.org/bin/named/main.c Wed Jun 22 22:34:55 2005	701	--- ../bind-9.3.1.org/bin/named/main.c Wed Jun 22 22:34:55 2005
702	+++ ./bin/named/main.c Wed Jun 22 22:47:38 2005	702	+++ ./bin/named/main.c Wed Jun 22 22:47:38 2005
703	@@ -71,6 +71,7 @@	703	@@ -72,6 +72,7 @@
704	* Include header files for database drivers here.	704	* Include header files for database drivers here.
705	*/	705	*/
706	/* #include "xxdb.h" */	706	/* #include "xxdb.h" */
707	+#include <ldapdb.h>	707	+#include <ldapdb.h>
708		708
709	static isc_boolean_t want_stats = ISC_FALSE;	709	/*
710	static char program_name[ISC_DIR_NAMEMAX] = "named";	710	* Include DLZ drivers if appropriate.
711	@@ -656,6 +657,7 @@	711	@@ -681,6 +682,7 @@
712	* Add calls to register sdb drivers here.	712	* Add calls to register sdb drivers here.
713	*/	713	*/
714	/* xxdb_init(); */	714	/* xxdb_init(); */
715	+ ldapdb_init();	715	+ ldapdb_init();
716		716
717	ns_server_create(ns_g_mctx, &ns_g_server);	717	#ifdef DLZ
718	}	718	/*
719	@@ -672,7 +674,7 @@	719	@@ -707,6 +709,7 @@
720	* Add calls to unregister sdb drivers here.	720	* Add calls to unregister sdb drivers here.
721	*/	721	*/
722	/* xxdb_clear(); */	722	/* xxdb_clear(); */
723	-
724	+ ldapdb_clear();	723	+ ldapdb_clear();
725	isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN,	724
726	ISC_LOG_NOTICE, "exiting");	725	#ifdef DLZ
727	ns_log_shutdown();	726	/*