Attachment 223135 Details for Bug 253842 – Yadifa 2.4.2 v3

[patch] Yadifa 2.4.2 v3

yadifa.diff (text/plain), 5.23 KB, created by Leo Vandewoestijne on 2021-03-10 00:10:45 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Leo Vandewoestijne

Created: 2021-03-10 00:10:45 UTC

Size: 5.23 KB

patch

obsolete

>Index: GIDs
>===================================================================
>--- GIDs	(revision 567967)
>+++ GIDs	(working copy)
>@@ -393,7 +393,7 @@
> ecartis:*:450:
> # free: 451
> # free: 452
>-# free: 453
>+yadifa:*:453
> # free: 454
> inadyn:*:455:
> # free: 456
>Index: UIDs
>===================================================================
>--- UIDs	(revision 567967)
>+++ UIDs	(working copy)
>@@ -398,7 +398,7 @@
> ecartis:*:450:450::0:0:Ecartis Listserver:/usr/local/ecartis:/usr/sbin/nologin
> # free: 451
> # free: 452
>-# free: 453
>+yadifa:*:453:453::0:0:Yadifa DNS Server:/nonexistent:/usr/sbin/nologin
> # free: 454
> inadyn:*:455:455::0:0:inadyn user:/nonexistent:/usr/sbin/nologin
> # free: 456
>Index: dns/yadifa/Makefile
>===================================================================
>--- dns/yadifa/Makefile	(revision 567967)
>+++ dns/yadifa/Makefile	(working copy)
>@@ -1,8 +1,8 @@
> # $FreeBSD$
> 
> PORTNAME=	yadifa
>-DISTVERSION=	2.4.1
>-DISTVERSIONSUFFIX=	-9916
>+DISTVERSION=	2.4.2
>+DISTVERSIONSUFFIX=	-9997
> CATEGORIES=	dns
> MASTER_SITES=	https://www.yadifa.eu/sites/default/files/releases/ \
> 		https://dns.company/downloads/yadifa/
>@@ -16,6 +16,10 @@
> USES=		compiler:c11 libtool ssl
> USE_RC_SUBR=	${PORTNAME}d
> 
>+USERS=		yadifa
>+GROUPS=		yadifa
>+SUB_LIST+=	USERS="${USERS}" GROUPS="${GROUPS}"
>+
> GNU_CONFIGURE=	yes
> CONFIGURE_ARGS=	--localstatedir=/var
> 
>@@ -41,7 +45,9 @@
> 
> CTRL_CONFIGURE_OFF=		--disable-ctrl
> DDNS_CONFIGURE_OFF=		--disable-dynupdate
>+DNSSECTOOLS_CONFIGURE_OFF=	--disable-dnssec-tools
> ECDSA_CONFIGURE_OFF=		--disable-ecdsa
>+KEYGEN_CONFIGURE_ENABLE=	keygen
> LARGEFILE_CONFIGURE_OFF=	--disable-largefile
> MASTER_CONFIGURE_OFF=		--disable-master
> NSID_CONFIGURE_OFF=		--disable-nsid
>@@ -48,9 +54,7 @@
> RRL_CONFIGURE_OFF=		--disable-rrl
> RRSIG_CONFIGURE_OFF=		--disable-rrsig-management
> TCL_USES=			tcl
>-DNSSECTOOLS_OFF=		--disable-dnssec-tools
>-KEYGEN_ENABLE=			keygen
>-ZONESIGN_ENABLE=		zonesign
>+ZONESIGN_CONFIGURE_ENABLE=	zonesign
> 
> post-configure:
> 	${REINPLACE_CMD} -e 's|^docdir = .*|docdir = ${EXAMPLESDIR}|' ${WRKSRC}/etc/Makefile
>Index: dns/yadifa/distinfo
>===================================================================
>--- dns/yadifa/distinfo	(revision 567967)
>+++ dns/yadifa/distinfo	(working copy)
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1608810435
>-SHA256 (yadifa-2.4.1-9916.tar.gz) = ad13e5f26e050959eed1cd15d22eeaf14551742df6458c5eec0219e0023e32d4
>-SIZE (yadifa-2.4.1-9916.tar.gz) = 2635686
>+TIMESTAMP = 1614243484
>+SHA256 (yadifa-2.4.2-9997.tar.gz) = 000fba3805d5a85df92925f3b36714b65edf874309da9295be380d7a98f02b38
>+SIZE (yadifa-2.4.2-9997.tar.gz) = 2628181
>Index: dns/yadifa/files/yadifad.in
>===================================================================
>--- dns/yadifa/files/yadifad.in	(revision 567967)
>+++ dns/yadifa/files/yadifad.in	(working copy)
>@@ -3,30 +3,32 @@
> # $FreeBSD$
> #
> # PROVIDE: yadifad
>-# REQUIRE: SERVERS cleanvar
>+# REQUIRE: FILESYSTEMS SERVERS cleanvar defaultroute netwait
>+# BEFORE: NETWORKING
> # KEYWORD: shutdown
> #
> # Add the following lines to /etc/rc.conf to enable yadifad:
>-#
> # yadifad_enable="YES"
>-# # optional
>+# # and optional:
> # yadifad_config="%%PREFIX%%/etc/yadifad.conf"
>+# yadifad_uid="%%USERS%%"
>+# yadifad_gid="%%GROUPS%%"
> 
>+
> . /etc/rc.subr
> 
> name=yadifad
> rcvar=yadifad_enable
> 
>-load_rc_config ${name}
>+eval ": \${${name}_enable:=\"NO\"}"
>+eval ": \${${name}_config:=\"%%PREFIX%%/etc/${name}.conf\"}"
>+eval ": \${${name}_uid:=\"%%USERS%%\"}"
>+eval ": \${${name}_gid:=\"%%GROUPS%%\"}"
> 
>-: ${yadifad_enable:="NO"}
>-: ${yadifad_config="%%PREFIX%%/etc/yadifad.conf"}
>+load_rc_config "${name}"
> 
>+required_files=${yadifad_config}
> command=%%PREFIX%%/sbin/${name}
>-procname=%%PREFIX%%/sbin/${name}
>-pidfile=/var/run/${name}.pid
>+command_args="-c ${yadifad_config} -d -u ${yadifad_uid} -g ${yadifad_gid}"
> 
>-command_args="-c ${yadifad_config} -d"
>-required_files=${yadifad_config}
>-
> run_rc_command "$1"
>Index: dns/yadifa/pkg-plist
>===================================================================
>--- dns/yadifa/pkg-plist	(revision 567967)
>+++ dns/yadifa/pkg-plist	(working copy)
>@@ -36,6 +36,7 @@
> include/dnscore/dns-udp.h
> include/dnscore/dns_resource_record.h
> include/dnscore/dnscore-config-features.h
>+include/dnscore/dnscore-release-date.h
> include/dnscore/dnscore.h
> include/dnscore/dnsformat.h
> include/dnscore/dnskey-keyring.h
>@@ -243,8 +244,8 @@
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/keys.conf
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/yadifa.bash_completion
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/yadifa.conf
>-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/yadifad-master.conf.example
>-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/yadifad-slave.conf.example
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/yadifad-primary.conf.example
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/yadifad-secondary.conf.example
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/yadifad.bash_completion
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/yadifad.conf
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/yadifad.init
>@@ -262,6 +263,7 @@
> /var/yadifa/masters/localhost.zone
> /var/yadifa/masters/localhost6.zone
> /var/yadifa/masters/somedomain.eu.zone
>+@dir /var/log
> @dir /var/log/yadifa
> @dir /var/log/yadifad
> @dir /var/log/yakeyrolld
>@@ -271,3 +273,6 @@
> @dir /var/yadifa/masters
> @dir /var/yadifa/slaves
> @dir /var/yadifa/xfr
>+@postexec chown -R %%USERS%%:%%GROUPS%% /var/log
>+@postexec chown -R %%USERS%%:%%GROUPS%% /var/plans
>+@postexec chown -R %%USERS%%:%%GROUPS%% /var/yadifa

Flags:

freebsd: maintainer-approval+

Actions: View | Diff

Attachments on bug 253842: 222816 | 222818 | 222819 | 222846 | 222915 | 223135