Update inadyn to 1.99.13.

In the last five years, the following has happened to inadyn:
- Binary moved from bin to sbin
- Added support for more DDNS providers
- Added SSL support
- Gained other minor features
- Fixed bugs

14 files changed, 194 insertions, 82 deletions

diff --git a/net/inadyn/DESCR b/net/inadyn/DESCR
index caec50f637e..3d710ccecd6 100644
--- a/net/inadyn/DESCR
+++ b/net/inadyn/DESCR
@@ -1,20 +1,12 @@
-INADYN is a dynamic DNS client. That is, it maintains the IP address of a
-host name. It periodically checks whether the IP address stored by the DNS
-server is the real current address of the machine that is running INADYN.
+Inadyn is a small and simple DDNS client with HTTPS support.  That is, it
+maintains the IP address of a host name.  It periodically checks whether
+the IP address stored by the DNS server is the real current address of the
+machine that is running Inadyn.
 
    Features:
-
-     * supports the following dynamic DNS services:
-     * dyndns.org (in all three flavors: dynamic, static, custom)
-     * freedns.afraid.org
-     * zoneedit.com
-     * no-ip.com
-     * maintains up multiple aliases of the same IP address
-     * runs as a service (Windows 2000/XP, Linux)
-     * or runs as a console application
-     * updates the correct IP address even behind a NAT router.
+     * supports the many dynamic DNS services, including DynDNS,
+       FreeDNS, ZoneEdit, No-IP, and easyDNS.
+     * maintains multiple aliases of the same IP address
+     * updates the correct IP address even behind a NAT router
      * supports access via http proxy
-     * does not perform unnecessary updates.
-     * has 'install and forget it feature'. That is, after install one can
-       completely forget about it. No maintenance required. (as long as no
-       bugs are found;-)
+     * does not perform unnecessary updates
diff --git a/net/inadyn/Makefile b/net/inadyn/Makefile
index a6f2519dbfc..8529d4a9e6c 100644
--- a/net/inadyn/Makefile
+++ b/net/inadyn/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.8 2015/03/07 21:14:32 tnn Exp $
+# $NetBSD: Makefile,v 1.9 2015/04/04 07:59:33 snj Exp $
 
-DISTNAME=	inadyn-1.96.2
-PKGREVISION=	1
+DISTNAME=	inadyn-1.99.13
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_GITHUB:=troglobit/}
 EXTRACT_SUFX=	.zip
@@ -11,32 +10,36 @@ HOMEPAGE=	http://troglobit.com/inadyn.html
 COMMENT=	Dynamic DNS client
 LICENSE=	gnu-gpl-v2
 
-USE_TOOLS+=	gmake
+USE_TOOLS+=	autoconf gmake
 RCD_SCRIPTS=	inadyn
-RCD_SCRIPT_WRK.inadyn=	${WRKDIR}/inadyn.sh
+
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS+=	--enable-openssl
 
 LIBS.SunOS=	-lsocket -lnsl
-MAKE_ENV+=	TARGET_ARCH=pkgsrc
-MAKE_ENV+=	LIBS=${LIBS:Q}
 
-WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
-MAKE_FILE=	makefile
+INSTALLATION_DIRS=	sbin ${PKGMANDIR}/man5 ${PKGMANDIR}/man8
+INSTALLATION_DIRS+=	share/doc/inadyn
+
+OWN_DIRS+=		${VARBASE}/db/inadyn ${VARBASE}/run
+
+BUILD_DEFS+=		VARBASE
 
-INSTALLATION_DIRS=	bin ${PKGMANDIR}/man5 ${PKGMANDIR}/man8
+SUBST_CLASSES+=		etc
+SUBST_SED.etc=		-e "s|/etc|${PKG_SYSCONFDIR}|g"
+SUBST_FILES.etc=	man/inadyn.conf.5 man/inadyn.8 include/ddns.h
+SUBST_MESSAGE.etc=	Fixing path to configuration file
+SUBST_STAGE.etc=	pre-configure
 
-pre-patch:
-	set -e && cd ${WRKSRC} &&  \
-	for f in man/inadyn.conf.5 man/inadyn.8 src/dyndns.h ; do	\
-		${SED}	-e "s|/etc|${PKG_SYSCONFDIR}|g"			\
-			$${f} > $${f}.orig;			\
-		${CP} -f $${f}.orig $${f};			\
-	done
+SUBST_CLASSES+=		var
+SUBST_SED.var=		-e "s|/var|${VARBASE}|"
+SUBST_FILES.var=	man/inadyn.conf.5 man/inadyn.8 include/ddns.h
+SUBST_MESSAGE.var=	Adjusting path to VARBASE
+SUBST_STAGE.var=	pre-configure
 
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/bin/pkgsrc/inadyn ${DESTDIR}${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/man/inadyn.conf.5 \
-		${DESTDIR}${PREFIX}/${PKGMANDIR}/man5
-	${INSTALL_MAN} ${WRKSRC}/man/inadyn.8 \
-		${DESTDIR}${PREFIX}/${PKGMANDIR}/man8
+pre-configure:
+	cd ${WRKSRC} && autoconf
 
+.include "../../security/openssl/buildlink3.mk"
+.include "../../mk/dlopen.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/inadyn/PLIST b/net/inadyn/PLIST
index 2fb67c10c7d..81229b81a01 100644
--- a/net/inadyn/PLIST
+++ b/net/inadyn/PLIST
@@ -1,4 +1,9 @@
-@comment $NetBSD: PLIST,v 1.3 2014/03/11 14:05:08 jperkin Exp $
-bin/inadyn
-${PKGMANDIR}/man5/inadyn.conf.5
-${PKGMANDIR}/man8/inadyn.8
+@comment $NetBSD: PLIST,v 1.4 2015/04/04 07:59:33 snj Exp $
+man/man5/inadyn.conf.5
+man/man8/inadyn.8
+sbin/inadyn
+share/doc/inadyn/AUTHORS
+share/doc/inadyn/CHANGELOG
+share/doc/inadyn/COPYING
+share/doc/inadyn/NEWS
+share/doc/inadyn/README
diff --git a/net/inadyn/distinfo b/net/inadyn/distinfo
index ce2416c1483..de5a9cd6c97 100644
--- a/net/inadyn/distinfo
+++ b/net/inadyn/distinfo
@@ -1,7 +1,12 @@
-$NetBSD: distinfo,v 1.4 2015/03/07 12:19:10 tnn Exp $
+$NetBSD: distinfo,v 1.5 2015/04/04 07:59:33 snj Exp $
 
-SHA1 (inadyn-1.96.2.zip) = 3f42746e443b51db6c0c93bf79435d4718e8d3ee
-RMD160 (inadyn-1.96.2.zip) = d9462456866b725e93154ec1aabb5bf4bdf7ebb6
-Size (inadyn-1.96.2.zip) = 73168 bytes
-SHA1 (patch-aa) = 399adaaaa990277b9b84175850ccdc6970c349cc
-SHA1 (patch-ab) = 1c76470bc2202e5ef26b2a136ce98e0ae2684ca7
+SHA1 (inadyn-1.99.13.zip) = 1294b252979dccb6ecb926d9460d36fa54c97bfe
+RMD160 (inadyn-1.99.13.zip) = 09c4795277621128810f5342efd81a46fe555b8c
+Size (inadyn-1.99.13.zip) = 233771 bytes
+SHA1 (patch-include_ddns.h) = 3d5ae83a33eb848d755364c0d67d9e996bd0aa76
+SHA1 (patch-man_inadyn.8) = 66d66eeea6d59bd2c747083003215a124ed0b4d2
+SHA1 (patch-man_inadyn.conf.5) = 56dc41756aba768d18d057f0199d4f7a2dbc9b25
+SHA1 (patch-src_Makefile.in) = 5ef9f6cb1a6623450e7ca6f144c777f4e11d9b2e
+SHA1 (patch-src_configure.ac) = 69eabc245c47a20c067bbd5b49dda70f08011aae
+SHA1 (patch-src_os.c) = bcbcf79661fe6d3efca02a0293901fa4f1eb2819
+SHA1 (patch-src_tcp.c) = c0890430c48ac268d8545376ad80feba0b593cf1
diff --git a/net/inadyn/files/inadyn.sh b/net/inadyn/files/inadyn.sh
index b2b64f50f34..a404fc8b49b 100644
--- a/net/inadyn/files/inadyn.sh
+++ b/net/inadyn/files/inadyn.sh
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: inadyn.sh,v 1.1 2011/12/14 13:35:47 abs Exp $
+# $NetBSD: inadyn.sh,v 1.2 2015/04/04 07:59:33 snj Exp $
 #
 
 # PROVIDE: inadyn
@@ -10,7 +10,7 @@
 
 name="inadyn"
 rcvar=$name
-command="@PREFIX@/bin/${name}"
+command="@PREFIX@/sbin/${name}"
 required_files="@PKG_SYSCONFDIR@/inadyn.conf"
 
 load_rc_config $name
diff --git a/net/inadyn/patches/patch-aa b/net/inadyn/patches/patch-aa
deleted file mode 100644
index 0b5a9b8eea3..00000000000
--- a/net/inadyn/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2008/06/22 04:52:39 dmcmahill Exp $
-
---- makefile.orig	2005-09-09 23:16:50.000000000 +0000
-+++ makefile	2008-06-19 23:47:05.000000000 +0000
-@@ -34,6 +34,6 @@
- OBJ=$(COMMON_OBJ) $(CFG_OBJ)
- 
--COMPILE=gcc  -Wall  -pedantic -c  $(ARCH_SPECIFIC_CFLAGS) $(CFLAGS) -o "$(OUTDIR)/$(*F).o" $(CFG_INC) "$<"
--LINK=gcc $(CFLAGS) -o "$(OUTFILE)" $(OBJ) $(CFG_LIB) $(ARCH_SPECIFIC_LIBS)
-+COMPILE=$(CC)  -c  $(ARCH_SPECIFIC_CFLAGS) $(CFLAGS) -o "$(OUTDIR)/$(*F).o" $(CFG_INC) "$<"
-+LINK=$(CC) $(CFLAGS) -o "$(OUTFILE)" $(OBJ) $(CFG_LIB) $(ARCH_SPECIFIC_LIBS) $(LIBS)
- 
- # Pattern rules
diff --git a/net/inadyn/patches/patch-ab b/net/inadyn/patches/patch-ab
deleted file mode 100644
index 01eb11b6407..00000000000
--- a/net/inadyn/patches/patch-ab
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2011/12/14 13:35:47 abs Exp $
-
-usleep is not guaranteed to work for arguments >= 1,000,000
-
---- src/os_unix.c.orig	2008-06-20 03:11:39.000000000 +0000
-+++ src/os_unix.c	2008-06-20 03:13:09.000000000 +0000
-@@ -31,5 +31,9 @@
- void os_sleep_ms(int ms)
- {
--    usleep(ms*1000);
-+    /* usleep is not guaranteed to work for arguments >= 1,000,000 */
-+    if( ms >= 1000 )
-+        sleep( ms/1000 );
-+    else
-+        usleep(ms*1000);
- }
- 
diff --git a/net/inadyn/patches/patch-include_ddns.h b/net/inadyn/patches/patch-include_ddns.h
new file mode 100644
index 00000000000..232a8497e58
--- /dev/null
+++ b/net/inadyn/patches/patch-include_ddns.h
@@ -0,0 +1,22 @@
+$NetBSD: patch-include_ddns.h,v 1.1 2015/04/04 07:59:34 snj Exp $
+
+/var/run is for non-persistent data, and despite the misleading name,
+RUNTIME_DATA_DIR contains "persistent cache files", so let's use
+/var/db (subject to VARBASE replacement under pkgsrc) instead.
+
+With RUNTIME_DATA_DIR set to a more reasonable value, stop using it
+for the default pidfile location.
+
+--- include/ddns.h.orig	2015-02-07 23:08:18.000000000 -0800
++++ include/ddns.h	2015-04-03 22:38:17.000000000 -0700
+@@ -38,8 +38,8 @@
+ 
+ /* Test values */
+ #define DEFAULT_CONFIG_FILE	"/etc/inadyn.conf"
+-#define RUNTIME_DATA_DIR	"/var/run/inadyn"
+-#define DEFAULT_PIDFILE		RUNTIME_DATA_DIR "/inadyn.pid"
++#define RUNTIME_DATA_DIR	"/var/db/inadyn"
++#define DEFAULT_PIDFILE		"/var/run/inadyn.pid"
+ 
+ #define DYNDNS_MY_IP_SERVER	"checkip.dyndns.org"
+ #define DYNDNS_MY_CHECKIP_URL	"/"
diff --git a/net/inadyn/patches/patch-man_inadyn.8 b/net/inadyn/patches/patch-man_inadyn.8
new file mode 100644
index 00000000000..7dd40d68ddf
--- /dev/null
+++ b/net/inadyn/patches/patch-man_inadyn.8
@@ -0,0 +1,38 @@
+$NetBSD: patch-man_inadyn.8,v 1.1 2015/04/04 07:59:34 snj Exp $
+
+Adjust /var subdirs.  /var gets replaced by VARBASE.
+
+--- man/inadyn.8.orig	2015-04-03 22:48:32.000000000 -0700
++++ man/inadyn.8	2015-04-03 22:48:20.000000000 -0700
+@@ -233,10 +233,10 @@ Set interface to check for IP. Only on U
+ External IP check is not performed
+ .It Fl P, -pidfile Ar FILE
+ Set pidfile, defaults to
+-.Pa /var/run/inadyn/inadyn.pid 
++.Pa /var/run/inadyn.pid 
+ .It Fl c, -cache-dir Ar PATH
+ Set directory for persistent cache files, defaults to
+-.Pa /var/run/inadyn
++.Pa /var/db/inadyn
+ .Pp
+ The cache files are used to keep track of which addresses have been
+ successfully sent to their respective DDNS provider and when.  The
+@@ -418,13 +418,13 @@ that
+ For convenience in sending signals,
+ .Nm
+ writes its process ID to
+-.Pa /var/run/inadyn/inadyn.pid
++.Pa /var/run/inadyn.pid
+ .Sh FILES
+-.Bl -tag -width /var/run/inadyn/inadyn.cache -compact
++.Bl -tag -width /var/db/inadyn/inadyn.cache -compact
+ .It Pa /etc/inadyn.conf
+-.It Pa /var/run/inadyn/inadyn.pid
+-.It Pa /var/run/inadyn/dyndns.org.cache
+-.It Pa /var/run/inadyn/freedns.afraid.org.cache
++.It Pa /var/run/inadyn.pid
++.It Pa /var/db/inadyn/dyndns.org.cache
++.It Pa /var/db/inadyn/freedns.afraid.org.cache
+ .It Pa ... one .cache file per DDNS provider
+ .El
+ .Sh SEE ALSO
diff --git a/net/inadyn/patches/patch-man_inadyn.conf.5 b/net/inadyn/patches/patch-man_inadyn.conf.5
new file mode 100644
index 00000000000..067271be3bb
--- /dev/null
+++ b/net/inadyn/patches/patch-man_inadyn.conf.5
@@ -0,0 +1,15 @@
+$NetBSD: patch-man_inadyn.conf.5,v 1.1 2015/04/04 07:59:34 snj Exp $
+
+Use a more sensible cache-dir.  /var will be replaced by VARBASE.
+
+--- man/inadyn.conf.5.orig	2015-04-03 22:40:32.000000000 -0700
++++ man/inadyn.conf.5	2015-04-03 22:41:17.000000000 -0700
+@@ -51,7 +51,7 @@ startup-delay  60
+ .br
+ # pidfile      /var/run/inadyn.pid
+ .br
+-cache-dir      /etc/inadyn
++cache-dir      /var/db/inadyn
+ .Pp
+ # Primary account, used for most operations
+ .br
diff --git a/net/inadyn/patches/patch-src_Makefile.in b/net/inadyn/patches/patch-src_Makefile.in
new file mode 100644
index 00000000000..adb400dc03e
--- /dev/null
+++ b/net/inadyn/patches/patch-src_Makefile.in
@@ -0,0 +1,14 @@
+$NetBSD: patch-src_Makefile.in,v 1.1 2015/04/04 07:59:34 snj Exp $
+
+Check for dlopen using autoconf rather than hardcoding it in src/Makefile.in.
+
+--- src/Makefile.in.orig	2015-04-03 21:56:50.000000000 -0700
++++ src/Makefile.in	2015-04-03 21:56:51.000000000 -0700
+@@ -204,7 +204,6 @@ inadyn_SOURCES = main.c ddns.c cache.c e
+ 	../plugins/sitelutions.c ../plugins/tunnelbroker.c \
+ 	../plugins/tzo.c ../plugins/zoneedit.c ../plugins/zerigo.c \
+ 	../plugins/dhis.c ../plugins/duckdns.c ../plugins/dtdns.c
+-inadyn_LDADD = -ldl
+ all: all-am
+ 
+ .SUFFIXES:
diff --git a/net/inadyn/patches/patch-src_configure.ac b/net/inadyn/patches/patch-src_configure.ac
new file mode 100644
index 00000000000..66c3a99bdfa
--- /dev/null
+++ b/net/inadyn/patches/patch-src_configure.ac
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_configure.ac,v 1.1 2015/04/04 07:59:34 snj Exp $
+
+Check for dlopen using autoconf rather than hardcoding it in src/Makefile.in.
+
+--- configure.ac.orig	2015-04-03 21:50:04.000000000 -0700
++++ configure.ac	2015-04-03 21:50:42.000000000 -0700
+@@ -73,5 +73,8 @@ AC_FUNC_FORK
+ AC_PROG_GCC_TRADITIONAL
+ AC_FUNC_SELECT_ARGTYPES
+ AC_CHECK_FUNCS([atexit memset poll socket strerror])
++AC_SEARCH_LIBS([dlopen], [dl dld], [], [
++  AC_MSG_ERROR([unable to find the dlopen() function])
++])
+ 
+ AC_OUTPUT
diff --git a/net/inadyn/patches/patch-src_os.c b/net/inadyn/patches/patch-src_os.c
new file mode 100644
index 00000000000..3c99d7845e7
--- /dev/null
+++ b/net/inadyn/patches/patch-src_os.c
@@ -0,0 +1,19 @@
+$NetBSD: patch-src_os.c,v 1.1 2015/04/04 07:59:34 snj Exp $
+
+Avoid bogus usleep usage.
+
+--- src/os.c.orig	2015-04-03 21:12:49.000000000 -0700
++++ src/os.c	2015-04-03 21:19:49.000000000 -0700
+@@ -180,7 +180,11 @@ static void *param = NULL;
+ 
+ void os_sleep_ms(int ms)
+ {
+-	usleep(ms * 1000);
++	/* usleep is not guaranteed to work for arguments >= 1,000,000 */
++	if (ms >= 1000)
++		sleep(ms / 1000);
++	else
++		usleep(ms * 1000);
+ }
+ 
+ int os_get_socket_error(void)
diff --git a/net/inadyn/patches/patch-src_tcp.c b/net/inadyn/patches/patch-src_tcp.c
new file mode 100644
index 00000000000..e6680eadc1e
--- /dev/null
+++ b/net/inadyn/patches/patch-src_tcp.c
@@ -0,0 +1,14 @@
+$NetBSD: patch-src_tcp.c,v 1.1 2015/04/04 07:59:34 snj Exp $
+
+pull in time.h for struct timeval
+
+--- src/tcp.c.orig	2015-04-03 21:27:23.000000000 -0700
++++ src/tcp.c	2015-04-03 21:30:17.000000000 -0700
+@@ -23,6 +23,7 @@
+ #include <poll.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include <time.h>
+ 
+ #include "debug.h"
+ #include "tcp.h"