Attachment #218444 for bug #250021

Lines 1-3 Link Here

(-)./distinfo (-3 / +3 lines)
1	TIMESTAMP = 1524796813	1	TIMESTAMP = 1601269409
2	SHA256 (maradns-2.0.15.tar.bz2) = 2c20588dc9a79492aca94a477864c59ac28ec7ae4715046022311e9cefe332b2	2	SHA256 (maradns-3.5.0016.tar.xz) = a879cff991424b2fc09cd58d56f55ea7540a6e06e7e45dc6d44036a7fa3b20ac
3	SIZE (maradns-2.0.15.tar.bz2) = 1166133	3	SIZE (maradns-3.5.0016.tar.xz) = 6752140




--- 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) ; \

Lines 1-8 Link Here

(-)./files/patch-configure (-4 / +4 lines)
1	--- configure.orig 2015-08-19 04:44:49 UTC	1	--- configure.orig 2020-09-01 08:51:17 UTC
2	+++ configure	2	+++ configure
3	@@ -93,6 +93,9 @@ elif echo $UNAME \| grep -i cygwin > /dev	3	@@ -127,6 +127,9 @@ elif echo $UNAME \| grep -i cygwin > /dev
4	echo It looks like you are using Cygwin\; this should compile fine	4	echo cygrunsrv.exe -S MaraDNS
5	echo by typing in \'make\'.	5	echo
6	EXITCODE=0	6	EXITCODE=0
7	+elif echo $UNAME \| grep -i freebsd > /dev/null ; then	7	+elif echo $UNAME \| grep -i freebsd > /dev/null ; then
8	+ cat $BUILDDIR/Makefile.freebsd >> Makefile	8	+ cat $BUILDDIR/Makefile.freebsd >> Makefile




--- MaraDns.h.orig	2020-09-01 08:51:17 UTC
+++ MaraDns.h
@@ -75,21 +75,21 @@
      line to point to Bash
  */
 
-#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 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 707
+#define DUENDE_LOGGER_UID 65534
 
 /* The directory that Duende runs in.  This directory has to exist for

Lines 1-11 Link Here

(-)./files/patch-tools__Makefile (-11 lines)
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)




# $FreeBSD: head/dns/maradns/Makefile 468929 2018-05-03 14:05:55Z mat $

PORTNAME=	maradns
PORTVERSION=	3.5.0016
CATEGORIES=	dns
MASTER_SITES=	https://maradns.samiam.org/download/3.5/${PORTVERSION}/
MAINTAINER=	takefu@airport.fm
MAINTAINER=	je3kmz@FreeBSD.org
COMMENT=	DNS server with focus on security and simplicity

LICENSE=	BSD2CLAUSE
LICENSE_FILE=	${WRKSRC}/COPYING

USES=		tar:xz
USE_RC_SUBR=	${PORTNAME} zoneserver Deadwood
USERS=		bind
GROUPS=		bind

CONV_DESC=	Install bind2csv2 tool (needs python)

IPV6_CONFIGURE_ON=	--ipv6
CONV_USES=	python:run shebangfix

PORTDOCS=	*
PORTEXAMPLES=	*
REINPLACE_ARGS=	-i ""
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

		 s|/etc/deadwood|${ETCDIR}|g; s| = 99| = 53|g'

do-install:
	${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

	@${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_VER}/doc/dwood3rc ${STAGEDIR}${ETCDIR}/dwood3rc.sample

do-install-CONV-on:
	${INSTALL_SCRIPT} ${WRKSRC}/tools/bind2csv2.py ${STAGEDIR}${PREFIX}/bin/bind2csv2

Return to bug 250021

Lines 1-5 Link Here

(-)./files/patch-build_Makefile.freebsd (+11 lines)
1	--- build/Makefile.freebsd.orig 2012-02-12 06:04:11 UTC	1	--- build/Makefile.freebsd.orig 2012-02-12 06:04:11 UTC
2	+++ build/Makefile.freebsd	2	+++ build/Makefile.freebsd
		3	@@ -31,8 +31,8 @@ M="VERSION=$(VERSION)"
		4	Q="DEFINES=-DSELECT_PROBLEM"
		5
		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) -O2 -Wall -pipe -D_THREAD_SAFE -pthread"
		11	V="VERSION=$(VERSION)"
		12
		13	# Debug
3	@@ -47,7 +47,8 @@ all:	14	@@ -47,7 +47,8 @@ all:
4	cd ../qual ; make $(M) ; cd ../server ; \	15	cd ../qual ; make $(M) ; cd ../server ; \
5	make $(M) $(Q) COMPILED=\"$(COMPILED)\" $(V) ; \	16	make $(M) $(Q) COMPILED=\"$(COMPILED)\" $(V) ; \

Lines 1-21 Link Here

(-)./files/patch-MaraDns.h (-5 / +5 lines)
1	--- MaraDns.h.orig 2015-09-26 05:35:18 UTC	1	--- MaraDns.h.orig 2020-09-01 08:51:17 UTC
2	+++ MaraDns.h	2	+++ MaraDns.h
3	@@ -71,21 +71,21 @@	3	@@ -75,21 +75,21 @@
4	line to point to Bash	4	line to point to Bash
5	*/	5	*/
6		6
7	-#define MARADNS_DEFAULT_UID 99	7	-#define MARADNS_DEFAULT_UID 707
8	+#define MARADNS_DEFAULT_UID 53	8	+#define MARADNS_DEFAULT_UID 53
9		9
10	/* The default GID (Group ID) that MaraDNS has; see the default UID notes	10	/* 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 */	11	above. Again: CHANGE THE MARARC MAN PAGE IF YOU CHANGE THIS VALUE */
12	-#define MARADNS_DEFAULT_GID 99	12	-#define MARADNS_DEFAULT_GID 707
13	+#define MARADNS_DEFAULT_GID 53	13	+#define MARADNS_DEFAULT_GID 53
14		14
15	/* The UID that the Duende logging process uses. CHANGE THE DUENDE MAN	15	/* 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	16	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) */	17	mararc man page; the source file for the duende man page is duende.ej) */
18	-#define DUENDE_LOGGER_UID 66	18	-#define DUENDE_LOGGER_UID 707
19	+#define DUENDE_LOGGER_UID 65534	19	+#define DUENDE_LOGGER_UID 65534
20		20
21	/* The directory that Duende runs in. This directory has to exist for	21	/* The directory that Duende runs in. This directory has to exist for

Lines 2-18 Link Here

(-)./Makefile (-9 / +18 lines)
2	# $FreeBSD: head/dns/maradns/Makefile 468929 2018-05-03 14:05:55Z mat $	2	# $FreeBSD: head/dns/maradns/Makefile 468929 2018-05-03 14:05:55Z mat $
3		3
4	PORTNAME= maradns	4	PORTNAME= maradns
5	PORTVERSION= 2.0.15	5	PORTVERSION= 3.5.0016
6	CATEGORIES= dns	6	CATEGORIES= dns
7	MASTER_SITES= http://maradns.samiam.org/download/2.0/${PORTVERSION}/	7	MASTER_SITES= https://maradns.samiam.org/download/3.5/${PORTVERSION}/
8		8	MAINTAINER= takefu@airport.fm
9	MAINTAINER= je3kmz@FreeBSD.org
10	COMMENT= DNS server with focus on security and simplicity	9	COMMENT= DNS server with focus on security and simplicity
11		10
12	LICENSE= BSD2CLAUSE	11	LICENSE= BSD2CLAUSE
13	LICENSE_FILE= ${WRKSRC}/COPYING	12	LICENSE_FILE= ${WRKSRC}/COPYING
14		13
15	USES= tar:bz2	14	USES= tar:xz
16	USE_RC_SUBR= ${PORTNAME} zoneserver Deadwood	15	USE_RC_SUBR= ${PORTNAME} zoneserver Deadwood
17	USERS= bind	16	USERS= bind
18	GROUPS= bind	17	GROUPS= bind
Lines 25-36 OPTIONS_SUB= yes Link Here
25	CONV_DESC= Install bind2csv2 tool (needs python)	24	CONV_DESC= Install bind2csv2 tool (needs python)
26		25
27	IPV6_CONFIGURE_ON= --ipv6	26	IPV6_CONFIGURE_ON= --ipv6
28	CONV_USES= python:2.7,run shebangfix	27	CONV_USES= python:run shebangfix
29		28
30	PORTDOCS= *	29	PORTDOCS= *
31	PORTEXAMPLES= *	30	PORTEXAMPLES= *
32	REINPLACE_ARGS= -i ""	31	REINPLACE_ARGS= -i ""
33	DEADWOOD_VER= 3.2.11	32	DEADWOOD_VER= deadwood-${PORTVERSION}
		33
		34	pre-patch:
		35	@${ECHO_MSG} max_mem = 0 >> ${WRKSRC}/doc/en/examples/example_full_mararc
		36	@${ECHO_MSG} hide_disclaimer = \"YES\" >> ${WRKSRC}/doc/en/examples/example_full_mararc
		37	cd ${WRKSRC}/${DEADWOOD_VER}/src/; ${LN} -s Makefile.centos8 Makefile
		38
		39	pre-patch-IPV6-on:
		40	@${ECHO_MSG} ipv6_bind_address = \"::1\" >> ${WRKSRC}/doc/en/examples/example_full_mararc
		41	@${REINPLACE_CMD} -e 's\|bind_address=\"127.0.0.1\|bind_address=\"127.0.0.1,\ ::1\|'\
		42	-e 's\|127.0.0.1/16\|127.0.0.1/16,\ ::1/128\|' ${WRKSRC}/${DEADWOOD_VER}/doc/dwood3rc
34		43
35	post-patch:	44	post-patch:
36	@${REINPLACE_CMD} -e 's\|make \|\$$\{MAKE\} \|' ${WRKSRC}/build/Makefile.freebsd	45	@${REINPLACE_CMD} -e 's\|make \|\$$\{MAKE\} \|' ${WRKSRC}/build/Makefile.freebsd
Lines 39-45 post-patch: Link Here
39	s\|/etc/deadwood\|${ETCDIR}\|g; s\| = 99\| = 53\|g'	48	s\|/etc/deadwood\|${ETCDIR}\|g; s\| = 99\| = 53\|g'
40		49
41	do-install:	50	do-install:
42	${INSTALL_PROGRAM} ${WRKSRC}/deadwood-${DEADWOOD_VER}/src/Deadwood ${STAGEDIR}${PREFIX}/sbin	51	${INSTALL_PROGRAM} ${WRKSRC}/${DEADWOOD_VER}/src/Deadwood ${STAGEDIR}${PREFIX}/sbin
43	${INSTALL_PROGRAM} ${WRKSRC}/server/maradns ${STAGEDIR}${PREFIX}/sbin	52	${INSTALL_PROGRAM} ${WRKSRC}/server/maradns ${STAGEDIR}${PREFIX}/sbin
44	${INSTALL_PROGRAM} ${WRKSRC}/tcp/fetchzone ${STAGEDIR}${PREFIX}/bin	53	${INSTALL_PROGRAM} ${WRKSRC}/tcp/fetchzone ${STAGEDIR}${PREFIX}/bin
45	${INSTALL_PROGRAM} ${WRKSRC}/tcp/getzone ${STAGEDIR}${PREFIX}/bin	54	${INSTALL_PROGRAM} ${WRKSRC}/tcp/getzone ${STAGEDIR}${PREFIX}/bin
Lines 55-61 do-install: Link Here
55	@${MKDIR} ${STAGEDIR}${ETCDIR}	64	@${MKDIR} ${STAGEDIR}${ETCDIR}
56	${INSTALL_DATA} ${WRKSRC}/doc/en/examples/example_full_mararc ${STAGEDIR}${ETCDIR}/mararc.sample	65	${INSTALL_DATA} ${WRKSRC}/doc/en/examples/example_full_mararc ${STAGEDIR}${ETCDIR}/mararc.sample
57	${INSTALL_DATA} ${WRKSRC}/doc/en/examples/example_csv2 ${STAGEDIR}${ETCDIR}/csv2.sample	66	${INSTALL_DATA} ${WRKSRC}/doc/en/examples/example_csv2 ${STAGEDIR}${ETCDIR}/csv2.sample
58	${INSTALL_DATA} ${WRKSRC}/deadwood-${DEADWOOD_VER}/doc/dwood3rc ${STAGEDIR}${ETCDIR}/dwood3rc.sample	67	${INSTALL_DATA} ${WRKSRC}/${DEADWOOD_VER}/doc/dwood3rc ${STAGEDIR}${ETCDIR}/dwood3rc.sample
59		68
60	do-install-CONV-on:	69	do-install-CONV-on:
61	${INSTALL_SCRIPT} ${WRKSRC}/tools/bind2csv2.py ${STAGEDIR}${PREFIX}/bin/bind2csv2	70	${INSTALL_SCRIPT} ${WRKSRC}/tools/bind2csv2.py ${STAGEDIR}${PREFIX}/bin/bind2csv2