Attachment 208521 Details for Bug 241426 – Update to v2.5

[patch] Update to v2.5

inadyn.diff (text/plain), 17.38 KB, created by Colin T. on 2019-10-23 07:44:58 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Colin T.

Created: 2019-10-23 07:44:58 UTC

Size: 17.38 KB

patch

obsolete

>Index: GIDs
>===================================================================
>--- GIDs	(revision 515166)
>+++ GIDs	(working copy)
>@@ -185,7 +185,7 @@
> prosody:*:242:
> ot-recorder:*:243:
> mastodon:*:244:
>-# free: 245
>+inadyn:*:245
> # free: 246
> fcron:*:247:
> # free: 248
>Index: UIDs
>===================================================================
>--- UIDs	(revision 515166)
>+++ UIDs	(working copy)
>@@ -190,7 +190,7 @@
> prosody:*:242:242::0:0:Prosody Jabber Server:/nonexistent:/usr/sbin/nologin
> ot-recorder:*:243:243::0:0:OwnTracks Recorder:/nonexistent:/usr/sbin/nologin
> mastodon:*:244:244::0:0:Mastodon User:/usr/local/www/mastodon:/bin/sh
>-# free: 245
>+inadyn:*:245:245::0:0:inadyn user:/var/cache/inadyn:/usr/sbin/nologin
> # free: 246
> fcron:*:247:247::0:0:fcron pseudo-user:/nonexistent:/usr/sbin/nologin
> # free: 248
>Index: dns/inadyn/Makefile
>===================================================================
>--- dns/inadyn/Makefile	(revision 515166)
>+++ dns/inadyn/Makefile	(working copy)
>@@ -2,41 +2,52 @@
> # $FreeBSD$
> 
> PORTNAME=	inadyn
>-PORTVERSION=	1.96.2
>-PORTREVISION=	3
>+PORTVERSION=	2.5
> 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
>+
>+LIB_DEPENDS=	libconfuse.so:devel/libconfuse
>+
>+RUN_DEPENDS=	ca_root_nss>=0:security/ca_root_nss
>+
>+GNU_CONFIGURE=	yes
>+USES=		autoreconf libtool pkgconfig
>+
>+USE_GITHUB=	yes
>+GH_ACCOUNT=	troglobit
>+GH_TAGNAME=	v${PORTVERSION}
>+
> USE_RC_SUBR=	inadyn
>-MAKEFILE=	makefile
>+USERS=		inadyn
>+GROUPS=		inadyn
> 
>-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
> 
>-post-extract:
>-	@${MV} ${WRKDIR}/${PORTNAME} ${WRKSRC}
>-	@${RM} ${WRKSRC}/bin/linux/inadyn
>+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
>+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 <bsd.port.mk>
>Index: dns/inadyn/distinfo
>===================================================================
>--- dns/inadyn/distinfo	(revision 515166)
>+++ dns/inadyn/distinfo	(working copy)
>@@ -1,2 +1,3 @@
>-SHA256 (inadyn.v1.96.2.zip) = 981f29d12415637c8e3ad747c204a599ddb900360d04a9b4c351d54db3d2321c
>-SIZE (inadyn.v1.96.2.zip) = 110170
>+TIMESTAMP = 1571666923
>+SHA256 (troglobit-inadyn-2.5-v2.5_GH0.tar.gz) = 28fddd94cb7dda08aef0e5e97bbfd2af83f5dc7ac899a477b5936e82a76d3709
>+SIZE (troglobit-inadyn-2.5-v2.5_GH0.tar.gz) = 111982
>Index: dns/inadyn/files/inadyn.in
>===================================================================
>--- dns/inadyn/files/inadyn.in	(revision 515166)
>+++ 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:~$
>
>Property changes on: dns/inadyn/files/patch-examples_README.md
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>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
>
>Property changes on: dns/inadyn/files/patch-examples_inadyn.conf
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: dns/inadyn/files/patch-man__inadyn.8
>===================================================================
>--- dns/inadyn/files/patch-man__inadyn.8	(revision 515166)
>+++ 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
>
>Property changes on: dns/inadyn/files/patch-man_inadyn.8
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>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
>
>Property changes on: dns/inadyn/files/patch-man_inadyn.conf.5
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: dns/inadyn/files/patch-readme.html
>===================================================================
>--- dns/inadyn/files/patch-readme.html	(revision 515166)
>+++ 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&nbsp; 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 515166)
>+++ 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/files/patch-src_cache.c
>===================================================================
>--- dns/inadyn/files/patch-src_cache.c	(nonexistent)
>+++ dns/inadyn/files/patch-src_cache.c	(working copy)
>@@ -0,0 +1,13 @@
>+#
>+# https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=182466
>+#
>+--- src/cache.c.orig	2019-10-21 09:42:21 UTC
>++++ src/cache.c
>+@@ -31,6 +31,7 @@
>+ * once it has read the IP and the modification time.
>+ */
>+ 
>++#include <netinet/in.h>
>+ #include <resolv.h>
>+ #include <sys/stat.h>
>+ #include <time.h>
>
>Property changes on: dns/inadyn/files/patch-src_cache.c
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+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,600) 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,750) /var/cache/inadyn
>+@dir(inadyn,inadyn,750) /var/run/inadyn
>
>Property changes on: dns/inadyn/pkg-plist
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 241426: 208521 | 212044 | 212459