Menu
▾
▴
[Astlinux-commits] SF.net SVN: astlinux:[7511] branches/1.0
|
From: <abe...@us...> - 2016-02-09 19:15:18
|
Revision: 7511
http://sourceforge.net/p/astlinux/code/7511
Author: abelbeck
Date: 2016-02-09 19:15:16 +0000 (Tue, 09 Feb 2016)
Log Message:
-----------
add ddclient package, no longer use inadyn package
Modified Paths:
--------------
branches/1.0/astlinux-ast11.config
branches/1.0/astlinux-ast13.config
branches/1.0/astlinux18.config
branches/1.0/initrd.config
branches/1.0/package/Config.in
branches/1.0/package/inadyn/Config.in
branches/1.0/package/webinterface/altweb/admin/network.php
branches/1.0/package/webinterface/altweb/common/functions.php
branches/1.0/package/webinterface/altweb/common/version.php
branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf
branches/1.0/runnix-iso.config
branches/1.0/runnix.config
branches/1.0/x86_64-configs/astlinux-ast11.config
branches/1.0/x86_64-configs/astlinux-ast13.config
branches/1.0/x86_64-configs/astlinux18.config
branches/1.0/x86_64-configs/initrd.config
Added Paths:
-----------
branches/1.0/package/ddclient/
branches/1.0/package/ddclient/Config.in
branches/1.0/package/ddclient/ddclient-01-bang-perl-cleanup.patch
branches/1.0/package/ddclient/ddclient-05-zoneedit-error-result-fix.patch
branches/1.0/package/ddclient/ddclient-10-curl-ssl.patch
branches/1.0/package/ddclient/ddclient.conf
branches/1.0/package/ddclient/ddclient.mk
branches/1.0/package/ddclient/dynamicdns.init
Modified: branches/1.0/astlinux-ast11.config
===================================================================
--- branches/1.0/astlinux-ast11.config 2016-02-09 03:40:20 UTC (rev 7510)
+++ branches/1.0/astlinux-ast11.config 2016-02-09 19:15:16 UTC (rev 7511)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn7287-dirty Configuration
-# Tue Oct 27 17:37:38 2015
+# Buildroot 2011.08-svn7510-dirty Configuration
+# Tue Feb 9 12:36:48 2016
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -690,6 +690,7 @@
# BR2_PACKAGE_CTORRENT is not set
# BR2_PACKAGE_CUPS is not set
BR2_PACKAGE_DARKSTAT=y
+BR2_PACKAGE_DDCLIENT=y
BR2_PACKAGE_DHCPDUMP=y
# BR2_PACKAGE_DIBBLER is not set
BR2_PACKAGE_DNSCRYPT_PROXY=y
@@ -704,7 +705,6 @@
# BR2_PACKAGE_HOSTAPD is not set
# BR2_PACKAGE_IFPLUGD is not set
BR2_PACKAGE_IFTOP=y
-BR2_PACKAGE_INADYN=y
BR2_PACKAGE_IPERF=y
BR2_PACKAGE_IPERF3=y
BR2_PACKAGE_IPROUTE2=y
Modified: branches/1.0/astlinux-ast13.config
===================================================================
--- branches/1.0/astlinux-ast13.config 2016-02-09 03:40:20 UTC (rev 7510)
+++ branches/1.0/astlinux-ast13.config 2016-02-09 19:15:16 UTC (rev 7511)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn7287-dirty Configuration
-# Tue Oct 27 17:37:39 2015
+# Buildroot 2011.08-svn7510-dirty Configuration
+# Tue Feb 9 12:36:51 2016
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -690,6 +690,7 @@
# BR2_PACKAGE_CTORRENT is not set
# BR2_PACKAGE_CUPS is not set
BR2_PACKAGE_DARKSTAT=y
+BR2_PACKAGE_DDCLIENT=y
BR2_PACKAGE_DHCPDUMP=y
# BR2_PACKAGE_DIBBLER is not set
BR2_PACKAGE_DNSCRYPT_PROXY=y
@@ -704,7 +705,6 @@
# BR2_PACKAGE_HOSTAPD is not set
# BR2_PACKAGE_IFPLUGD is not set
BR2_PACKAGE_IFTOP=y
-BR2_PACKAGE_INADYN=y
BR2_PACKAGE_IPERF=y
BR2_PACKAGE_IPERF3=y
BR2_PACKAGE_IPROUTE2=y
Modified: branches/1.0/astlinux18.config
===================================================================
--- branches/1.0/astlinux18.config 2016-02-09 03:40:20 UTC (rev 7510)
+++ branches/1.0/astlinux18.config 2016-02-09 19:15:16 UTC (rev 7511)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn7287-dirty Configuration
-# Tue Oct 27 17:37:36 2015
+# Buildroot 2011.08-svn7510-dirty Configuration
+# Tue Feb 9 12:36:45 2016
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -690,6 +690,7 @@
# BR2_PACKAGE_CTORRENT is not set
# BR2_PACKAGE_CUPS is not set
BR2_PACKAGE_DARKSTAT=y
+BR2_PACKAGE_DDCLIENT=y
BR2_PACKAGE_DHCPDUMP=y
# BR2_PACKAGE_DIBBLER is not set
BR2_PACKAGE_DNSCRYPT_PROXY=y
@@ -704,7 +705,6 @@
# BR2_PACKAGE_HOSTAPD is not set
# BR2_PACKAGE_IFPLUGD is not set
BR2_PACKAGE_IFTOP=y
-BR2_PACKAGE_INADYN=y
BR2_PACKAGE_IPERF=y
BR2_PACKAGE_IPERF3=y
BR2_PACKAGE_IPROUTE2=y
Modified: branches/1.0/initrd.config
===================================================================
--- branches/1.0/initrd.config 2016-02-09 03:40:20 UTC (rev 7510)
+++ branches/1.0/initrd.config 2016-02-09 19:15:16 UTC (rev 7511)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn7287-dirty Configuration
-# Tue Oct 27 17:37:43 2015
+# Buildroot 2011.08-svn7510-dirty Configuration
+# Tue Feb 9 12:36:57 2016
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -570,6 +570,7 @@
# BR2_PACKAGE_CTORRENT is not set
# BR2_PACKAGE_CUPS is not set
# BR2_PACKAGE_DARKSTAT is not set
+# BR2_PACKAGE_DDCLIENT is not set
# BR2_PACKAGE_DHCPDUMP is not set
# BR2_PACKAGE_DIBBLER is not set
# BR2_PACKAGE_DNSCRYPT_PROXY is not set
Modified: branches/1.0/package/Config.in
===================================================================
--- branches/1.0/package/Config.in 2016-02-09 03:40:20 UTC (rev 7510)
+++ branches/1.0/package/Config.in 2016-02-09 19:15:16 UTC (rev 7511)
@@ -457,6 +457,7 @@
source "package/ctorrent/Config.in"
source "package/cups/Config.in"
source "package/darkstat/Config.in"
+source "package/ddclient/Config.in"
if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
source "package/dhcp/Config.in"
endif
Added: branches/1.0/package/ddclient/Config.in
===================================================================
--- branches/1.0/package/ddclient/Config.in (rev 0)
+++ branches/1.0/package/ddclient/Config.in 2016-02-09 19:15:16 UTC (rev 7511)
@@ -0,0 +1,12 @@
+config BR2_PACKAGE_DDCLIENT
+ bool "ddclient"
+ select BR2_PACKAGE_PERL
+ select BR2_PACKAGE_LIBCURL
+ select BR2_PACKAGE_CURL
+ default n
+ help
+ DDclient is a Perl client used to update dynamic DNS entries for
+ accounts on a Dynamic DNS Network Service Provider.
+
+ http://sourceforge.net/projects/ddclient/
+
Added: branches/1.0/package/ddclient/ddclient-01-bang-perl-cleanup.patch
===================================================================
--- branches/1.0/package/ddclient/ddclient-01-bang-perl-cleanup.patch (rev 0)
+++ branches/1.0/package/ddclient/ddclient-01-bang-perl-cleanup.patch 2016-02-09 19:15:16 UTC (rev 7511)
@@ -0,0 +1,6 @@
+--- ddclient-3.8.3/ddclient.orig 2014-05-09 18:07:36.000000000 -0500
++++ ddclient-3.8.3/ddclient 2014-05-09 18:04:23.000000000 -0500
+@@ -1,3 +1,2 @@
+ #!/usr/bin/perl -w
+-#!/usr/local/bin/perl -w
+ ######################################################################
Added: branches/1.0/package/ddclient/ddclient-05-zoneedit-error-result-fix.patch
===================================================================
--- branches/1.0/package/ddclient/ddclient-05-zoneedit-error-result-fix.patch (rev 0)
+++ branches/1.0/package/ddclient/ddclient-05-zoneedit-error-result-fix.patch 2016-02-09 19:15:16 UTC (rev 7511)
@@ -0,0 +1,11 @@
+--- ddclient-3.8.3/ddclient.orig 2014-05-09 18:07:36.000000000 -0500
++++ ddclient-3.8.3/ddclient 2014-05-09 18:04:23.000000000 -0500
+@@ -3072,7 +3072,7 @@
+ $status_text = $var{'TEXT'} if exists $var{'TEXT'};
+ $status_ip = $var{'IP'} if exists $var{'IP'};
+
+- if ($status eq 'SUCCESS' || ($status eq 'ERROR' && $var{'CODE'} eq '707')) {
++ if ($status eq 'SUCCESS' || ($status eq 'ERROR' && ($var{'CODE'} eq '707' || $var{'CODE'} eq '702'))) {
+ $config{$h}{'ip'} = $status_ip;
+ $config{$h}{'mtime'} = $now;
+ $config{$h}{'status'} = 'good';
Added: branches/1.0/package/ddclient/ddclient-10-curl-ssl.patch
===================================================================
--- branches/1.0/package/ddclient/ddclient-10-curl-ssl.patch (rev 0)
+++ branches/1.0/package/ddclient/ddclient-10-curl-ssl.patch 2016-02-09 19:15:16 UTC (rev 7511)
@@ -0,0 +1,38 @@
+--- ddclient-3.8.3/ddclient.orig 2014-05-09 18:00:02.000000000 -0500
++++ ddclient-3.8.3/ddclient 2014-05-09 18:00:51.000000000 -0500
+@@ -1916,7 +1916,7 @@
+ if ( $force_ssl || ($globals{'ssl'} and (caller(1))[3] ne 'main::get_ip') ) {
+ $use_ssl = 1;
+ $default_port = 443;
+- load_ssl_support;
++ #load_ssl_support;
+ } else {
+ $use_ssl = 0;
+ $default_port = 80;
+@@ -1953,14 +1953,18 @@
+ debug("skipped network connection");
+ verbose("SENDING:", "%s", $request);
+ } elsif ($use_ssl) {
+- $sd = IO::Socket::SSL->new(
+- PeerAddr => $peer,
+- PeerPort => $port,
+- Proto => 'tcp',
+- MultiHomed => 1,
+- Timeout => opt('timeout'),
+- );
+- defined $sd or warning("cannot connect to $peer:$port socket: $@ " . IO::Socket::SSL::errstr());
++ $0 = sprintf("%s - curl sending to %s port %s", $program, $peer, $port);
++ my $timeout = opt('timeout');
++
++ $reply = <<`CURL_SSL`;
++/usr/bin/curl -ksi0 --user '${login}:${password}' --user-agent '${program}/${version}' \\
++ --connect-timeout $timeout --max-time $timeout \\
++ --url 'https://${server}/${url}' 2>/dev/null
++CURL_SSL
++
++ if (! $reply) {
++ warning("curl cannot connect to $peer:$port");
++ }
+ } else {
+ $sd = IO::Socket::INET->new(
+ PeerAddr => $peer,
Added: branches/1.0/package/ddclient/ddclient.conf
===================================================================
--- branches/1.0/package/ddclient/ddclient.conf (rev 0)
+++ branches/1.0/package/ddclient/ddclient.conf 2016-02-09 19:15:16 UTC (rev 7511)
@@ -0,0 +1,106 @@
+daemon=@DELAY@
+@USE_WEB@use=web, web=@WEB_STR@
+@USE_IF@use=if, if=@EXTIF@
+#@zoneedit@>
+#@zoneedit@>## ZoneEdit
+#@zoneedit@>ssl=yes
+#@zoneedit@>server=dynamic.zoneedit.com
+#@zoneedit@>protocol=zoneedit1
+#@zoneedit@>login=@DDUSER@
+#@zoneedit@>password=@DDPASS@
+#@zoneedit@>@DDHOST@
+#@dyndns@>
+#@dyndns@>## dyndns.org dynamic addresses
+#@dyndns@>server=members.dyndns.org
+#@dyndns@>protocol=dyndns2
+#@dyndns@>login=@DDUSER@
+#@dyndns@>password=@DDPASS@
+#@dyndns@>@DDHOST@
+#@dyndns-static@>
+#@dyndns-static@>## dyndns.org static addresses
+#@dyndns-static@>server=members.dyndns.org
+#@dyndns-static@>protocol=dyndns2
+#@dyndns-static@>login=@DDUSER@
+#@dyndns-static@>password=@DDPASS@
+#@dyndns-static@>static=yes, @DDHOST@
+#@dyndns-custom@>
+#@dyndns-custom@>## dyndns.org custom addresses
+#@dyndns-custom@>server=members.dyndns.org
+#@dyndns-custom@>protocol=dyndns2
+#@dyndns-custom@>login=@DDUSER@
+#@dyndns-custom@>password=@DDPASS@
+#@dyndns-custom@>custom=yes, @DDHOST@
+#@no-ip@>
+#@no-ip@>## No-IP
+#@no-ip@>server=dynupdate.no-ip.com
+#@no-ip@>protocol=noip
+#@no-ip@>login=@DDUSER@
+#@no-ip@>password=@DDPASS@
+#@no-ip@>@DDHOST@
+#@freedns@>
+#@freedns@>## FreeDNS
+#@freedns@>server=freedns.afraid.org
+#@freedns@>protocol=freedns
+#@freedns@>login=@DDUSER@
+#@freedns@>password=@DDPASS@
+#@freedns@>@DDHOST@
+#@dnsomatic@>
+#@dnsomatic@>## DNS-O-MATIC
+#@dnsomatic@>ssl=yes
+#@dnsomatic@>server=updates.dnsomatic.com
+#@dnsomatic@>protocol=dyndns2
+#@dnsomatic@>login=@DDUSER@
+#@dnsomatic@>password=@DDPASS@
+#@dnsomatic@>@DDHOST@
+#@pairnic@>
+#@pairnic@>## pairNIC
+#@pairnic@>ssl=yes
+#@pairnic@>server=dynamic.pairnic.com
+#@pairnic@>protocol=dyndns2
+#@pairnic@>login=@DDUSER@
+#@pairnic@>password=@DDPASS@
+#@pairnic@>@DDHOST@
+#@nsupdate-ipv4@>
+#@nsupdate-ipv4@>## nsupdate.info
+#@nsupdate-ipv4@>ssl=yes
+#@nsupdate-ipv4@>server=ipv4.nsupdate.info
+#@nsupdate-ipv4@>protocol=dyndns2
+#@nsupdate-ipv4@>login=@DDUSER@
+#@nsupdate-ipv4@>password=@DDPASS@
+#@nsupdate-ipv4@>@DDHOST@
+#@easydns@>
+#@easydns@>## EasyDNS
+#@easydns@>server=members.easydns.com
+#@easydns@>protocol=easydns
+#@easydns@>login=@DDUSER@
+#@easydns@>password=@DDPASS@
+#@easydns@>@DDHOST@
+#@dnspark@>
+#@dnspark@>## dnspark.com
+#@dnspark@>server=www.dnspark.com
+#@dnspark@>protocol=dnspark
+#@dnspark@>login=@DDUSER@
+#@dnspark@>password=@DDPASS@
+#@dnspark@>@DDHOST@
+#@namecheap@>
+#@namecheap@>## NameCheap
+#@namecheap@>server=dynamicdns.park-your-domain.com
+#@namecheap@>protocol=namecheap
+#@namecheap@>login=@DDUSER@
+#@namecheap@>password=@DDPASS@
+#@namecheap@>@DDHOST@
+#@changeip@>
+#@changeip@>## ChangeIP
+#@changeip@>server=nic.changeip.com
+#@changeip@>protocol=changeip
+#@changeip@>login=@DDUSER@
+#@changeip@>password=@DDPASS@
+#@changeip@>@DDHOST@
+#@dtdns@>
+#@dtdns@>## DtDNS
+#@dtdns@>server=www.dtdns.com
+#@dtdns@>protocol=dtdns
+#@dtdns@>client=ddclient
+#@dtdns@>password=@DDPASS@
+#@dtdns@>@DDHOST@
+
Added: branches/1.0/package/ddclient/ddclient.mk
===================================================================
--- branches/1.0/package/ddclient/ddclient.mk (rev 0)
+++ branches/1.0/package/ddclient/ddclient.mk 2016-02-09 19:15:16 UTC (rev 7511)
@@ -0,0 +1,23 @@
+#############################################################
+#
+# ddclient
+#
+#############################################################
+DDCLIENT_VERSION = 3.8.3
+DDCLIENT_SOURCE = ddclient-$(DDCLIENT_VERSION).tar.gz
+DDCLIENT_SITE = http://downloads.sourceforge.net/project/ddclient/ddclient/ddclient-$(DDCLIENT_VERSION)
+
+define DDCLIENT_INSTALL_TARGET_CMDS
+ $(INSTALL) -m 0755 -D package/ddclient/dynamicdns.init $(TARGET_DIR)/etc/init.d/dynamicdns
+ $(INSTALL) -m 0755 -D $(@D)/ddclient $(TARGET_DIR)/usr/sbin/ddclient
+ $(INSTALL) -m 0644 -D package/ddclient/ddclient.conf $(TARGET_DIR)/stat/etc/ddclient.conf
+ ln -sf /tmp/etc/ddclient.conf $(TARGET_DIR)/etc/ddclient.conf
+endef
+
+define DDCLIENT_UNINSTALL_TARGET_CMDS
+ rm -f $(TARGET_DIR)/etc/init.d/dynamicdns
+ rm -f $(TARGET_DIR)/usr/sbin/ddclient
+ rm -f $(TARGET_DIR)/stat/etc/ddclient.conf
+endef
+
+$(eval $(call GENTARGETS,package,ddclient))
Added: branches/1.0/package/ddclient/dynamicdns.init
===================================================================
--- branches/1.0/package/ddclient/dynamicdns.init (rev 0)
+++ branches/1.0/package/ddclient/dynamicdns.init 2016-02-09 19:15:16 UTC (rev 7511)
@@ -0,0 +1,130 @@
+#!/bin/sh
+
+. /etc/rc.conf
+
+gen_ddclient_conf()
+{
+ local use_web="" use_if="#" web_str delay service
+
+ if [ ! -x /usr/sbin/ddclient ]; then
+ echo "dynamicdns: Script \"/usr/sbin/ddclient\" not found, exiting." >&2
+ exit 1
+ fi
+
+ delay="360"
+
+ if [ -z "$DDGETIP" ]; then
+ web_str="myip.dnsomatic.com/"
+ elif [ "$DDGETIP" = "interface" ]; then
+ use_web="#"
+ use_if=""
+ web_str="$DDGETIP/"
+ delay="120"
+ elif [ "$DDGETIP" = "checkip.dyndns.org" -o "$DDGETIP" = "checkip.dyndns.com" ]; then
+ web_str="$DDGETIP/, web-skip='IP Address'"
+ else
+ web_str="$DDGETIP/"
+ fi
+
+ # Handle Service Types
+ case "$DDSERVICE" in
+ 'de...@zo...') service="zoneedit" ;;
+ 'dy...@dy...') service="dyndns" ;;
+ 'st...@dy...') service="dyndns-static" ;;
+ 'cu...@dy...') service="dyndns-custom" ;;
+ 'de...@no...') service="no-ip" ;;
+ 'de...@fr...') service="freedns" ;;
+ 'de...@dn...') service="dnsomatic" ;;
+ 'de...@pa...') service="pairnic" ;;
+ 'de...@ns...') service="nsupdate-ipv4" ;;
+ *) service="$(echo "$DDSERVICE" | tr -d '^$*[]|"')" ;; # sanitize for sed regex
+ esac
+
+ if [ -n "$DDUSER" -a -n "$DDPASS" -a -n "$DDHOST" ]; then
+
+ # Genearate /etc/ddclient.conf configuration file
+ if [ -f /mnt/kd/ddclient.conf ]; then
+ echo "# Autogenerated. Edit /mnt/kd/ddclient.conf file.
+" >/tmp/etc/ddclient.conf
+ cat /mnt/kd/ddclient.conf >>/tmp/etc/ddclient.conf
+ else
+ echo "# Autogenerated. Do not edit.
+# A manually generated ddclient config will use /mnt/kd/ddclient.conf if it exists.
+" >/tmp/etc/ddclient.conf
+ cat /stat/etc/ddclient.conf >>/tmp/etc/ddclient.conf
+ fi
+
+ sed -i -e "s|^#@${service}@>||" \
+ -e '/^#@/ d' \
+ /tmp/etc/ddclient.conf
+
+ sed -i -e "s|@DDUSER@|${DDUSER}|g" \
+ -e "s|@DDPASS@|${DDPASS}|g" \
+ -e "s|@DDHOST@|${DDHOST}|g" \
+ -e "s|@EXTIF@|${EXTIF}|g" \
+ -e "s|@EXT2IF@|${EXT2IF}|g" \
+ -e "s|@DELAY@|${delay}|g" \
+ -e "s|@USE_WEB@|${use_web}|g" \
+ -e "s|@USE_IF@|${use_if}|g" \
+ -e "s|@WEB_STR@|${web_str}|g" \
+ /tmp/etc/ddclient.conf
+
+ chmod 600 /tmp/etc/ddclient.conf
+ fi
+}
+
+init () {
+
+ if [ -f /tmp/etc/ddclient.conf ]; then
+ rm /tmp/etc/ddclient.conf
+ fi
+
+ if [ "$DDCLIENT" = "ddclient" -o "$DDCLIENT" = "inadyn" -o -z "$DDCLIENT" ]; then # unset default for backward compatibility
+ gen_ddclient_conf
+ fi
+}
+
+start () {
+
+ if [ -f /etc/ddclient.conf ]; then
+ echo "Starting dynamicdns (ddclient)..."
+ ddclient -syslog -file /etc/ddclient.conf -cache /var/db/ddclient.cache -pid /var/run/ddclient.pid
+ fi
+}
+
+stop () {
+
+ if [ -f /etc/ddclient.conf ]; then
+ if [ -f /var/run/ddclient.pid ]; then
+ echo "Stopping dynamicdns (ddclient)..."
+ kill $(cat /var/run/ddclient.pid) >/dev/null 2>&1
+ fi
+ fi
+}
+
+case $1 in
+
+start)
+ start
+ ;;
+
+stop)
+ stop
+ ;;
+
+init)
+ init
+ start
+ ;;
+
+restart)
+ stop
+ sleep 2
+ start
+ ;;
+
+*)
+ echo "Usage: start|stop|restart"
+ ;;
+
+esac
Property changes on: branches/1.0/package/ddclient/dynamicdns.init
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Modified: branches/1.0/package/inadyn/Config.in
===================================================================
--- branches/1.0/package/inadyn/Config.in 2016-02-09 03:40:20 UTC (rev 7510)
+++ branches/1.0/package/inadyn/Config.in 2016-02-09 19:15:16 UTC (rev 7511)
@@ -1,4 +1,5 @@
config BR2_PACKAGE_INADYN
+ depends on !BR2_PACKAGE_DDCLIENT
bool "inadyn"
default n
help
Modified: branches/1.0/package/webinterface/altweb/admin/network.php
===================================================================
--- branches/1.0/package/webinterface/altweb/admin/network.php 2016-02-09 03:40:20 UTC (rev 7510)
+++ branches/1.0/package/webinterface/altweb/admin/network.php 2016-02-09 19:15:16 UTC (rev 7511)
@@ -82,11 +82,16 @@
$select_dyndns = array (
'User Defined >>>' => '',
+ 'ChangeIP' => 'changeip',
'DNS-O-Matic' => 'de...@dn...',
+ 'DNS Park' => 'dnspark',
+ 'DtDNS' => 'dtdns',
'DynDNS' => 'dy...@dy...',
'DynDNS [custom]' => 'cu...@dy...',
'DynDNS [static]' => 'st...@dy...',
+ 'EasyDNS' => 'easydns',
'FreeDNS' => 'de...@fr...',
+ 'NameCheap' => 'namecheap',
'No-IP' => 'de...@no...',
'nsupdate.info' => 'de...@ns...',
'pairNIC' => 'de...@pa...',
@@ -1951,15 +1956,13 @@
putHtml('<strong>Dynamic DNS Update:</strong>');
if (($dd_client = getVARdef($db, 'DDCLIENT', $cur_db)) === '') {
if (getVARdef($db, 'DDUSER', $cur_db) !== '' && getVARdef($db, 'DDPASS', $cur_db) !== '') {
- $dd_client = 'inadyn';
+ $dd_client = 'ddclient';
}
}
putHtml('<select name="dd_client">');
putHtml('<option value="none">disabled</option>');
- $sel = ($dd_client === 'inadyn') ? ' selected="selected"' : '';
- putHtml('<option value="inadyn"'.$sel.'>inadyn</option>');
- $sel = ($dd_client === 'ddclient') ? ' selected="selected"' : '';
- putHtml('<option value="ddclient"'.$sel.'>ddclient</option>');
+ $sel = ($dd_client === 'ddclient' || $dd_client === 'inadyn') ? ' selected="selected"' : '';
+ putHtml('<option value="ddclient"'.$sel.'>enabled</option>');
putHtml('</select>');
putHtml('</td></tr>');
Modified: branches/1.0/package/webinterface/altweb/common/functions.php
===================================================================
--- branches/1.0/package/webinterface/altweb/common/functions.php 2016-02-09 03:40:20 UTC (rev 7510)
+++ branches/1.0/package/webinterface/altweb/common/functions.php 2016-02-09 19:15:16 UTC (rev 7511)
@@ -105,7 +105,7 @@
if ($process === 'asterisk' || $process === 'prosody' || $process === 'slapd' || $process === 'kamailio') {
$path .= $process.'/';
} elseif ($process === 'dynamicdns') {
- if (is_file($path.'ddclient.pid') || is_file($path.'inadyn.pid')) {
+ if (is_file($path.'ddclient.pid')) {
$str = $running;
} else {
$str = $stopped;
Modified: branches/1.0/package/webinterface/altweb/common/version.php
===================================================================
--- branches/1.0/package/webinterface/altweb/common/version.php 2016-02-09 03:40:20 UTC (rev 7510)
+++ branches/1.0/package/webinterface/altweb/common/version.php 2016-02-09 19:15:16 UTC (rev 7511)
@@ -1,6 +1,6 @@
<?php
// version.php for AstLinux Alternate Web Interface
-$GUI_VERSION = '1.8.35';
+$GUI_VERSION = '1.8.36';
?>
Modified: branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf 2016-02-09 03:40:20 UTC (rev 7510)
+++ branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf 2016-02-09 19:15:16 UTC (rev 7511)
@@ -200,9 +200,9 @@
#PPPOE_RESTART_DELAY=2
## Dynamic DNS Support
-## Both "inadyn" and "ddclient" clients are supported.
-## For a list of valid DDSERVICE names, see the ouput of "inadyn".
-#DDCLIENT="ddclient" # "none", "inadyn" or "ddclient", unset defaults to "inadyn" for backward compatibility
+## The "ddclient" client is supported.
+## For a list of valid DDSERVICE names, issue "ddclient -help".
+#DDCLIENT="ddclient" # "none", "ddclient", unset defaults to "ddclient" for backward compatibility
#DDSERVICE=
#DDUSER=
#DDPASS=
Modified: branches/1.0/runnix-iso.config
===================================================================
--- branches/1.0/runnix-iso.config 2016-02-09 03:40:20 UTC (rev 7510)
+++ branches/1.0/runnix-iso.config 2016-02-09 19:15:16 UTC (rev 7511)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn7496 Configuration
-# Mon Feb 1 17:42:11 2016
+# Buildroot 2011.08-svn7510-dirty Configuration
+# Tue Feb 9 12:37:09 2016
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -599,6 +599,7 @@
# BR2_PACKAGE_CTORRENT is not set
# BR2_PACKAGE_CUPS is not set
# BR2_PACKAGE_DARKSTAT is not set
+# BR2_PACKAGE_DDCLIENT is not set
# BR2_PACKAGE_DHCP is not set
# BR2_PACKAGE_DHCPDUMP is not set
# BR2_PACKAGE_DIBBLER is not set
Modified: branches/1.0/runnix.config
===================================================================
--- branches/1.0/runnix.config 2016-02-09 03:40:20 UTC (rev 7510)
+++ branches/1.0/runnix.config 2016-02-09 19:15:16 UTC (rev 7511)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn7287-dirty Configuration
-# Tue Oct 27 17:37:40 2015
+# Buildroot 2011.08-svn7510-dirty Configuration
+# Tue Feb 9 12:37:03 2016
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -600,6 +600,7 @@
# BR2_PACKAGE_CTORRENT is not set
# BR2_PACKAGE_CUPS is not set
# BR2_PACKAGE_DARKSTAT is not set
+# BR2_PACKAGE_DDCLIENT is not set
# BR2_PACKAGE_DHCP is not set
# BR2_PACKAGE_DHCPDUMP is not set
# BR2_PACKAGE_DIBBLER is not set
Modified: branches/1.0/x86_64-configs/astlinux-ast11.config
===================================================================
--- branches/1.0/x86_64-configs/astlinux-ast11.config 2016-02-09 03:40:20 UTC (rev 7510)
+++ branches/1.0/x86_64-configs/astlinux-ast11.config 2016-02-09 19:15:16 UTC (rev 7511)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn7342-dirty Configuration
-# Mon Nov 23 09:11:34 2015
+# Buildroot 2011.08-svn7510-dirty Configuration
+# Tue Feb 9 12:37:21 2016
#
BR2_HAVE_DOT_CONFIG=y
BR2_ARCH_IS_64=y
@@ -671,6 +671,7 @@
# BR2_PACKAGE_CTORRENT is not set
# BR2_PACKAGE_CUPS is not set
BR2_PACKAGE_DARKSTAT=y
+BR2_PACKAGE_DDCLIENT=y
BR2_PACKAGE_DHCPDUMP=y
# BR2_PACKAGE_DIBBLER is not set
BR2_PACKAGE_DNSCRYPT_PROXY=y
@@ -685,7 +686,6 @@
# BR2_PACKAGE_HOSTAPD is not set
# BR2_PACKAGE_IFPLUGD is not set
BR2_PACKAGE_IFTOP=y
-BR2_PACKAGE_INADYN=y
BR2_PACKAGE_IPERF=y
BR2_PACKAGE_IPERF3=y
BR2_PACKAGE_IPROUTE2=y
Modified: branches/1.0/x86_64-configs/astlinux-ast13.config
===================================================================
--- branches/1.0/x86_64-configs/astlinux-ast13.config 2016-02-09 03:40:20 UTC (rev 7510)
+++ branches/1.0/x86_64-configs/astlinux-ast13.config 2016-02-09 19:15:16 UTC (rev 7511)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn7342-dirty Configuration
-# Mon Nov 23 09:11:34 2015
+# Buildroot 2011.08-svn7510-dirty Configuration
+# Tue Feb 9 12:37:23 2016
#
BR2_HAVE_DOT_CONFIG=y
BR2_ARCH_IS_64=y
@@ -671,6 +671,7 @@
# BR2_PACKAGE_CTORRENT is not set
# BR2_PACKAGE_CUPS is not set
BR2_PACKAGE_DARKSTAT=y
+BR2_PACKAGE_DDCLIENT=y
BR2_PACKAGE_DHCPDUMP=y
# BR2_PACKAGE_DIBBLER is not set
BR2_PACKAGE_DNSCRYPT_PROXY=y
@@ -685,7 +686,6 @@
# BR2_PACKAGE_HOSTAPD is not set
# BR2_PACKAGE_IFPLUGD is not set
BR2_PACKAGE_IFTOP=y
-BR2_PACKAGE_INADYN=y
BR2_PACKAGE_IPERF=y
BR2_PACKAGE_IPERF3=y
BR2_PACKAGE_IPROUTE2=y
Modified: branches/1.0/x86_64-configs/astlinux18.config
===================================================================
--- branches/1.0/x86_64-configs/astlinux18.config 2016-02-09 03:40:20 UTC (rev 7510)
+++ branches/1.0/x86_64-configs/astlinux18.config 2016-02-09 19:15:16 UTC (rev 7511)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn7342-dirty Configuration
-# Mon Nov 23 09:11:34 2015
+# Buildroot 2011.08-svn7510-dirty Configuration
+# Tue Feb 9 12:37:14 2016
#
BR2_HAVE_DOT_CONFIG=y
BR2_ARCH_IS_64=y
@@ -671,6 +671,7 @@
# BR2_PACKAGE_CTORRENT is not set
# BR2_PACKAGE_CUPS is not set
BR2_PACKAGE_DARKSTAT=y
+BR2_PACKAGE_DDCLIENT=y
BR2_PACKAGE_DHCPDUMP=y
# BR2_PACKAGE_DIBBLER is not set
BR2_PACKAGE_DNSCRYPT_PROXY=y
@@ -685,7 +686,6 @@
# BR2_PACKAGE_HOSTAPD is not set
# BR2_PACKAGE_IFPLUGD is not set
BR2_PACKAGE_IFTOP=y
-BR2_PACKAGE_INADYN=y
BR2_PACKAGE_IPERF=y
BR2_PACKAGE_IPERF3=y
BR2_PACKAGE_IPROUTE2=y
Modified: branches/1.0/x86_64-configs/initrd.config
===================================================================
--- branches/1.0/x86_64-configs/initrd.config 2016-02-09 03:40:20 UTC (rev 7510)
+++ branches/1.0/x86_64-configs/initrd.config 2016-02-09 19:15:16 UTC (rev 7511)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn7339 Configuration
-# Sun Nov 22 15:51:12 2015
+# Buildroot 2011.08-svn7510-dirty Configuration
+# Tue Feb 9 12:37:26 2016
#
BR2_HAVE_DOT_CONFIG=y
BR2_ARCH_IS_64=y
@@ -551,6 +551,7 @@
# BR2_PACKAGE_CTORRENT is not set
# BR2_PACKAGE_CUPS is not set
# BR2_PACKAGE_DARKSTAT is not set
+# BR2_PACKAGE_DDCLIENT is not set
# BR2_PACKAGE_DHCPDUMP is not set
# BR2_PACKAGE_DIBBLER is not set
# BR2_PACKAGE_DNSCRYPT_PROXY is not set
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
