From vasallia@ukr.net  Wed Apr 21 16:17:21 2004
Return-Path: <vasallia@ukr.net>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id AE4F216A4CE
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 21 Apr 2004 16:17:21 -0700 (PDT)
Received: from mail-kv.alkar.net (mail-kv.alkar.net [195.248.176.165])
	by mx1.FreeBSD.org (Postfix) with ESMTP id ECD7243D55
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 21 Apr 2004 16:17:20 -0700 (PDT)
	(envelope-from vasallia@ukr.net)
Received: from 238-246.dialup.alkar.net ([212.86.238.246] helo=santinel.home.ua)
	by mail-kv.alkar.net with esmtp
	id 1BGQxw-0004Vx-J9
	for FreeBSD-gnats-submit@freebsd.org; Thu, 22 Apr 2004 02:17:17 +0300
Received: from anray by santinel.home.ua with local (Exim)
	id 1BGP0K-000INX-Ln
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 22 Apr 2004 00:11:36 +0300
Message-Id: <E1BGP0K-000INX-Ln@santinel.home.ua>
Date: Thu, 22 Apr 2004 00:11:36 +0300
From: Andrey Slusar <vasallia@ukr.net>
Reply-To: Andrey Slusar <vasallia@ukr.net>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [PATCH] dns/djbdns: add WITH_JUMBO - collection Jumbo Patch contains 13 individual djbdns patches
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         65865
>Category:       ports
>Synopsis:       [PATCH] dns/djbdns: add WITH_JUMBO - collection Jumbo Patch contains 13 individual djbdns patches
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    roam
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Apr 21 16:20:18 PDT 2004
>Closed-Date:    Thu Jul 07 14:52:18 GMT 2005
>Last-Modified:  Thu Jul 07 14:52:18 GMT 2005
>Originator:     Andrey Slusar
>Release:        FreeBSD 5.2-CURRENT i386
>Organization:
Santinel
>Environment:
System: FreeBSD santinel.home.ua 5.2-CURRENT FreeBSD 5.2-CURRENT #1: Tue Apr 20 17:02:29 EEST 2004 root@santinel.home.ua:/usr/obj/usr/src/sys/ANRAY i386
	
>Description:
 Jumbo Patch collection contains:

	PATCH1: rr-srv.patch
		add support for SRV record for tinydns-data and axfr-get
		author: Michael Handler; original filename: srv-patch;
	PATCH2: rr-soa-contact.patch
		now you can modify SOA email contact address from tinydns-data
		author: Dan Peterson; original filename: tinydns-data-soa-contact.patch;
	PATCH3: multi-data.patch
		add support to tinydns-data to load multiple data files
		specified on command line
		author: Balazs Nagy; original filename: djbdns-1.05-multi_tinydns_data.patch;
	PATCH4: okclient.patch
		dnscache will respond queries from everywhere clients when
		OKCLIENT envar is set.
		author: Uwe Ohse; original filename: dnscache-0.61.okclient.patch;
	PATCH5: mip-dnscache.patch
		dnscache can now listen on multiple IP's listed on IP envar and
		seperated by slashes.
		author: Dan Peterson; original filename: dnscache-multiple-ip.patch;
	PATCH6: dumpcache.patch
		add support to dnscache to dump cache from memory and load it
		from file when it start, or when it receive SIGALRM signal
		author: Florent Guillaume; original filename: patch-dnscache-dumpcache-v4.txt;
	PATCH7: dnsfilter-repl.patch
		dnsfilter will replace IP-s with names
		author: Uwe Ohse; original filename: djbdns-1.05-dnsfilter-replace.diff;
	PATCH8: mip-tinydns.patch
		tinydns can now listen on multiple IP's listed on IP envar and
		seperated by slashes.
		author: Uwe Ohse; original filename: djbdns-1.05-multiip.diff;
	PATCH9: reload-dnscache.patch
		add support to dnscache reload configuration files when it
		receive SIGHUP signal
		author: Matthias Andree; original filename: djbdns-1.05-sighup.patch;
	PATCH10: nxd-dnscache.patch
          	add support to dnscache to return a special IP address for
          	NXDOMAIN type A responses when NXDSPECIAL environment variable
          	is set.
          	author: Dan Peterson; original filename: dnscache-1.05-nxdspecial.patch;
	PATCH11: nxd-tinydns.patch
		add support to tinydns to log 'X' instead of '+' when it return
          	NXDOMAIN in answers.
          	author: Dan Peterson; original filename: server-1.05-nxdomain-logging.patch;
	PATCH12: notify-tinydns.patch
		add support to tinydns to react on notify queries and log 'N'.
          	author: ???; original filename: ???;
	PATCH13: roundrobind-dnscache.patch
		dnscache will serve round-robin'd records when are many A
          	records in answer.
          	author: Thomas Mangin; original filename: round-robin.patch;
>How-To-Repeat:
	N/A
>Fix:
--- djbdns.diff begins here ---
diff -ruN djbdns/Makefile djbdns.new/Makefile
--- djbdns/Makefile	Wed Apr 21 09:33:54 2004
+++ djbdns.new/Makefile	Wed Apr 21 23:25:29 2004
@@ -37,6 +37,7 @@
 PATCH_DIST_STRIP=	-p1
 .endif
 
+.if !defined(WITH_JUMBO)
 .if defined(WITH_DNSCACHE_DUMPCACHE)
 .if defined(WITH_IPV6)
 BROKEN=		The IPv6 and dnscache-dumpcache patches are currently in conflict.
@@ -46,6 +47,22 @@
 PATCH_DIST_STRIP=	-p1
 CFLAGS+=	-DDUMPCACHE
 .endif
+.endif
+
+.if defined(WITH_JUMBO)
+.if defined(WITH_IPV6)
+BROKEN=		The IPv6 and jumbo patches are currently in conflict.
+.endif
+.if defined(WITH_IGNOREIP)
+BROKEN=		The ignoreip and jumbo patches are currently in conflict.
+.endif
+PATCH_SITES+=	http://www.ro.kde.org/djbdns/mywork/jumbo/:jumbo
+PATCHFILES+=	jumbo-p13.patch.gz
+PATCH_DIST_STRIP=	-p1
+.if defined(WITH_DNSCACHE_DUMPCACHE)
+CFLAGS+=	-DDUMPCACHE
+.endif
+.endif
 
 .if defined(WITH_IGNOREIP)
 PATCH_SITES+=	http://tinydns.org/:ignoreip
@@ -90,6 +107,8 @@
 	@${ECHO} "                            http://smarden.org/pape/djb/manpages/"
 	@${ECHO} "- WITH_IGNOREIP           - build with Russel Nelson's ignoreip2 patch"
 	@${ECHO} "                            http://tinydns.org/djbdns-1.05-ignoreip2.patch"
+	@${ECHO} "- WITH_JUMBO              - build with Jumbo Patch collection"
+	@${ECHO} "                          - www.ro.kde.org/djbdns/mywork/jumbo/jumbo-p13.patch.gz"
 	@${ECHO} "- WITH_PERSISTENT_MMAP    - build with Lennert Buytenhek's persistent mmap"
 	@${ECHO} "                            patch for tinydns"
 	@${ECHO} "                            http://marc.theaimsgroup.com/?l=djbdns&m=108229203212517&w=2"
diff -ruN djbdns/distinfo djbdns.new/distinfo
--- djbdns/distinfo	Wed Apr 21 07:22:39 2004
+++ djbdns.new/distinfo	Wed Apr 21 23:32:45 2004
@@ -4,3 +4,4 @@
 MD5 (patch-dnscache-dumpcache-v4.txt) = 61441dec12dd627a7fea7c3059cc2542
 MD5 (djbdns-1.05-ignoreip2.patch) = c032250b209d055847a763c8d9c7e865
 MD5 (tinydns-persistmmap-20040418.patch) = c721977364502180f9563b85cecf133b
+MD5 (jumbo-p13.patch.gz) = c96a7cf19968f26ff1422cd197b1a72d
--- djbdns.diff ends here ---


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->roam 
Responsible-Changed-By: vs 
Responsible-Changed-When: Thu Apr 22 02:20:56 PDT 2004 
Responsible-Changed-Why:  
Over to maintainer. 

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

From: Florent Thoumie <flz@xbsd.org>
To: roam@FreeBSD.org
Cc: freebsd-gnats-submit@FreeBSD.org
Subject: Re: ports/65865
Date: Tue, 05 Jul 2005 16:33:46 +0200

 	This PR is quite old now, and there are some patches in jumbo
 	patch I'd like to have.
 
 	I'll try and commit it this week end unless roam raises his
 	veto.
 
 -- 
 Florent Thoumie
 flz@xbsd.org

From: Peter Pentchev <roam@ringlet.net>
To: Florent Thoumie <flz@xbsd.org>
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/65865
Date: Tue, 5 Jul 2005 18:24:40 +0300

 --9UV9rz0O2dU/yYYn
 Content-Type: text/plain; charset=us-ascii
 Content-Disposition: inline
 Content-Transfer-Encoding: quoted-printable
 
 On Tue, Jul 05, 2005 at 04:33:46PM +0200, Florent Thoumie wrote:
 > This PR is quite old now, and there are some patches in jumbo
 > patch I'd like to have.
 >=20
 > I'll try and commit it this week end unless roam raises his
 > veto.
 
 Errr... actually I do have a couple of other changes to the djbdns port
 in the works, and they include this one...  I think I ought to be able
 to handle it in the next couple of days :\
 
 G'luck,
 Peter
 
 --=20
 Peter Pentchev roam@ringlet.net    roam@cnsys.bg    roam@FreeBSD.org
 PGP key: http://people.FreeBSD.org/~roam/roam.key.asc
 Key fingerprint FDBA FD79 C26F 3C51 C95E  DF9E ED18 B68D 1619 4553
 I am not the subject of this sentence.
 
 --9UV9rz0O2dU/yYYn
 Content-Type: application/pgp-signature
 Content-Disposition: inline
 
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.1 (FreeBSD)
 
 iD8DBQFCyqY47Ri2jRYZRVMRAlrSAJ0VtlzPiyz0GXbl7xy/ouqT1i0okACdFT08
 ozHeLPmCrzfFjaDh/Fe4q4E=
 =ADUm
 -----END PGP SIGNATURE-----
 
 --9UV9rz0O2dU/yYYn--

From: Florent Thoumie <flz@xbsd.org>
To: Peter Pentchev <roam@ringlet.net>
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/65865
Date: Tue, 05 Jul 2005 17:33:53 +0200

 Peter Pentchev wrote:
 > On Tue, Jul 05, 2005 at 04:33:46PM +0200, Florent Thoumie wrote:
 > 
 >>This PR is quite old now, and there are some patches in jumbo
 >>patch I'd like to have.
 >>
 >>I'll try and commit it this week end unless roam raises his
 >>veto.
 > 
 > 
 > Errr... actually I do have a couple of other changes to the djbdns port
 > in the works, and they include this one...  I think I ought to be able
 > to handle it in the next couple of days :\
 
 	So I'm not going to touch it, as long as you do it :)
 
 -- 
 Florent Thoumie
 flz@xbsd.org
State-Changed-From-To: open->closed 
State-Changed-By: roam 
State-Changed-When: Thu Jul 7 14:51:44 GMT 2005 
State-Changed-Why:  
Committed with slight modifications as part of my overhaul of the djbdns 
port's config structure. 
Thanks for the patch and the patience! 

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