[git.ipfire.org] IPFire 2.x development tree branch, master, updated. 06dbe99dbb1c37de8fc94b6f2dc6e53ef1d7d022

[git.ipfire.org] IPFire 2.x development tree branch, master, updated. 06dbe99dbb1c37de8fc94b6f2dc6e53ef1d7d022

[git]

[-- Attachment #1: Type: text/plain, Size: 3505 bytes --]

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, master has been updated
       via  06dbe99dbb1c37de8fc94b6f2dc6e53ef1d7d022 (commit)
       via  1f080b34bac4fbaa88d2b460ece53d460fff6ec5 (commit)
      from  5fe185f83c98d86cdbca470ecbea5c1365cae3f9 (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 06dbe99dbb1c37de8fc94b6f2dc6e53ef1d7d022
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Mon Aug 4 19:39:16 2014 +0200

    tor: Update to 0.2.4.23
    
    http://www.heise.de/security/meldung/Erfolgreicher-Angriff-auf-Tor-Anonymisierung-2278774.html

commit 1f080b34bac4fbaa88d2b460ece53d460fff6ec5
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date:   Thu Jul 31 21:45:38 2014 +0200

    ddns.cgi: Check for valid FQDN before doing nslookup.
    
    We now check if the used hostname is a valid FQDN before doing the nslookup to
    determine if a DDNS host is up do date.

-----------------------------------------------------------------------

Summary of changes:
 html/cgi-bin/ddns.cgi | 19 +++++++++++++++++--
 lfs/tor               |  6 +++---
 2 files changed, 20 insertions(+), 5 deletions(-)

Difference in files:
diff --git a/html/cgi-bin/ddns.cgi b/html/cgi-bin/ddns.cgi
index 3072a8b..65e3bee 100644
--- a/html/cgi-bin/ddns.cgi
+++ b/html/cgi-bin/ddns.cgi
@@ -507,17 +507,32 @@ END
 		chomp(@current);
 		my @temp = split(/\,/,$line);
 
+		# Handle hostname details. Only connect the values with a dott if both are available.
+		my $hostname="";
+
+		if (($temp[1]) && ($temp[2])) {
+			$hostname="$temp[1].$temp[2]";
+		} else {
+			$hostname="$temp[1]";
+		}
+
 		# Generate value for enable/disable checkbox.
-		my $sync = "<font color='blue'>";
+		my $sync = '';
 		my $gif = '';
 		my $gdesc = '';
 
 		if ($temp[7] eq "on") {
 			$gif = 'on.gif';
 			$gdesc = $Lang::tr{'click to disable'};
-			$sync = (&General::DyndnsServiceSync ($ip,$temp[1], $temp[2]) ? "<font color='green'>": "<font color='red'>") ;
+
+			# Check if the given hostname is a FQDN before doing a nslookup.
+			if (&General::validfqdn($hostname)) {
+				$sync = (&General::DyndnsServiceSync ($ip,$temp[1], $temp[2]) ? "<font color='green'>": "<font color='red'>") ;
+			}
+
 			$toggle_enabled = 'off';
 		} else {
+			$sync = "<font color='blue'>";
 			$gif = 'off.gif';
 			$gdesc = $Lang::tr{'click to enable'};
 			$toggle_enabled = 'on';
diff --git a/lfs/tor b/lfs/tor
index 6f9e502..0cc2957 100644
--- a/lfs/tor
+++ b/lfs/tor
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 0.2.4.22
+VER        = 0.2.4.23
 
 THISAPP    = tor-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = tor
-PAK_VER    = 7
+PAK_VER    = 8
 
 DEPS       = "libevent2"
 
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 5a7eee0d9df87233255d78b25c6f8270
+$(DL_FILE)_MD5 = 9e39928e310612c3bffee727f554c63f
 
 install : $(TARGET)
 


hooks/post-receive
--
IPFire 2.x development tree