From mboxrd@z Thu Jan  1 00:00:00 1970
From: Peter =?utf-8?q?M=C3=BCller?= <peter.mueller@ipfire.org>
To: development@lists.ipfire.org
Subject: [PATCH] Tor WebUI: drop relay bandwith options < 1 MBit/s
Date: Fri, 08 Mar 2019 19:17:00 +0000
Message-ID: <fa2ac44f-1b93-b4af-4c33-b49dfa4148b2@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1535569510692192625=="
List-Id: <development.lists.ipfire.org>

--===============1535569510692192625==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

Tor requires at least 1 MBit/s in order to participate.

Fixes #12001

Signed-off-by: Peter M=C3=BCller <peter.mueller(a)ipfire.org>
---
 html/cgi-bin/tor.cgi | 11 ++++-------
 lfs/tor              |  2 +-
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/html/cgi-bin/tor.cgi b/html/cgi-bin/tor.cgi
index b17db01a2..71da66666 100644
--- a/html/cgi-bin/tor.cgi
+++ b/html/cgi-bin/tor.cgi
@@ -2,7 +2,7 @@
 ############################################################################=
###
 #                                                                           =
  #
 # IPFire.org - A linux based firewall                                       =
  #
-# Copyright (C) 2013  IPFire Team  <info(a)ipfire.org>                      =
    #
+# Copyright (C) 2013-2019  IPFire Team  <info(a)ipfire.org>                 =
    #
 #                                                                           =
  #
 # This program is free software: you can redistribute it and/or modify      =
  #
 # it under the terms of the GNU General Public License as published by      =
  #
@@ -36,10 +36,10 @@ my @dummy =3D ( ${Header::colouryellow} );
 undef (@dummy);
=20
 my @bandwidth_limits =3D (
-	1000 * 1024, # 1G
+	1000 * 1024, # 1 GBit/s
 	 500 * 1024,
 	 200 * 1024,
-	 100 * 1024, # 100M
+	 100 * 1024, # 100 MBit/s
 	  64 * 1024,
 	  50 * 1024,
 	  25 * 1024,
@@ -49,10 +49,7 @@ my @bandwidth_limits =3D (
 	   8 * 1024,
 	   4 * 1024,
 	   2 * 1024,
-	       1024, # 1M
-	        512,
-	        256,
-	        160
+	       1024  # 1 MBit/s
 );
 my @accounting_periods =3D ('daily', 'weekly', 'monthly');
=20
diff --git a/lfs/tor b/lfs/tor
index 4e38a3e7c..384b1b213 100644
--- a/lfs/tor
+++ b/lfs/tor
@@ -32,7 +32,7 @@ DL_FROM    =3D $(URL_IPFIRE)
 DIR_APP    =3D $(DIR_SRC)/$(THISAPP)
 TARGET     =3D $(DIR_INFO)/$(THISAPP)
 PROG       =3D tor
-PAK_VER    =3D 33
+PAK_VER    =3D 34
=20
 DEPS       =3D ""
=20
--=20
2.16.4

--===============1535569510692192625==--