This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".
The branch, next has been updated via 035f1702efd0626ec0bb2c6e165600c0bb98ef0c (commit) via 339310f9f78493b4492fdee55007e4a4b34069a3 (commit) via 90ae7409ff9989c4870fd8fc541e3b7fd36732a6 (commit) via 469ec27c641a4f5c88cd283e18d29c4e9487a614 (commit) via 89a7b5b13cc29a96d661bd05beec5be63c25b9e6 (commit) via 87df4095ea4033dd5767e6b66cc29245b1cf930e (commit) via be9dbcb2c04a1fbf3ef28fec02b98723f99ef6d0 (commit) via ff6f02953662fac69250177bebdfdc8e1c571fea (commit) from d175e0b9d30ae78d59460a6891545589826dc628 (commit)
Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.
- Log ----------------------------------------------------------------- commit 035f1702efd0626ec0bb2c6e165600c0bb98ef0c Merge: d175e0b 339310f Author: Arne Fitzenreiter arne_f@ipfire.org Date: Sat Sep 3 16:05:55 2011 +0200
Merge commit 'origin/master' into next
-----------------------------------------------------------------------
Summary of changes: config/rootfiles/core/52/exclude | 1 + config/rootfiles/core/{50 => 52}/filelists/apache2 | 0 config/rootfiles/core/52/filelists/ethtool | 1 + config/rootfiles/core/52/filelists/files | 2 + config/rootfiles/core/52/update.sh | 2 + html/cgi-bin/ddns.cgi | 6 +++- lfs/ethtool | 8 ++-- src/scripts/setddns.pl | 30 ++++++++++++++++++++ 8 files changed, 45 insertions(+), 5 deletions(-) copy config/rootfiles/core/{50 => 52}/filelists/apache2 (100%) create mode 120000 config/rootfiles/core/52/filelists/ethtool
Difference in files: diff --git a/config/rootfiles/core/52/exclude b/config/rootfiles/core/52/exclude index ce199d8..bb0d8c8 100644 --- a/config/rootfiles/core/52/exclude +++ b/config/rootfiles/core/52/exclude @@ -1 +1,2 @@ srv/web/ipfire/html/proxy.pac +var/updatecache diff --git a/config/rootfiles/core/52/filelists/apache2 b/config/rootfiles/core/52/filelists/apache2 new file mode 120000 index 0000000..eef95ef --- /dev/null +++ b/config/rootfiles/core/52/filelists/apache2 @@ -0,0 +1 @@ +../../../common/apache2 \ No newline at end of file diff --git a/config/rootfiles/core/52/filelists/ethtool b/config/rootfiles/core/52/filelists/ethtool new file mode 120000 index 0000000..494a53e --- /dev/null +++ b/config/rootfiles/core/52/filelists/ethtool @@ -0,0 +1 @@ +../../../common/ethtool \ No newline at end of file diff --git a/config/rootfiles/core/52/filelists/files b/config/rootfiles/core/52/filelists/files index dca50be..331514d 100644 --- a/config/rootfiles/core/52/filelists/files +++ b/config/rootfiles/core/52/filelists/files @@ -2,3 +2,5 @@ etc/system-release var/ipfire/langs/ etc/rc.d/init.d/console usr/local/sbin/setup +usr/local/bin/setddns.pl +srv/web/ipfire/cgi-bin/ddns.cgi diff --git a/config/rootfiles/core/52/update.sh b/config/rootfiles/core/52/update.sh index 16e8368..1e2f61e 100644 --- a/config/rootfiles/core/52/update.sh +++ b/config/rootfiles/core/52/update.sh @@ -34,6 +34,7 @@ done
# #Stop services +/etc/init.d/apache stop
# #Extract files @@ -41,6 +42,7 @@ extract_files
# #Start services +/etc/init.d/apache start
# #Update Language cache diff --git a/html/cgi-bin/ddns.cgi b/html/cgi-bin/ddns.cgi index f7ae568..4453542 100644 --- a/html/cgi-bin/ddns.cgi +++ b/html/cgi-bin/ddns.cgi @@ -139,11 +139,13 @@ if ($settings{'ACTION'} eq $Lang::tr{'add'}) { } # Permit an empty HOSTNAME for the nsupdate, regfish, dyndns, enom, ovh, zoneedit, no-ip, easydns + #and namecheap unless ($settings{'SERVICE'} eq 'zoneedit.com' || $settings{'SERVICE'} eq 'nsupdate' || $settings{'SERVICE'} eq 'dyndns-custom'|| $settings{'SERVICE'} eq 'regfish.com' || $settings{'SERVICE'} eq 'enom.com' || $settings{'SERVICE'} eq 'dnspark.com' || $settings{'SERVICE'} eq 'ovh.com' || $settings{'HOSTNAME'} ne '' || - $settings{'SERVICE'} eq 'no-ip.com' || $settings{'SERVICE'} eq 'easydns.com' ) { + $settings{'SERVICE'} eq 'no-ip.com' || $settings{'SERVICE'} eq 'easydns.com' || + $settings{'SERVICE'} eq 'namecheap.com' ) { $errormessage = $Lang::tr{'hostname not set'}; } unless ($settings{'HOSTNAME'} eq '' || $settings{'HOSTNAME'} =~ /^[a-zA-Z_0-9-]+$/) { @@ -243,6 +245,7 @@ $checked{'SERVICE'}{'easydns.com'} = ''; $checked{'SERVICE'}{'enom.com'} = ''; $checked{'SERVICE'}{'freedns.afraid.org'} = ''; $checked{'SERVICE'}{'hn.org'} = ''; +$checked{'SERVICE'}{'namecheap.com'} = ''; $checked{'SERVICE'}{'no-ip.com'} = ''; $checked{'SERVICE'}{'nsupdate'} = ''; $checked{'SERVICE'}{'ovh.com'} = ''; @@ -336,6 +339,7 @@ print <<END <option $checked{'SERVICE'}{'enom.com'}>enom.com</option> <option $checked{'SERVICE'}{'freedns.afraid.org'}>freedns.afraid.org</option> <option $checked{'SERVICE'}{'hn.org'}>hn.org</option> + <option $checked{'SERVICE'}{'namecheap.com'}>namecheap.com</option> <option $checked{'SERVICE'}{'no-ip.com'}>no-ip.com</option> <option $checked{'SERVICE'}{'nsupdate'}>nsupdate</option> <option $checked{'SERVICE'}{'ovh.com'}>ovh.com</option> diff --git a/lfs/ethtool b/lfs/ethtool index 00b4a13..15f0419 100644 --- a/lfs/ethtool +++ b/lfs/ethtool @@ -24,10 +24,10 @@
include Config
-VER = 3 +VER = 3.0
THISAPP = ethtool-$(VER) -DL_FILE = $(THISAPP).tar.gz +DL_FILE = $(THISAPP).tar.bz2 DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) @@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = b4e71f7fa2629250677eefcb338442c5 +$(DL_FILE)_MD5 = cb129398cbbf39859901b55ecac101da
install : $(TARGET)
@@ -69,7 +69,7 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && ./configure --prefix=/usr cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install diff --git a/src/scripts/setddns.pl b/src/scripts/setddns.pl index 2c7c947..f66b841 100644 --- a/src/scripts/setddns.pl +++ b/src/scripts/setddns.pl @@ -515,6 +515,36 @@ if ($ip ne $ipcache) { &General::log("Dynamic DNS ip-update for $settings{'HOSTDOMAIN'} : failure (could not connect to server)"); } } + #namecheap test + elsif ($settings{'SERVICE'} eq 'namecheap') { + # use proxy ? + my %proxysettings; + &General::readhash("${General::swroot}/proxy/settings", %proxysettings); + if ($_=$proxysettings{'UPSTREAM_PROXY'}) { + my ($peer, $peerport) = (/^(?:[a-zA-Z ]+://)?(?:[A-Za-z0-9_.-]*?(?::[A-Za-z0-9_.-]*?)?@)?([a-zA-Z0-9._-]*?)(?::([0-9]{1,5}))?(?:/.*?)?$/); + Net::SSLeay::set_proxy($peer,$peerport,$proxysettings{'UPSTREAM_USER'},$proxysettings{'UPSTREAM_PASSWORD'} ); + } + + my ($out, $response) = Net::SSLeay::get_https( 'dynamicdns.park-your-domain.com', + 443, + "/update?host=$settings{'HOSTNAME'}&domain=$settings{'DOMAIN'}&password=$settings{'PASSWORD'}&ip=$ip", + Net::SSLeay::make_headers('User-Agent' => 'IPFire' ) + ); + #Valid responses from service are: + # wait confirmation!! + if ($response =~ m%HTTP/1.. 200 OK%) { + if ( $out !~ m/<ErrCount>0</ErrCount>/ ) { + $out =~ m/<Err1>(.*)</Err1>/; + &General::log("Dynamic DNS ip-update for $settings{'HOSTNAME'}.$settings{'DOMAIN'} : failure ($1)"); + } else { + &General::log("Dynamic DNS ip-update for $settings{'HOSTNAME'}.$settings{'DOMAIN'} : success"); + $success++; + } + } else { + &General::log("Dynamic DNS ip-update for $settings{'HOSTNAME'}.$settings{'DOMAIN'} : failure (could not connect to server)"); + } + } + #end namecheap test elsif ($settings{'SERVICE'} eq 'dynu') { # use proxy ? my %proxysettings;
hooks/post-receive -- IPFire 2.x development tree