From: Jo-Philipp Wich <jow@openwrt.org>
Date: Sun, 8 Feb 2015 18:18:16 +0000 (+0100)
Subject: Merge pull request #315 from poranje/proto-ipv6+aiccu
X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fluci.git;a=commitdiff_plain;h=1abe6fa10ce456e9fd20389a274f5065e34a800e;hp=ada0ea2aeae569e1acc48a2d643028a7050ce8f8

Merge pull request #315 from poranje/proto-ipv6+aiccu

luci-proto-ipv6: add aiccu
---

diff --git a/applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua b/applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua
index 23f6f5c84..d1cc155fa 100644
--- a/applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua
+++ b/applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua
@@ -90,6 +90,10 @@ local pip = s:taboption("general", Flag, "predictable_ips", translate("Predictab
 	translate("The assigned IPs will be selected deterministically"))
 pip.default = "1"
 
+local compr = s:taboption("general", Flag, "compression", translate("Enable compression"),
+	translate("Enable compression"))
+compr.default = "1"
+
 local udp = s:taboption("general", Flag, "udp", translate("Enable UDP"),
 	translate("Enable UDP channel support; this must be enabled unless you know what you are doing"))
 udp.default = "1"
diff --git a/build/zoneinfo2lua.pl b/build/zoneinfo2lua.pl
index 4a90dae35..d3f040326 100755
--- a/build/zoneinfo2lua.pl
+++ b/build/zoneinfo2lua.pl
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 # zoneinfo2lua.pl - Make Lua module from /usr/share/zoneinfo
-# Execute from within /usr/share/zoneinfo
+# Execute from within root of Luci feed, usually feeds/luci
 # $Id$
 
 use strict;
@@ -51,16 +51,7 @@ open(O, "> $tzdout/tzdata.lua") || die "open($tzdout/tzdata.lua): $!\n";
 
 print STDERR "Writing time zones to $tzdout/tzdata.lua ... ";
 print O <<HEAD;
---[[
-LuCI - Autogenerated Zoneinfo Module
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-	http://www.apache.org/licenses/LICENSE-2.0
-
-]]--
+-- Licensed to the public under the Apache License 2.0.
 
 module "luci.sys.zoneinfo.tzdata"
 
@@ -81,16 +72,7 @@ open (O, "> $tzdout/tzoffset.lua") || die "open($tzdout/tzoffset.lua): $!\n";
 
 print STDERR "Writing time offsets to $tzdout/tzoffset.lua ... ";
 print O <<HEAD;
---[[
-LuCI - Autogenerated Zoneinfo Module
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-	http://www.apache.org/licenses/LICENSE-2.0
-
-]]--
+-- Licensed to the public under the Apache License 2.0.
 
 module "luci.sys.zoneinfo.tzoffset"
 
diff --git a/modules/luci-base/luasrc/sys/zoneinfo/tzdata.lua b/modules/luci-base/luasrc/sys/zoneinfo/tzdata.lua
index 633749669..97a3608ea 100644
--- a/modules/luci-base/luasrc/sys/zoneinfo/tzdata.lua
+++ b/modules/luci-base/luasrc/sys/zoneinfo/tzdata.lua
@@ -86,7 +86,7 @@ TZ = {
 	{ 'America/Boise', 'MST7MDT,M3.2.0,M11.1.0' },
 	{ 'America/Cambridge Bay', 'MST7MDT,M3.2.0,M11.1.0' },
 	{ 'America/Campo Grande', 'AMT4AMST,M10.3.0/0,M2.3.0/0' },
-	{ 'America/Cancun', 'CST6CDT,M4.1.0,M10.5.0' },
+	{ 'America/Cancun', 'EST5' },
 	{ 'America/Caracas', 'VET4:30' },
 	{ 'America/Cayenne', 'GFT3' },
 	{ 'America/Cayman', 'EST5' },
@@ -178,7 +178,7 @@ TZ = {
 	{ 'America/Rio Branco', 'ACT5' },
 	{ 'America/Santa Isabel', 'PST8PDT,M4.1.0,M10.5.0' },
 	{ 'America/Santarem', 'BRT3' },
-	{ 'America/Santiago', 'CLT4CLST,M9.1.6/24,M4.4.6/24' },
+	{ 'America/Santiago', 'CLT3' },
 	{ 'America/Santo Domingo', 'AST4' },
 	{ 'America/Sao Paulo', 'BRT3BRST,M10.3.0/0,M2.3.0/0' },
 	{ 'America/Scoresbysund', 'EGT1EGST,M3.5.0/0,M10.5.0/1' },
@@ -207,7 +207,7 @@ TZ = {
 	{ 'Antarctica/Macquarie', 'MIST-11' },
 	{ 'Antarctica/Mawson', 'MAWT-5' },
 	{ 'Antarctica/McMurdo', 'NZST-12NZDT,M9.5.0,M4.1.0/3' },
-	{ 'Antarctica/Palmer', 'CLT4CLST,M9.1.6/24,M4.4.6/24' },
+	{ 'Antarctica/Palmer', 'CLT3' },
 	{ 'Antarctica/Rothera', 'ROTT3' },
 	{ 'Antarctica/Syowa', 'SYOT-3' },
 	{ 'Antarctica/Troll', 'UTC0CEST-2,M3.5.0/1,M10.5.0/3' },
@@ -384,7 +384,7 @@ TZ = {
 	{ 'Pacific/Bougainville', 'BST-11' },
 	{ 'Pacific/Chatham', 'CHAST-12:45CHADT,M9.5.0/2:45,M4.1.0/3:45' },
 	{ 'Pacific/Chuuk', 'CHUT-10' },
-	{ 'Pacific/Easter', 'EAST6EASST,M9.1.6/22,M4.4.6/22' },
+	{ 'Pacific/Easter', 'EAST5' },
 	{ 'Pacific/Efate', 'VUT-11' },
 	{ 'Pacific/Enderbury', 'PHOT-13' },
 	{ 'Pacific/Fakaofo', 'TKT-13' },
diff --git a/modules/luci-base/luasrc/sys/zoneinfo/tzoffset.lua b/modules/luci-base/luasrc/sys/zoneinfo/tzoffset.lua
index facfd0c8b..c8c908b6e 100644
--- a/modules/luci-base/luasrc/sys/zoneinfo/tzoffset.lua
+++ b/modules/luci-base/luasrc/sys/zoneinfo/tzoffset.lua
@@ -45,8 +45,7 @@ OFFSET = {
 	uyst  =  -7200,	-- UYST
 	fnt   =  -7200,	-- FNT
 	srt   = -10800,	-- SRT
-	clt   = -14400,	-- CLT
-	clst  = -10800,	-- CLST
+	clt   = -10800,	-- CLT
 	egt   =  -3600,	-- EGT
 	egst  =      0,	-- EGST
 	nst   = -12600,	-- NST
@@ -135,8 +134,7 @@ OFFSET = {
 	chast =  45900,	-- CHAST
 	chadt =  49500,	-- CHADT
 	chut  =  36000,	-- CHUT
-	east  = -21600,	-- EAST
-	easst = -18000,	-- EASST
+	east  = -18000,	-- EAST
 	vut   =  39600,	-- VUT
 	phot  =  46800,	-- PHOT
 	tkt   =  46800,	-- TKT
diff --git a/protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua b/protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua
index e0e63d863..7b213127f 100644
--- a/protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua
+++ b/protocols/luci-proto-openconnect/luasrc/model/cbi/admin_network/proto_openconnect.lua
@@ -19,6 +19,9 @@ port = section:taboption("general", Value, "port", translate("VPN Server port"))
 port.placeholder = "443"
 port.datatype    = "port"
 
+ifname = section:taboption("general", Value, "interface", translate("Output Interface"))
+ifname.template = "cbi/network_netlist"
+
 section:taboption("general", Value, "serverhash", translate("VPN Server's certificate SHA1 hash"))
 
 section:taboption("general", Value, "authgroup", translate("AuthGroup"))