Import of pkgsrc-2016Q3

2016-11-18 22:39:22 +01:00
parent 9d819b6d54
commit 1242aa1e36
35952 changed files with 949747 additions and 377081 deletions
@@ -1,21 +1,23 @@
-# $NetBSD: Makefile,v 1.10 2015/08/14 20:24:27 abs Exp $
+# $NetBSD: Makefile,v 1.13 2016/05/29 22:32:11 abs Exp $

-DISTNAME=	inadyn-1.99.13
-PKGREVISION=	1
+DISTNAME=	inadyn-1.99.15
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_GITHUB:=troglobit/}
-EXTRACT_SUFX=	.zip
+EXTRACT_SUFX=	.tar.xz

 MAINTAINER=	pkgsrc-users@NetBSD.org
 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

@@ -39,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"
@@ -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
@@ -1,13 +1,13 @@
-$NetBSD: distinfo,v 1.6 2015/08/14 20:24:27 abs Exp $
+$NetBSD: distinfo,v 1.9 2016/05/29 22:32:11 abs Exp $

-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-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
@@ -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
@@ -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	"/"
@@ -1,38 +0,0 @@
-$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
@@ -1,15 +0,0 @@
-$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
@@ -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;
@@ -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
@@ -1,14 +0,0 @@
-$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:
@@ -1,10 +1,24 @@
-$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])
@@ -12,4 +26,10 @@ Check for dlopen using autoconf rather than hardcoding it in src/Makefile.in.
 +  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`
@@ -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)
@@ -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>