Updated net/inadyn to 1.99.15

Inadyn v1.99.15 Changes * Support for new API at https://tunnelbroker.net, fixes issue #83. Use [email protected] to use the DYN.com API to update the IPv4 address for your IPv6-in-IPv4 tunnel. Thanks goes to Horst Venzke @hvenzke for reporting this problem! * The old API for the IPv6-in-IPv4 system [email protected] is now deprecated. Users should migrate to [email protected] * Files generated by the GNU Configure & Build System is now no longer stored in GIT. Instead, users that rely on GIT must run the new ./autogen.sh script to generate the necessary files (configure). Fixes * Fix issue #100: regression from 1.99.13 pidfile is no longer created. Inadyn 1.x semantics incompatible with OpenBSD pidfile() that replaced local version in 1.99.14. Problem found by David Schury @daersc. * Fix issue #107: If an IP address update fails, e.g. due to temporary connectivity, HTTP transmission problems, etc. then Inadyn now forces an update in the next IP check cycle. (This is the configurable period interval in inadyn.conf.) Reported by Oliver Graute @redbrain17 and audited by @BulldozerBSG, thanks! * Fix issue #108: Update README with correct alias syntax for Namecheap, issue reported by @quazar0 Inadyn v1.99.14 Changes * New setting append-myip which, instead of appending your hostname alias, appends the current IP to the server GET update URL. See the README or the man pages for more details. * Prevent Inadyn from bugging out if it cannot write a cache file when the -o, --once flag is given. * Inadyn now defaults to a silent build, use make V=1 (like Linux) to get a verbose build. Useful for auto-builders etc. * Migrate to libite for functions like pidfile(), strlcpy() etc. * Add support for http://GiraDNS.com, thanks to Thorsten Mühlfelder, @thenktor! * Add support for https://www.duiadns.net, thanks to Ionut Slaveanu, @svionut! * Add Cygwin support for running Inadyn in Windows, thanks to Scott Mann, @sejmann! Fixes * Sanitized default logs by placing conditions for debug logs. Thanks to Frank Aurich, @1100101, for this work! * Fix issue #82: build failure, no rule to build target CHANGELOG, a regression introduced in 1.99.13. * Fix Duck DNS support, thanks to Ismani Nieuweboer, @YourDearestEigenvalue!
TritonDataCenter · May 29, 2016 · b637bdf · b637bdf
1 parent 0203612
commit b637bdf
Show file tree

Hide file tree

Showing 13 changed files with 105 additions and 114 deletions.
diff --git a/net/inadyn/Makefile b/net/inadyn/Makefile
@@ -1,23 +1,23 @@
-# $NetBSD: Makefile,v 1.12 2016/05/15 22:23:56 abs Exp $
+# $NetBSD: Makefile,v 1.13 2016/05/29 22:32:11 abs Exp $
 
-DISTNAME=	inadyn-1.99.13
-PKGREVISION=	2
+DISTNAME=	inadyn-1.99.15
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_GITHUB:=troglobit/}
-EXTRACT_SUFX=	.zip
-
-DIST_SUBDIR=    ${PKGNAME_NOREV}
+EXTRACT_SUFX=	.tar.xz
 
 MAINTAINER=	[email protected]
 HOMEPAGE=	http://troglobit.com/inadyn.html
 COMMENT=	Dynamic DNS client
 LICENSE=	gnu-gpl-v2
 
-USE_TOOLS+=	autoconf gmake
+GITHUB_RELEASE=	1.99.15
+GITHUB_TYPE=	release
+
+USE_TOOLS+=	autoconf automake gmake
 RCD_SCRIPTS=	inadyn
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=	--enable-openssl
+CONFIGURE_ARGS+=--enable-openssl --disable-gitcheck
 
 LIBS.SunOS=	-lsocket -lnsl
 
@@ -41,8 +41,9 @@ SUBST_MESSAGE.var=	Adjusting path to VARBASE
 SUBST_STAGE.var=	pre-configure
 
 pre-configure:
-	cd ${WRKSRC} && autoconf
+	cd ${WRKSRC} && autoreconf -i
 
 .include "../../security/openssl/buildlink3.mk"
+.include "../../devel/libite/buildlink3.mk"
 .include "../../mk/dlopen.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/inadyn/PLIST b/net/inadyn/PLIST
@@ -1,9 +1,9 @@
-@comment $NetBSD: PLIST,v 1.4 2015/04/04 07:59:33 snj Exp $
+@comment $NetBSD: PLIST,v 1.5 2016/05/29 22:32:11 abs 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/ChangeLog
 share/doc/inadyn/NEWS
 share/doc/inadyn/README
diff --git a/net/inadyn/distinfo b/net/inadyn/distinfo
@@ -1,14 +1,13 @@
-$NetBSD: distinfo,v 1.8 2016/05/15 22:23:56 abs Exp $
+$NetBSD: distinfo,v 1.9 2016/05/29 22:32:11 abs Exp $
 
-SHA1 (inadyn-1.99.13/inadyn-1.99.13.zip) = b7baf126cbb12195e5faf17d82fbed972c2eee39
-RMD160 (inadyn-1.99.13/inadyn-1.99.13.zip) = 910cba5a8f72d9d8e70f4f672a3b3f252e77cb92
-SHA512 (inadyn-1.99.13/inadyn-1.99.13.zip) = 69ab4be0df8828fd8d9155b547cee84c42a0735fba91c9ca86e82e4d6c89cd12f1c9901319b4a6bcc0fb187e1372d61dbc0f41e81598fe245a74a80894889447
-Size (inadyn-1.99.13/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-plugins_freedns.c) = befb431e0c4b2ae74735c2b9a6533b534e752b9a
-SHA1 (patch-src_Makefile.in) = 5ef9f6cb1a6623450e7ca6f144c777f4e11d9b2e
-SHA1 (patch-src_configure.ac) = 69eabc245c47a20c067bbd5b49dda70f08011aae
-SHA1 (patch-src_os.c) = bcbcf79661fe6d3efca02a0293901fa4f1eb2819
-SHA1 (patch-src_tcp.c) = c0890430c48ac268d8545376ad80feba0b593cf1
+SHA1 (inadyn-1.99.15.tar.xz) = 7c9e4fea2a881a4c7435bd0b98a8bc15d2a55256
+RMD160 (inadyn-1.99.15.tar.xz) = 90cf6e6c1f1118a2102f3651627c61b167e12d75
+SHA512 (inadyn-1.99.15.tar.xz) = b22844e27b6c28e4d4b59f7884ff0f9063715904a66d30998b8d9eba78f268cb1469c9581d0d110ecea587117f2d54a483f2fbc2a02391c8797c30ae426d3f41
+Size (inadyn-1.99.15.tar.xz) = 149152 bytes
+SHA1 (patch-Makefile.am) = d8c104c98f0f2e489bf44aad80117d66c8b6f822
+SHA1 (patch-include_ddns.h) = 9b12cd4bdb1ba715727e2dc5b5fdf6d6c553c5c6
+SHA1 (patch-plugins_freedns.c) = 401ef1026896efdeb617e20849c1dd69b0a1e461
+SHA1 (patch-src_Makefile.am) = 199559c036ba575c4a07da799d8a9383daa01197
+SHA1 (patch-src_configure.ac) = e21054454c7c68cb1ccc03939f24be8eb69e574c
+SHA1 (patch-src_os.c) = 695e0d2e403501f54bf2f68666913ba82dc83d35
+SHA1 (patch-src_tcp.c) = 1cf9de1d2a9bd2b440dd8cfc7ede701e8ec34766
diff --git a/net/inadyn/patches/patch-Makefile.am b/net/inadyn/patches/patch-Makefile.am
@@ -0,0 +1,14 @@
+$NetBSD: patch-Makefile.am,v 1.1 2016/05/29 22:32:12 abs Exp $
+
+Depend on external libite
+
+--- Makefile.am.orig	2015-09-09 19:27:51.000000000 +0000
++++ Makefile.am
+@@ -1,6 +1,6 @@
+ ## Inadyn - A small and simple DDNS client                -*-Makefile-*-
+
+-SUBDIRS         = libite src include man
++SUBDIRS         = src include man
+ doc_DATA	= README AUTHORS COPYING NEWS ChangeLog
+ EXTRA_DIST	= autogen.sh
+ DISTCLEANFILES	= *~ DEADJOE semantic.cache *.gdb *.elf core core.* *.d
diff --git a/net/inadyn/patches/patch-include_ddns.h b/net/inadyn/patches/patch-include_ddns.h
@@ -1,4 +1,4 @@
-$NetBSD: patch-include_ddns.h,v 1.1 2015/04/04 07:59:34 snj Exp $
+$NetBSD: patch-include_ddns.h,v 1.2 2016/05/29 22:32:12 abs Exp $
 
 /var/run is for non-persistent data, and despite the misleading name,
 RUNTIME_DATA_DIR contains "persistent cache files", so let's use
@@ -7,16 +7,24 @@ RUNTIME_DATA_DIR contains "persistent cache files", so let's use
 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 @@
+--- include/ddns.h.orig	2015-07-22 10:01:42.000000000 +0000
++++ include/ddns.h
+@@ -34,14 +34,14 @@
+ #include "plugin.h"
+ #include "libite/lite.h"
+
+-#define VERSION_STRING	"Inadyn version " VERSION " -- Dynamic DNS update client."
++#define VERSION_STRING	"Inadyn version " VERSION " -- Dynamic DNS update client."
+ #define AGENT_NAME	"inadyn/" VERSION
+ #define SUPPORT_ADDR	PACKAGE_BUGREPORT
 
  /* 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 DEFAULT_CONFIG_FILE	"/etc/inadyn.conf"
+-#define RUNTIME_DATA_DIR        _PATH_VARRUN     "inadyn/"
+-#define DEFAULT_PIDFILE         RUNTIME_DATA_DIR "inadyn.pid"
++#define DEFAULT_CONFIG_FILE     SYSCONFDIR "/inadyn.conf"
++#define RUNTIME_DATA_DIR        _PATH_VARDB  "inadyn/"
++#define DEFAULT_PIDFILE         _PATH_VARRUN "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
diff --git a/net/inadyn/patches/patch-man_inadyn.conf.5 b/net/inadyn/patches/patch-man_inadyn.conf.5
diff --git a/net/inadyn/patches/patch-plugins_freedns.c b/net/inadyn/patches/patch-plugins_freedns.c
@@ -1,8 +1,8 @@
-$NetBSD: patch-plugins_freedns.c,v 1.1 2015/08/14 20:24:28 abs Exp $
+$NetBSD: patch-plugins_freedns.c,v 1.2 2016/05/29 22:32:12 abs Exp $
 
 If the update call fails, log the response from the remote service
 
---- plugins/freedns.c.orig	2015-07-14 15:29:28.000000000 +0000
+--- plugins/freedns.c.orig	2015-09-09 19:27:51.000000000 +0000
 +++ plugins/freedns.c
 @@ -55,7 +55,7 @@ static int request(ddns_t *ctx, ddns_inf
  	int           i, rc = 0;

diff --git a/net/inadyn/patches/patch-src_Makefile.am b/net/inadyn/patches/patch-src_Makefile.am
@@ -0,0 +1,16 @@
+$NetBSD: patch-src_Makefile.am,v 1.1 2016/05/29 22:32:12 abs Exp $
+
+Not all systems always want -ldl
+Set SYSCONFDIR from config
+
+--- src/Makefile.am.orig	2015-07-04 15:23:32.000000000 +0000
++++ src/Makefile.am
+@@ -20,6 +20,6 @@ inadyn_SOURCES += ../plugins/common.c		.
+ 		  ../plugins/dhis.c		../plugins/duckdns.c	\
+ 		  ../plugins/dtdns.c		../plugins/giradns.c	\
+ 		  ../plugins/duiadns.c
+-inadyn_CPPFLAGS = -I../
++inadyn_CPPFLAGS = -I../ -DSYSCONFDIR=\"/etc\"
+ inadyn_LDFLAGS  = -L../libite
+-inadyn_LDADD	= -ldl -lite
++inadyn_LDADD	= -lite
diff --git a/net/inadyn/patches/patch-src_Makefile.in b/net/inadyn/patches/patch-src_Makefile.in
diff --git a/net/inadyn/patches/patch-src_configure.ac b/net/inadyn/patches/patch-src_configure.ac
@@ -1,15 +1,35 @@
-$NetBSD: patch-src_configure.ac,v 1.1 2015/04/04 07:59:34 snj Exp $
+$NetBSD: patch-src_configure.ac,v 1.2 2016/05/29 22:32:12 abs Exp $
 
 Check for dlopen using autoconf rather than hardcoding it in src/Makefile.in.
+Plus add an option to disable gitcheck
 
---- 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
+--- configure.ac.orig	2015-09-09 19:27:51.000000000 +0000
++++ configure.ac
+@@ -22,6 +22,12 @@ AC_ARG_ENABLE(openssl,
+         [ac_enable_openssl="no"]
+ )
+
++AC_ARG_ENABLE(gitcheck,
++        [AS_HELP_STRING([--disable-gitcheck], [Disable Git check, default: enabled])],
++        [ac_enable_gitcheck="$enableval"],
++        [ac_enable_gitcheck="yes"]
++)
++
+ # Define necessary build flags
+ AC_GNU_SOURCE
+ AC_USE_SYSTEM_EXTENSIONS
+@@ -73,10 +79,13 @@ 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
+ # Check if user has downloaded a GitHub ZIP file and attempt to fix it.
+ AC_MSG_CHECKING([status of GIT submodules])
+-if test ! -e libite/lite.h; then
++if test "$ac_enable_gitcheck" = "yes" -a ! -e libite/lite.h; then
+     AC_MSG_RESULT([Missing!])
+     AC_MSG_CHECKING([if we can update all submodules])
+     run=`git submodule update --init`
diff --git a/net/inadyn/patches/patch-src_os.c b/net/inadyn/patches/patch-src_os.c
@@ -1,9 +1,9 @@
-$NetBSD: patch-src_os.c,v 1.1 2015/04/04 07:59:34 snj Exp $
+$NetBSD: patch-src_os.c,v 1.2 2016/05/29 22:32:12 abs Exp $
 
-Avoid bogus usleep usage.
+Avoid possible usleep overflow
 
---- src/os.c.orig	2015-04-03 21:12:49.000000000 -0700
-+++ src/os.c	2015-04-03 21:19:49.000000000 -0700
+--- src/os.c.orig	2015-09-09 19:27:51.000000000 +0000
++++ src/os.c
 @@ -180,7 +180,11 @@ static void *param = NULL;
 
  void os_sleep_ms(int ms)

diff --git a/net/inadyn/patches/patch-src_tcp.c b/net/inadyn/patches/patch-src_tcp.c
@@ -1,9 +1,9 @@
-$NetBSD: patch-src_tcp.c,v 1.1 2015/04/04 07:59:34 snj Exp $
+$NetBSD: patch-src_tcp.c,v 1.2 2016/05/29 22:32:12 abs 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
+--- src/tcp.c.orig	2015-09-09 19:27:51.000000000 +0000
++++ src/tcp.c
 @@ -23,6 +23,7 @@
  #include <poll.h>
  #include <stdlib.h>