diff --git a/lang/php8/Makefile b/lang/php8/Makefile index b1377321..0a1de9d4 100644 --- a/lang/php8/Makefile +++ b/lang/php8/Makefile @@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=php -PKG_VERSION:=8.2.0 +PKG_VERSION:=8.2.1 PKG_RELEASE:=1 PKG_MAINTAINER:=Michael Heimpold @@ -16,7 +16,7 @@ PKG_CPE_ID:=cpe:/a:php:php PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=http://www.php.net/distributions/ -PKG_HASH:=6ea4c2dfb532950fd712aa2a08c1412a6a81cd1334dd0b0bf88a8e44c2b3a943 +PKG_HASH:=650d3bd7a056cabf07f6a0f6f1dd8ba45cd369574bbeaa36de7d1ece212c17af PKG_BUILD_PARALLEL:=1 PKG_USE_MIPS16:=0 diff --git a/lang/python/borgbackup/Makefile b/lang/python/borgbackup/Makefile new file mode 100644 index 00000000..8c6a8a92 --- /dev/null +++ b/lang/python/borgbackup/Makefile @@ -0,0 +1,63 @@ +# +# Copyright (C) 2022 Julien Malik +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=borgbackup +PKG_VERSION:=1.2.2 +PKG_RELEASE:=1 + +PYPI_NAME:=borgbackup +PKG_HASH:=d730687443f1beb602b1d72bae36318f6f9654818fcdc50458540ec579e57260 + +PKG_LICENSE:=BSD-3-Clause +PKG_LICENSE_FILES:=LICENSE +PKG_MAINTAINER:=Julien Malik + +include ../pypi.mk +include $(INCLUDE_DIR)/package.mk +include ../python3-package.mk + +define Package/borgbackup + SECTION:=lang + CATEGORY:=Languages + SUBMENU:=Python + TITLE:=Deduplicated, encrypted, authenticated and compressed backups + URL:=https://github.com/borgbackup/borg + DEPENDS:= \ + +python3-light \ + +python3-msgpack \ + +python3-pyfuse3 \ + +libacl \ + +libopenssl \ + +liblz4 \ + +libzstd \ + +libxxhash +endef + +define Package/borgbackup/description + BorgBackup (short: Borg) is a deduplicating backup program. + Optionally, it supports compression and authenticated encryption. + + The main goal of Borg is to provide an efficient and secure way to backup data. + The data deduplication technique used makes Borg suitable for daily backups since only changes are stored. The authenticated encryption technique makes it suitable for backups to not fully trusted targets. +endef + +HOST_PYTHON3_PACKAGE_BUILD_DEPENDS:=Cython + +# borg setup.py shall find these via pkg-config, but depends on python pkgconfig PyPi module +# which quickly becomes a nightmare to build, since it build-depends on poetry which is not +# available in the python package feed, and has a myriad of deps +PYTHON3_PKG_SETUP_VARS:= \ + BORG_OPENSSL_PREFIX="/usr/lib" \ + BORG_LIBLZ4_PREFIX="/usr/lib" \ + BORG_LIBZSTD_PREFIX="/usr/lib" \ + BORG_LIBXXHASH_PREFIX="/usr/lib" + +$(eval $(call Py3Package,borgbackup)) +$(eval $(call BuildPackage,borgbackup)) +$(eval $(call BuildPackage,borgbackup-src)) diff --git a/lang/python/django/Makefile b/lang/python/django/Makefile index 5d34a6cb..1249f3e5 100644 --- a/lang/python/django/Makefile +++ b/lang/python/django/Makefile @@ -8,11 +8,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:=django -PKG_VERSION:=4.1.3 +PKG_VERSION:=4.1.5 PKG_RELEASE:=1 PYPI_NAME:=Django -PKG_HASH:=678bbfc8604eb246ed54e2063f0765f13b321a50526bdc8cb1f943eda7fa31f1 +PKG_HASH:=ff56ebd7ead0fd5dbe06fe157b0024a7aaea2e0593bb3785fb594cf94dad58ef PKG_MAINTAINER:=Alexandru Ardelean , Peter Stadler PKG_LICENSE:=BSD-3-Clause diff --git a/lang/python/python-async-generator/Makefile b/lang/python/python-async-generator/Makefile new file mode 100644 index 00000000..b3e64903 --- /dev/null +++ b/lang/python/python-async-generator/Makefile @@ -0,0 +1,42 @@ +# +# Copyright (C) 2022 Julien Malik +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=python-async-generator +PKG_VERSION:=1.10 +PKG_RELEASE:=1 + +PYPI_NAME:=async_generator +PKG_HASH:=6ebb3d106c12920aaae42ccb6f787ef5eefdcdd166ea3d628fa8476abe712144 + +PKG_LICENSE:=Apache-2.0|MIT +PKG_LICENSE_FILES:=LICENSE.APACHE2|LICENSE.MIT +PKG_MAINTAINER:=Julien Malik + +include ../pypi.mk +include $(INCLUDE_DIR)/package.mk +include ../python3-package.mk + +define Package/python3-async-generator + SECTION:=lang + CATEGORY:=Languages + SUBMENU:=Python + TITLE:=Async generators and context managers for Python 3.5+ + URL:=https://github.com/python-trio/async_generator + DEPENDS:=+python3-light +endef + +define Package/python3-async-generator/description + Python 3.6 added async generators. Python 3.7 adds some more tools to make them usable, like contextlib.asynccontextmanager. + + This library gives you all that back to Python 3.5. +endef + +$(eval $(call Py3Package,python3-async-generator)) +$(eval $(call BuildPackage,python3-async-generator)) +$(eval $(call BuildPackage,python3-async-generator-src)) diff --git a/lang/python/python-exceptiongroup/Makefile b/lang/python/python-exceptiongroup/Makefile new file mode 100644 index 00000000..dd64f921 --- /dev/null +++ b/lang/python/python-exceptiongroup/Makefile @@ -0,0 +1,42 @@ +# +# Copyright (C) 2022 Julien Malik +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=python-exceptiongroup +PKG_VERSION:=1.0.4 +PKG_RELEASE:=1 + +PYPI_NAME:=exceptiongroup +PKG_HASH:=bd14967b79cd9bdb54d97323216f8fdf533e278df937aa2a90089e7d6e06e5ec + +PKG_LICENSE:=MIT,Python-2.0 +PKG_LICENSE_FILES:=LICENSE +PKG_MAINTAINER:=Julien Malik + +include ../pypi.mk +include $(INCLUDE_DIR)/package.mk +include ../python3-package.mk + +define Package/python3-exceptiongroup + SECTION:=lang + CATEGORY:=Languages + SUBMENU:=Python + TITLE:=Backport of PEP 654 (exception groups) + URL:=https://github.com/agronholm/exceptiongroup + DEPENDS:= \ + +python3-light \ + +python3-attrs +endef + +define Package/python3-exceptiongroup/description + This is a backport of the BaseExceptionGroup and ExceptionGroup classes from Python 3.11. +endef + +$(eval $(call Py3Package,python3-exceptiongroup)) +$(eval $(call BuildPackage,python3-exceptiongroup)) +$(eval $(call BuildPackage,python3-exceptiongroup-src)) diff --git a/lang/python/python-exceptiongroup/patches/0001-add-setup.py-to-avoid-depending-on-flit-for-building.patch b/lang/python/python-exceptiongroup/patches/0001-add-setup.py-to-avoid-depending-on-flit-for-building.patch new file mode 100644 index 00000000..ec276382 --- /dev/null +++ b/lang/python/python-exceptiongroup/patches/0001-add-setup.py-to-avoid-depending-on-flit-for-building.patch @@ -0,0 +1,31 @@ +From 99e590f2177148420f3556bbb0dc2e493e94e45f Mon Sep 17 00:00:00 2001 +From: Julien Malik +Date: Sat, 26 Nov 2022 13:05:20 +0100 +Subject: [PATCH] add setup.py to avoid depending on flit for building + +--- + setup.py | 18 ++++++++++++++++++ + 1 file changed, 18 insertions(+) + create mode 100644 setup.py + +--- /dev/null ++++ b/setup.py +@@ -0,0 +1,18 @@ ++#!/usr/bin/env python ++ ++import setuptools ++ ++setuptools.setup( ++ name='exceptiongroup', ++ version='1.0.4', ++ description='Backport of PEP 654 (exception groups)', ++ author='Alex Grönholm', ++ author_email='Alex Grönholm ', ++ url='https://github.com/agronholm/exceptiongroup', ++ packages=['exceptiongroup'], ++ package_data={'': ['*']}, ++ package_dir={'': 'src'}, ++ extras_require={'test': ['pytest >= 6']}, ++ python_requires='>=3.7', ++) ++ diff --git a/lang/python/python-lxml/Makefile b/lang/python/python-lxml/Makefile index 55cf73db..628150e2 100644 --- a/lang/python/python-lxml/Makefile +++ b/lang/python/python-lxml/Makefile @@ -8,11 +8,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:=python-lxml -PKG_VERSION:=4.9.1 -PKG_RELEASE:=$(AUTORELEASE) +PKG_VERSION:=4.9.2 +PKG_RELEASE:=1 PYPI_NAME:=lxml -PKG_HASH:=fe749b052bb7233fe5d072fcb549221a8cb1a16725c47c37e42b0b9cb3ff2c3f +PKG_HASH:=2455cfaeb7ac70338b3257f41e21f0724f4b5b0c0e7702da67ee6c3640835b67 PKG_LICENSE:=BSD-3-Clause PKG_LICENSE_FILES:=LICENSES.txt diff --git a/lang/python/python-outcome/Makefile b/lang/python/python-outcome/Makefile new file mode 100644 index 00000000..05ec2412 --- /dev/null +++ b/lang/python/python-outcome/Makefile @@ -0,0 +1,42 @@ +# +# Copyright (C) 2022 Julien Malik +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=python-outcome +PKG_VERSION:=1.2.0 +PKG_RELEASE:=1 + +PYPI_NAME:=outcome +PKG_HASH:=6f82bd3de45da303cf1f771ecafa1633750a358436a8bb60e06a1ceb745d2672 + +PKG_LICENSE:=Apache-2.0|MIT +PKG_LICENSE_FILES:=LICENSE.APACHE2|LICENSE.MIT +PKG_MAINTAINER:=Julien Malik + +include ../pypi.mk +include $(INCLUDE_DIR)/package.mk +include ../python3-package.mk + +define Package/python3-outcome + SECTION:=lang + CATEGORY:=Languages + SUBMENU:=Python + TITLE:=Capture the outcome of Python function calls. + URL:=https://outcome.readthedocs.io + DEPENDS:= \ + +python3-light \ + +python3-attrs +endef + +define Package/python3-outcome/description + Capture the outcome of Python function calls. Extracted from the Trio project. +endef + +$(eval $(call Py3Package,python3-outcome)) +$(eval $(call BuildPackage,python3-outcome)) +$(eval $(call BuildPackage,python3-outcome-src)) diff --git a/lang/python/python-pyfuse3/Makefile b/lang/python/python-pyfuse3/Makefile new file mode 100644 index 00000000..fd13ccfc --- /dev/null +++ b/lang/python/python-pyfuse3/Makefile @@ -0,0 +1,46 @@ +# +# Copyright (C) 2022 Julien Malik +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=python-pyfuse3 +PKG_VERSION:=3.2.2 +PKG_RELEASE:=1 + +PYPI_NAME:=pyfuse3 +PKG_HASH:=aa4080913e6148bff1365d4aaacdc96767b87a1e178031fd9caeb5f0b9fc8cec + +PKG_LICENSE:=LGPL-2.0-or-later +PKG_LICENSE_FILES:=LICENSE +PKG_MAINTAINER:=Julien Malik + +include ../pypi.mk +include $(INCLUDE_DIR)/package.mk +include ../python3-package.mk + +define Package/python3-pyfuse3 + SECTION:=lang + CATEGORY:=Languages + SUBMENU:=Python + TITLE:=Python 3 bindings for libfuse 3 with async I/O support + URL:=https://github.com/libfuse/pyfuse3 + DEPENDS:= \ + +python3-light \ + +python3-trio \ + +libfuse3 +endef + +define Package/python3-pyfuse3/description + pyfuse3 is a set of Python 3 bindings for libfuse 3. + + It provides an asynchronous API compatible with Trio and asyncio, + and enables you to easily write a full-featured Linux filesystem in Python. +endef + +$(eval $(call Py3Package,python3-pyfuse3)) +$(eval $(call BuildPackage,python3-pyfuse3)) +$(eval $(call BuildPackage,python3-pyfuse3-src)) diff --git a/lang/python/python-pytz/Makefile b/lang/python/python-pytz/Makefile index 16490c00..f8e3cea8 100644 --- a/lang/python/python-pytz/Makefile +++ b/lang/python/python-pytz/Makefile @@ -8,11 +8,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:=python-pytz -PKG_VERSION:=2022.6 +PKG_VERSION:=2022.7 PKG_RELEASE:=1 PYPI_NAME:=pytz -PKG_HASH:=e89512406b793ca39f5971bc999cc538ce125c0e51c27941bef4568b460095e2 +PKG_HASH:=7ccfae7b4b2c067464a6733c6261673fdb8fd1be905460396b97a073e9fa683a PKG_MAINTAINER:=Alexandru Ardelean PKG_LICENSE:=MIT diff --git a/lang/python/python-sniffio/Makefile b/lang/python/python-sniffio/Makefile new file mode 100644 index 00000000..eef65ad6 --- /dev/null +++ b/lang/python/python-sniffio/Makefile @@ -0,0 +1,40 @@ +# +# Copyright (C) 2022 Julien Malik +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=python-sniffio +PKG_VERSION:=1.3.0 +PKG_RELEASE:=1 + +PYPI_NAME:=sniffio +PKG_HASH:=e60305c5e5d314f5389259b7f22aaa33d8f7dee49763119234af3755c55b9101 + +PKG_LICENSE:=Apache-2.0|MIT +PKG_LICENSE_FILES:=LICENSE.APACHE2|LICENSE.MIT +PKG_MAINTAINER:=Julien Malik + +include ../pypi.mk +include $(INCLUDE_DIR)/package.mk +include ../python3-package.mk + +define Package/python3-sniffio + SECTION:=lang + CATEGORY:=Languages + SUBMENU:=Python + TITLE:=Sniff out which async library your code is running under + URL:=https://sniffio.readthedocs.io + DEPENDS:=+python3-light +endef + +define Package/python3-sniffio/description + This is a tiny package whose only purpose is to let you detect which async library your code is running under. +endef + +$(eval $(call Py3Package,python3-sniffio)) +$(eval $(call BuildPackage,python3-sniffio)) +$(eval $(call BuildPackage,python3-sniffio-src)) diff --git a/lang/python/python-sortedcontainers/Makefile b/lang/python/python-sortedcontainers/Makefile new file mode 100644 index 00000000..b049eb98 --- /dev/null +++ b/lang/python/python-sortedcontainers/Makefile @@ -0,0 +1,40 @@ +# +# Copyright (C) 2022 Julien Malik +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=python-sortedcontainers +PKG_VERSION:=2.4.0 +PKG_RELEASE:=1 + +PYPI_NAME:=sortedcontainers +PKG_HASH:=25caa5a06cc30b6b83d11423433f65d1f9d76c4c6a0c90e3379eaa43b9bfdb88 + +PKG_LICENSE:=Apache-2.0 +PKG_LICENSE_FILES:=LICENSE +PKG_MAINTAINER:=Julien Malik + +include ../pypi.mk +include $(INCLUDE_DIR)/package.mk +include ../python3-package.mk + +define Package/python3-sortedcontainers + SECTION:=lang + CATEGORY:=Languages + SUBMENU:=Python + TITLE:=Sorted Containers -- Sorted List, Sorted Dict, Sorted Set + URL:=https://grantjenks.com/docs/sortedcontainers + DEPENDS:=+python3-light +endef + +define Package/python3-sortedcontainers/description + Sorted Containers is an Apache2 licensed sorted collections library, written in pure-Python, and fast as C-extensions. +endef + +$(eval $(call Py3Package,python3-sortedcontainers)) +$(eval $(call BuildPackage,python3-sortedcontainers)) +$(eval $(call BuildPackage,python3-sortedcontainers-src)) diff --git a/lang/python/python-trio/Makefile b/lang/python/python-trio/Makefile new file mode 100644 index 00000000..8afd6b29 --- /dev/null +++ b/lang/python/python-trio/Makefile @@ -0,0 +1,49 @@ +# +# Copyright (C) 2022 Julien Malik +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=python-trio +PKG_VERSION:=0.22.0 +PKG_RELEASE:=1 + +PYPI_NAME:=trio +PKG_HASH:=ce68f1c5400a47b137c5a4de72c7c901bd4e7a24fbdebfe9b41de8c6c04eaacf + +PKG_LICENSE:=Apache-2.0|MIT +PKG_LICENSE_FILES:=LICENSE.APACHE2|LICENSE.MIT +PKG_MAINTAINER:=Julien Malik + +include ../pypi.mk +include $(INCLUDE_DIR)/package.mk +include ../python3-package.mk + +define Package/python3-trio + SECTION:=lang + CATEGORY:=Languages + SUBMENU:=Python + TITLE:=A friendly Python library for async concurrency and I/O + URL:=https://trio.readthedocs.io + DEPENDS:= \ + +python3-light \ + +python3-attrs \ + +python3-async-generator \ + +python3-cffi \ + +python3-exceptiongroup \ + +python3-idna \ + +python3-outcome \ + +python3-sniffio \ + +python3-sortedcontainers +endef + +define Package/python3-trio/description + The Trio project’s goal is to produce a production-quality, permissively licensed, async/await-native I/O library for Python +endef + +$(eval $(call Py3Package,python3-trio)) +$(eval $(call BuildPackage,python3-trio)) +$(eval $(call BuildPackage,python3-trio-src)) diff --git a/libs/getdns/Makefile b/libs/getdns/Makefile index d89b996f..9a4b838b 100644 --- a/libs/getdns/Makefile +++ b/libs/getdns/Makefile @@ -5,8 +5,8 @@ include $(TOPDIR)/rules.mk PKG_NAME:=getdns -PKG_VERSION:=1.7.0 -PKG_RELEASE:=2 +PKG_VERSION:=1.7.3 +PKG_RELEASE:=1 PKG_LICENSE:=BSD-3-Clause PKG_LICENSE_FILES:=LICENSE @@ -14,7 +14,7 @@ PKG_MAINTAINER:= PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://getdnsapi.net/dist/ -PKG_HASH:=ea8713ce5e077ac76b1418ceb6afd25e6d4e39e9600f6f5e81d3a3a13a60f652 +PKG_HASH:=f1404ca250f02e37a118aa00cf0ec2cbe11896e060c6d369c6761baea7d55a2c CMAKE_INSTALL:=1 diff --git a/multimedia/icecast/Makefile b/multimedia/icecast/Makefile index 5d83bbdf..544ea3ca 100644 --- a/multimedia/icecast/Makefile +++ b/multimedia/icecast/Makefile @@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=icecast PKG_VERSION:=2.4.4 -PKG_RELEASE:=3 +PKG_RELEASE:=4 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://downloads.xiph.org/releases/icecast/ @@ -55,6 +55,7 @@ CONFIGURE_ARGS+= \ --with-vorbis="$(STAGING_DIR)/usr" \ --with-xslt-config="$(STAGING_DIR)/usr/bin/xslt-config" +TARGET_CFLAGS+= -I$(STAGING_DIR)/usr/include/libxml2 # Manually edit configure in case both vorbis and tremor host packages are installed define Build/Configure diff --git a/multimedia/yt-dlp/Makefile b/multimedia/yt-dlp/Makefile index 36162cff..ee8e7adc 100644 --- a/multimedia/yt-dlp/Makefile +++ b/multimedia/yt-dlp/Makefile @@ -1,11 +1,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:=yt-dlp -PKG_VERSION:=2022.11.11 +PKG_VERSION:=2023.1.6 PKG_RELEASE:=1 PYPI_NAME:=yt-dlp -PKG_HASH:=f6b962023c17a77151476f0f6ed71be87d017629ba5d9994528bc548521191b6 +PKG_HASH:=3a783a36751ced16368f40b3ba865ab39b30689ed8056f1ee2346aa3839a0b0f PKG_MAINTAINER:=Michal Vasilek PKG_LICENSE:=Unlicense diff --git a/net/knot/Makefile b/net/knot/Makefile index 45c4fcb7..a19efe26 100644 --- a/net/knot/Makefile +++ b/net/knot/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=knot PKG_VERSION:=3.2.4 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://secure.nic.cz/files/knot-dns/ @@ -151,6 +151,7 @@ CONFIGURE_ARGS += \ --enable-recvmmsg=no \ --enable-cap-ng=no \ --enable-xdp=no \ + --enable-maxminddb=no \ --disable-fastparser \ --without-libidn \ --with-libnghttp2=no \ diff --git a/net/ocserv/Makefile b/net/ocserv/Makefile index f8ba40d5..b969a8e4 100644 --- a/net/ocserv/Makefile +++ b/net/ocserv/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ocserv PKG_VERSION:=1.1.6 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_USE_MIPS16:=0 PKG_BUILD_DIR :=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) @@ -63,6 +63,7 @@ CONFIGURE_ARGS+= \ --with-libreadline-prefix="$(STAGING_DIR)/" \ --without-libnl \ --without-gssapi \ + --without-maxmind \ --with-libcrypt-prefix="$(STAGING_DIR)/" \ --with-libev-prefix="$(STAGING_DIR)/" \ --without-lz4 \ diff --git a/net/xinetd/Makefile b/net/xinetd/Makefile index 62e90bdd..1d52a1b5 100644 --- a/net/xinetd/Makefile +++ b/net/xinetd/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=xinetd PKG_VERSION:=2.3.15 -PKG_RELEASE:=13 +PKG_RELEASE:=14 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://github.com/xinetd-org/xinetd/archive diff --git a/net/xinetd/files/xinetd.init b/net/xinetd/files/xinetd.init index 9e3872fc..5e89b5b6 100644 --- a/net/xinetd/files/xinetd.init +++ b/net/xinetd/files/xinetd.init @@ -62,7 +62,22 @@ config_cb() { local option="$1" local value="$2" - [ -n "$value" ] && [ "$option" != "name" ] && echo -e "\t$option = $value" >> $GENERATED_CONF_FILE + # for the redirect option we have to convert the '[ip address]:port' notation + # in config file to 'ip_address port' in the xinetd config file + if [ "$option" = "redirect" ] && [ -n "$value" ]; then + local redirect_ip="" + local redirect_port="" + + redirect_ip="$(echo ${value%:*})" + redirect_ip="$(echo ${redirect_ip//\[/})" + redirect_ip="$(echo ${redirect_ip//\]/})" + + redirect_port="$(echo ${value##*:})" + + echo -e "\t$option = $redirect_ip $redirect_port" >> $GENERATED_CONF_FILE + else + [ -n "$value" ] && [ "$option" != "name" ] && echo -e "\t$option = $value" >> $GENERATED_CONF_FILE + fi } # redefined callback for lists when calling config_load diff --git a/sound/squeezelite/Makefile b/sound/squeezelite/Makefile index ca4554ec..311728e2 100644 --- a/sound/squeezelite/Makefile +++ b/sound/squeezelite/Makefile @@ -6,13 +6,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=squeezelite -PKG_VERSION:=1.9.9-1403 -PKG_RELEASE:=$(AUTORELEASE) +PKG_VERSION:=1.9.9-1415 +PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/ralph-irving/squeezelite -PKG_SOURCE_VERSION:=bc72c0de3fff771540a2a45aaafafed539387b3c -PKG_MIRROR_HASH:=25f6c320e52b53c0340a337429b91d59783c87f1af3454dc0434c24b90ed3b94 +PKG_SOURCE_VERSION:=5361789c8df37d87a22cc2253ff746557044931a +PKG_MIRROR_HASH:=c6cabb4041c1197881d9f5e9ea8293ece2d409356ccf56d4a8948743b49b13ca PKG_MAINTAINER:=Ted Hess PKG_LICENSE:=GPL-3.0-or-later @@ -116,6 +116,8 @@ define Package/squeezelite-mini/description This package will dynamically load installed codecs. endef +opts+= -DNO_MAD + ifeq ($(CONFIG_SQUEEZELITE_WMA),y) opts+= -DFFMPEG endif diff --git a/sound/squeezelite/patches/010-select_broadcast_interface.patch b/sound/squeezelite/patches/010-select_broadcast_interface.patch index 5cc6a79e..50a50c39 100644 --- a/sound/squeezelite/patches/010-select_broadcast_interface.patch +++ b/sound/squeezelite/patches/010-select_broadcast_interface.patch @@ -1,6 +1,6 @@ --- a/main.c +++ b/main.c -@@ -93,6 +93,7 @@ static void usage(const char *argv0) { +@@ -99,6 +99,7 @@ static void usage(const char *argv0) { #if IR " -i []\tEnable lirc remote control support (lirc config file ~/.lircrc used if filename not specified)\n" #endif @@ -8,7 +8,7 @@ " -m \t\tSet mac address, format: ab:cd:ef:12:34:56\n" " -M \tSet the squeezelite player model name sent to the server (default: " MODEL_NAME_STRING ")\n" " -n \t\tSet the player name\n" -@@ -292,6 +293,8 @@ int main(int argc, char **argv) { +@@ -304,6 +305,8 @@ int main(int argc, char **argv) { extern bool user_rates; char *logfile = NULL; u8_t mac[6]; @@ -17,7 +17,7 @@ unsigned stream_buf_size = STREAMBUF_SIZE; unsigned output_buf_size = 0; // set later unsigned rates[MAX_SUPPORTED_SAMPLERATES] = { 0 }; -@@ -332,6 +335,7 @@ int main(int argc, char **argv) { +@@ -344,6 +347,7 @@ int main(int argc, char **argv) { int maxSampleRate = 0; @@ -25,7 +25,7 @@ char *optarg = NULL; int optind = 1; int i; -@@ -339,8 +343,6 @@ int main(int argc, char **argv) { +@@ -351,8 +355,6 @@ int main(int argc, char **argv) { #define MAXCMDLINE 512 char cmdline[MAXCMDLINE] = ""; @@ -34,7 +34,7 @@ for (i = 0; i < argc && (strlen(argv[i]) + strlen(cmdline) + 2 < MAXCMDLINE); i++) { strcat(cmdline, argv[i]); strcat(cmdline, " "); -@@ -348,7 +350,7 @@ int main(int argc, char **argv) { +@@ -360,7 +362,7 @@ int main(int argc, char **argv) { while (optind < argc && strlen(argv[optind]) >= 2 && argv[optind][0] == '-') { char *opt = argv[optind] + 1; @@ -43,7 +43,7 @@ #if ALSA "UVO" #endif -@@ -442,6 +444,9 @@ int main(int argc, char **argv) { +@@ -454,6 +456,9 @@ int main(int argc, char **argv) { case 'f': logfile = optarg; break; @@ -53,7 +53,7 @@ case 'm': { int byte = 0; -@@ -755,6 +760,11 @@ int main(int argc, char **argv) { +@@ -767,6 +772,11 @@ int main(int argc, char **argv) { winsock_init(); #endif @@ -65,7 +65,7 @@ stream_init(log_stream, stream_buf_size); if (!strcmp(output_device, "-")) { -@@ -801,7 +811,7 @@ int main(int argc, char **argv) { +@@ -813,7 +823,7 @@ int main(int argc, char **argv) { exit(1); } @@ -132,7 +132,7 @@ } else { --- a/squeezelite.h +++ b/squeezelite.h -@@ -456,7 +456,7 @@ char* strcasestr(const char *haystack, c +@@ -458,7 +458,7 @@ char* strcasestr(const char *haystack, c char *next_param(char *src, char c); u32_t gettime_ms(void); @@ -141,7 +141,7 @@ void set_nonblock(sockfd s); int connect_timeout(sockfd sock, const struct sockaddr *addr, socklen_t addrlen, int timeout); void server_addr(char *server, in_addr_t *ip_ptr, unsigned *port_ptr); -@@ -513,7 +513,7 @@ void buf_init(struct buffer *buf, size_t +@@ -515,7 +515,7 @@ void buf_init(struct buffer *buf, size_t void buf_destroy(struct buffer *buf); // slimproto.c diff --git a/sound/squeezelite/patches/020-no_libmad.patch b/sound/squeezelite/patches/020-no_libmad.patch deleted file mode 100644 index 8403056a..00000000 --- a/sound/squeezelite/patches/020-no_libmad.patch +++ /dev/null @@ -1,80 +0,0 @@ ---- a/Makefile -+++ b/Makefile -@@ -24,7 +24,7 @@ OPT_PULSEAUDIO = -DPULSEAUDIO - SOURCES = \ - main.c slimproto.c buffer.c stream.c utils.c \ - output.c output_alsa.c output_pa.c output_stdout.c output_pack.c output_pulse.c decode.c \ -- flac.c pcm.c mad.c vorbis.c mpg.c -+ flac.c pcm.c vorbis.c mpg.c - - SOURCES_DSD = dsd.c dop.c dsd2pcm/dsd2pcm.c - SOURCES_FF = ffmpeg.c -@@ -45,7 +45,7 @@ LINK_PULSEAUDIO = -lpulse - LINK_SSL = -lssl -lcrypto - LINK_ALAC = -lalac - --LINKALL = -lmad -lmpg123 -lFLAC -lvorbisfile -lvorbis -logg -+LINKALL = -lmpg123 -lFLAC -lvorbisfile -lvorbis -logg - LINKALL_FF = -lavformat -lavcodec -lavutil - LINKALL_RESAMPLE = -lsoxr - LINKALL_IR = -llirc_client ---- a/decode.c -+++ b/decode.c -@@ -183,11 +183,7 @@ void decode_init(log_level level, const - if (!strstr(exclude_codecs, "pcm") && (!include_codecs || (order_codecs = strstr(include_codecs, "pcm")))) - sort_codecs((include_codecs ? order_codecs - include_codecs : i), register_pcm()); - -- // try mad then mpg for mp3 unless command line option passed -- if (!(strstr(exclude_codecs, "mp3") || strstr(exclude_codecs, "mad")) && -- (!include_codecs || (order_codecs = strstr(include_codecs, "mp3")) || (order_codecs = strstr(include_codecs, "mad")))) -- sort_codecs((include_codecs ? order_codecs - include_codecs : i), register_mad()); -- else if (!(strstr(exclude_codecs, "mp3") || strstr(exclude_codecs, "mpg")) && -+ if (!(strstr(exclude_codecs, "mp3") || strstr(exclude_codecs, "mpg")) && - (!include_codecs || (order_codecs = strstr(include_codecs, "mp3")) || (order_codecs = strstr(include_codecs, "mpg")))) - sort_codecs((include_codecs ? order_codecs - include_codecs : i), register_mpg()); - ---- a/main.c -+++ b/main.c -@@ -51,7 +51,7 @@ - #else - #define CODECS_DSD "" - #endif --#define CODECS_MP3 " (mad,mpg for specific mp3 codec)" -+#define CODECS_MP3 "" - - #define CODECS CODECS_BASE CODECS_AAC CODECS_FF CODECS_OPUS CODECS_DSD CODECS_MP3 - ---- a/squeezelite.h -+++ b/squeezelite.h -@@ -191,7 +191,6 @@ - - #if LINUX - #define LIBFLAC "libFLAC.so.8" --#define LIBMAD "libmad.so.0" - #define LIBMPG "libmpg123.so.0" - #define LIBVORBIS "libvorbisfile.so.3" - #define LIBOPUS "libopusfile.so.0" -@@ -206,7 +205,6 @@ - - #if OSX - #define LIBFLAC "libFLAC.8.dylib" --#define LIBMAD "libmad.0.dylib" - #define LIBMPG "libmpg123.0.dylib" - #define LIBVORBIS "libvorbisfile.3.dylib" - #define LIBTREMOR "libvorbisidec.1.dylib" -@@ -220,7 +218,6 @@ - - #if WIN - #define LIBFLAC "libFLAC.dll" --#define LIBMAD "libmad-0.dll" - #define LIBMPG "libmpg123-0.dll" - #define LIBVORBIS "libvorbisfile.dll" - #define LIBOPUS "libopusfile-0.dll" -@@ -234,7 +231,6 @@ - - #if FREEBSD - #define LIBFLAC "libFLAC.so.8" --#define LIBMAD "libmad.so.0" - #define LIBMPG "libmpg123.so.0" - #define LIBVORBIS "libvorbisfile.so.3" - #define LIBTREMOR "libvorbisidec.so.1" diff --git a/utils/conmon/Makefile b/utils/conmon/Makefile index ef500a83..887511ab 100644 --- a/utils/conmon/Makefile +++ b/utils/conmon/Makefile @@ -1,12 +1,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=conmon -PKG_VERSION:=2.1.0 -PKG_RELEASE:=$(AUTORELEASE) +PKG_VERSION:=2.1.5 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://github.com/containers/$(PKG_NAME)/archive/v$(PKG_VERSION) -PKG_HASH:=874909d831feac75e452562087f6ea0eb39848ef144397bdd8f0daf579c5ee85 +PKG_HASH:=ee3179ee2b9a9107acec00eb546062cf7deb847f135a3b81503d22b0d226b3ed PKG_MAINTAINER:=Oskari Rauta PKG_LICENSE:=Apache-2.0 diff --git a/utils/conmon/patches/010-remove-libdl-dep.patch b/utils/conmon/patches/010-remove-libdl-dep.patch index 5a7640cd..bcfb4d00 100644 --- a/utils/conmon/patches/010-remove-libdl-dep.patch +++ b/utils/conmon/patches/010-remove-libdl-dep.patch @@ -1,26 +1,11 @@ --- a/meson.build +++ b/meson.build -@@ -35,14 +35,6 @@ add_project_arguments('-Os', '-Wall', '- - - glib = dependency('glib-2.0') - --cc = meson.get_compiler('c') --null_dep = dependency('', required : false) --if cc.has_function('dlopen') -- libdl = null_dep --else -- libdl = cc.find_library('dl') --endif -- - executable('conmon', - ['src/conmon.c', - 'src/config.h', -@@ -78,7 +70,7 @@ executable('conmon', +@@ -90,7 +90,7 @@ executable('conmon', 'src/utils.h', 'src/seccomp_notify.c', 'src/seccomp_notify.h'], -- dependencies : [glib, libdl], -+ dependencies : [glib], +- dependencies : [glib, libdl, sd_journal, seccomp], ++ dependencies : [glib, sd_journal, seccomp], install : true, install_dir : join_paths(get_option('libexecdir'), 'podman'), ) diff --git a/utils/crun/Makefile b/utils/crun/Makefile index 769325df..85d97218 100644 --- a/utils/crun/Makefile +++ b/utils/crun/Makefile @@ -1,14 +1,14 @@ include $(TOPDIR)/rules.mk PKG_NAME:=crun -PKG_VERSION:=1.6 -PKG_RELEASE:=$(AUTORELEASE) +PKG_VERSION:=1.7.2 +PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/containers/crun.git -PKG_SOURCE_DATE:=2022-09-07 -PKG_SOURCE_VERSION:=18cf2efbb8feb2b2f20e316520e0fd0b6c41ef4d -PKG_MIRROR_HASH:=cd7d6fb4c58f73eff6060268d08a77404731f1cc913635add4a2e340d3c455af +PKG_SOURCE_DATE:=2023-01-11 +PKG_SOURCE_VERSION:=4e5bd755c12a86f2e36962964f3eab7b3516d3ac +PKG_MIRROR_HASH:=8e6b0f3e9dde982601f562683f5c744b03e630681afaf9aaacaa4c89ccec23dc PKG_BUILD_DEPENDS:=argp-standalone PKG_BUILD_PARALLEL:=1 diff --git a/utils/syncthing/Makefile b/utils/syncthing/Makefile index 6848bd6c..9feb2e93 100644 --- a/utils/syncthing/Makefile +++ b/utils/syncthing/Makefile @@ -1,12 +1,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=syncthing -PKG_VERSION:=1.22.2 +PKG_VERSION:=1.23.0 PKG_RELEASE:=1 PKG_SOURCE:=syncthing-source-v$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://github.com/syncthing/syncthing/releases/download/v$(PKG_VERSION) -PKG_HASH:=211704904788808ef2818994fb36e33c3e33ed1b52267f7adbf1411fa5ee2d2f +PKG_HASH:=0f66d3dd2a7915a6f3ca6773c1dc02345444b2644a533211ce1ee57b371ae458 PKG_BUILD_DIR=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)/$(PKG_NAME) @@ -19,19 +19,19 @@ PKG_BUILD_DEPENDS:=golang/host PKG_BUILD_PARALLEL:=1 PKG_USE_MIPS16:=0 -GO_PKG:=github.com/syncthing/syncthing/ +GO_PKG:=github.com/syncthing/syncthing GO_PKG_BUILD_PKG:=\ - $(if $(CONFIG_PACKAGE_syncthing),github.com/syncthing/syncthing/cmd/syncthing/) \ - $(if $(CONFIG_PACKAGE_stdiscosrv),github.com/syncthing/syncthing/cmd/stdiscosrv/) \ - $(if $(CONFIG_PACKAGE_strelaysrv),github.com/syncthing/syncthing/cmd/strelaysrv/) + $(if $(CONFIG_PACKAGE_syncthing),$(GO_PKG)/cmd/syncthing/) \ + $(if $(CONFIG_PACKAGE_stdiscosrv),$(GO_PKG)/cmd/stdiscosrv/) \ + $(if $(CONFIG_PACKAGE_strelaysrv),$(GO_PKG)/cmd/strelaysrv/) GO_PKG_INSTALL_EXTRA:=^gui/ GO_PKG_LDFLAGS_X:=\ - github.com/syncthing/syncthing/lib/build.Version=v$(PKG_VERSION) \ - github.com/syncthing/syncthing/lib/build.Stamp=$(SOURCE_DATE_EPOCH) \ - github.com/syncthing/syncthing/lib/build.User=openwrt \ - github.com/syncthing/syncthing/lib/build.Host=openwrt \ - github.com/syncthing/syncthing/lib/build.Tags=noupgrade + $(GO_PKG)/lib/build.Version=v$(PKG_VERSION) \ + $(GO_PKG)/lib/build.Stamp=$(SOURCE_DATE_EPOCH) \ + $(GO_PKG)/lib/build.User=openwrt \ + $(GO_PKG)/lib/build.Host=openwrt \ + $(GO_PKG)/lib/build.Tags=noupgrade GO_PKG_TAGS:=noupgrade include $(INCLUDE_DIR)/package.mk @@ -90,11 +90,9 @@ define Package/strelaysrv/description Relay server for syncthing endef -define Build/Install - $(call GoPackage/Package/Install/Bin,$(PKG_INSTALL_DIR)) -endef - define SyncthingInstall + $(INSTALL_DIR) $(1)/etc/$(2) + $(INSTALL_DIR) $(1)/etc/config/ $(INSTALL_CONF) $(CURDIR)/files/$(2).conf $(1)/etc/config/$(2) @@ -102,7 +100,7 @@ define SyncthingInstall $(INSTALL_BIN) $(CURDIR)/files/$(2).init $(1)/etc/init.d/$(2) $(INSTALL_DIR) $(1)/usr/bin/ - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/$(2) $(1)/usr/bin + $(INSTALL_BIN) $(GO_PKG_BUILD_BIN_DIR)/$(2) $(1)/usr/bin endef diff --git a/utils/xxhash/Makefile b/utils/xxhash/Makefile new file mode 100644 index 00000000..04924b75 --- /dev/null +++ b/utils/xxhash/Makefile @@ -0,0 +1,93 @@ +# +# Copyright (C) 2022 Julien Malik +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +# initial implementation kindly stolen from (and then updated) : +# https://forum.openwrt.org/t/xxhash-makefile/118426 + +include $(TOPDIR)/rules.mk + +PKG_NAME:=xxhash +PKG_VERSION:=0.8.1 +PKG_RELEASE:=1 + +PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=https://github.com/Cyan4973/xxHash/archive/v$(PKG_VERSION) +PKG_HASH:=3bb6b7d6f30c591dd65aaaff1c8b7a5b94d81687998ca9400082c739a690436c + +# The source for the library (xxhash.c and xxhash.h) is BSD +# The source for the command line tool (xxhsum.c) is GPLv2+ +PKG_LICENSE:=BSD-2-Clause,GPL-2.0-or-later +PKG_LICENSE_FILES:=LICENSE,cli/COPYING +PKG_MAINTAINER:=Julien Malik + +include $(INCLUDE_DIR)/package.mk + +define Package/xxhash/Default + TITLE:=Extremely fast hash algorithm + URL:=https://cyan4973.github.io/xxHash/ +endef + +define Package/xxhash/Default/description + xxHash is an Extremely fast Hash algorithm, running at RAM speed + limits. It successfully completes the SMHasher test suite which + evaluates collision, dispersion and randomness qualities of hash + functions. Code is highly portable, and hashes are identical on all + platforms (little / big endian). +endef + +define Package/libxxhash + $(call Package/xxhash/Default) + SECTION:=libs + CATEGORY:=Libraries +endef + +define Package/libxxhash/description + $(call Package/xxhash/Default/description) + + This package contains the shared library. +endef + +define Package/xxhash + $(call Package/xxhash/Default) + SECTION:=utils + CATEGORY:=Utilities + DEPENDS:= +libxxhash +endef + +define Package/xxhash/description + $(call Package/xxhash/Default/description) + + This package contains the executables. +endef + +define Build/Prepare + rm -rf $(PKG_BUILD_DIR)/ + mkdir -p $(PKG_BUILD_DIR)/ + $(TAR) -xzf $(DL_DIR)/$(PKG_SOURCE) -C $(PKG_BUILD_DIR) --strip 1 +endef + +define Build/InstallDev + $(INSTALL_DIR) $(1)/usr/include + $(CP) $(PKG_BUILD_DIR)/*.h $(1)/usr/include + $(INSTALL_DIR) $(1)/usr/lib + $(CP) $(PKG_BUILD_DIR)/libxxhash.so* $(1)/usr/lib + $(INSTALL_DIR) $(1)/usr/lib/pkgconfig + $(CP) $(PKG_BUILD_DIR)/libxxhash.pc.in $(1)/usr/lib/pkgconfig +endef + +define Package/libxxhash/install + $(INSTALL_DIR) $(1)/usr/lib + $(CP) $(PKG_BUILD_DIR)/libxxhash.so.* $(1)/usr/lib +endef + +define Package/xxhash/install + $(INSTALL_DIR) $(1)/usr/bin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/xxh*sum $(1)/usr/bin/ +endef + +$(eval $(call BuildPackage,libxxhash)) +$(eval $(call BuildPackage,xxhash))