From nobody@FreeBSD.org  Fri Aug  3 10:54:45 2007
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id AB7DA16A417
	for <freebsd-gnats-submit@FreeBSD.org>; Fri,  3 Aug 2007 10:54:45 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21])
	by mx1.freebsd.org (Postfix) with ESMTP id 8695D13C45D
	for <freebsd-gnats-submit@FreeBSD.org>; Fri,  3 Aug 2007 10:54:45 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (localhost [127.0.0.1])
	by www.freebsd.org (8.14.1/8.14.1) with ESMTP id l73Asjos051899
	for <freebsd-gnats-submit@FreeBSD.org>; Fri, 3 Aug 2007 10:54:45 GMT
	(envelope-from nobody@www.freebsd.org)
Received: (from nobody@localhost)
	by www.freebsd.org (8.14.1/8.14.1/Submit) id l73AsjZA051898;
	Fri, 3 Aug 2007 10:54:45 GMT
	(envelope-from nobody)
Message-Id: <200708031054.l73AsjZA051898@www.freebsd.org>
Date: Fri, 3 Aug 2007 10:54:45 GMT
From: Aleksey Ovcharenko <aleksey.ovcharenko@gmail.com>
To: freebsd-gnats-submit@FreeBSD.org
Subject: dns/bind9-sdb-ldap port is outdated
X-Send-Pr-Version: www-3.0

>Number:         115163
>Category:       ports
>Synopsis:       dns/bind9-sdb-ldap port is outdated
>Confidential:   no
>Severity:       serious
>Priority:       high
>Responsible:    mm
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Fri Aug 03 11:00:05 GMT 2007
>Closed-Date:    Wed Sep 05 13:51:50 GMT 2007
>Last-Modified:  Wed Sep 05 13:51:50 GMT 2007
>Originator:     Aleksey Ovcharenko
>Release:        
>Organization:
>Environment:
>Description:
It's related to FreeBSD Security Advisory FreeBSD-SA-07:07.bind
>How-To-Repeat:

>Fix:
Apply an attached patch.

Patch attached with submission follows:

diff -ruN bind9-sdb-ldap.orig/Makefile bind9-sdb-ldap/Makefile
--- bind9-sdb-ldap.orig/Makefile	Mon Jul 23 02:35:46 2007
+++ bind9-sdb-ldap/Makefile	Fri Aug  3 03:02:33 2007
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	bind9
-PORTVERSION=	9.3.2
+PORTVERSION=	9.4.1
 CATEGORIES=	dns net ipv6
 MASTER_SITES=	${MASTER_SITE_ISC}
 MASTER_SITE_SUBDIR=	bind9/${ISCVERSION}
@@ -23,7 +23,7 @@
 CONFLICTS=	bind-8.* bind84-8.* bind9-9.* bind9-dlz-* host-* skalibs-*
 
 # ISC releases things like 9.3.0rc1, which our versioning doesn't like
-ISCVERSION=	9.3.2
+ISCVERSION=	9.4.1-P1
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--localstatedir=/var --disable-linux-caps --with-openssl \
diff -ruN bind9-sdb-ldap.orig/distinfo bind9-sdb-ldap/distinfo
--- bind9-sdb-ldap.orig/distinfo	Sat Jun 24 05:55:59 2006
+++ bind9-sdb-ldap/distinfo	Fri Aug  3 02:59:04 2007
@@ -1,6 +1,6 @@
-MD5 (bind-9.3.2.tar.gz) = 55e709501a7780233c36e25ccd15ece2
-SHA256 (bind-9.3.2.tar.gz) = 4d4298abd85d06083a0643091dde05ffbe3db051439524dbe4a81c689735c694
-SIZE (bind-9.3.2.tar.gz) = 5302112
-MD5 (bind-9.3.2.tar.gz.asc) = 06eccb8a9122e0f6efa9502cc61f5006
-SHA256 (bind-9.3.2.tar.gz.asc) = b7a9bc3852bb75e390d457e4449083a90c1c267f68fae00f317b9712ef726cf3
-SIZE (bind-9.3.2.tar.gz.asc) = 187
+MD5 (bind-9.4.1-P1.tar.gz) = 44e0514e6105ddaa235394045d9aeb0c
+SHA256 (bind-9.4.1-P1.tar.gz) = 912d07be9a6b4fa180d38637bf32ac4e802b087e46fbbf2a76314ecc3444b693
+SIZE (bind-9.4.1-P1.tar.gz) = 6341409
+MD5 (bind-9.4.1-P1.tar.gz.asc) = 2d93fd12d3aa9895c23c09784f7fe0b7
+SHA256 (bind-9.4.1-P1.tar.gz.asc) = b66a7ad4a8dd2a375fb961ab9b8a744fa55b034c0b7233b4490b6351e36f5030
+SIZE (bind-9.4.1-P1.tar.gz.asc) = 478
diff -ruN bind9-sdb-ldap.orig/files/patch-sdb_ldap bind9-sdb-ldap/files/patch-sdb_ldap
--- bind9-sdb-ldap.orig/files/patch-sdb_ldap	Fri Nov  4 07:20:00 2005
+++ bind9-sdb-ldap/files/patch-sdb_ldap	Fri Aug  3 03:21:25 2007
@@ -700,28 +700,27 @@
 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
-@@ -71,6 +71,7 @@
+@@ -72,6 +72,7 @@
   * Include header files for database drivers here.
   */
  /* #include "xxdb.h" */
 +#include <ldapdb.h> 
  
- static isc_boolean_t	want_stats = ISC_FALSE;
- static char		program_name[ISC_DIR_NAMEMAX] = "named";
-@@ -656,6 +657,7 @@
+ /*
+  * Include DLZ drivers if appropriate.
+@@ -681,6 +682,7 @@
  	 * Add calls to register sdb drivers here.
  	 */
  	/* xxdb_init(); */
 +	ldapdb_init();
  
- 	ns_server_create(ns_g_mctx, &ns_g_server);
- }
-@@ -672,7 +674,7 @@
+ #ifdef DLZ
+ 	/*
+@@ -707,6 +709,7 @@
  	 * Add calls to unregister sdb drivers here.
  	 */
  	/* xxdb_clear(); */
--
 +	ldapdb_clear();
- 	isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN,
- 		      ISC_LOG_NOTICE, "exiting");
- 	ns_log_shutdown();
+ 
+ #ifdef DLZ
+ 	/*


>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->feedback 
State-Changed-By: edwin 
State-Changed-When: Fri Aug 3 11:00:12 UTC 2007 
State-Changed-Why:  
Awaiting maintainers feedback 

http://www.freebsd.org/cgi/query-pr.cgi?pr=115163 

From: Hugo Meiland <hugo@chem.leidenuniv.nl>
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/115163: dns/bind9-sdb-ldap port is outdated
Date: Fri, 03 Aug 2007 17:12:22 +0200

 Edwin Groothuis wrote:
 > Maintainer of dns/bind9-sdb-ldap,
 >
 > Please note that PR ports/115163 has just been submitted.
 >
 > If it contains a patch for an upgrade, an enhancement or a bug fix
 > you agree on, reply to this email stating that you approve the patch
 > and a committer will take care of it.
 >
 > The full text of the PR can be found at:
 >     http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/115163
 >
 >   
 looks good, please commit the patch...
 
 thank you!
 
 Hugo Meiland
Responsible-Changed-From-To: freebsd-ports-bugs->mm 
Responsible-Changed-By: mm 
Responsible-Changed-When: Mon Aug 20 10:32:33 UTC 2007 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=115163 

From: Martin Matuska <mm@FreeBSD.org>
To: bug-followup@FreeBSD.org,  aleksey.ovcharenko@gmail.com
Cc:  
Subject: Re: ports/115163: dns/bind9-sdb-ldap port is outdated
Date: Mon, 20 Aug 2007 12:58:38 +0200

 Here are 3 problems with the proposed patch:
 1. The version is incorrect (9.4.1.1, see dns/bind9)
 2. There is a MLINKS entry missing (see dns/bind9)
 3. The pkg-plist was not updated at all
 
 Maintainer please approve the following updated patch that fixes these
 problems.
 
 Index: ports/dns/bind9-sdb-ldap/Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/dns/bind9-sdb-ldap/Makefile,v
 retrieving revision 1.4
 diff -u -r1.4 Makefile
 --- ports/dns/bind9-sdb-ldap/Makefile    23 Jul 2007 09:35:46 -0000    1.4
 +++ ports/dns/bind9-sdb-ldap/Makefile    20 Aug 2007 10:56:12 -0000
 @@ -6,7 +6,7 @@
  #
  
  PORTNAME=    bind9
 -PORTVERSION=    9.3.2
 +PORTVERSION=    9.4.1.1
  CATEGORIES=    dns net ipv6
  MASTER_SITES=    ${MASTER_SITE_ISC}
  MASTER_SITE_SUBDIR=    bind9/${ISCVERSION}
 @@ -23,7 +23,7 @@
  CONFLICTS=    bind-8.* bind84-8.* bind9-9.* bind9-dlz-* host-* skalibs-*
  
  # ISC releases things like 9.3.0rc1, which our versioning doesn't like
 -ISCVERSION=    9.3.2
 +ISCVERSION=    9.4.1-P1
  
  GNU_CONFIGURE=    yes
  CONFIGURE_ARGS=    --localstatedir=/var --disable-linux-caps
 --with-openssl \
 @@ -86,6 +86,7 @@
  MAN5=    named.conf.5 rndc.conf.5
  MAN8=    dnssec-keygen.8 dnssec-signzone.8 lwresd.8 named-checkconf.8 \
      named-checkzone.8 named.8 nsupdate.8 rndc-confgen.8 rndc.8
 +MLINKS=    named-checkzone.8 named-compilezone.8
  
  pre-fetch:
  .if defined(PORT_REPLACES_BASE_BIND9)
 Index: ports/dns/bind9-sdb-ldap/distinfo
 ===================================================================
 RCS file: /home/pcvs/ports/dns/bind9-sdb-ldap/distinfo,v
 retrieving revision 1.3
 diff -u -r1.3 distinfo
 --- ports/dns/bind9-sdb-ldap/distinfo    24 Jun 2006 12:55:59 -0000    1.3
 +++ ports/dns/bind9-sdb-ldap/distinfo    20 Aug 2007 10:56:12 -0000
 @@ -1,6 +1,6 @@
 -MD5 (bind-9.3.2.tar.gz) = 55e709501a7780233c36e25ccd15ece2
 -SHA256 (bind-9.3.2.tar.gz) =
 4d4298abd85d06083a0643091dde05ffbe3db051439524dbe4a81c689735c694
 -SIZE (bind-9.3.2.tar.gz) = 5302112
 -MD5 (bind-9.3.2.tar.gz.asc) = 06eccb8a9122e0f6efa9502cc61f5006
 -SHA256 (bind-9.3.2.tar.gz.asc) =
 b7a9bc3852bb75e390d457e4449083a90c1c267f68fae00f317b9712ef726cf3
 -SIZE (bind-9.3.2.tar.gz.asc) = 187
 +MD5 (bind-9.4.1-P1.tar.gz) = 44e0514e6105ddaa235394045d9aeb0c
 +SHA256 (bind-9.4.1-P1.tar.gz) =
 912d07be9a6b4fa180d38637bf32ac4e802b087e46fbbf2a76314ecc3444b693
 +SIZE (bind-9.4.1-P1.tar.gz) = 6341409
 +MD5 (bind-9.4.1-P1.tar.gz.asc) = 2d93fd12d3aa9895c23c09784f7fe0b7
 +SHA256 (bind-9.4.1-P1.tar.gz.asc) =
 b66a7ad4a8dd2a375fb961ab9b8a744fa55b034c0b7233b4490b6351e36f5030
 +SIZE (bind-9.4.1-P1.tar.gz.asc) = 478
 Index: ports/dns/bind9-sdb-ldap/pkg-plist
 ===================================================================
 RCS file: /home/pcvs/ports/dns/bind9-sdb-ldap/pkg-plist,v
 retrieving revision 1.3
 diff -u -r1.3 pkg-plist
 --- ports/dns/bind9-sdb-ldap/pkg-plist    24 Jun 2006 12:55:59 -0000    1.3
 +++ ports/dns/bind9-sdb-ldap/pkg-plist    20 Aug 2007 10:56:12 -0000
 @@ -130,6 +130,7 @@
  include/isc/rwlock.h
  include/isc/serial.h
  include/isc/sha1.h
 +include/isc/sha2.h
  include/isc/sockaddr.h
  include/isc/socket.h
  include/isc/stdio.h
 @@ -159,6 +160,7 @@
  include/isccc/types.h
  include/isccc/util.h
  include/isccc/version.h
 +include/isccfg/aclconf.h
  include/isccfg/cfg.h
  include/isccfg/grammar.h
  include/isccfg/log.h
 @@ -189,6 +191,7 @@
  sbin/named
  sbin/named-checkconf
  sbin/named-checkzone
 +sbin/named-compilezone
  sbin/rndc
  sbin/rndc-confgen
  %%PORTDOCS%%%%DOCSDIR%%/CHANGES
 @@ -204,6 +207,7 @@
  %%PORTDOCS%%%%DOCSDIR%%/arm/Bv9ARM.ch07.html
  %%PORTDOCS%%%%DOCSDIR%%/arm/Bv9ARM.ch08.html
  %%PORTDOCS%%%%DOCSDIR%%/arm/Bv9ARM.ch09.html
 +%%PORTDOCS%%%%DOCSDIR%%/arm/Bv9ARM.ch10.html
  %%PORTDOCS%%%%DOCSDIR%%/arm/Bv9ARM.html
  %%PORTDOCS%%%%DOCSDIR%%/misc/dnssec
  %%PORTDOCS%%%%DOCSDIR%%/misc/format-options.pl
 Index: ports/dns/bind9-sdb-ldap/files/patch-sdb_ldap
 ===================================================================
 RCS file: /home/pcvs/ports/dns/bind9-sdb-ldap/files/patch-sdb_ldap,v
 retrieving revision 1.2
 diff -u -r1.2 patch-sdb_ldap
 --- ports/dns/bind9-sdb-ldap/files/patch-sdb_ldap    4 Nov 2005 15:20:00
 -0000    1.2
 +++ ports/dns/bind9-sdb-ldap/files/patch-sdb_ldap    20 Aug 2007
 10:56:12 -0000
 @@ -700,28 +700,27 @@
  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
 -@@ -71,6 +71,7 @@
 +@@ -72,6 +72,7 @@
    * Include header files for database drivers here.
    */
   /* #include "xxdb.h" */
  +#include <ldapdb.h>
  
 - static isc_boolean_t    want_stats = ISC_FALSE;
 - static char        program_name[ISC_DIR_NAMEMAX] = "named";
 -@@ -656,6 +657,7 @@
 + /*
 +  * Include DLZ drivers if appropriate.
 +@@ -681,6 +682,7 @@
        * Add calls to register sdb drivers here.
        */
       /* xxdb_init(); */
  +    ldapdb_init();
  
 -     ns_server_create(ns_g_mctx, &ns_g_server);
 - }
 -@@ -672,7 +674,7 @@
 + #ifdef DLZ
 +     /*
 +@@ -707,6 +709,7 @@
        * Add calls to unregister sdb drivers here.
        */
       /* xxdb_clear(); */
 --
  +    ldapdb_clear();
 -     isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN,
 -               ISC_LOG_NOTICE, "exiting");
 -     ns_log_shutdown();
 +
 + #ifdef DLZ
 +     /*
 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/115163: commit references a PR
Date: Wed,  5 Sep 2007 13:48:57 +0000 (UTC)

 mm          2007-09-05 13:48:51 UTC
 
   FreeBSD ports repository
 
   Modified files:
     dns/bind9-sdb-ldap   Makefile distinfo pkg-plist 
     dns/bind9-sdb-ldap/files patch-sdb_ldap 
   Log:
   - Update to 9.4.1.1
   
   PR:             ports/115163
   Submitted by:   Aleksey Ovcharenko <aleksey.ovcharenko at gmail.com>
   Patch by:       sumbitter, mm [1]
   Approved by:    Hugo Meiland <hugo at chem.leidenuniv.nl> (maintainer)
   
   [1] fixed patch approved by maintainer timeout (14+ days)
   
   Revision  Changes    Path
   1.5       +3 -2      ports/dns/bind9-sdb-ldap/Makefile
   1.4       +6 -6      ports/dns/bind9-sdb-ldap/distinfo
   1.3       +11 -12    ports/dns/bind9-sdb-ldap/files/patch-sdb_ldap
   1.4       +4 -0      ports/dns/bind9-sdb-ldap/pkg-plist
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
State-Changed-From-To: feedback->closed 
State-Changed-By: mm 
State-Changed-When: Wed Sep 5 13:51:49 UTC 2007 
State-Changed-Why:  
Committed, with minor changes. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=115163 
>Unformatted:
