Date: Mon, 22 Oct 2012 17:27:05 +0900 From: Takefu <takefu@airport.fm> To: freebsd-gnats-submit@FreeBSD.org, =?ISO-8859-1?Q?Bernhard_Fr=F6hlic?= =?ISO-8859-1?Q?h?= <decke@FreeBSD.org> Subject: ports/172949: [PATCH] dns/maradns: Trim the headers Message-ID: <50850359.70309@airport.fm> Resent-Message-ID: <201210220830.q9M8U0gx029852@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 172949
>Category: ports
>Synopsis: [PATCH] dns/maradns: Trim the headers
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Mon Oct 22 08:30:00 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator: Takefu
>Release: FreeBSD 7.4-RELEASE-p10 i386
>Organization:
FOX Amateur Radio Club
>Environment:
System: FreeBSD RELENG74.localIPv4.airport.fm 7.4-RELEASE-p10 FreeBSD 7.4-RELEASE-p10 #0: Tue Oct 16 16:09:35 JST 2012
>Description:
- fix OptionsNG
- fix portlint(1) compliant [1]
- fix Trim the headers
- fix patch file for building CLANG [2]
[1] pkg-descr
[2] files/patch-build_Makefile.freebsd
Port maintainer (decke@FreeBSD.org) is cc'd.
Generated with FreeBSD Port Tools 0.99_6 (mode: change, diff: ports)
>How-To-Repeat:
>Fix:
--- maradns-1.4.12.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/dns/maradns/Makefile ./Makefile
--- /usr/ports/dns/maradns/Makefile 2012-08-05 00:05:23.000000000 +0900
+++ ./Makefile 2012-10-22 16:33:35.000000000 +0900
@@ -1,9 +1,5 @@
-# New ports collection makefile for: maradns
-# Date created: 26 May 2001
-# Whom: Anders Nordby <anders@fix.no>
-#
+# Created by: Anders Nordby <anders@fix.no>
# $FreeBSD: ports/dns/maradns/Makefile,v 1.73 2012/08/04 15:05:23 decke Exp $
-#
PORTNAME= maradns
PORTVERSION= 1.4.12
@@ -16,6 +12,9 @@
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=
@@ -29,6 +28,8 @@
MAN5= mararc.5 csv1.5 csv2.5 csv2_txt.5
MAN8= maradns.8 zoneserver.8 duende.8
+.include <bsd.port.pre.mk>
+
post-patch:
@${FIND} ${WRKSRC} -type f | ${XARGS} ${REINPLACE_CMD} -e \
's|/etc/maradns|${ETCDIR}|g; s|/etc/mararc|${ETCDIR}|g'
@@ -62,11 +63,11 @@
${INSTALL_DATA} ${WRKSRC}/doc/en/examples/example_csv2 ${ETCDIR}/example_csv2
${MKDIR} ${ETCDIR}/logger
-.ifndef(NOPORTEXAMPLES)
+.if ${PORT_OPTIONS:MEXAMPLES}
@${MKDIR} ${EXAMPLESDIR}/
${INSTALL_DATA} ${WRKSRC}/doc/en/examples/* ${EXAMPLESDIR}/
.endif
-.ifndef(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
@${MKDIR} ${DOCSDIR}/en
${INSTALL_DATA} ${WRKSRC}/doc/en/*.* ${DOCSDIR}/en
${INSTALL_DATA} ${WRKSRC}/doc/en/QuickStart ${DOCSDIR}/en
@@ -77,4 +78,4 @@
${CP} -R ${WRKSRC}/doc/en/text ${DOCSDIR}/en
.endif
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff -ruN --exclude=CVS /usr/ports/dns/maradns/files/patch-build_Makefile.freebsd ./files/patch-build_Makefile.freebsd
--- /usr/ports/dns/maradns/files/patch-build_Makefile.freebsd 2012-08-05 00:05:23.000000000 +0900
+++ ./files/patch-build_Makefile.freebsd 2012-01-17 15:13:25.000000000 +0900
@@ -1,15 +1,12 @@
---- /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
+--- 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 --exclude=CVS /usr/ports/dns/maradns/pkg-descr ./pkg-descr
--- /usr/ports/dns/maradns/pkg-descr 2012-08-05 00:05:23.000000000 +0900
+++ ./pkg-descr 2012-10-22 16:36:44.000000000 +0900
@@ -5,22 +5,18 @@
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.
-
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.
-
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.
-
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.
-
o Open Source. MaraDNS is fully open-source, The license is a two-clause BSD
license that is almost identical to the FreeBSD license.
--- maradns-1.4.12.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?50850359.70309>