Commit graph

1107 commits

Author SHA1 Message Date
Luiz Angelo Daros de Luca
b6a9980d40 ruby: bump to 2.3.3
This release contains a bug fix about Refinements and Module#prepend.
The mixture use of Module#refine and Module#prepend to the same Class
could cause unexpected NoMethodError. This is a regression on Ruby 2.3.2
released last week. See [Bug #12920] for details.

Signed-off-by: Luiz Angelo Daros de Luca <luizluca@gmail.com>
2016-11-22 14:55:11 -02:00
Breuss Simon
7e1b756cd3 update micropython and micropython-lib to v1.8.6
Signed-off-by: Breuss Simon <simon.breuss@gmail.com>
2016-11-21 20:07:32 +01:00
Andrew McConachie
398109118c lang/python-pcapy: Added python-pcapy package
https://github.com/CoreSecurity/pcapy
Pcapy is a Python extension module that enables software written in Python to access the routines from the pcap packet capture library.

Signed-off-by: Andrew McConachie <andrew@depht.com>>
2016-11-19 13:12:19 -05:00
Luiz Angelo Daros de Luca
1f8432ab9a ruby: bump to 2.3.2
This release contains update of RubyGems 2.5.2 and update of included ssl certificates.

There are many bugfixes too. See the http://svn.ruby-lang.org/repos/ruby/tags/v2_3_2/ChangeLog
for details.

Signed-off-by: Luiz Angelo Daros de Luca <luizluca@gmail.com>
2016-11-18 04:50:12 -02:00
Michael Heimpold
583af8565e php7: update to 7.0.13
Signed-off-by: Michael Heimpold <mhei@heimpold.de>
2016-11-16 21:12:39 +01:00
Alexandru Ardelean
ee512fa36f python-dns: add python-setuptools/host as build dependency
After commit a4b0c0a9fb
python host does not install/have the built-in setuptools package.

So, for python-dns, we need to add it explicitly (since it's required).

Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
2016-11-09 09:35:19 +02:00
Alexandru Ardelean
556821951d python-dns: use --prefix & --root config options
Does not fix anything, just brings it inline with the
other python packages.

Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
2016-11-09 09:28:34 +02:00
Alexandru Ardelean
9eca45fdf1 python, python3: unify HOST_ vars and get rid of HOST_CFLAGS
--sysconfigdir and --sbindir are obtained from --prefix
and --exec-prefix, so no need to have them explicitly

Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
2016-11-07 10:55:34 +02:00
Alexandru Ardelean
7d89234b86 python,python3: get rid of HOST_CFLAGS
They rely on system paths and are a bit misleading/confusing.
As seen here:
https://github.com/openwrt/packages/issues/3339

Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
2016-11-07 10:55:33 +02:00
Alexandru Ardelean
e81632ab90 python3: disable ensurepip on package & host builds
Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
2016-11-07 10:55:33 +02:00
Alexandru Ardelean
6a670f42b1 python: move PYTHON_VERSION in own .mk file
Allows for more granularity with respect to python-host.mk
and python-package.mk inclusions.

Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
2016-11-07 10:55:31 +02:00
Alexandru Ardelean
45bdb70e1e python: add include guard for python-host.mk and include in Makefile
So that it can be included twice.
python-package.mk include python-host.mk, but at some point
in time python-host.mk is not exported to staging_dir yet.

So, to have in python's Makefile, we need to include it
in the Makefile, and to prevent double inclusion (if
python-host.mk is exported from a previous build), the
include guard is added.

Also, moved the includes after some vars were set.

Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
2016-11-07 09:27:20 +02:00
Gergely Kiss
ed56b2ea43 python-urllib3: update to version 1.19
Signed-off-by: Gergely Kiss <mail.gery@gmail.com>
2016-11-06 17:36:20 +01:00
Hannu Nyman
d015c6edfe Merge pull request #2922 from cshore/pull-request-fix-perl-utf8-dependency
lang/perlbase: Fix missing utf8 dependency on unicore
2016-11-06 11:57:42 +02:00
Hannu Nyman
2ae49e2b16 Merge pull request #3460 from Shulyaka/python-dns
python-dns: version update to 1.15.0
2016-11-04 09:28:37 +02:00
Denis Shulyaka
0e8e30eb6b python-dns: version update to 1.15.0
Signed-off-by: Denis Shulyaka <Shulyaka@gmail.com>
2016-11-03 18:15:55 +03:00
Jo-Philipp Wich
4a083de4a9 python3: avoid use of HOST_BUILD_PREFIX
Currently, the python3-package.mk framework relies on HOST_BUILD_PREFIX to
refer to the $(STAGING_DIR)/host directory but using the HOST_BUILD_PREFIX
variable requires the use of include/host-build.mk which in turn includes
python3-package.mk, leading to target redefinition errors.

In order to provide a global, uniform way to refer to the host staging
directory, LEDE introduced a new variable STAGING_DIR_HOSTPKG which points
to $(STAGING_DIR)/host for now with the purpose of eventually being able to
relocate that directory in the future.

This commit changes python3-package.mk to ...
 - stop including include/host-build.mk (revert of #3423)
 - replace usages of $(HOST_BUILD_PREFIX) with $(STAGING_DIR_HOSTPKG)
 - warn and fallback to $(STAGING_DIR)/host if STAGING_DIR_HOSTPKG is
   unavailable

The fallback code will ensure that the python host build infrastructure
continues to work properly on older OpenWrt and LEDE versions until the
STAGING_DIR_HOSTPKG is fully settled in and can be removed some time
in the future.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2016-11-01 12:57:41 +01:00
Jo-Philipp Wich
73b7f55424 python: avoid use of HOST_BUILD_PREFIX
Currently, the python-host.mk framework relies on HOST_BUILD_PREFIX to
refer to the $(STAGING_DIR)/host directory but using the HOST_BUILD_PREFIX
variable requires the use of include/host-build.mk which in turn includes
python-host.mk, leading to target redefinition errors.

In order to provide a global, uniform way to refer to the host staging
directory, LEDE introduced a new variable STAGING_DIR_HOSTPKG which points
to $(STAGING_DIR)/host for now with the purpose of eventually being able to
relocate that directory in the future.

This commit changes python-host.mk to ...
 - stop including include/host-build.mk (revert of #3423)
 - replace usages of $(HOST_BUILD_PREFIX) with $(STAGING_DIR_HOSTPKG)
 - warn and fallback to $(STAGING_DIR)/host if STAGING_DIR_HOSTPKG is
   unavailable

The fallback code will ensure that the python host build infrastructure
continues to work properly on older OpenWrt and LEDE versions until the
STAGING_DIR_HOSTPKG is fully settled in and can be removed some time
in the future.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2016-11-01 12:57:36 +01:00
Hannu Nyman
b24ba82cce Merge pull request #3423 from commodo/python-include-host-build
python,python3: include host-build.mk in python-host.mk & python3-package.mk
2016-10-31 10:05:46 +02:00
Alexandru Ardelean
e54d296a53 python,python3: include host-build.mk in python-host.mk & python3-package.mk
Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
2016-10-31 09:51:34 +02:00
Hannu Nyman
0c1950923f Merge pull request #3420 from kissg1988/python-urllib3
python-urllib3: update to version 1.18.1
2016-10-31 09:40:34 +02:00
Hannu Nyman
4f5eb2ffe7 Merge pull request #3419 from kissg1988/simplejson
simplejson: update to version 3.10.0
2016-10-31 09:40:17 +02:00
Gergely Kiss
74f897cbce vala: update to version 0.34.2
Signed-off-by: Gergely Kiss <mail.gery@gmail.com>
2016-10-30 23:01:52 +01:00
Gergely Kiss
99c51afc68 simplejson: update to version 3.10.0
Signed-off-by: Gergely Kiss <mail.gery@gmail.com>
2016-10-30 21:09:52 +01:00
Gergely Kiss
17b3c156cc python-urllib3: update to version 1.18.1
Signed-off-by: Gergely Kiss <mail.gery@gmail.com>
2016-10-30 20:56:06 +01:00
Amnon Paz
d0697b488b lua-openssl: Fix makefile 2016-10-30 11:34:26 +02:00
Hannu Nyman
265f9595ed Merge pull request #3297 from NeoRaider/python
python, python3, python-*: use default prefix for host install
2016-10-27 16:43:15 +03:00
Hannu Nyman
8e8fdc4b4d Merge pull request #3307 from amnonpaz/feature-new-package-lua-openssl
lua-openssl: Introduce new package
2016-10-27 09:38:45 +03:00
Yousong Zhou
9f8dd657a1 Merge pull request #3352 from yousong/python-packages
python-packages: initial version 1.0
2016-10-21 10:27:51 -05:00
Yousong Zhou
c6ddd3d7c0 python-packages: initial version 1.0
Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
2016-10-21 12:07:23 +08:00
Yousong Zhou
3a710acf93 python-pip: add host build
Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
2016-10-17 19:55:39 +08:00
Yousong Zhou
fbba266e79 python: introduce Build/Compile/HostPyRun{Host,Target}
Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
2016-10-17 19:55:39 +08:00
Michael Heimpold
7122495899 php5/php5-pecl-*: R.I.P.
Remove the php5 stuff since php7 is in place for several weeks
and all depended in-tree packages has been migrated.

Signed-off-by: Michael Heimpold <mhei@heimpold.de>
2016-10-16 20:56:14 +02:00
Michael Heimpold
80f0ea5728 php7: update to 7.0.12
Signed-off-by: Michael Heimpold <mhei@heimpold.de>
2016-10-16 20:53:46 +02:00
Hannu Nyman
03161d9448 Merge pull request #3303 from karlp/pulls/lua-kepler-urls
Pulls/lua kepler urls
2016-10-15 13:18:15 +03:00
Hannu Nyman
d2a393a607 Merge pull request #3267 from karlp/pulls/luasql-doc-url
lang: luasql: update URL to current
2016-10-15 13:18:10 +03:00
Amnon Paz
b69cf8e638 lua-openssl: Introduce new package
Add a Lua wrapper library for openssl.

Add patches for:
1. Revise the makefile, so the package can be built under openwrt
2. Remove "lua_isinteger" implementation from the package's "compat"
   code in order to avoid linkage issues - An implementation already
   exists in the target's Lua package.
3. Support OPENSSL_NO_SSL3_METHOD & OPENSSL_NO_COMP

Signed-off-by: Amnon Paz <pazamnon@gmail.com>
2016-10-10 16:02:48 +03:00
Karl Palsson
2f53af0557 luaexpat: Use new URL for documentation
keplerproject.org is long gone.  Use current maintainer website.

Signed-off-by: Karl Palsson <karlp@etactica.com>
2016-10-05 11:00:32 +00:00
Karl Palsson
b7ec0c715c lua-xavante: use new URL for documentation
keplerproject.org is long gone.

Signed-off-by: Karl Palsson <karlp@etactica.com>
2016-10-05 10:58:31 +00:00
Karl Palsson
7028fbfc86 lua-wsapi: Use new URL for documentation
keplerproject.org has been long gone.

Signed-off-by: Karl Palsson <karlp@etactica.com>
2016-10-05 10:58:31 +00:00
Karl Palsson
c3d4458615 lua-rings: use new URL for documentation
keplerproject.org is long gone.

Signed-off-by: Karl Palsson <karlp@etactica.com>
2016-10-05 10:58:17 +00:00
John Crispin
844638d519 Merge pull request #3056 from plntyk/fix_node
node: fix soft/hard float compile on arm/mips
2016-10-04 09:13:11 +02:00
Matthias Schiffer
0da71b8f85
node: use default host install prefix
Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
2016-10-04 05:02:09 +02:00
Matthias Schiffer
b53342b9a4
python3: use default prefix for host install
Also fixes a few incorrect "$(STAGING_DIR_HOST)/host" paths.

Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
2016-10-04 01:00:05 +02:00
Matthias Schiffer
205ee41506
python, python-*: use default prefix for host install
Also fixes a few incorrect "$(STAGING_DIR_HOST)/host" paths.

Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
2016-10-04 00:59:37 +02:00
Karl Palsson
ba5139a08f lang: luasql: update URL to current
Old keplerproject.org urls are all down.
github project source for this project references new githubio website.

Signed-off-by: Karl Palsson <karlp@etactica.com>
2016-09-30 13:44:23 +00:00
Jeffery To
4c93f60c85 python-cryptography: update to 1.5.1
Fixes #3226

Signed-off-by: Jeffery To <jeffery.to@gmail.com>
2016-09-25 01:43:25 +08:00
Michael Heimpold
f353950649 php7: adjust patch to unbreak build (fixes #3202)
Signed-off-by: Michael Heimpold <mhei@heimpold.de>
2016-09-22 19:38:10 +02:00
Hannu Nyman
2da7f031fa Merge pull request #3207 from jefferyto/zope-interface-4.3.2
zope-interface: update to 4.3.2
2016-09-22 18:48:35 +03:00
Hannu Nyman
7906a17949 Merge pull request #3206 from jefferyto/python-pyopenssl-16.1.0
python-pyopenssl: update to 16.1.0
2016-09-22 18:48:15 +03:00
Jeffery To
4f234e7641 twisted: update to 16.4.1
Signed-off-by: Jeffery To <jeffery.to@gmail.com>
2016-09-22 22:44:39 +08:00
Jeffery To
c1f3977980 zope-interface: update to 4.3.2
Signed-off-by: Jeffery To <jeffery.to@gmail.com>
2016-09-22 21:20:41 +08:00
Jeffery To
2089495165 python-pyopenssl: update to 16.1.0
Signed-off-by: Jeffery To <jeffery.to@gmail.com>
2016-09-22 20:44:35 +08:00
Jeffery To
de9aa513a5 python-cryptography: update to 1.5
The cmac patch was upstreamed (pyca/cryptography#3062).

Signed-off-by: Jeffery To <jeffery.to@gmail.com>
2016-09-22 20:31:20 +08:00
Jeffery To
4bf02e4ffa python-enum34: add build dependency to python-setuptools
Signed-off-by: Jeffery To <jeffery.to@gmail.com>
2016-09-22 19:40:54 +08:00
Michael Heimpold
7485e98e68 php5: update to 5.6.26
This fixes the following CVEs:
 - in intl: CVE-2016-7416
 - in mysqlnd: CVE-2016-7412
 - in phar: CVE-2016-7414
 - in spl: CVE-2016-7417
 - in standard: CVS-2016-7411
 - in wddx: CVE-2016-7413, CVE-2016-7418

Signed-off-by: Michael Heimpold <mhei@heimpold.de>
2016-09-21 21:55:45 +02:00
Michael Heimpold
5d063301ac php7: update to 7.0.11
This fixes the following CVEs:
 - in intl: CVE-2016-7416
 - in mysqlnd: CVE-2016-7412
 - in phar: CVE-2016-7414
 - in spl: CVE-2016-7417
 - in wddx: CVE-2016-7413, CVE-2016-7418

Signed-off-by: Michael Heimpold <mhei@heimpold.de>
2016-09-21 21:55:44 +02:00
Michael Heimpold
6d2d5a6a19 php7: package phar extension
Signed-off-by: Michael Heimpold <mhei@heimpold.de>
2016-09-21 21:55:44 +02:00
Hannu Nyman
f71320e233 Merge pull request #3201 from commodo/python-pip-disable-host
python: disable with-ensurepip option for host build
2016-09-21 17:20:35 +03:00
Alexandru Ardelean
a4b0c0a9fb python: disable with-ensurepip option for host build
Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
2016-09-21 16:44:02 +03:00
Jeffery To
7c3f42d74c python-cffi: update to 1.8.3
Signed-off-by: Jeffery To <jeffery.to@gmail.com>
2016-09-21 04:20:36 +08:00
Jeffery To
15495f22bb python-ipaddress: update to 1.0.17
Signed-off-by: Jeffery To <jeffery.to@gmail.com>
2016-09-21 02:22:57 +08:00
Jeffery To
cabcd8e807 python-ply: update to 3.9
Signed-off-by: Jeffery To <jeffery.to@gmail.com>
2016-09-21 01:44:19 +08:00
Jeffery To
af92e141cd python-attrs: update to 16.2.0
Signed-off-by: Jeffery To <jeffery.to@gmail.com>
2016-09-21 01:19:13 +08:00
Hannu Nyman
bafd8cc672 Merge pull request #3190 from commodo/python3-setuptools
python3-setuptools: upgrade to version 27.2.0
2016-09-19 15:49:41 +03:00
Hannu Nyman
5f1a23948e Merge pull request #3189 from commodo/python-setuptools
python-setuptools: upgrade to version 27.2.0
2016-09-19 15:49:14 +03:00
Alexandru Ardelean
05a8127f06 python3-setuptools: upgrade to version 27.2.0
Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
2016-09-19 15:44:42 +03:00
Alexandru Ardelean
e180eaeb2e python-setuptools: upgrade to version 27.2.0
It's a bit weird fixing a build error with an upgrade,
but it seems to work on my setup.
Hopefully, builbot agrees.

Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
2016-09-19 15:38:24 +03:00
Gergely Kiss
25b42ed7f4 openpyxl: update to version 2.4.0
Signed-off-by: Gergely Kiss <mail.gery@gmail.com>
2016-09-19 05:58:45 +02:00
W. Michael Petullo
4399f887de luasec: remove obsolete patches
Signed-off-by: W. Michael Petullo <mike@flyn.org>
2016-09-16 14:04:52 -04:00
W. Michael Petullo
0c4b164998 luasec: update to 0.6
Signed-off-by: W. Michael Petullo <mike@flyn.org>
2016-09-14 08:48:56 -04:00
Hannu Nyman
f28b1c33fd Merge pull request #3159 from commodo/python-setuptools
python-setuptools: upgrade to version 27.1.2
2016-09-13 22:35:27 +03:00
Hannu Nyman
4d4f2cb671 Merge pull request #3160 from commodo/python3-setuptools
python3-setuptools: upgrade to version 27.1.2
2016-09-13 22:34:19 +03:00
Alexandru Ardelean
69e28f9916 python-setuptools: upgrade to version 27.1.2
Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
2016-09-13 16:00:19 +03:00
Alexandru Ardelean
7a3310439f python3-setuptools: upgrade to version 27.1.2
Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
2016-09-13 15:54:20 +03:00
Hannu Nyman
5a0f62117a Merge pull request #3158 from commodo/python3-upgrade
python3: upgrade to version 3.5.2
2016-09-13 14:30:06 +03:00
Alexandru Ardelean
b6993d544f python3: upgrade to version 3.5.2
Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
2016-09-13 14:22:08 +03:00
Alexandru Ardelean
8dd0131439 python: upgrade to version 2.7.12
Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
2016-09-13 10:17:57 +03:00
Michael Heimpold
e99e704eb4 php7-pecl-http: fix build when host has php installed (refs #3149)
When php is installed on the host system, then the configure tries
to obtain from this binary whether some extensions are available.
This prevents the cross build when the desired extensions are not
present - which is the usual case.

So add a patch to prevent configure from doing this - we give
this information via environment variable during build already.

Signed-off-by: Michael Heimpold <mhei@heimpold.de>
2016-09-08 23:07:04 +02:00
Michael Heimpold
f6c3de0925 php7-pecl-http: fix build when php5 is build in parallel (fixes #3149)
- remove hack to find required packages: when php5-pecl-{raphf,propro}
  was built in paralle, then the hack could not determine which build
  directory must be used; this was resolved by a previous commit, both
  packages now install their header files in the staging area so that
  this pecl module will find it properly

- refine build dir to avoid collision with (possible) php5 package variant

Signed-off-by: Michael Heimpold <mhei@heimpold.de>
2016-09-07 23:35:01 +02:00
Michael Heimpold
8eeb939760 php7-pecl-{propro,raphf}: fix two problems (refs #3149)
- refine build dir to avoid collisions with php5 package variants
- properly install headers to location where depended packages look for it

Signed-off-by: Michael Heimpold <mhei@heimpold.de>
2016-09-07 23:31:16 +02:00
Michael Heimpold
edce81222a php7-pecl-{dio,libevent}: refine build dir to avoid collisions with php5 package variants (refs #3149)
Signed-off-by: Michael Heimpold <mhei@heimpold.de>
2016-09-07 23:31:16 +02:00
Michael Heimpold
0ab6f387fa php5-pecl-*: refine build dir to avoid collisions with php7 package variants (refs #3149)
Signed-off-by: Michael Heimpold <mhei@heimpold.de>
2016-09-07 23:31:16 +02:00
Michael Heimpold
5be3377ed4 php7-pecl-http: add new package
Quote:
This PHP HTTP extension aims to provide a convenient and powerful
set of functionality for one of PHPs major applications:
it eases handling of HTTP urls, headers and messages, provides
means for negotiation of a client's preferred content type,
language and charset, as well as a convenient way to send any
arbitrary data with caching and resuming capabilities.
It provides powerful request functionality with support for
parallel requests.

Signed-off-by: Michael Heimpold <mhei@heimpold.de>
2016-09-06 21:59:32 +02:00
Michael Heimpold
830248f963 php7-pecl-libevent: add new package
This is the php7 version of php5-pecl-libevent.
Since upstream did not (yet) merged the php7 compat
changes and released a new package, we use a development
snapshot of a Github contributor.

Signed-off-by: Michael Heimpold <mhei@heimpold.de>
2016-09-06 21:58:46 +02:00
Michael Heimpold
3d305a35e1 php7/php7-pecl-*: introduce load order
Some PECL modules (possibly also php modules) depend on
special load order, otherwise loading the module will fail
due to unresolvable symbols.

This changeset introduces a very simple compile-time defined
order by specifying a prefix for the ini file with the load
directive. If not given, it uses a default value.

It also updates all current pecl module packages to take
this new approach.

Signed-off-by: Michael Heimpold <mhei@heimpold.de>
2016-09-06 21:58:34 +02:00
Michael Heimpold
86acab6430 php7: mod-mysqli: use libmysqlclient instead of libmysqlclient_r (refs #3132)
Signed-off-by: Michael Heimpold <mhei@heimpold.de>
2016-09-04 13:40:44 +02:00
Michael Heimpold
dc56ebbf2f php7: fix two build problems
1) fix rebuilding with existing staging area
2) fix dependency to libmysqlclient (fixes #3132)

Signed-off-by: Michael Heimpold <mhei@heimpold.de>
2016-09-04 01:09:23 +02:00
Michael Heimpold
2c94623986 php7-pecl-raphf: add new package
This is the php7 version of php5-pecl-raphf package.

Signed-off-by: Michael Heimpold <mhei@heimpold.de>
2016-09-03 21:51:23 +02:00
Michael Heimpold
0c279fd0aa php7-pecl-propro: add new package
This is the php7 version of php5-pecl-propro package.

Signed-off-by: Michael Heimpold <mhei@heimpold.de>
2016-09-03 21:51:23 +02:00
Michael Heimpold
d6db439541 php7-pecl-dio: add new package
This is a heavy patched variant of the pecl dio module, which
now at least compiles for php7.

Patches are sent to maintainer - no response yet.

Signed-off-by: Michael Heimpold <mhei@heimpold.de>
2016-09-03 21:51:23 +02:00
Michael Heimpold
c6d45a041e php7: restructure patches
- Add some more patches from Debian
- Rename existing ones (our own patches starts with prefix 1000+)

Signed-off-by: Michael Heimpold <mhei@heimpold.de>
2016-09-03 21:51:23 +02:00
Michael Heimpold
292c2ffc18 php7: add new package
This is a copy of the existing php5 stuff, adopted for PHP7.

Please not, that its not supported to install both php5
and php7 in parallel on the target.

Signed-off-by: Michael Heimpold <mhei@heimpold.de>
2016-09-03 21:51:23 +02:00
Michael Heimpold
def97187d2 Treewide fix of typo: PKG_LICENSE_FILE --> PKG_LICENSE_FILES
Without the trailing _S_ the variable is not considered at all.

Signed-off-by: Michael Heimpold <mhei@heimpold.de>
2016-09-03 00:00:54 +02:00
champtar
dbba4823db Merge pull request #3121 from yousong/erlang-mips16
erlang: fix compilation error by disabling mips16
2016-09-02 06:01:54 +02:00
Yousong Zhou
c8c91ed23c erlang: fix compilation error by disabling mips16
This is caused by a toolchain bug and has been reported to GCC a
while a ago without receiving any responses yet [1].  Fix it at the
moment by not compiling with mips16 enabled.

Should fix #1750 and #1904.

 [1] Bug 71519 - "Out of range operand" bteqz inst generated by
     "casesi_internal_mips16_<mode>",
     https://gcc.gnu.org/bugzilla/show_bug.cgi?id=71519

Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
2016-09-01 16:49:25 +08:00
Gergely Kiss
ced7b903aa python-urllib3: import version 1.16
Signed-off-by: Gergely Kiss <mail.gery@gmail.com>
2016-08-30 18:13:03 +02:00
Hannu Nyman
37cde87699 Merge pull request #3113 from kissg1988/openpyxl
openpyxl: upgrade to version 2.4.0-b1
2016-08-30 18:46:13 +03:00
Hannu Nyman
9c7f720605 Merge pull request #3112 from kissg1988/gunicorn
gunicorn: upgrade to version 19.6.0
2016-08-30 18:46:04 +03:00
Hannu Nyman
84839ce3a6 Merge pull request #3114 from kissg1988/pytz
pytz: upgrade to version 2016.6.1
2016-08-30 18:45:38 +03:00
Gergely Kiss
a091f2fa87 pytz: upgrade to version 2016.6.1
Signed-off-by: Gergely Kiss <mail.gery@gmail.com>
2016-08-30 12:57:11 +02:00
Gergely Kiss
03318e2ffa openpyxl: upgrade to version 2.4.0-b1
Signed-off-by: Gergely Kiss <mail.gery@gmail.com>
2016-08-30 12:53:41 +02:00
Gergely Kiss
3b44caf10e gunicorn: upgrade to version 19.6.0
Signed-off-by: Gergely Kiss <mail.gery@gmail.com>
2016-08-30 12:27:44 +02:00
Gergely Kiss
beeeb15887 django-statici18n: upgrade to version 1.2.1
Signed-off-by: Gergely Kiss <mail.gery@gmail.com>
2016-08-30 12:22:30 +02:00
Gergely Kiss
591e22c8ae django-postoffice: upgrade to version 2.0.8
Signed-off-by: Gergely Kiss <mail.gery@gmail.com>
2016-08-30 12:19:05 +02:00
Gergely Kiss
8d2b88824b django-jsonfield: upgrade to version 1.0.1
Signed-off-by: Gergely Kiss <mail.gery@gmail.com>
2016-08-30 12:08:17 +02:00
Gergely Kiss
70fb482d3e django-constance: upgrade to version 1.2
Signed-off-by: Gergely Kiss <mail.gery@gmail.com>
2016-08-30 12:03:16 +02:00
Gergely Kiss
49512d9a0a django-compressor: upgrade to version 2.1
Signed-off-by: Gergely Kiss <mail.gery@gmail.com>
2016-08-30 11:55:39 +02:00
Gergely Kiss
41bb7f4faa django-appconf: upgrade to version 1.0.2
Signed-off-by: Gergely Kiss <mail.gery@gmail.com>
2016-08-30 11:48:16 +02:00
Michael Heimpold
353c5f1729 php5: update to 5.6.25
Signed-off-by: Michael Heimpold <mhei@heimpold.de>
2016-08-28 00:13:12 +02:00
Gergely Kiss
64d2162e52 python-dateutil: fix dependency
Signed-off-by: Gergely Kiss <mail.gery@gmail.com>
2016-08-24 20:35:34 +00:00
Gergely Kiss
16d635be4e six: remove duplicate package (see python-six)
Signed-off-by: Gergely Kiss <mail.gery@gmail.com>
2016-08-24 20:35:34 +00:00
Gergely Kiss
4e0accfe2c gunicorn: add missing dependency
Signed-off-by: Gergely Kiss <mail.gery@gmail.com>
2016-08-24 20:35:34 +00:00
Gergely Kiss
437621931a seafile: import version 5.1.1 and its dependencies
Signed-off-by: Gergely Kiss <mail.gery@gmail.com>
2016-08-24 20:35:33 +00:00
Frank Edelhäuser
23d3148fc3 moved upstream project to github
Signed-off-by: Frank Edelhaeuser <mrpace2@gmail.com>
(cherry picked from commit f5fe26ec21)
2016-08-23 15:02:10 +03:00
Gergely Kiss
2b80051716 pillow: upgrade to version 3.3.1
Signed-off-by: Gergely Kiss <mail.gery@gmail.com>
2016-08-22 18:39:24 +02:00
champtar
e128a2c3d9 Merge pull request #3035 from jow-/luasec-no-compression-fix
luasec: fix build with OPENSSL_NO_COMP
2016-08-18 16:00:16 +02:00
Hannu Nyman
4c83465b27 Merge pull request #2996 from jefferyto/python-enum34-1.1.6
python-enum34: update to 1.1.6
2016-08-14 14:19:05 +03:00
Dirk Neukirchen
bc86e32d43 node: fix soft/hard float compile on arm/mips
reported by brcm2708/2709 user on IRC

Signed-off-by: Dirk Neukirchen <plntyk.lede@plntyk.name>
2016-08-13 18:58:47 +02:00
champtar
e034a1c09b Merge pull request #2997 from jefferyto/python-cryptography-1.4
python-cryptography: update to 1.4, fixed lede compilation
2016-08-09 23:50:27 +02:00
champtar
3175d65aab Merge pull request #2999 from jefferyto/zope-interface-4.2.0
zope-interface: update to 4.2.0
2016-08-09 23:49:37 +02:00
champtar
80a8f4b139 Merge pull request #2998 from jefferyto/python-gmpy2-2.0.8
python-gmpy2: update to 2.0.8
2016-08-09 23:49:15 +02:00
champtar
d86f8a317f Merge pull request #3019 from mickeprag/python-pyserial
python-pyserial: update to 3.1.1
2016-08-09 23:45:46 +02:00
Jo-Philipp Wich
32f6b85a52 luasec: fix build with OPENSSL_NO_COMP
Currently luasec fails to build if OpenSSL was built without compression
support due to an undefined COMP_METHOD type:

    ssl.c: In function 'meth_compression':
    ssl.c:404:9: error: unknown type name 'COMP_METHOD'
       const COMP_METHOD *comp;
             ^
    <builtin>: recipe for target 'ssl.o' failed
    make[6]: *** [ssl.o] Error 1

Add a local patch to stub the `meth_compression()` function if there is no
compression support available in the OpenSSL library in order to allow
luasec to build.

A similar fix has been added upstream with
https://github.com/brunoos/luasec/pull/30

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2016-08-09 09:35:21 +02:00
Ted Hess
e96a676f9c Merge pull request #3007 from jefferyto/twisted-16.3.0
twisted: update to 16.3.0
2016-08-08 14:03:30 -04:00
Micke Prag
a14bf58fb9 python-pyserial: update to 3.1.1
Signed-off-by: Micke Prag <micke.prag@telldus.se>
2016-08-04 15:21:25 +02:00
Jeffery To
d409eb19e3 twisted: update to 16.3.0
Signed-off-by: Jeffery To <jeffery.to@gmail.com>
2016-07-31 20:25:01 +08:00
Jeffery To
1c690da27a zope-interface: update to 4.2.0
Signed-off-by: Jeffery To <jeffery.to@gmail.com>
2016-07-28 01:44:04 +08:00
Jeffery To
ef591ac05d python-gmpy2: update to 2.0.8
Signed-off-by: Jeffery To <jeffery.to@gmail.com>
2016-07-28 01:23:26 +08:00
Jeffery To
f9c788c290 python-cryptography: update to 1.4, fixed lede compilation
Signed-off-by: Jeffery To <jeffery.to@gmail.com>
2016-07-28 00:37:03 +08:00
Jeffery To
32516c5c89 python-enum34: update to 1.1.6
Signed-off-by: Jeffery To <jeffery.to@gmail.com>
2016-07-27 23:03:09 +08:00
champtar
1dbb481659 Merge pull request #2994 from jefferyto/python-cffi-1.7.0
python-cffi: update to 1.7.0
2016-07-27 16:45:50 +02:00
Jeffery To
8ea476fa45 python-cffi: update to 1.7.0
Signed-off-by: Jeffery To <jeffery.to@gmail.com>
2016-07-27 22:34:43 +08:00
Jeffery To
e2439e3e88 python-attrs: update to 16.0.0
Signed-off-by: Jeffery To <jeffery.to@gmail.com>
2016-07-27 22:05:15 +08:00
Michael Heimpold
96fa6629d6 php5: update to 5.6.23
This fixes the following CVEs:
 - in GD: CVE-2015-8874, CVE-2016-5766, CVE-2016-5767
 - in mbstring: CVE-2016-5768
 - in mcrypt: CVE-2016-5769
 - in SPL: CVE-2016-5770, CVE-2016-5771
 - in WDDX: CVE-2016-5772
 - in zip: CVE-2016-5773

Signed-off-by: Michael Heimpold <mhei@heimpold.de>
2016-07-19 23:14:33 +02:00
champtar
3f5ed39e40 Merge pull request #2446 from jow-/CVE-2016-2381
perl: securely handle duplicate environment variables [CVE-2016-2381]
2016-07-12 17:13:44 +02:00
champtar
85ae3d5505 Merge pull request #2954 from the-alien/master
python-psycopg2: update to 2.6.2
2016-07-11 10:09:08 +02:00
Yousong Zhou
30ae324754 Merge pull request #2953 from oskarirauta/master
lua-lsqlite3: new package
2016-07-11 09:01:32 +08:00
alien
6492d12bdf python-psycopg2: update to 2.6.2
Signed-off-by: Dmitry Trefilov <the-alien@live.ru>
2016-07-11 00:38:13 +03:00
Oskari Rauta
b03bc5760f lua-lsqlite3: new package
Maintainer: Oskari Rauta / @oskarirauta
Compile tested: x86, APU-4D, Chaos Calmer
Run tested: ar71xx, WNDR3800, Chaos Calmer and x86, APU-4D, Chaos
Calmer - tests done. Performs as should.

Description:
LuaSQLite3 is a thin wrapper around the public domain SQLite3 database
engine.

This commit adds another sqlite3 module for Lua. This is very popular
and in my opinion, suites even better for some projects requiring
sqlite3 in Lua than already luasql, even though luasql is more
versatile since it supports other databases as well. It wouldn't hurt
to include this in the repository. This can also be installed with
luarocks, but I prefer a openwrt package.

Signed-off-by: Oskari Rauta oskari.rauta@gmail.com
2016-07-10 19:20:01 +03:00
Stephen Walker
a53bf7192b packages: cleanup Makefile variables
Standard assignment is immediate expansion without any extraneous spacing, RFC822 compliant email addresses without any quotation marks and long git hashes

Signed-off-by: Stephen Walker <stephendwalker+github@gmail.com>
2016-07-09 14:50:58 -04:00
Daniel Dickinson
1b1a2db490 lang/perlbase: Fix missing utf8 dependency on unicore
perlbase-utf8 depends on perlbase-unicore however that dependency was missing.
This patch fixes that.

Signed-off-by: Daniel Dickinson <lede@daniel.thecshore.com>
2016-07-04 18:13:45 -04:00
champtar
dbff705c7e Merge pull request #2697 from NeoRaider/lua-cjson-host
lua-cjson: add host build support
2016-07-02 18:09:35 +02:00
champtar
c6aa245059 Merge pull request #2902 from commodo/python3-win-exe-files-remove
python3: do not allow packaging of windows exe files
2016-07-02 14:46:08 +02:00
Alexandru Ardelean
2dee0cf070 python3: do not allow packaging of windows exe files
Thanks to @ryzhovau for reporting.

Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
2016-06-27 15:38:24 +03:00
Alexandru Ardelean
aa2baa2120 python: do not allow packaging of windows exe files
Thanks to @ryzhovau for reporting.

Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
2016-06-27 15:31:12 +03:00
Jo-Philipp Wich
c9fd05542c Merge pull request #2635 from kissg1988/pillow
python-imglib/pillow: replace discontinued python-imglib (PIL) with pillow
2016-06-15 16:37:40 +02:00
champtar
40911be1e6 Merge pull request #2821 from jow-/lua-sha2-reloc
lua-sha2: switch to Github repository
2016-06-06 16:20:25 +02:00
Jo-Philipp Wich
f2c3884670 lua-sha2: switch to Github repository
The original Google Code repository is not available anymore, use the
equivalent Github repository instead.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2016-06-06 16:08:02 +02:00
Hannu Nyman
a291ce5485 Merge pull request #2815 from commodo/python-setuptools-upgrade
python-setuptools: upgrade to version 22.0.5
2016-06-04 14:52:22 +03:00
Hannu Nyman
8b70dbdfd5 Merge pull request #2814 from commodo/python-pip-upgrade
python-pip: upgrade to version 8.1.2
2016-06-04 14:51:53 +03:00
zyxmon
ddba337522 python3 versions of pip & setuptools
should be built in separate from python2.7 PKG_BUILD_DIR's.
This commit also upgrades packages

Signed-off-by: Andrey Sechin <zyxmon@gmail.com>
2016-06-04 14:20:04 +03:00
Alexandru Ardelean
97a85b3b53 python-setuptools: upgrade to version 22.0.5
Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
2016-06-04 12:49:44 +03:00
Alexandru Ardelean
2cfc8ddcb3 python-pip: upgrade to version 8.1.2
Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
2016-06-04 12:48:07 +03:00
Hirokazu MORIKAWA
865f44ef77 node,node-*: node update to v4.4.5 and Enhance CPU-arch variant. 2016-05-27 16:22:39 +09:00
Naoir
4f391d1f2a Merge pull request #2703 from cshore/pull-request-cgi-fix
lang/perl-cgi: Fix missing file for perl-cgi
2016-05-23 14:27:21 +02:00
John Crispin
12928412b8 Merge pull request #2731 from nxhack/node-hid-fix-git-submodule-issue
node-hid: fix git submodule issue
2016-05-23 09:37:51 +02:00
Hannu Nyman
ba6a7568de Merge pull request #2723 from the-alien/master
lang/python-ldap: Update to the version 2.4.25
2016-05-23 10:33:23 +03:00
Hirokazu MORIKAWA
a3148b64e6 node-hid: fix git submodule issue 2016-05-23 14:49:29 +09:00
Michael Heimpold
723e10cd6c php5: update to 5.6.21
This fixes the following CVEs:
 - in BCMath: CVE-2016-4537, CVE-2016-4538
 - in EXIF: CVE-2016-4542, CVE-2016-4543, CVE-2016-4544
 - in GD: CVE-2016-3074
 - in Intl: CVE-2016-4540, CVE-2016-4541
 - in XML: CVE-2016-4539

Signed-off-by: Michael Heimpold <mhei@heimpold.de>
2016-05-21 22:12:25 +02:00
alien
6b24e46adc lang/python-ldap: Update to the version 2.4.25 2016-05-21 00:23:05 +03:00
Hirokazu MORIKAWA
aa9202facb node-hid: fix compile error 2016-05-18 14:54:38 +09:00
Daniel Dickinson
53fc9cb27f lang/perl-cgi: Fix missing file for perl-cgi
Perl CGI fails to copy CGI.pm to package and therefore
perl programs and modules depend on CGI module fail.

Signed-off-by: Daniel Dickinson <lede@daniel.thecshore.com>
2016-05-16 00:01:59 -04:00
Matthias Schiffer
5a1f3d3d73
lua-cjson: add host build support
LUA_MATH_LIBRARY=m is added as lua-cjson fails to detect Lua in the host
build without it.

Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
2016-05-14 12:05:11 +02:00
Hirokazu MORIKAWA
c9115cdf54 node-*: node update to v4.4.4 2016-05-11 17:10:49 +09:00
Matthias Schiffer
bbce5fce72
node: fix undefined behaviour leading to broken code with GCC 6
Fixes segfaults occuring in the node host build when GCC 6 is used.

Backport of upstream commit 96198d5bc710a4e3ca49eeeb3b3fa7b8cb61547d.

Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
2016-05-09 16:27:48 +02:00
Matthias Schiffer
9125c3615f
node: update to v4.4.4
While we're at it, also enable parallel builds.

Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
2016-05-09 16:21:44 +02:00
Luiz Angelo Daros de Luca
ef30cd8b90 ruby: updated to 2.3.1
Signed-off-by: Luiz Angelo Daros de Luca <luizluca@gmail.com>
2016-05-01 19:56:52 -03:00
champtar
c201bd9594 Merge pull request #2647 from kissg1988/vala
vala: update to 0.32.0
2016-04-30 22:45:33 +02:00
Gergely Kiss
aa5616691b vala: update to 0.32.0
Signed-off-by: Gergely Kiss <mail.gery@gmail.com>
2016-04-30 22:26:59 +02:00
Dirk Feytons
d556c9440b luabitop: correct dependency
Signed-off-by: Dirk Feytons <dirk.feytons@gmail.com>
2016-04-29 21:40:17 +02:00
Gergely Kiss
fd9d063e94 PIL/pillow: replace discontinued python-imglib (PIL) with pillow
Signed-off-by: Gergely Kiss <mail.gery@gmail.com>
2016-04-29 00:22:04 +02:00
Michael Heimpold
195564de1d php5: add mod_intl (resolves #2620)
Signed-off-by: Michael Heimpold <mhei@heimpold.de>
2016-04-24 22:51:39 +02:00
Hirokazu MORIKAWA
5a118cda9e node update v0.12.13 2016-04-21 16:43:14 +09:00
Hannu Nyman
22b6275312 Merge pull request #2605 from commodo/python-fix-build
python: revert $(STAGING_DIR)/host to $(STAGING_DIR)/host change
2016-04-16 00:15:07 +03:00
Alexandru Ardelean
eec85f0ce7 python: revert $(STAGING_DIR)/host to $(STAGING_DIR)/host change
Also, override all prefix args in the HOST_CONFIGURE_ARGS
so that this works fine on CC/15.05.
There are some changes in core regarding package builds that
require this.

Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
2016-04-15 12:11:21 +03:00
Alexandru Ardelean
06fbe038ab python3: revert $(STAGING_DIR)/host to $(STAGING_DIR_HOST) change
Also, override all prefix args in the HOST_CONFIGURE_ARGS
so that this works fine on CC/15.05.
There are some changes in core regarding package builds that
require this.

Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
2016-04-15 12:09:19 +03:00
Hannu Nyman
bfdf179f21 Merge pull request #2602 from commodo/python3-pip
python3-pip: bump to version 8.1.1
2016-04-14 17:19:33 +03:00
Hannu Nyman
9082acce6c Merge pull request #2601 from commodo/python-pip-upgrade
python-pip: bump to version 8.1.1
2016-04-14 17:19:15 +03:00
Hannu Nyman
087127c1fd Merge pull request #2599 from commodo/python-setuptools-upgrade
python-setuptools: upgrade to version 20.7.0
2016-04-14 17:19:02 +03:00
Hannu Nyman
3f89c1f9c1 Merge pull request #2598 from commodo/python3-update-staging-dir-host
python3: change $(STAGING_DIR)/host to $(STAGING_DIR_HOST)
2016-04-14 17:18:52 +03:00
Hannu Nyman
adfc3ec9ce Merge pull request #2600 from commodo/python3-setuptools-upgrade
python3-setuptools upgrade to version 20.7.0
2016-04-14 17:18:35 +03:00
Alexandru Ardelean
32db03968f python3-pip: bump to version 8.1.1
Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
2016-04-14 17:01:25 +03:00
Alexandru Ardelean
7ebd492f5f python3: change $(STAGING_DIR)/host to $(STAGING_DIR_HOST)
I ommitted 1 element when pushing.

Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
2016-04-14 16:57:38 +03:00
Hannu Nyman
35a2cd6087 Merge pull request #2596 from commodo/python-update-staging-dir-host
python: change $(STAGING_DIR)/host to $(STAGING_DIR_HOST)
2016-04-14 14:47:01 +03:00
Alexandru Ardelean
7289a98f4b python-pip: bump to version 8.1.1
Seems it's some Unicode fix that required a small release.
https://pip.pypa.io/en/stable/news/

Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
2016-04-14 14:39:46 +03:00
Alexandru Ardelean
2b30456aa3 python3-setuptools upgrade to version 20.7.0
Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
2016-04-14 14:35:33 +03:00
Alexandru Ardelean
6255aa959d python-setuptools: upgrade to version 20.7.0
python-setuptools releases more often than my preference.
Every once in a while I sync up with the latest released.

Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
2016-04-14 14:32:21 +03:00
Alexandru Ardelean
c8e8aae579 python: change $(STAGING_DIR)/host to $(STAGING_DIR_HOST)
It seems that this can become an issue.
Found when building python3-setuptools from packages/trunk
in openwrt/15.05.

python3-setuptools is not in packages/for-15.05

Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
2016-04-14 11:56:21 +03:00
Alexandru Ardelean
57d94bbd44 python3: upgrade to version 3.5.1
Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
2016-04-14 11:41:48 +03:00
champtar
fb744a6581 Merge pull request #2486 from yousong/cp-fix
Drop the redundant -r option to $(CP)
2016-04-10 17:56:21 +02:00
Stefan Weil
a2d18499d7 lang/ruby: Fix typos (found by codespell)
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2016-04-09 19:47:45 +02:00
Stefan Weil
a91ab74d48 lang/perl: Fix typos (found by codespell)
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2016-04-09 19:47:45 +02:00
Marcel Denia
c7acba22e2 perl-cgi: Update to 4.28 2016-04-05 12:05:27 +02:00
Hirokazu MORIKAWA
bca789b6bb node-* : specify npm_config_cache directory 2016-04-01 13:49:16 +09:00
Hirokazu MORIKAWA
ac000220c3 node-* : specify npm_config_cache directory 2016-04-01 13:48:46 +09:00
Hirokazu MORIKAWA
47f466e88d node-* : specify npm_config_cache directory 2016-04-01 13:47:59 +09:00
Hirokazu MORIKAWA
10c6b41107 node-* : specify npm_config_cache directory 2016-04-01 13:46:31 +09:00
zyxmon
e1ec29c9df This fixes parallel builds
python-setuptools/host needs python-package.mk and python-host.mk files that are installed by python (non host build - InstallDev)
Signed-off-by: Andrey Sechin <zyxmon@gmail.com>
2016-03-31 22:22:25 +03:00
Michael Heimpold
80f02cd1ed php5: update to 5.6.19
Signed-off-by: Michael Heimpold <mhei@heimpold.de>
2016-03-23 21:13:55 +01:00