Index: GIDs =================================================================== --- GIDs (revision 527399) +++ GIDs (working copy) @@ -395,7 +395,7 @@ # free: 452 # free: 453 # free: 454 -# free: 455 +inadyn:*:445 # free: 456 # free: 457 # free: 458 Index: UIDs =================================================================== --- UIDs (revision 527399) +++ UIDs (working copy) @@ -400,7 +400,7 @@ # free: 452 # free: 453 # free: 454 -# free: 455 +inadyn:*:445:445::0:0:inadyn user:/var/cache/inadyn:/usr/sbin/nologin # free: 456 # free: 457 # free: 458 Index: dns/inadyn/Makefile =================================================================== --- dns/inadyn/Makefile (revision 527399) +++ dns/inadyn/Makefile (working copy) @@ -2,41 +2,54 @@ # $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} MAINTAINER= samm@FreeBSD.org COMMENT= Dynamic DNS update client -USES= dos2unix gmake zip +LICENSE= GPLv2 +LICENSE_FILE= ${WRKSRC}/COPYING + +LIB_DEPENDS= libconfuse.so:devel/libconfuse + +RUN_DEPENDS= ca_root_nss>=0:security/ca_root_nss + +USES= autoreconf libtool pkgconfig + +GNU_CONFIGURE= yes + +USE_GITHUB= yes +GH_ACCOUNT= troglobit +GH_TAGNAME= v${PORTVERSION} + +USERS= inadyn +GROUPS= inadyn + USE_RC_SUBR= inadyn -MAKEFILE= makefile -PORTDOCS= readme.html -PLIST_FILES= bin/inadyn man/man5/inadyn.conf.5.gz man/man8/inadyn.8.gz +OPTIONS_DEFINE= DOCS EXAMPLES +OPTIONS_DEFAULT= OPENSSL +OPTIONS_SINGLE= TLS +OPTIONS_SINGLE_TLS= GNUTLS OPENSSL -OPTIONS_DEFINE= DOCS +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-extract: - @${MV} ${WRKDIR}/${PORTNAME} ${WRKSRC} - @${RM} ${WRKSRC}/bin/linux/inadyn - 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 +pre-configure: + @${MKDIR} ${WRKSRC}/m4 +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 Index: dns/inadyn/distinfo =================================================================== --- dns/inadyn/distinfo (revision 527399) +++ dns/inadyn/distinfo (working copy) @@ -1,2 +1,3 @@ -SHA256 (inadyn.v1.96.2.zip) = 981f29d12415637c8e3ad747c204a599ddb900360d04a9b4c351d54db3d2321c -SIZE (inadyn.v1.96.2.zip) = 110170 +TIMESTAMP = 1582955686 +SHA256 (troglobit-inadyn-2.6-v2.6_GH0.tar.gz) = 036709a3edac10ea94525046bdce9a8cdd0003bf1dbc8ae4fc3e561ae3cb91bd +SIZE (troglobit-inadyn-2.6-v2.6_GH0.tar.gz) = 124493 Index: dns/inadyn/files/inadyn.in =================================================================== --- dns/inadyn/files/inadyn.in (revision 527399) +++ dns/inadyn/files/inadyn.in (working copy) @@ -9,16 +9,13 @@ # 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 @@ -25,10 +22,26 @@ 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" Index: dns/inadyn/files/patch-examples_README.md =================================================================== --- dns/inadyn/files/patch-examples_README.md (nonexistent) +++ dns/inadyn/files/patch-examples_README.md (working copy) @@ -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:~$ Index: dns/inadyn/files/patch-examples_inadyn.conf =================================================================== --- dns/inadyn/files/patch-examples_inadyn.conf (nonexistent) +++ dns/inadyn/files/patch-examples_inadyn.conf (working copy) @@ -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 Index: dns/inadyn/files/patch-man__inadyn.8 =================================================================== --- dns/inadyn/files/patch-man__inadyn.8 (revision 527399) +++ dns/inadyn/files/patch-man__inadyn.8 (nonexistent) @@ -1,36 +0,0 @@ -diff -Naur man/inadyn.8.orig man/inadyn.8 ---- man/inadyn.8.orig 2007-08-21 18:48:17.000000000 +0000 -+++ man/inadyn.8 2007-08-21 21:32:49.000000000 +0000 -@@ -88,7 +88,7 @@ - .I \-\-input_file - The file name that contains inadyn command options exactly as specified in - the command line syntax (adds to those already present in the cmd --line). The default configuration file name is '/etc/inadyn.conf'. It is -+line). The default configuration file name is '%%PREFIX%%/etc/inadyn.conf'. It is - looked at automatically if - .B inadyn - is called without any command line options. The format is as expected -@@ -204,8 +204,7 @@ - When the user has several names then each name should be followed with - that name hash string. - .SH OUTPUT --.B --inadyn -+.B inadyn - prints a message when the IP is updated. If no update is needed then by - default it prints a single '.' character, unless \-\-verbose is set to 0. - Therefore, unless \-\-verbose is set to 0, the log file will contains lot -@@ -214,9 +213,12 @@ - will print some error messages. Those are harmless and should be - followed by 'OK' messages after the connection is back up. - --.SH Signals -+.SH SIGNALS - Any of the SIG_HUP, SIG_INT, SIG_QUIT will cause inadyn to terminate gracefully. - -+.SH FILES -+%%PREFIX%%/etc/inadyn.conf -+ - .SH "SEE ALSO" - .SS "Other manual pages" - The syntax of the optional configuration file is given by Property changes on: dns/inadyn/files/patch-man__inadyn.8 ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: dns/inadyn/files/patch-man_inadyn.8 =================================================================== --- dns/inadyn/files/patch-man_inadyn.8 (nonexistent) +++ dns/inadyn/files/patch-man_inadyn.8 (working copy) @@ -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 Index: dns/inadyn/files/patch-man_inadyn.conf.5 =================================================================== --- dns/inadyn/files/patch-man_inadyn.conf.5 (nonexistent) +++ dns/inadyn/files/patch-man_inadyn.conf.5 (working copy) @@ -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 Index: dns/inadyn/files/patch-readme.html =================================================================== --- dns/inadyn/files/patch-readme.html (revision 527399) +++ dns/inadyn/files/patch-readme.html (nonexistent) @@ -1,39 +0,0 @@ -diff -Naur readme.html.orig readme.html ---- readme.html.orig 2007-08-21 18:43:09.000000000 +0000 -+++ readme.html 2007-08-21 18:43:22.000000000 +0000 -@@ -195,7 +195,7 @@ - mode, with configuration read from file of an address from - freedns.afraid.org
- Config file (can be placed anywhere, but in linux is convenient in --default location: /etc/inadyn.conf
-+default location: %%PREFIX%%/etc/inadyn.conf
- Content of cfg file:
- --update_period 60000
- --alias test.homeip.net,hash_for_host1
-@@ -204,7 +204,7 @@ - rights, more secure) -
- Launching of inadyn does not need any params. It looks for --/etc/inadyn.config -+%%PREFIX%%/etc/inadyn.config -
-
- 4. Freedns update in console
-@@ -230,7 +230,7 @@ - can be present in the - command line from a configuration file. This feature allows the user to - write the options only once, and avoids frequent retyping.
--Default configuration file is /etc/inadyn.conf under Unix -+Default configuration file is %%PREFIX%%/etc/inadyn.conf under Unix - systems.
- The location of the config file can be given ot inadyn via --input_file - option
-@@ -314,7 +314,7 @@ - input file name that - contains - inadyn command options (adds to those already present in the cmd line). --The default configuration file name is '/etc/inadyn.conf'. It is only -+The default configuration file name is '%%PREFIX%%/etc/inadyn.conf'. It is only - used if inadyn is called without any command line options. This allows - inadyn to be called without any arguments. The format is as expected - for a **NIX config  file. See below for details.
Property changes on: dns/inadyn/files/patch-readme.html ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: dns/inadyn/files/patch-src__dyndns.h =================================================================== --- dns/inadyn/files/patch-src__dyndns.h (revision 527399) +++ dns/inadyn/files/patch-src__dyndns.h (nonexistent) @@ -1,12 +0,0 @@ -diff -Naur src/dyndns.h.orig src/dyndns.h ---- src/dyndns.h.orig 2007-08-21 18:42:48.000000000 +0000 -+++ src/dyndns.h 2007-08-21 18:42:57.000000000 +0000 -@@ -44,7 +44,7 @@ - - /*test values*/ - #define DYNDNS_DEFAULT_DEBUG_LEVEL 1 --#define DYNDNS_DEFAULT_CONFIG_FILE "/etc/inadyn.conf" -+#define DYNDNS_DEFAULT_CONFIG_FILE "%%PREFIX%%/etc/inadyn.conf" - - #define DYNDNS_MY_USERNAME "test" - #define DYNDNS_MY_PASSWD "test" Property changes on: dns/inadyn/files/patch-src__dyndns.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: dns/inadyn/pkg-plist =================================================================== --- dns/inadyn/pkg-plist (nonexistent) +++ dns/inadyn/pkg-plist (working copy) @@ -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