From takefu@airport.fm  Thu Aug  2 09:05:55 2012
Return-Path: <takefu@airport.fm>
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 39835106564A;
	Thu,  2 Aug 2012 09:05:55 +0000 (UTC)
	(envelope-from takefu@airport.fm)
Received: from ae-osaka.co.jp (mx.ae-osaka.co.jp [210.196.184.82])
	by mx1.freebsd.org (Postfix) with ESMTP id ADB7E8FC16;
	Thu,  2 Aug 2012 09:05:54 +0000 (UTC)
Received: from ae-osaka.co.jp (localhost.ae-osaka.co.jp [127.0.0.1])
	by ae-osaka.co.jp (Postfix) with ESMTP id D2E71D3AC1B;
	Thu,  2 Aug 2012 18:05:46 +0900 (JST)
Received: from [IPv6:2001:3e0:4ec:a011:caf:8db0:e14a:de26] (unknown [IPv6:2001:3e0:4ec:a011:caf:8db0:e14a:de26])
	by ae-osaka.co.jp (Postfix) with ESMTPSA id B214BD3AC1A;
	Thu,  2 Aug 2012 18:05:46 +0900 (JST)
Message-Id: <501A42E8.6050901@airport.fm>
Date: Thu, 02 Aug 2012 18:05:44 +0900
From: Takefu <takefu@airport.fm>
Reply-To: takefu@airport.fm
To: freebsd-gnats-submit@freebsd.org
Cc: decke@FreeBSD.org
In-Reply-To: <201208020818.q728I68Q077087@unbound.local.ae-osaka.co.jp>
Subject: [UPDATE] dns/maradns: update to 1.4.12
References: <201208020818.q728I68Q077087@unbound.local.ae-osaka.co.jp>

>Number:         170322
>Category:       ports
>Synopsis:       [UPDATE] dns/maradns: update to 1.4.12, copy to dns/maradns1
>Confidential:   yes
>Severity:       non-critical
>Priority:       low
>Responsible:    decke
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Thu Aug 02 09:10:07 UTC 2012
>Closed-Date:    Sat Aug 04 15:06:12 UTC 2012
>Last-Modified:  Sat Aug  4 15:10:04 UTC 2012
>Originator:     Takefu
>Release:        FreeBSD 7.4-RELEASE amd64
>Organization:
FOX Amateur Radio Club
>Environment:
>Description:
- Update to 1.4.12
- Whitespace fixes
- Sourceforge is unregistered of MASTER_SITES
- Environment variable CC definition is irregular
- Change repository
    maradns -> maradns1
Port maintainer (decke@FreeBSD.org) is cc'd.
>How-To-Repeat:
>Fix:
--- dns/maradns.patch begins here ---
diff -ruN /usr/ports/dns/maradns/Makefile dns/maradns1/Makefile
--- /usr/ports/dns/maradns/Makefile	2012-01-23 15:06:02.000000000 +0900
+++ dns/maradns1/Makefile	2012-08-02 14:02:00.000000000 +0900
@@ -5,10 +5,10 @@
 #

 PORTNAME=	maradns
-PORTVERSION=	1.4.10
+PORTNAME=	maradns1
+PORTVERSION=	1.4.12
 CATEGORIES=	dns
-MASTER_SITES=	http://www.maradns.org/download/1.4/${PORTVERSION}/ \
-		SF/${PORTNAME}/MaraDNS/${PORTVERSION}/
+MASTER_SITES=	http://www.maradns.org/download/1.4/
+#		SF/${PORTNAME}/MaraDNS/${PORTVERSION}/

 MAINTAINER=	decke@FreeBSD.org
 COMMENT=	DNS server with focus on security and simplicity
@@ -17,8 +17,12 @@
 LICENSE=	BSD
 LICENSE_FILE=	${WRKSRC}/COPYING

+DEPRECATED=	MaraDNS 1 end-of-life: June 21, 2015
+#EXPIRATION_DATE=	2015-06-21
+
 REINPLACE_ARGS=	-i ""
 MAKE_ENV=	FLAGS="${CFLAGS} ${PTHREAD_CFLAGS}"
+CONFIGURE_ENV=	LANG=

 USE_BZIP2=	yes
 USE_RC_SUBR=	${PORTNAME} zoneserver
diff -ruN /usr/ports/dns/maradns/distinfo dns/maradns1/distinfo
--- /usr/ports/dns/maradns/distinfo	2012-01-23 15:06:02.000000000 +0900
+++ dns/maradns1/distinfo	2012-08-01 11:25:08.000000000 +0900
@@ -1,2 +1,2 @@
-SHA256 (maradns-1.4.10.tar.bz2) = 3aaa2361341c559e1c91876544cfd5973ea960b9bfd5c8d0bb54617291f40555
-SIZE (maradns-1.4.10.tar.bz2) = 1121427
+SHA256 (maradns-1.4.12.tar.bz2) = 72c0e0fd10e4d9ed70d8c7addb9b0abd2cf2d23f6b477db3aefd69c9faa0893b
+SIZE (maradns-1.4.12.tar.bz2) = 1178772
diff -ruN /usr/ports/dns/maradns/files/patch-build_Makefile.freebsd dns/maradns1/files/patch-build_Makefile.freebsd
--- /usr/ports/dns/maradns/files/patch-build_Makefile.freebsd	1970-01-01 09:00:00.000000000 +0900
+++ dns/maradns1/files/patch-build_Makefile.freebsd	2012-01-17 15:13:25.000000000 +0900
@@ -0,0 +1,12 @@
+--- build/Makefile.freebsd.orig	2006-01-22 14:22:01.000000000 +0900
++++ build/Makefile.freebsd	2012-01-17 15:13:16.000000000 +0900
+@@ -27,8 +27,7 @@
+ Q="DEFINES=-DSELECT_PROBLEM"
+
+ # FreeBSD needs some special flags to compile MaraDNS
+-CC="cc -O2 -Wall -pipe -D_THREAD_SAFE -pthread"
+-M=CC=$(CC)
++M="CC=$(CC) -O2 -Wall -pipe -D_THREAD_SAFE -pthread"
+ V="VERSION=$(VERSION)"
+
+ # Debug
diff -ruN /usr/ports/dns/maradns/pkg-descr dns/maradns1/pkg-descr
--- /usr/ports/dns/maradns/pkg-descr	2010-07-21 16:51:01.000000000 +0900
+++ dns/maradns1/pkg-descr	2012-08-02 13:00:51.000000000 +0900
@@ -1,26 +1,22 @@
 MaraDNS is a package that implements the Domain Name Service (DNS), an
-essential internet service. MaraDNS has the following advantages:
+essential internet service. MaraDNS has the following advantages:

 o Secure. MaraDNS has a security history as good as or better than any other DNS
   server. For example, MaraDNS has always randomized, using a secure random
   number generator, the Query ID and source port of DNS queries; and was never
-  vulnerable to the "new" cache poisoning attack.
-
+  vulnerable to the "new" cache poisoning attack.
 o Supported. MaraDNS has a long history of being maintained and updated.
   Actively developed since 2001, MaraDNS continues to be fully supported: The
   most recent release was done on August 4, 2009. Deadwood, the code that will
-  become part of MaraDNS 2.0, is frequently updated.
-
+  become part of MaraDNS 2.0, is frequently updated.
 o Easy to use. A basic recursive configuration needs only a single three-line
   configuration file. A basic authoritative configuration needs only a four-line
   configuration file and a one-line zone file. MaraDNS is fully documented, with
-  both easy-to-follow tutorials and a complete and up-to-date reference manual.
-
+  both easy-to-follow tutorials and a complete and up-to-date reference manual.
 o Small. MaraDNS is well suited for embedded applications and other environments
   where the server must use the absolute minimum number of resources possible.
   MaraDNS' binary is smaller than that of any other currently maintained
-  recursive DNS server.
-
+  recursive DNS server.
 o Open Source. MaraDNS is fully open-source, The license is a two-clause BSD
   license that is almost identical to the FreeBSD license.
--- dns/maradns.patch ends here ---
>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->decke 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Thu Aug 2 09:10:18 UTC 2012 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

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

From: =?ISO-8859-1?Q?Bernhard_Fr=F6hlich?= <decke@FreeBSD.org>
To: bug-followup@FreeBSD.org, takefu@airport.fm
Cc:  
Subject: Re: ports/170322: [UPDATE] dns/maradns: update to 1.4.12, copy to dns/maradns1
Date: Sat, 4 Aug 2012 16:34:07 +0200

 The update looks good to me so I am already preparing an commit. I
 will commit the update to dns/maradns because I think further plans
 for the maradns 2 update should be discussed in PR ports/170323.
 
 -- 
 Bernhard Froehlich
 http://www.bluelife.at/
State-Changed-From-To: open->closed 
State-Changed-By: decke 
State-Changed-When: Sat Aug 4 15:06:11 UTC 2012 
State-Changed-Why:  
Committed. Thanks! 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/170322: commit references a PR
Date: Sat,  4 Aug 2012 15:05:42 +0000 (UTC)

 Author: decke
 Date: Sat Aug  4 15:05:23 2012
 New Revision: 302012
 URL: http://svn.freebsd.org/changeset/ports/302012
 
 Log:
   - Update to 1.4.12
   - Whitespace fixes in pkg-descr
   - Remove SF from MASTER_SITES
   - Fix CC definition (fixes CLANG builds)
   
   PR:		ports/170322
   Submitted by:	Takefu <takefu@airport.fm>
 
 Added:
   head/dns/maradns/files/patch-build_Makefile.freebsd   (contents, props changed)
 Modified:
   head/dns/maradns/Makefile   (contents, props changed)
   head/dns/maradns/distinfo   (contents, props changed)
   head/dns/maradns/pkg-descr   (contents, props changed)
 
 Modified: head/dns/maradns/Makefile
 ==============================================================================
 --- head/dns/maradns/Makefile	Sat Aug  4 13:13:02 2012	(r302011)
 +++ head/dns/maradns/Makefile	Sat Aug  4 15:05:23 2012	(r302012)
 @@ -6,10 +6,9 @@
  #
  
  PORTNAME=	maradns
 -PORTVERSION=	1.4.10
 +PORTVERSION=	1.4.12
  CATEGORIES=	dns
 -MASTER_SITES=	http://www.maradns.org/download/1.4/${PORTVERSION}/ \
 -		SF/${PORTNAME}/MaraDNS/${PORTVERSION}/
 +MASTER_SITES=	http://www.maradns.org/download/1.4/
  
  MAINTAINER=	decke@FreeBSD.org
  COMMENT=	DNS server with focus on security and simplicity
 @@ -19,6 +18,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
  
  REINPLACE_ARGS=	-i ""
  MAKE_ENV=	FLAGS="${CFLAGS} ${PTHREAD_CFLAGS}"
 +CONFIGURE_ENV=	LANG=
  
  USE_BZIP2=	yes
  USE_RC_SUBR=	${PORTNAME} zoneserver
 
 Modified: head/dns/maradns/distinfo
 ==============================================================================
 --- head/dns/maradns/distinfo	Sat Aug  4 13:13:02 2012	(r302011)
 +++ head/dns/maradns/distinfo	Sat Aug  4 15:05:23 2012	(r302012)
 @@ -1,2 +1,2 @@
 -SHA256 (maradns-1.4.10.tar.bz2) = 3aaa2361341c559e1c91876544cfd5973ea960b9bfd5c8d0bb54617291f40555
 -SIZE (maradns-1.4.10.tar.bz2) = 1121427
 +SHA256 (maradns-1.4.12.tar.bz2) = 72c0e0fd10e4d9ed70d8c7addb9b0abd2cf2d23f6b477db3aefd69c9faa0893b
 +SIZE (maradns-1.4.12.tar.bz2) = 1178772
 
 Added: head/dns/maradns/files/patch-build_Makefile.freebsd
 ==============================================================================
 --- /dev/null	00:00:00 1970	(empty, because file is newly added)
 +++ head/dns/maradns/files/patch-build_Makefile.freebsd	Sat Aug  4 15:05:23 2012	(r302012)
 @@ -0,0 +1,15 @@
 +--- /usr/ports/dns/maradns/files/patch-build_Makefile.freebsd 1970-01-01 09:00:00.000000000 +0900
 ++++ dns/maradns1/files/patch-build_Makefile.freebsd 2012-01-17 15:13:25.000000000 +0900
 +@@ -0,0 +1,12 @@
 ++--- build/Makefile.freebsd.orig   2006-01-22 14:22:01.000000000 +0900
 +++++ build/Makefile.freebsd 2012-01-17 15:13:16.000000000 +0900
 ++@@ -27,8 +27,7 @@
 ++ Q="DEFINES=-DSELECT_PROBLEM"
 ++
 ++ # FreeBSD needs some special flags to compile MaraDNS
 ++-CC="cc -O2 -Wall -pipe -D_THREAD_SAFE -pthread"
 ++-M=CC=$(CC)
 +++M="CC=$(CC) -O2 -Wall -pipe -D_THREAD_SAFE -pthread"
 ++ V="VERSION=$(VERSION)"
 ++
 ++ # Debug
 
 Modified: head/dns/maradns/pkg-descr
 ==============================================================================
 --- head/dns/maradns/pkg-descr	Sat Aug  4 13:13:02 2012	(r302011)
 +++ head/dns/maradns/pkg-descr	Sat Aug  4 15:05:23 2012	(r302012)
 @@ -1,25 +1,25 @@
  MaraDNS is a package that implements the Domain Name Service (DNS), an
 -essential internet service. MaraDNS has the following advantages: 
 +essential internet service. MaraDNS has the following advantages:
  
  o Secure. MaraDNS has a security history as good as or better than any other DNS
    server. For example, MaraDNS has always randomized, using a secure random
    number generator, the Query ID and source port of DNS queries; and was never
 -  vulnerable to the "new" cache poisoning attack. 
 +  vulnerable to the "new" cache poisoning attack.
  
  o Supported. MaraDNS has a long history of being maintained and updated.
    Actively developed since 2001, MaraDNS continues to be fully supported: The
    most recent release was done on August 4, 2009. Deadwood, the code that will
 -  become part of MaraDNS 2.0, is frequently updated. 
 +  become part of MaraDNS 2.0, is frequently updated.
  
  o Easy to use. A basic recursive configuration needs only a single three-line
    configuration file. A basic authoritative configuration needs only a four-line
    configuration file and a one-line zone file. MaraDNS is fully documented, with
 -  both easy-to-follow tutorials and a complete and up-to-date reference manual. 
 +  both easy-to-follow tutorials and a complete and up-to-date reference manual.
  
  o Small. MaraDNS is well suited for embedded applications and other environments
    where the server must use the absolute minimum number of resources possible.
    MaraDNS' binary is smaller than that of any other currently maintained
 -  recursive DNS server. 
 +  recursive DNS server.
  
  o Open Source. MaraDNS is fully open-source, The license is a two-clause BSD
    license that is almost identical to the FreeBSD license.
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 
>Unformatted:
