Commit graph

793 commits

Author SHA1 Message Date
Josef Schlehofer
2002e47732
text-unidecode: add new package
Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>
2019-03-28 14:32:21 +01:00
Jeffery To
e436e73f1c python,python3: Use only target package data for Build/InstallDev
This changes Build/InstallDev for both Python 2 and 3 to only copy files
from target Python, not from host Python, since InstallDev files are
used for target packages to link to other target packages.

In particular, usr/lib/python{2.7,3.7}/_sysconfigdata.py holds system
configuration data generated at build time, and is different for target
Python and host Python.

Signed-off-by: Jeffery To <jeffery.to@gmail.com>
2019-03-27 03:44:31 +08:00
Hannu Nyman
9c1a54a6f1
Merge pull request #8474 from jefferyto/python-cffi-1.12.2
python-cffi: Update to latest version
2019-03-22 20:48:04 +02:00
Jeffery To
52167d7f2c python-cffi: Update to latest version
Signed-off-by: Jeffery To <jeffery.to@gmail.com>
2019-03-22 21:50:36 +08:00
Jeffery To
6b15619ef7 python-attrs: Update to latest version
Signed-off-by: Jeffery To <jeffery.to@gmail.com>
2019-03-22 21:48:27 +08:00
Hannu Nyman
f2b1f9d432
Merge pull request #8445 from cotequeiroz/python-requests-oauthlib_1.2.0
python-requests-oauthlib: update to 1.2.0; python-oauthlib: update to 3.0.1
2019-03-21 17:36:13 +02:00
Karel Kočí
b8106eb291
python-influxdb: update to 5.2.2
Signed-off-by: Karel Kočí <karel.koci@nic.cz>
2019-03-20 16:26:18 +01:00
Hannu Nyman
e2884eb99a
Merge pull request #8446 from cotequeiroz/python-qrcode_6.1
python-qrcode: bump to 6.1, fix dependencies
2019-03-19 16:37:23 +02:00
Alexandru Ardelean
b485a90aa3 python3: remove OpenSSL deprecated API patch
Fixes: https://github.com/openwrt/packages/issues/8399

These 2 patches cause some breakage for other packages.
For now, we drop them and wait for upstream to finalize a fix.
We can live with deprecated SSL APIs for a while. No need to hurry, since
this doesn't seem to help.

Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
2019-03-19 14:09:03 +08:00
Eneas U de Queiroz
ad001446d5
python-requests-oauthlib: update to 1.2.0
This version adds compatibility with OAuthlib 3.0.0 and above.

Signed-off-by: Eneas U de Queiroz <cote2004-github@yahoo.com>
2019-03-18 18:16:11 -03:00
Eneas U de Queiroz
ef59c595d4
python-oauthlib: update to 3.0.1
This is a major update with bufixes, new features and API changes.

Signed-off-by: Eneas U de Queiroz <cote2004-github@yahoo.com>
2019-03-18 18:16:11 -03:00
Hannu Nyman
c06179ba98
Merge pull request #8381 from cotequeiroz/python-certifi_2019.3.9
python-certifi: Update to 2019.3.9
2019-03-17 06:55:15 +02:00
Hannu Nyman
6c001178c1
Merge pull request #8376 from jefferyto/python-package-data-2
python-pyopenssl,python-service-identity: Update package data
2019-03-16 08:26:07 +02:00
Hannu Nyman
6c5f68ad14
Merge pull request #8404 from BKPepe/bottle
python3-bottle: update to version 0.12.16
2019-03-15 08:41:54 +02:00
Josef Schlehofer
98c704d3f0
python3-bottle: update to version 0.12.16
Add LICENSE file
Add CPE ID
Remove current maintainer and add me as maintainer

Signed-off-by: Josef Schlehofer <josef.schlehofer@nic.cz>
2019-03-13 21:45:10 +01:00
Stepan Henek
2aa66b0a6f
python3-bottle: use Py3Package for installation
Signed-off-by: Stepan Henek <stepan.henek@nic.cz>
2019-03-13 21:41:03 +01:00
Eneas U de Queiroz
9429b83840
click-log: fix circular dependency
Removing python3 conditional DEPENDS to avoid a circular dependency.

Signed-off-by: Eneas U de Queiroz <cote2004-github@yahoo.com>
2019-03-13 14:34:49 -03:00
Eneas U de Queiroz
8061b28ea0
python-chardet: fix Makefile typo
Signed-off-by: Eneas U de Queiroz <cote2004-github@yahoo.com>
2019-03-13 14:34:49 -03:00
Eneas U de Queiroz
d8de24183f
python-requests: fix circular dependency
Removing python3 conditional DEPENDS to avoid a circular dependency.
Fixes a typo in Makefile.

Signed-off-by: Eneas U de Queiroz <cote2004-github@yahoo.com>
2019-03-13 14:34:49 -03:00
Eneas U de Queiroz
1bf60e9b58
python-ply: fix circular dependency
Removing python3 conditional DEPENDS to avoid a circular dependency.

Signed-off-by: Eneas U de Queiroz <cote2004-github@yahoo.com>
2019-03-13 14:34:49 -03:00
Eneas U de Queiroz
5590cda91b
python-simplejson: fix circular dependency
Removing python2 conditional DEPENDS to avoid a circular dependency.

Signed-off-by: Eneas U de Queiroz <cote2004-github@yahoo.com>
2019-03-13 14:34:49 -03:00
Hannu Nyman
f9dd076a46
Merge pull request #8371 from neheb/patch-1
python: Add PKG_CPE_ID for proper CVE tracking
2019-03-12 19:06:41 +02:00
Hannu Nyman
840d05eb8e
Merge pull request #8368 from neheb/p
python: Refresh patches
2019-03-12 19:06:18 +02:00
Rosen Penev
3b935060e8 python3: Fix compilation with deprecated OpenSSL APIs
Also refreshed patches.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
2019-03-11 15:08:09 -07:00
Rosen Penev
1d04e54651 python: Add PKG_CPE_ID for proper CVE tracking
Signed-off-by: Rosen Penev <rosenp@gmail.com>
2019-03-11 13:14:26 -07:00
Hannu Nyman
9e5a4bf4fb python-requests: adjust to chardet rename
Adjust to the rename of chardet to python-chardet

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2019-03-11 21:31:00 +02:00
Karel Kočí
37633c97d7
python-influxdb: add package
Signed-off-by: Karel Kočí <karel.koci@nic.cz>
2019-03-11 17:21:32 +01:00
Karel Kočí
83e76672d7
python-paho-mqtt: add package
Signed-off-by: Karel Kočí <cynerd@email.cz>
2019-03-11 17:21:32 +01:00
Karel Kočí
82b47309d8
python-appdirs: add package
Signed-off-by: Karel Kočí <cynerd@email.cz>
2019-03-11 17:21:31 +01:00
Karel Kočí
091d93d2a5
python-schema: add package
Signed-off-by: Karel Kočí <karel.koci@nic.cz>
2019-03-11 17:21:31 +01:00
Karel Kočí
c9f70feec3
python-contextlib2: add package
Signed-off-by: Karel Kočí <cynerd@email.cz>
2019-03-11 17:21:31 +01:00
Karel Kočí
1418f401b5
python-jsonpath-ng: add package
Signed-off-by: Karel Kočí <karel.koci@nic.cz>
2019-03-11 17:21:31 +01:00
Karel Kočí
0361b39628
python-decorator: add package
Signed-off-by: Karel Kočí <karel.koci@nic.cz>
2019-03-11 17:21:31 +01:00
Karel Kočí
d0e3345aca
click-log: add package
Signed-off-by: Karel Kočí <karel.koci@nic.cz>
2019-03-11 17:21:31 +01:00
Hannu Nyman
c332e6420a
Merge pull request #8377 from Cynerd/add-python3-packages
Add python3 variant for chadet, simplejson, requests and pytz
2019-03-11 16:31:48 +02:00
Hannu Nyman
3a5fd27aac
Merge pull request #8033 from ysc3839/add-pycryptodome
python-cryptodome: add new package
2019-03-11 16:29:20 +02:00
Eneas U de Queiroz
c0e4ecac3a
python-certifi: Update to 2019.3.9
Signed-off-by: Eneas U de Queiroz <cote2004-github@yahoo.com>
2019-03-11 08:30:51 -03:00
Jeffery To
450891679b python-pyopenssl,python-service-identity: Update package data
This updates the Python 2 and 3 versions of each package to share the
same title field.

This also updates the package title, url and source urls.

Signed-off-by: Jeffery To <jeffery.to@gmail.com>
2019-03-11 19:30:06 +08:00
Eneas U de Queiroz
9c4d764b27
python-qrcode: bump to 6.1, fix dependencies
The package was missing dependencies on pillow and python-setuptools.

The Makefile was simplified.

Signed-off-by: Eneas U de Queiroz <cote2004-github@yahoo.com>
2019-03-11 08:29:46 -03:00
Karel Kočí
3e1f90967e
python-pytz: add Python3 version
Signed-off-by: Karel Kočí <cynerd@email.cz>
2019-03-11 10:43:38 +01:00
Karel Kočí
e47c03c7d5
python-requests: add Python3 version
Signed-off-by: Karel Kočí <cynerd@email.cz>
2019-03-11 10:43:37 +01:00
Karel Kočí
82565d1e73
python-simplejson: add Python3 specific package
Package is rewritten to be current type of python package with variants
but for backward compatibility the simplejson package name was left as
is and new Python3 specific package was named correctly as
python3-simplejson.

Signed-off-by: Karel Kočí <cynerd@email.cz>
2019-03-11 10:43:37 +01:00
Karel Kočí
f80fd7e44d
python-chardet: add Python3 variant
Signed-off-by: Karel Kočí <karel.koci@nic.cz>
2019-03-11 10:43:37 +01:00
Hannu Nyman
2cfecc66a0
Merge pull request #7789 from neheb/pcapy
python-pcapy: Add uclibc++ support
2019-03-10 18:48:25 +02:00
Hannu Nyman
c13b537885
Merge pull request #8211 from cshoredaniel/pr-update-bcrypt
bcrypt: Update to 3.1.6
2019-03-10 09:53:59 +02:00
Rosen Penev
5d4f817865 python: Refresh patches
git is intollerant when it comes to fuzz. this fixes it.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
2019-03-08 18:48:45 -08:00
Alexandru Ardelean
8e493eb19d python: bump to version 2.7.16
This change updates Python to version 2.7.16, which is a bugfix release
in the Python 2.7 series.
This also removes patches back-ported from upstream.

Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
2019-03-08 19:34:38 +08:00
Daniel Golle
17835f4b04 Flask: now depends on python3-setuptools
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
2019-03-08 02:03:16 +01:00
Hannu Nyman
39fe02525e
Merge pull request #8338 from BKPepe/python-dns
python-dns: Add Python3 variant, update to 1.16.0
2019-03-06 18:00:18 +02:00
Karel Kočí
35c7bcc85e
Jinja2: add missing dependency on markupsafe
Signed-off-by: Karel Kočí <karel.koci@nic.cz>
2019-03-05 17:19:51 +01:00
Rosen Penev
39f763f0ee pyodbc: Added ability to compile with uclibc++
Allows a smaller size.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
2019-03-03 16:15:31 -08:00
Josef Schlehofer
ae9cfe503b
python-dns: Add Python3 variant, update to 1.16.0
As it was suggested in PR from the current package maintainer, I have become a new maintainer.

Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>
2019-03-03 21:43:02 +01:00
Daniel Golle
993d0414f7 python-gnupg: update to version 0.4.4
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
2019-03-02 23:20:10 +01:00
Daniel Golle
d898a8ac1f pyodbc: update to version 4.0.26
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
2019-03-02 23:10:46 +01:00
Daniel Golle
c843d478f5 MarkupSafe: update to version 1.1.1
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
2019-03-02 22:46:54 +01:00
Hannu Nyman
8be3292b1e
Merge pull request #8322 from jefferyto/python-cryptography-update
python-cryptography: Update to latest version
2019-03-01 23:07:39 +02:00
Hannu Nyman
c722f6e5e1
Merge pull request #8308 from commodo/python3-pip-fix
python3-pip: fix install rule
2019-03-01 23:07:09 +02:00
Hannu Nyman
b710d098f2
Merge pull request #8307 from commodo/python3-split-urllib
python3: split python3-urllib from python3-light
2019-03-01 23:06:25 +02:00
Jeffery To
fc8c0c4f95 python-cryptography: Update to latest version
Version 2.6 includes OpenSSL no-engine support.

This also removes python-idna as a dependency. idna became optional with
version 2.5 (https://cryptography.io/en/latest/changelog/#v2-5).

This also updates the package title field and updates both Python 2 and
3 versions to use the same field.

Signed-off-by: Jeffery To <jeffery.to@gmail.com>
2019-03-02 01:46:48 +08:00
Richard Yu
2c63742f25
python-cryptodome: add new package
PyCryptodome is an almost drop-in replacement for the old PyCrypto library.

Signed-off-by: Richard Yu <yurichard3839@gmail.com>
2019-03-01 14:12:24 +08:00
Alexandru Ardelean
998ff3471a python,python3: add Jeffery To as co-maintainer
For a while now, Jeffery has helped quite a lot with Python, and is now
unofficial go-to guy [for problems] with Python packages.

This change adds him as co-maintainer [if he also agrees].

I'm not going away; I'll be still doing the same work for Python.
This change serves to recognize Jeffery in an official way, since he's
already taking on these things. And 2 co-maintainers is better in case one
kicks the bucket [by accident].

Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
2019-02-27 12:33:27 +02:00
Alexandru Ardelean
1b96dc0171 python3-pip: fix install rule
Fixes: https://github.com/openwrt/packages/issues/8301

This seems to have slipped for some time. No idea if it ever worked.
It could be that this worked at some point.

In any case, the shebang is properly updated now.

Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
2019-02-27 12:18:19 +02:00
Alexandru Ardelean
82981d1d55 python3: split python3-urllib from python3-light
This is the result of this discussion:
  https://github.com/openwrt/packages/issues/8285

`urllib.request` requires the `email` module/lib, which was part of
python3-light.
This change moves the Lib/urllib folder from the python3-light into it's
own package, making it lighter. At least this way, users that want `urllib`
(on top of `python3-light`) will be forced to install it via opkg and this
will make sure `python3-email` gets installed as well.

Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
2019-02-26 15:37:48 +02:00
Hannu Nyman
e3e139d927
Merge pull request #8263 from Cynerd/python-fix-collision
python,python3: do not package binary files to base packages
2019-02-24 10:14:42 +02:00
Hannu Nyman
5345d9e49f
Merge pull request #8273 from jefferyto/python-pkg-setup-dir
python,python3: Add PYTHON_PKG_SETUP_DIR
2019-02-23 19:40:03 +02:00
Alexandru Ardelean
9b36b449dc python,python3: allow users to override python args & vars
If users want to define these before including python[3]-package.mk, these
vars will be overridden during the include.
So, override these vars if they haven't been defined.

Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
2019-02-23 17:00:59 +08:00
Jeffery To
5d72e9bf7e python,python3: Add PYTHON_PKG_SETUP_DIR
This adds a variable (PYTHON_PKG_SETUP_DIR / PYTHON3_PKG_SETUP_DIR) that
allows a Python package Makefile to control the directory where setup.py
is called (as part of PyBuild/Compile/Default /
Py3Build/Compile/Default).

Signed-off-by: Jeffery To <jeffery.to@gmail.com>
2019-02-23 16:59:22 +08:00
Hannu Nyman
90bbf7f221
Merge pull request #8266 from BKPepe/urllib3
python-urllib3: add variant for Python3
2019-02-21 18:39:40 +02:00
Karel Kočí
7175b2b47d
python,python3: do not package binary files to base packages
Thanks to fix 200a5a2eec all base packages
now contain all binaries that are generated as part of python
installation. That causes collision between those packages with package
managers that consider this such as Turris updater-ng. This is also just
wrong. Those binaries were not included and should not be after
mentioned fix as well.

This just adds empty install definition. The idea is to override the
default one that is otherwise used.

Signed-off-by: Karel Kočí <karel.koci@nic.cz>
2019-02-21 09:33:49 +01:00
Jeffery To
f562ccf2ca multiple-python-packages: Update package data
This updates the Python 2 and 3 versions of each package to share the
same title field. (For packages that only had this change, their
PKG_RELEASE were not incremented.)

This also updates the package title, url and source urls, where
necessary.

Signed-off-by: Jeffery To <jeffery.to@gmail.com>
2019-02-20 19:19:20 +08:00
Josef Schlehofer
6f02b3ae64
python-urllib3: add variant for Python3
Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>
2019-02-20 09:50:58 +01:00
Jeffery To
8100d33b04 python-(automat|crypto|gmpy2|parsley): Use default compile
This updates these packages to use the default PyBuild/Compile, instead
of defining their own Build/Compile.

This also updates the Python 2 and 3 versions to use the same TITLE.

This also updates the source url and adds src packages for python-gmpy2.

Signed-off-by: Jeffery To <jeffery.to@gmail.com>
2019-02-19 22:54:43 +08:00
Hannu Nyman
d1d0fac7d8
Merge pull request #8251 from jefferyto/python3-twisted-install
python-twisted: Fix python3 install
2019-02-19 15:49:29 +02:00
Jeffery To
22e2d592e0 python-cffi: Update to 1.12.1
Signed-off-by: Jeffery To <jeffery.to@gmail.com>
2019-02-19 16:51:21 +08:00
Jeffery To
6e55df6ccb python-txsocks: Fix twisted dependency
This fixes the dependency on twisted, which was renamed to
python-twisted earlier.

This also changes the package to use the default PyBuild/Compile.

Signed-off-by: Jeffery To <jeffery.to@gmail.com>
2019-02-19 15:29:21 +08:00
Jeffery To
4b16ae6a11 python-twisted: Fix python3 install
The install routine was written before the fix in #8241, and wasn't
sufficiently tested with that fix.

Signed-off-by: Jeffery To <jeffery.to@gmail.com>
2019-02-19 14:36:36 +08:00
Hannu Nyman
9c82fc1136
Merge pull request #8240 from jefferyto/python-twisted
twisted: Rename package, fix errors
2019-02-18 18:34:19 +02:00
Jeffery To
200a5a2eec python,python3: Fix calling default PyPackage/install
This fixes Package/*/install to call PyPackage/*/install correctly.
Previously, if a package used the default PyPackage/*/install, then it
would not called. (A custom-defined PyPackage/*/install would be called
with no issue.)

Signed-off-by: Jeffery To <jeffery.to@gmail.com>
2019-02-18 16:33:26 +08:00
Jeffery To
247d162e2e twisted: Rename package, fix errors
This renames the Python 2 twisted package to python-twisted, and updates
dependents (i.e. obfsproxy) to reference the updated name.

This also fixes conflicts between the Python 2 and 3 packages. Twisted
installs some scripts to /usr/bin, and previously scripts for both
packages used the same names. This adds a "3" suffix to scripts
installed by python3-twisted.

This also adds python[3]-setuptools as a dependency, as the scripts
installed to /usr/bin depend on pkg_resources (part of setuptools).

Signed-off-by: Jeffery To <jeffery.to@gmail.com>
2019-02-18 16:11:02 +08:00
Hannu Nyman
5524d12e86
Merge pull request #8197 from Cynerd/python3-twisted
twisted: add Python3 variant
2019-02-13 18:49:51 +02:00
Karel Kočí
045e76c8e9
twisted: add Python3 variant
Signed-off-by: Karel Kočí <karel.koci@nic.cz>
2019-02-12 18:33:38 +01:00
Alexandru Ardelean
382f1ec6e4 python-pyopenssl: bump to version 19.0.0
Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
2019-02-12 12:39:55 +02:00
Alexandru Ardelean
e31f3b5a13 python-lxml: bump to version 4.3.1
Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
2019-02-12 12:39:55 +02:00
Alexandru Ardelean
c2fe5fae42 python-cryptography: bump to version 2.5
Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
2019-02-12 12:39:54 +02:00
Alexandru Ardelean
a06a7870f3 python-pyasn1-modules: bump to version 0.2.4
Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
2019-02-12 12:31:55 +02:00
Alexandru Ardelean
c767598097 python,python3: fix CVE-2019-5010 - Denial of Service
This patch addresses issue:
  [ssl][CVE-2019-5010] TALOS-2018-0758 Denial of Service

Link to Python issue:
  https://bugs.python.org/issue35746

Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
2019-02-12 12:31:55 +02:00
Alexandru Ardelean
ed862da936 python,python3: move shebang handle in install script
This extends the Python[3] shebang fixup to all packages.
Only Python scripts in `/usr/bin` will be handled at the moment. Later it
may make sense to also cover executables in `/bin`, though typically Python
executables shouldn't be placed there.

Previously the shebang handling was only done for python[3]-pip &
python[3]-setuptools.

Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
2019-02-12 12:31:55 +02:00
Alexandru Ardelean
1bf7679211 python,python3: make deletion tolerant for paths with spaces
Piping to xargs does not handle spaces in paths too well, because it splits
up the paths.
For deleting empty dirs, we also need to do several retries, otherwise
`find` will try to go through the directories after they're deleted.

Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
2019-02-12 12:31:54 +02:00
Daniel F. Dickinson
a3bbbbc915 bcrypt: Update to 3.1.6
Update to latest version even though it's a no-op for us
(change is for compilation on Haiku) because otherwise uscan (and
folks who don't check changelogs for relevant changes) will complain.

Signed-off-by: Daniel F. Dickinson <cshored@thecshore.com>
2019-02-12 01:45:42 -05:00
Alexandru Ardelean
14d0a9c58d python,python3: move .exe removal in python-package-install.sh script
It's a common operation for both Python & Python3, so move it to the
script `python-package-install.sh` script.

Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
2019-02-04 16:38:12 +02:00
Hannu Nyman
13e1f0fdf2
Merge pull request #7921 from daniel-santos/python-idna
python-idna: Add missing dependency on python(3)-codecs
2019-01-23 18:44:58 +02:00
Hannu Nyman
f03fd0525a
Merge pull request #7953 from neheb/patch-5
pytz: Update to 2018.9
2019-01-20 00:01:14 +02:00
Hannu Nyman
52021e64b6
Merge pull request #7978 from cshoredaniel/pr-python-pkgconfig
python3: Add installation of pkconfig to InstallDev section.
2019-01-19 11:49:12 +02:00
Hannu Nyman
9d0e8f5aff
Merge pull request #7948 from cshoredaniel/pr-add-bcrypt
bcrypt: Add python secure password hashing library
2019-01-18 17:32:36 +02:00
Daniel F. Dickinson
682cdf3b9c python3: install pkgconfig to staging
Some programs that use the Python C API have difficulties finding
cross-compiled Python3 without the pkgconfig, so make sure we have
python3.pc and python-3.7.pc in pkgconfig staging dir.

CircleCI requires a package Makefile change to actually
do the CI check, so bump PKG_RELEASE.

Signed-off-by: Daniel F. Dickinson <cshored@thecshore.com>
2019-01-18 04:40:43 -05:00
Rosen Penev
f6ceb85a25
pytz: Update to 2018.9
Signed-off-by: Rosen Penev <rosenp@gmail.com>
2019-01-13 10:44:10 -08:00
Daniel F. Dickinson
f0269b2ab7 bcrypt: Add python secure password hashing library
bcrypt is a secure password hashing mechanism and is
extremely useful for more secure Radicale authentication,
so add it.

Signed-off-by: Daniel F. Dickinson <cshored@thecshore.com>
2019-01-13 00:57:23 -05:00
Jeffery To
19c3f37f0f python: Fix lib2to3 fixes search
This is the patch from c98b12d9a9 (#7931),
applied for python 2.

Signed-off-by: Jeffery To <jeffery.to@gmail.com>
2019-01-13 05:59:20 +08:00
Hannu Nyman
cf327c3d89
Merge pull request #7900 from cshoredaniel/pr-add-vobject
vobject: Add python vCard/vCalendar Library
2019-01-12 19:03:11 +02:00
Hannu Nyman
179b06d76d
Merge pull request #7931 from kidome/master
python3: enable lib2to3 to also search .pyc files.
2019-01-12 18:28:34 +02:00
Daniel Santos
a350edf1a9 python-idna: Add missing dependency on python(3)-codecs
This error is exposed when using python-minimal.

Signed-off-by: Daniel Santos <daniel.santos@pobox.com>
2019-01-12 00:53:04 -06:00
Hannu Nyman
7c740b4ca9
Merge pull request #7913 from commodo/python-readme
lang/python/README.md: add doc describing the lang/python subtree
2019-01-09 21:05:42 +02:00
Nj Hsiong
c98b12d9a9 python3: enable lib2to3 to also search and fix .pyc files.
python3's lib2to3 would fail in silence if python3 and its packages are installed as compiled .pyc files. Root cause is, in Lib/lib2to3/refactor.py, the function get_all_fix_names only searches '.py' fix names.

Signed-off-by: Nj Hsiong <nj.hsiong@gmail.com>
2019-01-09 22:06:52 +08:00
Alexandru Ardelean
77bce0c672 lang/python/README.md: add doc describing the lang/python subtree
It was a semi-popular request a while back that I put off for a while.
Here's a quick doc.
I'll update it later as things change and I don't forget.
It also lets other people update if something is wrong.

Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
2019-01-08 17:38:16 +02:00
Hannu Nyman
192d51ce31
Merge pull request #7899 from cshoredaniel/pr-update-dateutil
python-dateutil: update dateutil packaging
2019-01-08 16:48:51 +02:00
Hannu Nyman
924b5bbf35
Merge pull request #7908 from cshoredaniel/pr-add-passlib
passlib: Add python library
2019-01-08 15:14:01 +02:00
Hannu Nyman
aac3a90518
Merge pull request #7903 from commodo/pyasn1-modules
python-pyasn1-modules: bump to version 0.2.3
2019-01-08 15:06:20 +02:00
Daniel F. Dickinson
c239b06e2d passlib: Add python library
passlib is extremely useful for more secure Radicale
authentication so add it.

Signed-off-by: Daniel F. Dickinson <cshored@thecshore.com>
2019-01-08 03:58:28 -05:00
Daniel F. Dickinson
c0f1f32eee python-dateutil: Update packaging and add Python3 version
Update the packaging to use the generic bits by @commodo.
Radicale 2.x requires Python3 and python-dateutils, so
build for Python3 as well.

Signed-off-by: Daniel F. Dickinson <cshored@thecshore.com>
2019-01-07 11:13:46 -05:00
Alexandru Ardelean
4bd29418fc python-pyasn1-modules: bump to version 0.2.3
This change upgrades the version of pyasn1-modules to version 0.2.3.
Run-tested on an x86 VM.

Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
2019-01-07 15:04:07 +02:00
Alexandru Ardelean
39519b2ef8 python-lxml: bump to version 4.3.0
This change upgrades the version of lxml to 4.3.0.
Run-tested on an x86 VM.

Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
2019-01-07 15:03:34 +02:00
Daniel F. Dickinson
624a3f5fc0 vobject: Add python library
Lbrary for vCard and vCalendar support for Python{3}.
vobject is used by Radicale2 so add it.

Signed-off-by: Daniel F. Dickinson <cshored@thecshore.com>
2019-01-07 07:33:00 -05:00
Alexandru Ardelean
a16dea9627 python,python3: use setuptools & pip versions from python{3}-version.mk
`setuptools` & `pip` whl files were selected via wildcards, because it was
easier in the beginning.
Also, initially there weren't any PYTHON{3}_{SETUTPTOOLS/PIP}_VERSION
variables. But now since these vars exist, it makes sense to use them,
because we can catch easier (at build) time if Python/Python3 bump these
versions.

Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
2019-01-02 23:42:01 +02:00
Daniel F. Dickinson
a37a0e8a4d python3: Fix py3 pip and setuptools versions
The update to Python 3.7.2 missed updating pip and setuptools versions,
so fix that.

Signed-off-by: Daniel F. Dickinson <cshored@thecshore.com>
2019-01-02 02:59:08 -05:00
Hannu Nyman
0f1c9b8c46
Merge pull request #7821 from commodo/python3-7-2
python3: bump to version 3.7.2
2019-01-01 12:54:48 +02:00
Hannu Nyman
5240700752
Merge pull request #7818 from commodo/python-CVE-2018-14647
python: backport CVE-2018-14647 patches from upstream
2018-12-31 22:32:18 +02:00
Alexandru Ardelean
1e9a248a56 python3: bump to version 3.7.2
Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
2018-12-31 19:26:46 +02:00
Alexandru Ardelean
3c8172255a python: backport CVE-2018-14647 patches from upstream
These patches are backports from Python 2.7 upstream.
The security issue is described here:
  https://nvd.nist.gov/vuln/detail/CVE-2018-14647

The Python bug report:
  https://bugs.python.org/issue34623

Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
2018-12-31 17:53:41 +02:00
Alexandru Ardelean
54e48669e7 python-pyasn1: bump to version 0.4.5
Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
2018-12-31 00:04:50 +02:00
Hannu Nyman
0e9715553c
Merge pull request #7755 from jefferyto/python-dist-info
python/python3: fix .dist-info missing for setuptools and pip
2018-12-30 20:16:38 +02:00
Rosen Penev
a005877193 python-pcapy: Add uclibc++ support
Reduces space required on the target device.

Added patch to get rid of the explicit libstdcpp dependency.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
2018-12-26 15:54:21 -08:00
Hannu Nyman
b42779ed71
Merge pull request #7655 from cotequeiroz/pyjwt-1.7.1
pyjwt: bump to version 1.7.1
2018-12-26 19:40:39 +02:00
Hannu Nyman
467649955c
Merge pull request #7716 from neheb/patch-20
python-six: Update to 1.12.0
2018-12-26 19:36:39 +02:00
Jeffery To
2f55f2a7b5 python/python3: fix .dist-info missing for setuptools and pip
Without .dist-info (similar to .egg-info), setuptools and pip are not
discoverable by pkg_resources.

Signed-off-by: Jeffery To <jeffery.to@gmail.com>
2018-12-22 22:16:52 +08:00
Hannu Nyman
cb6fc9d7a9
Merge pull request #7692 from neheb/patch-6
django: Update to 1.11.17
2018-12-21 21:16:48 +02:00
Hannu Nyman
069544bedd
Merge pull request #7711 from neheb/patch-16
python-service-identity: Update to 18.1.0
2018-12-21 17:38:25 +02:00
Hannu Nyman
d56d13e9ec
Merge pull request #7709 from neheb/patch-14
python-mysql: Update to 1.3.14
2018-12-21 17:14:41 +02:00
Rosen Penev
05007d60cf python-service-identity: Update to 18.1.0
Switched URL to standard one.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
2018-12-19 12:36:28 -08:00
Hannu Nyman
024a554fbd
Merge pull request #7718 from neheb/patch-23
python-dpkt: Update to 1.92
2018-12-19 16:49:35 +02:00
Rosen Penev
54918d4d46 python-dpkt: Update to 1.9.2
Signed-off-by: Rosen Penev <rosenp@gmail.com>
2018-12-17 19:14:48 -08:00
Rosen Penev
e01ad70f94
python-six: Update to 1.12.0
Switch to standard pythonhosted URL.

Cosmetic Makefile rearrangements for consistency between packages.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
2018-12-17 18:33:15 -08:00
Rosen Penev
c49b170809
python-requests: Update to 2.21.0
Signed-off-by: Rosen Penev <rosenp@gmail.com>
2018-12-17 14:19:32 -08:00
Rosen Penev
019bcd9780 python-mysql: Update to 1.3.14
Signed-off-by: Rosen Penev <rosenp@gmail.com>
2018-12-17 14:17:11 -08:00
Rosen Penev
c57e503cf5
django: Update to 1.11.17
Added PKG_CPE_ID for proper CVE tracking.

Some Makefile rearrangements for consistency.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
2018-12-16 11:33:26 -08:00
Eneas U de Queiroz
253334011c pyjwt: bump to version 1.7.1
This is a bugfix release.

Signed-off-by: Eneas U de Queiroz <cote2004-github@yahoo.com>
2018-12-13 16:24:38 -02:00
Rosen Penev
ae79f0e14f python-psycopg2: Update to 2.7.6.1
Signed-off-by: Rosen Penev <rosenp@gmail.com>
2018-12-08 18:12:55 -08:00
Hannu Nyman
e81189e983
Merge pull request #7607 from cotequeiroz/python-egenix-mx-base_sources
python-egenix-mx-base: use source distribution
2018-12-08 21:59:38 +02:00
Eneas U de Queiroz
e1cb6d5fbb python-egenix-mx-base: use source distribution
The zip file distribution did not include the source files, and
downloaded pre-built binaries from the web.

Signed-off-by: Eneas U de Queiroz <cote2004-github@yahoo.com>
2018-12-07 14:17:37 -02:00
Rosen Penev
e56e1ad746 python-idna: Update to 2.8
Changed URL to pythonhosted one.

Some Makefile rearrangements for consistency between packages.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
2018-12-06 15:23:32 -08:00
Hannu Nyman
52d37c6cb7
Merge pull request #7578 from cotequeiroz/django-simple-captcha_PyPackage
django-simple-captcha: use PyPackage to build
2018-12-06 10:51:33 +02:00
Hannu Nyman
c53afcb99f
Merge pull request #7579 from cotequeiroz/django-webpack-loader_PyPackage
django-webpack-loader: use PyPackage to build
2018-12-06 10:51:18 +02:00
Hannu Nyman
8e7efabb7d
Merge pull request #7577 from cotequeiroz/django-ranged-response_PyPackage
django-ranged-response: use PyPackage to build
2018-12-06 10:50:08 +02:00
Hannu Nyman
fa8c03d68d
Merge pull request #7576 from cotequeiroz/django-formtools_PyPackage
django-formtools: use PyPackage to build
2018-12-06 10:49:54 +02:00
Hannu Nyman
18a10cec48
Merge pull request #7580 from cotequeiroz/pyjwt-1.7.0
pyjwt: Bump to version 1.7.0 -- python-requests-oauthlib:  use PyPackage
2018-12-06 10:28:12 +02:00
Hannu Nyman
2fafc4f67e
Merge pull request #7582 from cotequeiroz/python-requests_PyPackage
python-requests: use PyPackage to build
2018-12-06 08:53:17 +02:00
Hannu Nyman
ba75b83a5f
Merge pull request #7583 from cotequeiroz/python-certifi-2018.11.29
python-certifi: Update to 2018.11.29, add python3
2018-12-06 08:52:09 +02:00
Hannu Nyman
ac57e7b700
Merge pull request #7581 from cotequeiroz/python-oauthlib_python3
python-oauthlib: add python3 package
2018-12-06 08:51:01 +02:00
Eneas U de Queiroz
b01258e284 pytz: fix host-compile dependency
Add HOST_BUILD_DEPENDS=python/host

Signed-off-by: Eneas U de Queiroz <cote2004-github@yahoo.com>
2018-12-05 16:34:56 -02:00
Eneas U de Queiroz
53dfce1b23 python-requests-oauthlib: use PyPackage to build
Updated Makefile to use PyPackage, added option to build source package,
updated PKG_SOURCE_URL, and adpated to python-pyjwt new package name.

Signed-off-by: Eneas U de Queiroz <cote2004-github@yahoo.com>
2018-12-05 08:34:01 -02:00
Eneas U de Queiroz
acca39d00e pyjwt: Bump to version 1.7.0, add ptyhon3
Version 1.7.0 brings compatibility with python 3.7.
As a result of building a python3 version, the python2 package name was
changed from pyjwt to python-pyjwt.

Signed-off-by: Eneas U de Queiroz <cote2004-github@yahoo.com>
2018-12-05 08:33:29 -02:00
Eneas U de Queiroz
c22577e921 python-certifi: Update to 2018.11.29, add python3
Package was upgraded to current version, and the python3 variant was
added.

Signed-off-by: Eneas U de Queiroz <cote2004-github@yahoo.com>
2018-12-05 08:19:01 -02:00
Eneas U de Queiroz
f9978fce52 django-simple-captcha: use PyPackage to build
Updated Makefile to use PyPackage, added option to build source package,
and updated PKG_SOURCE_URL.

Signed-off-by: Eneas U de Queiroz <cote2004-github@yahoo.com>
2018-12-05 08:13:55 -02:00
Eneas U de Queiroz
b29881b853 python-requests: use PyPackage to build
Updated Makefile to use PyPackage, added option to build source package.

Signed-off-by: Eneas U de Queiroz <cote2004-github@yahoo.com>
2018-12-05 08:11:53 -02:00
Eneas U de Queiroz
f7ca9643a6 python-oauthlib: add python3 package
Signed-off-by: Eneas U de Queiroz <cote2004-github@yahoo.com>
2018-12-05 08:11:02 -02:00
Eneas U de Queiroz
61091f9281 django-ranged-response: use PyPackage to build
Updated Makefile to use PyPackage, added option to build source package,
and updated PKG_SOURCE_URL.

Signed-off-by: Eneas U de Queiroz <cote2004-github@yahoo.com>
2018-12-05 08:05:46 -02:00
Eneas U de Queiroz
d97aaaf0bd django-formtools: use PyPackage to build
Updated Makefile to use PyPackage, added option to build source package,
and updated PKG_SOURCE_URL.

Signed-off-by: Eneas U de Queiroz <cote2004-github@yahoo.com>
2018-12-05 08:04:47 -02:00
Eneas U de Queiroz
ecda21c07a django-webpack-loader: use PyPackage to build
Updated Makefile to use PyPackage, added option to build source package,
and updated PKG_SOURCE_URL.

Signed-off-by: Eneas U de Queiroz <cote2004-github@yahoo.com>
2018-12-05 08:03:40 -02:00
Hannu Nyman
4c24a16d40
Merge pull request #7534 from neheb/patch-3
pytz: Add python/host to BUILD_DEPENDS
2018-12-02 12:36:36 +02:00
Rosen Penev
8e25b4b859 python-crypgoraphy: Update to 2.4.2
Signed-off-by: Rosen Penev <rosenp@gmail.com>
2018-12-01 11:02:14 -08:00
Rosen Penev
d3cd4a9e1e
pytz: Add python/host to BUILD_DEPENDS
Buildbots occasionally fail because of this. Travis also seems to try to build this before python.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
2018-11-27 11:10:10 -08:00
Hannu Nyman
c5cc933a89
Merge pull request #7352 from neheb/patch-2
MarkupSafe: Update to 1.1.0
2018-11-24 09:19:38 +02:00
Hannu Nyman
09236850b4
Merge pull request #7385 from neheb/patch-6
Jinja2: Update to 2.10
2018-11-24 09:18:57 +02:00
Hannu Nyman
2f8c57a027
Merge pull request #7384 from neheb/patch-4
Flask: Update to 1.0.2
2018-11-24 09:18:41 +02:00
Rosen Penev
340c3895f5 python-cryptography: Update to 2.4.1
Replaced DTLS patch with upstreamed one.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
2018-11-18 18:23:48 -08:00
Hannu Nyman
094e5339e7
Merge pull request #7152 from neheb/patch-42
Werkzeug: Update to 0.14.1
2018-11-18 21:26:38 +02:00
Rosen Penev
1114c9d7e0 twisted: Update to 18.9.0
Signed-off-by: Rosen Penev <rosenp@gmail.com>
2018-11-17 10:53:06 -08:00
Hannu Nyman
58f79231ed
Merge pull request #7428 from neheb/patch-11
python3-bottle: Update to 0.12.13
2018-11-17 10:21:45 +02:00
Hannu Nyman
8c963ff811
Merge pull request #7446 from commodo/python-fix-ssl-build
python: fix build with OpenSSL 1.1.0
2018-11-17 10:18:17 +02:00
Hannu Nyman
78499b835a
Merge pull request #7424 from neheb/patch-3
python-requests: Update to 2.20.1
2018-11-16 21:10:12 +02:00
Alexandru Ardelean
5bc39702fb python: fix build with OpenSSL 1.1.0
Addresses issue from here:
  https://github.com/openwrt/packages/issues/7367#issuecomment-437685598

The SSL module in Python doesn't handle properly all the combinations of
NPN between all OpenSSL & LibreSSL versions.
This patch fixes this.
Also pushed a report & proposal upstream to Python:
  https://bugs.python.org/issue35264

Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
2018-11-16 15:35:42 +02:00
Rosen Penev
56d45d6c52
itsdangerous: Update to 1.1.0
Signed-off-by: Rosen Penev <rosenp@gmail.com>
2018-11-14 11:43:21 -08:00
Hannu Nyman
e9f055f679
Merge pull request #7425 from neheb/patch-8
python-urllib3: Update to 1.24..1
2018-11-14 21:40:53 +02:00
Hannu Nyman
51ad2efe02
Merge pull request #7423 from neheb/zope
python-zope-interface: Update to 4.6.0
2018-11-14 20:34:12 +02:00
Rosen Penev
92c3b7ad49 python3-bottle: Update to 0.12.13
Switched to a proper URL.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
2018-11-14 10:07:57 -08:00
Rosen Penev
509ed2121b python-pycparser: Update to 2.19
Signed-off-by: Rosen Penev <rosenp@gmail.com>
2018-11-14 10:00:49 -08:00
Rosen Penev
94fe63339e
python-urllib3: Update to 1.24..1
Signed-off-by: Rosen Penev <rosenp@gmail.com>
2018-11-14 09:54:29 -08:00
Rosen Penev
b836a2efb7
python-requests: Update to 2.20.1
Signed-off-by: Rosen Penev <rosenp@gmail.com>
2018-11-14 09:52:33 -08:00
Rosen Penev
2edb4a7335 python-zope-interface: Update to 4.6.0
Signed-off-by: Rosen Penev <rosenp@gmail.com>
2018-11-14 09:47:58 -08:00
Hannu Nyman
76df7c4df5
Merge pull request #7386 from neheb/pillow
pillow: Update to 5.3.0
2018-11-12 17:17:57 +02:00
Hannu Nyman
0ad1369496
Merge pull request #7380 from neheb/pytz
pytz: Update to 2018.7 and add host build
2018-11-12 17:16:13 +02:00
Rosen Penev
2ebb321aaf
python-gnupg: Fix build breakage
Apparently := doesn't work here. Why it doesn't should be investigated but for now fix it.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
2018-11-11 04:36:03 -08:00
Rosen Penev
e8e8022e47 pillow: Update to 5.3.0
Switched to pypi for consistency.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
2018-11-10 19:49:32 -08:00
Rosen Penev
68dab099cd
Jinja2: Update to 2.10
Switch URL to a deterministic one.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
2018-11-10 19:38:41 -08:00
Rosen Penev
57ab493043
Flask: Update to 1.0.2
Update URL to a deterministic one.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
2018-11-10 19:35:39 -08:00
Rosen Penev
8dda6b8f2f pytz: Update to 2018.7 and add host build
Django 1.11 and above needs pytz to run properly. This was causing issues
with seahub, whose Makefile uses django-admin to compile locales.

Also removed InstallDev. It tried to accomplish the same thing but ended
up installing to the same directories anyways.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
2018-11-10 16:38:05 -08:00
Rosen Penev
e162a6c86e MarkupSafe: Update to 1.1.0
Most interesting: Use newer CPython API on Python 3, resulting in a 1.5x speedup.

Switched to a standard URL.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
2018-11-08 10:01:34 -08:00
Rosen Penev
e6d2fa9f7b python-ldap: Update to 3.1.0
Switched URL to a proper one.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
2018-11-06 19:05:13 -08:00
Rosen Penev
c86ccd6512 Werkzeug: Update to 0.14.1
Switched URL to a sensible one.

Some Makefile rearrangements for consistency.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
2018-11-06 09:38:16 -08:00
Rosen Penev
3f6ca010bb python-gnupg: Use a more standard URL for easier version bumping
Signed-off-by: Rosen Penev <rosenp@gmail.com>
2018-11-06 09:30:02 -08:00
Rosen Penev
b0e4ec2924
django: Update to 1.11.16
Fixed a race condition in QuerySet.update_or_create() that could result in data loss (#29499).

Signed-off-by: Rosen Penev <rosenp@gmail.com>
2018-11-05 11:37:48 -08:00
Hannu Nyman
bccd074f43
Merge pull request #7265 from neheb/patch-27
python-attrs: Update to 18.2.0
2018-11-04 12:56:50 +02:00
Hannu Nyman
177e40f883
Merge pull request #7297 from commodo/python3-3.7.1
python3: bump to version 3.7.1
2018-11-02 19:08:26 +02:00
Alexandru Ardelean
178ffb41f1 python3: bump to version 3.7.1
This change bumps Python3 version to 3.7.1.
Patch `002-fix-implicit-dh-free-declaration.patch` is now included in
upstream.
This also fixes CVE-2018-1061.
   https://www.cvedetails.com/cve/CVE-2018-1061/

Compile & run-tested on x86.

Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
2018-11-02 09:58:57 +02:00
champtar
1ee4c1492d
Merge pull request #7291 from cotequeiroz/pytz-installdev
pytz: add Package/InstallDev
2018-11-01 09:13:21 -05:00
Hannu Nyman
9de6ac084d
Merge pull request #7260 from neheb/patch-9
python-certifi: Update to 2018.10.15
2018-10-31 20:39:15 +02:00
Eneas U de Queiroz
455cde8128 pytz: add package/InstallDev
Building would not work for packages that depended on this when the
build directory was deleted after compiled, so they failed when
BUILDBOT=y.

Signed-off-by: Eneas U de Queiroz <cote2004-github@yahoo.com>
2018-10-31 08:01:40 -03:00
Dirk Brenken
b4f7e81377
Merge pull request #7259 from neheb/patch-6
pytz: Update to 2018.6
2018-10-30 15:46:56 +01:00
Rosen Penev
dba6b95c95 python-attrs: Update to 18.2.0
Signed-off-by: Rosen Penev <rosenp@gmail.com>
2018-10-29 09:56:52 -07:00
Rosen Penev
e9a1dadd32
python-dateutil: Update to 2.7.5
Signed-off-by: Rosen Penev <rosenp@gmail.com>
2018-10-28 10:29:06 -07:00
Rosen Penev
ea6ce3a53b
python-certifi: Update to 2018.10.15
Signed-off-by: Rosen Penev <rosenp@gmail.com>
2018-10-28 10:05:18 -07:00