Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'openwrt:master' into master

Browse source
This commit is contained in:
Hayzam Sherif 2024-01-27 03:52:52 +05:30 committed by GitHub
commit abb31f207f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
158 changed files with 1346 additions and 4110 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
.github/workflows/formal.yml vendored
View file

@ -34,14 +34,6 @@ jobs:
RET=1
fi
author="$(git show -s --format=%aN $commit)"
if echo $author | grep -q '\S\+\s\+\S\+'; then
success "Author name ($author) seems ok"
else
err "Author name ($author) need to be your real name 'firstname lastname'"
RET=1
fi
subject="$(git show -s --format=%s $commit)"
if echo "$subject" | grep -q -e '^[0-9A-Za-z,+/_-]\+: ' -e '^Revert ' -e '^CONTRIBUTING.md' -e '^README.md'; then
success "Commit subject line seems ok ($subject)"

6
admin/btop/Makefile
View file

@ -1,12 +1,12 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=btop
PKG_VERSION:=1.2.13
PKG_RELEASE:=3
PKG_VERSION:=1.3.0
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL=https://codeload.github.com/aristocratos/btop/tar.gz/v$(PKG_VERSION)?
PKG_HASH:=668dc4782432564c35ad0d32748f972248cc5c5448c9009faeb3445282920e02
PKG_HASH:=375e078ce2091969f0cd14030620bd1a94987451cf7a73859127a786006a32cf
PKG_MAINTAINER:=Tianling Shen <cnsztl@immortalwrt.org>
PKG_LICENSE:=Apache-2.0

4
admin/htop/Makefile
View file

@ -8,12 +8,12 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=htop
PKG_VERSION:=3.2.2
PKG_VERSION:=3.3.0
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/htop-dev/htop/tar.gz/$(PKG_VERSION)?
PKG_HASH:=3829c742a835a0426db41bb039d1b976420c21ec65e93b35cd9bfd2d57f44ac8
PKG_HASH:=1e5cc328eee2bd1acff89f860e3179ea24b85df3ac483433f92a29977b14b045
PKG_LICENSE:=GPL-2.0-or-later
PKG_LICENSE_FILES:=COPYING

4
admin/sudo/Makefile
View file

@ -8,12 +8,12 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=sudo
PKG_VERSION:=1.9.15p4
PKG_VERSION:=1.9.15p5
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://www.sudo.ws/dist
PKG_HASH:=2e20ec9865eeeea1316c6f49ec6ac4678869b689d4d90b44243bf4887d6dd532
PKG_HASH:=558d10b9a1991fb3b9fa7fa7b07ec4405b7aefb5b3cb0b0871dbc81e3a88e558
PKG_MAINTAINER:=Alexandru Ardelean <ardeleanalex@gmail.com>

4
lang/luasec/Makefile
View file

@ -8,12 +8,12 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=luasec
PKG_VERSION:=1.3.1
PKG_VERSION:=1.3.2
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/brunoos/luasec/tar.gz/v$(PKG_VERSION)?
PKG_HASH:=6fb919633a3304a262189f62a369adc4b36bc7113da37af093b069cf1c8d785e
PKG_HASH:=97293092ba385ab390decb6678bc8cbeffd5899bfbc49eb7ef4aa00f5e31c3d4
MAINTAINER:=W. Michael Petullo <mike@flyn.org>
PKG_LICENSE:=MIT

4
lang/node/Makefile
View file

@ -8,12 +8,12 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=node
PKG_VERSION:=v20.10.0
PKG_VERSION:=v20.11.0
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=https://nodejs.org/dist/$(PKG_VERSION)
PKG_HASH:=32eb256eebd8cacd5574e6631e54b42be7ec8ebe25ad47a8ca685403bad15535
PKG_HASH:=31807ebeeeb049c53f1765e4a95aed69476a4b696dd100cb539ab668d7950b40
PKG_MAINTAINER:=Hirokazu MORIKAWA <morikw2@gmail.com>, Adrian Panella <ianchi74@outlook.com>
PKG_LICENSE:=MIT

2
lang/node/patches/007-fix_host_build_on_macos.patch
View file

@ -1,6 +1,6 @@
--- a/tools/gyp/pylib/gyp/generator/make.py
+++ b/tools/gyp/pylib/gyp/generator/make.py
@@ -206,7 +206,7 @@ cmd_solink_module = $(LINK.$(TOOLSET)) -
@@ -207,7 +207,7 @@ cmd_solink_module = $(LINK.$(TOOLSET)) -
LINK_COMMANDS_MAC = """\
quiet_cmd_alink = LIBTOOL-STATIC $@

24
lang/node/patches/204-v8_gyp.patch
View file

@ -44,7 +44,7 @@
],
'sources': [
'<!@pymod_do_main(GN-scraper "<(V8_ROOT)/BUILD.gn" "\\"v8_initializers.*?sources = ")',
@@ -689,6 +695,7 @@
@@ -694,6 +700,7 @@
'toolsets': ['host', 'target'],
'direct_dependent_settings': {
'sources': ['<!@pymod_do_main(GN-scraper "<(V8_ROOT)/BUILD.gn" "v8_compiler_sources = ")'],
@ -52,7 +52,7 @@
'conditions': [
['v8_target_arch=="ia32"', {
'sources': [
@@ -797,6 +804,8 @@
@@ -802,6 +809,8 @@
'target_name': 'v8_turboshaft',
'type': 'static_library',
'toolsets': ['host', 'target'],
@ -61,7 +61,7 @@
'dependencies': [
'generate_bytecode_builtins_list',
'run_torque',
@@ -821,6 +830,7 @@
@@ -826,6 +835,7 @@
'run_torque',
'v8_maybe_icu',
],
@ -69,7 +69,7 @@
'conditions': [
['(is_component_build and not v8_optimized_debug and v8_enable_fast_mksnapshot) or v8_enable_turbofan==0', {
'dependencies': [
@@ -861,6 +871,7 @@
@@ -866,6 +876,7 @@
],
'includes': ['inspector.gypi'],
'direct_dependent_settings': {
@ -77,7 +77,7 @@
'include_dirs': [
'<(generate_bytecode_output_root)',
'<(SHARED_INTERMEDIATE_DIR)',
@@ -1474,6 +1485,7 @@
@@ -1484,6 +1495,7 @@
}],
],
'direct_dependent_settings': {
@ -85,7 +85,7 @@
'include_dirs': [
'<(V8_ROOT)/include',
],
@@ -1494,6 +1506,7 @@
@@ -1504,6 +1516,7 @@
{
'target_name': 'bytecode_builtins_list_generator',
'type': 'executable',
@ -93,7 +93,7 @@
'conditions': [
['want_separate_host_toolset', {
'toolsets': ['host'],
@@ -1522,6 +1535,9 @@
@@ -1532,6 +1545,9 @@
{
'target_name': 'mksnapshot',
'type': 'executable',
@ -103,7 +103,7 @@
'dependencies': [
'v8_base_without_compiler',
'v8_compiler_for_mksnapshot',
@@ -1549,6 +1565,7 @@
@@ -1559,6 +1575,7 @@
{
'target_name': 'torque',
'type': 'executable',
@ -111,7 +111,7 @@
'dependencies': [
'torque_base',
# "build/win:default_exe_manifest",
@@ -1591,6 +1608,7 @@
@@ -1601,6 +1618,7 @@
{
'target_name': 'torque-language-server',
'type': 'executable',
@ -119,7 +119,7 @@
'conditions': [
['want_separate_host_toolset', {
'toolsets': ['host'],
@@ -1622,6 +1640,8 @@
@@ -1632,6 +1650,8 @@
{
'target_name': 'gen-regexp-special-case',
'type': 'executable',
@ -128,7 +128,7 @@
'dependencies': [
'v8_libbase',
# "build/win:default_exe_manifest",
@@ -1840,6 +1860,7 @@
@@ -1850,6 +1870,7 @@
}],
],
'direct_dependent_settings': {
@ -136,7 +136,7 @@
'include_dirs': [
'<(V8_ROOT)/include',
],
@@ -1961,15 +1982,19 @@
@@ -1971,15 +1992,19 @@
}],
],
'direct_dependent_settings': {

2
lang/node/patches/999-revert_enable_pointer_authentication_on_arm64.patch
View file

@ -1,6 +1,6 @@
--- a/configure.py
+++ b/configure.py
@@ -1270,7 +1270,6 @@ def configure_node(o):
@@ -1275,7 +1275,6 @@ def configure_node(o):
# Enable branch protection for arm64
if target_arch == 'arm64':

4
lang/php8-pecl-mcrypt/Makefile
View file

@ -8,9 +8,9 @@ include $(TOPDIR)/rules.mk
PECL_NAME:=mcrypt
PECL_LONGNAME:=Bindings for the libmcrypt library
PKG_VERSION:=1.0.6
PKG_VERSION:=1.0.7
PKG_RELEASE:=1
PKG_HASH:=be6efd52a76ed01aabdda0ce426aed0a93db4ec06908c16a5460175c35b0d08a
PKG_HASH:=12ea2fbbf2e2efbe790a12121f77bf096c8b84cef81d0216bec00d56e5badef4
PKG_NAME:=php8-pecl-mcrypt
PKG_SOURCE:=$(PECL_NAME)-$(PKG_VERSION).tgz

6
lang/python/numpy/Makefile
View file

@ -6,11 +6,11 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=numpy
PKG_VERSION:=1.25.2
PKG_VERSION:=1.26.2
PKG_RELEASE:=1
PYPI_NAME:=$(PKG_NAME)
PKG_HASH:=fd608e19c8d7c55021dffd43bfe5492fab8cc105cc8986f813f8c3c048b38760
PKG_HASH:=f65738447676ab5777f11e6bbbdb8ce11b785e105f690bc45966574816b6d3ea
PKG_MAINTAINER:=Alexandru Ardelean <ardeleanalex@gmail.com>
@ -21,7 +21,7 @@ PKG_CPE_ID:=cpe:/a:numpy:numpy
PKG_CONFIG_DEPENDS:= \
CONFIG_NUMPY_OPENBLAS_SUPPORT
PKG_BUILD_DEPENDS:=python-cython/host
PKG_BUILD_DEPENDS:=python-cython/host pyproject-metadata/host
# Ensure numpy does not find openblas if openblas support is not enabled
PYTHON3_PKG_BUILD_VARS:= \

16
lang/python/numpy/patches/001-unpin-build-dependencies.patch
View file

@ -1,16 +0,0 @@
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -4,11 +4,11 @@
#build-backend = "mesonpy"
requires = [
# setuptools, wheel and Cython are needed for the setup.py based build
- "setuptools==59.2.0",
+ "setuptools>=59.2.0",
# `wheel` is needed for non-isolated builds, given that `meson-python`
# doesn't list it as a runtime requirement (at least in 0.11.0) - it's
# likely to be removed as a dependency in meson-python 0.12.0.
- "wheel==0.38.1",
+ "wheel>=0.38.1",
"Cython>=0.29.34,<3.0",
# "meson-python>=0.10.0",
]

2
lang/python/numpy/patches/002-avoid-build-user-config-files.patch
View file

@ -1,6 +1,6 @@
--- a/numpy/distutils/system_info.py
+++ b/numpy/distutils/system_info.py
@@ -403,7 +403,7 @@ def get_standard_file(fname):
@@ -404,7 +404,7 @@ def get_standard_file(fname):
pass
else:
user_file = os.path.join(f, fname)

22
lang/python/numpy/patches/003-without-vendored-meson.patch Normal file
View file

@ -0,0 +1,22 @@
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,6 @@
[build-system]
-build-backend = "mesonpy"
-backend-path = ['./vendored-meson/meson-python']
+#build-backend = "mesonpy"
+#backend-path = ['./vendored-meson/meson-python']
requires = [
"Cython>=0.29.34,<3.1",
# All dependencies of the vendored meson-python (except for meson, because
@@ -194,8 +194,8 @@ repair-wheel-command = ""
[tool.spin]
package = 'numpy'
-[tool.spin.meson]
-cli = 'vendored-meson/meson/meson.py'
+#[tool.spin.meson]
+#cli = 'vendored-meson/meson/meson.py'
[tool.spin.commands]
"Build" = [

39
lang/python/pyproject-metadata/Makefile Normal file
View file

@ -0,0 +1,39 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=pyproject-metadata
PKG_VERSION:=0.7.1
PKG_RELEASE:=1
PYPI_NAME:=pyproject-metadata
PKG_HASH:=0a94f18b108b9b21f3a26a3d541f056c34edcb17dc872a144a15618fed7aef67
PKG_MAINTAINER:=Andy Syam <privasisource@gmail.com>
PKG_LICENSE:=MIT
PKG_LICENSE_FILES:=LICENSE
HOST_BUILD_DEPENDS:=python3/host python-build/host python-installer/host python-wheel/host
include ../pypi.mk
include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/host-build.mk
include ../python3-package.mk
include ../python3-host-build.mk
define Package/python3-pyproject-metadata
SUBMENU:=Python
SECTION:=lang
CATEGORY:=Languages
TITLE:=PEP 621 metadata parsing
URL:=https://github.com/FFY00/python-pyproject-metadata
DEPENDS:=+python3
endef
define Package/python3-pyproject-metadata/description
This project does not implement the parsing of pyproject.toml containing PEP 621 metadata.
Instead, given a Python data structure representing PEP 621 metadata (already parsed), it will validate this input and generate a PEP 643-compliant metadata file (e.g. PKG-INFO).
endef
$(eval $(call Py3Package,python3-pyproject-metadata))
$(eval $(call BuildPackage,python3-pyproject-metadata))
$(eval $(call BuildPackage,python3-pyproject-metadata-src))
$(eval $(call HostBuild))

4
lang/python/python-bleak/Makefile
View file

@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=python-bleak
PKG_VERSION:=0.21.1
PKG_RELEASE:=1
PKG_RELEASE:=2
PYPI_NAME:=bleak
PKG_HASH:=ec4a1a2772fb315b992cbaa1153070c7e26968a52b0e2727035f443a1af5c18f
@ -30,7 +30,7 @@ define Package/python3-bleak
TITLE:=Bluetooth Low Energy platform Agnostic Klient
URL:=https://github.com/hbldh/bleak
DEPENDS:=+python3-light +python3-async-timeout +python3-asyncio \
+python3-dbus-fast +python3-ctypes +python3-logging
+python3-dbus-fast +python3-ctypes +python3-typing-extensions +python3-logging
endef
define Package/python3-bleak/description

4
lang/python/python-cython/Makefile
View file

@ -8,11 +8,11 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=python-cython
PKG_VERSION:=0.29.36
PKG_VERSION:=3.0.7
PKG_RELEASE:=1
PYPI_NAME:=Cython
PKG_HASH:=41c0cfd2d754e383c9eeb95effc9aa4ab847d0c9747077ddd7c0dcb68c3bc01f
PKG_HASH:=fb299acf3a578573c190c858d49e0cf9d75f4bc49c3f24c5a63804997ef09213
PKG_LICENSE:=Apache-2.0
PKG_LICENSE_FILES:=LICENSE.txt

4
lang/python/python-dbus-fast/Makefile
View file

@ -7,12 +7,12 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=python-dbus-fast
PKG_VERSION:=2.20.0
PKG_VERSION:=2.21.0
PKG_RELEASE:=1
PYPI_NAME:=dbus-fast
PYPI_SOURCE_NAME:=dbus_fast
PKG_HASH:=a38e837c5a8d0a1745ec8390f68ff57986ed2167b0aa2e4a79738a51dd6dfcc3
PKG_HASH:=f582f6f16791ced6067dab325fae444edf7ce0704315b90c2a473090636a6fe0
PKG_MAINTAINER:=Quintin Hill <stuff@quintin.me.uk>
PKG_LICENSE:=MIT

4
lang/python/python-distro/Makefile
View file

@ -1,11 +1,11 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=python-distro
PKG_VERSION:=1.8.0
PKG_VERSION:=1.9.0
PKG_RELEASE:=1
PYPI_NAME:=distro
PKG_HASH:=02e111d1dc6a50abb8eed6bf31c3e48ed8b0830d1ea2a1b78c61765c2513fdd8
PKG_HASH:=2fa77c6fd8940f116ee1d6b94a2f90b13b5ea8d019b98bc8bafdcabcdd9bdbed
PKG_MAINTAINER:=Javier Marcet <javier@marcet.info>
PKG_LICENSE:=Apache-2.0

4
lang/python/python-docker/Makefile
View file

@ -1,11 +1,11 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=python-docker
PKG_VERSION:=6.1.3
PKG_VERSION:=7.0.0
PKG_RELEASE:=1
PYPI_NAME:=docker
PKG_HASH:=aa6d17830045ba5ef0168d5eaa34d37beeb113948c413affe1d5991fc11f9a20
PKG_HASH:=323736fb92cd9418fc5e7133bc953e11a9da04f4483f828b527db553f1e7e5a3
PKG_MAINTAINER:=Javier Marcet <javier@marcet.info>
PKG_LICENSE:=Apache-2.0

49
lang/python/python-gevent/Makefile Normal file
View file

@ -0,0 +1,49 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=python-gevent
PKG_VERSION:=23.9.1
PKG_RELEASE:=1
PYPI_NAME:=gevent
PKG_HASH:=72c002235390d46f94938a96920d8856d4ffd9ddf62a303a0d7c118894097e34
PKG_MAINTAINER:=Andy Syam <privasisource@gmail.com>
PKG_LICENSE:=MIT
PKG_LICENSE_FILES:=LICENSE
PKG_BUILD_FLAGS:=no-mips16
PKG_BUILD_DEPENDS:=python-cffi/host python-greenlet/host python-cython/host
include ../pypi.mk
include $(INCLUDE_DIR)/package.mk
include ../python3-package.mk
PYTHON3_PKG_SETUP_VARS:= \
GEVENTSETUP_EMBED=0 \
GEVENTSETUP_EMBED_LIBEV=0 \
GEVENTSETUP_EMBED_CARES=0
define Package/python3-gevent
SUBMENU:=Python
SECTION:=lang
CATEGORY:=Languages
TITLE:=Coroutine-based network library
URL:=https://github.com/gevent/gevent
DEPENDS:= \
+python3-light \
+python3-cffi \
+python3-greenlet \
+python3-zope-interface \
+libcares \
+libev \
+libuv
endef
define Package/python3-gevent/description
gevent is a coroutine -based Python networking library that uses greenlet
to provide a high-level synchronous API on top of the libev or libuv event loop.
endef
$(eval $(call Py3Package,python3-gevent))
$(eval $(call BuildPackage,python3-gevent))
$(eval $(call BuildPackage,python3-gevent-src))

9
lang/python/python-greenlet/Makefile
View file

@ -8,11 +8,11 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=python-greenlet
PKG_VERSION:=2.0.2
PKG_VERSION:=3.0.2
PKG_RELEASE:=1
PYPI_NAME:=greenlet
PKG_HASH:=e7c8dc13af7db097bed64a051d2dd49e9f0af495c26995c00a9ee842690d34c0
PKG_HASH:=1c1129bc47266d83444c85a8e990ae22688cf05fb20d7951fd2866007c2ba9bc
PKG_MAINTAINER:=Jan Pavlinec <jan.pavlinec1@gmail.com>
PKG_LICENSE:=MIT
@ -20,9 +20,13 @@ PKG_LICENSE_FILES:=LICENSE
# FIXME: remove when GCC10 is the oldest supported compiler, or the issue goes away
PKG_BUILD_FLAGS:=no-mips16
HOST_BUILD_DEPENDS:=python3/host python-build/host python-installer/host python-wheel/host
include ../pypi.mk
include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/host-build.mk
include ../python3-package.mk
include ../python3-host-build.mk
define Package/python3-greenlet
SUBMENU:=Python
@ -51,3 +55,4 @@ endif
$(eval $(call Py3Package,python3-greenlet))
$(eval $(call BuildPackage,python3-greenlet))
$(eval $(call BuildPackage,python3-greenlet-src))
$(eval $(call HostBuild))

4
lang/python/python-jsonschema/Makefile
View file

@ -1,11 +1,11 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=python-jsonschema
PKG_VERSION:=4.20.0
PKG_VERSION:=4.21.1
PKG_RELEASE:=1
PYPI_NAME:=jsonschema
PKG_HASH:=4f614fd46d8d61258610998997743ec5492a648b33cf478c1ddc23ed4598a5fa
PKG_HASH:=85727c00279f5fa6bedbe6238d2aa6403bedd8b4864ab11207d07df3cc1b2ee5
PKG_MAINTAINER:=Javier Marcet <javier@marcet.info>
PKG_LICENSE:=MIT

4
lang/python/python-msgpack/Makefile
View file

@ -8,11 +8,11 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=python-msgpack
PKG_VERSION:=1.0.5
PKG_VERSION:=1.0.7
PKG_RELEASE:=1
PYPI_NAME:=msgpack
PKG_HASH:=c075544284eadc5cddc70f4757331d99dcbc16b2bbd4849d15f8aae4cf36d31c
PKG_HASH:=572efc93db7a4d27e404501975ca6d2d9775705c2d922390d878fcf768d92c87
PKG_MAINTAINER:=Jan Pavlinec <jan.pavlinec1@gmail.com>
PKG_LICENSE:=Apache-2.0

4
lang/python/python-networkx/Makefile
View file

@ -6,11 +6,11 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=python-networkx
PKG_VERSION:=3.1
PKG_VERSION:=3.2.1
PKG_RELEASE:=1
PYPI_NAME:=networkx
PKG_HASH:=de346335408f84de0eada6ff9fafafff9bcda11f0a0dfaa931133debb146ab61
PKG_HASH:=9f1bb5cf3409bf324e0a722c20bdb4c20ee39bf1c30ce8ae499c8502b0b5e0c6
PKG_LICENSE:=BSD-3-clause
PKG_LICENSE_FILES:=LICENSE.txt

4
lang/python/python-orjson/Makefile
View file

@ -1,11 +1,11 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=python-orjson
PKG_VERSION:=3.9.10
PKG_VERSION:=3.9.12
PKG_RELEASE:=1
PYPI_NAME:=orjson
PKG_HASH:=9ebbdbd6a046c304b1845e96fbcc5559cd296b4dfd3ad2509e33c4d9ce07d6a1
PKG_HASH:=da908d23a3b3243632b523344403b128722a5f45e278a8343c2bb67538dff0e4
PKG_MAINTAINER:=Timothy Ace <openwrt@timothyace.com>
PKG_LICENSE:=Apache-2.0 MIT

4
lang/python/python-sqlalchemy/Makefile
View file

@ -8,11 +8,11 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=python-sqlalchemy
PKG_VERSION:=2.0.20
PKG_VERSION:=2.0.23
PKG_RELEASE:=1
PYPI_NAME:=SQLAlchemy
PKG_HASH:=ca8a5ff2aa7f3ade6c498aaafce25b1eaeabe4e42b73e25519183e4566a16fc6
PKG_HASH:=c1bda93cbbe4aa2aa0aa8655c5aeda505cd219ff3e8da91d1d329e143e4aff69
PKG_MAINTAINER:=Josef Schlehofer <pepe.schlehofer@gmail.com>
PKG_LICENSE:=MIT

4
lang/python/python-websocket-client/Makefile
View file

@ -1,11 +1,11 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=python-websocket-client
PKG_VERSION:=1.6.4
PKG_VERSION:=1.7.0
PKG_RELEASE:=1
PYPI_NAME:=websocket-client
PKG_HASH:=b3324019b3c28572086c4a319f91d1dcd44e6e11cd340232978c684a7650d0df
PKG_HASH:=10e511ea3a8c744631d3bd77e61eb17ed09304c413ad42cf6ddfa4c7787e8fe6
PKG_MAINTAINER:=Javier Marcet <javier@marcet.info>
PKG_LICENSE:=Apache-2.0

4
lang/python/python-zeroconf/Makefile
View file

@ -8,11 +8,11 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=python-zeroconf
PKG_VERSION:=0.97.0
PKG_VERSION:=0.131.0
PKG_RELEASE:=1
PYPI_NAME:=zeroconf
PKG_HASH:=9a06cd21182250100df6c4f4e9de2a47a0ea927c7d5a0446035bb3dfcc17a647
PKG_HASH:=90c431e99192a044a5e0217afd7ca0ca9824af93190332e6f7baf4da5375f331
PKG_MAINTAINER:=Josef Schlehofer <pepe.schlehofer@gmail.com>
PKG_LICENSE:=LGPL-2.1-or-later

35
lang/python/python-zope-event/Makefile Normal file
View file

@ -0,0 +1,35 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=python-zope-event
PKG_VERSION:=5.0
PKG_RELEASE:=1
PYPI_NAME:=zope.event
PKG_HASH:=bac440d8d9891b4068e2b5a2c5e2c9765a9df762944bda6955f96bb9b91e67cd
PKG_LICENSE:=ZPL-2.1
PKG_LICENSE_FILES:=LICENSE.txt
PKG_MAINTAINER:=Andy Syam <privasisource@gmail.com>
include ../pypi.mk
include $(INCLUDE_DIR)/package.mk
include ../python3-package.mk
define Package/python3-zope-event
SECTION:=lang
CATEGORY:=Languages
SUBMENU:=Python
TITLE:=Very basic event publishing system
URL:=https://github.com/zopefoundation/zope.event
DEPENDS:=+python3-light +python3-logging
endef
define Package/python3-zope-event/description
The zope.event package provides a simple event system, including:
An event publishing API, intended for use by applications which are unaware of any subscribers to their events.
A very simple synchronous event-dispatching system, on which more sophisticated event dispatching systems can be built. For example, a type-based event dispatching system that builds on zope.event can be found in zope.component.
endef
$(eval $(call Py3Package,python3-zope-event))
$(eval $(call BuildPackage,python3-zope-event))
$(eval $(call BuildPackage,python3-zope-event-src))

4
lang/vala/Makefile
View file

@ -8,12 +8,12 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=vala
PKG_VERSION:=0.56.3
PKG_VERSION:=0.56.14
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=@GNOME/vala/$(basename $(PKG_VERSION))
PKG_HASH:=e1066221bf7b89cb1fa7327a3888645cb33b604de3bf45aa81132fd040b699bf
PKG_HASH:=9382c268ca9bdc02aaedc8152a9818bf3935273041f629c56de410e360a3f557
PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org>
PKG_LICENSE:=LGPL-2.1-or-later

2
libs/apr/Makefile
View file

@ -20,7 +20,7 @@ PKG_MAINTAINER:=Thomas Heil <heil@terminal-consulting.de>
PKG_LICENSE:=Apache-2.0
PKG_LICENSE_FILES:=LICENSE
PKG_CPE_ID:=cpe:/a:apache:apr
PKG_CPE_ID:=cpe:/a:apache:portable_runtime
PKG_BUILD_PARALLEL:=1

6
libs/gnutls/Makefile
View file

@ -6,13 +6,13 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=gnutls
PKG_VERSION:=3.8.0
PKG_RELEASE:=3
PKG_VERSION:=3.8.3
PKG_RELEASE:=1
PKG_BUILD_FLAGS:=no-mips16
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=https://www.gnupg.org/ftp/gcrypt/gnutls/v3.8
PKG_HASH:=0ea0d11a1660a1e63f960f157b197abe6d0c8cb3255be24e1fb3815930b9bdc5
PKG_HASH:=f74fc5954b27d4ec6dfbb11dea987888b5b124289a3703afcada0ee520f4173e
PKG_MAINTAINER:=Nikos Mavrogiannopoulos <nmav@gnutls.org>
PKG_LICENSE:=LGPL-2.1-or-later

490
libs/gnutls/patches/040-build-use-clang-format-on-off-annotation.patch
View file

@ -1,490 +0,0 @@
From 18345986e29c820e64daced78232f236fd4a4e6e Mon Sep 17 00:00:00 2001
From: Daiki Ueno <ueno@gnu.org>
Date: Thu, 16 Mar 2023 16:21:37 +0900
Subject: [PATCH] build: use /* clang-format {on|off} */ annotation
Signed-off-by: Daiki Ueno <ueno@gnu.org>
---
lib/includes/gnutls/abstract.h | 4 ----
lib/includes/gnutls/compat.h | 4 ----
lib/includes/gnutls/crypto.h | 4 ----
lib/includes/gnutls/dtls.h | 4 ----
lib/includes/gnutls/gnutls.h.in | 18 ++++++++----------
lib/includes/gnutls/ocsp.h | 4 ----
lib/includes/gnutls/openpgp.h | 4 ----
lib/includes/gnutls/pkcs11.h | 4 ----
lib/includes/gnutls/pkcs12.h | 4 ----
lib/includes/gnutls/pkcs7.h | 4 ----
lib/includes/gnutls/socket.h | 4 ----
lib/includes/gnutls/system-keys.h | 4 ----
lib/includes/gnutls/tpm.h | 4 ----
lib/includes/gnutls/urls.h | 4 ----
lib/includes/gnutls/x509-ext.h | 4 ----
lib/includes/gnutls/x509.h | 4 ----
tests/test-chains-issuer-aia.h | 4 ----
tests/test-chains.h | 4 ----
18 files changed, 8 insertions(+), 78 deletions(-)
--- a/lib/includes/gnutls/abstract.h
+++ b/lib/includes/gnutls/abstract.h
@@ -30,11 +30,9 @@
# include <gnutls/openpgp.h>
# include <gnutls/tpm.h>
-/* *INDENT-OFF* */
#ifdef __cplusplus
extern "C" {
#endif
-/* *INDENT-ON* */
/* Public key operations */
@@ -748,10 +746,8 @@ gnutls_pubkey_print(gnutls_pubkey_t pubk
gnutls_certificate_print_formats_t format,
gnutls_datum_t * out);
-/* *INDENT-OFF* */
#ifdef __cplusplus
}
#endif
-/* *INDENT-ON* */
#endif /* GNUTLS_ABSTRACT_H */
--- a/lib/includes/gnutls/compat.h
+++ b/lib/includes/gnutls/compat.h
@@ -25,11 +25,9 @@
#ifndef GNUTLS_COMPAT_H
# define GNUTLS_COMPAT_H
-/* *INDENT-OFF* */
#ifdef __cplusplus
extern "C" {
#endif
-/* *INDENT-ON* */
# ifdef __GNUC__
@@ -228,10 +226,8 @@ int gnutls_priority_compression_list(gnu
const unsigned int **list)
_GNUTLS_GCC_ATTR_DEPRECATED;
-/* *INDENT-OFF* */
#ifdef __cplusplus
}
#endif
-/* *INDENT-ON* */
#endif /* GNUTLS_COMPAT_H */
--- a/lib/includes/gnutls/crypto.h
+++ b/lib/includes/gnutls/crypto.h
@@ -25,11 +25,9 @@
# include <gnutls/gnutls.h>
-/* *INDENT-OFF* */
#ifdef __cplusplus
extern "C" {
#endif
-/* *INDENT-ON* */
typedef struct api_cipher_hd_st *gnutls_cipher_hd_t;
@@ -335,10 +333,8 @@ int gnutls_encode_gost_rs_value(gnutls_d
int gnutls_decode_gost_rs_value(const gnutls_datum_t * sig_value,
gnutls_datum_t * r, gnutls_datum_t * s);
-/* *INDENT-OFF* */
#ifdef __cplusplus
}
#endif
-/* *INDENT-ON* */
#endif /* GNUTLS_CRYPTO_H */
--- a/lib/includes/gnutls/dtls.h
+++ b/lib/includes/gnutls/dtls.h
@@ -29,11 +29,9 @@
# include <gnutls/gnutls.h>
-/* *INDENT-OFF* */
#ifdef __cplusplus
extern "C" {
#endif
-/* *INDENT-ON* */
# define GNUTLS_COOKIE_KEY_SIZE 16
@@ -84,10 +82,8 @@ void gnutls_dtls_prestate_set(gnutls_ses
unsigned int gnutls_record_get_discarded(gnutls_session_t session);
-/* *INDENT-OFF* */
#ifdef __cplusplus
}
#endif
-/* *INDENT-ON* */
#endif /* GNUTLS_DTLS_H */
--- a/lib/includes/gnutls/gnutls.h.in
+++ b/lib/includes/gnutls/gnutls.h.in
@@ -45,19 +45,19 @@
/* Get time_t. */
# include <time.h>
-/* *INDENT-OFF* */
#ifdef __cplusplus
extern "C" {
#endif
-/* *INDENT-ON* */
# define GNUTLS_VERSION "@VERSION@"
-# define GNUTLS_VERSION_MAJOR @MAJOR_VERSION@
-# define GNUTLS_VERSION_MINOR @MINOR_VERSION@
-# define GNUTLS_VERSION_PATCH @PATCH_VERSION@
+/* clang-format off */
+#define GNUTLS_VERSION_MAJOR @MAJOR_VERSION@
+#define GNUTLS_VERSION_MINOR @MINOR_VERSION@
+#define GNUTLS_VERSION_PATCH @PATCH_VERSION@
-# define GNUTLS_VERSION_NUMBER @NUMBER_VERSION@
+#define GNUTLS_VERSION_NUMBER @NUMBER_VERSION@
+/* clang-format on */
# define GNUTLS_CIPHER_RIJNDAEL_128_CBC GNUTLS_CIPHER_AES_128_CBC
# define GNUTLS_CIPHER_RIJNDAEL_256_CBC GNUTLS_CIPHER_AES_256_CBC
@@ -2365,9 +2365,9 @@ int gnutls_dh_params_cpy(gnutls_dh_param
/* Session stuff
*/
-/* *INDENT-OFF* */
+/* clang-format off */
@DEFINE_IOVEC_T@
-/* *INDENT-ON* */
+/* clang-format on */
typedef ssize_t(*gnutls_pull_func) (gnutls_transport_ptr_t, void *, size_t);
typedef ssize_t(*gnutls_push_func) (gnutls_transport_ptr_t, const void *,
@@ -3634,11 +3634,9 @@ gnutls_transport_is_ktls_enabled(gnutls_
# define GNUTLS_E_APPLICATION_ERROR_MAX -65000
# define GNUTLS_E_APPLICATION_ERROR_MIN -65500
-/* *INDENT-OFF* */
#ifdef __cplusplus
}
#endif
-/* *INDENT-ON* */
# include <gnutls/compat.h>
--- a/lib/includes/gnutls/ocsp.h
+++ b/lib/includes/gnutls/ocsp.h
@@ -29,11 +29,9 @@
# include <gnutls/gnutls.h>
# include <gnutls/x509.h>
-/* *INDENT-OFF* */
#ifdef __cplusplus
extern "C" {
#endif
-/* *INDENT-ON* */
# define GNUTLS_OCSP_NONCE "1.3.6.1.5.5.7.48.1.2"
@@ -269,10 +267,8 @@ gnutls_ocsp_resp_list_import2(gnutls_ocs
const gnutls_datum_t * resp_data,
gnutls_x509_crt_fmt_t format, unsigned int flags);
-/* *INDENT-OFF* */
#ifdef __cplusplus
}
#endif
-/* *INDENT-ON* */
#endif /* GNUTLS_OCSP_H */
--- a/lib/includes/gnutls/openpgp.h
+++ b/lib/includes/gnutls/openpgp.h
@@ -30,11 +30,9 @@
# include <gnutls/gnutls.h>
# include <limits.h>
-/* *INDENT-OFF* */
#ifdef __cplusplus
extern "C" {
#endif
-/* *INDENT-ON* */
/* Openpgp certificate stuff
*/
@@ -424,10 +422,8 @@ int gnutls_certificate_set_openpgp_keyri
(gnutls_certificate_credentials_t c, const char *file,
gnutls_openpgp_crt_fmt_t format) _GNUTLS_GCC_ATTR_DEPRECATED;
-/* *INDENT-OFF* */
#ifdef __cplusplus
}
#endif
-/* *INDENT-ON* */
#endif /* GNUTLS_OPENPGP_H */
--- a/lib/includes/gnutls/pkcs11.h
+++ b/lib/includes/gnutls/pkcs11.h
@@ -28,11 +28,9 @@
# include <gnutls/gnutls.h>
# include <gnutls/x509.h>
-/* *INDENT-OFF* */
#ifdef __cplusplus
extern "C" {
#endif
-/* *INDENT-ON* */
# define GNUTLS_PKCS11_MAX_PIN_LEN 256
@@ -491,10 +489,8 @@ gnutls_pkcs11_copy_attached_extension(co
# define gnutls_x509_crt_import_pkcs11_url gnutls_x509_crt_import_url
-/* *INDENT-OFF* */
#ifdef __cplusplus
}
#endif
-/* *INDENT-ON* */
#endif /* GNUTLS_PKCS11_H */
--- a/lib/includes/gnutls/pkcs12.h
+++ b/lib/includes/gnutls/pkcs12.h
@@ -25,11 +25,9 @@
# include <gnutls/x509.h>
-/* *INDENT-OFF* */
#ifdef __cplusplus
extern "C" {
#endif
-/* *INDENT-ON* */
/* PKCS12 structures handling
*/
@@ -138,10 +136,8 @@ int gnutls_pkcs12_bag_get_friendly_name(
int gnutls_pkcs12_bag_set_friendly_name(gnutls_pkcs12_bag_t bag,
unsigned indx, const char *name);
-/* *INDENT-OFF* */
#ifdef __cplusplus
}
#endif
-/* *INDENT-ON* */
#endif /* GNUTLS_PKCS12_H */
--- a/lib/includes/gnutls/pkcs7.h
+++ b/lib/includes/gnutls/pkcs7.h
@@ -31,11 +31,9 @@
# include <gnutls/gnutls.h>
# include <gnutls/x509.h>
-/* *INDENT-OFF* */
#ifdef __cplusplus
extern "C" {
#endif
-/* *INDENT-ON* */
/* PKCS7 structures handling
*/
@@ -149,10 +147,8 @@ int gnutls_pkcs7_print_signature_info(gn
gnutls_certificate_print_formats_t format,
gnutls_datum_t * out);
-/* *INDENT-OFF* */
#ifdef __cplusplus
}
#endif
-/* *INDENT-ON* */
#endif /* GNUTLS_PKCS7_H */
--- a/lib/includes/gnutls/socket.h
+++ b/lib/includes/gnutls/socket.h
@@ -31,11 +31,9 @@
/* Get socklen_t */
# include <sys/socket.h>
-/* *INDENT-OFF* */
#ifdef __cplusplus
extern "C" {
#endif
-/* *INDENT-ON* */
void gnutls_transport_set_fastopen(gnutls_session_t session,
int fd,
@@ -43,10 +41,8 @@ void gnutls_transport_set_fastopen(gnutl
socklen_t connect_addrlen,
unsigned int flags);
-/* *INDENT-OFF* */
#ifdef __cplusplus
}
#endif
-/* *INDENT-ON* */
#endif /* GNUTLS_SOCKET_H */
--- a/lib/includes/gnutls/system-keys.h
+++ b/lib/includes/gnutls/system-keys.h
@@ -31,11 +31,9 @@
* they will be requested through the pin callbacks.
*/
-/* *INDENT-OFF* */
#ifdef __cplusplus
extern "C" {
#endif
-/* *INDENT-ON* */
struct system_key_iter_st;
typedef struct system_key_iter_st *gnutls_system_key_iter_t;
@@ -54,10 +52,8 @@ int gnutls_system_key_add_x509(gnutls_x5
gnutls_x509_privkey_t privkey, const char *label,
char **cert_url, char **key_url);
-/* *INDENT-OFF* */
#ifdef __cplusplus
}
#endif
-/* *INDENT-ON* */
#endif /* GNUTLS_SYSTEM_KEYS_H */
--- a/lib/includes/gnutls/tpm.h
+++ b/lib/includes/gnutls/tpm.h
@@ -26,11 +26,9 @@
# include <gnutls/gnutls.h>
# include <gnutls/x509.h>
-/* *INDENT-OFF* */
#ifdef __cplusplus
extern "C" {
#endif
-/* *INDENT-ON* */
struct tpm_key_list_st;
typedef struct tpm_key_list_st *gnutls_tpm_key_list_t;
@@ -71,10 +69,8 @@ int gnutls_tpm_get_registered(gnutls_tpm
int gnutls_tpm_privkey_delete(const char *url, const char *srk_password);
-/* *INDENT-OFF* */
#ifdef __cplusplus
}
#endif
-/* *INDENT-ON* */
#endif /* GNUTLS_TPM_H */
--- a/lib/includes/gnutls/urls.h
+++ b/lib/includes/gnutls/urls.h
@@ -31,11 +31,9 @@
* keys and certificates.
*/
-/* *INDENT-OFF* */
#ifdef __cplusplus
extern "C" {
#endif
-/* *INDENT-ON* */
typedef int (*gnutls_privkey_import_url_func)(gnutls_privkey_t pkey,
const char *url, unsigned flags);
@@ -71,10 +69,8 @@ typedef struct gnutls_custom_url_st {
int gnutls_register_custom_url(const gnutls_custom_url_st * st);
-/* *INDENT-OFF* */
#ifdef __cplusplus
}
#endif
-/* *INDENT-ON* */
#endif /* GNUTLS_URLS_H */
--- a/lib/includes/gnutls/x509-ext.h
+++ b/lib/includes/gnutls/x509-ext.h
@@ -28,11 +28,9 @@
# include <gnutls/gnutls.h>
# include <gnutls/x509.h>
-/* *INDENT-OFF* */
#ifdef __cplusplus
extern "C" {
#endif
-/* *INDENT-ON* */
typedef struct gnutls_subject_alt_names_st *gnutls_subject_alt_names_t;
@@ -215,10 +213,8 @@ int gnutls_x509_ct_sct_get(const gnutls_
gnutls_sign_algorithm_t * sigalg,
gnutls_datum_t * signature);
-/* *INDENT-OFF* */
#ifdef __cplusplus
}
#endif
-/* *INDENT-ON* */
#endif /* GNUTLS_X509_EXT_H */
--- a/lib/includes/gnutls/x509.h
+++ b/lib/includes/gnutls/x509.h
@@ -30,11 +30,9 @@
# include <gnutls/gnutls.h>
-/* *INDENT-OFF* */
#ifdef __cplusplus
extern "C" {
#endif
-/* *INDENT-ON* */
/* Some OIDs usually found in Distinguished names, or
* in Subject Directory Attribute extensions.
@@ -1710,10 +1708,8 @@ gnutls_x509_ext_print(gnutls_x509_ext_st
# include <gnutls/pkcs7.h>
-/* *INDENT-OFF* */
#ifdef __cplusplus
}
#endif
-/* *INDENT-ON* */
#endif /* GNUTLS_X509_H */
--- a/tests/test-chains-issuer-aia.h
+++ b/tests/test-chains-issuer-aia.h
@@ -23,8 +23,6 @@
#ifndef GNUTLS_TESTS_TEST_CHAINS_ISSUER_AIA_H
# define GNUTLS_TESTS_TEST_CHAINS_ISSUER_AIA_H
-/* *INDENT-OFF* */
-
#define MAX_CHAIN 1
static const char *missing_cert_aia[] = {
@@ -132,6 +130,4 @@ static const char *missing_cert_aia_ca[]
# pragma GCC diagnostic pop
#endif
-/* *INDENT-ON* */
-
#endif /* GNUTLS_TESTS_TEST_CHAINS_ISSUER_AIA_H */
--- a/tests/test-chains.h
+++ b/tests/test-chains.h
@@ -23,8 +23,6 @@
#ifndef GNUTLS_TESTS_TEST_CHAINS_H
# define GNUTLS_TESTS_TEST_CHAINS_H
-/* *INDENT-OFF* */
-
#define MAX_CHAIN 10
static const char *chain_with_no_subject_id_in_ca_ok[] = {
@@ -4449,6 +4447,4 @@ static struct
# pragma GCC diagnostic pop
#endif
-/* *INDENT-ON* */
-
#endif /* GNUTLS_TESTS_TEST_CHAINS_H */

6
libs/hwloc/Makefile
View file

@ -6,12 +6,12 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=hwloc
PKG_VERSION:=2.8.0
PKG_VERSION:=2.10.0
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=https://download.open-mpi.org/release/$(PKG_NAME)/v2.8
PKG_HASH:=348a72fcd48c32a823ee1da149ae992203e7ad033549e64aed6ea6eeb01f42c1
PKG_SOURCE_URL:=https://download.open-mpi.org/release/$(PKG_NAME)/v2.10
PKG_HASH:=0305dd60c9de2fbe6519fe2a4e8fdc6d3db8de574a0ca7812b92e80c05ae1392
PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org>
PKG_LICENSE:=BSD-3-Clause

68
libs/libdaq/Makefile
View file

@ -1,68 +0,0 @@
#
# Copyright (C) 2012-2015 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:=libdaq
PKG_VERSION:=2.2.2
PKG_RELEASE:=3
PKG_SOURCE_URL:=https://www.snort.org/downloads/snortplus/
PKG_SOURCE:=daq-$(PKG_VERSION).tar.gz
PKG_HASH:=7cd818cabb1ad35360e83076e54775f07165ee71407dc672d147e27d3cd37f7b
PKG_BUILD_DIR:=$(BUILD_DIR)/daq-$(PKG_VERSION)
PKG_LICENSE:=GPL-2.0
PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org>
PKG_INSTALL:=1
include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/nls.mk
define Package/libdaq
SECTION:=libs
CATEGORY:=Libraries
TITLE:=DAQ library
URL:=$(PKG_SOURCE_URL)
DEPENDS:=+libdnet +libpcap
endef
define Package/libdaq/description
Data Acquisition library for packet I/O.
endef
CONFIGURE_ARGS+= \
--disable-static \
--disable-nfq-module \
--with-dnet-includes="$(STAGING_DIR)/usr/include" \
--with-dnet-libraries="$(STAGING_DIR)/usr/lib" \
--with-libpcap-includes="$(STAGING_DIR)/usr/include" \
--with-libpcap-libraries="$(STAGING_DIR)/usr/lib" \
define Build/InstallDev
$(INSTALL_DIR) $(STAGING_DIR)/usr/include/daq2
$(CP) $(PKG_INSTALL_DIR)/usr/include/*.h $(STAGING_DIR)/usr/include/daq2/
$(INSTALL_DIR) $(STAGING_DIR)/usr/lib/daq2
$(CP) $(PKG_INSTALL_DIR)/usr/lib/lib* $(STAGING_DIR)/usr/lib/daq2/
$(INSTALL_DIR) $(STAGING_DIR)/usr/lib/daq2/daq
$(CP) $(PKG_INSTALL_DIR)/usr/lib/daq/* $(STAGING_DIR)/usr/lib/daq2/daq/
$(INSTALL_DIR) $(STAGING_DIR)/usr/bin
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/daq-modules-config $(STAGING_DIR)/usr/bin/
$(SED) 's,^\(prefix\|exec_prefix\)=.*,\1=$(STAGING_DIR)/usr,g' $(STAGING_DIR)/usr/bin/daq-modules-config
$(INSTALL_DIR) $(2)/bin
$(LN) ../../usr/bin/daq-modules-config $(2)/bin/daq-modules-config
endef
define Package/libdaq/install
$(INSTALL_DIR) $(1)/usr/lib
$(CP) $(PKG_INSTALL_DIR)/usr/lib/*.so* $(1)/usr/lib/
$(INSTALL_DIR) $(1)/usr/lib/daq
$(CP) $(PKG_INSTALL_DIR)/usr/lib/daq/*.so* $(1)/usr/lib/daq/
endef
$(eval $(call BuildPackage,libdaq))

18
libs/libdaq/patches/001-compile.patch
View file

@ -1,18 +0,0 @@
--- a/configure
+++ b/configure
@@ -13244,10 +13244,11 @@ if ${daq_cv_libpcap_version_1x+:} false;
else
if test "$cross_compiling" = yes; then :
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot run test program while cross compiling
-See \`config.log' for more details" "$LINENO" 5; }
+# { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+#$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+#as_fn_error $? "cannot run test program while cross compiling
+#See \`config.log' for more details" "$LINENO" 5; }
+ echo " No cross compiling test."
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */

42
libs/libdaq/patches/100-musl-compat.patch
View file

@ -1,42 +0,0 @@
--- a/os-daq-modules/daq_ipfw.c
+++ b/os-daq-modules/daq_ipfw.c
@@ -23,10 +23,10 @@
#include <stdlib.h>
#include <string.h>
#include <stdio.h>
+#include <unistd.h>
#include <sys/types.h>
#include <sys/time.h>
-#include <sys/unistd.h>
#include <netinet/in.h>
#include <sys/socket.h>
--- a/os-daq-modules/daq_ipq.c
+++ b/os-daq-modules/daq_ipq.c
@@ -24,10 +24,10 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
+#include <unistd.h>
#include <sys/types.h>
#include <sys/time.h>
-#include <sys/unistd.h>
#include <netinet/ip.h>
--- a/os-daq-modules/daq_nfq.c
+++ b/os-daq-modules/daq_nfq.c
@@ -24,10 +24,10 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
+#include <unistd.h>
#include <sys/types.h>
#include <sys/time.h>
-#include <sys/unistd.h>
#include <netinet/ip.h>

4
libs/libdmapsharing/Makefile
View file

@ -10,12 +10,12 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=libdmapsharing
PKG_VERSION:=3.9.12
PKG_VERSION:=3.9.13
PKG_RELEASE:=1
PKG_SOURCE:=libdmapsharing-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://www.flyn.org/projects/libdmapsharing/
PKG_HASH:=aa47e405c5059ff35ff6fc447e497dc1ff15558859a57710a664350314abf750
PKG_HASH:=3659f63f29e11d6d6ae78b53d7cc6be3f3adeff9c00c67cc50ad19c6af699f7a
PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org>
PKG_LICENSE:=LGPL-2.1-or-later

2
libs/libdmapsharing/patches/001-disable_pixbuf.patch
View file

@ -1,6 +1,6 @@
--- a/configure.ac
+++ b/configure.ac
@@ -126,15 +126,7 @@ fi
@@ -124,15 +124,7 @@ fi
AC_SUBST(GOBJECT_CFLAGS)
AC_SUBST(GOBJECT_LIBS)

1
libs/libestr/Makefile
View file

@ -18,6 +18,7 @@ PKG_HASH:=46632b2785ff4a231dcf241eeb0dcb5fc0c7d4da8ee49cf5687722cdbe8b2024
PKG_MAINTAINER:=
PKG_LICENSE:=LGPL-2.1-or-later
PKG_LICENSE_FILES:=COPYING
PKG_CPE_ID:=cpe:/a:adiscon:libestr
PKG_INSTALL:=1
PKG_BUILD_PARALLEL:=1

4
libs/libfmt/Makefile
View file

@ -8,13 +8,13 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=libfmt
PKG_VERSION:=9.1.0
PKG_VERSION:=10.2.1
PKG_RELEASE:=1
PKG_SOURCE_NAME:=fmt
PKG_SOURCE:=$(PKG_SOURCE_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/fmtlib/$(PKG_SOURCE_NAME)/tar.gz/$(PKG_VERSION)?
PKG_HASH:=5dea48d1fcddc3ec571ce2058e13910a0d4a6bab4cc09a809d8b1dd1c88ae6f2
PKG_HASH:=1250e4cc58bf06ee631567523f48848dc4596133e163f02615c97f78bab6c811
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_SOURCE_NAME)-$(PKG_VERSION)
PKG_MAINTAINER:=Othmar Truniger <github@truniger.ch>

4
libs/libgcrypt/Makefile
View file

@ -8,12 +8,12 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=libgcrypt
PKG_VERSION:=1.10.2
PKG_VERSION:=1.10.3
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=https://www.gnupg.org/ftp/gcrypt/libgcrypt/
PKG_HASH:=3b9c02a004b68c256add99701de00b383accccf37177e0d6c58289664cce0c03
PKG_HASH:=8b0870897ac5ac67ded568dcfadf45969cfa8a6beb0fd60af2a9eadc2a3272aa
PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org>
PKG_CPE_ID:=cpe:/a:gnupg:libgcrypt

7
libs/libmad/Makefile
View file

@ -8,13 +8,12 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=libmad
PKG_VERSION:=0.16.3
PKG_RELEASE:=2
PKG_RELEASE:=1
PKG_SOURCE_PROTO:=git
PKG_SOURCE_VERSION:=0.16.3
PKG_SOURCE_VERSION:=0.16.4
PKG_SOURCE_URL:=https://codeberg.org/tenacityteam/libmad
PKG_MIRROR_HASH:=f2fa2a3c75ad1c58f0b6150482a3036408c8da79f0fcbf23bcf9e105f29079ee
PKG_MIRROR_HASH:=729c78430c2fa4bf5bb25aa3f25b6a6cd5367e5255057e6211a48f6cde6a953a
PKG_MAINTAINER:=Ted Hess <thess@kitschensync.net>
PKG_LICENSE:=GPL-2.0-or-later

9
libs/libsodium/Makefile
View file

@ -8,13 +8,13 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=libsodium
PKG_VERSION:=1.0.18
PKG_RELEASE:=4
PKG_VERSION:=1.0.19
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://download.libsodium.org/libsodium/releases \
https://github.com/jedisct1/libsodium/releases/download/$(PKG_VERSION)
PKG_HASH:=6f504490b342a4f8a4c4a02fc9b866cbef8622d5df4e5452b46be121e46636c1
PKG_HASH:=018d79fe0a045cca07331d37bd0cb57b2e838c51bc48fd837a1472e50068bbea
PKG_MAINTAINER:=Damiano Renfer <x9w2n7xnu@relay.firefox.com>
PKG_LICENSE:=ISC
@ -27,6 +27,9 @@ PKG_BUILD_PARALLEL:=1
include $(INCLUDE_DIR)/package.mk
TAR_OPTIONS+= --strip-components 1
TAR_CMD=$(HOST_TAR) -C $(1) $(TAR_OPTIONS)
define Package/libsodium
SECTION:=libs
CATEGORY:=Libraries

12
libs/libsodium/patches/001-revert-f5076db5f8ef27.patch
View file

@ -1,6 +1,6 @@
--- a/src/libsodium/Makefile.am
+++ b/src/libsodium/Makefile.am
@@ -59,6 +59,7 @@ libsodium_la_SOURCES = \
@@ -73,6 +73,7 @@ libsodium_la_SOURCES = \
crypto_scalarmult/curve25519/ref10/x25519_ref10.h \
crypto_scalarmult/curve25519/scalarmult_curve25519.c \
crypto_scalarmult/curve25519/scalarmult_curve25519.h \
@ -8,7 +8,7 @@
crypto_secretbox/crypto_secretbox.c \
crypto_secretbox/crypto_secretbox_easy.c \
crypto_secretbox/xsalsa20poly1305/secretbox_xsalsa20poly1305.c \
@@ -160,7 +161,6 @@ libsodium_la_SOURCES += \
@@ -173,7 +174,6 @@ libsodium_la_SOURCES += \
crypto_pwhash/scryptsalsa208sha256/pbkdf2-sha256.h \
crypto_pwhash/scryptsalsa208sha256/pwhash_scryptsalsa208sha256.c \
crypto_pwhash/scryptsalsa208sha256/nosse/pwhash_scryptsalsa208sha256_nosse.c \
@ -18,7 +18,7 @@
crypto_shorthash/siphash24/shorthash_siphashx24.c \
--- a/src/libsodium/include/sodium.h
+++ b/src/libsodium/include/sodium.h
@@ -33,6 +33,7 @@
@@ -39,6 +39,7 @@
#include "sodium/crypto_pwhash_argon2i.h"
#include "sodium/crypto_scalarmult.h"
#include "sodium/crypto_scalarmult_curve25519.h"
@ -26,11 +26,11 @@
#include "sodium/crypto_secretbox.h"
#include "sodium/crypto_secretbox_xsalsa20poly1305.h"
#include "sodium/crypto_secretstream_xchacha20poly1305.h"
@@ -57,7 +58,6 @@
# include "sodium/crypto_box_curve25519xchacha20poly1305.h"
@@ -64,7 +65,6 @@
#include "sodium/crypto_core_ed25519.h"
#include "sodium/crypto_core_ristretto255.h"
#include "sodium/crypto_pwhash_scryptsalsa208sha256.h"
-#include "sodium/crypto_scalarmult_ed25519.h"
#include "sodium/crypto_scalarmult_ristretto255.h"
#include "sodium/crypto_secretbox_xchacha20poly1305.h"
# include "sodium/crypto_pwhash_scryptsalsa208sha256.h"
#include "sodium/crypto_stream_salsa2012.h"

12
libs/libsodium/patches/100-minimal-build-with-ed25519-core.patch
View file

@ -1,6 +1,6 @@
--- a/src/libsodium/Makefile.am
+++ b/src/libsodium/Makefile.am
@@ -12,6 +12,7 @@ libsodium_la_SOURCES = \
@@ -23,6 +23,7 @@ libsodium_la_SOURCES = \
crypto_box/crypto_box_easy.c \
crypto_box/crypto_box_seal.c \
crypto_box/curve25519xsalsa20poly1305/box_curve25519xsalsa20poly1305.c \
@ -8,7 +8,7 @@
crypto_core/ed25519/ref10/ed25519_ref10.c \
crypto_core/hchacha20/core_hchacha20.c \
crypto_core/hsalsa20/ref2/core_hsalsa20_ref2.c \
@@ -152,7 +153,6 @@ if !MINIMAL
@@ -165,7 +166,6 @@ if !MINIMAL
libsodium_la_SOURCES += \
crypto_box/curve25519xchacha20poly1305/box_curve25519xchacha20poly1305.c \
crypto_box/curve25519xchacha20poly1305/box_seal_curve25519xchacha20poly1305.c \
@ -18,19 +18,19 @@
crypto_pwhash/scryptsalsa208sha256/crypto_scrypt.h \
--- a/src/libsodium/include/sodium.h
+++ b/src/libsodium/include/sodium.h
@@ -14,6 +14,7 @@
@@ -16,6 +16,7 @@
#include "sodium/crypto_auth_hmacsha512256.h"
#include "sodium/crypto_box.h"
#include "sodium/crypto_box_curve25519xsalsa20poly1305.h"
+#include "sodium/crypto_core_ed25519.h"
#include "sodium/crypto_core_hsalsa20.h"
#include "sodium/crypto_core_hchacha20.h"
#include "sodium/crypto_core_hsalsa20.h"
#include "sodium/crypto_core_salsa20.h"
@@ -56,7 +57,6 @@
@@ -62,7 +63,6 @@
#ifndef SODIUM_LIBRARY_MINIMAL
#include "sodium/crypto_box_curve25519xchacha20poly1305.h"
-#include "sodium/crypto_core_ed25519.h"
#include "sodium/crypto_core_ristretto255.h"
#include "sodium/crypto_pwhash_scryptsalsa208sha256.h"
#include "sodium/crypto_scalarmult_ristretto255.h"
# include "sodium/crypto_secretbox_xchacha20poly1305.h"

75
libs/libsoup/Makefile
View file

@ -1,75 +0,0 @@
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
#
include $(TOPDIR)/rules.mk
PKG_NAME:=libsoup
PKG_VERSION:=2.74.3
PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=@GNOME/libsoup/$(basename $(PKG_VERSION))
PKG_HASH:=e4b77c41cfc4c8c5a035fcdc320c7bc6cfb75ef7c5a034153df1413fa1d92f13
PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org>
PKG_LICENSE:=LGPL-2.1-or-later
PKG_LICENSE_FILES:=COPYING
PKG_CPE_ID:=cpe:/a:gnome:libsoup
PKG_BUILD_DEPENDS:=glib2/host
include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/nls.mk
include $(INCLUDE_DIR)/meson.mk
define Package/libsoup
SECTION:=libs
CATEGORY:=Libraries
TITLE:=libsoup
URL:=https://wiki.gnome.org/Projects/libsoup
DEPENDS:=+glib2 +libxml2 +libgnutls +libsqlite3 +libpsl $(ICONV_DEPENDS) $(INTL_DEPENDS)
endef
MESON_ARGS += \
-Dgssapi=disabled \
-Dntlm=disabled \
-Dbrotli=disabled \
-Dtls_check=false \
-Dgnome=false \
-Dintrospection=disabled \
-Dvapi=disabled \
-Dgtk_doc=false \
-Dtests=false \
-Dinstalled_tests=false \
-Dsysprof=disabled
define package/libsoup/decription
Libsoup is an HTTP library implementation in C
endef
define Build/InstallDev
$(INSTALL_DIR) $(1)/usr/{lib/pkgconfig,include/libsoup-2.4/libsoup}
$(CP) \
$(PKG_INSTALL_DIR)/usr/lib/libsoup-2.4.so* \
$(1)/usr/lib/
$(INSTALL_DATA) \
$(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* \
$(1)/usr/lib/pkgconfig/
$(INSTALL_DATA) \
$(PKG_INSTALL_DIR)/usr/include/libsoup-2.4/libsoup/*.h \
$(1)/usr/include/libsoup-2.4/libsoup/
endef
define Package/libsoup/install
$(INSTALL_DIR) $(1)/usr/lib
$(CP) \
$(PKG_INSTALL_DIR)/usr/lib/libsoup-2.4.so* \
$(1)/usr/lib/
endef
$(eval $(call BuildPackage,libsoup))

22
libs/libsoup/patches/010-libxml-1.12.patch
View file

@ -1,22 +0,0 @@
--- a/libsoup/soup-xmlrpc-old.c
+++ b/libsoup/soup-xmlrpc-old.c
@@ -11,7 +11,7 @@
#include <string.h>
-#include <libxml/tree.h>
+#include <libxml/parser.h>
#include "soup-xmlrpc-old.h"
#include "soup.h"
--- a/libsoup/soup-xmlrpc.c
+++ b/libsoup/soup-xmlrpc.c
@@ -17,7 +17,7 @@
#include <string.h>
#include <errno.h>
-#include <libxml/tree.h>
+#include <libxml/parser.h>
#include "soup-xmlrpc.h"
#include "soup.h"

4
libs/libsoup3/Makefile
View file

@ -6,12 +6,12 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=libsoup3
PKG_VERSION:=3.4.2
PKG_VERSION:=3.4.4
PKG_RELEASE:=1
PKG_SOURCE:=libsoup-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=@GNOME/libsoup/$(basename $(PKG_VERSION))
PKG_HASH:=78c8fa37cb152d40ec8c4a148d6155e2f6947f3f1602a7cda3a31ad40f5ee2f3
PKG_HASH:=291c67725f36ed90ea43efff25064b69c5a2d1981488477c05c481a3b4b0c5aa
PKG_BUILD_DIR:=$(BUILD_DIR)/libsoup-$(PKG_VERSION)
PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org>

2
libs/libvpx/Makefile
View file

@ -20,7 +20,7 @@ PKG_SOURCE_VERSION:=v$(PKG_VERSION)
PKG_MAINTAINER:=Luiz Angelo Daros de Luca <luizluca@gmail.com>
PKG_LICENSE:=BSD-3-Clause
PKG_LICENSE_FILES:=LICENSE
PKG_CPE_ID:=cpe:/a:john_koleszar:libvpx
PKG_CPE_ID:=cpe:/a:webmproject:libvpx
PKG_BUILD_PARALLEL:=1
PKG_ABI_VERSION:=$(subst $(space),.,$(wordlist 1, 2, $(subst .,$(space),$(PKG_VERSION))))

64
libs/mpfr/Makefile
View file

@ -1,64 +0,0 @@
#
# Copyright (C) 2023 Jeffery To
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
#
include $(TOPDIR)/rules.mk
PKG_NAME:=mpfr
PKG_VERSION:=4.2.1
PKG_RELEASE:=1
PKG_SOURCE_URL:=@GNU/mpfr http://www.mpfr.org/mpfr-$(PKG_VERSION)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_HASH:=277807353a6726978996945af13e52829e3abd7a9a5b7fb2793894e18f1fcbb2
PKG_LICENSE:=LGPL-3.0-or-later
PKG_LICENSE_FILES:=COPYING.LESSER
PKG_MAINTAINER:=Jeffery To <jeffery.to@gmail.com>
PKG_CPE_ID:=cpe:/a:mpfr:gnu_mpfr
PKG_BUILD_PARALLEL:=1
PKG_FIXUP:=autoreconf
PKG_INSTALL:=1
include $(INCLUDE_DIR)/package.mk
define Package/libmpfr
SECTION:=libs
CATEGORY:=Libraries
TITLE:=GNU MPFR library
URL:=https://www.mpfr.org/
DEPENDS:=+libgmp
ABI_VERSION:=6
endef
define Package/libmpfr/description
MPFR is a portable library written in C for arbitrary precision
arithmetic on floating-point numbers. It is based on the GNU MP library.
It aims to provide a class of floating-point numbers with precise
semantics.
endef
CONFIGURE_ARGS += \
--enable-thread-safe
define Build/InstallDev
$(INSTALL_DIR) $(1)/usr/include
$(CP) $(PKG_INSTALL_DIR)/usr/include/mpf* $(1)/usr/include/
$(INSTALL_DIR) $(1)/usr/lib
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libmpfr.{a,so*} $(1)/usr/lib/
$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/mpfr.pc $(1)/usr/lib/pkgconfig/
endef
define Package/libmpfr/install
$(INSTALL_DIR) $(1)/usr/lib
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libmpfr.so.* $(1)/usr/lib/
endef
$(eval $(call BuildPackage,libmpfr))

22
libs/mpfr/patches/001-only-src.patch
View file

@ -1,22 +0,0 @@
--- a/Makefile.am
+++ b/Makefile.am
@@ -38,7 +38,7 @@ AUTOMAKE_OPTIONS = gnu
# old Automake version.
ACLOCAL_AMFLAGS = -I m4
-SUBDIRS = doc src tests tune tools/bench
+SUBDIRS = src
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = mpfr.pc
--- a/Makefile.in
+++ b/Makefile.in
@@ -401,7 +401,7 @@ AUTOMAKE_OPTIONS = gnu
# libtoolize and in case some developer needs to switch back to an
# old Automake version.
ACLOCAL_AMFLAGS = -I m4
-SUBDIRS = doc src tests tune tools/bench
+SUBDIRS = src
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = mpfr.pc
nobase_dist_doc_DATA = AUTHORS BUGS COPYING COPYING.LESSER NEWS TODO \

4
libs/openblas/Makefile
View file

@ -5,12 +5,12 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=OpenBLAS
PKG_VERSION:=0.3.25
PKG_VERSION:=0.3.26
PKG_RELEASE:=1
PKG_SOURCE:=OpenBLAS-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://github.com/xianyi/OpenBLAS/releases/download/v$(PKG_VERSION)/
PKG_HASH:=4c25cb30c4bb23eddca05d7d0a85997b8db6144f5464ba7f8c09ce91e2f35543
PKG_HASH:=4e6e4f5cb14c209262e33e6816d70221a2fe49eb69eaf0a06f065598ac602c68
PKG_LICENSE:=BSD 3-Clause
PKG_MAINTAINER:=Alexandru Ardelean <ardeleanalex@gmail.com>

4
libs/openldap/Makefile
View file

@ -8,14 +8,14 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=openldap
PKG_VERSION:=2.6.4
PKG_VERSION:=2.6.6
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tgz
PKG_SOURCE_URL:=https://gpl.savoirfairelinux.net/pub/mirrors/openldap/openldap-release/ \
https://mirror.eu.oneandone.net/software/openldap/openldap-release/ \
https://www.openldap.org/software/download/OpenLDAP/openldap-release/
PKG_HASH:=d51704e50178430c06cf3d8aa174da66badf559747a47d920bb54b2d4aa40991
PKG_HASH:=082e998cf542984d43634442dbe11da860759e510907152ea579bdc42fe39ea0
PKG_LICENSE:=OLDAP-2.8
PKG_LICENSE_FILES:=LICENSE
PKG_CPE_ID:=cpe:/a:openldap:openldap

8
libs/vips/Makefile
View file

@ -6,12 +6,12 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=vips
PKG_VERSION:=8.14.2
PKG_VERSION:=8.15.1
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=https://github.com/libvips/libvips/releases/download/v$(PKG_VERSION)
PKG_HASH:=27dad021f0835a5ab14e541d02abd41e4c3bd012d2196438df5a9e754984f7ce
PKG_HASH:=06811f5aed3e7bc03e63d05537ff4b501de5283108c8ee79396c60601a00830c
PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org>
PKG_LICENSE:=LGPL-2.1-or-later
@ -35,11 +35,11 @@ endef
MESON_ARGS += \
-Dgtk_doc=false \
-Dintrospection=false \
-Dintrospection=disabled \
-Danalyze=false \
-Dcfitsio=disabled \
-Dfftw=disabled \
-Dgsf=disabled \
-Darchive=disabled \
-Dimagequant=disabled \
-Dlcms=disabled \
-Dwebp=disabled \

4
libs/xmlrpc-c/Makefile
View file

@ -8,12 +8,12 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=xmlrpc-c
PKG_VERSION:=1.54.06
PKG_VERSION:=1.59.02
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tgz
PKG_SOURCE_URL:=@SF/xmlrpc-c/Xmlrpc-c%20Super%20Stable/$(PKG_VERSION)
PKG_HASH:=ae6d0fb58f38f1536511360dc0081d3876c1f209d9eaa54357e2bacd690a5640
PKG_HASH:=e25e45be1bae7e90f1de69be3d6838917ba3839b2f1c7d3fc0e6663d8622a5ab
PKG_MAINTAINER:=Ted Hess <thess@kitschensync.net>
PKG_LICENSE:=VARIOUS

11
libs/xmlrpc-c/patches/001-fix-format-parameter.patch
View file

@ -1,11 +0,0 @@
--- a/src/xmlrpc_server_abyss.c
+++ b/src/xmlrpc_server_abyss.c
@@ -780,7 +780,7 @@ createServer(xmlrpc_env *
ServerInit2(abyssServerP, &error);
if (error) {
- xmlrpc_faultf(envP, error);
+ xmlrpc_faultf(envP, "%s", error);
xmlrpc_strfree(error);
}
}

299
libs/xmlrpc-c/patches/001-fix-pkg-config-files.patch Normal file
View file

@ -0,0 +1,299 @@
--- a/lib/abyss/src/Makefile
+++ b/lib/abyss/src/Makefile
@@ -131,13 +131,15 @@ SOCKLIB=$(SOCKETLIBOPT)
xmlrpc_abyss.pc:
rm -f $@
@echo "Echoes to '$@' suppressed here ..."
+ @echo -e '$(PKGCONFIG_VAR_SET)' >>$@
+ @echo >>$@
@echo "Name: xmlrpc_abyss" >>$@
@echo "Description: Xmlrpc-c Abyss HTTP C library" >>$@
@echo "Version: $(XMLRPC_VERSION_STRING)" >>$@
@echo >>$@
@echo "Requires: xmlrpc_util" >>$@
- @echo "Libs: -L$(LIBDESTDIR) -lxmlrpc_abyss $(SOCKLIB)" >>$@
- @echo "Cflags: -I$(HEADERDESTDIR)" >>$@
+ @echo 'Libs: -L$${libdir} -lxmlrpc_abyss $(SOCKLIB)' >>$@
+ @echo 'Cflags: -I$${includedir}' >>$@
# Need this dependency for those who don't use depend.mk.
# Without it, version.h doesn't get created.
--- a/lib/abyss++/Makefile
+++ b/lib/abyss++/Makefile
@@ -120,13 +120,15 @@ $(LIBXMLRPC_ABYSSPP_MODS:%=%.osh): \
xmlrpc_abyss++.pc:
rm -f $@
@echo "Echoes to '$@' suppressed here ..."
+ @echo -e '$(PKGCONFIG_VAR_SET)' >>$@
+ @echo >>$@
@echo "Name: xmlrpc_abyss++" >>$@
@echo "Description: Xmlrpc-c Abyss HTTP C++ library" >>$@
@echo "Version: $(XMLRPC_VERSION_STRING)" >>$@
@echo >>$@
@echo "Requires: xmlrpc_abyss xmlrpc_util++" >>$@
- @echo "Libs: -L$(LIBDESTDIR) -lxmlrpc_abyss++" >>$@
- @echo "Cflags: -I$(HEADERDESTDIR)" >>$@
+ @echo 'Libs: -L$${libdir} -lxmlrpc_abyss++' >>$@
+ @echo 'Cflags: -I$${includedir}' >>$@
#-----------------------------------------------------------------------------
# MISCELLANEOUS RULES
--- a/lib/expat/Makefile
+++ b/lib/expat/Makefile
@@ -34,13 +34,15 @@ xmltok/all: gennmtab/all
xmlrpc_expat.pc:
rm -f $@
@echo "Echoes to '$@' suppressed here ..."
+ @echo -e '$(PKGCONFIG_VAR_SET)' >>$@
+ @echo >>$@
@echo "Name: xmlrpc_expat" >>$@
@echo "Description: Xmlrpc-c XML parsing library" >>$@
@echo "Version: $(XMLRPC_VERSION_STRING)" >>$@
@echo >>$@
@echo "Requires: xmlrpc_util" >>$@
- @echo "Libs: -L$(LIBDESTDIR) -lxmlrpc_xmlparse -lxmlrpc_xmltok" >>$@
- @echo "Cflags: -I$(HEADERDESTDIR)" >>$@
+ @echo 'Libs: -L$${libdir} -lxmlrpc_xmlparse -lxmlrpc_xmltok' >>$@
+ @echo 'Cflags: -I$${includedir}' >>$@
.PHONY: clean
clean: $(SUBDIRS:%=%/clean) clean-common
--- a/lib/libutil/Makefile
+++ b/lib/libutil/Makefile
@@ -112,13 +112,15 @@ libxmlrpc_util.a: LIBOBJECTS = $(TARGET_
xmlrpc_util.pc:
rm -f $@
@echo "Echoes to '$@' suppressed here ..."
+ @echo -e '$(PKGCONFIG_VAR_SET)' >>$@
+ @echo >>$@
@echo "Name: xmlrpc_util" >>$@
@echo "Description: Xmlrpc-c utility functions library" >>$@
@echo "Version: $(XMLRPC_VERSION_STRING)" >>$@
@echo >>$@
@echo "Requires: " >>$@
- @echo "Libs: -L$(LIBDESTDIR) -lxmlrpc_util" >>$@
- @echo "Cflags: -I$(HEADERDESTDIR)" >>$@
+ @echo 'Libs: -L$${libdir} -lxmlrpc_util' >>$@
+ @echo 'Cflags: -I$${includedir}' >>$@
.PHONY: install
install: install-common
--- a/lib/libutil++/Makefile
+++ b/lib/libutil++/Makefile
@@ -101,13 +101,15 @@ libxmlrpc_util++.a: LIBOBJECTS = $(LIBXM
xmlrpc_util++.pc:
rm -f $@
@echo "Echoes to '$@' suppressed here ..."
+ @echo -e '$(PKGCONFIG_VAR_SET)' >>$@
+ @echo >>$@
@echo "Name: xmlrpc_util++" >>$@
@echo "Description: Xmlrpc-c C++ utility functions library" >>$@
@echo "Version: $(XMLRPC_VERSION_STRING)" >>$@
@echo >>$@
@echo "Requires: xmlrpc_util" >>$@
- @echo "Libs: -L$(LIBDESTDIR) -lxmlrpc_util++" >>$@
- @echo "Cflags: -I$(HEADERDESTDIR)" >>$@
+ @echo 'Libs: -L$${libdir} -lxmlrpc_util++' >>$@
+ @echo 'Cflags: -I$${includedir}' >>$@
#-----------------------------------------------------------------------------
# MISCELLANEOUS RULES
--- a/lib/openssl/Makefile
+++ b/lib/openssl/Makefile
@@ -81,13 +81,15 @@ INCLUDES = \
xmlrpc_openssl.pc:
rm -f $@
@echo "Echoes to '$@' suppressed here ..."
+ @echo -e '$(PKGCONFIG_VAR_SET)' >>$@
+ @echo >>$@
@echo "Name: xmlrpc_openssl" >>$@
@echo "Description: Openssl convenience function from Xmlrpc-c package" >>$@
@echo "Version: $(XMLRPC_VERSION_STRING)" >>$@
@echo >>$@
@echo "Requires: xmlrpc_util" >>$@
- @echo "Libs: -L$(LIBDESTDIR) -lxmlrpc_openssl" >>$@
- @echo "Cflags: -I$(HEADERDESTDIR)" >>$@
+ @echo 'Libs: -L$${libdir} -lxmlrpc_openssl' >>$@
+ @echo 'Cflags: -I$${includedir}' >>$@
#-----------------------------------------------------------------------------
# MISCELLANEOUS
--- a/src/Makefile
+++ b/src/Makefile
@@ -333,57 +333,67 @@ libxmlrpc_client.ldflags:
xmlrpc.pc:
rm -f $@
@echo "Echoes to '$@' suppressed here ..."
- @echo "Name: xmlrpc" >>$@
- @echo "Description: Xmlrpc-c basic XML-RPC library" >>$@
- @echo "Version: $(XMLRPC_VERSION_STRING)" >>$@
+ @echo -e '$(PKGCONFIG_VAR_SET)' >>$@
+ @echo >>$@
+ @echo 'Name: xmlrpc' >>$@
+ @echo 'Description: Xmlrpc-c basic XML-RPC library' >>$@
+ @echo 'Version: $(XMLRPC_VERSION_STRING)' >>$@
@echo >>$@
- @echo "Requires: xmlrpc_util $(XML_PKGCONFIG_REQ)" >>$@
- @echo "Libs: -L$(LIBDESTDIR) -lxmlrpc" >>$@
- @echo "Cflags: -I$(HEADERDESTDIR)" >>$@
+ @echo 'Requires: xmlrpc_util $(XML_PKGCONFIG_REQ)' >>$@
+ @echo 'Libs: -L$${libdir} -lxmlrpc' >>$@
+ @echo 'Cflags: -I$${includedir}' >>$@
xmlrpc_client.pc:
rm -f $@
@echo "Echoes to '$@' suppressed here ..."
+ @echo -e '$(PKGCONFIG_VAR_SET)' >>$@
+ @echo >>$@
@echo "Name: xmlrpc_client" >>$@
@echo "Description: Xmlrpc-c XML-RPC client library" >>$@
@echo "Version: $(XMLRPC_VERSION_STRING)" >>$@
@echo >>$@
@echo "Requires: xmlrpc xmlrpc_util" >>$@
- @echo "Libs: -L$(LIBDESTDIR) -lxmlrpc_client" >>$@
- @echo "Cflags: -I$(HEADERDESTDIR)" >>$@
+ @echo 'Libs: -L$${libdir} -lxmlrpc_client' >>$@
+ @echo 'Cflags: -I$${includedir}' >>$@
xmlrpc_server.pc:
rm -f $@
@echo "Echoes to '$@' suppressed here ..."
+ @echo -e '$(PKGCONFIG_VAR_SET)' >>$@
+ @echo >>$@
@echo "Name: xmlrpc_server" >>$@
@echo "Description: Xmlrpc-c XML-RPC server library" >>$@
@echo "Version: $(XMLRPC_VERSION_STRING)" >>$@
@echo >>$@
@echo "Requires: xmlrpc xmlrpc_util" >>$@
- @echo "Libs: -L$(LIBDESTDIR) -lxmlrpc_server" >>$@
- @echo "Cflags: -I$(HEADERDESTDIR)" >>$@
+ @echo 'Libs: -L$${libdir} -lxmlrpc_server' >>$@
+ @echo 'Cflags: -I$${includedir}' >>$@
xmlrpc_server_abyss.pc:
rm -f $@
@echo "Echoes to '$@' suppressed here ..."
+ @echo -e '$(PKGCONFIG_VAR_SET)' >>$@
+ @echo >>$@
@echo "Name: xmlrpc_server_abyss" >>$@
@echo "Description: Xmlrpc-c Abyss XML-RPC server library" >>$@
@echo "Version: $(XMLRPC_VERSION_STRING)" >>$@
@echo >>$@
@echo "Requires: xmlrpc xmlrpc_server xmlrpc_abyss xmlrpc_util" >>$@
- @echo "Libs: -L$(LIBDESTDIR) -lxmlrpc_server_abyss" >>$@
- @echo "Cflags: -I$(HEADERDESTDIR)" >>$@
+ @echo 'Libs: -L$${libdir} -lxmlrpc_server_abyss' >>$@
+ @echo 'Cflags: -I$${includedir}' >>$@
xmlrpc_server_cgi.pc:
rm -f $@
@echo "Echoes to '$@' suppressed here ..."
+ @echo -e '$(PKGCONFIG_VAR_SET)' >>$@
+ @echo >>$@
@echo "Name: xmlrpc_server_cgi" >>$@
@echo "Description: Xmlrpc-c CGI XML-RPC server library" >>$@
@echo "Version: $(XMLRPC_VERSION_STRING)" >>$@
@echo >>$@
@echo "Requires: xmlrpc xmlrpc_server xmlrpc_util" >>$@
- @echo "Libs: -L$(LIBDESTDIR) -lxmlrpc_server_cgi" >>$@
- @echo "Cflags: -I$(HEADERDESTDIR)" >>$@
+ @echo 'Libs: -L$${libdir} -lxmlrpc_server_cgi' >>$@
+ @echo 'Cflags: -I$${includedir}' >>$@
.PHONY: check
check:
--- a/src/cpp/Makefile
+++ b/src/cpp/Makefile
@@ -355,57 +355,67 @@ $(TRANSPORT_CONFIG_USERS:%=%.o) $(TRANSP
xmlrpc++.pc:
rm -f $@
@echo "Echoes to '$@' suppressed here ..."
+ @echo -e '$(PKGCONFIG_VAR_SET)' >>$@
+ @echo >>$@
@echo "Name: xmlrpc++" >>$@
@echo "Description: Xmlrpc-c basic XML-RPC C++ library" >>$@
@echo "Version: $(XMLRPC_VERSION_STRING)" >>$@
@echo >>$@
@echo "Requires: xmlrpc xmlrpc_util" >>$@
- @echo "Libs: -L$(LIBDESTDIR) -lxmlrpc++" >>$@
- @echo "Cflags: -I$(HEADERDESTDIR)" >>$@
+ @echo 'Libs: -L$${libdir} -lxmlrpc++' >>$@
+ @echo 'Cflags: -I$${includedir}' >>$@
xmlrpc_client++.pc:
rm -f $@
@echo "Echoes to '$@' suppressed here ..."
+ @echo -e '$(PKGCONFIG_VAR_SET)' >>$@
+ @echo >>$@
@echo "Name: xmlrpc_client++" >>$@
@echo "Description: Xmlrpc-c XML-RPC client C++ library" >>$@
@echo "Version: $(XMLRPC_VERSION_STRING)" >>$@
@echo >>$@
@echo "Requires: xmlrpc++ xmlrpc_client xmlrpc_util++ xmlrpc_util" >>$@
- @echo "Libs: -L$(LIBDESTDIR) -lxmlrpc_client++" >>$@
- @echo "Cflags: -I$(HEADERDESTDIR)" >>$@
+ @echo 'Libs: -L$${libdir} -lxmlrpc_client++' >>$@
+ @echo 'Cflags: -I$${includedir}' >>$@
xmlrpc_server++.pc:
rm -f $@
@echo "Echoes to '$@' suppressed here ..."
+ @echo -e '$(PKGCONFIG_VAR_SET)' >>$@
+ @echo >>$@
@echo "Name: xmlrpc_server++" >>$@
@echo "Description: Xmlrpc-c XML-RPC server C++ library" >>$@
@echo "Version: $(XMLRPC_VERSION_STRING)" >>$@
@echo >>$@
@echo "Requires: xmlrpc++ xmlrpc xmlrpc_server xmlrpc_util++ xmlrpc_util" >>$@
- @echo "Libs: -L$(LIBDESTDIR) -lxmlrpc_server++" >>$@
- @echo "Cflags: -I$(HEADERDESTDIR)" >>$@
+ @echo 'Libs: -L$${libdir} -lxmlrpc_server++' >>$@
+ @echo 'Cflags: -I$${includedir}' >>$@
xmlrpc_server_abyss++.pc:
rm -f $@
@echo "Echoes to '$@' suppressed here ..."
+ @echo -e '$(PKGCONFIG_VAR_SET)' >>$@
+ @echo >>$@
@echo "Name: xmlrpc_server_abyss++" >>$@
@echo "Description: Xmlrpc-c Abyss XML-RPC server C++ library" >>$@
@echo "Version: $(XMLRPC_VERSION_STRING)" >>$@
@echo >>$@
@echo "Requires: xmlrpc++ xmlrpc xmlrpc_server++ xmlrpc_abyss xmlrpc_util++ xmlrpc_util" >>$@
- @echo "Libs: -L$(LIBDESTDIR) -lxmlrpc_server_abyss" >>$@
- @echo "Cflags: -I$(HEADERDESTDIR)" >>$@
+ @echo 'Libs: -L$${libdir} -lxmlrpc_server_abyss++' >>$@
+ @echo 'Cflags: -I$${includedir}' >>$@
xmlrpc_server_pstream++.pc:
rm -f $@
@echo "Echoes to '$@' suppressed here ..."
+ @echo -e '$(PKGCONFIG_VAR_SET)' >>$@
+ @echo >>$@
@echo "Name: xmlrpc_server_pstream" >>$@
@echo "Description: Xmlrpc-c packet stream XML-RPC server library" >>$@
@echo "Version: $(XMLRPC_VERSION_STRING)" >>$@
@echo >>$@
- @echo "Requires: xmlrpc++ xmlrpc xmlrpc_server++ xmlrpc_util++ xmlrpc_util" >>$@
- @echo "Libs: -L$(LIBDESTDIR) -lxmlrpc_server_pstream++ -lxmlrpc_packetsocket" >>$@
- @echo "Cflags: -I$(HEADERDESTDIR)" >>$@
+ @echo "Requires: xmlrpc++ xmlrpc xmlrpc_server++ xmlrpc_util++ xmlrpc_util" >>$@
+ @echo 'Libs: -L$${libdir} -lxmlrpc_server_pstream++' -lxmlrpc_packetsocket >>$@
+ @echo 'Cflags: -I$${includedir}' >>$@
#-----------------------------------------------------------------------------
# MISCELLANEOUS RULES
--- a/common.mk
+++ b/common.mk
@@ -584,6 +584,11 @@ PROGRAMDESTDIR = $(DESTDIR)$(PROGRAMIN
MANDESTDIR = $(DESTDIR)$(MANINST_DIR)
PKGCONFIGDESTDIR = $(DESTDIR)$(PKGCONFIGINST_DIR)
+# The following value, in a pkg-config file, sets the conventional pkg-config
+# variables that the pkg-config user can override at pkg-config time.
+PKGCONFIG_VAR_SET = \
+ prefix=$(PREFIX)\nexec_prefix=$${prefix}\nincludedir=$${prefix}/include\nlibdir=$${exec_prefix}/lib
+
##############################################################################
# INSTALL RULES #

4
mail/dovecot/Makefile
View file

@ -8,12 +8,12 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=dovecot
PKG_VERSION:=2.3.20
PKG_VERSION:=2.3.21
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://dovecot.org/releases/2.3
PKG_HASH:=caa832eb968148abdf35ee9d0f534b779fa732c0ce4a913d9ab8c3469b218552
PKG_HASH:=05b11093a71c237c2ef309ad587510721cc93bbee6828251549fc1586c36502d
PKG_MAINTAINER:=Lucian Cristian <lucian.cristian@gmail.com>
PKG_LICENSE:=LGPL-2.1-only MIT BSD-3-Clause

4
mail/pigeonhole/Makefile
View file

@ -8,7 +8,7 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=dovecot-pigeonhole
PKG_VERSION_PLUGIN:=0.5.20
PKG_VERSION_PLUGIN:=0.5.21
PKG_VERSION_DOVECOT:=$(shell make --no-print-directory -C ../dovecot/ val.PKG_VERSION V=s)
PKG_VERSION:=$(PKG_VERSION_DOVECOT)-$(PKG_VERSION_PLUGIN)
PKG_RELEASE:=1
@ -17,7 +17,7 @@ DOVECOT_VERSION:=2.3
PKG_SOURCE:=dovecot-$(DOVECOT_VERSION)-pigeonhole-$(PKG_VERSION_PLUGIN).tar.gz
PKG_SOURCE_URL:=https://pigeonhole.dovecot.org/releases/$(DOVECOT_VERSION)
PKG_HASH:=ae32bd4870ea2c1328ae09ba206e9ec12128046d6afca52fbbc9ef7f75617c98
PKG_HASH:=1ca71d2659076712058a72030288f150b2b076b0306453471c5261498d3ded27
PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org>
PKG_LICENSE:=LGPL-2.1-or-later

2
multimedia/gst1-plugins-good/Makefile
View file

@ -278,7 +278,7 @@ $(eval $(call GstBuildPlugin,ossaudio,OSS audio support,audio,,))
$(eval $(call GstBuildPlugin,png,png support,video,,+libpng))
#$(eval $(call GstBuildPlugin,pulse,pulse support,audio pbutils tag video,,+pulseaudio))
$(eval $(call GstBuildPlugin,shout2,shout2 support,audio,,+libshout))
$(eval $(call GstBuildPlugin,soup,soup input,audio tag,,+libsoup))
$(eval $(call GstBuildPlugin,soup,soup input,audio tag,,+libsoup3))
$(eval $(call GstBuildPlugin,speex,speex support,audio tag,,+libspeex))
$(eval $(call GstBuildPlugin,taglib,taglib support,tag,,+taglib))
$(eval $(call GstBuildPlugin,video4linux2,video4linux2 support,video allocators,,+libv4l))

2
net/adblock-fast/Makefile
View file

@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=adblock-fast
PKG_VERSION:=1.1.1
PKG_RELEASE:=1
PKG_RELEASE:=3
PKG_MAINTAINER:=Stan Grishin <stangri@melmac.ca>
PKG_LICENSE:=GPL-3.0-or-later

4
net/adblock-fast/files/etc/init.d/adblock-fast
View file

@ -60,7 +60,7 @@ readonly runningConfigFile="/dev/shm/${packageName}.config"
readonly runningErrorFile="/dev/shm/${packageName}.error"
readonly runningStatusFile="/dev/shm/${packageName}.status"
readonly hostsFilter='/localhost/d;/^#/d;/^[^0-9]/d;s/^0\.0\.0\.0.//;s/^127\.0\.0\.1.//;s/[[:space:]]*#.*$//;s/[[:cntrl:]]$//;s/[[:space:]]//g;/[`~!@#\$%\^&\*()=+;:"'\'',<>?/\|[{}]/d;/]/d;/\./!d;/^$/d;/[^[:alnum:]_.-]/d;'
readonly domainsFilter='/^#/d;s/[[:space:]]*#.*$//;s/[[:space:]]*$//;s/[[:cntrl:]]$//;/[[:space:]]/d;/[`~!@#\$%\^&\*()=+;:"'\'',<>?/\|[{}]/d;/]/d;/\./!d;/^$/d;/[^[:alnum:]_.-]/d;'
readonly domainsFilter='/^#/d;s/[[:space:]]*#.*$//;s/[[:space:]]*$//;s/[[:cntrl:]]$//;/[[:space:]]/d;/[`~!@#\$%\^&\*()=+;:"'\'',<>?/\|[{}]/d;/]/d;/^$/d;/[^[:alnum:]_.-]/d;'
readonly adBlockPlusFilter='/^#/d;/^!/d;s/[[:space:]]*#.*$//;s/^||//;s/\^$//;s/[[:space:]]*$//;s/[[:cntrl:]]$//;/[[:space:]]/d;/[`~!@#\$%\^&\*()=+;:"'\'',<>?/\|[{}]/d;/]/d;/\./!d;/^$/d;/[^[:alnum:]_.-]/d;'
readonly dnsmasqFileFilter='\|^server=/[[:alnum:]_.-].*/|!d;s|server=/||;s|/.*$||'
readonly dnsmasq2FileFilter='\|^local=/[[:alnum:]_.-].*/|!d;s|local=/||;s|/.*$||'
@ -1728,7 +1728,7 @@ adb_start() {
action="$(config_cache get 'trigger_service')"
fw4_restart_flag="$(config_cache get 'trigger_fw4')"
if [ "$action" = 'on_boot' ] || [ "$param" = 'on_boot' ]; then
if [ "$action" = 'on_boot' ] || [ "$param" = 'on_boot' ] || [ "$param" = 'on_pause' ]; then
if cache 'test_gzip' || cache 'test'; then
action='restore'
else

8
net/alist/Makefile
View file

@ -5,12 +5,12 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=alist
PKG_VERSION:=3.29.1
PKG_VERSION:=3.30.0
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/alist-org/alist/tar.gz/v$(PKG_VERSION)?
PKG_HASH:=b7d1929d9aef511b263673dba8e5b787f695e1b4fa4555fe562f8060ee0bdea4
PKG_HASH:=68831d5177cdbae3ab294ce4263b4221c0ff687a72dd48a844d533ccb13c3efb
PKG_LICENSE:=AGPL-3.0-only
PKG_LICENSE_FILES:=LICENSE
@ -46,13 +46,13 @@ define Package/alist/conffiles
/etc/config/alist
endef
WEB_VERSION:=3.29.0
WEB_VERSION:=3.30.0
WEB_FILE:=$(PKG_NAME)-web-$(WEB_VERSION).tar.gz
define Download/alist-web
URL:=https://github.com/alist-org/alist-web/releases/download/$(WEB_VERSION)/
URL_FILE:=dist.tar.gz
FILE:=$(WEB_FILE)
HASH:=ece9d3fd45f18eaa7376e5fc077ebeae8f67b7bcf6004a29ae58392bfc2a3d13
HASH:=04e160efc6e7169103cd424a39de0f1720e769aacc49dc0a2fcc3f1fcc6d0fee
endef
define Build/Prepare

2
net/atftp/Makefile
View file

@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=atftp
PKG_VERSION:=0.8.0
PKG_RELEASE:=1
PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=@SF/$(PKG_NAME)

2
net/atftp/files/atftpd.conf
View file

@ -1,3 +1,5 @@
config service 'service'
option enable '0'
option path '/srv/tftp'
option port '69'

16
net/atftp/files/atftpd.init
View file

@ -5,11 +5,19 @@ START=95
PIDFILE=/tmp/run/atftpd.pid
start() {
config_load atftpd
config_get SRV service path "/srv/tftp"
config_get PORT service port 69
local enable
local srv
local port
atftpd --pidfile $PIDFILE --user root.root --port $PORT --daemon $SRV
config_load atftpd
config_get enable service enable 0
[ "$enable" -eq "0" ] && return 0
config_get srv service path "/srv/tftp"
config_get port service port 69
atftpd --pidfile $PIDFILE --user root.root --port $port --daemon $srv
}
stop() {

4
net/banip/Makefile
View file

@ -1,12 +1,12 @@
# banIP - ban incoming and outgoing IPs via named nftables Sets
# Copyright (c) 2018-2023 Dirk Brenken (dev@brenken.org)
# Copyright (c) 2018-2024 Dirk Brenken (dev@brenken.org)
# This is free software, licensed under the GNU General Public License v3.
include $(TOPDIR)/rules.mk
PKG_NAME:=banip
PKG_VERSION:=0.9.3
PKG_RELEASE:=3
PKG_RELEASE:=5
PKG_LICENSE:=GPL-3.0-or-later
PKG_MAINTAINER:=Dirk Brenken <dev@brenken.org>

6
net/banip/files/banip.init
View file

@ -1,6 +1,6 @@
#!/bin/sh /etc/rc.common
# banIP init script - ban incoming and outgoing IPs via named nftables Sets
# Copyright (c) 2018-2023 Dirk Brenken (dev@brenken.org)
# Copyright (c) 2018-2024 Dirk Brenken (dev@brenken.org)
# This is free software, licensed under the GNU General Public License v3.
# (s)hellcheck exceptions
@ -22,10 +22,10 @@ ban_lock="/var/run/banip.lock"
[ "${action}" = "boot" ] && "${ban_init}" running && exit 0
{ [ "${action}" = "stop" ] || [ "${action}" = "report" ] || [ "${action}" = "search" ] || [ "${action}" = "survey" ] || [ "${action}" = "lookup" ]; } && ! "${ban_init}" running && exit 0
[ ! -r "${ban_funlib}" ] && { [ "${action}" = "boot" ] || [ "${action}" = "start" ] || [ "${action}" = "restart" ] || [ "${action}" = "reload" ] || [ "${action}" = "stop" ] || [ "${action}" = "report" ] || [ "${action}" = "search" ] || [ "${action}" = "lookup" ] || [ "${action}" = "status" ]; } && exit 1
[ ! -r "${ban_funlib}" ] && { [ "${action}" = "boot" ] || [ "${action}" = "start" ] || [ "${action}" = "restart" ] || [ "${action}" = "reload" ] || [ "${action}" = "stop" ] || [ "${action}" = "report" ] || [ "${action}" = "search" ] || [ "${action}" = "survey" ] || [ "${action}" = "lookup" ] || [ "${action}" = "status" ]; } && exit 1
[ -d "${ban_lock}" ] && { [ "${action}" = "boot" ] || [ "${action}" = "start" ] || [ "${action}" = "restart" ] || [ "${action}" = "reload" ] || [ "${action}" = "lookup" ]; } && exit 1
[ ! -d "${ban_lock}" ] && { [ "${action}" = "boot" ] || [ "${action}" = "start" ] || [ "${action}" = "restart" ] || [ "${action}" = "reload" ] || [ "${action}" = "lookup" ]; } && mkdir -p "${ban_lock}"
{ [ "${action}" = "boot" ] || [ "${action}" = "start" ] || [ "${action}" = "restart" ] || [ "${action}" = "reload" ] || [ "${action}" = "stop" ] || [ "${action}" = "report" ] || [ "${action}" = "search" ] || [ "${action}" = "lookup" ] || [ "${action}" = "status" ]; } && . "${ban_funlib}"
{ [ "${action}" = "boot" ] || [ "${action}" = "start" ] || [ "${action}" = "restart" ] || [ "${action}" = "reload" ] || [ "${action}" = "stop" ] || [ "${action}" = "report" ] || [ "${action}" = "search" ] || [ "${action}" = "survey" ] || [ "${action}" = "lookup" ] || [ "${action}" = "status" ]; } && . "${ban_funlib}"
[ ! -d "${ban_lock}" ] && { [ "${action}" = "boot" ] || [ "${action}" = "start" ] || [ "${action}" = "restart" ] || [ "${action}" = "reload" ] || [ "${action}" = "lookup" ]; } && exit 1
boot() {

8
net/banip/files/banip.tpl
View file

@ -1,5 +1,5 @@
# banIP mail template/include - ban incoming and outgoing IPs via named nftables Sets
# Copyright (c) 2018-2023 Dirk Brenken (dev@brenken.org)
# Copyright (c) 2018-2024 Dirk Brenken (dev@brenken.org)
# This is free software, licensed under the GNU General Public License v3.
# info preparation
@ -12,9 +12,9 @@ elif printf "%s" "${ban_packages}" | "${ban_grepcmd}" -q '"logd'; then
logread_cmd="${ban_logreadcmd} -l ${ban_loglimit} -e "banIP/" 2>/dev/null"
fi
banip_info="$(/etc/init.d/banip status 2>/dev/null | "${ban_awkcmd}" '{NR=1;max=160;if(length($0)>max+1)while($0){if(NR==1){print substr($0,1,max)}else{print substr($0,1,max)}{$0=substr($0,max+1);NR=NR+1}}else print}')"
banip_info="$(/etc/init.d/banip status 2>/dev/null)"
report_info="$("${ban_catcmd}" "${ban_reportdir}/ban_report.txt" 2>/dev/null)"
log_info="$(${logread_cmd} | "${ban_awkcmd}" '{NR=1;max=160;if(length($0)>max+1)while($0){if(NR==1){print substr($0,1,max)}else{print substr($0,1,max)}{$0=substr($0,max+1);NR=NR+1}}else print}')"
log_info="$(${logread_cmd})"
system_info="$(
strings /etc/banner 2>/dev/null
"${ban_ubuscmd}" call system board | "${ban_awkcmd}" 'BEGIN{FS="[{}\"]"}{if($2=="kernel"||$2=="hostname"||$2=="system"||$2=="model"||$2=="description")printf " + %-12s: %s\n",$2,$4}'
@ -22,7 +22,7 @@ system_info="$(
# content header
#
mail_text="$(printf "%s\n" "<html><body><pre style='display:block;font-family:monospace;font-size:1rem;padding:20;background-color:#f3eee5;white-space:pre'>")"
mail_text="$(printf "%s\n" "<html><body><pre style='font-family:monospace;padding:20;background-color:#f3eee5;white-space:pre-wrap;overflow-x:auto;' >")"
# content body
#

4
net/cloudflared/Makefile
View file

@ -5,12 +5,12 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=cloudflared
PKG_VERSION:=2023.7.3
PKG_VERSION:=2024.1.4
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/cloudflare/cloudflared/tar.gz/$(PKG_VERSION)?
PKG_HASH:=772ddcb721f5b479192117d1156b1091505721aa81d6bab3de9577176b930191
PKG_HASH:=a78af7d12b96bba691c420bc0ea42087cda73463868a3ba7c6890a9f962218e9
PKG_LICENSE:=Apache-2.0
PKG_LICENSE_FILES:=LICENSE

4
net/dhtd/Makefile
View file

@ -1,12 +1,12 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=dhtd
PKG_VERSION:=0.2.6
PKG_VERSION:=1.0.1
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/mwarning/dhtd/tar.gz/v$(PKG_VERSION)?
PKG_HASH:=4d9d88dc9cb035742a86c451c6bd40a7e44161709cd962933516ef6c5170683d
PKG_HASH:=7b1338059dfb9ed2300bb6b005d7cd677d99df8c74846eaed1b0cb97641b7297
PKG_MAINTAINER:=Moritz Warning <moritzwarning@web.de>
PKG_LICENSE:=MIT

4
net/dnsproxy/Makefile
View file

@ -5,12 +5,12 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=dnsproxy
PKG_VERSION:=0.61.0
PKG_VERSION:=0.63.1
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/AdguardTeam/dnsproxy/tar.gz/v$(PKG_VERSION)?
PKG_HASH:=0b75b8d8139992e77df39492d41ca7060553f80a13d7e0436f3d8e1616146b92
PKG_HASH:=f92478ffe5a673760780a2a1a01d8421264ae62057879da85b8cbbbb6ef0be09
PKG_MAINTAINER:=Tianling Shen <cnsztl@immortalwrt.org>
PKG_LICENSE:=Apache-2.0

53
net/evilginx2/Makefile Normal file
View file

@ -0,0 +1,53 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=evilginx2
PKG_VERSION:=3.2.0
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/kgretzky/evilginx2/tar.gz/v$(PKG_VERSION)?
PKG_HASH:=1c9f51c447704d0097280b6e743134cf108e8adc654a0ac4343400b5800e77f0
PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org>
PKG_LICENSE:=BSD-3-Clause
PKG_LICENSE_FILES:=LICENSE
PKG_BUILD_DEPENDS:=golang/host
PKG_BUILD_PARALLEL:=1
PKG_BUILD_FLAGS:=no-mips16
GO_PKG:=github.com/kgretzky/evilginx2
GO_PKG_LDFLAGS_X:=$(GO_PKG)/cmd.Version=$(PKG_VERSION)
include $(INCLUDE_DIR)/package.mk
include ../../lang/golang/golang-package.mk
define Package/evilginx2
SECTION:=net
CATEGORY:=Network
TITLE:=Man-in-the-middle reverse-proxy attack framework
URL:=https://help.evilginx.com/
DEPENDS:=$(GO_ARCH_DEPENDS)
endef
define Package/evilginx/description
Evilginx is a man-in-the-middle reverse-proxy attack framework that
is useful for testing your organization's exposure to phishing and
other similar attacks.
endef
define Package/gophish/conffiles
/etc/evilginx2.json
endef
define Package/evilginx2/install
$(call GoPackage/Package/Install/Bin,$(PKG_INSTALL_DIR))
$(INSTALL_DIR) $(1)/usr/sbin
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/evilginx2 $(1)/usr/sbin/
$(INSTALL_DIR) $(1)/usr/libexec/evilginx2
$(CP) $(PKG_BUILD_DIR)/phishlets $(1)/usr/libexec/evilginx2/
$(CP) $(PKG_BUILD_DIR)/redirectors $(1)/usr/libexec/evilginx2/
endef
$(eval $(call GoBinPackage,evilginx2))
$(eval $(call BuildPackage,evilginx2))

2
net/hs20/Makefile
View file

@ -1,7 +1,7 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=hs20
PKG_RELEASE:=8
PKG_RELEASE:=9
PKG_SOURCE_URL:=http://w1.fi/hostap.git
PKG_SOURCE_PROTO:=git

11
net/hs20/patches/010-libxml-212.patch Normal file
View file

@ -0,0 +1,11 @@
--- a/src/utils/xml_libxml2.c
+++ b/src/utils/xml_libxml2.c
@@ -8,7 +8,7 @@
#include "includes.h"
#define LIBXML_VALID_ENABLED
-#include <libxml/tree.h>
+#include <libxml/parser.h>
#include <libxml/xmlschemastypes.h>
#include "common.h"

5
net/i2pd/Makefile
View file

@ -10,17 +10,18 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=i2pd
PKG_VERSION:=2.48.0
PKG_VERSION:=2.50.2
PKG_RELEASE:=1
PKG_BUILD_PARALLEL:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/PurpleI2P/i2pd/tar.gz/$(PKG_VERSION)?
PKG_HASH:=ccf417aa66ce37f72ea15b7fbcff4c71e823566ea74bda696b9c1e19aae08739
PKG_HASH:=ae2ec4732c38fda71b4b48ce83624dd8b2e05083f2c94a03d20cafb616f63ca5
PKG_MAINTAINER:=David Yang <mmyangfl@gmail.com>
PKG_LICENSE:=BSD-3-Clause
PKG_LICENSE_FILES:=LICENSE
PKG_CPE_ID:=cpe:/a:i2pd:i2pd
include $(INCLUDE_DIR)/package.mk

4
net/knxd/Makefile
View file

@ -11,12 +11,12 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=knxd
PKG_VERSION:=0.14.59
PKG_VERSION:=0.14.60
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/knxd/knxd/tar.gz/$(PKG_VERSION)?
PKG_HASH:=8b8314ad4265cd48e9a257a1bcfd162b1084422f765082b45cceabdd70c0c164
PKG_HASH:=0d7e7265761e291014f670dce6a24efc4a6e9ef1a88e2f96ffa347c98c91588f
PKG_MAINTAINER:=Othmar Truniger <github@truniger.ch>
PKG_LICENSE:=GPL-2.0-or-later

2
net/knxd/patches/0100-version.patch
View file

@ -7,4 +7,4 @@
-test -d .git || exit
-# git describe --tags
-git log --format=format:%D | perl -ne 'next unless s#.*tag: ##; s#,.*##; next if m#/#; print; exit;'
+echo -n "0.14.59"
+echo -n "0.14.60"

4
net/krb5/Makefile
View file

@ -8,7 +8,7 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=krb5
PKG_VERSION:=1.21
PKG_VERSION:=1.21.2
PKG_RELEASE:=1
PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org>
@ -19,7 +19,7 @@ PKG_CPE_ID:=cpe:/a:mit:kerberos
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://web.mit.edu/kerberos/dist/krb5/1.21
PKG_HASH:=69f8aaff85484832df67a4bbacd99b9259bd95aab8c651fbbe65cdc9620ea93b
PKG_HASH:=9560941a9d843c0243a71b17a7ac6fe31c7cebb5bce3983db79e52ae7e850491
PKG_BUILD_PARALLEL:=1
PKG_INSTALL:=1

4
net/ksmbd-tools/Makefile
View file

@ -5,8 +5,8 @@ PKG_RELEASE:=1
PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://github.com/cifsd-team/ksmbd-tools
PKG_SOURCE_VERSION:=3.4.8
PKG_MIRROR_HASH:=e374c6e5053e82bc321e13927dbf3baf0d636205516564324686d002c084c5d6
PKG_SOURCE_VERSION:=3.5.1
PKG_MIRROR_HASH:=6e8e56ecdfa0ddfdb3a351b27ae5b9148d4f6695bcee9a7eae39c2a42481ef18
PKG_LICENSE:=GPL-2.0-or-later
PKG_LICENSE_FILES:=COPYING

2
net/ksmbd-tools/patches/030-glib.patch
View file

@ -3,7 +3,7 @@
@@ -21,6 +21,7 @@ include_dirs = include_directories(
glib_dep = dependency(
'glib-2.0',
version: '>= 2.40',
version: '>= 2.44',
+ static: true,
)
libnl_dep = dependency(

6
net/modemmanager/Makefile
View file

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=modemmanager
PKG_SOURCE_VERSION:=1.22.0
PKG_RELEASE:=7
PKG_RELEASE:=9
PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://gitlab.freedesktop.org/mobile-broadband/ModemManager.git
@ -92,6 +92,7 @@ define Package/modemmanager/install
$(INSTALL_DIR) $(1)/usr/sbin
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/ModemManager $(1)/usr/sbin
$(INSTALL_BIN) ./files/usr/sbin/ModemManager-wrapper $(1)/usr/sbin
$(INSTALL_BIN) ./files/usr/sbin/ModemManager-monitor $(1)/usr/sbin
$(INSTALL_DIR) $(1)/usr/bin
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/mmcli $(1)/usr/bin
@ -118,9 +119,6 @@ define Package/modemmanager/install
$(INSTALL_DIR) $(1)/etc/init.d
$(INSTALL_BIN) ./files/modemmanager.init $(1)/etc/init.d/modemmanager
$(INSTALL_DIR) $(1)/etc/hotplug.d/usb
$(INSTALL_DATA) ./files/25-modemmanager-usb $(1)/etc/hotplug.d/usb
$(INSTALL_DIR) $(1)/etc/hotplug.d/net
$(INSTALL_DATA) ./files/25-modemmanager-net $(1)/etc/hotplug.d/net

3
net/modemmanager/files/10-report-down
View file

@ -16,9 +16,8 @@ STATE="$4"
[ "${STATE}" = "disconnected" ] || exit 0
. /usr/share/ModemManager/modemmanager.common
. /lib/netifd/netifd-proto.sh
INCLUDE_ONLY=1 . /lib/netifd/proto/modemmanager.sh
. /usr/share/ModemManager/modemmanager.common
MODEM_STATUS=$(mmcli --modem="${MODEM_PATH}" --output-keyvalue)
[ -n "${MODEM_STATUS}" ] || exit 1

13
net/modemmanager/files/25-modemmanager-usb
View file

@ -1,13 +0,0 @@
#!/bin/sh
# Copyright (C) 2019 Aleksander Morgado <aleksander@aleksander.es>
# We need to process only full USB device removal events, we don't
# want to process specific interface removal events.
[ "$ACTION" = remove ] || exit
[ -z "${INTERFACE}" ] || exit
# Load common utilities
. /usr/share/ModemManager/modemmanager.common
mm_clear_modem_wait_status "/sys${DEVPATH}"
mm_cleanup_interface_by_sysfspath "/sys${DEVPATH}"

225
net/modemmanager/files/modemmanager.common
View file

@ -6,7 +6,6 @@
. /lib/functions.sh
. /lib/netifd/netifd-proto.sh
INCLUDE_ONLY=1 . /lib/netifd/proto/modemmanager.sh
################################################################################
# Runtime state
@ -14,7 +13,7 @@ INCLUDE_ONLY=1 . /lib/netifd/proto/modemmanager.sh
MODEMMANAGER_RUNDIR="/var/run/modemmanager"
MODEMMANAGER_PID_FILE="${MODEMMANAGER_RUNDIR}/modemmanager.pid"
MODEMMANAGER_CDCWDM_CACHE="${MODEMMANAGER_RUNDIR}/cdcwdm.cache"
MODEMMANAGER_SYSFS_CACHE="${MODEMMANAGER_RUNDIR}/sysfs.cache"
MODEMMANAGER_MONITOR_CACHE="${MODEMMANAGER_RUNDIR}/monitor.cache"
MODEMMANAGER_EVENTS_CACHE="${MODEMMANAGER_RUNDIR}/events.cache"
################################################################################
@ -22,6 +21,8 @@ MODEMMANAGER_EVENTS_CACHE="${MODEMMANAGER_RUNDIR}/events.cache"
mm_log() {
local level="$1"; shift
[ "${level}" = "debug" ] && return
logger -p "daemon.${level}" -t "ModemManager[$$]" "hotplug: $*"
}
@ -93,48 +94,6 @@ mm_untrack_cdcwdm() {
echo "${cdcwdm}"
}
################################################################################
# ModemManager needs some time from the ports being added until a modem object
# is exposed in DBus. With the logic here we do an explicit wait of N seconds
# for ModemManager to expose the new modem object, making sure that the wait is
# unique per device (i.e. per physical device sysfs path).
# Gets the modem wait status as retrieved from the cache
mm_get_modem_wait_status() {
local sysfspath="$1"
# If no sysfs cache file, we're done
[ -f "${MODEMMANAGER_SYSFS_CACHE}" ] || return
# Get status of the sysfs path
awk -v sysfspath="${sysfspath}" '!/^#/ && $0 ~ sysfspath { print $2 }' "${MODEMMANAGER_SYSFS_CACHE}"
}
# Clear the modem wait status from the cache, if any
mm_clear_modem_wait_status() {
local sysfspath="$1"
local escaped_sysfspath
[ -f "${MODEMMANAGER_SYSFS_CACHE}" ] && {
# escape '/', '\' and '&' for sed...
escaped_sysfspath=$(echo "$sysfspath" | sed -e 's/[\/&]/\\&/g')
sed -i "/${escaped_sysfspath}/d" "${MODEMMANAGER_SYSFS_CACHE}"
}
}
# Sets the modem wait status in the cache
mm_set_modem_wait_status() {
local sysfspath="$1"
local status="$2"
# Remove sysfs line before adding the new one with the new state
mm_clear_modem_wait_status "${sysfspath}"
# Add the new status
echo "${sysfspath} ${status}" >> "${MODEMMANAGER_SYSFS_CACHE}"
}
# Callback for config_foreach()
mm_get_modem_config_foreach_cb() {
local cfg="$1"
@ -156,112 +115,6 @@ mm_get_modem_config() {
config_foreach mm_get_modem_config_foreach_cb interface "${sysfspath}"
}
# Wait for a modem in the specified sysfspath
mm_wait_for_modem() {
local cfg="$1"
local sysfspath="$2"
# TODO: config max wait
local n=45
local step=5
while [ $n -ge 0 ]; do
[ -d "${sysfspath}" ] || {
mm_log "error" "ignoring modem detection request: no device at ${sysfspath}"
proto_set_available "${cfg}" 0
return 1
}
# Check if the modem exists at the given sysfs path
if ! mmcli -m "${sysfspath}" > /dev/null 2>&1
then
mm_log "error" "modem not detected at sysfs path"
else
mm_log "info" "modem exported successfully at ${sysfspath}"
mm_log "info" "setting interface '${cfg}' as available"
proto_set_available "${cfg}" 1
return 0
fi
sleep $step
n=$((n-step))
done
mm_log "error" "timed out waiting for the modem to get exported at ${sysfspath}"
proto_set_available "${cfg}" 0
return 2
}
mm_report_modem_wait() {
local sysfspath=$1
local parent_sysfspath status
parent_sysfspath=$(mm_find_physdev_sysfs_path "$sysfspath")
[ -n "${parent_sysfspath}" ] || {
mm_log "error" "parent device sysfspath not found"
return
}
status=$(mm_get_modem_wait_status "${parent_sysfspath}")
case "${status}" in
"")
local cfg
cfg=$(mm_get_modem_config "${parent_sysfspath}")
if [ -n "${cfg}" ]; then
mm_log "info" "interface '${cfg}' is set to configure device '${parent_sysfspath}'"
mm_log "info" "now waiting for modem at sysfs path ${parent_sysfspath}"
mm_set_modem_wait_status "${parent_sysfspath}" "processed"
# Launch subshell for the explicit wait
( mm_wait_for_modem "${cfg}" "${parent_sysfspath}" ) > /dev/null 2>&1 &
else
mm_log "info" "no need to wait for modem at sysfs path ${parent_sysfspath}"
mm_set_modem_wait_status "${parent_sysfspath}" "ignored"
fi
;;
"processed")
mm_log "info" "already waiting for modem at sysfs path ${parent_sysfspath}"
;;
"ignored")
;;
*)
mm_log "error" "unknown status read for device at sysfs path ${parent_sysfspath}"
;;
esac
}
################################################################################
# Cleanup interfaces
mm_cleanup_interfaces() {
local sysfs_path status
# Do nothing if there is no sysfs cache
[ -f "${MODEMMANAGER_SYSFS_CACHE}" ] || return
while IFS= read -r sysfs_cache_line; do
sysfs_path=$(echo "${sysfs_cache_line}" | awk '{print $1}')
status=$(echo "${sysfs_cache_line}" | awk '{print $2}')
if [ "${status}" = "processed" ]; then
mm_log "debug" "call cleanup for: ${sysfs_path}"
mm_cleanup_interface_by_sysfspath "${sysfs_path}"
fi
done < ${MODEMMANAGER_SYSFS_CACHE}
}
mm_cleanup_interface_by_sysfspath() {
local dev="$1"
local cfg
cfg=$(mm_get_modem_config "$dev")
[ -n "${cfg}" ] || return
mm_log "info" "setting interface '$cfg' as unavailable"
proto_set_available "${cfg}" 0
}
################################################################################
# Event reporting
@ -296,13 +149,9 @@ mm_report_event() {
# Report the event
mm_log "debug" "Report event: action=${action}, name=${name}, subsystem=${subsystem}"
result=$(mmcli --report-kernel-event="action=${action},name=${name},subsystem=${subsystem}" 2>&1)
if [ "$?" -eq "0" ]; then
# Wait for added modem if a sysfspath is given
[ -n "${sysfspath}" ] && [ "$action" = "add" ] && mm_report_modem_wait "${sysfspath}"
else
if [ "$?" -ne "0" ]; then
mm_log "error" "Couldn't report kernel event: ${result}"
fi
}
mm_report_event_from_cache_line() {
@ -351,3 +200,69 @@ mm_report_events_from_cache() {
mm_report_event_from_cache_line "${event_line}"
done < ${MODEMMANAGER_EVENTS_CACHE}
}
# This method expects as first argument a list of key-value pairs, as returned by mmcli --output-keyvalue
# The second argument must be exactly the name of the field to read
#
# Sample output:
# $ mmcli -m 0 -K
# modem.dbus-path : /org/freedesktop/ModemManager1/Modem/0
# modem.generic.device-identifier : ed6eff2e3e0f90463da1c2a755b2acacd1335752
# modem.generic.manufacturer : Dell Inc.
# modem.generic.model : DW5821e Snapdragon X20 LTE
# modem.generic.revision : T77W968.F1.0.0.4.0.GC.009\n026
# modem.generic.carrier-configuration : GCF
# modem.generic.carrier-configuration-revision : 08E00009
# modem.generic.hardware-revision : DW5821e Snapdragon X20 LTE
# ....
modemmanager_get_field() {
local list=$1
local field=$2
local value=""
[ -z "${list}" ] || [ -z "${field}" ] && return
# there is always at least a whitespace after each key, and we use that as part of the
# key matching we do (e.g. to avoid getting 'modem.generic.state-failed-reason' as a result
# when grepping for 'modem.generic.state'.
line=$(echo "${list}" | grep "${field} ")
value=$(echo ${line#*:})
# not found?
[ -n "${value}" ] || return 2
# only print value if set
[ "${value}" != "--" ] && echo "${value}"
return 0
}
# build a comma-separated list of values from the list
modemmanager_get_multivalue_field() {
local list=$1
local field=$2
local value=""
local length idx item
[ -z "${list}" ] || [ -z "${field}" ] && return
length=$(modemmanager_get_field "${list}" "${field}.length")
[ -n "${length}" ] || return 0
[ "$length" -ge 1 ] || return 0
idx=1
while [ $idx -le "$length" ]; do
item=$(modemmanager_get_field "${list}" "${field}.value\[$idx\]")
[ -n "${item}" ] && [ "${item}" != "--" ] && {
[ -n "${value}" ] && value="${value}, "
value="${value}${item}"
}
idx=$((idx + 1))
done
# nothing built?
[ -n "${value}" ] || return 2
# only print value if set
echo "${value}"
return 0
}

6
net/modemmanager/files/modemmanager.init
View file

@ -21,11 +21,15 @@ start_service() {
# wrapper script called '/usr/sbin/ModemManager-wrapper'.
#
. /usr/share/ModemManager/modemmanager.common
procd_open_instance
procd_open_instance "service"
procd_set_param command /usr/sbin/ModemManager-wrapper
procd_append_param command --log-level="$LOG_LEVEL"
[ "$LOG_LEVEL" = "DEBUG" ] && procd_append_param command --debug
procd_set_param respawn "${respawn_threshold:-3600}" "${respawn_timeout:-5}" "${respawn_retry:-5}"
procd_set_param pidfile "${MODEMMANAGER_PID_FILE}"
procd_close_instance
procd_open_instance "monitor"
procd_set_param command /usr/sbin/ModemManager-monitor
procd_set_param respawn "${respawn_threshold:-3600}" "${respawn_timeout:-5}" "${respawn_retry:-5}"
procd_close_instance
}

73
net/modemmanager/files/modemmanager.proto
View file

@ -8,6 +8,7 @@
. /lib/functions.sh
. ../netifd-proto.sh
. ./ppp.sh
. /usr/share/ModemManager/modemmanager.common
init_proto "$@"
}
@ -24,72 +25,6 @@ cdr2mask ()
echo "${1-0}"."${2-0}"."${3-0}"."${4-0}"
}
# This method expects as first argument a list of key-value pairs, as returned by mmcli --output-keyvalue
# The second argument must be exactly the name of the field to read
#
# Sample output:
# $ mmcli -m 0 -K
# modem.dbus-path : /org/freedesktop/ModemManager1/Modem/0
# modem.generic.device-identifier : ed6eff2e3e0f90463da1c2a755b2acacd1335752
# modem.generic.manufacturer : Dell Inc.
# modem.generic.model : DW5821e Snapdragon X20 LTE
# modem.generic.revision : T77W968.F1.0.0.4.0.GC.009\n026
# modem.generic.carrier-configuration : GCF
# modem.generic.carrier-configuration-revision : 08E00009
# modem.generic.hardware-revision : DW5821e Snapdragon X20 LTE
# ....
modemmanager_get_field() {
local list=$1
local field=$2
local value=""
[ -z "${list}" ] || [ -z "${field}" ] && return
# there is always at least a whitespace after each key, and we use that as part of the
# key matching we do (e.g. to avoid getting 'modem.generic.state-failed-reason' as a result
# when grepping for 'modem.generic.state'.
line=$(echo "${list}" | grep "${field} ")
value=$(echo ${line#*:})
# not found?
[ -n "${value}" ] || return 2
# only print value if set
[ "${value}" != "--" ] && echo "${value}"
return 0
}
# build a comma-separated list of values from the list
modemmanager_get_multivalue_field() {
local list=$1
local field=$2
local value=""
local length idx item
[ -z "${list}" ] || [ -z "${field}" ] && return
length=$(modemmanager_get_field "${list}" "${field}.length")
[ -n "${length}" ] || return 0
[ "$length" -ge 1 ] || return 0
idx=1
while [ $idx -le "$length" ]; do
item=$(modemmanager_get_field "${list}" "${field}.value\[$idx\]")
[ -n "${item}" ] && [ "${item}" != "--" ] && {
[ -n "${value}" ] && value="${value}, "
value="${value}${item}"
}
idx=$((idx + 1))
done
# nothing built?
[ -n "${value}" ] || return 2
# only print value if set
echo "${value}"
return 0
}
modemmanager_cleanup_connection() {
local modemstatus="$1"
@ -523,7 +458,9 @@ proto_modemmanager_setup() {
modemmanager_check_state "$device" "${modemstatus}" "$pincode"
[ "$?" -ne "0" ] && return 1
[ -z "${allowedmode}" ] || {
if [ -z "${allowedmode}" ]; then
modemmanager_set_allowed_mode "$device" "$interface" "any"
else
case "$allowedmode" in
"2g")
modemmanager_set_allowed_mode "$device" \
@ -548,7 +485,7 @@ proto_modemmanager_setup() {
esac
# check error for allowed_mode and preferred_mode function call
[ "$?" -ne "0" ] && return 1
}
fi
# always cleanup before attempting a new connection, just in case
modemmanager_cleanup_connection "${modemstatus}"

155
net/modemmanager/files/usr/sbin/ModemManager-monitor Normal file
View file

@ -0,0 +1,155 @@
#!/bin/sh
. /lib/functions.sh
. /lib/netifd/netifd-proto.sh
. /usr/share/ModemManager/modemmanager.common
trap_with_arg() {
func="$1" ; shift
for sig ; do
# shellcheck disable=SC2064
trap "$func $sig" "$sig"
done
}
func_trap() {
local monitor_cache_line object
logger "ModemManager-monitor[$$]" "Sending signal ${1} ..."
# Set all configured logical interfaces to unavailable
while IFS= read -r monitor_cache_line; do
object=$(echo "${monitor_cache_line}" | awk '{print $1}')
mm_monitor_cache_remove "$object"
done < ${MODEMMANAGER_MONITOR_CACHE}
kill "-${1}" "$CHILD" 2>/dev/null
}
mm_monitor_get_sysfspath() {
local object="$1"
# If no monitor cache file, we're done
[ -f "${MODEMMANAGER_MONITOR_CACHE}" ] || return
awk -v object="${object}" '!/^#/ && $0 ~ object { print $2 }' "${MODEMMANAGER_MONITOR_CACHE}"
}
mm_monitor_cache_remove() {
local object="$1"
local device cfg
device=$(mm_monitor_get_sysfspath "${object}")
cfg=$(mm_get_modem_config "${device}")
if [ -n "${cfg}" ]; then
mm_log "debug" "interface '${cfg}' set '${device}' state unavailable"
proto_set_available "${cfg}" 0
fi
mm_log "debug" "delete object '$object' from monitore cache"
# On monitor remove event, remove old events from cache
# Also substitute object path '/org/freedesktop/ModemManager1/Modem/<number>'
# all '/' with '\/' to make sed happy with shell expansion
sed -i "/${object//\//\\/}/d" "${MODEMMANAGER_MONITOR_CACHE}"
}
mm_monitor_cache_add() {
local object="$1"
local modemstatus device sysfspath cfg
modemstatus="$(mmcli --modem="${object}" --output-keyvalue)"
device=$(modemmanager_get_field "${modemstatus}" "modem.generic.device")
[ -n "${device}" ] || {
mm_log "err" "No 'device' for object '$object' not found..."
return 1
}
sysfspath=$(modemmanager_get_field "${modemstatus}" "modem.generic.physdev")
[ -n "${sysfspath}" ] || {
mm_log "err" "No 'sysfspath' for object '$object' not found..."
return 2
}
mm_log "debug" "add object '$object' to monitore cache (device=${device},sysfspath=${sysfspath})"
# On monitor add event, store event details in cache (if not exists yet)
grep -qs "${sysfspath}" "${MODEMMANAGER_MONITOR_CACHE}" || \
echo "${object} ${device} ${sysfspath}" >> "${MODEMMANAGER_MONITOR_CACHE}"
cfg=$(mm_get_modem_config "${device}")
if [ -n "${cfg}" ]; then
mm_log "info" "interface '${cfg}' set '${device}' state available"
proto_set_available "${cfg}" 1
fi
}
mm_monitor_cache_del() {
local object="$1"
mm_monitor_cache_remove "$object"
}
mm_monitor_cache() {
local line="$1"
local event object modemstatus device pyhsdev
event="$(echo "$line" | cut -d " " -f 1)"
object="$(echo "$line" | cut -d " " -f 2)"
case "$event" in
"(+)")
mm_monitor_cache_add "$object"
;;
"(-)")
mm_monitor_cache_del "$object"
;;
esac
}
main() {
local n=60
local step=1
local mmrunning=0
trap_with_arg func_trap INT TERM KILL
mkdir -p "${MODEMMANAGER_RUNDIR}"
chmod 0755 "${MODEMMANAGER_RUNDIR}"
# Wait for ModemManager to be available in the bus
while [ $n -ge 0 ]; do
sleep $step
mm_log "info" "Checking if ModemManager is available..."
if ! /usr/bin/mmcli -L >/dev/null 2>&1; then
mm_log "info" "ModemManager not yet available"
else
mmrunning=1
break
fi
n=$((n-step))
done
[ ${mmrunning} -eq 1 ] || {
mm_log "error" "couldn't report initial kernel events: ModemManager not running"
return
}
/usr/bin/mmcli -M | {
local line
while read -r line; do
mm_log "debug" "Monitor cache line: ${line}"
mm_monitor_cache "$line"
done
} &
CHILD="$!"
wait $CHILD
}
main "$@"

7
net/modemmanager/files/usr/sbin/ModemManager-wrapper
View file

@ -1,5 +1,7 @@
#!/bin/sh
. /usr/share/ModemManager/modemmanager.common
trap_with_arg() {
func="$1" ; shift
for sig ; do
@ -14,8 +16,6 @@ func_trap() {
}
main() {
. /usr/share/ModemManager/modemmanager.common
trap_with_arg func_trap INT TERM KILL
mkdir -p "${MODEMMANAGER_RUNDIR}"
@ -27,9 +27,6 @@ main() {
mm_report_events_from_cache
wait "$CHILD"
# Set all configured interfaces as unavailable
mm_cleanup_interfaces
}
main "$@"

4
net/nebula/Makefile
View file

@ -4,12 +4,12 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=nebula
PKG_VERSION:=1.8.1
PKG_VERSION:=1.8.2
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/slackhq/nebula/tar.gz/v$(PKG_VERSION)?
PKG_HASH:=85c048b6d39296eeb8cf2d3324124d834011121383d0550662018190494d433e
PKG_HASH:=203713c58d0ec8a10df2f605af791a77a33f825454911ac3a5313ced591547fd
PKG_MAINTAINER:=Stan Grishin <stangri@melmac.ca>
PKG_LICENSE:=MIT

4
net/netbird/Makefile
View file

@ -1,12 +1,12 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=netbird
PKG_VERSION:=0.24.3
PKG_VERSION:=0.25.2
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/netbirdio/netbird/tar.gz/v$(PKG_VERSION)?
PKG_HASH:=6590034fe8a8dc215242bbd7706197beef67a63a099a45a30c436373c892aab0
PKG_HASH:=8a2f509a9f945168fc7b40a23f970de3623356e01fa91dc780dd4a26521944b7
PKG_MAINTAINER:=Oskari Rauta <oskari.rauta@gmail.com>
PKG_LICENSE:=BSD-3-Clause

8
net/nfdump/Makefile
View file

@ -6,12 +6,12 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=nfdump
PKG_VERSION:=1.7.2
PKG_RELEASE:=1
PKG_VERSION:=1.7.3
PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/phaag/nfdump/tar.gz/v$(PKG_VERSION)?
PKG_HASH:=0545b792e81f5edd51a2fdfbfcc4eac7ba8087005811ab41c34bfac4d78fe926
PKG_HASH:=9ea7e1ded34a81839b73e66cb62c9bc11a8070210584f9a508798d7bd6058c89
PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org>
PKG_LICENSE:=BSD-3-Clause
@ -27,7 +27,7 @@ include $(INCLUDE_DIR)/package.mk
define Package/nfdump
SECTION:=net
CATEGORY:=Network
DEPENDS:= +flex +libbz2 +USE_MUSL:musl-fts +libatomic
DEPENDS:= +flex +libbz2 +USE_MUSL:musl-fts +libatomic +libzstd
TITLE:= nfdump
URL:=https://github.com/phaag/nfdump/
endef

6
net/nginx/Makefile
View file

@ -8,12 +8,12 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=nginx
PKG_VERSION:=1.25.2
PKG_RELEASE:=2
PKG_VERSION:=1.25.3
PKG_RELEASE:=1
PKG_SOURCE:=nginx-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://nginx.org/download/
PKG_HASH:=05dd6d9356d66a74e61035f2a42162f8c754c97cf1ba64e7a801ba158d6c0711
PKG_HASH:=64c5b975ca287939e828303fa857d22f142b251f17808dfe41733512d9cded86
PKG_MAINTAINER:=Thomas Heil <heil@terminal-consulting.de> \
Christian Marangi <ansuelsmth@gmail.com>

48
net/nqptp/Makefile Normal file
View file

@ -0,0 +1,48 @@
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
# updated to work with latest source from abrasive
#
include $(TOPDIR)/rules.mk
PKG_NAME:=nqptp
PKG_VERSION:=1.2.4
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/mikebrady/nqptp/tar.gz/$(PKG_VERSION)?
PKG_HASH:=1df1d5edd5b713010d6495b3abca4c1cf4ad8fa6029df0abeb9e4de8e0eb707a
PKG_MAINTAINER:=Ben Klang <bklang@wirehack.net>
PKG_LICENSE:=GPL-2.0-only
PKG_LICENSE_FILES:=COPYING LICENSES nqptp.c
PKG_FIXUP:=autoreconf
PKG_BUILD_PARALLEL:=1
include $(INCLUDE_DIR)/package.mk
define Package/nqptp
SECTION:=net
CATEGORY:=Network
TITLE:=Not Quite Peer-to-Peer
URL:=https://github.com/mikebrady/nqptp
endef
define Package/nqptp/description
nqptp is a daemon that monitors timing data from PTP clocks it sees on ports
319 and 320. It maintains records for one clock, identified by its Clock ID.
It is a companion application to Shairport Sync and provides timing
information for AirPlay 2 operation.
endef
define Package/nqptp/install
$(INSTALL_DIR) $(1)/usr/bin
$(INSTALL_BIN) $(PKG_BUILD_DIR)/nqptp $(1)/usr/bin/
$(INSTALL_DIR) $(1)/etc/init.d
$(INSTALL_BIN) ./files/nqptp.init $(1)/etc/init.d/nqptp
endef
$(eval $(call BuildPackage,nqptp))

15
net/nqptp/files/nqptp.init Normal file
View file

@ -0,0 +1,15 @@
#!/bin/sh /etc/rc.common
# Copyright (C) 2023 Ben Klang <bklang@wirehack.net>
START=99
USE_PROCD=1
service_triggers() {
procd_add_reload_trigger "nqptp"
}
start_service() {
procd_open_instance
procd_set_param command /usr/bin/nqptp
procd_close_instance
}

6
net/ocserv/Makefile
View file

@ -8,14 +8,14 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=ocserv
PKG_VERSION:=1.2.0
PKG_VERSION:=1.2.4
PKG_RELEASE:=1
PKG_BUILD_FLAGS:=no-mips16
PKG_BUILD_DIR :=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=ftp://ftp.infradead.org/pub/ocserv/
PKG_HASH:=47a66e504a6b04bb04856176d78ee392ad1385d22d1670d4ed48b7b95e9dffc5
PKG_SOURCE_URL:=https://www.infradead.org/ocserv/download/
PKG_HASH:=d30f29c5967715f7b118e89bba496011b2be2af0f49bb9e332f12be7fbf693d7
PKG_LICENSE:=GPL-2.0-or-later
PKG_LICENSE_FILES:=COPYING

8
net/openconnect/Makefile
View file

@ -8,12 +8,12 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=openconnect
PKG_VERSION:=9.01
PKG_RELEASE:=2
PKG_VERSION:=9.12
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=ftp://ftp.infradead.org/pub/openconnect/
PKG_HASH:=b3d7faf830e9793299d6a41e81d84cd4a3e2789c148c9e598e4585010090e4c7
PKG_SOURCE_URL:=https://www.infradead.org/openconnect/download
PKG_HASH:=a2bedce3aa4dfe75e36e407e48e8e8bc91d46def5335ac9564fbf91bd4b2413e
PKG_LICENSE:=LGPL-2.1-or-later
PKG_LICENSE_FILES:=COPYING.LGPL

34
net/openconnect/patches/001-Use-OpenSSL_version-not-deprecated-SSLeay_version.patch
View file

@ -1,34 +0,0 @@
From 01b7e75034e6d838d7750a828eccaa8dd534f152 Mon Sep 17 00:00:00 2001
From: David Woodhouse <dwmw2@infradead.org>
Date: Thu, 12 May 2022 15:55:59 +0100
Subject: [PATCH] Use OpenSSL_version() not deprecated SSLeay_version()
Fixes: #428
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
---
openssl.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
--- a/openssl.c
+++ b/openssl.c
@@ -49,6 +49,8 @@
typedef int (*X509_STORE_CTX_get_issuer_fn)(X509 **issuer,
X509_STORE_CTX *ctx, X509 *x);
#define X509_STORE_CTX_get_get_issuer(ctx) ((ctx)->get_issuer)
+#define OpenSSL_version SSLeay_version
+#define OPENSSL_VERSION SSLEAY_VERSION
#endif
static char tls_library_version[32] = "";
@@ -56,7 +58,9 @@ static char tls_library_version[32] = ""
const char *openconnect_get_tls_library_version(void)
{
if (!*tls_library_version) {
- strncpy(tls_library_version, SSLeay_version(SSLEAY_VERSION), sizeof(tls_library_version));
+ strncpy(tls_library_version,
+ OpenSSL_version(OPENSSL_VERSION),
+ sizeof(tls_library_version));
tls_library_version[sizeof(tls_library_version)-1]='\0';
}
return tls_library_version;

Some files were not shown because too many files have changed in this diff Show more