Attachment #129007 for bug #172949

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

Lines 1-9 Link Here

(-)./Makefile (-8 / +9 lines)
1	# New ports collection makefile for: maradns	1	# Created by: Anders Nordby <anders@fix.no>
2	# Date created: 26 May 2001
3	# Whom: Anders Nordby <anders@fix.no>
4	#
5	# $FreeBSD: ports/dns/maradns/Makefile,v 1.73 2012/08/04 15:05:23 decke Exp $	2	# $FreeBSD: ports/dns/maradns/Makefile,v 1.73 2012/08/04 15:05:23 decke Exp $
6	#
7	PORTNAME= maradns	3	PORTNAME= maradns
8	PORTVERSION= 1.4.12	4	PORTVERSION= 1.4.12
Lines 16-21 Link Here
16	LICENSE= BSD	12	LICENSE= BSD
17	LICENSE_FILE= ${WRKSRC}/COPYING	13	LICENSE_FILE= ${WRKSRC}/COPYING
		14	#DEPRECATED= MaraDNS 1 end-of-life: June 21, 2015
		15	#EXPIRATION_DATE= 2015-06-21
		16
18	REINPLACE_ARGS= -i ""	17	REINPLACE_ARGS= -i ""
19	MAKE_ENV= FLAGS="${CFLAGS} ${PTHREAD_CFLAGS}"	18	MAKE_ENV= FLAGS="${CFLAGS} ${PTHREAD_CFLAGS}"
20	CONFIGURE_ENV= LANG=	19	CONFIGURE_ENV= LANG=
Lines 29-34 Link Here
29	MAN5= mararc.5 csv1.5 csv2.5 csv2_txt.5	28	MAN5= mararc.5 csv1.5 csv2.5 csv2_txt.5
30	MAN8= maradns.8 zoneserver.8 duende.8	29	MAN8= maradns.8 zoneserver.8 duende.8
		30	.include <bsd.port.pre.mk>
		31
31	post-patch:	32	post-patch:
32	@${FIND} ${WRKSRC} -type f \| ${XARGS} ${REINPLACE_CMD} -e \	33	@${FIND} ${WRKSRC} -type f \| ${XARGS} ${REINPLACE_CMD} -e \
33	's\|/etc/maradns\|${ETCDIR}\|g; s\|/etc/mararc\|${ETCDIR}\|g'	34	's\|/etc/maradns\|${ETCDIR}\|g; s\|/etc/mararc\|${ETCDIR}\|g'
Lines 62-72 Link Here
62	${INSTALL_DATA} ${WRKSRC}/doc/en/examples/example_csv2 ${ETCDIR}/example_csv2	63	${INSTALL_DATA} ${WRKSRC}/doc/en/examples/example_csv2 ${ETCDIR}/example_csv2
63	${MKDIR} ${ETCDIR}/logger	64	${MKDIR} ${ETCDIR}/logger
64	.ifndef(NOPORTEXAMPLES)	65	.if ${PORT_OPTIONS:MEXAMPLES}
65	@${MKDIR} ${EXAMPLESDIR}/	66	@${MKDIR} ${EXAMPLESDIR}/
66	${INSTALL_DATA} ${WRKSRC}/doc/en/examples/* ${EXAMPLESDIR}/	67	${INSTALL_DATA} ${WRKSRC}/doc/en/examples/* ${EXAMPLESDIR}/
67	.endif	68	.endif
68	.ifndef(NOPORTDOCS)	69	.if ${PORT_OPTIONS:MDOCS}
69	@${MKDIR} ${DOCSDIR}/en	70	@${MKDIR} ${DOCSDIR}/en
70	${INSTALL_DATA} ${WRKSRC}/doc/en/. ${DOCSDIR}/en	71	${INSTALL_DATA} ${WRKSRC}/doc/en/. ${DOCSDIR}/en
71	${INSTALL_DATA} ${WRKSRC}/doc/en/QuickStart ${DOCSDIR}/en	72	${INSTALL_DATA} ${WRKSRC}/doc/en/QuickStart ${DOCSDIR}/en
Lines 77-80 Link Here
77	${CP} -R ${WRKSRC}/doc/en/text ${DOCSDIR}/en	78	${CP} -R ${WRKSRC}/doc/en/text ${DOCSDIR}/en
78	.endif	79	.endif
79	.include <bsd.port.mk>	80	.include <bsd.port.post.mk>




--- 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
+ V="VERSION=$(VERSION)"
+
+ # Debug




  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.

Return to bug 172949

Lines 1-15 Link Here

(-)./files/patch-build_Makefile.freebsd (-15 / +12 lines)
1	--- /usr/ports/dns/maradns/files/patch-build_Makefile.freebsd 1970-01-01 09:00:00.000000000 +0900	1	--- build/Makefile.freebsd.orig 2006-01-22 14:22:01.000000000 +0900
2	+++ dns/maradns1/files/patch-build_Makefile.freebsd 2012-01-17 15:13:25.000000000 +0900	2	+++ build/Makefile.freebsd 2012-01-17 15:13:16.000000000 +0900
3	@@ -0,0 +1,12 @@	3	@@ -27,8 +27,7 @@
4	+--- build/Makefile.freebsd.orig 2006-01-22 14:22:01.000000000 +0900	4	Q="DEFINES=-DSELECT_PROBLEM"
5	++++ build/Makefile.freebsd 2012-01-17 15:13:16.000000000 +0900	5
6	+@@ -27,8 +27,7 @@	6	# FreeBSD needs some special flags to compile MaraDNS
7	+ Q="DEFINES=-DSELECT_PROBLEM"	7	-CC="cc -O2 -Wall -pipe -D_THREAD_SAFE -pthread"
8	+	8	-M=CC=$(CC)
9	+ # FreeBSD needs some special flags to compile MaraDNS	9	+M="CC=$(CC) -O2 -Wall -pipe -D_THREAD_SAFE -pthread"
10	+-CC="cc -O2 -Wall -pipe -D_THREAD_SAFE -pthread"	10	V="VERSION=$(VERSION)"
11	+-M=CC=$(CC)	11
12	++M="CC=$(CC) -O2 -Wall -pipe -D_THREAD_SAFE -pthread"	12	# Debug
13	+ V="VERSION=$(VERSION)"
14	+
15	+ # Debug

Lines 5-26 Link Here

(-)./pkg-descr (-4 lines)
5	server. For example, MaraDNS has always randomized, using a secure random	5	server. For example, MaraDNS has always randomized, using a secure random
6	number generator, the Query ID and source port of DNS queries; and was never	6	number generator, the Query ID and source port of DNS queries; and was never
7	vulnerable to the "new" cache poisoning attack.	7	vulnerable to the "new" cache poisoning attack.
8
9	o Supported. MaraDNS has a long history of being maintained and updated.	8	o Supported. MaraDNS has a long history of being maintained and updated.
10	Actively developed since 2001, MaraDNS continues to be fully supported: The	9	Actively developed since 2001, MaraDNS continues to be fully supported: The
11	most recent release was done on August 4, 2009. Deadwood, the code that will	10	most recent release was done on August 4, 2009. Deadwood, the code that will
12	become part of MaraDNS 2.0, is frequently updated.	11	become part of MaraDNS 2.0, is frequently updated.
13
14	o Easy to use. A basic recursive configuration needs only a single three-line	12	o Easy to use. A basic recursive configuration needs only a single three-line
15	configuration file. A basic authoritative configuration needs only a four-line	13	configuration file. A basic authoritative configuration needs only a four-line
16	configuration file and a one-line zone file. MaraDNS is fully documented, with	14	configuration file and a one-line zone file. MaraDNS is fully documented, with
17	both easy-to-follow tutorials and a complete and up-to-date reference manual.	15	both easy-to-follow tutorials and a complete and up-to-date reference manual.
18
19	o Small. MaraDNS is well suited for embedded applications and other environments	16	o Small. MaraDNS is well suited for embedded applications and other environments
20	where the server must use the absolute minimum number of resources possible.	17	where the server must use the absolute minimum number of resources possible.
21	MaraDNS' binary is smaller than that of any other currently maintained	18	MaraDNS' binary is smaller than that of any other currently maintained
22	recursive DNS server.	19	recursive DNS server.
23
24	o Open Source. MaraDNS is fully open-source, The license is a two-clause BSD	20	o Open Source. MaraDNS is fully open-source, The license is a two-clause BSD
25	license that is almost identical to the FreeBSD license.	21	license that is almost identical to the FreeBSD license.