View | Details | Raw Unified | Return to bug 241426 | Differences between
and this patch

Collapse All | Expand All

(-)GIDs (-1 / +1 lines)
Lines 185-191 Link Here
185
prosody:*:242:
185
prosody:*:242:
186
ot-recorder:*:243:
186
ot-recorder:*:243:
187
mastodon:*:244:
187
mastodon:*:244:
188
# free: 245
188
inadyn:*:245
189
# free: 246
189
# free: 246
190
fcron:*:247:
190
fcron:*:247:
191
# free: 248
191
# free: 248
(-)UIDs (-1 / +1 lines)
Lines 190-196 Link Here
190
prosody:*:242:242::0:0:Prosody Jabber Server:/nonexistent:/usr/sbin/nologin
190
prosody:*:242:242::0:0:Prosody Jabber Server:/nonexistent:/usr/sbin/nologin
191
ot-recorder:*:243:243::0:0:OwnTracks Recorder:/nonexistent:/usr/sbin/nologin
191
ot-recorder:*:243:243::0:0:OwnTracks Recorder:/nonexistent:/usr/sbin/nologin
192
mastodon:*:244:244::0:0:Mastodon User:/usr/local/www/mastodon:/bin/sh
192
mastodon:*:244:244::0:0:Mastodon User:/usr/local/www/mastodon:/bin/sh
193
# free: 245
193
inadyn:*:245:245::0:0:inadyn user:/var/cache/inadyn:/usr/sbin/nologin
194
# free: 246
194
# free: 246
195
fcron:*:247:247::0:0:fcron pseudo-user:/nonexistent:/usr/sbin/nologin
195
fcron:*:247:247::0:0:fcron pseudo-user:/nonexistent:/usr/sbin/nologin
196
# free: 248
196
# free: 248
(-)dns/inadyn/Makefile (-23 / +34 lines)
Lines 2-42 Link Here
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTNAME=	inadyn
4
PORTNAME=	inadyn
5
PORTVERSION=	1.96.2
5
PORTVERSION=	2.5
6
PORTREVISION=	3
7
CATEGORIES=	dns
6
CATEGORIES=	dns
8
MASTER_SITES=	http://www.inatech.eu/inadyn/ \
9
		LOCAL/dhn
10
DISTNAME=	${PORTNAME}.v${PORTVERSION}
11
7
12
MAINTAINER=	samm@freebsd.org
8
MAINTAINER=	samm@freebsd.org
13
COMMENT=	Dynamic DNS update client
9
COMMENT=	Dynamic DNS update client
14
10
15
USES=		dos2unix gmake zip
11
LICENSE=	GPLv2
12
13
LIB_DEPENDS=	libconfuse.so:devel/libconfuse
14
15
RUN_DEPENDS=	ca_root_nss>=0:security/ca_root_nss
16
17
GNU_CONFIGURE=	yes
18
USES=		autoreconf libtool pkgconfig
19
20
USE_GITHUB=	yes
21
GH_ACCOUNT=	troglobit
22
GH_TAGNAME=	v${PORTVERSION}
23
16
USE_RC_SUBR=	inadyn
24
USE_RC_SUBR=	inadyn
17
MAKEFILE=	makefile
25
USERS=		inadyn
26
GROUPS=		inadyn
18
27
19
PORTDOCS=	readme.html
28
OPTIONS_DEFINE=		DOCS EXAMPLES
20
PLIST_FILES=	bin/inadyn man/man5/inadyn.conf.5.gz man/man8/inadyn.8.gz
29
OPTIONS_DEFAULT=	OPENSSL
30
OPTIONS_SINGLE=		TLS
31
OPTIONS_SINGLE_TLS=	GNUTLS OPENSSL
21
32
22
OPTIONS_DEFINE=	DOCS
33
GNUTLS_LIB_DEPENDS=	libgnutls.so:security/gnutls
23
34
24
post-extract:
35
OPENSSL_USES=		ssl
25
	@${MV} ${WRKDIR}/${PORTNAME} ${WRKSRC}
36
OPENSSL_CONFIGURE_ENABLE=openssl
26
	@${RM} ${WRKSRC}/bin/linux/inadyn
37
OPENSSL_CONFIGURE_ON=	OpenSSL_CFLAGS=-I${OPENSSLINC} OpenSSL_LIBS="-L${OPENSSLLIB} -lssl"
27
38
28
post-patch:
39
post-patch:
29
	@${REINPLACE_CMD} -e 's|gcc|$$\(CC\)|g' ${WRKSRC}/makefile
30
	@${REINPLACE_CMD} -e "s,%%PREFIX%%,${PREFIX},g" \
40
	@${REINPLACE_CMD} -e "s,%%PREFIX%%,${PREFIX},g" \
31
		${WRKSRC}/man/inadyn.8 ${WRKSRC}/readme.html \
41
		${WRKSRC}/man/inadyn.8 ${WRKSRC}/man/inadyn.conf.5 \
32
		${WRKSRC}/src/dyndns.h
42
		${WRKSRC}/examples/README.md ${WRKSRC}/examples/inadyn.conf
33
43
34
do-install:
44
pre-configure:
35
	@${MKDIR} ${STAGEDIR}${DOCSDIR}
45
	@${MKDIR} ${WRKSRC}/m4
36
	${INSTALL_DATA} -p ${WRKSRC}/${PORTDOCS} ${STAGEDIR}${DOCSDIR}
37
	${INSTALL_PROGRAM} ${WRKSRC}/bin/linux/inadyn ${STAGEDIR}${PREFIX}/bin
38
	${INSTALL_MAN} ${WRKSRC}/man/inadyn.8 ${STAGEDIR}${MANPREFIX}/man/man8
39
	${INSTALL_MAN} ${WRKSRC}/man/inadyn.conf.5 \
40
		${STAGEDIR}${MANPREFIX}/man/man5
41
46
47
post-install:
48
	${MV} ${STAGEDIR}${DOCSDIR}/examples ${STAGEDIR}${EXAMPLESDIR}
49
	${INSTALL_DATA} ${STAGEDIR}${EXAMPLESDIR}/inadyn.conf ${STAGEDIR}${PREFIX}/etc/inadyn.conf.sample
50
	${MKDIR} ${STAGEDIR}/var/cache/inadyn
51
	${MKDIR} ${STAGEDIR}/var/run/inadyn
52
42
.include <bsd.port.mk>
53
.include <bsd.port.mk>
(-)dns/inadyn/distinfo (-2 / +3 lines)
Lines 1-2 Link Here
1
SHA256 (inadyn.v1.96.2.zip) = 981f29d12415637c8e3ad747c204a599ddb900360d04a9b4c351d54db3d2321c
1
TIMESTAMP = 1571666923
2
SIZE (inadyn.v1.96.2.zip) = 110170
2
SHA256 (troglobit-inadyn-2.5-v2.5_GH0.tar.gz) = 28fddd94cb7dda08aef0e5e97bbfd2af83f5dc7ac899a477b5936e82a76d3709
3
SIZE (troglobit-inadyn-2.5-v2.5_GH0.tar.gz) = 111982
(-)dns/inadyn/files/inadyn.in (-11 / +24 lines)
Lines 9-24 Link Here
9
# Add the following lines to /etc/rc.conf.local or /etc/rc.conf
9
# Add the following lines to /etc/rc.conf.local or /etc/rc.conf
10
# to enable this service:
10
# to enable this service:
11
#
11
#
12
# inadyn_enable="YES"
12
# inadyn_enable (bool):		Set it to "YES" to enable inadyn
13
#				Default is "NO"
14
# inadyn_config (str):		Set full path to configuration file.
15
#				Default is "${PREFIX}/etc/inadyn.conf"
16
# inadyn_pidfile (str):		Set full path to pid file.
17
#				Default is "/var/run/inadyn/inadyn.pid"
13
#
18
#
14
# Reccomend using the inadyn.conf over inadyn_flags. However, inadyn_flags will
15
# take priority the configuration file by upstream's design. Any command
16
# line arguement (and thus inadyn_flags) will cause inadyn.conf to be ignored
17
# completely.
18
# See inadyn(8) for inadyn_flags and inadyn.conf syntax.
19
#
20
# Don't forget to include --background in either method!
21
#
22
19
23
. /etc/rc.subr
20
. /etc/rc.subr
24
21
Lines 25-34 Link Here
25
name="inadyn"
22
name="inadyn"
26
rcvar=inadyn_enable
23
rcvar=inadyn_enable
27
24
28
command=%%PREFIX%%/bin/${name}
25
start_precmd="inadyn_checkconfig"
26
restart_precmd="inadyn_checkconfig"
27
configtest_precmd="inadyn_checkconfig"
28
extra_commands="configtest"
29
29
30
load_rc_config $name
30
load_rc_config $name
31
31
32
: ${inadyn_enable="NO"}
32
: ${inadyn_enable:="NO"}
33
: ${inadyn_config:="%%PREFIX%%/etc/inadyn.conf"}
34
: ${inadyn_pidfile:="/var/run/inadyn/inadyn.pid"}
33
35
36
command=%%PREFIX%%/sbin/inadyn
37
command_args="-p inadyn:inadyn -f ${inadyn_config} -P ${inadyn_pidfile}"
38
pidfile=${inadyn_pidfile}
39
required_files=${inadyn_config}
40
41
inadyn_checkconfig()
42
{
43
	echo "Performing sanity check on ${name} configuration:"
44
	eval ${command} ${command_args} --check-config
45
}
46
34
run_rc_command "$1"
47
run_rc_command "$1"
(-)dns/inadyn/files/patch-examples_README.md (+29 lines)
Line 0 Link Here
1
--- examples/README.md.orig	2019-10-21 13:57:28 UTC
2
+++ examples/README.md
3
@@ -1,4 +1,4 @@
4
-Example /etc/inadyn.conf files
5
+Example %%PREFIX%%/etc/inadyn.conf files
6
 ==============================
7
 
8
 This directory holds a few example configuration files for common
9
@@ -11,16 +11,16 @@ https://gitub.com/troglobit/inadyn
10
 Usage
11
 -----
12
 
13
-Simply copy the desired example to /etc/inadyn.conf, edit it with
14
+Simply copy the desired example to %%PREFIX%%/etc/inadyn.conf, edit it with
15
 your hostname, username, and password and then start Inadyn.
16
 
17
 
18
 Example
19
 -------
20
 
21
-    user@example:~$ sudo cp freedns.conf /etc/inadyn.conf
22
-    user@example:~$ sudo chmod 600 /etc/inadyn.conf
23
-    user@example:~$ sudo vim /etc/inadyn.conf
24
+    user@example:~$ sudo cp freedns.conf %%PREFIX%%/etc/inadyn.conf
25
+    user@example:~$ sudo chmod 600 %%PREFIX%%/etc/inadyn.conf
26
+    user@example:~$ sudo vim %%PREFIX%%/etc/inadyn.conf
27
     [Change username, password and hostname]
28
     user@example:~$ sudo inadyn
29
     user@example:~$
(-)dns/inadyn/files/patch-examples_inadyn.conf (+8 lines)
Line 0 Link Here
1
--- examples/inadyn.conf.orig	2019-10-21 13:57:31 UTC
2
+++ examples/inadyn.conf
3
@@ -1,4 +1,4 @@
4
-# /etc/inadyn.conf :: v2 configuration file format
5
+# %%PREFIX%%/etc/inadyn.conf :: v2 configuration file format
6
 #
7
 # 1. Select a matching DDNS provider to uncomment, this file lists a few
8
 #    common ones, including a custom one, see inadyn(8) for the full list
(-)dns/inadyn/files/patch-man__inadyn.8 (-36 lines)
Lines 1-36 Link Here
1
diff -Naur man/inadyn.8.orig man/inadyn.8
2
--- man/inadyn.8.orig	2007-08-21 18:48:17.000000000 +0000
3
+++ man/inadyn.8	2007-08-21 21:32:49.000000000 +0000
4
@@ -88,7 +88,7 @@
5
 .I \-\-input_file
6
 The file name that contains inadyn command options exactly as specified in
7
 the command line syntax (adds to those already present in the cmd
8
-line). The default configuration file name is '/etc/inadyn.conf'. It is
9
+line). The default configuration file name is '%%PREFIX%%/etc/inadyn.conf'. It is
10
 looked at automatically if
11
 .B inadyn
12
 is called without any command line options. The format is as expected
13
@@ -204,8 +204,7 @@
14
 When the user has several names then each name should be followed with
15
 that name hash string.
16
 .SH OUTPUT
17
-.B
18
-inadyn
19
+.B inadyn
20
 prints a message when the IP is updated. If no update is needed then by
21
 default it prints a single '.' character, unless \-\-verbose is set to 0.
22
 Therefore, unless \-\-verbose is set to 0, the log file will contains lot
23
@@ -214,9 +213,12 @@
24
 will print some error messages. Those are harmless and should be 
25
 followed by 'OK' messages after the connection is back up.
26
 
27
-.SH Signals
28
+.SH SIGNALS
29
 Any of the SIG_HUP, SIG_INT, SIG_QUIT will cause inadyn to terminate gracefully.
30
 
31
+.SH FILES
32
+%%PREFIX%%/etc/inadyn.conf
33
+
34
 .SH "SEE ALSO"
35
 .SS "Other manual pages"
36
 The syntax of the optional configuration file is given by
(-)dns/inadyn/files/patch-man_inadyn.8 (+29 lines)
Line 0 Link Here
1
--- man/inadyn.8.orig	2019-10-21 13:56:52 UTC
2
+++ man/inadyn.8
3
@@ -140,7 +140,7 @@ supported more command line options, from v2.0
4
 has been greatly simplified.  See
5
 .Xr inadyn.conf 5
6
 for details of the
7
-.Pa /etc/inadyn.conf
8
+.Pa %%PREFIX%%/etc/inadyn.conf
9
 configuration file format.
10
 .Pp
11
 .Bl -tag -width Ds
12
@@ -207,7 +207,7 @@ is given.
13
 Use
14
 .Ar FILE
15
 for configuration. By default
16
-.Pa /etc/inadyn.conf ,
17
+.Pa %%PREFIX%%/etc/inadyn.conf ,
18
 is used.  See
19
 .Xr inadyn.conf 5
20
 for examples.
21
@@ -343,7 +343,7 @@ writes its process ID to
22
 .Pa /var/run/inadyn.pid
23
 .Sh FILES
24
 .Bl -tag -width /var/cache/inadyn/freedns.afraid.org.cache -compact
25
-.It Pa /etc/inadyn.conf
26
+.It Pa %%PREFIX%%/etc/inadyn.conf
27
 .It Pa /run/inadyn.pid
28
 .It Pa /var/cache/inadyn/dyndns.org.cache
29
 .It Pa /var/cache/inadyn/freedns.afraid.org.cache
(-)dns/inadyn/files/patch-man_inadyn.conf.5 (+11 lines)
Line 0 Link Here
1
--- man/inadyn.conf.5.orig	2019-10-21 13:57:00 UTC
2
+++ man/inadyn.conf.5
3
@@ -16,7 +16,7 @@
4
 .Nm inadyn.conf
5
 .Nd inadyn DDNS client configuration file
6
 .Sh SYNOPSIS
7
-.Nm /etc/inadyn.conf
8
+.Nm %%PREFIX%%/etc/inadyn.conf
9
 .Sh DESCRIPTION
10
 .Nm inadyn
11
 is configured using a simple configuration file.  The
(-)dns/inadyn/files/patch-readme.html (-39 lines)
Lines 1-39 Link Here
1
diff -Naur readme.html.orig readme.html
2
--- readme.html.orig	2007-08-21 18:43:09.000000000 +0000
3
+++ readme.html	2007-08-21 18:43:22.000000000 +0000
4
@@ -195,7 +195,7 @@
5
 mode, with configuration read from file of an address from
6
 freedns.afraid.org </span><br>
7
 Config file (can be placed anywhere, but in linux is convenient in
8
-default location: /etc/inadyn.conf<br>
9
+default location: %%PREFIX%%/etc/inadyn.conf<br>
10
 Content of cfg file:<br>
11
 --update_period 60000 <br>
12
 --alias test.homeip.net,hash_for_host1 <br>
13
@@ -204,7 +204,7 @@
14
 rights, more secure)
15
 <br>
16
 Launching of inadyn does not need any params. It looks for
17
-/etc/inadyn.config
18
+%%PREFIX%%/etc/inadyn.config
19
 <br>
20
 <br>
21
 <span style="font-weight: bold;">4. Freedns update in console </span><br>
22
@@ -230,7 +230,7 @@
23
 can be present in the
24
 command line from a configuration file. This feature allows the user to
25
 write the options only once, and avoids frequent retyping.<br>
26
-<i>Default configuration file</i> is /etc/inadyn.conf under Unix
27
+<i>Default configuration file</i> is %%PREFIX%%/etc/inadyn.conf under Unix
28
 systems. <br>
29
 The location of the config file can be given ot inadyn via --input_file
30
 option <br>
31
@@ -314,7 +314,7 @@
32
 input file name that
33
 contains
34
 inadyn command options (adds to those already present in the cmd line).
35
-The default configuration file name is '/etc/inadyn.conf'. It is only
36
+The default configuration file name is '%%PREFIX%%/etc/inadyn.conf'. It is only
37
 used if inadyn is called without any command line options. This allows
38
 inadyn to be called without any arguments. The format is as expected
39
 for a **NIX config&nbsp; file. See below for details.<br>
(-)dns/inadyn/files/patch-src__dyndns.h (-12 lines)
Lines 1-12 Link Here
1
diff -Naur src/dyndns.h.orig src/dyndns.h
2
--- src/dyndns.h.orig	2007-08-21 18:42:48.000000000 +0000
3
+++ src/dyndns.h	2007-08-21 18:42:57.000000000 +0000
4
@@ -44,7 +44,7 @@
5
 
6
 /*test values*/
7
 #define DYNDNS_DEFAULT_DEBUG_LEVEL	1
8
-#define DYNDNS_DEFAULT_CONFIG_FILE	"/etc/inadyn.conf"
9
+#define DYNDNS_DEFAULT_CONFIG_FILE	"%%PREFIX%%/etc/inadyn.conf"
10
 
11
 #define DYNDNS_MY_USERNAME		"test"
12
 #define DYNDNS_MY_PASSWD		"test"
(-)dns/inadyn/files/patch-src_cache.c (+13 lines)
Line 0 Link Here
1
#
2
# https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=182466
3
#
4
--- src/cache.c.orig	2019-10-21 09:42:21 UTC
5
+++ src/cache.c
6
@@ -31,6 +31,7 @@
7
  * once it has read the IP and the modification time.
8
  */
9
 
10
+#include <netinet/in.h>
11
 #include <resolv.h>
12
 #include <sys/stat.h>
13
 #include <time.h>
(-)dns/inadyn/pkg-plist (+15 lines)
Line 0 Link Here
1
@sample(inadyn,inadyn,600) etc/inadyn.conf.sample
2
man/man5/inadyn.conf.5.gz
3
man/man8/inadyn.8.gz
4
sbin/inadyn
5
%%PORTDOCS%%%%DOCSDIR%%/COPYING
6
%%PORTDOCS%%%%DOCSDIR%%/ChangeLog.md
7
%%PORTDOCS%%%%DOCSDIR%%/README.md
8
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/README.md
9
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/custom.conf
10
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dyndns.conf
11
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/freedns.conf
12
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/freemyip.conf
13
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/inadyn.conf
14
@dir(inadyn,inadyn,750) /var/cache/inadyn
15
@dir(inadyn,inadyn,750) /var/run/inadyn

Return to bug 241426