inadyn: upgrade to 2.0

packages/addons/service/inadyn/changelog.txt

@@ -1,2 +1,5 @@
-8.0.100
+101
+- Upgrade to 2.0
+
+100
 - Initial addon

packages/addons/service/inadyn/package.mk

@@ -17,13 +17,13 @@
 ################################################################################
 
 PKG_NAME="inadyn"
-PKG_VERSION="1.99.15"
-PKG_REV="100"
+PKG_VERSION="2.0"
+PKG_REV="101"
 PKG_ARCH="any"
 PKG_LICENSE="GPLv2"
 PKG_SITE="http://troglobit.com/inadyn.html"
-PKG_URL="ftp://troglobit.com/$PKG_NAME/$PKG_NAME-$PKG_VERSION.tar.xz"
-PKG_DEPENDS_TARGET="toolchain libressl"
+PKG_URL="https://github.com/troglobit/inadyn/archive/v$PKG_VERSION.tar.gz"
+PKG_DEPENDS_TARGET="toolchain libconfuse libite libressl"
 PKG_SECTION="service/system"
 PKG_SHORTDESC="Inadyn: a small and simple Dynamic Domain Name System client"
 PKG_LONGDESC="Inadyn ($PKG_VERSION) is a small and simple Dynamic Domain Name System (DDNS) client with HTTPS support. It is commonly available in many GNU/Linux distributions, used in off-the-shelf routers and Internet gateways to automate the task of keeping your DNS record up to date with any IP address changes from your ISP. It can also be used in installations with redundant (backup) connections to the Internet."
@@ -34,13 +34,7 @@ PKG_ADDON_NAME="Inadyn"
 PKG_ADDON_TYPE="xbmc.service"
 PKG_MAINTAINER="Anton Voyl (awiouy)"
 
-PKG_CONFIGURE_OPTS_TARGET="--enable-openssl" # --sysconfdir is ineffective
-
-pre_configure_target() {
-  # inadyn fails to build in subdirs
-  cd $ROOT/$PKG_BUILD
-  rm -rf .$TARGET_NAME
-}
+PKG_CONFIGURE_OPTS_TARGET="--enable-openssl"
 
 makeinstall_target() {
   :
@@ -48,5 +42,5 @@ makeinstall_target() {
 
 addon() {
   mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin
-  cp $PKG_BUILD/src/inadyn $ADDON_BUILD/$PKG_ADDON_ID/bin
+  cp $PKG_BUILD/.$TARGET_NAME/src/inadyn $ADDON_BUILD/$PKG_ADDON_ID/bin
 }

packages/addons/service/inadyn/source/bin/inadyn-service

@@ -20,24 +20,23 @@
 . /etc/profile
 oe_setup_addon service.system.inadyn
 
-config="$ADDON_HOME/inadyn.conf"
-
-options="-b"
-if [ "$inadyn_S" == "inadyn.conf" ]
-then
-   if [ -f "$config" ] && [ -s "$config" ]
-   then
-      options="$options -F $config"
-   else
-      exit 0
-   fi
+if [ "$inadyn_S" == "inadyn.conf" ]; then
+    config="$ADDON_HOME/inadyn.conf"
 else
-   options="$options -S $inadyn_S -u $inadyn_u -p $inadyn_p -a $inadyn_a"
-   if [ "$inadyn_s" == "true" ]
-   then
-      options="$options -s"
+    config="$ADDON_HOME/inadyn.temp"
+    if [ -z "$inadyn_a" -o -z "$inadyn_p" -o -z "$inadyn_u" ]; then
+        rm -fr "$config"
+    else
+        echo "\
+provider $inadyn_S {
+   ssl      = $inadyn_s
+   username = $inadyn_u
+   password = $inadyn_p
+   hostname = $inadyn_a
+}" > "$config"
     fi
 fi
 
-inadyn $options
-
+if [ -f "$config" ]; then
+    inadyn -f "$config" -l info
+fi

packages/addons/service/inadyn/source/resources/settings.xml

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <settings>
    <category label="30000">
-      <setting id="inadyn_S" label="30001" type="labelenum" values="inadyn.conf|default@dyndns.org|default@freedns.afraid.org|default@zoneedit.com|default@no-ip.com|default@easydns.com|default@tzo.com|dyndns@3322.org|default@dnsomatic.com|dyndns@he.net|default@tunnelbroker.net|default@dynsip.org|default@sitelutions.com|default@dnsexit.com|default@changeip.com|default@zerigo.com|default@dhis.org|ipv4@nsupdate.info|default@duckdns.org|default@loopia.com|default@duiadns.net" />
-      <setting id="inadyn_u" label="30002" type="text" visible="!eq(-1,0)" />
-      <setting id="inadyn_p" label="30003" type="text" visible="!eq(-2,0)" option="hidden" />
-      <setting id="inadyn_a" label="30004" type="text" visible="!eq(-3,0)" />
-      <setting id="inadyn_s" label="30005" type="bool" visible="!eq(-4,0)" default="true"/>
+      <setting id="inadyn_S" label="30001" type="select" default="inadyn.conf" values="inadyn.conf|default@changeip.com|default@ddnss.de|default@dhis.org|default@dnsexit.com|default@dnsomatic.com|default@domains.google.com|default@dtdns.com|default@duckdns.org|default@duiadns.net|default@dyndns.org|default@dynsip.org|default@dynv6.com|default@easydns.com|default@freedns.afraid.org|default@gira.de|default@ipv4.dynv6.com|default@loopia.com|default@no-ip.com|default@ovh.com|default@sitelutions.com|default@spdyn.de|default@strato.com|default@tunnelbroker.net|default@tzo.com|default@zerigo.com|default@zoneedit.com|dyndns@3322.org|dyndns@he.net|ipv4@nsupdate.info" />
+      <setting id="inadyn_u" label="30002" type="text" visible="!eq(-1,inadyn.conf)" />
+      <setting id="inadyn_p" label="30003" type="text" visible="!eq(-2,inadyn.conf)" option="hidden" />
+      <setting id="inadyn_a" label="30004" type="text" visible="!eq(-3,inadyn.conf)" />
+      <setting id="inadyn_s" label="30005" type="bool" visible="!eq(-4,inadyn.conf)" default="true"/>
     </category>
 </settings>