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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
`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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
CVE-2013-7459 and CVE-2018-6594. Both patches taken from Fedora.
Also took the liberty to update the PKG_SOURCE_URL to a standard one.
Updated the home URL as well.
Signed-off-by: Rosen Penev <rosenp@gmail.com>
Add -rpath linker option to host build, pointing to staging/hostpkh/lib.
It's needed to find the correct host libs during runtime, without it the
hosts libs may be used instaead, causing failures.
Signed-off-by: Jan Kardell <jan.kardell@telliq.com>
The linker option -rpath is required to find libs in staging_dir. Now it
is included when building host modules. Without it the import test of
the _ctypes and _uuid modules would fail. The _ctypes module uses
libffi.so.6 from staging, but OpenSUSE LEAP 15 has libffi.so.7.
It will also fail on LEAP 42.x, Fedora28 and 29 and future or old
versions of Ubuntu.
Fix needed in master and 18.06 branches.
Signed-off-by: Jan Kardell <jan.kardell@telliq.com>
Switched URL to standard pythonhosted one. Only a zip file is available. No .tar.gz.
This should hopefully fix uscan.
Signed-off-by: Rosen Penev <rosenp@gmail.com>
Switched from git repo to standard pythonhosted tarball.
The 1.11 series is the last to support Python 2.
Signed-off-by: Rosen Penev <rosenp@gmail.com>
No idea how this creeped up. Probably OpenSSL been has updated recently.
Will send this patch upstream as well, but in the meantime we should fix
the Python3 build.
Build error seems to be:
```
<openwrt>/build_dir/target-i386_pentium4_musl/Python-3.7.0/Modules/_ssl.c:4000:5: error: implicit declaration of function 'DH_free'; did you mean 'lh_free'? [-Werror=implicit-function-declaration]
DH_free(dh);
^~~~~~~
lh_free
cc1: some warnings being treated as errors
Python build finished successfully!
The necessary bits to build these optional modules were not found:
_tkinter _uuid nis
To find the necessary bits, look in setup.py in detect_modules() for the module's name.
The following modules found by detect_modules() in setup.py, have been
built by the Makefile instead, as configured by the Setup files:
_abc atexit pwd
time zlib
Failed to build these modules:
_ssl
Makefile:618: recipe for target 'sharedmods' failed
```
Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
Switched to regular tarballs from standard pythonhosted source.
Small Makefile rearrangements for consistency.
Signed-off-by: Rosen Penev <rosenp@gmail.com>
Version 2.3.1 has been released recently and requested via Github #6967Fixes#6967.
Also, changed URL to `https://files.pythonhosted.org` ; fewer redirects.
Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
Version 0.2.2 has been released recently.
Pull it in the packages feed.
Also, change URL to a fixed form.
Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
Version 1.1.2 has been released recently.
Pull newer version into the packages feed.
Also, switch URL to a fixed form.
Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
mariadb was sorted out to include nls.mk. Update python-mysql to do the
same and remove the hack.
Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net>
libmariadb 10.2.x needs to be linked in together with iconv. On uclibc
iconv is not included in libc and libiconv-full needs to be used. This
commit helps python-mysql find the shared library.
Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net>
During a previous pull request the PKG_NAME was first changed and then
reverted back. But the download URL was not changed accordingly.
Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net>
- change source from MySQL-python to mysqlclient, which is a fork of the
former. The former project hasn't seen any updates in years.
- this is also in anticipation of the upgrade of MariaDB from 10.1.x to
10.2.x. With the latter python-mysql does not compile - mysqlclient
does.
- the patch is dropped as libmaria is threadsafe anyway.
- add variant for Python3.
Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net>
JSON Web Token implementation in Python.
This package is a direct dependency of python-requests-oauthlib, a
dependency of seafile-seahub.
Signed-off-by: Eneas U de Queiroz <cote2004-github@yahoo.com>
A generic, spec-compliant, thorough implementation of the OAuth
request-signing logic.
This package is a direct dependency of python-requests-oauthlib, a
dependency of seafile-seahub.
Signed-off-by: Eneas U de Queiroz <cote2004-github@yahoo.com>
OAuthlib authentication support for Requests.
This package is a direct dependency of seafile-seahub.
Signed-off-by: Eneas U de Queiroz <cote2004-github@yahoo.com>
Python package for providing Mozilla's CA Bundle.
This package is a direct dependency of python-requests, a dependency of
seafile-seahub.
Signed-off-by: Eneas U de Queiroz <cote2004-github@yahoo.com>
Transparently use webpack with django.
This package is a direct dependency of seafile-seahub.
Signed-off-by: Eneas U de Queiroz <cote2004-github@yahoo.com>
Modified Django FileResponse that adds Content-Range headers.
This package is a direct dependency of django-simple-captcha, a
dependency of seafile-seahub.
Signed-off-by: Eneas U de Queiroz <cote2004-github@yahoo.com>
A very simple, yet powerful, Django captcha application.
This package is a direct dependency of seafile-seahub.
Signed-off-by: Eneas U de Queiroz <cote2004-github@yahoo.com>
A set of high-level abstractions for Django forms.
This package is a direct dependency of seafile-seahub.
Signed-off-by: Eneas U de Queiroz <cote2004-github@yahoo.com>
This was copied over from python-packages, when support for installing
packages host-side (via pip) was added.
Based on the discussion on this commit:
612c53fc6c
it was mentioned that removing this may add more benefit in terms of
reducing build time, because packages won't get reinstalled every time.
I'm not entirely sure about any potential side-effects of this, but it's
worth trying it out.
Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
This also updates pip and setuptools.
With this occasion, they also get PKG_RELEASEs of their own.
Dropped patch 011-remove-setupterm-definition.patch
Manually re-applied 005-fix-bluetooth-support.patch
Ran make package/python/refresh to refresh other patches.
Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
zlib is now a host tool and the zlib/host package was removed. this
dependency is not needed any more as there will always be a zlib host
library.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Report https://github.com/openwrt/packages/issues/5638
It was mentioned that this causes build failures on Mac OS X.
The default behavior [in the setup.py script] is to check whether
`--with-system-ffi` is present in the CONFIG_ARGS env var.
However that back-fires a bit when `--with-system-ffi=no`, because the
condition `not '--with-system-ffi' in sysconfig.get_config_var("CONFIG_ARGS")`
evaluates to true.
This is a small bug in the `setup.py` script, but it looks like the
easiest/cleanest way to address it on our end is to just remove it entirely
from the HOST_CONFIGURE_ARGS.
At least that's how it looks like when testing on a Linux machine.
Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
This change was introduced in commit 1c54e2b0fb to address build
issues on Ubuntu 12.04.
However it was reported to cause issues on Mac OS X.
Report: https://github.com/openwrt/packages/issues/5310
It was also reported that removing this on MacOS X fixes the issue.
Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
Following a discussion on bugs.python.org:
* https://bugs.python.org/issue29708
* https://bugs.python.org/msg313384
It seems that setting a fixed value to PYTHONHASHSEED guarantees that
the bytecodes are generated consistently/in a reproducible manner.
Hopefully, this is the last bit to make Python3 build reproducible.
Tested this locally on a few files [that were not reproducible without
this change].
The PYTHONHASHSEED is only assigned to the host Python/Python3 during
compilation of byte-codes [from python source].
Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
There have been some new dependencies added in recent versions of
Twisted (mostly internal classes that have been spun out into their own
libraries):
* constantly (#5453), since 16.5.0
* incremental (#5454), since 16.5.0
* Automat (#5456), since 17.1.0
* hyperlink (#5455) since 17.5.0
Signed-off-by: Jeffery To <jeffery.to@gmail.com>
For python `src` packages we should clear out the DEPENDS
to prevent recursive deps from happening.
Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
This is a new requirement for the Twisted package.
From the readme:
Automat is a library for concise, idiomatic Python expression of
finite-state automata (particularly deterministic finite-state
transducers).
Signed-off-by: Jeffery To <jeffery.to@gmail.com>
This is a new requirement for the Twisted package.
From the readme:
Hyperlink provides a pure-Python implementation of immutable URLs. Based
on RFC 3986 and 3987, the Hyperlink URL makes working with both URIs and
IRIs easy.
Signed-off-by: Jeffery To <jeffery.to@gmail.com>
This is a new requirement for the Twisted package.
From the readme:
Incremental is a small library that versions your Python projects.
Signed-off-by: Jeffery To <jeffery.to@gmail.com>
This is a new requirement for the Twisted package.
From the readme:
A library that provides symbolic constant support. It includes
collections and constants with text, numeric, and bit flag values.
Originally twisted.python.constants from the Twisted project.
Signed-off-by: Jeffery To <jeffery.to@gmail.com>
python3 variant
Renaming the package is needed to allow for a Python 3 variant
(python3-zope-interface). Packages that depend on this (only twisted)
also have their dependencies adjusted.
Signed-off-by: Jeffery To <jeffery.to@gmail.com>
This guarantees for the package feeds that
the mk files will always be available for all packages.
Will need to see about external-feed Python packages
a bit later.
Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
The only difference just a parameter for Python3
[ -b to compile bytecodes in legacy mode ].
No need to keep 2 almost identical files now
that they're exported.
I'm a bit scared of that param, since it may get
removed at some point.
But let's see until then.
Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
Since `lang/python` is it's own folder of Python packages
(for both Python 2 & 3), and these build rules are needed
in a lot of packages [especially Python packages],
putting them here makes sense architecturally,
to be shared.
This also helps get rid of the `include_mk` construct
which relies on OpenWrt core to provide, and seems
like a broken design idea that has persisted for a while.
Reason is: it requires that Python 2/3 be built to provide
these mk files for other Python packages,
which seems like a bad idea.
Long-term, there could be an issue where some other feeds
would require these mk files [e.g. telephony] for
some Python packages.
We'll see how we handle this a bit later.
For now we limit this to this feed.
Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
The .mk snippets are not really usable at the moment, as they cannot be
considered for metadata collection (package DUMP) when included through
include_mk. Python packages do not use include_mk anymore for this reason,
so the install commands can be removed as well.
Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
Eneas U de Queiroz
Hannu Nyman
Rosen Penev
Karel Kočí
Karel Kočí
Jeffery To
Alexandru Ardelean
Daniel Golle
Josef Schlehofer
Richard Yu
Alexandru Ardelean
Daniel F. Dickinson
Daniel Santos
Nj Hsiong
champtar
Dirk Brenken
Jan Kardell
Daniel Golle
Andy Walsh
Sebastian Kemper
Karol Wrona
Martin Strobel
Waldemar Konik
Hauke Mehrtens
Gergely Kiss
Kimmo Vuorinen
Matthias Schiffer