Attachment 243114 Details for Bug 250021 – I reviewed your patch, and feedback to you.

[patch] I reviewed your patch, and feedback to you.

maradns-3.5.0036-reviewd-but-not-good.patch (text/plain), 18.19 KB, created by Norikatsu Shigemura on 2023-07-02 01:11:31 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Norikatsu Shigemura

Created: 2023-07-02 01:11:31 UTC

Size: 18.19 KB

patch

obsolete

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

Actions: View | Diff

Attachments on bug 250021: 218444 | 218636 | 242780 | 243114 | 243193 | 245121 | 245424 | 246129 | 248196 | 248288 | 248656