mirror of
https://github.com/openwrt/packages.git
synced 2025-12-10 12:41:22 +00:00
Compare commits
22 Commits
0f24c4daf8
...
openwrt-24
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
275052d5fa | ||
|
|
07cedfe325 | ||
|
|
2ab7c24e28 | ||
|
|
ca47b6ce11 | ||
|
|
8ab520eef7 | ||
|
|
cac957166a | ||
|
|
c4b3cfae10 | ||
|
|
14f766efff | ||
|
|
a9891c2877 | ||
|
|
75ba28479e | ||
|
|
b03875c738 | ||
|
|
8b1ea353d5 | ||
|
|
cec82e394e | ||
|
|
94fbc8eebd | ||
|
|
124a7a7c0c | ||
|
|
b2c88cd6c2 | ||
|
|
1eb7e0e4a5 | ||
|
|
0f1e74bb4c | ||
|
|
07ed6152fe | ||
|
|
960dfa2df8 | ||
|
|
80c90e9049 | ||
|
|
2dcc84370c |
@@ -8,11 +8,11 @@
|
||||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=django
|
||||
PKG_VERSION:=5.1.7
|
||||
PKG_VERSION:=5.1.14
|
||||
PKG_RELEASE:=1
|
||||
|
||||
PYPI_NAME:=Django
|
||||
PKG_HASH:=30de4ee43a98e5d3da36a9002f287ff400b43ca51791920bfb35f6917bfe041c
|
||||
PKG_HASH:=b98409fb31fdd6e8c3a6ba2eef3415cc5c0020057b43b21ba7af6eff5f014831
|
||||
|
||||
PKG_MAINTAINER:=Alexandru Ardelean <ardeleanalex@gmail.com>, Peter Stadler <peter.stadler@student.uibk.ac.at>
|
||||
PKG_LICENSE:=BSD-3-Clause
|
||||
|
||||
@@ -8,11 +8,11 @@
|
||||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=python-automat
|
||||
PKG_VERSION:=22.10.0
|
||||
PKG_VERSION:=25.4.16
|
||||
PKG_RELEASE:=1
|
||||
|
||||
PYPI_NAME:=Automat
|
||||
PKG_HASH:=e56beb84edad19dcc11d30e8d9b895f75deeb5ef5e96b84a467066b3b84bb04e
|
||||
PYPI_NAME:=automat
|
||||
PKG_HASH:=0017591a5477066e90d26b0e696ddc143baafd87b588cfac8100bc6be9634de0
|
||||
|
||||
PKG_LICENSE:=MIT
|
||||
PKG_LICENSE_FILES:=LICENSE
|
||||
@@ -32,8 +32,7 @@ define Package/python3-automat
|
||||
URL:=https://github.com/glyph/Automat
|
||||
DEPENDS:= \
|
||||
+python3-light \
|
||||
+python3-attrs \
|
||||
+python3-six
|
||||
+python3-attrs
|
||||
endef
|
||||
|
||||
define Package/python3-automat/description
|
||||
|
||||
@@ -1,18 +0,0 @@
|
||||
--- a/setup.py
|
||||
+++ b/setup.py
|
||||
@@ -22,15 +22,6 @@ setup(
|
||||
"attrs>=19.2.0",
|
||||
"six",
|
||||
],
|
||||
- extras_require={
|
||||
- "visualize": ["graphviz>0.5.1",
|
||||
- "Twisted>=16.1.1"],
|
||||
- },
|
||||
- entry_points={
|
||||
- "console_scripts": [
|
||||
- "automat-visualize = automat._visualize:tool"
|
||||
- ],
|
||||
- },
|
||||
author='Glyph',
|
||||
author_email='glyph@twistedmatrix.com',
|
||||
include_package_data=True,
|
||||
@@ -1,19 +0,0 @@
|
||||
--- a/setup.py
|
||||
+++ b/setup.py
|
||||
@@ -12,7 +12,7 @@ setup(
|
||||
Self-service finite-state machines for the programmer on the go.
|
||||
""".strip(),
|
||||
readme='README.md',
|
||||
- packages=find_packages(exclude=[]),
|
||||
+ packages=find_packages(exclude=["*._test", "*._test.*"]),
|
||||
package_dir={'automat': 'automat'},
|
||||
setup_requires=[
|
||||
'wheel',
|
||||
@@ -25,6 +25,7 @@ setup(
|
||||
author='Glyph',
|
||||
author_email='glyph@twistedmatrix.com',
|
||||
include_package_data=True,
|
||||
+ exclude_package_data={'':['_test/*']},
|
||||
license="MIT",
|
||||
keywords='fsm finite state machine automata',
|
||||
classifiers=[
|
||||
@@ -9,11 +9,12 @@
|
||||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=python-flask-login
|
||||
PKG_VERSION:=0.6.2
|
||||
PKG_VERSION:=0.6.3
|
||||
PKG_RELEASE:=1
|
||||
|
||||
PYPI_NAME:=Flask-Login
|
||||
PKG_HASH:=c0a7baa9fdc448cdd3dd6f0939df72eec5177b2f7abe6cb82fc934d29caac9c3
|
||||
PYTHON3_PKG_WHEEL_NAME:=flask_login
|
||||
PKG_HASH:=5e23d14a607ef12806c699590b89d0f0e0d67baeec599d75947bf9c147330333
|
||||
|
||||
PKG_MAINTAINER:=Jan Pavlinec <jan.pavlinec1@gmail.com>
|
||||
PKG_LICENSE:=MIT
|
||||
|
||||
@@ -8,11 +8,12 @@
|
||||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=python-flask-seasurf
|
||||
PKG_VERSION:=1.1.1
|
||||
PKG_VERSION:=2.0.0
|
||||
PKG_RELEASE:=1
|
||||
|
||||
PYPI_NAME:=Flask-SeaSurf
|
||||
PKG_HASH:=54537008c769ac0ada8237877327c3e7ed74dcd8b01e74a9120ee0232c5951a9
|
||||
PYTHON3_PKG_WHEEL_NAME:=flask_seasurf
|
||||
PKG_HASH:=8e4003be1580ea8663d6bd3adf272f549ca4d735848895192618ed1945d5ad3c
|
||||
|
||||
PKG_MAINTAINER:=Josef Schlehofer <pepe.schlehofer@gmail.com>
|
||||
PKG_LICENSE:=BSD-3-Clause
|
||||
|
||||
@@ -0,0 +1,34 @@
|
||||
From 8e6267a4c0e8cfedd18ab3efe616904d77ef99d6 Mon Sep 17 00:00:00 2001
|
||||
From: Josef Schlehofer <pepe.schlehofer@gmail.com>
|
||||
Date: Mon, 3 Nov 2025 23:15:33 +0100
|
||||
Subject: [PATCH] setup.py: use up-to-date SPDX license identifier with LICENSE
|
||||
file
|
||||
|
||||
It fixes setuptoolsDeprecationWarning about deprecated license
|
||||
classifiers and adds LICENSE file.
|
||||
|
||||
Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>
|
||||
---
|
||||
setup.py | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
--- a/setup.py
|
||||
+++ b/setup.py
|
||||
@@ -15,7 +15,8 @@ setup(
|
||||
name='Flask-SeaSurf',
|
||||
version=__version__,
|
||||
url='https://github.com/maxcountryman/flask-seasurf/',
|
||||
- license='BSD',
|
||||
+ license='BSD-3-Clause',
|
||||
+ license_files=['LICENSE'],
|
||||
author='Max Countryman',
|
||||
author_email='maxc@me.com',
|
||||
description='An updated CSRF extension for Flask.',
|
||||
@@ -30,7 +31,6 @@ setup(
|
||||
'Development Status :: 4 - Beta',
|
||||
'Environment :: Web Environment',
|
||||
'Intended Audience :: Developers',
|
||||
- 'License :: OSI Approved :: BSD License',
|
||||
'Operating System :: OS Independent',
|
||||
'Programming Language :: Python',
|
||||
'Programming Language :: Python :: 3',
|
||||
@@ -0,0 +1,56 @@
|
||||
From 6b578f03f4efd89a05a120de919386a5834e4900 Mon Sep 17 00:00:00 2001
|
||||
From: Josef Schlehofer <pepe.schlehofer@gmail.com>
|
||||
Date: Mon, 3 Nov 2025 23:35:26 +0100
|
||||
Subject: [PATCH 2/3] Add pyproject.toml with modern Python packaging
|
||||
configuration
|
||||
|
||||
This follows PEP 621 and as well while keeping backward compatibility
|
||||
with existing setup.py.
|
||||
|
||||
Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>
|
||||
---
|
||||
pyproject.toml | 38 ++++++++++++++++++++++++++++++++++++++
|
||||
1 file changed, 38 insertions(+)
|
||||
create mode 100644 pyproject.toml
|
||||
|
||||
--- /dev/null
|
||||
+++ b/pyproject.toml
|
||||
@@ -0,0 +1,38 @@
|
||||
+[build-system]
|
||||
+requires = ["setuptools>=61.0", "wheel"]
|
||||
+build-backend = "setuptools.build_meta"
|
||||
+
|
||||
+[project]
|
||||
+name = "Flask-SeaSurf"
|
||||
+version = "2.0.0"
|
||||
+description = "An updated CSRF extension for Flask."
|
||||
+readme = {file = "README.markdown", content-type = "text/markdown"}
|
||||
+license = "BSD-3-Clause"
|
||||
+license-files = ["LICENSE"]
|
||||
+authors = [{name = "Max Countryman", email = "maxc@me.com"}]
|
||||
+requires-python = ">=3.8"
|
||||
+dependencies = ["Flask"]
|
||||
+classifiers = [
|
||||
+ "Development Status :: 4 - Beta",
|
||||
+ "Environment :: Web Environment",
|
||||
+ "Intended Audience :: Developers",
|
||||
+ "Operating System :: OS Independent",
|
||||
+ "Programming Language :: Python",
|
||||
+ "Programming Language :: Python :: 3",
|
||||
+ "Programming Language :: Python :: 3.8",
|
||||
+ "Programming Language :: Python :: 3.9",
|
||||
+ "Programming Language :: Python :: 3.10",
|
||||
+ "Programming Language :: Python :: 3.11",
|
||||
+ "Programming Language :: Python :: 3.12",
|
||||
+ "Topic :: Internet :: WWW/HTTP :: Dynamic Content",
|
||||
+ "Topic :: Software Development :: Libraries :: Python Modules",
|
||||
+]
|
||||
+
|
||||
+[project.urls]
|
||||
+Homepage = "https://github.com/maxcountryman/flask-seasurf/"
|
||||
+
|
||||
+[tool.setuptools]
|
||||
+py-modules = ["flask_seasurf"]
|
||||
+
|
||||
+[project.optional-dependencies]
|
||||
+test = ["pytest"]
|
||||
@@ -8,11 +8,12 @@
|
||||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=python-flask-session
|
||||
PKG_VERSION:=0.3.2
|
||||
PKG_VERSION:=0.8.0
|
||||
PKG_RELEASE:=1
|
||||
|
||||
PYPI_NAME:=Flask-Session
|
||||
PKG_HASH:=0768e2bbf06f963ec1aa711bde7aa32dc39ff70f89b495d6db687d899eae4423
|
||||
PYPI_SOURCE_NAME:=flask_session
|
||||
PKG_HASH:=20e045eb01103694e70be4a49f3a80dbb1b57296a22dc6f44bbf3f83ef0742ff
|
||||
|
||||
PKG_MAINTAINER:=Josef Schlehofer <pepe.schlehofer@gmail.com>
|
||||
PKG_LICENSE:=BSD-3-Clause
|
||||
|
||||
@@ -8,11 +8,12 @@
|
||||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=python-flask-socketio
|
||||
PKG_VERSION:=5.3.5
|
||||
PKG_VERSION:=5.5.1
|
||||
PKG_RELEASE:=1
|
||||
|
||||
PYPI_NAME:=Flask-SocketIO
|
||||
PKG_HASH:=5f01158d10db71aa78c969b631ce3b9148b47ab0de1995158f9577f85b004d25
|
||||
PYPI_SOURCE_NAME:=flask_socketio
|
||||
PKG_HASH:=d946c944a1074ccad8e99485a6f5c79bc5789e3ea4df0bb9c864939586c51ec4
|
||||
|
||||
PKG_MAINTAINER:=Jan Pavlinec <jan.pavlinec1@gmail.com>
|
||||
PKG_LICENSE:=MIT
|
||||
|
||||
@@ -1,40 +0,0 @@
|
||||
#
|
||||
# Copyright (C) 2015, 2017-2018 OpenWrt.org
|
||||
#
|
||||
# This is free software, licensed under the GNU General Public License v2.
|
||||
# See /LICENSE for more information.
|
||||
#
|
||||
|
||||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=python-parsley
|
||||
PKG_VERSION:=1.3
|
||||
PKG_RELEASE:=6
|
||||
|
||||
PYPI_NAME:=Parsley
|
||||
PKG_HASH:=9444278d47161d5f2be76a767809a3cbe6db4db822f46a4fd7481d4057208d41
|
||||
|
||||
PKG_LICENSE:=MIT
|
||||
PKG_LICENSE_FILES:=LICENSE
|
||||
PKG_MAINTAINER:=Jeffery To <jeffery.to@gmail.com>
|
||||
|
||||
include ../pypi.mk
|
||||
include $(INCLUDE_DIR)/package.mk
|
||||
include ../python3-package.mk
|
||||
|
||||
define Package/python3-parsley
|
||||
SECTION:=lang
|
||||
CATEGORY:=Languages
|
||||
SUBMENU:=Python
|
||||
TITLE:=Parsing and pattern matching
|
||||
URL:=http://launchpad.net/parsley
|
||||
DEPENDS:=+python3-light
|
||||
endef
|
||||
|
||||
define Package/python3-parsley/description
|
||||
Parsing and pattern matching made easy.
|
||||
endef
|
||||
|
||||
$(eval $(call Py3Package,python3-parsley))
|
||||
$(eval $(call BuildPackage,python3-parsley))
|
||||
$(eval $(call BuildPackage,python3-parsley-src))
|
||||
@@ -1,19 +0,0 @@
|
||||
--- a/setup.py
|
||||
+++ b/setup.py
|
||||
@@ -4,6 +4,7 @@
|
||||
Setup script for the Parsley distribution.
|
||||
"""
|
||||
|
||||
+import io
|
||||
from distutils.core import setup
|
||||
setup(
|
||||
name="Parsley",
|
||||
@@ -13,7 +14,7 @@ setup(
|
||||
author="Allen Short",
|
||||
author_email="washort42@gmail.com",
|
||||
license="MIT License",
|
||||
- long_description=open("README").read(),
|
||||
+ long_description=io.open("README", encoding="utf-8").read(),
|
||||
packages=["ometa", "terml", "ometa._generated", "terml._generated",
|
||||
"ometa.test", "terml.test"],
|
||||
py_modules=["parsley"]
|
||||
@@ -1,11 +0,0 @@
|
||||
--- a/setup.py
|
||||
+++ b/setup.py
|
||||
@@ -15,7 +15,6 @@ setup(
|
||||
author_email="washort42@gmail.com",
|
||||
license="MIT License",
|
||||
long_description=io.open("README", encoding="utf-8").read(),
|
||||
- packages=["ometa", "terml", "ometa._generated", "terml._generated",
|
||||
- "ometa.test", "terml.test"],
|
||||
+ packages=["ometa", "terml", "ometa._generated", "terml._generated"],
|
||||
py_modules=["parsley"]
|
||||
)
|
||||
@@ -1,45 +0,0 @@
|
||||
#
|
||||
# Copyright (C) 2021 CZ.NIC, z. s. p. o. (https://www.nic.cz/)
|
||||
#
|
||||
# This is free software, licensed under the GNU General Public License v2.
|
||||
# See /LICENSE for more information.
|
||||
#
|
||||
|
||||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=python-pysocks
|
||||
PKG_VERSION:=1.7.1
|
||||
PKG_RELEASE:=1
|
||||
|
||||
PYPI_NAME:=PySocks
|
||||
PKG_HASH:=3f8804571ebe159c380ac6de37643bb4685970655d3bba243530d6558b799aa0
|
||||
|
||||
PKG_MAINTAINER:=Jan Pavlinec <jan.pavlinec1@gmail.com>
|
||||
PKG_LICENSE:=MIT
|
||||
PKG_LICENSE_FILES:=LICENSE
|
||||
|
||||
include ../pypi.mk
|
||||
include $(INCLUDE_DIR)/package.mk
|
||||
include ../python3-package.mk
|
||||
|
||||
define Package/python3-pysocks
|
||||
SUBMENU:=Python
|
||||
SECTION:=lang
|
||||
CATEGORY:=Languages
|
||||
TITLE:=Python SOCKS client module
|
||||
URL:=https://github.com/Anorov/PySocks
|
||||
DEPENDS:= \
|
||||
+python3-light \
|
||||
+python3-logging \
|
||||
+python3-openssl \
|
||||
+python3-urllib
|
||||
endef
|
||||
|
||||
define Package/python3-pysocks/description
|
||||
PySocks lets you send traffic through SOCKS proxy servers.
|
||||
It is a modern fork of SocksiPy with bug fixes and extra features.
|
||||
endef
|
||||
|
||||
$(eval $(call Py3Package,python3-pysocks))
|
||||
$(eval $(call BuildPackage,python3-pysocks))
|
||||
$(eval $(call BuildPackage,python3-pysocks-src))
|
||||
@@ -8,11 +8,12 @@
|
||||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=python-ruamel-yaml
|
||||
PKG_VERSION:=0.17.32
|
||||
PKG_VERSION:=0.18.16
|
||||
PKG_RELEASE:=1
|
||||
|
||||
PYPI_NAME:=ruamel.yaml
|
||||
PKG_HASH:=ec939063761914e14542972a5cba6d33c23b0859ab6342f61cf070cfc600efc2
|
||||
PYTHON3_PKG_WHEEL_NAME:=ruamel_yaml
|
||||
PKG_HASH:=a6e587512f3c998b2225d68aa1f35111c29fad14aed561a26e73fab729ec5e5a
|
||||
|
||||
PKG_MAINTAINER:=Josef Schlehofer <pepe.schlehofer@gmail.com>
|
||||
PKG_LICENSE:=MIT
|
||||
|
||||
@@ -1,40 +0,0 @@
|
||||
#
|
||||
# Copyright (C) 2019 CZ.NIC, z. s. p. o. (https://www.nic.cz/)
|
||||
#
|
||||
# This is free software, licensed under the GNU General Public License v2.
|
||||
# See /LICENSE for more information.
|
||||
#
|
||||
|
||||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=python-unidecode
|
||||
PKG_VERSION:=1.3.6
|
||||
PKG_RELEASE:=1
|
||||
|
||||
PYPI_NAME:=Unidecode
|
||||
PKG_HASH:=fed09cf0be8cf415b391642c2a5addfc72194407caee4f98719e40ec2a72b830
|
||||
|
||||
PKG_MAINTAINER:=Josef Schlehofer <pepe.schlehofer@gmail.com>
|
||||
PKG_LICENSE:=GPL-2.0-or-later
|
||||
PKG_LICENSE_FILES:=LICENSE
|
||||
|
||||
include ../pypi.mk
|
||||
include $(INCLUDE_DIR)/package.mk
|
||||
include ../python3-package.mk
|
||||
|
||||
define Package/python3-unidecode
|
||||
SECTION:=lang
|
||||
CATEGORY:=Languages
|
||||
SUBMENU:=Python
|
||||
TITLE:=ASCII transliterations of Unicode text
|
||||
URL:=https://github.com/avian2/unidecode
|
||||
DEPENDS:=+python3-light
|
||||
endef
|
||||
|
||||
define Package/python-unidecode/description
|
||||
Unidecode, lossy ASCII transliterations of Unicode text
|
||||
endef
|
||||
|
||||
$(eval $(call Py3Package,python3-unidecode))
|
||||
$(eval $(call BuildPackage,python3-unidecode))
|
||||
$(eval $(call BuildPackage,python3-unidecode-src))
|
||||
@@ -8,11 +8,12 @@
|
||||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=python-yaml
|
||||
PKG_VERSION:=6.0.1
|
||||
PKG_RELEASE:=2
|
||||
PKG_VERSION:=6.0.3
|
||||
PKG_RELEASE:=1
|
||||
|
||||
PYPI_NAME:=PyYAML
|
||||
PKG_HASH:=bfdf460b1736c775f2ba9f6a92bca30bc2095067b8a9d77876d1fad6cc3b4a43
|
||||
PYPI_SOURCE_NAME:=pyyaml
|
||||
PKG_HASH:=d76623373421df22fb4cf8817020cbb7ef15c725b9d5e45f17e189bfc384190f
|
||||
|
||||
PKG_MAINTAINER:=Josef Schlehofer <pepe.schlehofer@gmail.com>
|
||||
PKG_LICENSE:=MIT
|
||||
|
||||
@@ -1,18 +0,0 @@
|
||||
--- a/pyproject.toml
|
||||
+++ b/pyproject.toml
|
||||
@@ -1,3 +1,3 @@
|
||||
[build-system]
|
||||
-requires = ["setuptools", "wheel", "Cython<3.0"]
|
||||
+requires = ["setuptools", "wheel", "Cython"]
|
||||
build-backend = "setuptools.build_meta"
|
||||
--- a/setup.py
|
||||
+++ b/setup.py
|
||||
@@ -82,7 +82,7 @@ if 'sdist' in sys.argv or os.environ.get
|
||||
with_cython = True
|
||||
try:
|
||||
from Cython.Distutils.extension import Extension as _Extension
|
||||
- from Cython.Distutils import build_ext as _build_ext
|
||||
+ from Cython.Distutils.old_build_ext import old_build_ext as _build_ext
|
||||
with_cython = True
|
||||
except ImportError:
|
||||
if with_cython:
|
||||
@@ -1,11 +1,14 @@
|
||||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=python-zope-event
|
||||
PKG_VERSION:=5.0
|
||||
PKG_VERSION:=6.1
|
||||
PKG_RELEASE:=1
|
||||
|
||||
PYPI_NAME:=zope.event
|
||||
PKG_HASH:=bac440d8d9891b4068e2b5a2c5e2c9765a9df762944bda6955f96bb9b91e67cd
|
||||
PYPI_SOURCE_NAME:=zope_event
|
||||
PKG_HASH:=6052a3e0cb8565d3d4ef1a3a7809336ac519bc4fe38398cb8d466db09adef4f0
|
||||
|
||||
PKG_BUILD_DEPENDS:=python3/host python-setuptools/host
|
||||
|
||||
PKG_LICENSE:=ZPL-2.1
|
||||
PKG_LICENSE_FILES:=LICENSE.txt
|
||||
|
||||
@@ -9,16 +9,21 @@
|
||||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=python-zope-interface
|
||||
PKG_VERSION:=6.1
|
||||
PKG_VERSION:=8.0.1
|
||||
PKG_RELEASE:=1
|
||||
|
||||
PYPI_NAME:=zope.interface
|
||||
PKG_HASH:=2fdc7ccbd6eb6b7df5353012fbed6c3c5d04ceaca0038f75e601060e95345309
|
||||
PYPI_SOURCE_NAME:=zope_interface
|
||||
PKG_HASH:=eba5610d042c3704a48222f7f7c6ab5b243ed26f917e2bc69379456b115e02d1
|
||||
|
||||
PKG_LICENSE:=ZPL-2.1
|
||||
PKG_LICENSE_FILES:=LICENSE.txt
|
||||
PKG_MAINTAINER:=Jeffery To <jeffery.to@gmail.com>
|
||||
|
||||
PKG_BUILD_DEPENDS:= \
|
||||
python3/host \
|
||||
python-setuptools/host
|
||||
|
||||
include ../pypi.mk
|
||||
include $(INCLUDE_DIR)/package.mk
|
||||
include ../python3-package.mk
|
||||
|
||||
@@ -1,19 +0,0 @@
|
||||
--- a/setup.py
|
||||
+++ b/setup.py
|
||||
@@ -125,7 +125,7 @@ setup(name='zope.interface',
|
||||
"Framework :: Zope :: 3",
|
||||
"Topic :: Software Development :: Libraries :: Python Modules",
|
||||
],
|
||||
- packages=find_packages('src'),
|
||||
+ packages=find_packages('src', exclude=["*.tests", "*.tests.*"]),
|
||||
package_dir={'': 'src'},
|
||||
namespace_packages=["zope"],
|
||||
cmdclass={
|
||||
@@ -133,6 +133,7 @@ setup(name='zope.interface',
|
||||
},
|
||||
test_suite='zope.interface.tests',
|
||||
include_package_data=True,
|
||||
+ exclude_package_data={'':['tests/*']},
|
||||
zip_safe=False,
|
||||
tests_require=tests_require,
|
||||
install_requires=['setuptools'],
|
||||
@@ -1,12 +1,12 @@
|
||||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=exim
|
||||
PKG_VERSION:=4.98.2
|
||||
PKG_VERSION:=4.99
|
||||
PKG_RELEASE:=1
|
||||
|
||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
|
||||
PKG_SOURCE_URL:=https://ftp.exim.org/pub/exim/exim4/
|
||||
PKG_HASH:=88b8e8a67c1db6cc0b1d148161aa36e662f4ca2fef25d5b6f3694d490e42dcae
|
||||
PKG_HASH:=5df38b042ffa9a9c8d31b20bc8481558070e361b06f657608622a62a327adcba
|
||||
PKG_MAINTAINER:=Daniel Golle <daniel@makrotopia.org>
|
||||
|
||||
PKG_LICENSE:=GPL-2.0-or-later
|
||||
@@ -45,7 +45,7 @@ LOOKUPS:= \
|
||||
define Package/exim/Default
|
||||
SECTION:=mail
|
||||
CATEGORY:=Mail
|
||||
DEPENDS:=+libdb47 +libpcre2 $(ICONV_DEPENDS) +BUILD_NLS:libidn2 +BUILD_NLS:libidn
|
||||
DEPENDS:= +USE_GLIBC:libcrypt-compat +libdb47 +libpcre2 $(ICONV_DEPENDS) +BUILD_NLS:libidn2 +BUILD_NLS:libidn
|
||||
TITLE:=Exim message transfer agent
|
||||
URL:=http://www.exim.org/
|
||||
USERID:=exim=42:exim=42
|
||||
|
||||
@@ -1,11 +0,0 @@
|
||||
--- a/src/drtables.c
|
||||
+++ b/src/drtables.c
|
||||
@@ -663,7 +663,7 @@ addlookupmodule(NULL, &ibase_lookup_modu
|
||||
addlookupmodule(NULL, &ldap_lookup_module_info);
|
||||
#endif
|
||||
|
||||
-#ifdef LOOKUP_JSON
|
||||
+#if defined(LOOKUP_JSON) && LOOKUP_JSON!=2
|
||||
addlookupmodule(NULL, &json_lookup_module_info);
|
||||
#endif
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
--- a/src/dane-openssl.c
|
||||
+++ b/src/dane-openssl.c
|
||||
@@ -1098,8 +1098,8 @@ if (dane->selectors[DANESSL_USAGE_DANE_T
|
||||
@@ -1122,8 +1122,8 @@ if (dane->selectors[DANESSL_USAGE_DANE_T
|
||||
* Check that setting the untrusted chain updates the expected
|
||||
* structure member at the expected offset.
|
||||
*/
|
||||
@@ -11,16 +11,6 @@
|
||||
OPENSSL_assert(dane->chain == X509_STORE_CTX_get0_untrusted(ctx));
|
||||
}
|
||||
}
|
||||
--- a/src/pdkim/signing.c
|
||||
+++ b/src/pdkim/signing.c
|
||||
@@ -704,7 +704,6 @@ return NULL;
|
||||
void
|
||||
exim_dkim_init(void)
|
||||
{
|
||||
-ERR_load_crypto_strings();
|
||||
}
|
||||
|
||||
|
||||
--- a/src/tls-openssl.c
|
||||
+++ b/src/tls-openssl.c
|
||||
@@ -23,7 +23,10 @@ functions from the OpenSSL library. */
|
||||
@@ -31,10 +21,10 @@
|
||||
+#include <openssl/dh.h>
|
||||
#include <openssl/rand.h>
|
||||
+#include <openssl/rsa.h>
|
||||
#ifndef OPENSSL_NO_ECDH
|
||||
# include <openssl/ec.h>
|
||||
#endif
|
||||
@@ -947,8 +950,9 @@ pkey = EVP_RSA_gen(2048);
|
||||
#include <openssl/ec.h>
|
||||
#ifndef DISABLE_OCSP
|
||||
# include <openssl/ocsp.h>
|
||||
@@ -909,8 +912,9 @@ pkey = EVP_RSA_gen(2048);
|
||||
|
||||
X509_set_version(x509, 2); /* N+1 - version 3 */
|
||||
ASN1_INTEGER_set(X509_get_serialNumber(x509), 1);
|
||||
@@ -46,7 +36,7 @@
|
||||
X509_set_pubkey(x509, pkey);
|
||||
|
||||
name = X509_get_subject_name(x509);
|
||||
@@ -4972,8 +4976,8 @@ return string_fmt_append(g,
|
||||
@@ -5031,8 +5035,8 @@ return string_fmt_append(g,
|
||||
" Runtime: %s\n"
|
||||
" : %s\n",
|
||||
OPENSSL_VERSION_TEXT,
|
||||
@@ -57,7 +47,7 @@
|
||||
/* third line is 38 characters for the %s and the line is 73 chars long;
|
||||
the OpenSSL output includes a "built on: " prefix already. */
|
||||
}
|
||||
@@ -5015,8 +5019,6 @@ if (pidnow != pidlast)
|
||||
@@ -5074,8 +5078,6 @@ if (pidnow != pidlast)
|
||||
is unique for each thread", this doesn't apparently apply across processes,
|
||||
so our own warning from vaguely_random_number_fallback() applies here too.
|
||||
Fix per PostgreSQL. */
|
||||
@@ -70,14 +60,14 @@
|
||||
+++ b/src/tlscert-openssl.c
|
||||
@@ -219,13 +219,13 @@ return mod ? tls_field_from_dn(cp, mod)
|
||||
uschar *
|
||||
tls_cert_not_before(void * cert, uschar * mod)
|
||||
tls_cert_not_before(void * cert, const uschar * mod)
|
||||
{
|
||||
-return asn1_time_copy(X509_get_notBefore((X509 *)cert), mod);
|
||||
+return asn1_time_copy(X509_getm_notBefore((X509 *)cert), mod);
|
||||
}
|
||||
|
||||
uschar *
|
||||
tls_cert_not_after(void * cert, uschar * mod)
|
||||
tls_cert_not_after(void * cert, const uschar * mod)
|
||||
{
|
||||
-return asn1_time_copy(X509_get_notAfter((X509 *)cert), mod);
|
||||
+return asn1_time_copy(X509_getm_notAfter((X509 *)cert), mod);
|
||||
|
||||
11
mail/exim/patches/050-fix-crosscompile.patch
Normal file
11
mail/exim/patches/050-fix-crosscompile.patch
Normal file
@@ -0,0 +1,11 @@
|
||||
--- a/src/miscmods/Makefile
|
||||
+++ b/src/miscmods/Makefile
|
||||
@@ -62,7 +62,7 @@ dkim.o:
|
||||
$(FE)$(CC) -c $(CFLAGS) $(INCLUDE) pdkim.c
|
||||
$(FE)$(CC) -c $(CFLAGS) $(INCLUDE) $(TLS_INCLUDE) signing.c
|
||||
$(FE)mv dkim.o dkim_tmp.o
|
||||
- $(FE)ld -r -o dkim.o $(LDFLAGS_PARTIAL) \
|
||||
+ $(FE)$(CC) -r -o dkim.o $(LDFLAGS_PARTIAL) \
|
||||
dkim_tmp.o dkim_transport.o pdkim.o signing.o
|
||||
|
||||
# Similarly, we want a single .so for the dynamic-load module
|
||||
@@ -10,7 +10,7 @@ Last-Update: 2021-07-28
|
||||
|
||||
--- a/src/EDITME
|
||||
+++ b/src/EDITME
|
||||
@@ -913,6 +913,21 @@ HEADERS_CHARSET="ISO-8859-1"
|
||||
@@ -998,6 +998,21 @@ HEADERS_CHARSET="ISO-8859-1"
|
||||
|
||||
|
||||
#------------------------------------------------------------------------------
|
||||
@@ -45,7 +45,7 @@ Last-Update: 2021-07-28
|
||||
#define CONFIGURE_FILE
|
||||
--- a/src/globals.c
|
||||
+++ b/src/globals.c
|
||||
@@ -118,6 +118,10 @@ int dsn_ret = 0;
|
||||
@@ -120,6 +120,10 @@ int dsn_ret = 0;
|
||||
const pcre2_code *regex_DSN = NULL;
|
||||
uschar *dsn_advertise_hosts = NULL;
|
||||
|
||||
@@ -58,7 +58,7 @@ Last-Update: 2021-07-28
|
||||
BOOL gnutls_allow_auto_pkcs11 = FALSE;
|
||||
--- a/src/globals.h
|
||||
+++ b/src/globals.h
|
||||
@@ -157,6 +157,9 @@ extern int dsn_ret; /
|
||||
@@ -164,6 +164,9 @@ extern int dsn_ret; /
|
||||
extern const pcre2_code *regex_DSN; /* For recognizing DSN settings */
|
||||
extern uschar *dsn_advertise_hosts; /* host for which TLS is advertised */
|
||||
|
||||
@@ -248,7 +248,7 @@ Last-Update: 2021-07-28
|
||||
/* End of local_scan.c */
|
||||
--- a/src/local_scan.h
|
||||
+++ b/src/local_scan.h
|
||||
@@ -28,6 +28,7 @@ settings, and the store functions. */
|
||||
@@ -30,6 +30,7 @@ settings, and the store functions. */
|
||||
|
||||
#include <stdarg.h>
|
||||
#include <sys/types.h>
|
||||
@@ -256,7 +256,7 @@ Last-Update: 2021-07-28
|
||||
#include "config.h"
|
||||
#include "mytypes.h"
|
||||
#include "store.h"
|
||||
@@ -177,6 +178,9 @@ extern header_line *header_list; /
|
||||
@@ -179,6 +180,9 @@ extern header_line *header_list; /
|
||||
extern BOOL host_checking; /* Set when checking a host */
|
||||
extern uschar *interface_address; /* Interface for incoming call */
|
||||
extern int interface_port; /* Port number for incoming call */
|
||||
@@ -266,16 +266,17 @@ Last-Update: 2021-07-28
|
||||
extern uschar *message_id; /* Internal id of message being handled */
|
||||
extern uschar *received_protocol; /* Name of incoming protocol */
|
||||
extern int recipients_count; /* Number of recipients */
|
||||
@@ -247,4 +251,6 @@ extern pid_t child_open_exim2_functio
|
||||
@@ -249,5 +253,7 @@ extern pid_t child_open_exim2_functio
|
||||
extern pid_t child_open_function(uschar **, uschar **, int, int *, int *, BOOL, const uschar *);
|
||||
#endif
|
||||
|
||||
+#pragma GCC visibility pop
|
||||
+
|
||||
#endif /* whole file */
|
||||
/* End of local_scan.h */
|
||||
--- a/src/readconf.c
|
||||
+++ b/src/readconf.c
|
||||
@@ -219,6 +219,9 @@ static optionlist optionlist_config[] =
|
||||
@@ -218,6 +218,9 @@ static optionlist optionlist_config[] =
|
||||
{ "local_from_prefix", opt_stringptr, {&local_from_prefix} },
|
||||
{ "local_from_suffix", opt_stringptr, {&local_from_suffix} },
|
||||
{ "local_interfaces", opt_stringptr, {&local_interfaces} },
|
||||
@@ -287,7 +288,7 @@ Last-Update: 2021-07-28
|
||||
#endif
|
||||
--- a/src/string.c
|
||||
+++ b/src/string.c
|
||||
@@ -455,6 +455,7 @@ return ss;
|
||||
@@ -459,6 +459,7 @@ return ss;
|
||||
|
||||
#if (defined(HAVE_LOCAL_SCAN) || defined(EXPAND_DLFUNC)) \
|
||||
&& !defined(MACRO_PREDEF) && !defined(COMPILE_UTILITY)
|
||||
@@ -295,7 +296,7 @@ Last-Update: 2021-07-28
|
||||
/*************************************************
|
||||
* Copy and save string *
|
||||
*************************************************/
|
||||
@@ -500,6 +501,7 @@ string_copyn_function(const uschar * s,
|
||||
@@ -504,6 +505,7 @@ string_copyn_function(const uschar * s,
|
||||
{
|
||||
return string_copyn(s, n);
|
||||
}
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
--- a/src/exim.c
|
||||
+++ b/src/exim.c
|
||||
@@ -647,13 +647,15 @@ exim_nullstd(void)
|
||||
@@ -660,13 +660,15 @@ exim_nullstd(void)
|
||||
{
|
||||
int devnull = -1;
|
||||
struct stat statbuf;
|
||||
@@ -12,7 +12,7 @@
|
||||
{
|
||||
- if (devnull < 0) devnull = open("/dev/null", O_RDWR);
|
||||
+ if (devnull < 0) devnull = open(devnullpath, O_RDWR);
|
||||
if (devnull < 0) log_write(0, LOG_MAIN|LOG_PANIC_DIE, "%s",
|
||||
if (devnull < 0) log_write_die(0, LOG_MAIN, "%s",
|
||||
- string_open_failed("/dev/null", NULL));
|
||||
+ string_open_failed("%s", devnullpath));
|
||||
if (devnull != i) (void)dup2(devnull, i);
|
||||
@@ -20,7 +20,7 @@
|
||||
}
|
||||
--- a/src/local_scan.h
|
||||
+++ b/src/local_scan.h
|
||||
@@ -27,6 +27,7 @@ store.c
|
||||
@@ -29,6 +29,7 @@ store.c
|
||||
settings, and the store functions. */
|
||||
|
||||
#include <stdarg.h>
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
--- a/OS/Makefile-Base
|
||||
+++ b/OS/Makefile-Base
|
||||
@@ -253,7 +253,7 @@ utils: $(EXIM_MONITOR) exicyclog exinext
|
||||
transport-filter.pl convert4r3 convert4r4 \
|
||||
exim_checkaccess \
|
||||
@@ -252,7 +252,7 @@ utils: $(EXIM_MONITOR) exicyclog exinext
|
||||
exigrep eximstats exipick exiqgrep exiqsumm \
|
||||
transport-filter.pl exim_checkaccess \
|
||||
exim_dbmbuild exim_dumpdb exim_fixdb exim_tidydb \
|
||||
- exim_lock exim_msgdate exim_id_update
|
||||
+ exim_lock exim_msgdate
|
||||
|
||||
@@ -10,12 +10,12 @@
|
||||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=haproxy
|
||||
PKG_VERSION:=3.0.10
|
||||
PKG_VERSION:=3.0.12
|
||||
PKG_RELEASE:=1
|
||||
|
||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
|
||||
PKG_SOURCE_URL:=https://www.haproxy.org/download/3.0/src
|
||||
PKG_HASH:=d1508670b6fd5839c669a0a916842f0d3d3d0b578bb351a2a74a1de3d929ce26
|
||||
PKG_HASH:=cd2bade59a7e2d61f2d62be7c6c4cfc0e2b3a90431023720cae7c43843b0570b
|
||||
|
||||
PKG_MAINTAINER:=Thomas Heil <heil@terminal-consulting.de>, \
|
||||
Christian Lachner <gladiac@gmail.com>
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
#!/bin/sh
|
||||
|
||||
CLONEURL=https://git.haproxy.org/git/haproxy-3.0.git
|
||||
BASE_TAG=v3.0.10
|
||||
BASE_TAG=v3.0.12
|
||||
TMP_REPODIR=tmprepo
|
||||
PATCHESDIR=patches
|
||||
|
||||
|
||||
@@ -9,14 +9,14 @@
|
||||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=kea
|
||||
PKG_VERSION:=2.6.0
|
||||
PKG_VERSION:=2.6.4
|
||||
PKG_RELEASE:=1
|
||||
|
||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
|
||||
PKG_SOURCE_URL:=https://ftp.isc.org/isc/kea/$(PKG_VERSION)
|
||||
PKG_HASH:=207ceae33eb3b81ec4e6ac5605249a85b93779333b62aadf39e489f11dbcdc8d
|
||||
PKG_HASH:=6806405e4d559abc10febd2c273dc6e2bc6ac42767afa5ca20b118ffba84a671
|
||||
|
||||
PKG_MAINTAINER:=BangLang Huang <banglang.huang@foxmail.com>, Rosy Song <rosysong@rosinson.com>
|
||||
PKG_MAINTAINER:=Philip Prindeville <philipp@redfish-solutions.com>, Noah Meyerhans <frodo@morgul.net>
|
||||
PKG_LICENSE:=MPL-2.0
|
||||
PKG_LICENSE_FILES:=COPYING
|
||||
|
||||
|
||||
@@ -8,7 +8,8 @@ BIN_PATH="/usr/sbin"
|
||||
CONF_PATH="/etc/kea"
|
||||
|
||||
start_service() {
|
||||
mkdir -p /var/run/kea
|
||||
mkdir -p /var/run/kea /var/lib/kea
|
||||
chmod 0750 /var/run/kea /var/lib/kea
|
||||
|
||||
config_load "kea"
|
||||
config_foreach start_kea "service"
|
||||
|
||||
@@ -225,7 +225,7 @@
|
||||
+SUBDIRS = .
|
||||
|
||||
AM_CPPFLAGS = -I$(top_builddir)/src/lib -I$(top_srcdir)/src/lib
|
||||
AM_CPPFLAGS += $(BOOST_INCLUDES)
|
||||
AM_CPPFLAGS += -DDEFAULT_HOOKS_PATH=\"$(libdir)/kea/hooks\"
|
||||
--- a/src/lib/http/Makefile.am
|
||||
+++ b/src/lib/http/Makefile.am
|
||||
@@ -1,4 +1,4 @@
|
||||
|
||||
@@ -6,7 +6,7 @@ Date: Sat Aug 3 10:19:05 2024 -0600
|
||||
|
||||
--- a/src/bin/keactrl/keactrl.in
|
||||
+++ b/src/bin/keactrl/keactrl.in
|
||||
@@ -112,7 +112,8 @@ get_pid_from_file() {
|
||||
@@ -116,7 +116,8 @@ get_pid_from_file() {
|
||||
|
||||
# Extract the name portion (from last slash to last dot) of the config file name.
|
||||
local conf_name
|
||||
|
||||
@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=pbr
|
||||
PKG_VERSION:=1.2.0
|
||||
PKG_RELEASE:=2
|
||||
PKG_RELEASE:=6
|
||||
PKG_LICENSE:=AGPL-3.0-or-later
|
||||
PKG_MAINTAINER:=Stan Grishin <stangri@melmac.ca>
|
||||
|
||||
|
||||
@@ -286,10 +286,11 @@ is_supported_protocol(){ grep -qi "^${1:--}" /etc/protocols;}
|
||||
is_pptp() { local p; network_get_protocol p "$1"; [ "${p:0:4}" = "pptp" ]; }
|
||||
is_softether() { local d; network_get_device d "$1"; [ "${d:0:4}" = "vpn_" ]; }
|
||||
is_supported_interface() { { is_lan "$1" || is_disabled_interface "$1"; } && return 1; str_contains_word "$supported_interface" "$1" || { ! is_ignored_interface "$1" && { is_wan "$1" || is_wan6 "$1" || is_tunnel "$1"; }; } || is_ignore_target "$1" || is_xray "$1"; }
|
||||
is_netbird() { local d; network_get_device d "$1"; [ "${d:0:2}" = "wt" ]; }
|
||||
is_tailscale() { local d; network_get_device d "$1"; [ "${d:0:9}" = "tailscale" ]; }
|
||||
is_tor() { [ "$(str_to_lower "$1")" = "tor" ]; }
|
||||
is_tor_running() { ! is_ignored_interface 'tor' && [ -s "$torConfigFile" ] && str_contains "$(ubus call service list "{ 'name': 'tor' }" | jsonfilter -e '@.tor.instances.*.running')" 'true' && return 0 || return 1; }
|
||||
is_tunnel() { is_dslite "$1" || is_l2tp "$1" || is_oc "$1" || is_ovpn "$1" || is_pptp "$1" || is_softether "$1" || is_tailscale "$1" || is_tor "$1" || is_wg "$1"; }
|
||||
is_tunnel() { is_dslite "$1" || is_l2tp "$1" || is_oc "$1" || is_ovpn "$1" || is_pptp "$1" || is_softether "$1" || is_netbird "$1" || is_tailscale "$1" || is_tor "$1" || is_wg "$1"; }
|
||||
is_url() { is_url_file "$1" || is_url_dl "$1"; }
|
||||
is_url_dl() { is_url_ftp "$1" || is_url_http "$1" || is_url_https "$1"; }
|
||||
is_url_file() { [ "$1" != "${1#file://}" ]; }
|
||||
|
||||
@@ -1,87 +1,106 @@
|
||||
#!/bin/sh
|
||||
# When using pbr with dnsmasq's nft set support, a domain-based policy will not take effect until
|
||||
# the remote domain name has been resolved by dnsmasq. Resolve all domain names in pbr policies in advance.
|
||||
# shellcheck disable=SC3043
|
||||
|
||||
(
|
||||
timeout_nft='10'
|
||||
timeout_dnsmasq='20'
|
||||
pipe_ubus="/tmp/pipe.ubus.$$"
|
||||
pipe_nslookup="/tmp/pipe.nslookup.$$"
|
||||
log_abort='domain names in policies not resolved'
|
||||
pipe_nslookup="/var/run/${packageName}.nslookup.$$"
|
||||
|
||||
# shellcheck disable=SC2154
|
||||
output()
|
||||
{
|
||||
msg="$*"
|
||||
msg=$(printf '%b' "$msg" | sed 's/\x1b\[[0-9;]*m//g')
|
||||
output() {
|
||||
local msg="$*"
|
||||
|
||||
msg="$(printf '%b' "$msg" | sed 's/\x1b\[[0-9;]*m//g')"
|
||||
# shellcheck disable=SC2154
|
||||
logger -t "$packageName [$$]" "$(printf '%b' "$msg")"
|
||||
}
|
||||
|
||||
nft_ready()
|
||||
{
|
||||
nft_ready() {
|
||||
local timeout_nft='10'
|
||||
|
||||
while ! /usr/sbin/nft list sets 'inet' | grep -q "pbr"; do
|
||||
[ "$timeout_nft" -eq '0' ] && {
|
||||
output "Pbr's nft sets not found, $log_abort $__FAIL__"
|
||||
return 1
|
||||
}
|
||||
sleep '1' && timeout_nft=$((timeout_nft - 1))
|
||||
sleep '1' && timeout_nft="$((timeout_nft - 1))"
|
||||
done
|
||||
}
|
||||
|
||||
run_nslookup()
|
||||
{
|
||||
output=$(nslookup "$1" 127.0.0.1) && { echo '0' > "$pipe_nslookup"; return; }
|
||||
reason=$(printf '%s' "$output" | grep -Eo -m 1 'NXDOMAIN|SERVFAIL|timed out') && \
|
||||
run_nslookup() {
|
||||
local output reason
|
||||
|
||||
output="$(nslookup "$1" 127.0.0.1)" && { echo '0' > "$pipe_nslookup"; return; }
|
||||
reason="$(printf '%s' "$output" | grep -Eo -m 1 'NXDOMAIN|SERVFAIL|timed out')" && \
|
||||
output "$_WARNING_ Lookup failed for $domain ($reason)"
|
||||
echo '1' > "$pipe_nslookup"
|
||||
}
|
||||
|
||||
# shellcheck disable=SC2162
|
||||
nslookup_tracker()
|
||||
{
|
||||
while read ec; do
|
||||
entries=$((entries + 1))
|
||||
[ "$ec" -eq '1' ] && errors=$((errors + 1))
|
||||
nslookup_tracker() {
|
||||
local entries errors
|
||||
|
||||
while read -r rc; do
|
||||
entries="$((entries + 1))"
|
||||
[ "$rc" -eq '1' ] && errors="$((errors + 1))"
|
||||
done < "$pipe_nslookup"
|
||||
|
||||
output "Finished resolving $entries domain names in policies (${errors:-0} failed) $__OK__"
|
||||
}
|
||||
|
||||
[ -n "$resolverSetSupported" ] || {
|
||||
output "Resolver set support disabled, $log_abort $__FAIL__"
|
||||
exit
|
||||
}
|
||||
mkfifo "$pipe_ubus"
|
||||
mkfifo "$pipe_nslookup"
|
||||
ubus listen -m 'ubus.object.add' > "$pipe_ubus" & ubus_listen_pid=$!
|
||||
main() {
|
||||
local pipe_ubus="/var/run/${packageName}.ubus.$$"
|
||||
local timeout_dnsmasq='20'
|
||||
local msg_abort='domain names in policies not resolved'
|
||||
local dnsmasq_restarted ubus_listen_pid event domain entries
|
||||
local rc='0'
|
||||
|
||||
# shellcheck disable=SC3045
|
||||
while read -t "$timeout_dnsmasq" -r event; do
|
||||
echo "$event" | grep -q "dnsmasq.dns" || continue
|
||||
dnsmasq_restarted='1'
|
||||
# shellcheck disable=SC2154
|
||||
[ -f "$packageDnsmasqFile" ] || {
|
||||
output "File $packageDnsmasqFile not found, $log_abort $__FAIL__"
|
||||
break
|
||||
[ -n "$resolverSetSupported" ] || {
|
||||
output "Resolver set support disabled, $msg_abort $__FAIL__"
|
||||
rc='1'
|
||||
return "$rc"
|
||||
}
|
||||
nft_ready || break
|
||||
nslookup_tracker & exec 3>"$pipe_nslookup"
|
||||
mkfifo "$pipe_ubus"
|
||||
mkfifo "$pipe_nslookup"
|
||||
# The subshell may be necessary for "$!" to expand to a correct value
|
||||
( exec ubus listen -m 'ubus.object.add' > "$pipe_ubus" ) &
|
||||
ubus_listen_pid="$!"
|
||||
|
||||
(
|
||||
output "Resolving domain names in policies..."
|
||||
while IFS='/' read -r _ domain _; do
|
||||
[ -n "$domain" ] && run_nslookup "$domain" &
|
||||
entries=$((entries + 1))
|
||||
done < "$packageDnsmasqFile"
|
||||
wait
|
||||
)
|
||||
# shellcheck disable=SC3045
|
||||
while read -t "$timeout_dnsmasq" -r event; do
|
||||
echo "$event" | grep -q "dnsmasq.dns" || continue
|
||||
dnsmasq_restarted='1'
|
||||
# shellcheck disable=SC2154
|
||||
[ -f "$packageDnsmasqFile" ] || {
|
||||
output "File $packageDnsmasqFile not found, $msg_abort $__FAIL__"
|
||||
rc='1'
|
||||
break
|
||||
}
|
||||
nft_ready || {
|
||||
output "Pbr's nft sets not found, $msg_abort $__FAIL__"
|
||||
rc='1'
|
||||
break
|
||||
}
|
||||
nslookup_tracker & exec 3>"$pipe_nslookup"
|
||||
(
|
||||
output "Resolving domain names in policies..."
|
||||
while IFS='/' read -r _ domain _; do
|
||||
[ -n "$domain" ] && run_nslookup "$domain" &
|
||||
entries="$((entries + 1))"
|
||||
done < "$packageDnsmasqFile"
|
||||
wait
|
||||
)
|
||||
exec 3>&-
|
||||
break
|
||||
done < "$pipe_ubus"
|
||||
|
||||
exec 3>&-
|
||||
break
|
||||
done < "$pipe_ubus"
|
||||
|
||||
[ -n "$dnsmasq_restarted" ] || output "Dnsmasq hasn't restarted, $log_abort $__FAIL__"
|
||||
kill "$ubus_listen_pid"
|
||||
rm "$pipe_ubus"
|
||||
rm "$pipe_nslookup"
|
||||
[ -n "$dnsmasq_restarted" ] || {
|
||||
output "Dnsmasq hasn't restarted, $msg_abort $__FAIL__"
|
||||
rc='1'
|
||||
}
|
||||
kill "$ubus_listen_pid"
|
||||
rm -f "$pipe_ubus"
|
||||
rm -f "$pipe_nslookup"
|
||||
return "$rc"
|
||||
}
|
||||
|
||||
main
|
||||
return "$?"
|
||||
) &
|
||||
|
||||
@@ -8,15 +8,14 @@
|
||||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=tor
|
||||
PKG_VERSION:=0.4.8.18
|
||||
PKG_VERSION:=0.4.8.21
|
||||
PKG_RELEASE:=1
|
||||
|
||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
|
||||
PKG_SOURCE_URL:=https://dist.torproject.org/ \
|
||||
https://archive.torproject.org/tor-package-archive
|
||||
PKG_HASH:=4aea6c109d4eff4ea2bafb905a7e6b0a965d14fe856214b02fcd9046b4d93af8
|
||||
PKG_MAINTAINER:=Hauke Mehrtens <hauke@hauke-m.de> \
|
||||
Peter Wagner <tripolar@gmx.at>
|
||||
PKG_HASH:=eaf6f5b73091b95576945eade98816ddff7cd005befe4d94718a6f766b840903
|
||||
PKG_MAINTAINER:=Rui Salvaterra <rsalvaterra@gmail.com>
|
||||
PKG_LICENSE:=BSD-3-Clause
|
||||
PKG_LICENSE_FILES:=LICENSE
|
||||
PKG_CPE_ID:=cpe:/a:torproject:tor
|
||||
|
||||
@@ -1,52 +0,0 @@
|
||||
#
|
||||
# Copyright (C) 2016-2020 OpenWrt.org
|
||||
#
|
||||
# This is free software, licensed under the GNU General Public License v2.
|
||||
# See /LICENSE for more information.
|
||||
#
|
||||
|
||||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=webui-aria2
|
||||
PKG_SOURCE_DATE:=2018-12-09
|
||||
PKG_SOURCE_VERSION:=fb9d758d5cdc2be0867ee9502c44fd17560f5d24
|
||||
PKG_RELEASE:=1
|
||||
|
||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_DATE).tar.gz
|
||||
PKG_SOURCE_URL:=https://codeload.github.com/ziahamza/webui-aria2/tar.gz/$(PKG_SOURCE_VERSION)?
|
||||
PKG_HASH:=4cddcbd64a7b20baf0c2c31cb3c07d0fa01576a12c4e6feefd0840acd3f65919
|
||||
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_SOURCE_VERSION)
|
||||
|
||||
PKG_LICENSE:=MIT
|
||||
PKG_LICENSE_FILES:=LICENSE
|
||||
PKG_MAINTAINER:=Hsing-Wang Liao <kuoruan@gmail.com>
|
||||
|
||||
include $(INCLUDE_DIR)/package.mk
|
||||
|
||||
define Package/webui-aria2
|
||||
SECTION:=net
|
||||
CATEGORY:=Network
|
||||
SUBMENU:=Download Manager
|
||||
DEPENDS:=
|
||||
TITLE:=An interface to interact with aria2
|
||||
URL:=https://github.com/ziahamza/webui-aria2
|
||||
PKGARCH:=all
|
||||
endef
|
||||
|
||||
define Package/webui-aria2/description
|
||||
The aim for this project is to create the worlds best and hottest interface to interact with aria2. Very simple to use.
|
||||
endef
|
||||
|
||||
define Build/Compile
|
||||
endef
|
||||
|
||||
define Package/webui-aria2/install
|
||||
$(INSTALL_DIR) $(1)/www/webui-aria2
|
||||
|
||||
$(CP) \
|
||||
$(PKG_BUILD_DIR)/docs/* \
|
||||
$(PKG_BUILD_DIR)/{LICENSE,favicon.ico} \
|
||||
$(1)/www/webui-aria2
|
||||
endef
|
||||
|
||||
$(eval $(call BuildPackage,webui-aria2))
|
||||
@@ -1,11 +0,0 @@
|
||||
--- a/docs/index.html
|
||||
+++ b/docs/index.html
|
||||
@@ -3,7 +3,7 @@
|
||||
|
||||
<!-- {{{ head -->
|
||||
<head>
|
||||
- <link rel="icon" href="../favicon.ico" />
|
||||
+ <link rel="icon" href="favicon.ico" />
|
||||
|
||||
<meta charset="utf-8">
|
||||
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
|
||||
Reference in New Issue
Block a user