View | Details | Raw Unified | Return to bug 234494 | Differences between
and this patch

Collapse All | Expand All

(-)./Makefile (-36 / +56 lines)
Lines 1-66 Link Here
1
PORTNAME=	maradns
1
PORTNAME=	maradns
2
PORTVERSION=	2.0.15
2
PORTVERSION=	3.5.0036
3
CATEGORIES=	dns
3
CATEGORIES=	dns
4
MASTER_SITES=	http://maradns.samiam.org/download/2.0/${PORTVERSION}/
4
MASTER_SITES=	https://maradns.samiam.org/download/3.5/${PORTVERSION}/
5
5
6
MAINTAINER=	je3kmz@FreeBSD.org
6
MAINTAINER=	takefu@airport.fm
7
COMMENT=	DNS server with focus on security and simplicity
7
COMMENT=	DNS server with focus on security and simplicity
8
WWW=		https://maradns.org/
8
WWW=		https://maradns.samiam.org/
9
9
10
LICENSE=	BSD2CLAUSE
10
LICENSE=	BSD2CLAUSE
11
LICENSE_FILE=	${WRKSRC}/COPYING
11
LICENSE_FILE=	${WRKSRC}/COPYING
12
12
13
USES=		cpe tar:bz2
13
LIB_DEPENDS=	libeditline.so:devel/editline
14
15
USES=		cpe gmake shebangfix tar:xz
16
14
USE_RC_SUBR=	${PORTNAME} zoneserver Deadwood
17
USE_RC_SUBR=	${PORTNAME} zoneserver Deadwood
18
SHEBANG_FILES=	${WRKSRC}/doc/en/tutorial/make.index
19
HAS_CONFIGURE=	yes
20
REINPLACE_ARGS=	""
15
USERS=		bind
21
USERS=		bind
16
GROUPS=		bind
22
GROUPS=		bind
17
INSTALL_TARGET=	install PREFIX=${STAGEDIR}${PREFIX}
23
OPTIONS_DEFINE=	DOCS EXAMPLES IPV6 MANPAGES
18
HAS_CONFIGURE=	yes
19
20
OPTIONS_DEFINE=	IPV6 DOCS EXAMPLES
21
OPTIONS_SUB=	yes
24
OPTIONS_SUB=	yes
25
IPV6_CONFIGURE_OFF=	--noipv6
26
DEADWOOD_VER=	deadwood-${PORTVERSION}
22
27
23
IPV6_CONFIGURE_ON=	--ipv6
24
25
PORTDOCS=	*
26
PORTEXAMPLES=	*
27
REINPLACE_ARGS=	-i ""
28
DEADWOOD_VER=	3.2.11
29
30
post-patch:
28
post-patch:
31
	@${REINPLACE_CMD} -e 's|make |\$$\{MAKE\} |' ${WRKSRC}/build/Makefile.freebsd
29
	@${ECHO_MSG} max_mem = 0 >> ${WRKSRC}/doc/en/examples/example_full_mararc
32
	@${FIND} ${WRKSRC} -type f ! -name "*.orig" | ${XARGS} ${REINPLACE_CMD} -e \
30
	@${ECHO_MSG} hide_disclaimer = \"YES\" >> ${WRKSRC}/doc/en/examples/example_full_mararc
31
	@${REINPLACE_CMD} -e 's|make |\$$\{MAKE\} |g; s|^\tVERSION|#\tVERSION|'\
32
		${WRKSRC}/build/Makefile.freebsd
33
	@${REINPLACE_CMD} -e 's|make |\$$\{MAKE\} |'\
34
		-e 's|-O3 -DLUA_USE_LINUX|-O2 -Wall -Wpedantic|'\
35
		${WRKSRC}/coLunacyDNS/Makefile.editline
36
	@${REINPLACE_CMD} -e 's| $$(FLAGS)||' ${WRKSRC}/${DEADWOOD_VER}/src/Makefile.noip6
37
	@cd ${WRKSRC} && ${CAT} ${FILESDIR}/localbase | ${XARGS} ${REINPLACE_CMD} -e \
33
		's|/etc/maradns|${ETCDIR}|g; s|/etc/mararc|${ETCDIR}|g; \
38
		's|/etc/maradns|${ETCDIR}|g; s|/etc/mararc|${ETCDIR}|g; \
34
		 s|/etc/deadwood|${ETCDIR}|g; s| = 99| = 53|g'
39
		 s|/etc/deadwood|${ETCDIR}|g; s| = 99| = 53|g'
40
	@${REINPLACE_CMD} -e 's|127.0.0.1\"|127.0.0.2\"|g'\
41
		${WRKSRC}/${DEADWOOD_VER}/doc/dwood3rc
35
42
36
do-install:
43
post-patch-IPV6-on:
37
	${INSTALL_PROGRAM} ${WRKSRC}/deadwood-${DEADWOOD_VER}/src/Deadwood ${STAGEDIR}${PREFIX}/sbin
44
	@${ECHO_MSG} ipv6_bind_address = \"::1\" >> ${WRKSRC}/doc/en/examples/example_full_mararc
38
	${INSTALL_PROGRAM} ${WRKSRC}/server/maradns ${STAGEDIR}${PREFIX}/sbin
45
	@${REINPLACE_CMD} -e 's|bind_address=\"127.0.0.1|bind_address=\"127.0.0.1,\ ::1|'\
46
		-e 's|127.0.0.1/16|127.0.0.1/16,\ ::1/128|' ${WRKSRC}/${DEADWOOD_VER}/doc/dwood3rc
47
48
post-install:
49
	${INSTALL_PROGRAM} ${WRKSRC}/tools/askmara ${STAGEDIR}${PREFIX}/bin
50
	${INSTALL_PROGRAM} ${WRKSRC}/tools/duende ${STAGEDIR}${PREFIX}/bin
39
	${INSTALL_PROGRAM} ${WRKSRC}/tcp/fetchzone ${STAGEDIR}${PREFIX}/bin
51
	${INSTALL_PROGRAM} ${WRKSRC}/tcp/fetchzone ${STAGEDIR}${PREFIX}/bin
40
	${INSTALL_PROGRAM} ${WRKSRC}/tcp/getzone ${STAGEDIR}${PREFIX}/bin
52
	${INSTALL_PROGRAM} ${WRKSRC}/tcp/getzone ${STAGEDIR}${PREFIX}/bin
53
	${INSTALL_PROGRAM} ${WRKSRC}/coLunacyDNS/lunacy/lunacy ${STAGEDIR}${PREFIX}/bin
54
	${INSTALL_PROGRAM} ${WRKSRC}/coLunacyDNS/coLunacyDNS ${STAGEDIR}${PREFIX}/sbin
55
	${INSTALL_PROGRAM} ${WRKSRC}/server/maradns ${STAGEDIR}${PREFIX}/sbin
41
	${INSTALL_PROGRAM} ${WRKSRC}/tcp/zoneserver ${STAGEDIR}${PREFIX}/sbin
56
	${INSTALL_PROGRAM} ${WRKSRC}/tcp/zoneserver ${STAGEDIR}${PREFIX}/sbin
42
	${INSTALL_PROGRAM} ${WRKSRC}/tools/askmara ${STAGEDIR}${PREFIX}/bin
57
	${INSTALL_PROGRAM} ${WRKSRC}/${DEADWOOD_VER}/src/Deadwood ${STAGEDIR}${PREFIX}/sbin
43
	${INSTALL_PROGRAM} ${WRKSRC}/tools/duende ${STAGEDIR}${PREFIX}/bin
44
	${INSTALL_PROGRAM} ${WRKSRC}/tools/misc/mqhash ${STAGEDIR}${PREFIX}/bin
45
46
	${INSTALL_MAN} ${WRKSRC}/doc/en/man/*.1 ${STAGEDIR}${MANPREFIX}/man/man1
47
	${INSTALL_MAN} ${WRKSRC}/doc/en/man/*.8 ${STAGEDIR}${MANPREFIX}/man/man8
48
	${INSTALL_MAN} ${WRKSRC}/doc/en/man/*.5 ${STAGEDIR}${MANPREFIX}/man/man5
49
50
	@${MKDIR} ${STAGEDIR}${ETCDIR}
58
	@${MKDIR} ${STAGEDIR}${ETCDIR}
51
	${INSTALL_DATA} ${WRKSRC}/doc/en/examples/example_full_mararc ${STAGEDIR}${ETCDIR}/mararc.sample
59
	${INSTALL_DATA} ${WRKSRC}/doc/en/examples/example_full_mararc ${STAGEDIR}${ETCDIR}/mararc.sample
52
	${INSTALL_DATA} ${WRKSRC}/doc/en/examples/example_csv2 ${STAGEDIR}${ETCDIR}/csv2.sample
60
	${INSTALL_DATA} ${WRKSRC}/doc/en/examples/example_csv2 ${STAGEDIR}${ETCDIR}/csv2.sample
53
	${INSTALL_DATA} ${WRKSRC}/deadwood-${DEADWOOD_VER}/doc/dwood3rc ${STAGEDIR}${ETCDIR}/dwood3rc.sample
61
	${INSTALL_DATA} ${WRKSRC}/${DEADWOOD_VER}/doc/dwood3rc ${STAGEDIR}${ETCDIR}/dwood3rc.sample
54
62
55
post-install-DOCS-on:
63
post-install-DOCS-on:
56
	@${MKDIR} ${STAGEDIR}${DOCSDIR}
64
	@${MKDIR} ${STAGEDIR}${DOCSDIR}
57
	cd ${WRKSRC}/doc/en && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}
65
	@cd ${WRKSRC}/doc/en/text/ && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}
58
	@${RM} -r ${STAGEDIR}${DOCSDIR}/man \
66
	${INSTALL_DATA} ${WRKSRC}/coLunacyDNS/doc/coLunacyDNS.txt ${STAGEDIR}${DOCSDIR}
59
		${STAGEDIR}${DOCSDIR}/source \
67
	${INSTALL_DATA} ${WRKSRC}/maradns.gpg.key ${STAGEDIR}${DOCSDIR}
60
		${STAGEDIR}${DOCSDIR}/pdf
61
	@${FIND} ${STAGEDIR}${DOCSDIR} -name Makefile -delete
62
68
63
post-install-EXAMPLES-on:
69
post-install-EXAMPLES-on:
64
	${MV} ${STAGEDIR}${DOCSDIR}/examples ${STAGEDIR}${EXAMPLESDIR}
70
	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
71
.for a in auth_mararc csv2 full_mararc mararc recursive_mararc simple_csv1
72
	${INSTALL_DATA} ${WRKSRC}/doc/en/source/example_${a} ${STAGEDIR}${EXAMPLESDIR}
73
.endfor
74
75
post-install-MANPAGES-on:
76
.for M1 in Deadwood askmara blockHashMake blockHashRead coLunacyDNS fetchzone getzone
77
	${INSTALL_MAN} ${WRKSRC}/doc/en/man/${M1}.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
78
.endfor
79
.for M5 in csv1 csv2 csv2_txt mararc
80
	${INSTALL_MAN} ${WRKSRC}/doc/en/man/${M5}.5 ${STAGEDIR}${MAN5PREFIX}/man/man5
81
.endfor
82
.for M8 in duende maradns zoneserver
83
	${INSTALL_MAN} ${WRKSRC}/doc/en/man/${M8}.8 ${STAGEDIR}${MAN8PREFIX}/man/man8
84
.endfor
65
85
66
.include <bsd.port.mk>
86
.include <bsd.port.mk>
(-)./distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
TIMESTAMP = 1524796813
1
TIMESTAMP = 1684379936
2
SHA256 (maradns-2.0.15.tar.bz2) = 2c20588dc9a79492aca94a477864c59ac28ec7ae4715046022311e9cefe332b2
2
SHA256 (maradns-3.5.0036.tar.xz) = 6cdbeb588c636ca2c19511af49ce56c8903ac264fcfed5fd759fdbedfea1b3a0
3
SIZE (maradns-2.0.15.tar.bz2) = 1166133
3
SIZE (maradns-3.5.0036.tar.xz) = 9192932
(-)./files/Deadwood.in (-1 lines)
Lines 4-10 Link Here
4
# REQUIRE: SERVERS
4
# REQUIRE: SERVERS
5
# BEFORE: DAEMON
5
# BEFORE: DAEMON
6
# KEYWORD: shutdown
6
# KEYWORD: shutdown
7
#
8
7
9
. /etc/rc.subr
8
. /etc/rc.subr
10
9
(-)./files/localbase (+49 lines)
Line 0 Link Here
1
deadwood-3.5.0036/doc/Deadwood-HOWTO
2
deadwood-3.5.0036/doc/Deadwood.txt
3
deadwood-3.5.0036/doc/dwood3rc
4
deadwood-3.5.0036/doc/dwood3rc-all
5
deadwood-3.5.0036/doc/FAQ.txt
6
deadwood-3.5.0036/doc/internals/CACHE.FILE
7
deadwood-3.5.0036/INSTALL.txt
8
deadwood-3.5.0036/sqa/recurse_2link_cname/dwood3rc
9
deadwood-3.5.0036/sqa/recurse_es-us.noticias.yahoo.com/dwood3rc
10
deadwood-3.5.0036/src/DwMararc.c
11
deadwood-3.5.0036/src/DwMararc.h
12
deadwood-3.5.0036/src/DwSocket.c
13
deadwood-3.5.0036/tools/make.blocklist.sh
14
doc/en/examples/example_authoritative_mararc.txt
15
doc/en/examples/example_full_mararc
16
doc/en/examples/example_mararc
17
doc/en/examples/example_recursive_mararc.txt
18
doc/en/faq.txt
19
doc/en/man/Deadwood.1
20
doc/en/man/duende.8
21
doc/en/man/maradns.8
22
doc/en/man/mararc.5
23
doc/en/man/zoneserver.8
24
doc/en/QuickStart
25
doc/en/source/example_auth_mararc
26
doc/en/source/example_mararc
27
doc/en/source/example_recursive_mararc
28
doc/en/text/authoritative.txt
29
doc/en/text/compile.txt
30
doc/en/text/convert.txt
31
doc/en/text/dangling.txt
32
doc/en/text/dnsmaster.txt
33
doc/en/text/dnsslave.txt
34
doc/en/text/dnstcp.txt
35
doc/en/text/man.duende.txt
36
doc/en/text/man.maradns.txt
37
doc/en/text/man.mararc.txt
38
doc/en/text/man.zoneserver.txt
39
doc/en/text/quick_start.txt
40
doc/en/text/recursive.txt
41
doc/en/text/troubleshoot.txt
42
doc/en/text/update.txt
43
Docker-stuff/alpine/Dockerfile
44
Docker-stuff/Dockerfile
45
parse/example_mararc
46
tools/letsencrypt/t-add
47
tools/letsencrypt/t-count
48
tools/letsencrypt/t-zap
49
tools/misc/make.maradns.spec
(-)./files/maradns.in (-1 lines)
Lines 4-10 Link Here
4
# REQUIRE: SERVERS
4
# REQUIRE: SERVERS
5
# BEFORE: DAEMON
5
# BEFORE: DAEMON
6
# KEYWORD: shutdown
6
# KEYWORD: shutdown
7
#
8
7
9
. /etc/rc.subr
8
. /etc/rc.subr
10
9
(-)./files/patch-MaraDns.h (-5 / +14 lines)
Lines 1-21 Link Here
1
--- MaraDns.h.orig	2015-09-26 05:35:18 UTC
1
--- MaraDns.h.orig	2022-05-07 06:11:04 UTC
2
+++ MaraDns.h
2
+++ MaraDns.h
3
@@ -71,21 +71,21 @@
3
@@ -51,7 +51,7 @@
4
 /* The default UID (User ID) that MaraDNS has; I put this here so packagers
5
    can change this easily.  This should be the 'nobody' user, or, optionally
6
    a special 'MaraDNS' user.  This user needs to be able to enter
7
-   the /etc/maradns directory, and read all zone files in /etc/maradns
8
+   the /usr/local/etc/maradns directory, and read all zone files in /usr/local/etc/maradns
9
 
10
    If you change this from 707, please also change the mararc man page, 
11
    which states the default value for this is 707.  To change the 
12
@@ -75,21 +75,21 @@
4
      line to point to Bash
13
      line to point to Bash
5
  */
14
  */
6
 
15
 
7
-#define MARADNS_DEFAULT_UID 99
16
-#define MARADNS_DEFAULT_UID 707
8
+#define MARADNS_DEFAULT_UID 53
17
+#define MARADNS_DEFAULT_UID 53
9
 
18
 
10
 /* The default GID (Group ID) that MaraDNS has; see the default UID notes
19
 /* The default GID (Group ID) that MaraDNS has; see the default UID notes
11
    above.  Again: CHANGE THE MARARC MAN PAGE IF YOU CHANGE THIS VALUE */
20
    above.  Again: CHANGE THE MARARC MAN PAGE IF YOU CHANGE THIS VALUE */
12
-#define MARADNS_DEFAULT_GID 99
21
-#define MARADNS_DEFAULT_GID 707
13
+#define MARADNS_DEFAULT_GID 53
22
+#define MARADNS_DEFAULT_GID 53
14
 
23
 
15
 /* The UID that the Duende logging process uses.  CHANGE THE DUENDE MAN
24
 /* The UID that the Duende logging process uses.  CHANGE THE DUENDE MAN
16
    PAGE IF YOU CHANGE THIS VALUE (same general process as changing the
25
    PAGE IF YOU CHANGE THIS VALUE (same general process as changing the
17
    mararc man page; the source file for the duende man page is duende.ej) */
26
    mararc man page; the source file for the duende man page is duende.ej) */
18
-#define DUENDE_LOGGER_UID 66
27
-#define DUENDE_LOGGER_UID 707
19
+#define DUENDE_LOGGER_UID 65534
28
+#define DUENDE_LOGGER_UID 65534
20
 
29
 
21
 /* The directory that Duende runs in.  This directory has to exist for
30
 /* The directory that Duende runs in.  This directory has to exist for
(-)./files/patch-build_Makefile.freebsd (-10 / +11 lines)
Lines 1-12 Link Here
1
--- build/Makefile.freebsd.orig	2012-02-12 06:04:11 UTC
1
--- build/Makefile.freebsd.orig	2023-05-03 00:53:39 UTC
2
+++ build/Makefile.freebsd
2
+++ build/Makefile.freebsd
3
@@ -47,7 +47,8 @@ all: 
3
@@ -31,8 +31,8 @@ M="VERSION=$(VERSION)"
4
 	cd ../qual ; make $(M) ; cd ../server ; \
4
 Q="DEFINES=-DSELECT_PROBLEM"
5
 	make $(M) $(Q) COMPILED=\"$(COMPILED)\" $(V) ; \
6
 	cd ../tools ; make $(M) ; \
7
-	cd ../deadwood-*/src/ ; make FLAGS="-O2"; \
8
+	cd misc ; make $(M) ; \
9
+	cd ../../deadwood-*/src/ ; make FLAGS="-O2"; \
10
 	cd ../../tcp ; make $(M) $(V) ; cat ../00README.FIRST
11
 
5
 
12
 debug: 
6
 # FreeBSD needs some special flags to compile MaraDNS
7
-CC="cc -O2 -Wall -pipe -D_THREAD_SAFE -pthread"
8
-M=CC=$(CC) 
9
+#CC="cc -O2 -Wall -pipe -D_THREAD_SAFE -pthread"
10
+M=CC="$(CC) $(FLAGS) -pipe -D_THREAD_SAFE -pthread"
11
 V="VERSION=$(VERSION)"
12
 
13
 # Debug
(-)./files/patch-coLunacyDNS_lunacy_Makefile.default (+19 lines)
Line 0 Link Here
1
--- coLunacyDNS/lunacy/Makefile.default.orig	2023-05-03 00:53:39 UTC
2
+++ coLunacyDNS/lunacy/Makefile.default
3
@@ -8,11 +8,11 @@
4
 # Your platform. See PLATS for possible values.
5
 PLAT= ansi
6
 
7
-CC= gcc
8
-CFLAGS= -O3 -Wall $(MYCFLAGS) -DNO_LFS -DNO_SPAWNER
9
-AR= ar rcu
10
-RANLIB= ranlib
11
-RM= rm -f
12
+#CC= gcc
13
+#CFLAGS= -O3 -Wall $(MYCFLAGS) -DNO_LFS -DNO_SPAWNER
14
+#AR= ar rcu
15
+#RANLIB= ranlib
16
+#RM= rm -f
17
 LIBS= -lm -lutil $(MYLIBS) -L/usr/local/lib/
18
 
19
 MYCFLAGS=
(-)./files/patch-configure (-3 / +43 lines)
Lines 1-8 Link Here
1
--- configure.orig	2015-08-19 04:44:49 UTC
1
--- configure.orig	2023-05-03 00:53:39 UTC
2
+++ configure
2
+++ configure
3
@@ -93,6 +93,9 @@ elif echo $UNAME | grep -i cygwin > /dev
3
@@ -42,6 +42,7 @@ fi
4
 	echo It looks like you are using Cygwin\; this should compile fine
4
 # Set the directory for the build files
5
 BUILDDIR=build
6
 export BUILDDIR
7
+DEADWOOD=$( echo deadwood-*/src )
8
 
9
 # Show them the disclaimer
10
 cat 00README.FIRST
11
@@ -116,13 +117,11 @@ elif echo $UNAME | grep -i mingw32 > /dev/null ; then
12
 	# Mingw32 doesn't support symlinks
13
 	cp server/MaraBigHash_en.h server/MaraBigHash_locale.h
14
 	cp server/MaraDNS_en.h server/MaraDNS_locale.h
15
-	DEADWOOD_DIR=$( echo deadwood-* )
16
-	cp $DEADWOOD_DIR/src/Makefile.mingw342 $DEADWOOD_DIR/src/Makefile
17
+	cp $DEADWOOD/Makefile.mingw342 $DEADWOOD/Makefile
18
 	cp COPYING 00README.FIRST
19
 	exit 0
20
 elif echo $UNAME | grep -i cygwin > /dev/null ; then
21
 	cat $BUILDDIR/Makefile.noflock >> Makefile
22
-	DEADWOOD="$( echo deadwood-*/src )"
23
 	cp ${DEADWOOD}/Makefile.xcygwin ${DEADWOOD}/Makefile
24
 	echo It looks like you are using Cygwin\; this will compile fine
5
 	echo by typing in \'make\'.
25
 	echo by typing in \'make\'.
26
@@ -137,6 +136,9 @@ elif echo $UNAME | grep -i cygwin > /dev/null ; then
27
 	echo cygrunsrv.exe -S MaraDNS
28
 	echo
6
 	EXITCODE=0
29
 	EXITCODE=0
7
+elif echo $UNAME | grep -i freebsd > /dev/null ; then
30
+elif echo $UNAME | grep -i freebsd > /dev/null ; then
8
+	cat $BUILDDIR/Makefile.freebsd >> Makefile
31
+	cat $BUILDDIR/Makefile.freebsd >> Makefile
Lines 10-12 Link Here
10
 # This is a a template for adding support to a new OS for MaraDNS.
33
 # This is a a template for adding support to a new OS for MaraDNS.
11
 # Some points: If you port MaraDNS, make sure the underlying OS has
34
 # Some points: If you port MaraDNS, make sure the underlying OS has
12
 # /dev/urandom support or have the default mararc have a
35
 # /dev/urandom support or have the default mararc have a
36
@@ -184,14 +186,14 @@ if [ -z "$IPV6" ] ; then
37
 	cp tcp/Makefile.authonly tcp/Makefile
38
 	cp dns/Makefile.authonly dns/Makefile
39
 	cp tools/Makefile.authonly tools/Makefile
40
-	DEADWOOD_DIR=$( echo deadwood-* )
41
-	cp $DEADWOOD_DIR/src/Makefile.noip6 $DEADWOOD_DIR/src/Makefile
42
+	cp $DEADWOOD/Makefile.noip6 $DEADWOOD/Makefile
43
 else
44
 	cp server/Makefile.ipv6 server/Makefile
45
 	cp qual/Makefile.nothreads qual/Makefile
46
 	cp tcp/Makefile.ipv6 tcp/Makefile
47
 	cp dns/Makefile.authonly dns/Makefile
48
 	cp tools/Makefile.ipv6 tools/Makefile
49
+	sed -e 's|-DNOIP6 ||' ${DEADWOOD}/Makefile.noip6 > ${DEADWOOD}/Makefile
50
 fi
51
 
52
 # While Lunacy *could* use readline, we use the API compatible
(-)./files/patch-tools__Makefile (-11 lines)
Lines 1-11 Link Here
1
--- tools/Makefile.orig	2010-09-09 20:21:09 UTC
2
+++ tools/Makefile
3
@@ -18,7 +18,7 @@ clean:
4
 	rm -f core $(EXECS) *.exe
5
 
6
 askmara: askmara.c askmara_labels_en.h $(OBJECTS) $(Q) $(OUTOBJ)
7
-	$(CC) $(FLAGS) -DAUTHONLY -o askmara askmara.c $(OBJECTS) $(Q) $(OUTOBJ)
8
+	$(CC) $(FLAGS) -DAUTHONLY -DIPV6 -o askmara askmara.c $(OBJECTS) $(Q) $(OUTOBJ)
9
 
10
 askmara-tcp: askmara-tcp.c askmara_labels_en.h $(OBJECTS) $(ROBJECTS) $(POBJECTS)
11
 	$(CC) $(FLAGS) -o askmara-tcp askmara-tcp.c $(OBJECTS) $(ROBJECTS) $(POBJECTS)
(-)./files/zoneserver.in (-1 lines)
Lines 4-10 Link Here
4
# REQUIRE: SERVERS
4
# REQUIRE: SERVERS
5
# BEFORE: DAEMON
5
# BEFORE: DAEMON
6
# KEYWORD: shutdown
6
# KEYWORD: shutdown
7
#
8
7
9
. /etc/rc.subr
8
. /etc/rc.subr
10
9
(-)./pkg-descr (-2 / +2 lines)
Lines 1-4 Link Here
1
MaraDNS is a package that implements the Domain Name Service (DNS), an
1
MaraDNS implements the Domain Name System (DNS), an essential internet service.
2
essential internet service.
2
3
People like MaraDNS because it's small, lightweight, easy to set up, and
3
People like MaraDNS because it's small, lightweight, easy to set up, and
4
remarkably secure.
4
remarkably secure.
(-)./pkg-plist (-14 / +55 lines)
Lines 2-24 bin/askmara Link Here
2
bin/duende
2
bin/duende
3
bin/fetchzone
3
bin/fetchzone
4
bin/getzone
4
bin/getzone
5
bin/mqhash
5
bin/lunacy
6
@dir %%ETCDIR%%
6
@sample %%ETCDIR%%/csv2.sample
7
@sample %%ETCDIR%%/csv2.sample
7
@sample %%ETCDIR%%/dwood3rc.sample
8
@sample %%ETCDIR%%/dwood3rc.sample
8
@sample %%ETCDIR%%/mararc.sample
9
@sample %%ETCDIR%%/mararc.sample
9
man/man1/Deadwood.1.gz
10
%%MANPAGES%%man/man1/Deadwood.1.gz
10
man/man1/askmara.1.gz
11
%%MANPAGES%%man/man1/askmara.1.gz
11
man/man1/bind2csv2.1.gz
12
%%MANPAGES%%man/man1/blockHashMake.1.gz
12
man/man1/fetchzone.1.gz
13
%%MANPAGES%%man/man1/blockHashRead.1.gz
13
man/man1/getzone.1.gz
14
%%MANPAGES%%man/man1/coLunacyDNS.1.gz
14
man/man1/mqhash.1.gz
15
%%MANPAGES%%man/man1/fetchzone.1.gz
15
man/man5/csv1.5.gz
16
%%MANPAGES%%man/man1/getzone.1.gz
16
man/man5/csv2.5.gz
17
%%MANPAGES%%man/man5/csv1.5.gz
17
man/man5/csv2_txt.5.gz
18
%%MANPAGES%%man/man5/csv2.5.gz
18
man/man5/mararc.5.gz
19
%%MANPAGES%%man/man5/csv2_txt.5.gz
19
man/man8/duende.8.gz
20
%%MANPAGES%%man/man5/mararc.5.gz
20
man/man8/maradns.8.gz
21
%%MANPAGES%%man/man8/duende.8.gz
21
man/man8/zoneserver.8.gz
22
%%MANPAGES%%man/man8/maradns.8.gz
23
%%MANPAGES%%man/man8/zoneserver.8.gz
22
sbin/Deadwood
24
sbin/Deadwood
25
sbin/coLunacyDNS
23
sbin/maradns
26
sbin/maradns
24
sbin/zoneserver
27
sbin/zoneserver
28
%%PORTDOCS%%@dir %%DOCSDIR%%
29
%%PORTDOCS%%%%DOCSDIR%%/Makefile
30
%%PORTDOCS%%%%DOCSDIR%%/authoritative.txt
31
%%PORTDOCS%%%%DOCSDIR%%/coLunacyDNS.txt
32
%%PORTDOCS%%%%DOCSDIR%%/coding_style.txt
33
%%PORTDOCS%%%%DOCSDIR%%/compile.txt
34
%%PORTDOCS%%%%DOCSDIR%%/convert.txt
35
%%PORTDOCS%%%%DOCSDIR%%/dangling.txt
36
%%PORTDOCS%%%%DOCSDIR%%/default_zonefile.txt
37
%%PORTDOCS%%%%DOCSDIR%%/dnsintro.txt
38
%%PORTDOCS%%%%DOCSDIR%%/dnsmaster.txt
39
%%PORTDOCS%%%%DOCSDIR%%/dnsslave.txt
40
%%PORTDOCS%%%%DOCSDIR%%/dnstcp.txt
41
%%PORTDOCS%%%%DOCSDIR%%/glossary.txt
42
%%PORTDOCS%%%%DOCSDIR%%/man.askmara.txt
43
%%PORTDOCS%%%%DOCSDIR%%/man.csv1.txt
44
%%PORTDOCS%%%%DOCSDIR%%/man.csv2.txt
45
%%PORTDOCS%%%%DOCSDIR%%/man.csv2_txt.txt
46
%%PORTDOCS%%%%DOCSDIR%%/man.duende.txt
47
%%PORTDOCS%%%%DOCSDIR%%/man.fetchzone.txt
48
%%PORTDOCS%%%%DOCSDIR%%/man.maradns.txt
49
%%PORTDOCS%%%%DOCSDIR%%/man.mararc.txt
50
%%PORTDOCS%%%%DOCSDIR%%/man.zoneserver.txt
51
%%PORTDOCS%%%%DOCSDIR%%/maradns.gpg.key
52
%%PORTDOCS%%%%DOCSDIR%%/quick_start.txt
53
%%PORTDOCS%%%%DOCSDIR%%/recordtypes.txt
54
%%PORTDOCS%%%%DOCSDIR%%/recursive.txt
55
%%PORTDOCS%%%%DOCSDIR%%/troubleshoot.txt
56
%%PORTDOCS%%%%DOCSDIR%%/tutorial.txt
57
%%PORTDOCS%%%%DOCSDIR%%/update.txt
58
%%PORTDOCS%%%%DOCSDIR%%/win_service.txt
59
%%PORTEXAMPLES%%@dir %%EXAMPLESDIR%%
60
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example_auth_mararc
61
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example_csv2
62
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example_full_mararc
63
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example_mararc
64
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example_recursive_mararc
65
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example_simple_csv1

Return to bug 234494