summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Schury2015-09-09 23:26:37 +0200
committerDavid Schury2015-09-09 23:26:37 +0200
commite2b8e83e2cc0e72e2efc5dd48438cae41fd9e91f (patch)
treeef0928f6246430bf52f60f1ea48acbcc60282cba
parentcd21c7f857efe1167f804af62cd5528d394a8696 (diff)
downloadaur-e2b8e83e2cc0e72e2efc5dd48438cae41fd9e91f.tar.gz
Updated to inadyn 1.99.15
Example configuration now used from README file.
-rw-r--r--.SRCINFO12
-rw-r--r--PKGBUILD15
-rw-r--r--inadyn.conf49
-rw-r--r--pidfile.patch63
4 files changed, 28 insertions, 111 deletions
diff --git a/.SRCINFO b/.SRCINFO
index ff0391a8068..10441787d09 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = inadyn-fork
pkgdesc = Simple dynamic DNS client - fork of the original INADYN implementation from Narcis Ilisei
- pkgver = 1.99.14
- pkgrel = 2
+ pkgver = 1.99.15
+ pkgrel = 1
url = http://troglobit.com/inadyn.html
arch = x86_64
arch = i686
@@ -15,13 +15,11 @@ pkgbase = inadyn-fork
conflicts = inadyn-mt
conflicts = inadyn-fork-git
backup = etc/inadyn.conf
- source = https://github.com/troglobit/inadyn/releases/download/1.99.14/inadyn-1.99.14.tar.xz
- source = pidfile.patch
+ source = https://github.com/troglobit/inadyn/releases/download/1.99.15/inadyn-1.99.15.tar.xz
source = inadyn.conf
source = inadyn.service
- sha256sums = b2dfed3bb1340843105b6ba73c0bccc558bf7ead53f7f598cb47ec18de46e8d1
- sha256sums = 71d639c5b31157f53ea7a25374330ae60aa6c59780462c16ec8ce6c87d8c9b2d
- sha256sums = 919f87ea87b58e4ddfaf3346ffbcf899b8d9dcee5a0e9440e17e5db9552bba53
+ sha256sums = b54ed82653e9bd6624e579433907aecfd3e83bdab9ed0b3c21d6817c799ac715
+ sha256sums = 2da656ca5b971484c7e033e9e9bcd26afbf4fa08f707f7ca44d954d1646353d7
sha256sums = 4587f4ae2a4215f9ba67d5b3b7d0aa120a9ebd31677472fa68d8792f42d7135f
pkgname = inadyn-fork
diff --git a/PKGBUILD b/PKGBUILD
index e4cbc0fd9c1..057e9b9c00a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,8 +5,8 @@
pkgname=inadyn-fork
_name=inadyn
-pkgver=1.99.14
-pkgrel=2
+pkgver=1.99.15
+pkgrel=1
pkgdesc='Simple dynamic DNS client - fork of the original INADYN implementation from Narcis Ilisei'
url='http://troglobit.com/inadyn.html'
arch=('x86_64' 'i686' 'armv6h' 'armv7h')
@@ -16,19 +16,12 @@ backup=('etc/inadyn.conf')
conflicts=('inadyn-opendns' 'inadyn' 'inadyn-mt' 'inadyn-fork-git')
provides=('inadyn')
source=(https://github.com/troglobit/inadyn/releases/download/$pkgver/${_name}-$pkgver.tar.xz
- pidfile.patch
inadyn.conf
inadyn.service)
-sha256sums=('b2dfed3bb1340843105b6ba73c0bccc558bf7ead53f7f598cb47ec18de46e8d1'
- '71d639c5b31157f53ea7a25374330ae60aa6c59780462c16ec8ce6c87d8c9b2d'
- '919f87ea87b58e4ddfaf3346ffbcf899b8d9dcee5a0e9440e17e5db9552bba53'
+sha256sums=('b54ed82653e9bd6624e579433907aecfd3e83bdab9ed0b3c21d6817c799ac715'
+ '2da656ca5b971484c7e033e9e9bcd26afbf4fa08f707f7ca44d954d1646353d7'
'4587f4ae2a4215f9ba67d5b3b7d0aa120a9ebd31677472fa68d8792f42d7135f')
-prepare(){
- cd ${_name}-$pkgver
- patch -Np1 -i ../pidfile.patch
-}
-
build(){
cd ${_name}-$pkgver
./configure --prefix=/usr --sbindir=/usr/bin --enable-openssl
diff --git a/inadyn.conf b/inadyn.conf
index 8d8d612a088..aa9c2527ba3 100644
--- a/inadyn.conf
+++ b/inadyn.conf
@@ -1,39 +1,28 @@
-# inadyn.conf
+# Example configuration of '/etc/inadyn.conf'
# For more details see 'man inadyn.conf' and 'man inadyn'
-# Check IP urls: checkip.dyndns.com ; checkip.two-dns.de ; myip.dnsomatic.com
-# Runs in background. Output to syslog or to log file [if specified].
background
-# Set dbg level. 0 to 5
verbose 1
-# How often the IP is checked, in seconds
-period 60
-# How often the IP should be updated even if it is not changed
-forced-update 3600
-# Initial delay at program startup. Default is 0 seconds.
-startup-delay 5
+period 300
+cache-dir /mnt/ddns
+startup-delay 60
#logfile /var/log/ddns.log
#pidfile /var/run/ddns.pid
-# example for dyndns.org
+# system default@dyndns.org
+# ssl
+# username yxxx
+# password xyxx
+# alias yyy
+# alias zzz
-#system default@dyndns.org
-# ssl
-# username xxxx
-# password yyyy
-# alias HOST
+# system default@no-ip.com
+# username xxyx
+# password xxxy
+# alias yyy
-# example for no-ip.com sevice
-
-#system default@no-ip.com
-# username xxxx
-# password yyyy
-# alias HOST
-
-# example for dnsomatic sevice
-
-#system default@dnsomatic.com
-# ssl
-# username xxxx
-# password yyyy
-# alias HOST
+# system default@tunnelbroker.net
+# ssl
+# username xyzzy
+# password update-key-in-advanced-tab
+# alias tunnel-id
diff --git a/pidfile.patch b/pidfile.patch
deleted file mode 100644
index 596fa9b6787..00000000000
--- a/pidfile.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-diff --git a/src/os.c b/src/os.c
-index 66c3ada..246c10f 100644
---- a/src/os.c
-+++ b/src/os.c
-@@ -33,7 +33,6 @@
- #include "debug.h"
- #include "ddns.h"
- #include "cache.h"
--#include "libite/lite.h"
-
- #define MAXSTRING 1024
-
-@@ -421,6 +420,39 @@ static int mkparentdir(char *file)
- return rc;
- }
-
-+static void pidexit(void)
-+{
-+ if (pidfile_path) {
-+ unlink(pidfile_path);
-+ free(pidfile_path);
-+ pidfile_path = NULL;
-+ }
-+}
-+
-+/* Continue using old pidfile fn for Inadyn 1.x series,
-+ * incompatible semantics with OpenBSD version. */
-+static int old_pidfile(char *file)
-+{
-+ FILE *fp;
-+
-+ /* Ignore any errors, we may not be allowed to create the dir,
-+ * but still be able to create/overwrite the pidfile. */
-+ mkparentdir(file);
-+
-+ fp = fopen(file, "w");
-+ if (!fp) {
-+ logit(LOG_ERR, "Failed creating pidfile %s: %s", file, strerror(errno));
-+ return RC_FILE_IO_ACCESS_ERROR;
-+ }
-+
-+ fprintf(fp, "%u\n", getpid());
-+ fclose(fp);
-+
-+ atexit(pidexit);
-+
-+ return 0;
-+}
-+
- /* Create pid and cache file repository, make sure we can write to it. If
- * we are restarted we cannot otherwise make sure we've not already updated
- * the IP -- and the user will be locked-out of their DDNS server provider
-@@ -440,8 +472,8 @@ int os_check_perms(void *UNUSED(arg))
- return RC_FILE_IO_ACCESS_ERROR;
- }
-
-- /* Not creating a pidfile is OK, the cache file is the critical point. */
-- pidfile(pidfile_path);
-+ if (old_pidfile(pidfile_path))
-+ logit(LOG_WARNING, "Failed creating pidfile %s: %m", pidfile_path);
-
- return 0;
- }