Commit graph

1385 commits

Author SHA1 Message Date
Ted Hess
11da8dcaf4 Merge pull request #1936 from mmaraya/master
port-mirroring: new package for copying network packets
2015-11-13 09:10:05 -05:00
Mike Maraya
e428fd92f0 port-mirroring: copy network packets with optional support for TaZmen Sniffer Protocol (TZSP)
Signed-off-by: Mike Maraya <mike.maraya@gmail.com>
2015-11-12 20:43:45 -05:00
Dirk Brenken
c7edde075c adblock: additional check for running dns query background task
fix for possible query log config change (enabled => disabled)

Please apply to upstream - thank you!

Signed-off-by: Dirk Brenken <dirk@brenken.org>
2015-11-12 14:56:04 +01:00
Steven Barth
1553468e04 Merge pull request #1949 from dibdot/master
adblock: busybox "tr" does not support character classes by default
2015-11-12 09:12:32 +01:00
Dirk Brenken
aa2649e8c3 adblock: busybox "tr" does not support character classes by default
bugfix: busybox "tr" does not support character classes by default and
generates (partly) odd domain names. 

Signed-off-by: Dirk Brenken <dirk@brenken.org>
2015-11-12 04:59:48 +01:00
Luka Perkov
a150eb16f3 git: update to 2.6.3
Signed-off-by: Luka Perkov <luka@openwrt.org>
2015-11-12 00:56:22 +01:00
Ted Hess
25c6b0818f Merge pull request #1946 from dibdot/master
adblock: uci support, dynamic uhttpd instance support plus various fixes
2015-11-11 17:00:32 -05:00
Daniel Gimpelevich
6e883328e8 vpnc: dirty hack for musl compatibility
Signed-off-by: Daniel Gimpelevich <daniel@gimpelevich.san-francisco.ca.us>
2015-11-11 13:29:43 -08:00
Dirk Brenken
1f5ed5d040 adblock: uci support, dynamic uhttpd instance support plus various fixes
* add uci support
* add dynamic uhttpd instance support
  (no longer rely on uhttpd config changes)
* package reordering
* plus various fixes

Signed-off-by: Dirk Brenken <dirk@brenken.org>
2015-11-11 19:39:51 +01:00
Dov Murik
7c0b1e07a5 net/rsyslog: add new package
Signed-off-by: Dov Murik <dmurik@us.ibm.com>
2015-11-11 10:01:01 -05:00
Luka Perkov
726e9dcafd Merge pull request #1914 from sairon/fossil-fix-makefile
fossil: fix Makefile for GNU Make < 3.82
2015-11-10 01:33:21 +01:00
Álvaro Fernández Rojas
60c4f0339e Merge pull request #1930 from mstorchak/tgt
tgt: update to 1.0.61
2015-11-09 07:06:18 +01:00
Maxim Storchak
186b29820a tgt: update to 1.0.61
Signed-off-by: Maxim Storchak <m.storchak@gmail.com>
2015-11-08 19:47:50 +02:00
Maxim Storchak
97c50ca2db netatalk: fix dependency: libattr instead of attr
Signed-off-by: Maxim Storchak <m.storchak@gmail.com>
2015-11-08 19:24:01 +02:00
Luka Perkov
94d295e25e fossl: update to 1.34
Signed-off-by: Luka Perkov <luka@openwrt.org>
2015-11-04 22:46:58 +01:00
Christian Schoenebeck
7ea8be0b0d ddns-scripts: rollup to version 2.5.0-1
- add -V / --version parameter to show version information
- new option lookup_host as host to use by nslookup/host to validate IP address changes, to be separate from [DOMAIN] parameter which produces a lot of questions in the forum and on multi-host updates
- new option param_enc for optional usage inside update_url [PARAMENC] (will be send urlencoded)
- new option param_opt for optional usage inside update_url [PARAMOPT]
- new service strato.de (IPv4 only) requested by ludwig.jaffe@
- new service variomedia.de (IPv4 & IPv6) requested by Wolfgang Oertl #1884
- rewritten function get_service_data to read services/service_ipv6 file
- allow 3rd parameter inside services/service_ipv6 file - here should be the answer of the ddns provider on success. If parameter is set, it's checked by ddns-scripts and report errors to logfile/syslog if failed and retry
- updated tld_names.dat

Signed-off-by: Christian Schoenebeck <christian.schoenebeck@gmail.com>
2015-11-04 21:29:22 +01:00
Jan Čermák
04fd610e9e fossil: fix Makefile for GNU Make < 3.82
make defconfig (or feeds update) raised following error for fossil
package on Ubuntu 14.04 LTS with GNU Make 3.81:
    Makefile:47: *** missing separator.  Stop.

To fix this, empty blocks are now defined instead of using undefine
directive which was added in GNU Make 3.82.

Signed-off-by: Jan Čermák <jan.cermak@nic.cz>
2015-11-04 18:22:41 +01:00
Ted Hess
86d352bf65 Merge pull request #1913 from dddaniel/master
atftp: fix invalid read in tftp_send_request.
2015-11-04 11:08:45 -05:00
Daniel Danzberger
8159bf7990 atftp: fix invalid read in tftp_send_request.
This invalid read of 1 byte caused a segfault
on some arm platforms.

Signed-off-by: Daniel Danzberger <daniel@dd-wrt.com>
2015-11-04 16:28:50 +01:00
Yousong Zhou
f335446e3b pppossh: use exec with pty option to eliminate a level of bufferbloat
While at it, also do the following fixes

 - Drop the URL pointing to the old github repo
 - Fix detection of default set of private keys

Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
2015-11-03 15:13:33 +08:00
Toke Høiland-Jørgensen
8b18ca42f0 sqm-scripts: Bump to v1.0.4. 2015-11-02 18:05:14 +01:00
Luka Perkov
96b257a705 fossil: add package
Signed-off-by: Luka Perkov <luka@openwrt.org>
2015-11-01 16:31:59 +01:00
Nikos Mavrogiannopoulos
637bc76c06 ocserv: allow enabling proxy ARP
Signed-off-by: Nikos Mavrogiannopoulos <nmav@gnutls.org>
2015-11-01 13:19:51 +01:00
Nikos Mavrogiannopoulos
25eeddbb21 ocserv: if ocserv.conf.local is present append it to ocserv.conf
Signed-off-by: Nikos Mavrogiannopoulos <nmav@gnutls.org>
2015-11-01 13:18:45 +01:00
Steven Barth
2506f249be Merge pull request #1905 from kissg1988/seafile
seafile-server: fix dependency and postinst script
2015-11-01 07:18:21 +01:00
Gergely Kiss
c2393dd796 seafile-server: make postinst script work with Image Generator
Signed-off-by: Gergely Kiss <mail.gery@gmail.com>
2015-11-01 00:45:12 +01:00
Luka Perkov
2cab2bb7bb nginx: bump to 1.9.6
In this bump as agreed with Thomas we are dropping out all the nginx 3rd party
addons. In case you would like to see your 3rd party addon included please send
a pull request and make sure it works with newest version.

Signed-off-by: Luka Perkov <luka@openwrt.org>
2015-10-31 20:41:12 +01:00
Gergely Kiss
cd3e8088fb seafile-server: fix broken dependency on seafile-ccnet
Signed-off-by: Gergely Kiss <mail.gery@gmail.com>
2015-10-31 19:56:38 +01:00
Nikos Mavrogiannopoulos
ce06021897 ocserv: simplify IPv6 network setting
Signed-off-by: Nikos Mavrogiannopoulos <nmav@gnutls.org>
2015-10-31 12:22:16 +01:00
Nikos Mavrogiannopoulos
7c9c18e756 ocserv: removed unecessary instructions and script
Signed-off-by: Nikos Mavrogiannopoulos <nmav@gnutls.org>
2015-10-31 11:52:47 +01:00
Michael Hanselmann
2f0f2c4cd9 [Unbound] Update to 1.5.6
Bump unbound to version 1.5.6 released on October 20, 2015.

Signed-off-by: Michael Hanselmann <public@hansmi.ch>
2015-10-30 21:39:08 +01:00
Steven Barth
8cf751141b Merge pull request #1895 from yousong/add-pppossh
pppossh: new package for network proto "pppossh"
2015-10-30 08:06:09 +01:00
Daniel Golle
46c7831304 openvswitch: work-around kernel architecture detection
caught on build-bot:
make -C /store/buildbot/slave/ramips/build/build_dir/target-mipsel_24kec+dsp_musl-1.1.11/linux-ramips_rt305x/linux-3.18.21 M=/store/buildbot/slave/ramips/build/build_dir/target-mipsel_24kec+dsp_musl-1.1.11/openvswitch-2.4.0/datapath/linux modules
make[7]: Entering directory `/store/buildbot/slave/ramips/build/build_dir/target-mipsel_24kec+dsp_musl-1.1.11/linux-ramips_rt305x/linux-3.18.21'
Makefile:610: arch/mipsel/Makefile: No such file or directory

Declare LINUX_KARCH to package's build-system to resolv this.

Signed-off-by: Daniel Golle <daniel@makrotopia.org>
2015-10-30 01:06:02 +01:00
dirk
10bd039c37 powerful adblock script to block ad/abuse domains
Signed-off-by: dirk <dirk@brenken.org>
2015-10-28 00:02:23 +01:00
Hauke Mehrtens
49d2473bdc iotivity: add resource-container
This is the new interface to add support for non OIC protocols to IoTivity.

Signed-off-by: Hauke Mehrtens <hauke.mehrtens@lantiq.com>
2015-10-27 19:09:24 +01:00
Hauke Mehrtens
f5e06e1205 iotivity: update to version 1.0.0
This brings IoTivity to version 1.0.0. The patches removed by this
commit are merged upstream now. There are some new patches needed for
new problems with Big Endian CPUs and also for musl. The plugin manager
was removed in upstream IoTivity 1.0.0.

Signed-off-by: Hauke Mehrtens <hauke.mehrtens@lantiq.com>
2015-10-27 19:09:24 +01:00
Yousong Zhou
2fd8dfad4c pppossh: new package for network proto "pppossh"
Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
2015-10-27 21:00:08 +08:00
Michael Haas
e86e8d9d35 wifidog: Bump to 1.3.0
* Updates wifidog to latest upstream release.
* Removes patches/100-musl-compat.patch as that's included in 1.3.0

Signed-off-by: Michael Haas <haas@computerlinguist.org>
2015-10-25 09:56:55 +01:00
Aedan ARFETT Renner
9c121aa2d1 mwan3-luci updated to 1.4-4
Hard-coded location of ip (/usr/bin/ip) in controller file
Added space after "for" in .htm files to clean it up

signed-off-by: Aedan "ARFETT" Renner <chipdankly@gmail.com>
2015-10-23 13:04:18 -07:00
Steven Barth
b7684e953b Merge pull request #1833 from commodo/keepalived-libnl
keepalived: update to use only libnl-genl
2015-10-22 10:43:43 +02:00
Daniel Golle
1f312e49af freeradius2: cleanup init script
The initscript originally imported from oldpackages no longer does
the job, sed'ery around ifconfig is just not the way.
Remove stuff which can also be done via /etc/freeradius2/* or
/etc/default/radiusd instead.

Fixes #1769 and #1193

Signed-off-by: Daniel Golle <daniel@makrotopia.org>
2015-10-21 03:11:50 +02:00
Steven Barth
cf13856040 Merge pull request #1876 from mlichvar/chrony-update-2.2
chrony: update to 2.2
2015-10-20 13:36:53 +02:00
Jeroen Louwes
5ca8b0227d mwan3: update to version 1.6-3
Fix for changed location ip binary

Signed-off-by: Jeroen Louwes <jeroen.louwes@gmail.com>
2015-10-20 10:04:20 +02:00
Miroslav Lichvar
116daf94e6 chrony: update to 2.2
Support for authentication with command key was replaced with
communication over Unix domain socket.

Signed-off-by: Miroslav Lichvar <mlichvar0@gmail.com>
2015-10-20 07:56:22 +02:00
Miroslav Lichvar
c75e456e25 chrony: remove old files
Remove files that were accidentally included in the previous merge
(pull request #1802). The obsolete patches are breaking the build now.

Signed-off-by: Miroslav Lichvar <mlichvar0@gmail.com>
2015-10-17 14:22:46 +02:00
Michael Hanselmann
c4db8d95ae [Unbound] Update to 1.5.5
Bump unbound to version 1.5.5 released on October 6, 2015.

Signed-off-by: Michael Hanselmann <public@hansmi.ch>
2015-10-14 22:37:51 +02:00
Steven Barth
52585203a1 Merge pull request #1858 from oneru/patch-1
Fwknop: Fix setting getting overwritten
2015-10-13 11:30:39 +02:00
Miroslav Lichvar
71559ae85f chrony: import from oldpackages
Signed-off-by: Miroslav Lichvar <mlichvar0@gmail.com>
2015-10-13 10:10:53 +02:00
Steven Barth
c6fbda003d Merge pull request #1800 from TuxCoder/master
chaosvpn: add new package
2015-10-13 08:50:39 +02:00
Jonathan Bennett
d836259386 Fwknop: Fix setting getting overwritten
A typo in the init file was causing a certain setting to be overwritten on every daemon start.

Signed-off-by: Jonathan Bennett <JBennett@incomsystems.biz>
2015-10-12 22:28:28 -05:00
Matteo Croce
3c4a091aa4 Merge pull request #1849 from drizzt/master
fwknop: fix building without gpg
2015-10-12 18:57:03 +02:00
Matthias Schiffer
8b1b1dd9f3 ethtool: update to v4.2
Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
2015-10-12 15:22:58 +02:00
Timothy Redaelli
eb23237cc1 fwknop: fix building without gpg 2015-10-09 17:10:13 +02:00
Nikos Mavrogiannopoulos
65b536c931 ocserv: updated to 0.10.9
Signed-off-by: Nikos Mavrogiannopoulos <nmav@gnutls.org>
2015-10-07 16:38:19 +02:00
Steven Barth
1d853ac05a all: get rid of kmod-ipv6 dependencies
Signed-off-by: Steven Barth <steven@midlink.org>
2015-10-06 09:04:29 +02:00
Steven Barth
4d9501bdf3 Merge pull request #1837 from cyanidium/master
nut: add dev headers, nut-web-cgi and nut-avahi-service, bugfix
2015-10-06 09:00:18 +02:00
Marty R
064d84ab90 nut: add dev headers, nut-web-cgi and nut-avahi-service, bugfix
Headers are required by collectd as mentioned in #1801. This is the nut portion based on dwmw2@d636841cd1d1dfab04cb509520c082738ddfb2ea
Happy to merge with 15.05 as per #1803.
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
[martin.p.rowe@gmail.com: condensed InstallDev lines]

Added package nut-web-cgi based on demorfi@7e340f47944ff4a9c49d3b1dc6c1d9d965cd344c. Closes #1614.
Pending signoff by @demorfi
[martin.p.rowe@gmail.com: simplified implementation, no changes to Config.in]

Added package nut-avahi-service similar to other implementations in #618
Bugfix to remove redundant NUT_DRIVER_SERIAL config
Bugfix to make UPSLOG config actually install (requires PKG_RELEASE bump)
Some code tidy-ups
Signed-off-by: Martin Rowe <martin.p.rowe@gmail.com>
2015-10-03 18:11:28 -07:00
Baptiste Jonglez
0496608450 bmon: Adapt to libnl package split, only depend on required parts
Signed-off-by: Baptiste Jonglez <git@bitsofnetworks.org>
2015-10-03 18:42:58 +02:00
Peter Wagner
8025353d76 git: update to 2.6.0
Signed-off-by: Peter Wagner <tripolar@gmx.at>
2015-10-03 11:22:11 +02:00
Peter Wagner
a5729ee727 nfs-kernel-server: update to 1.3.3
Signed-off-by: Peter Wagner <tripolar@gmx.at>
2015-10-03 11:19:22 +02:00
Steven Barth
35f0dc67ac Merge pull request #1805 from stefanhorning/ddns_service
ddns: Added schokokeks.org to ddns services
2015-10-03 10:44:26 +02:00
Steven Barth
30f8ca7ade Merge pull request #1830 from commodo/ovs-2.4.0-released
openvswitch: use released version 2.4.0
2015-10-03 10:23:10 +02:00
Steven Barth
e0e0936040 Merge pull request #1831 from commodo/aircrack-ng-libnl-update-fix
aircrack-ng: use libnl-genl
2015-10-03 10:22:49 +02:00
John Crispin
fe31939c0e cgi-io: add a small helper cgi that can be used by RPCD based UIs
Signed-off-by: John Crispin <blogic@openwrt.org>
2015-10-02 14:00:25 +02:00
Alexandru Ardelean
4da84af953 openvswitch: use released version 2.4.0
The previous version was an unreleased one from the OVS trunk.
This one is the released version, described here:
  http://openvswitch.org/pipermail/announce/2015-August/000078.html

Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
2015-10-02 10:22:03 +03:00
Alexandru Ardelean
b6f53282c5 aircrack-ng: use libnl-genl
Adding libnl-core and libnl-genl as deps.

Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
2015-10-02 09:24:16 +03:00
Yousong Zhou
2817f1d920 xl2tpd: bump version
The update is mainly for addressing some memory corruption and segementation
faults issues observed when running xl2tpd in OpenWrt.  The relevant upstream
pull request was at link [1]

 [1] Devel fix valgrind #77, https://github.com/xelerance/xl2tpd/pull/77

Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
2015-10-02 08:20:24 +08:00
Michael Heimpold
31e6a7832a u2pnpd: add new package
u²pnpd announces a device as UPnP basic device on the
network so that an user could easily find it. It tries
to detect various system information automatically, however
everything can be overridden by UCI settings.

Signed-off-by: Michael Heimpold <mhei@heimpold.de>
2015-10-01 23:49:20 +02:00
Alexandru Ardelean
0773a12ff5 keepalived: update to use only libnl-genl
Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
2015-10-01 21:31:52 +03:00
Marko Ratkaj
d003d3c06d squid: bump version to 3.5.9
Signed-off-by: Marko Ratkaj <marko.ratkaj@sartura.hr>
2015-09-27 23:44:31 +02:00
Marko Ratkaj
b1888862ad e2guardian: bump version to 3.2.0
Signed-off-by: Marko Ratkaj <marko.ratkaj@sartura.hr>
2015-09-27 23:44:17 +02:00
Stefan Horning
86352d4f85 ddns: Added schokokeks.org service. Signed-off-by: Stefan Horning <stefan@hornings.de> 2015-09-27 15:40:44 +02:00
Karl Palsson
e7bd3fbe21 mosquitto: upgrade to version 1.4.4
Drop patch now included upstream.

More information: http://mosquitto.org/2015/09/version-1-4-4-released/

Signed-off-by: Karl Palsson <karlp@tweak.net.au>
2015-09-23 10:30:48 +00:00
Norbert Summer
f6acde7187 chaosvpn: add new package
Signed-off-by: Norbert Summer <git@o-g.at>
2015-09-22 16:14:53 +02:00
Steven Barth
265a31cf35 Merge pull request #1788 from Dismounted/patch-1
nut: Fix required dependencies.
2015-09-22 15:54:33 +02:00
Michael Heimpold
27242cadfd Merge pull request #1789 from MikePetullo/scapy
scapy: add new package
2015-09-21 23:12:25 +02:00
Michael Heimpold
7149ceb89b Merge pull request #1792 from MikePetullo/krb5
krb5: update to 1.13.2
2015-09-21 22:51:55 +02:00
W. Michael Petullo
01b087c043 lighttpd: update to 1.4.37
Signed-off-by: W. Michael Petullo <mike@flyn.org>
2015-09-20 20:18:04 -04:00
W. Michael Petullo
15f1e8b2d9 krb5: update to 1.13.2
Signed-off-by: W. Michael Petullo <mike@flyn.org>
2015-09-20 19:42:38 -04:00
W. Michael Petullo
51adbf46d4 scapy: add new package
Signed-off-by: W. Michael Petullo <mike@flyn.org>
2015-09-20 19:10:27 -04:00
Hanson Wong
9fa55147c4 nut: Fix required dependencies. 2015-09-20 22:48:29 +10:00
Daniel Golle
a3ed4f89a7 gnunet: update version, fix gettext version after autoreconf
Use gettext-version PKG_FIXUP to install up-to-date gettext
infrastructure. autoreconf is still run implicitely as well.

Signed-off-by: Daniel Golle <daniel@makrotopia.org>
2015-09-19 20:21:33 +02:00
Tijs Van Buggenhout
ce0fbf2ea2 htpdate: add htpdate package based on AA feed
Source homepage has changed, and sources are updated to version 1.1.1
released 25 August 2015.

Patch adjtimex still applies.

Changes in version 1.1.1:

- Fixed out of bound issue and a missing null-terminated string (thanks
  to Tobias Stöckmann)

Signed-off-by: Tijs Van Buggenhout <tvbuggen@netzerk.be>
2015-09-16 11:13:26 +02:00
Ted Hess
632cbb96d3 Merge pull request #1775 from kissg1988/seafile-server
seafile-server: fix libevent2 includes
2015-09-14 16:40:07 -04:00
Ted Hess
83054e8aa8 Merge pull request #1774 from kissg1988/seafile-ccnet
seafile-ccnet: bump release
2015-09-14 16:39:40 -04:00
Gergely Kiss
cbbedb3245 seafile-ccnet: bump release
Signed-off-by: Gergely Kiss <mail.gery@gmail.com>
2015-09-14 20:27:48 +02:00
Gergely Kiss
08142f27da seafile-server: fix libevent2 includes
Signed-off-by: Gergely Kiss <mail.gery@gmail.com>
2015-09-14 20:24:48 +02:00
Markus Stenberg
4764682b65 mdnsresponder: fix fd leak for IPv6 sockets
Signed-off-by: Steven Barth <steven@midlink.org>
2015-09-14 14:05:27 +02:00
Daniel Golle
26b636c00f gnunet: fix build with full NLS support
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
2015-09-11 09:16:20 +02:00
Steven Barth
1e70a8c758 Merge pull request #1764 from dddaniel/master
atftp: add new package
2015-09-10 17:45:53 +02:00
Steven Barth
59b7aa84b0 Merge pull request #1765 from kissg1988/seafile-ccnet
seafile-ccnet: fix patch file to work correctly with libevent2 headers
2015-09-10 17:45:46 +02:00
heil
1b9a79c04d haproxy: fixes from upstream
- [PATCH 14/16] BUG/MINOR: http: remove stupid HTTP_METH_NONE entry
 - [PATCH 15/16] BUG/MAJOR: http: don't call http_send_name_header()
 - [PATCH 16/16] BUG/MINOR: tools: make str2sa_range() report

Signed-off-by: heil <heil@terminal-consulting.de>
2015-09-09 20:49:16 +02:00
Gergely Kiss
e03388255b seafile-ccnet: fix patch file to work correctly with libevent2 headers
Signed-off-by: Gergely Kiss <mail.gery@gmail.com>
2015-09-09 19:27:36 +02:00
Daniel Danzberger
46f94304d3 atftp: add new package
TODO:
	- add init script for atftpd
	- merge '120-retry-option.patch' from old atftp packages.

Signed-off-by: Daniel Danzberger <daniel@dd-wrt.com>
2015-09-09 11:48:09 +02:00
Steven Barth
99ba6415d9 Merge pull request #1760 from salzmdan/master
knot: update to 1.6.5
2015-09-08 11:32:31 +02:00
Daniel Salzman
8e8f73b4d8 knot: update to 1.6.5
Signed-off-by: Daniel Salzman <daniel.salzman@nic.cz>
2015-09-08 11:20:18 +02:00
Steven Barth
d083cafcd6 Merge pull request #1741 from Borromini/master
[Unbound] Update to 1.5.4
2015-09-08 08:13:04 +02:00
Steven Barth
7bb0dc34f3 strongswan: bump to 5.3.3
Signed-off-by: Steven Barth <steven@midlink.org>
2015-09-07 11:06:37 +02:00
Steven Barth
da250fd171 Merge pull request #1754 from kissg1988/seafile-ccnet
seafile-ccnet: use correct libevent2 includes
2015-09-07 09:19:42 +02:00
Steven Barth
f8117e3b41 Merge pull request #1755 from kissg1988/seafile-server
seafile-server: fix libevent2 include paths
2015-09-07 09:19:24 +02:00