Attachment 201702 Details for Bug 234494 – maradns-2.0.16.patch

[patch] maradns-2.0.16.patch

maradns-2.0.16.patch (text/plain), 2.61 KB, created by takefu on 2019-02-04 01:30:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: takefu

Created: 2019-02-04 01:30:03 UTC

Size: 2.61 KB

patch

obsolete

>diff -udprN /usr/ports/dns/maradns/distinfo ./distinfo
>--- /usr/ports/dns/maradns/distinfo	2018-05-03 14:05:55.000000000 +0000
>+++ ./distinfo	2019-02-04 01:03:03.616213000 +0000
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1524796813
>-SHA256 (maradns-2.0.15.tar.bz2) = 2c20588dc9a79492aca94a477864c59ac28ec7ae4715046022311e9cefe332b2
>-SIZE (maradns-2.0.15.tar.bz2) = 1166133
>+TIMESTAMP = 1546826906
>+SHA256 (maradns-2.0.16.tar.bz2) = 8a33c232f96ce1c2e1832ad34edde11a67f83264fe9529de8107326ffd86e2c6
>+SIZE (maradns-2.0.16.tar.bz2) = 1127504
>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.000000000 +0000
>+++ ./files/patch-build_Makefile.freebsd	2019-02-04 01:03:03.626435000 +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/Makefile ./Makefile
>--- /usr/ports/dns/maradns/Makefile	2018-05-03 14:05:55.000000000 +0000
>+++ ./Makefile	2019-02-04 01:24:41.965652000 +0000
>@@ -2,7 +2,7 @@
> # $FreeBSD: head/dns/maradns/Makefile 468929 2018-05-03 14:05:55Z mat $
> 
> PORTNAME=	maradns
>-PORTVERSION=	2.0.15
>+PORTVERSION=	2.0.16
> CATEGORIES=	dns
> MASTER_SITES=	http://maradns.samiam.org/download/2.0/${PORTVERSION}/
> 
>@@ -13,6 +13,7 @@ LICENSE=	BSD2CLAUSE
> LICENSE_FILE=	${WRKSRC}/COPYING
> 
> USES=		tar:bz2
>+
> USE_RC_SUBR=	${PORTNAME} zoneserver Deadwood
> USERS=		bind
> GROUPS=		bind
>@@ -30,7 +31,16 @@ CONV_USES=	python:2.7,run shebangfix
> PORTDOCS=	*
> PORTEXAMPLES=	*
> REINPLACE_ARGS=	-i ""
>-DEADWOOD_VER=	3.2.11
>+DEADWOOD_VER=	3.2.12
>+
>+pre-patch:
>+	@${ECHO_MSG} hide_disclaimer = \"YES\" >> ${WRKSRC}/doc/en/examples/example_full_mararc
>+	${REINPLACE_CMD} -e 's|262144|2621440|g' ${WRKSRC}/server/MaraDNS.c
>+
>+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-${DEADWOOD_VER}/doc/dwood3rc
> 
> post-patch:
> 	@${REINPLACE_CMD} -e 's|make |\$$\{MAKE\} |' ${WRKSRC}/build/Makefile.freebsd

Flags:

takefu: maintainer-approval+

Actions: View | Diff

Attachments on bug 234494: 200858 | 201702 | 203789 | 232812 | 242770