Attachment 145177 Details for Bug 192288 – maradns.patch

[patch] maradns.patch

maradns.patch (text/plain), 6.85 KB, created by takefu on 2014-07-31 07:24:51 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: takefu

Created: 2014-07-31 07:24:51 UTC

Size: 6.85 KB

patch

obsolete

>diff -ruN /usr/ports/dns/maradns/Makefile ./Makefile
>--- /usr/ports/dns/maradns/Makefile	2014-04-25 04:32:13.000000000 +0900
>+++ ./Makefile	2014-07-31 14:29:40.000000000 +0900
>@@ -4,7 +4,7 @@
> PORTNAME=	maradns
> PORTVERSION=	2.0.09
> CATEGORIES=	dns
>-MASTER_SITES=	http://www.maradns.org/download/2.0/${PORTVERSION}/\
>+MASTER_SITES=	http://maradns.samiam.org/download/2.0/${PORTVERSION}/\
> 		SF/${PORTNAME}/MaraDNS/${PORTVERSION}/
> 
> MAINTAINER=	mat@FreeBSD.org
>@@ -27,20 +27,21 @@
> INSTALL_TARGET=	install PREFIX=${STAGEDIR}${PREFIX}
> 
> OPTIONS_DEFINE=	IPV6 DOCS EXAMPLES
>-OPTIONS_DEFAULT=	IPV6
>-IPV6_DESC=	With support for IPv6
> 
>+DOCSSRCDIR=	${WRKSRC}/doc/en
> IPV6_CONFIGURE_ON=	--ipv6
> 
> PORTDOCS=	*
> PORTEXAMPLES=	*
> 
> post-patch:
>-	@${REINPLACE_CMD} -e 's/cc/${CC}/' ${WRKSRC}/build/Makefile.freebsd
> 	@${FIND} ${WRKSRC} -type f ! -name "*.orig" | ${XARGS} ${REINPLACE_CMD} -e \
> 		's|/etc/maradns|${ETCDIR}|g; s|/etc/mararc|${ETCDIR}|g' -e\
> 		's|/etc/deadwood|${ETCDIR}|g' -e\
> 		's| = 99| = 53|g'
>+	@${FIND} ${WRKSRC} -name '*Makefile*' | ${XARGS} ${REINPLACE_CMD} -e \
>+		's|make |\$$\{MAKE\} |g'
>+	@${FIND} ${DOCSSRCDIR} -name '*Makefile*' -delete
> 
> do-install:
> 	${INSTALL_PROGRAM} ${WRKSRC}/deadwood-${DEADWOOD_VER}/src/Deadwood ${STAGEDIR}${PREFIX}/sbin
>@@ -50,30 +51,30 @@
> 	${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_MAN} ${WRKSRC}/doc/en/man/askmara.1 ${STAGEDIR}${MANPREFIX}/man/man1
>-	${INSTALL_MAN} ${WRKSRC}/doc/en/man/getzone.1 ${STAGEDIR}${MANPREFIX}/man/man1
>-	${INSTALL_MAN} ${WRKSRC}/doc/en/man/fetchzone.1 ${STAGEDIR}${MANPREFIX}/man/man1
>-	${INSTALL_MAN} ${WRKSRC}/doc/en/man/maradns.8 ${STAGEDIR}${MANPREFIX}/man/man8
>-	${INSTALL_MAN} ${WRKSRC}/doc/en/man/zoneserver.8 ${STAGEDIR}${MANPREFIX}/man/man8
>-	${INSTALL_MAN} ${WRKSRC}/doc/en/man/duende.8 ${STAGEDIR}${MANPREFIX}/man/man8
>-	${INSTALL_MAN} ${WRKSRC}/doc/en/man/mararc.5 ${STAGEDIR}${MANPREFIX}/man/man5
>-	${INSTALL_MAN} ${WRKSRC}/doc/en/man/csv1.5 ${STAGEDIR}${MANPREFIX}/man/man5
>-	${INSTALL_MAN} ${WRKSRC}/doc/en/man/csv2.5 ${STAGEDIR}${MANPREFIX}/man/man5
>-	${INSTALL_MAN} ${WRKSRC}/doc/en/man/csv2_txt.5 ${STAGEDIR}${MANPREFIX}/man/man5
>-	${INSTALL_MAN} ${WRKSRC}/doc/en/man/Deadwood.1 ${STAGEDIR}${MANPREFIX}/man/man1
>-
>+	${INSTALL_MAN} ${DOCSSRCDIR}/man/askmara.1 ${STAGEDIR}${MANPREFIX}/man/man1
>+	${INSTALL_MAN} ${DOCSSRCDIR}/man/getzone.1 ${STAGEDIR}${MANPREFIX}/man/man1
>+	${INSTALL_MAN} ${DOCSSRCDIR}/man/fetchzone.1 ${STAGEDIR}${MANPREFIX}/man/man1
>+	${INSTALL_MAN} ${DOCSSRCDIR}/man/maradns.8 ${STAGEDIR}${MANPREFIX}/man/man8
>+	${INSTALL_MAN} ${DOCSSRCDIR}/man/zoneserver.8 ${STAGEDIR}${MANPREFIX}/man/man8
>+	${INSTALL_MAN} ${DOCSSRCDIR}/man/duende.8 ${STAGEDIR}${MANPREFIX}/man/man8
>+	${INSTALL_MAN} ${DOCSSRCDIR}/man/mararc.5 ${STAGEDIR}${MANPREFIX}/man/man5
>+	${INSTALL_MAN} ${DOCSSRCDIR}/man/csv1.5 ${STAGEDIR}${MANPREFIX}/man/man5
>+	${INSTALL_MAN} ${DOCSSRCDIR}/man/csv2.5 ${STAGEDIR}${MANPREFIX}/man/man5
>+	${INSTALL_MAN} ${DOCSSRCDIR}/man/csv2_txt.5 ${STAGEDIR}${MANPREFIX}/man/man5
>+	${INSTALL_MAN} ${DOCSSRCDIR}/man/Deadwood.1 ${STAGEDIR}${MANPREFIX}/man/man1
> 	@${MKDIR} ${STAGEDIR}${ETCDIR}
>-	${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} ${DOCSSRCDIR}/examples/example_full_mararc ${STAGEDIR}${ETCDIR}/mararc.sample
>+	${INSTALL_DATA} ${DOCSSRCDIR}/examples/example_csv2 ${STAGEDIR}${ETCDIR}/csv2.sample
> 	${INSTALL_DATA} ${WRKSRC}/deadwood-${DEADWOOD_VER}/doc/dwood3rc ${STAGEDIR}${ETCDIR}/dwood3rc.sample
>-
> 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
>-	cd ${WRKSRC}/doc/en && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}
>-	@${RM} -rf ${STAGEDIR}${DOCSDIR}/man \
>-		${STAGEDIR}${DOCSDIR}/source \
>-		${STAGEDIR}${DOCSDIR}/pdf
>-	@${FIND} ${STAGEDIR}${DOCSDIR} -name Makefile -delete
>-	${MV} ${STAGEDIR}${DOCSDIR}/examples ${STAGEDIR}${EXAMPLESDIR}
>+.for i in QuickStart README changelog.txt credits.txt faq.html faq.txt files.txt
>+	${INSTALL_DATA} ${DOCSSRCDIR}/${i} ${STAGEDIR}${DOCSDIR}
>+.endfor
>+.for i in misc text tutorial webpage
>+	@${MKDIR} ${STAGEDIR}${DOCSDIR}/${i}
>+	cd ${DOCSSRCDIR}/${i} && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}/${i}
>+.endfor
>+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
>+	cd ${DOCSSRCDIR}/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}
> 
> .include <bsd.port.mk>
>diff -ruN /usr/ports/dns/maradns/files/patch-MaraDns.h ./files/patch-MaraDns.h
>--- /usr/ports/dns/maradns/files/patch-MaraDns.h	2014-02-22 00:12:25.000000000 +0900
>+++ ./files/patch-MaraDns.h	2014-02-21 13:05:00.000000000 +0900
>@@ -1,5 +1,14 @@
> --- ./MaraDns.h.orig	2014-02-12 08:17:18.000000000 +0000
> +++ ./MaraDns.h	2014-02-20 15:23:22.000000000 +0000
>+@@ -54,7 +54,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 99, please also change the mararc man page, which
>+    states the default value for this is 99.  To change the man page:
> @@ -77,21 +77,21 @@
>       line to point to Bash
>   */
>diff -ruN /usr/ports/dns/maradns/files/patch-build_Makefile ./files/patch-build_Makefile
>--- /usr/ports/dns/maradns/files/patch-build_Makefile	1970-01-01 09:00:00.000000000 +0900
>+++ ./files/patch-build_Makefile	2014-02-21 15:20:42.000000000 +0900
>@@ -0,0 +1,12 @@
>+--- build/Makefile.freebsd.orig	2012-02-12 15:04:11.000000000 +0900
>++++ build/Makefile.freebsd	2014-02-21 15:20:18.000000000 +0900
>+@@ -31,8 +31,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/files/patch-tools__Makefile ./files/patch-tools__Makefile
>--- /usr/ports/dns/maradns/files/patch-tools__Makefile	2014-02-21 00:44:56.000000000 +0900
>+++ ./files/patch-tools__Makefile	1970-01-01 09:00:00.000000000 +0900
>@@ -1,11 +0,0 @@
>---- ./tools/Makefile.orig	2010-09-09 20:21:09.000000000 +0000
>-+++ ./tools/Makefile	2014-02-20 15:23:49.000000000 +0000
>-@@ -18,7 +18,7 @@
>- 	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)

Actions: View | Diff

Attachments on bug 192288: 145177