Attachment 218444 Details for Bug 250021 – maradns-3.5.0016

[patch] maradns-3.5.0016

maradns-3.5.0016.patch (text/plain), 6.68 KB, created by Kenji Takefu on 2020-10-01 06:18:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kenji Takefu

Created: 2020-10-01 06:18:03 UTC

Size: 6.68 KB

patch

obsolete

>diff -udprN /usr/ports/dns/maradns/distinfo ./distinfo
>--- /usr/ports/dns/maradns/distinfo	2018-05-03 14:05:55.260414000 +0000
>+++ ./distinfo	2020-09-28 06:08:27.807815000 +0000
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1524796813
>-SHA256 (maradns-2.0.15.tar.bz2) = 2c20588dc9a79492aca94a477864c59ac28ec7ae4715046022311e9cefe332b2
>-SIZE (maradns-2.0.15.tar.bz2) = 1166133
>+TIMESTAMP = 1601269409
>+SHA256 (maradns-3.5.0016.tar.xz) = a879cff991424b2fc09cd58d56f55ea7540a6e06e7e45dc6d44036a7fa3b20ac
>+SIZE (maradns-3.5.0016.tar.xz) = 6752140
>diff -udprN /usr/ports/dns/maradns/files/patch-build_Makefile.freebsd ./files/patch-build_Makefile.freebsd
>--- /usr/ports/dns/maradns/files/patch-build_Makefile.freebsd	2015-10-16 14:19:00.600247000 +0000
>+++ ./files/patch-build_Makefile.freebsd	2019-01-07 06:11:37.030064000 +0000
>@@ -1,5 +1,16 @@
> --- build/Makefile.freebsd.orig	2012-02-12 06:04:11 UTC
> +++ build/Makefile.freebsd
>+@@ -31,8 +31,8 @@ M="VERSION=$(VERSION)"
>+ Q="DEFINES=-DSELECT_PROBLEM"
>+ 
>+ # 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) -O2 -Wall -pipe -D_THREAD_SAFE -pthread"
>+ V="VERSION=$(VERSION)"
>+ 
>+ # Debug
> @@ -47,7 +47,8 @@ all: 
>  	cd ../qual ; make $(M) ; cd ../server ; \
>  	make $(M) $(Q) COMPILED=\"$(COMPILED)\" $(V) ; \
>diff -udprN /usr/ports/dns/maradns/files/patch-configure ./files/patch-configure
>--- /usr/ports/dns/maradns/files/patch-configure	2018-05-03 14:05:55.260414000 +0000
>+++ ./files/patch-configure	2020-09-28 06:08:27.808984000 +0000
>@@ -1,8 +1,8 @@
>---- configure.orig	2015-08-19 04:44:49 UTC
>+--- configure.orig	2020-09-01 08:51:17 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\'.
>+@@ -127,6 +127,9 @@ elif echo $UNAME | grep -i cygwin > /dev
>+ 	echo cygrunsrv.exe -S MaraDNS
>+ 	echo
>  	EXITCODE=0
> +elif echo $UNAME | grep -i freebsd > /dev/null ; then
> +	cat $BUILDDIR/Makefile.freebsd >> Makefile
>diff -udprN /usr/ports/dns/maradns/files/patch-MaraDns.h ./files/patch-MaraDns.h
>--- /usr/ports/dns/maradns/files/patch-MaraDns.h	2015-10-16 14:19:00.600247000 +0000
>+++ ./files/patch-MaraDns.h	2020-09-28 06:08:27.808414000 +0000
>@@ -1,21 +1,21 @@
>---- MaraDns.h.orig	2015-09-26 05:35:18 UTC
>+--- MaraDns.h.orig	2020-09-01 08:51:17 UTC
> +++ MaraDns.h
>-@@ -71,21 +71,21 @@
>+@@ -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 -udprN /usr/ports/dns/maradns/files/patch-tools__Makefile ./files/patch-tools__Makefile
>--- /usr/ports/dns/maradns/files/patch-tools__Makefile	2018-05-03 14:05:55.260414000 +0000
>+++ ./files/patch-tools__Makefile	1970-01-01 00:00:00.000000000 +0000
>@@ -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 -udprN /usr/ports/dns/maradns/Makefile ./Makefile
>--- /usr/ports/dns/maradns/Makefile	2018-05-03 14:05:55.260414000 +0000
>+++ ./Makefile	2020-10-01 05:28:57.792884000 +0000
>@@ -2,17 +2,16 @@
> # $FreeBSD: head/dns/maradns/Makefile 468929 2018-05-03 14:05:55Z mat $
> 
> PORTNAME=	maradns
>-PORTVERSION=	2.0.15
>+PORTVERSION=	3.5.0016
> CATEGORIES=	dns
>-MASTER_SITES=	http://maradns.samiam.org/download/2.0/${PORTVERSION}/
>-
>-MAINTAINER=	je3kmz@FreeBSD.org
>+MASTER_SITES=	https://maradns.samiam.org/download/3.5/${PORTVERSION}/
>+MAINTAINER=	takefu@airport.fm
> COMMENT=	DNS server with focus on security and simplicity
> 
> LICENSE=	BSD2CLAUSE
> LICENSE_FILE=	${WRKSRC}/COPYING
> 
>-USES=		tar:bz2
>+USES=		tar:xz
> USE_RC_SUBR=	${PORTNAME} zoneserver Deadwood
> USERS=		bind
> GROUPS=		bind
>@@ -25,12 +24,22 @@ OPTIONS_SUB=	yes
> CONV_DESC=	Install bind2csv2 tool (needs python)
> 
> IPV6_CONFIGURE_ON=	--ipv6
>-CONV_USES=	python:2.7,run shebangfix
>+CONV_USES=	python:run shebangfix
> 
> PORTDOCS=	*
> PORTEXAMPLES=	*
> REINPLACE_ARGS=	-i ""
>-DEADWOOD_VER=	3.2.11
>+DEADWOOD_VER=	deadwood-${PORTVERSION}
>+
>+pre-patch:
>+	@${ECHO_MSG} max_mem = 0 >> ${WRKSRC}/doc/en/examples/example_full_mararc
>+	@${ECHO_MSG} hide_disclaimer = \"YES\" >> ${WRKSRC}/doc/en/examples/example_full_mararc
>+	cd ${WRKSRC}/${DEADWOOD_VER}/src/; ${LN} -s Makefile.centos8 Makefile
>+
>+pre-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-patch:
> 	@${REINPLACE_CMD} -e 's|make |\$$\{MAKE\} |' ${WRKSRC}/build/Makefile.freebsd
>@@ -39,7 +48,7 @@ post-patch:
> 		 s|/etc/deadwood|${ETCDIR}|g; s| = 99| = 53|g'
> 
> do-install:
>-	${INSTALL_PROGRAM} ${WRKSRC}/deadwood-${DEADWOOD_VER}/src/Deadwood ${STAGEDIR}${PREFIX}/sbin
>+	${INSTALL_PROGRAM} ${WRKSRC}/${DEADWOOD_VER}/src/Deadwood ${STAGEDIR}${PREFIX}/sbin
> 	${INSTALL_PROGRAM} ${WRKSRC}/server/maradns ${STAGEDIR}${PREFIX}/sbin
> 	${INSTALL_PROGRAM} ${WRKSRC}/tcp/fetchzone ${STAGEDIR}${PREFIX}/bin
> 	${INSTALL_PROGRAM} ${WRKSRC}/tcp/getzone ${STAGEDIR}${PREFIX}/bin
>@@ -55,7 +64,7 @@ do-install:
> 	@${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
>+	${INSTALL_DATA} ${WRKSRC}/${DEADWOOD_VER}/doc/dwood3rc ${STAGEDIR}${ETCDIR}/dwood3rc.sample
> 
> do-install-CONV-on:
> 	${INSTALL_SCRIPT} ${WRKSRC}/tools/bind2csv2.py ${STAGEDIR}${PREFIX}/bin/bind2csv2

Actions: View | Diff

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