From: Arne Fitzenreiter Date: Sat, 3 Sep 2011 14:05:55 +0000 (+0200) Subject: Merge commit 'origin/master' into next X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=commitdiff_plain;h=035f1702efd0626ec0bb2c6e165600c0bb98ef0c;hp=d175e0b9d30ae78d59460a6891545589826dc628 Merge commit 'origin/master' into next --- diff --git a/config/rootfiles/core/52/exclude b/config/rootfiles/core/52/exclude index ce199d851..bb0d8c84b 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 000000000..eef95efa7 --- /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 000000000..494a53e9d --- /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 dca50befa..331514d94 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 16e8368e6..1e2f61e7f 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 f7ae56852..445354247 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 <enom.com + diff --git a/lfs/ethtool b/lfs/ethtool index 00b4a13e5..15f0419d8 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 2c7c947f5..f66b841d7 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/0<\/ErrCount>/ ) { + $out =~ m/(.*)<\/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;