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 d9949d4dd18789f18c21867cc3b7c6bbe3ba2801 (commit) via f64c99631116407320ea362121b3698c60c3a40c (commit) via c6137209a4fa72de7ea13be0c0713bddf57c0f38 (commit) via 8e0d8bfd4d61656bec48a63d7a9263aed8f0da94 (commit) via e122dd636659d9e97dcd0441717955de04a737b6 (commit) via 53f7ba12e8d0ba9f9c72e075b4a9e4e5c4a4ac00 (commit) via 4245fe34792cb67b1fe4b073e3b4d71014c3b277 (commit) via ae666bf128e8660512a6fe0a12eda22c4b126446 (commit) via b31af08582737abd3913809bdf38147b6316973a (commit) via e7c69924fc9f4af89567024ad51b87323c1a6bf3 (commit) via cd010e09a321ab562ff45da1b27e521da160c71f (commit) via ae650f95188e206cd3e3cbca5445f3ed074cb66f (commit) via 7586640395d996dcad45a6d33e22b57d41fd82b6 (commit) via 26cce22da0ffd9b861e6734e943238bc9a2b512c (commit) via 9e4945393d205da3f1a599651c6e94cbce386ecd (commit) via 0006d11060177a506c675f18c4678e0b7f82c3a9 (commit) via 8505f1ff4c743b98f4e72c0275f60ddaa06627f9 (commit) via 3387469bdb06af775d8708db7a743c95d3d2ca27 (commit) via 529ac19c466e3c1c079d6c8d73d21c3016edae59 (commit) via 67df3c3f1c3dc12d4238c617d91bb6622024efa2 (commit) via c83e7d5f81c1a86f156355ad4e04f73b94308452 (commit) from 2b1ff41196a0b9ac6794904427416eb05506f13d (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 d9949d4dd18789f18c21867cc3b7c6bbe3ba2801 Merge: 2b1ff41 f64c996 Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Sep 14 14:37:18 2013 +0200
Merge remote-tracking branch 'earl/tor' into next
Conflicts: lfs/tor
commit f64c99631116407320ea362121b3698c60c3a40c Author: Jan Paul Tuecking earl@ipfire.org Date: Fri Sep 13 15:17:25 2013 +0200
tor: changed rootfiles due to tor update
commit c6137209a4fa72de7ea13be0c0713bddf57c0f38 Author: Jan Paul Tuecking earl@ipfire.org Date: Thu Sep 12 21:36:06 2013 +0200
tor: update to 0.2.4.17-rc
commit 8e0d8bfd4d61656bec48a63d7a9263aed8f0da94 Author: Jan Paul Tuecking earl@ipfire.org Date: Sat Sep 7 14:55:55 2013 +0200
tor: added new strings for directory port
commit e122dd636659d9e97dcd0441717955de04a737b6 Author: Jan Paul Tuecking earl@ipfire.org Date: Sat Sep 7 14:52:02 2013 +0200
tor: changed init script due to directory port option
commit 53f7ba12e8d0ba9f9c72e075b4a9e4e5c4a4ac00 Author: Jan Paul Tuecking earl@ipfire.org Date: Sat Sep 7 14:50:06 2013 +0200
tor: increased pakfire version
commit 4245fe34792cb67b1fe4b073e3b4d71014c3b277 Author: Jan Paul Tuecking earl@ipfire.org Date: Sat Sep 7 14:47:28 2013 +0200
tor: added directory port to tor.cgi
commit ae666bf128e8660512a6fe0a12eda22c4b126446 Author: Jan Paul Tuecking earl@ipfire.org Date: Fri Sep 6 22:05:10 2013 +0200
tor: fixed display of not founded country flags in tor.cgi
commit b31af08582737abd3913809bdf38147b6316973a Author: Jan Paul Tuecking earl@ipfire.org Date: Fri Sep 6 22:01:21 2013 +0200
tor: valid client names are max. 19 characters long changed that in tor.cgi
commit e7c69924fc9f4af89567024ad51b87323c1a6bf3 Merge: cd4a822 cd010e0 Author: Jan Paul Tuecking earl@ipfire.org Date: Fri Sep 6 21:57:51 2013 +0200
Merge branch 'master' into tor
Conflicts: langs/de/cgi-bin/de.pl lfs/tor
-----------------------------------------------------------------------
Summary of changes: config/rootfiles/packages/tor | 3 ++- html/cgi-bin/tor.cgi | 22 ++++++++++++++++++++-- langs/de/cgi-bin/de.pl | 5 ++++- langs/en/cgi-bin/en.pl | 3 +++ lfs/tor | 6 +++--- src/initscripts/init.d/tor | 4 ++++ 6 files changed, 36 insertions(+), 7 deletions(-)
Difference in files: diff --git a/config/rootfiles/packages/tor b/config/rootfiles/packages/tor index 58de7da..f9c657c 100644 --- a/config/rootfiles/packages/tor +++ b/config/rootfiles/packages/tor @@ -5,7 +5,7 @@ etc/rc.d/rc0.d/K40tor etc/rc.d/rc3.d/S60tor etc/rc.d/rc6.d/K40tor #etc/tor -etc/tor/tor-tsocks.conf +#etc/tor/tor-tsocks.conf etc/tor/torrc srv/web/ipfire/cgi-bin/tor.cgi usr/bin/tor @@ -25,6 +25,7 @@ usr/local/bin/torctrl usr/share/tor usr/share/tor/defaults-torrc usr/share/tor/geoip +usr/share/tor/geoip6 var/ipfire/backup/addons/includes/tor var/ipfire/menu.d/EX-tor.menu var/ipfire/tor diff --git a/html/cgi-bin/tor.cgi b/html/cgi-bin/tor.cgi index b920724..befd508 100755 --- a/html/cgi-bin/tor.cgi +++ b/html/cgi-bin/tor.cgi @@ -108,6 +108,7 @@ $settings{'TOR_RELAY_ENABLED'} = 'off'; $settings{'TOR_RELAY_MODE'} = 'exit'; $settings{'TOR_RELAY_ADDRESS'} = ''; $settings{'TOR_RELAY_PORT'} = 9001; +$settings{'TOR_RELAY_DIRPORT'} = 0; $settings{'TOR_RELAY_NICKNAME'} = ''; $settings{'TOR_RELAY_CONTACT_INFO'} = ''; $settings{'TOR_RELAY_BANDWIDTH_RATE'} = 0; @@ -143,6 +144,11 @@ if ($settings{'ACTION'} eq $Lang::tr{'save'}) { if (!&General::validport($settings{'TOR_RELAY_PORT'})) { $errormessage = "$Lang::tr{'tor errmsg invalid relay port'}: $settings{'TOR_RELAY_PORT'}"; } + if ($settings{'TOR_RELAY_DIRPORT'} ne '0') { + if (!&General::validport($settings{'TOR_RELAY_DIRPORT'})) { + $errormessage = "$Lang::tr{'tor errmsg invalid directory port'}: $settings{'TOR_RELAY_DIRPORT'}"; + } + }
if ($settings{'TOR_RELAY_ADDRESS'} ne '') { if ((!&General::validfqdn($settings{'TOR_RELAY_ADDRESS'})) && (!&General::validip($settings{'TOR_RELAY_ADDRESS'}))) { @@ -382,7 +388,7 @@ END </td> <td width='25%' class='base'>$Lang::tr{'tor relay nickname'}: <img src='/blob.gif' alt='*' /></td> <td width='20%'> - <input type='text' name='TOR_RELAY_NICKNAME' value='$settings{'TOR_RELAY_NICKNAME'}' /> + <input type='text' name='TOR_RELAY_NICKNAME' value='$settings{'TOR_RELAY_NICKNAME'}' maxlength='19' /> </td> </tr> <tr> @@ -396,6 +402,14 @@ END </td> </tr> <tr> + <td width='25%'> </td> + <td width='30%'> </td> + <td width='25%' class='base'>$Lang::tr{'tor directory port'}:</td> + <td width='20%'> + <input type='text' name='TOR_RELAY_DIRPORT' value='$settings{'TOR_RELAY_DIRPORT'}' size='5' /> $Lang::tr{'tor 0 = disabled'} + </td> + </tr> + <tr> <td width='25%' class='base'>$Lang::tr{'tor contact info'}: <img src='/blob.gif' alt='*' /></td> <td width='75%' colspan='3'> <input type='text' name='TOR_RELAY_CONTACT_INFO' value='$settings{'TOR_RELAY_CONTACT_INFO'}' style='width: 98%;' /> @@ -607,7 +621,7 @@ END END
if (exists($node->{'country_code'})) { - if ($node->{'country_code'} eq '??') { + if (!$node->{'country_code'} or $node->{'country_code'} eq '??') { print "<img src='/images/flags/blank.png' border='0' align='absmiddle'/>"; } else { print "<a href='country.cgi#$node->{'country_code'}'><img src='/images/flags/$node->{'country_code'}.png' border='0' align='absmiddle' alt='$node->{'country_code'}'></a>"; @@ -683,6 +697,10 @@ sub BuildConfiguration() {
print FILE "ORPort $settings{'TOR_RELAY_PORT'}\n";
+ if ($settings{'TOR_RELAY_DIRPORT'} ne '0') { + print FILE "DirPort $settings{'TOR_RELAY_DIRPORT'}\n"; + } + if ($settings{'TOR_RELAY_ADDRESS'} ne '') { print FILE "Address $settings{'TOR_RELAY_ADDRESS'}\n"; } diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index 4e005e1..f9814d5 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -1798,6 +1798,7 @@ 'tone dial' => 'Tonwahl:', 'too long 80 char max' => ' ist zu lang, es sind maximal 80 Zeichen erlaubt', 'tor' => 'Tor', +'tor 0 = disabled' => '0 = deaktiviert', 'tor accounting' => 'Accounting', 'tor accounting bytes' => 'Traffic (empfangen/gesendet)', 'tor accounting bytes left' => 'übrig', @@ -1818,11 +1819,13 @@ 'tor connected relays' => 'Verbundene Relays', 'tor contact info' => 'Kontaktinformationen', 'tor daemon' => 'Daemon', +'tor directory port' => 'Directory-Port', 'tor enabled' => 'Tor einschalten', 'tor errmsg invalid accounting limit' => 'Ungültiges Accounting-Limit', +'tor errmsg invalid directory port' => 'Ungültiger Directory-Port', 'tor errmsg invalid ip or mask' => 'Ungültiges IP-Subnetz', 'tor errmsg invalid relay address' => 'Ungültige Relay-Adresse', -'tor errmsg invalid relay name' => 'Ungültiger Relay-Nickname.', +'tor errmsg invalid relay name' => 'Ungültiger Relay-Nickname', 'tor errmsg invalid relay port' => 'Ungültiger Relay-Port', 'tor errmsg invalid socks port' => 'Ungültiger SOCKS-Port', 'tor exit country' => 'Exit-Land', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index ba80985..1c50296 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -1832,6 +1832,7 @@ 'tone dial' => 'Tone dial:', 'too long 80 char max' => ' is too long, maximum allowed is 80 characters', 'tor' => 'Tor', +'tor 0 = disabled' => '0 = disabled', 'tor accounting' => 'Accounting', 'tor accounting bytes' => 'Traffic (read/written)', 'tor accounting bytes left' => 'left', @@ -1853,8 +1854,10 @@ 'tor connected relays' => 'Connected relays', 'tor contact info' => 'Contact Info', 'tor daemon' => 'Daemon', +'tor directory port' => 'Directory port', 'tor enabled' => 'Enable Tor', 'tor errmsg invalid accounting limit' => 'Invalid accounting limit', +'tor errmsg invalid directory port' => 'Invalid directory port', 'tor errmsg invalid ip or mask' => 'Invalid IP subnet', 'tor errmsg invalid node id' => 'Invalid node ID', 'tor errmsg invalid relay address' => 'Invalid relay address', diff --git a/lfs/tor b/lfs/tor index 6161a56..795f7c3 100644 --- a/lfs/tor +++ b/lfs/tor @@ -24,7 +24,7 @@
include Config
-VER = 0.2.3.25 +VER = 0.2.4.17-rc
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 = 3 +PAK_VER = 4
DEPS = "libevent2"
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = a1c364189a9a66ed9daa8e6436489daf +$(DL_FILE)_MD5 = 2cdfb8dcc3306a43cf465a858bf97b2d
install : $(TARGET)
diff --git a/src/initscripts/init.d/tor b/src/initscripts/init.d/tor index d631e86..9c1dfc7 100644 --- a/src/initscripts/init.d/tor +++ b/src/initscripts/init.d/tor @@ -22,6 +22,10 @@ function setup_firewall() { if [ "${TOR_RELAY_ENABLED}" = "on" -a -n "${TOR_RELAY_PORT}" ]; then iptables -A TOR_INPUT -p tcp --dport "${TOR_RELAY_PORT}" -j ACCEPT fi + + if [ "${TOR_RELAY_ENABLED}" = "on" -a -n "${TOR_RELAY_DIRPORT}" ] && [ "${TOR_RELAY_DIRPORT}" -ne 0 ]; then + iptables -A TOR_INPUT -p tcp --dport "${TOR_RELAY_DIRPORT}" -j ACCEPT + fi }
function flush_firewall() {
hooks/post-receive -- IPFire 2.x development tree