Date: Tue, 24 Mar 2020 21:43:36 +0000 (UTC) From: Matthias Andree <mandree@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r529066 - in head: . dns/inadyn dns/inadyn/files Message-ID: <202003242143.02OLhavN031177@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mandree Date: Tue Mar 24 21:43:36 2020 New Revision: 529066 URL: https://svnweb.freebsd.org/changeset/ports/529066 Log: dns/inadyn: Update to 2.6 Note that the UIDs/GIDs were meaning to add 455 as the ID, but typed 445 in the patch. I've corrected the IDs to 455. I've also elided one blank line between the _DEPENDS lines to please portlint. Other than that, test builds succeeded on 11.3 (i386, amd64), 12.1 (i386, amd64, mips64, aarch64). PR: 241426 Submitted by: Colin T. <bugzilla@nulldir.e4ward.com> Reviewed by: Daniel Engberg Approved by: samm@ (maintainer timeout, >4 months) Added: head/dns/inadyn/files/patch-examples_README.md (contents, props changed) head/dns/inadyn/files/patch-examples_inadyn.conf (contents, props changed) head/dns/inadyn/files/patch-man_inadyn.8 (contents, props changed) head/dns/inadyn/files/patch-man_inadyn.conf.5 (contents, props changed) head/dns/inadyn/pkg-plist (contents, props changed) Deleted: head/dns/inadyn/files/patch-man__inadyn.8 head/dns/inadyn/files/patch-readme.html head/dns/inadyn/files/patch-src__dyndns.h Modified: head/GIDs head/UIDs head/dns/inadyn/Makefile head/dns/inadyn/distinfo head/dns/inadyn/files/inadyn.in Modified: head/GIDs ============================================================================== --- head/GIDs Tue Mar 24 20:10:40 2020 (r529065) +++ head/GIDs Tue Mar 24 21:43:36 2020 (r529066) @@ -395,7 +395,7 @@ ecartis:*:450: # free: 452 # free: 453 # free: 454 -# free: 455 +inadyn:*:455 # free: 456 # free: 457 # free: 458 Modified: head/UIDs ============================================================================== --- head/UIDs Tue Mar 24 20:10:40 2020 (r529065) +++ head/UIDs Tue Mar 24 21:43:36 2020 (r529066) @@ -400,7 +400,7 @@ ecartis:*:450:450::0:0:Ecartis Listserver:/usr/local/e # free: 452 # free: 453 # free: 454 -# free: 455 +inadyn:*:455:455::0:0:inadyn user:/nonexistent:/usr/sbin/nologin # free: 456 # free: 457 # free: 458 Modified: head/dns/inadyn/Makefile ============================================================================== --- head/dns/inadyn/Makefile Tue Mar 24 20:10:40 2020 (r529065) +++ head/dns/inadyn/Makefile Tue Mar 24 21:43:36 2020 (r529066) @@ -2,41 +2,47 @@ # $FreeBSD$ PORTNAME= inadyn -PORTVERSION= 1.96.2 -PORTREVISION= 3 +PORTVERSION= 2.6 CATEGORIES= dns -MASTER_SITES= http://www.inatech.eu/inadyn/ \ - LOCAL/dhn -DISTNAME= ${PORTNAME}.v${PORTVERSION} +MASTER_SITES= https://github.com/troglobit/inadyn/releases/download/v${PORTVERSION}/ MAINTAINER= samm@FreeBSD.org COMMENT= Dynamic DNS update client -USES= dos2unix gmake zip -USE_RC_SUBR= inadyn -MAKEFILE= makefile +LICENSE= GPLv2 +LICENSE_FILE= ${WRKSRC}/COPYING -PORTDOCS= readme.html -PLIST_FILES= bin/inadyn man/man5/inadyn.conf.5.gz man/man8/inadyn.8.gz +LIB_DEPENDS= libconfuse.so:devel/libconfuse +RUN_DEPENDS= ca_root_nss>=0:security/ca_root_nss -OPTIONS_DEFINE= DOCS +USES= pkgconfig -post-extract: - @${MV} ${WRKDIR}/${PORTNAME} ${WRKSRC} - @${RM} ${WRKSRC}/bin/linux/inadyn +GNU_CONFIGURE= yes +USERS= inadyn +GROUPS= inadyn + +USE_RC_SUBR= inadyn + +OPTIONS_DEFINE= DOCS EXAMPLES +OPTIONS_DEFAULT= OPENSSL +OPTIONS_SINGLE= TLS +OPTIONS_SINGLE_TLS= GNUTLS OPENSSL + +GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls +OPENSSL_USES= ssl +OPENSSL_CONFIGURE_ENABLE= openssl +OPENSSL_CONFIGURE_ON= OpenSSL_CFLAGS=-I${OPENSSLINC} OpenSSL_LIBS="-L${OPENSSLLIB} -lssl" + post-patch: - @${REINPLACE_CMD} -e 's|gcc|$$\(CC\)|g' ${WRKSRC}/makefile @${REINPLACE_CMD} -e "s,%%PREFIX%%,${PREFIX},g" \ - ${WRKSRC}/man/inadyn.8 ${WRKSRC}/readme.html \ - ${WRKSRC}/src/dyndns.h + ${WRKSRC}/man/inadyn.8 ${WRKSRC}/man/inadyn.conf.5 \ + ${WRKSRC}/examples/README.md ${WRKSRC}/examples/inadyn.conf -do-install: - @${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} -p ${WRKSRC}/${PORTDOCS} ${STAGEDIR}${DOCSDIR} - ${INSTALL_PROGRAM} ${WRKSRC}/bin/linux/inadyn ${STAGEDIR}${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/man/inadyn.8 ${STAGEDIR}${MANPREFIX}/man/man8 - ${INSTALL_MAN} ${WRKSRC}/man/inadyn.conf.5 \ - ${STAGEDIR}${MANPREFIX}/man/man5 +post-install: + ${MV} ${STAGEDIR}${DOCSDIR}/examples ${STAGEDIR}${EXAMPLESDIR} + ${INSTALL_DATA} ${STAGEDIR}${EXAMPLESDIR}/inadyn.conf ${STAGEDIR}${PREFIX}/etc/inadyn.conf.sample + ${MKDIR} ${STAGEDIR}/var/cache/inadyn + ${MKDIR} ${STAGEDIR}/var/run/inadyn .include <bsd.port.mk> Modified: head/dns/inadyn/distinfo ============================================================================== --- head/dns/inadyn/distinfo Tue Mar 24 20:10:40 2020 (r529065) +++ head/dns/inadyn/distinfo Tue Mar 24 21:43:36 2020 (r529066) @@ -1,2 +1,3 @@ -SHA256 (inadyn.v1.96.2.zip) = 981f29d12415637c8e3ad747c204a599ddb900360d04a9b4c351d54db3d2321c -SIZE (inadyn.v1.96.2.zip) = 110170 +TIMESTAMP = 1584452320 +SHA256 (inadyn-2.6.tar.gz) = 01eb4736423b329729ec5852a357966589127325521ab6508ceacf7470e3ea6d +SIZE (inadyn-2.6.tar.gz) = 588726 Modified: head/dns/inadyn/files/inadyn.in ============================================================================== --- head/dns/inadyn/files/inadyn.in Tue Mar 24 20:10:40 2020 (r529065) +++ head/dns/inadyn/files/inadyn.in Tue Mar 24 21:43:36 2020 (r529066) @@ -9,26 +9,39 @@ # Add the following lines to /etc/rc.conf.local or /etc/rc.conf # to enable this service: # -# inadyn_enable="YES" +# inadyn_enable (bool): Set it to "YES" to enable inadyn +# Default is "NO" +# inadyn_config (str): Set full path to configuration file. +# Default is "%%PREFIX%%/etc/inadyn.conf" +# inadyn_pidfile (str): Set full path to pid file. +# Default is "/var/run/inadyn/inadyn.pid" # -# Reccomend using the inadyn.conf over inadyn_flags. However, inadyn_flags will -# take priority the configuration file by upstream's design. Any command -# line arguement (and thus inadyn_flags) will cause inadyn.conf to be ignored -# completely. -# See inadyn(8) for inadyn_flags and inadyn.conf syntax. -# -# Don't forget to include --background in either method! -# . /etc/rc.subr name="inadyn" rcvar=inadyn_enable -command=%%PREFIX%%/bin/${name} +start_precmd="inadyn_checkconfig" +restart_precmd="inadyn_checkconfig" +configtest_precmd="inadyn_checkconfig" +extra_commands="configtest" load_rc_config $name -: ${inadyn_enable="NO"} +: ${inadyn_enable:="NO"} +: ${inadyn_config:="%%PREFIX%%/etc/inadyn.conf"} +: ${inadyn_pidfile:="/var/run/inadyn/inadyn.pid"} + +command=%%PREFIX%%/sbin/inadyn +command_args="-p inadyn:inadyn -f ${inadyn_config} -P ${inadyn_pidfile}" +pidfile=${inadyn_pidfile} +required_files=${inadyn_config} + +inadyn_checkconfig() +{ + echo "Performing sanity check on ${name} configuration:" + eval ${command} ${command_args} --check-config +} run_rc_command "$1" Added: head/dns/inadyn/files/patch-examples_README.md ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/dns/inadyn/files/patch-examples_README.md Tue Mar 24 21:43:36 2020 (r529066) @@ -0,0 +1,29 @@ +--- examples/README.md.orig 2019-10-21 13:57:28 UTC ++++ examples/README.md +@@ -1,4 +1,4 @@ +-Example /etc/inadyn.conf files ++Example %%PREFIX%%/etc/inadyn.conf files + ============================== + + This directory holds a few example configuration files for common +@@ -11,16 +11,16 @@ https://gitub.com/troglobit/inadyn + Usage + ----- + +-Simply copy the desired example to /etc/inadyn.conf, edit it with ++Simply copy the desired example to %%PREFIX%%/etc/inadyn.conf, edit it with + your hostname, username, and password and then start Inadyn. + + + Example + ------- + +- user@example:~$ sudo cp freedns.conf /etc/inadyn.conf +- user@example:~$ sudo chmod 600 /etc/inadyn.conf +- user@example:~$ sudo vim /etc/inadyn.conf ++ user@example:~$ sudo cp freedns.conf %%PREFIX%%/etc/inadyn.conf ++ user@example:~$ sudo chmod 600 %%PREFIX%%/etc/inadyn.conf ++ user@example:~$ sudo vim %%PREFIX%%/etc/inadyn.conf + [Change username, password and hostname] + user@example:~$ sudo inadyn + user@example:~$ Added: head/dns/inadyn/files/patch-examples_inadyn.conf ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/dns/inadyn/files/patch-examples_inadyn.conf Tue Mar 24 21:43:36 2020 (r529066) @@ -0,0 +1,8 @@ +--- examples/inadyn.conf.orig 2019-10-21 13:57:31 UTC ++++ examples/inadyn.conf +@@ -1,4 +1,4 @@ +-# /etc/inadyn.conf :: v2 configuration file format ++# %%PREFIX%%/etc/inadyn.conf :: v2 configuration file format + # + # 1. Select a matching DDNS provider to uncomment, this file lists a few + # common ones, including a custom one, see inadyn(8) for the full list Added: head/dns/inadyn/files/patch-man_inadyn.8 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/dns/inadyn/files/patch-man_inadyn.8 Tue Mar 24 21:43:36 2020 (r529066) @@ -0,0 +1,29 @@ +--- man/inadyn.8.orig 2019-10-21 13:56:52 UTC ++++ man/inadyn.8 +@@ -140,7 +140,7 @@ supported more command line options, from v2.0 + has been greatly simplified. See + .Xr inadyn.conf 5 + for details of the +-.Pa /etc/inadyn.conf ++.Pa %%PREFIX%%/etc/inadyn.conf + configuration file format. + .Pp + .Bl -tag -width Ds +@@ -207,7 +207,7 @@ is given. + Use + .Ar FILE + for configuration. By default +-.Pa /etc/inadyn.conf , ++.Pa %%PREFIX%%/etc/inadyn.conf , + is used. See + .Xr inadyn.conf 5 + for examples. +@@ -343,7 +343,7 @@ writes its process ID to + .Pa /var/run/inadyn.pid + .Sh FILES + .Bl -tag -width /var/cache/inadyn/freedns.afraid.org.cache -compact +-.It Pa /etc/inadyn.conf ++.It Pa %%PREFIX%%/etc/inadyn.conf + .It Pa /run/inadyn.pid + .It Pa /var/cache/inadyn/dyndns.org.cache + .It Pa /var/cache/inadyn/freedns.afraid.org.cache Added: head/dns/inadyn/files/patch-man_inadyn.conf.5 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/dns/inadyn/files/patch-man_inadyn.conf.5 Tue Mar 24 21:43:36 2020 (r529066) @@ -0,0 +1,11 @@ +--- man/inadyn.conf.5.orig 2019-10-21 13:57:00 UTC ++++ man/inadyn.conf.5 +@@ -16,7 +16,7 @@ + .Nm inadyn.conf + .Nd inadyn DDNS client configuration file + .Sh SYNOPSIS +-.Nm /etc/inadyn.conf ++.Nm %%PREFIX%%/etc/inadyn.conf + .Sh DESCRIPTION + .Nm inadyn + is configured using a simple configuration file. The Added: head/dns/inadyn/pkg-plist ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/dns/inadyn/pkg-plist Tue Mar 24 21:43:36 2020 (r529066) @@ -0,0 +1,15 @@ +@sample(inadyn,inadyn,640) etc/inadyn.conf.sample +man/man5/inadyn.conf.5.gz +man/man8/inadyn.8.gz +sbin/inadyn +%%PORTDOCS%%%%DOCSDIR%%/COPYING +%%PORTDOCS%%%%DOCSDIR%%/ChangeLog.md +%%PORTDOCS%%%%DOCSDIR%%/README.md +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/README.md +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/custom.conf +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dyndns.conf +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/freedns.conf +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/freemyip.conf +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/inadyn.conf +@dir(inadyn,inadyn,) /var/cache/inadyn +@dir(inadyn,inadyn,) /var/run/inadyn
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202003242143.02OLhavN031177>