Received: by mail.netbsd.org (Postfix, from userid 605) id 44C5984D71; Fri, 13 Dec 2019 21:52:06 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id C250D84CEF for ; Fri, 13 Dec 2019 21:52:05 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id U-S2uy6UsYyX for ; Fri, 13 Dec 2019 21:52:04 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 6965B84CD8 for ; Fri, 13 Dec 2019 21:52:04 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 5D7C0FA97; Fri, 13 Dec 2019 21:52:04 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_157627392441000" MIME-Version: 1.0 Date: Fri, 13 Dec 2019 21:52:04 +0000 From: "Dan McMahill" Subject: CVS commit: pkgsrc/net/inadyn To: pkgsrc-changes@NetBSD.org Reply-To: dmcmahill@netbsd.org X-Mailer: log_accum Message-Id: <20191213215204.5D7C0FA97@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_157627392441000 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="UTF-8" Module Name: pkgsrc Committed By: dmcmahill Date: Fri Dec 13 21:52:04 UTC 2019 Modified Files: pkgsrc/net/inadyn: Makefile PLIST distinfo pkgsrc/net/inadyn/patches: patch-plugins_freedns.c patch-src_tcp.c Removed Files: pkgsrc/net/inadyn/patches: patch-Makefile.am patch-include_ddns.h patch-src_Makefile.am patch-src_configure.ac patch-src_os.c Log Message: Update inadyn to 2.5 Motivated by wanting to build under more recent systems with newer OpenSSL. Many changes since 1.99.15 [v2.5][] - 2018-09-30 --------------------- ### Changes - macOS changes by Jo Rhett: - Add linking with `-lresolv` - Use Homebrew's CA trust store - Update REDAME with install help - Add support for selfhost.de DDNS ### Fixes - Fix #211: Only show DDNS server response on successful transaction - Fix #211: Improved error handling in OpenSSL back-end - Fix #214: Add `nochg` to list of good responses for custom providers - Fixes by Erich Sauvageau: - Fix #216: Add DNS lookup exception for `all.dnsomatic.com` - Fix #219: Add DNS lookup exception for `default@tunnelbrooker.net` [v2.4][] - 2018-08-18 --------------------- ### Changes - Add support for Dynu DDNS provider ### Fixes - Add missing defines for `LLONG_MAX` and `LLONG_MIN` on some platforms - Fix #209: Update FreeDNS plugin to use v2 of their API to fetch update key - Fix #210: Use `~/.cache/inadyn` or `~/.inadyn` when running unprivileged [v2.3.1][] - 2018-02-12 ----------------------- This minor bug fix release holds Debian packaging fixes by André Colomb. ### Changes - Make .deb files an official part of releases ### Fixes - Fix installation of `inadyn` in `/usr/sbin` and symlink in `/usr/bin` - Rename debian/inadyn.links to be standards-compliant - Update deprecated build dependency for dh-systemd - Fix lintian warning about unsafe symlinks for build scripts - Version numbers containing a dash are inappropriate for 'native' packages, bump revision instead [v2.3][] - 2018-01-05 --------------------- ### Changes - Distribute `CONTRIBUTING.md` in release tarballs, by André Colomb - Clean up debug messages for HTTPS connections, by André Colomb - New build-depends, `libgnutls28-dev` for Debian/Ubuntu users and GnuTLS >= 3.0 for others, by André Colomb - Issue #192: Add `examples/*.conf` to source distribution, by André Colomb ### Fixes - TCP, not UDP, for `getaddrinfo()` hints + numeric lookups, by André Colomb - Disable SSL for checkip connections to SPDYN service, by André Colomb - Issue #186: Allow IPv6 for HTTP(S) connections, by André Colomb - Issue #189: Ignore premature session termination in GnuTLS, by André Colomb - Issue #193: Fix broken internal links in README.md, by André Colomb [v2.2.1][] - 2017-10-06 ----------------------- ### Fixes - Issue #174: `gnutls.c` missing `stdint.h`, fix for ArchLinux - Issue #179: Update easyDNS plugin to new API, by Nicholas Alipaz [v2.2][] - 2017-08-09 --------------------- ### Changes - Use HTTP by default for DYN.com checkip server, used by many DDNS providers that do not have their own. This change is far more user friendly since you no longer have to explicitly set `checkip-ssl = false` for the most common use-case. - Some DDNS providers have multiple IP addresses registered for the same service, as of this release Inadyn immediately tries to connect to the next listed addresses on connection problems. - Issue #153: Support for custom HTTP User Agent. Useful with providers that require using a specific brower. Set to, e.g. "Mozilla/4.0", or rely on the default "inadyn/VERSION" user agent. - Support for the `%%` format specifier in custom server URL's, as mentioned in issue #152. - Add support for a `.conf` syntax checker: `inadyn --check-config` - Add support for logging to `stderr` when running in foreground or without syslog enabled - Simplified provider name lookup in `.conf` file. Now substring match is used, resulting in support for `provider Dyn { ... }`. - Remove libite dependency by importing all its used files into inadyn. This should ease adoption by distributions and end users. All code is under free licenses: BSD, ISC. - Import Timur's Debian packaging, adding debconf support ### Fixes - Issue #152: Do not attempt to create PID file in oneshot mode (`-1`) - Issue #152: Must URL encode custom server URL's - Issue #170: Use configured `--prefix` not hard coded `/etc/inadyn.conf` - Issue #172: Use separate variable for `--iface` command line option and `.conf` file option [v2.1][] - 2016-12-04 --------------------- ### Changes - Use HTTPS instead of HTTP by default - Support for disabling HTTPS for `checkip-server`, per provider. Idea from Valery Frolov - Add `-I,--ident=NAME` option for syslog+pidfile name - Deprecate `--pidfile=NAME` option in favor of `--ident=NAME` ### Fixes - Issue #150: Custom update URL parser fixes - Issue #151: Support for detecting OpenSSL v1.1 - Issue #144: Clarify use of public vs private IP. It is possible to register private IP addresses in a public DNS - Clarify `--foreground` option in man page - Document minimum required versions of libite and libConfuse - Portability fixes, replace `__progname` with a small function, replace `%m` with `%s` and `strerror(errno)`. [v2.0][] - 2016-09-12 --------------------- New configuration file format, changed command line options, improved HTTPS support using GnuTLS and Open/LibreSSL. Inadyn now comes with certificate validation enabled by default. ### Changes - New configuration file format using [libConfuse][] - Radically simplified command line, a .conf file is now required - Reorganized SSL code, split `ssl.c` into `openssl.c` and `gnutls.c` - Strict HTTPS certificate validation is now default. To disable this use `strict-ssl = false` in the .conf file. - Certificate validation uses trusted CA certificates from the system with fall-backs to certain known locations. To override this default handling a `ca-trust-file = FILE` setting in `inadyn.conf` can be used to provide the path to another CA cert bundle, in PEM format. - Massive overhaul of `inadyn(8)` and `inadyn.conf(5)` man pages - Support for reading address from interface, including IPv6 addresses - Support for calling an external script to get the IP address - Support for multiple users @ same provider, idea from Valery Frolov: provider default@no-ip.com:1 { username = ian password = secret alias = flemming.no-ip.com } provider default@no-ip.com:2 { username = james password = bond alias = spectre.no-ip.com } - Support for ddnss.de and dynv6.com, contributed by Sven Hoefer - Support for spdyn.de, on request from Frank Röhm - Support for strato.com, contributed by Duncan Overbruck - Support for disabling IP address validation: `verify-address = false` - Refactored memory handling and privilige separation to simplify code - Refactored logging and backgrounding to simplify code - Removed old compatibility symlinks and other required GNU specific files, we now distribute and install README.md and ChangeLog.md ### Fixes - Fix issue #61: Add HTTPS certificate validation for OpenSSL/LibreSSL - Fix issue #67: Use GnuTLS native API for HTTPS - Fix DuckDNS: now requires 'www.' prefix in server URL. By Frank Aurich - Fix issue #110: Poodle `SSL_MODE_SEND_FALLBACK_SCSV` not needed - Fix issue #101: Remove support for custom pidfile - Fix issue #102: Relocate cache files `/var/run/inadyn` to `/var/cache/inadyn` - Fix issue #113: `--drop-privs` does not work - Add actual permissions check to `os_check_perms()` - Fix issue #121: Support for fully customizable update URL - Fix issue #122: Only use HTTPS connection for DNS update, not checkip - Fix issue #131: Use FreeDNS' own checkip server instead of DYN.com's - Fix issue #134: Support wildcard cert with GnuTLS backend To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.16 pkgsrc/net/inadyn/Makefile cvs rdiff -u -r1.5 -r1.6 pkgsrc/net/inadyn/PLIST cvs rdiff -u -r1.9 -r1.10 pkgsrc/net/inadyn/distinfo cvs rdiff -u -r1.1 -r0 pkgsrc/net/inadyn/patches/patch-Makefile.am \ pkgsrc/net/inadyn/patches/patch-src_Makefile.am cvs rdiff -u -r1.2 -r0 pkgsrc/net/inadyn/patches/patch-include_ddns.h \ pkgsrc/net/inadyn/patches/patch-src_configure.ac \ pkgsrc/net/inadyn/patches/patch-src_os.c cvs rdiff -u -r1.2 -r1.3 pkgsrc/net/inadyn/patches/patch-plugins_freedns.c \ pkgsrc/net/inadyn/patches/patch-src_tcp.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_157627392441000 Content-Disposition: inline Content-Length: 7532 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/net/inadyn/Makefile diff -u pkgsrc/net/inadyn/Makefile:1.15 pkgsrc/net/inadyn/Makefile:1.16 --- pkgsrc/net/inadyn/Makefile:1.15 Sun Nov 3 11:45:37 2019 +++ pkgsrc/net/inadyn/Makefile Fri Dec 13 21:52:04 2019 @@ -1,23 +1,22 @@ -# $NetBSD: Makefile,v 1.15 2019/11/03 11:45:37 rillig Exp $ +# $NetBSD: Makefile,v 1.16 2019/12/13 21:52:04 dmcmahill Exp $ -DISTNAME= inadyn-1.99.15 +DISTNAME= inadyn-2.5 CATEGORIES= net MASTER_SITES= ${MASTER_SITE_GITHUB:=troglobit/} -EXTRACT_SUFX= .tar.xz MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://troglobit.com/inadyn.html COMMENT= Dynamic DNS client LICENSE= gnu-gpl-v2 -GITHUB_RELEASE= 1.99.15 +GITHUB_RELEASE= v2.5 GITHUB_TYPE= release -USE_TOOLS+= autoconf automake gmake +USE_TOOLS+= gmake pkg-config RCD_SCRIPTS= inadyn GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --enable-openssl --disable-gitcheck +CONFIGURE_ARGS+= --enable-openssl LIBS.SunOS= -lsocket -lnsl @@ -30,16 +29,10 @@ BUILD_DEFS+= VARBASE 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_FILES.etc= man/inadyn.conf.5 man/inadyn.8 SUBST_MESSAGE.etc= Fixing path to configuration file SUBST_STAGE.etc= pre-configure -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 - .include "../../mk/bsd.prefs.mk" PKG_OPTIONS_VAR= PKG_OPTIONS.inadyn @@ -54,10 +47,9 @@ PKG_SUPPORTED_OPTIONS= static LDFLAGS+= -static .endif -pre-configure: - cd ${WRKSRC} && autoreconf -i - .include "../../security/openssl/buildlink3.mk" +.include "../../devel/confuse/buildlink3.mk" +.include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/libite/buildlink3.mk" .include "../../mk/dlopen.buildlink3.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/net/inadyn/PLIST diff -u pkgsrc/net/inadyn/PLIST:1.5 pkgsrc/net/inadyn/PLIST:1.6 --- pkgsrc/net/inadyn/PLIST:1.5 Sun May 29 22:32:11 2016 +++ pkgsrc/net/inadyn/PLIST Fri Dec 13 21:52:04 2019 @@ -1,9 +1,13 @@ -@comment $NetBSD: PLIST,v 1.5 2016/05/29 22:32:11 abs Exp $ +@comment $NetBSD: PLIST,v 1.6 2019/12/13 21:52:04 dmcmahill Exp $ man/man5/inadyn.conf.5 man/man8/inadyn.8 sbin/inadyn -share/doc/inadyn/AUTHORS share/doc/inadyn/COPYING -share/doc/inadyn/ChangeLog -share/doc/inadyn/NEWS -share/doc/inadyn/README +share/doc/inadyn/ChangeLog.md +share/doc/inadyn/README.md +share/doc/inadyn/examples/README.md +share/doc/inadyn/examples/custom.conf +share/doc/inadyn/examples/dyndns.conf +share/doc/inadyn/examples/freedns.conf +share/doc/inadyn/examples/freemyip.conf +share/doc/inadyn/examples/inadyn.conf Index: pkgsrc/net/inadyn/distinfo diff -u pkgsrc/net/inadyn/distinfo:1.9 pkgsrc/net/inadyn/distinfo:1.10 --- pkgsrc/net/inadyn/distinfo:1.9 Sun May 29 22:32:11 2016 +++ pkgsrc/net/inadyn/distinfo Fri Dec 13 21:52:04 2019 @@ -1,13 +1,8 @@ -$NetBSD: distinfo,v 1.9 2016/05/29 22:32:11 abs Exp $ +$NetBSD: distinfo,v 1.10 2019/12/13 21:52:04 dmcmahill Exp $ -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 +SHA1 (inadyn-2.5.tar.gz) = 9345dd2d118d86c116f5e238fdef1959bfe05a43 +RMD160 (inadyn-2.5.tar.gz) = cb590b7cfa6f625846adfd157b365060661e9175 +SHA512 (inadyn-2.5.tar.gz) = 885d05fdf70067a0e34899026300185a47f94e49ffe0cbbb7d07b17c80bd4cb2d2a9b35af4466b0dcc7949c59224d424f95e5afb9d31310db4ddacb90ca2475a +Size (inadyn-2.5.tar.gz) = 456400 bytes +SHA1 (patch-plugins_freedns.c) = d7a2f7382af41108a94fb352ce50214602b29c62 +SHA1 (patch-src_tcp.c) = 376d300041edf738c1de9c076ce00b6e4c109817 Index: pkgsrc/net/inadyn/patches/patch-plugins_freedns.c diff -u pkgsrc/net/inadyn/patches/patch-plugins_freedns.c:1.2 pkgsrc/net/inadyn/patches/patch-plugins_freedns.c:1.3 --- pkgsrc/net/inadyn/patches/patch-plugins_freedns.c:1.2 Sun May 29 22:32:12 2016 +++ pkgsrc/net/inadyn/patches/patch-plugins_freedns.c Fri Dec 13 21:52:04 2019 @@ -1,39 +1,39 @@ -$NetBSD: patch-plugins_freedns.c,v 1.2 2016/05/29 22:32:12 abs Exp $ +$NetBSD: patch-plugins_freedns.c,v 1.3 2019/12/13 21:52:04 dmcmahill Exp $ If the update call fails, log the response from the remote service ---- plugins/freedns.c.orig 2015-09-09 19:27:51.000000000 +0000 +--- plugins/freedns.c.orig 2018-08-29 17:40:11.000000000 -0500 +++ plugins/freedns.c -@@ -55,7 +55,7 @@ static int request(ddns_t *ctx, ddns_inf - int i, rc = 0; +@@ -59,5 +59,5 @@ http_t client; http_trans_t trans; - char *buf, *tmp, *line, *hash = NULL; + char *buf, *tmp, *line, *hash = NULL, *errmsg = NULL; char host[256], updateurl[256]; char buffer[256]; - char digeststr[SHA1_DIGEST_BYTES * 2 + 1]; -@@ -109,15 +109,20 @@ static int request(ddns_t *ctx, ddns_inf - } +@@ -110,7 +110,8 @@ free(buf); - if (!hash) + if (!hash) { -+ errmsg = trans.p_rsp_body; - rc = RC_DYNDNS_RSP_NOTOK; ++ errmsg = trans.rsp_body; + rc = RC_DDNS_RSP_NOTOK; - else + } else hash++; } - while (0); +@@ -118,7 +119,11 @@ if (rc) { -- logit(LOG_INFO, "Update URL query failed"); -+ if (errmsg != NULL) { -+ logit(LOG_INFO, "Update URL query failed (%s)", errmsg); -+ } else { -+ logit(LOG_INFO, "Update URL query failed"); -+ } - return 0; - } +- if (rc == RC_DDNS_RSP_NOTOK) +- logit(LOG_INFO, "Cannot find your DNS name in the list of API keys"); +- else ++ if (rc == RC_DDNS_RSP_NOTOK) { ++ if (errmsg != NULL) { ++ logit(LOG_INFO, "Cannot find your DNS name in the list of API keys (%s)", errmsg); ++ } else { ++ logit(LOG_INFO, "Cannot find your DNS name in the list of API keys"); ++ } ++ } else + logit(LOG_INFO, "Cannot find you FreeDNS account API keys"); Index: pkgsrc/net/inadyn/patches/patch-src_tcp.c diff -u pkgsrc/net/inadyn/patches/patch-src_tcp.c:1.2 pkgsrc/net/inadyn/patches/patch-src_tcp.c:1.3 --- pkgsrc/net/inadyn/patches/patch-src_tcp.c:1.2 Sun May 29 22:32:12 2016 +++ pkgsrc/net/inadyn/patches/patch-src_tcp.c Fri Dec 13 21:52:04 2019 @@ -1,14 +1,12 @@ -$NetBSD: patch-src_tcp.c,v 1.2 2016/05/29 22:32:12 abs Exp $ +$NetBSD: patch-src_tcp.c,v 1.3 2019/12/13 21:52:04 dmcmahill Exp $ pull in time.h for struct timeval ---- src/tcp.c.orig 2015-09-09 19:27:51.000000000 +0000 +--- src/tcp.c.orig 2017-12-27 07:46:43.000000000 -0500 +++ src/tcp.c -@@ -23,6 +23,7 @@ - #include +@@ -30,4 +30,5 @@ #include #include +#include - - #include "debug.h" - #include "tcp.h" + #include + #include --_----------=_157627392441000--