Attachment 162105 Details for Bug 203810 – maradns-2.0.13.patch

[patch] maradns-2.0.13.patch

maradns.patch (text/plain), 7.74 KB, created by takefu on 2015-10-16 01:18:52 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: takefu

Created: 2015-10-16 01:18:52 UTC

Size: 7.74 KB

patch

obsolete

>diff -dpruN /usr/ports/dns/maradns/Makefile ./Makefile
>--- /usr/ports/dns/maradns/Makefile	2015-09-28 13:27:24.000000000 +0000
>+++ ./Makefile	2015-10-16 01:07:21.000000000 +0000
>@@ -1,8 +1,7 @@
>-# Created by: Anders Nordby <anders@fix.no>
> # $FreeBSD: head/dns/maradns/Makefile 398112 2015-09-28 13:27:24Z mat $
> 
> PORTNAME=	maradns
>-PORTVERSION=	2.0.12
>+PORTVERSION=	2.0.13
> CATEGORIES=	dns
> MASTER_SITES=	http://maradns.samiam.org/download/2.0/${PORTVERSION}/\
> 		SF/${PORTNAME}/MaraDNS/${PORTVERSION}/
>@@ -13,7 +12,7 @@ COMMENT=	DNS server with focus on securi
> LICENSE=	BSD2CLAUSE
> LICENSE_FILE=	${WRKSRC}/COPYING
> 
>-DEADWOOD_VER=	3.2.08
>+DEADWOOD_VER=	3.2.09
> 
> REINPLACE_ARGS=	-i ""
> MAKE_ENV=	FLAGS="${CFLAGS}"
>@@ -21,10 +20,11 @@ CONFIGURE_ENV=	LANG=
> 
> HAS_CONFIGURE=	yes
> USE_RC_SUBR=	${PORTNAME} zoneserver Deadwood
>-USES=		tar:bz2
>+USES=		shebangfix tar:xz
> USERS=		bind
> GROUPS=		bind
> INSTALL_TARGET=	install PREFIX=${STAGEDIR}${PREFIX}
>+SHEBANG_FILES=	${WRKSRC}/tools/bind2csv2.py
> 
> OPTIONS_DEFINE=	IPV6 DOCS EXAMPLES
> 
>@@ -34,11 +34,14 @@ PORTDOCS=	*
> PORTEXAMPLES=	*
> 
> post-patch:
>-	@${REINPLACE_CMD} -e 's|cc|${CC}|' ${WRKSRC}/build/Makefile.freebsd
>-	@${FIND} ${WRKSRC} -type f ! -name "*.orig" | ${XARGS} ${REINPLACE_CMD} -e \
>+	@${REINPLACE_CMD} -e\
>+		's|make |\$$\{MAKE\} |g; 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'
>+		's|/etc/deadwood|${ETCDIR}|g; s| = 99| = 53|g' -e\
>+		's|${PREFIX}/${ETCDIR}/|${ETCDIR}/|g'
> 
> do-install:
> 	${INSTALL_PROGRAM} ${WRKSRC}/deadwood-${DEADWOOD_VER}/src/Deadwood ${STAGEDIR}${PREFIX}/sbin
>@@ -48,30 +51,26 @@ do-install:
> 	${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_SCRIPT} ${WRKSRC}/tools/bind2csv2.py ${STAGEDIR}${PREFIX}/bin
>+	${INSTALL_PROGRAM} ${WRKSRC}/tools/misc/mqhash ${STAGEDIR}${PREFIX}/bin
>+.for i in askmara.1 bind2csv2.1 getzone.1 fetchzone.1 mqhash.1\
>+	maradns.8 zoneserver.8 duende.8\
>+	mararc.5 csv1.5 csv2.5 csv2_txt.5 Deadwood.1
>+	${INSTALL_MAN} ${WRKSRC}/doc/en/man/${i} ${STAGEDIR}${MANPREFIX}/man/${i:C|.*\.|man|}/${i:C|\.*||}
>+.endfor
> 	@${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} ${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} ${WRKSRC}/doc/en/${i} ${STAGEDIR}${DOCSDIR}
>+.endfor
>+.for i in misc text tutorial webpage
>+	@${MKDIR} ${STAGEDIR}${DOCSDIR}/${i}
>+	cd ${WRKSRC}/doc/en/${i} && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}/${i}
>+.endfor
>+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
>+	cd ${WRKSRC}/doc/en/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}
> 
> .include <bsd.port.mk>
>diff -dpruN /usr/ports/dns/maradns/distinfo ./distinfo
>--- /usr/ports/dns/maradns/distinfo	2015-09-28 13:27:24.000000000 +0000
>+++ ./distinfo	2015-10-16 00:36:15.000000000 +0000
>@@ -1,2 +1,2 @@
>-SHA256 (maradns-2.0.12.tar.bz2) = a7683749d312f469e7f42d0f9b74588eb207bfa69391a9f2364b67af83d32ebc
>-SIZE (maradns-2.0.12.tar.bz2) = 1159457
>+SHA256 (maradns-2.0.13.tar.xz) = e09d0aa3ebbf7b042159844d0ed81c17fcbc1f3d6620ac25cc3037070c327647
>+SIZE (maradns-2.0.13.tar.xz) = 754084
>diff -dpruN /usr/ports/dns/maradns/files/patch-MaraDns.h ./files/patch-MaraDns.h
>--- /usr/ports/dns/maradns/files/patch-MaraDns.h	2014-02-21 15:12:25.000000000 +0000
>+++ ./files/patch-MaraDns.h	2015-10-16 01:01:55.000000000 +0000
>@@ -1,6 +1,6 @@
>---- ./MaraDns.h.orig	2014-02-12 08:17:18.000000000 +0000
>-+++ ./MaraDns.h	2014-02-20 15:23:22.000000000 +0000
>-@@ -77,21 +77,21 @@
>+--- MaraDns.h.orig	2015-09-26 05:35:18 UTC
>++++ MaraDns.h
>+@@ -71,21 +71,21 @@
>       line to point to Bash
>   */
>  
>diff -dpruN /usr/ports/dns/maradns/files/patch-build_Makefile.freebsd ./files/patch-build_Makefile.freebsd
>--- /usr/ports/dns/maradns/files/patch-build_Makefile.freebsd	1970-01-01 00:00:00.000000000 +0000
>+++ ./files/patch-build_Makefile.freebsd	2015-08-04 00:58:05.000000000 +0000
>@@ -0,0 +1,12 @@
>+--- build/Makefile.freebsd.orig	2012-02-12 06:04:11 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
>+ 
>+ debug: 
>diff -dpruN /usr/ports/dns/maradns/files/patch-configure ./files/patch-configure
>--- /usr/ports/dns/maradns/files/patch-configure	2014-02-20 15:44:56.000000000 +0000
>+++ ./files/patch-configure	2015-10-16 01:03:46.000000000 +0000
>@@ -1,6 +1,6 @@
>---- ./configure.orig	2014-01-14 21:46:25.000000000 +0000
>-+++ ./configure	2014-02-20 15:33:18.000000000 +0000
>-@@ -93,6 +93,9 @@
>+--- configure.orig	2015-08-19 04:44:49 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
>  	echo by typing in \'make\'.
>  	EXITCODE=0
>diff -dpruN /usr/ports/dns/maradns/files/patch-tools__Makefile ./files/patch-tools__Makefile
>--- /usr/ports/dns/maradns/files/patch-tools__Makefile	2014-02-20 15:44:56.000000000 +0000
>+++ ./files/patch-tools__Makefile	2015-08-04 00:58:21.000000000 +0000
>@@ -1,6 +1,6 @@
>---- ./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 @@
>+--- 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)
>diff -dpruN /usr/ports/dns/maradns/pkg-plist ./pkg-plist
>--- /usr/ports/dns/maradns/pkg-plist	2014-10-02 16:37:02.000000000 +0000
>+++ ./pkg-plist	2015-01-09 01:08:15.000000000 +0000
>@@ -1,14 +1,18 @@
> bin/askmara
>+bin/bind2csv2.py
> bin/duende
> bin/fetchzone
> bin/getzone
>+bin/mqhash
> @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

Actions: View | Diff

Attachments on bug 203810: 162105