PKG_ROOTS=$(find . -name Makefile | \
grep -v ".*/src/Makefile" | \
sed -e 's@./\(.*\)/Makefile@\1/@')
- CHANGES=$(git diff --diff-filter=d --name-only origin/$BRANCH)
+ CHANGES=$(git diff --diff-filter=d --name-only origin/$BRANCH...)
for ROOT in $PKG_ROOTS; do
for CHANGE in $CHANGES; do
include $(TOPDIR)/rules.mk
GO_VERSION_MAJOR_MINOR:=1.18
-GO_VERSION_PATCH:=1
+GO_VERSION_PATCH:=2
PKG_NAME:=golang
PKG_VERSION:=$(GO_VERSION_MAJOR_MINOR)$(if $(GO_VERSION_PATCH),.$(GO_VERSION_PATCH))
PKG_SOURCE:=go$(PKG_VERSION).src.tar.gz
PKG_SOURCE_URL:=$(GO_SOURCE_URLS)
-PKG_HASH:=efd43e0f1402e083b73a03d444b7b6576bb4c539ac46208b63a916b69aca4088
+PKG_HASH:=2c44d03ea2c34092137ab919ba602f2c261a038d08eb468528a3f3a28e5667e2
PKG_MAINTAINER:=Jeffery To <jeffery.to@gmail.com>
PKG_LICENSE:=BSD-3-Clause
--- /dev/null
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=lua-eco
+PKG_VERSION:=1.0.0
+PKG_RELEASE:=1
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL=https://github.com/zhaojh329/lua-eco/releases/download/v$(PKG_VERSION)
+PKG_HASH:=d9fd04acb4bd64f47a3a3e6a8d30ee1d0860221c5798ca528cf52260470b4155
+
+PKG_MAINTAINER:=Jianhui Zhao <zhaojh329@gmail.com>
+PKG_LICENSE:=MIT
+PKG_LICENSE_FILES:=LICENSE
+
+include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/cmake.mk
+
+define Package/lua-eco
+ TITLE:=A Lua coroutine library
+ SECTION:=lang
+ CATEGORY:=Languages
+ SUBMENU:=Lua
+ URL:=https://github.com/zhaojh329/lua-eco
+ DEPENDS:=+libev
+endef
+
+define Package/lua-eco/description
+ Lua-eco is a Lua coroutine library which was implemented based on IO event.
+endef
+
+define Package/lua-eco/Module
+ TITLE:=$1 support for lua-eco
+ SECTION:=lang
+ CATEGORY:=Languages
+ SUBMENU:=Lua
+ URL:=https://github.com/zhaojh329/lua-eco
+ DEPENDS:=+lua-eco $2
+endef
+
+Package/lua-eco-log=$(call Package/lua-eco/Module,Log utils)
+Package/lua-eco-sys=$(call Package/lua-eco/Module,System utils)
+Package/lua-eco-dns=$(call Package/lua-eco/Module,DNS)
+Package/lua-eco-socket=$(call Package/lua-eco/Module,Socket)
+Package/lua-eco-ssl=$(call Package/lua-eco/Module,SSL,\
+ @(PACKAGE_libopenssl||PACKAGE_libwolfssl||PACKAGE_libmbedtls) \
+ +PACKAGE_libopenssl:libopenssl +PACKAGE_libwolfssl:libwolfssl +PACKAGE_libmbedtls:libmbedtls +PACKAGE_libmbedtls:zlib)
+Package/lua-eco-iw=$(call Package/lua-eco/Module,IW utils,+libmnl)
+Package/lua-eco-ip=$(call Package/lua-eco/Module,IP utils,+libmnl)
+Package/lua-eco-file=$(call Package/lua-eco/Module,File utils)
+Package/lua-eco-ubus=$(call Package/lua-eco/Module,Ubus,+libubus)
+
+CMAKE_OPTIONS += \
+ -DECO_LOG_SUPPORT=O$(if $(CONFIG_PACKAGE_lua-eco-log),N,FF) \
+ -DECO_SYS_SUPPORT=O$(if $(CONFIG_PACKAGE_lua-eco-sys),N,FF) \
+ -DECO_DNS_SUPPORT=O$(if $(CONFIG_PACKAGE_lua-eco-dns),N,FF) \
+ -DECO_SOCKET_SUPPORT=O$(if $(CONFIG_PACKAGE_lua-eco-socket),N,FF) \
+ -DECO_IW_SUPPORT=O$(if $(CONFIG_PACKAGE_lua-eco-iw),N,FF) \
+ -DECO_IP_SUPPORT=O$(if $(CONFIG_PACKAGE_lua-eco-ip),N,FF) \
+ -DECO_FILE_SUPPORT=O$(if $(CONFIG_PACKAGE_lua-eco-file),N,FF) \
+ -DECO_UBUS_SUPPORT=O$(if $(CONFIG_PACKAGE_lua-eco-ubus),N,FF) \
+ -DECO_SSL_SUPPORT=O$(if $(CONFIG_PACKAGE_lua-eco-ssl),N,FF)
+
+ifneq ($(CONFIG_PACKAGE_lua-eco-ssl),)
+ ifneq ($(CONFIG_PACKAGE_libopenssl),)
+ CMAKE_OPTIONS += -DUSE_OPENSSL=ON
+ else
+ ifneq ($(CONFIG_PACKAGE_libwolfssl),)
+ CMAKE_OPTIONS += -DUSE_WOLFSSL=ON
+ else
+ ifneq ($(CONFIG_PACKAGE_libmbedtls),)
+ CMAKE_OPTIONS += -DUSE_MBEDTLS=ON
+ endif
+ endif
+ endif
+endif
+
+define Package/lua-eco/install
+ $(INSTALL_DIR) $(1)/usr/lib/lua
+ $(INSTALL_BIN) $(PKG_BUILD_DIR)/eco.so $(1)/usr/lib/lua
+endef
+
+define Package/lua-eco/Module/install
+ $(INSTALL_DIR) $(1)/usr/lib/lua/eco
+ $(INSTALL_BIN) $(PKG_BUILD_DIR)/$2.so $(1)/usr/lib/lua/eco
+endef
+
+Package/lua-eco-log/install=$(call Package/lua-eco/Module/install,$1,log)
+Package/lua-eco-sys/install=$(call Package/lua-eco/Module/install,$1,sys)
+Package/lua-eco-dns/install=$(call Package/lua-eco/Module/install,$1,dns)
+Package/lua-eco-socket/install=$(call Package/lua-eco/Module/install,$1,socket)
+Package/lua-eco-ssl/install=$(call Package/lua-eco/Module/install,$1,ssl)
+Package/lua-eco-iw/install=$(call Package/lua-eco/Module/install,$1,iw)
+Package/lua-eco-ip/install=$(call Package/lua-eco/Module/install,$1,ip)
+Package/lua-eco-file/install=$(call Package/lua-eco/Module/install,$1,file)
+Package/lua-eco-ubus/install=$(call Package/lua-eco/Module/install,$1,ubus)
+
+$(eval $(call BuildPackage,lua-eco))
+$(eval $(call BuildPackage,lua-eco-log))
+$(eval $(call BuildPackage,lua-eco-sys))
+$(eval $(call BuildPackage,lua-eco-dns))
+$(eval $(call BuildPackage,lua-eco-socket))
+$(eval $(call BuildPackage,lua-eco-ssl))
+$(eval $(call BuildPackage,lua-eco-iw))
+$(eval $(call BuildPackage,lua-eco-ip))
+$(eval $(call BuildPackage,lua-eco-file))
+$(eval $(call BuildPackage,lua-eco-ubus))
include $(TOPDIR)/rules.mk
PKG_NAME:=luaexpat
-PKG_VERSION:=1.3.0
-PKG_RELEASE:=1
+PKG_VERSION:=1.4.1
+PKG_RELEASE:=$(AUTORELEASE)
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://matthewwild.co.uk/projects/luaexpat
-PKG_HASH:=d060397960d87b2c89cf490f330508b7def1a0677bdc120531c571609fc57dc3
+PKG_SOURCE:=$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=https://github.com/lunarmodules/luaexpat/archive/refs/tags
+PKG_HASH:=d528060d45865b44bef7215ef8a440165b668f363a4af53358389f0315a8593c
PKG_CPE_ID:=cpe:/a:matthewwild:luaexpat
include $(TOPDIR)/rules.mk
PKG_NAME:=luasocket
-PKG_SOURCE_DATE:=2019-04-21
-PKG_SOURCE_VERSION:=733af884f1aa18ff469bf3c4d18810e815853211
-PKG_RELEASE:=1
+PKG_VERSION:=3.0.0
+PKG_RELEASE:=$(AUTORELEASE)
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://github.com/diegonehab/luasocket
-PKG_MIRROR_HASH:=60aef7544426cae3e6c7560a6e4ad556a04b879ca0ad0311645b2c513c872128
+PKG_SOURCE:=v$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=https://github.com/lunarmodules/luasocket/archive/refs/tags
+PKG_HASH:=04d98e40edcee7c7c5f83f0e8ba5503d14b56280e20daceee9e34ed7cf8f1b15
PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org>
PKG_LICENSE:=MIT
/*=========================================================================*\
* Internal functions prototypes
\*=========================================================================*/
-@@ -388,6 +391,12 @@ static int opt_ip6_setmembership(lua_Sta
+@@ -389,6 +392,12 @@ static int opt_ip6_setmembership(lua_Sta
if (!lua_isnil(L, -1)) {
if (lua_isnumber(L, -1)) {
val.ipv6mr_interface = (unsigned int) lua_tonumber(L, -1);
+++ /dev/null
---- a/src/makefile
-+++ b/src/makefile
-@@ -174,9 +174,8 @@ SO_linux=so
- O_linux=o
- CC_linux=gcc
- DEF_linux=-DLUASOCKET_$(DEBUG)
--CFLAGS_linux=$(LUAINC:%=-I%) $(DEF) -Wall -Wshadow -Wextra \
-- -Wimplicit -O2 -ggdb3 -fpic
--LDFLAGS_linux=-O -shared -fpic -o
-+CFLAGS_linux=$(LUAINC:%=-I%) $(DEF) -O2
-+LDFLAGS_linux=-O -shared -o
- LD_linux=gcc
- SOCKET_linux=usocket.o
-
PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://github.com/micropython/micropython-lib.git
-PKG_SOURCE_VERSION:=cdd260f0792d04a1ded99171b4c7a2582b7856b4
-PKG_SOURCE_DATE:=20211112
-PKG_MIRROR_HASH:=fea11185756e746e78cfe66dc4fa33830721cd94d726ac7cf4dde2e0a16d5041
+PKG_SOURCE_VERSION:=0c31e0b3d712fcd21982daec8bfca48ad5527a72
+PKG_SOURCE_DATE:=20220324
+PKG_MIRROR_HASH:=fb796c6d648e555e3e5233a3aec84be1692199b2cbae1efd7c22caf2a8c3f8f7
PKG_MAINTAINER:=Jeffery To <jeffery.to@gmail.com>
PKG_LICENSE:=MIT PSF-2.0
include $(TOPDIR)/rules.mk
PKG_NAME:=python3-networkx
-PKG_VERSION:=2.6.3
+PKG_VERSION:=2.8
PKG_RELEASE:=$(AUTORELEASE)
PYPI_NAME:=networkx
-PKG_HASH:=c0946ed31d71f1b732b5aaa6da5a0388a345019af232ce2f49c766e2d6795c51
+PKG_HASH:=4a52cf66aed221955420e11b3e2e05ca44196b4829aab9576d4d439212b0a14f
PKG_LICENSE:=BSD-3-clause
PKG_LICENSE_FILES:=LICENSE.txt
include $(TOPDIR)/rules.mk
PKG_NAME:=cyrus-sasl
-PKG_VERSION:=2.1.27
+PKG_VERSION:=2.1.28
PKG_RELEASE:=$(AUTORELEASE)
PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org>
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=https://www.cyrusimap.org/releases/
-PKG_HASH:=26866b1549b00ffd020f188a43c258017fa1c382b3ddadd8201536f72efb05d5
+PKG_SOURCE_URL:=https://github.com/cyrusimap/cyrus-sasl/releases/download/cyrus-sasl-2.1.28/
+PKG_HASH:=7ccfc6abd01ed67c1a0924b353e526f1b766b21f42d4562ee635a8ebfc5bb38c
PKG_LICENSE:=BSD-4c BSD
PKG_LICENSE_FILES:=COPYING cmulocal/COPYING saslauthd/COPYING
+++ /dev/null
-From dcc9f51cbd4ed622cfb0f9b1c141eb2ffe3b12f1 Mon Sep 17 00:00:00 2001
-From: Quanah Gibson-Mount <quanah@symas.com>
-Date: Tue, 18 Feb 2020 19:05:12 +0000
-Subject: [PATCH] Fix #587
-
-Off by one error in common.c, CVE-2019-19906.
-
-Thanks to Stephan Zeisberg for reporting
----
- lib/common.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/lib/common.c
-+++ b/lib/common.c
-@@ -190,7 +190,7 @@ int _sasl_add_string(char **out, size_t
-
- if (add==NULL) add = "(null)";
-
-- addlen=strlen(add); /* only compute once */
-+ addlen=strlen(add)+1; /* only compute once */
- if (_buf_alloc(out, alloclen, (*outlen)+addlen)!=SASL_OK)
- return SASL_NOMEM;
-
include $(TOPDIR)/rules.mk
PKG_NAME:=hwloc
-PKG_VERSION:=2.6.0
+PKG_VERSION:=2.7.1
PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=https://download.open-mpi.org/release/$(PKG_NAME)/v2.6
-PKG_HASH:=e1f073e44e28c296ff848dead5e9bd6e2426b77f95ead1792358958e859fa83a
+PKG_SOURCE_URL:=https://download.open-mpi.org/release/$(PKG_NAME)/v2.7
+PKG_HASH:=0d4e1d36c3a72c5d61901bfd477337f5a4c7e0a975da57165237d00e35ef528d
PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org>
PKG_LICENSE:=BSD-3-Clause
include $(TOPDIR)/rules.mk
PKG_NAME:=icu4c
-MAJOR_VERSION:=70
+MAJOR_VERSION:=71
MINOR_VERSION:=1
PKG_VERSION:=$(MAJOR_VERSION).$(MINOR_VERSION)
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(MAJOR_VERSION)_$(MINOR_VERSION)-src.tgz
PKG_SOURCE_URL:=https://github.com/unicode-org/icu/releases/download/release-$(MAJOR_VERSION)-$(MINOR_VERSION)
-PKG_HASH:=8d205428c17bf13bb535300669ed28b338a157b1c01ae66d31d0d3e2d47c3fd5
+PKG_HASH:=67a7e6e51f61faf1306b6935333e13b2c48abd8da6d2f46ce6adca24b1e21ebf
PKG_LICENSE:=ICU
PKG_LICENSE_FILES:=LICENSE
if (ut == NULL) {
--- a/tools/toolutil/toolutil.cpp
+++ b/tools/toolutil/toolutil.cpp
-@@ -266,7 +266,7 @@ struct UToolMemory {
+@@ -267,7 +267,7 @@ struct UToolMemory {
char name[64];
int32_t capacity, maxCapacity, size, idx;
void *array;
include $(TOPDIR)/rules.mk
PKG_NAME:=libdaq3
-PKG_VERSION:=3.0.5
+PKG_VERSION:=3.0.7
PKG_RELEASE:=$(AUTORELEASE)
PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org>
PKG_SOURCE:=libdaq-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/snort3/libdaq/tar.gz/v$(PKG_VERSION)?
-PKG_HASH:=4281464c5502037669e69d314b628df863420f590c4999c5b567c8016cd1e658
+PKG_HASH:=e3af1ef17d764294ae428e662f7d2a6187a0085c6e0f15fc230e754a298cabe2
PKG_BUILD_DIR:=$(BUILD_DIR)/libdaq-$(PKG_VERSION)
PKG_FIXUP:=autoreconf
include $(TOPDIR)/rules.mk
PKG_NAME:=libgcrypt
-PKG_VERSION:=1.9.4
+PKG_VERSION:=1.10.1
PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=https://www.gnupg.org/ftp/gcrypt/libgcrypt/
-PKG_HASH:=ea849c83a72454e3ed4267697e8ca03390aee972ab421e7df69dfe42b65caaf7
+PKG_HASH:=ef14ae546b0084cd84259f61a55e07a38c3b53afc0f546bffcef2f01baffe9de
PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org>
PKG_CPE_ID:=cpe:/a:gnupg:libgcrypt
include $(TOPDIR)/rules.mk
PKG_NAME:=libgee
-PKG_VERSION:=0.20.4
+PKG_VERSION:=0.20.5
PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=@GNOME/libgee/0.20
-PKG_HASH:=524c1bf390f9cdda4fbd9a47b269980dc64ab5280f0801b53bc69d782c72de0e
+PKG_HASH:=31863a8957d5a727f9067495cabf0a0889fa5d3d44626e54094331188d5c1518
PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org>
PKG_LICENSE:=LGPL-2.1-or-later
include $(TOPDIR)/rules.mk
PKG_NAME:=libgpg-error
-PKG_VERSION:=1.43
+PKG_VERSION:=1.45
PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=https://mirrors.dotsrc.org/gcrypt/libgpg-error \
http://ring.ksc.gr.jp/archives/net/gnupg/libgpg-error \
https://www.gnupg.org/ftp/gcrypt/libgpg-error
-PKG_HASH:=a9ab83ca7acc442a5bd846a75b920285ff79bdb4e3d34aa382be88ed2c3aebaf
+PKG_HASH:=570f8ee4fb4bff7b7495cff920c275002aea2147e9a1d220c068213267f80a26
PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org>
PKG_LICENSE:=LGPL-2.1-or-later
include $(TOPDIR)/rules.mk
PKG_NAME:=libmbim
-PKG_SOURCE_VERSION:=1.26.2
+PKG_SOURCE_VERSION:=1.26.4
PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://gitlab.freedesktop.org/mobile-broadband/libmbim.git
-PKG_MIRROR_HASH:=47eb6511818271be66336fb67ec97de7925119b09ddbd0ffd06b3f76893a461e
+PKG_MIRROR_HASH:=4963f9135f8ad26165d969d0b2028b00d68243201113c94a2ebe22c4227058a4
PKG_MAINTAINER:=Nicholas Smith <nicholas@nbembedded.com>
include $(TOPDIR)/rules.mk
PKG_NAME:=libqmi
-PKG_SOURCE_VERSION:=1.30.4
+PKG_SOURCE_VERSION:=1.30.6
PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://gitlab.freedesktop.org/mobile-broadband/libqmi.git
-PKG_MIRROR_HASH:=537eae29c36aba9757afd86e48b91c37c3fe3232037ad11fdd426297f6040a6b
+PKG_MIRROR_HASH:=034dc3b9e5ddb1acd9bb8c2a07f3f8a576d47b7f70942b61b82c4dfc8f805186
PKG_MAINTAINER:=Nicholas Smith <nicholas@nbembedded.com>
include $(TOPDIR)/rules.mk
PKG_NAME:=libslirp
-PKG_VERSION:=4.6.1
+PKG_VERSION:=4.7.0
PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE:=$(PKG_NAME)-v$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://gitlab.freedesktop.org/slirp/$(PKG_NAME)/-/archive/v$(PKG_VERSION)
-PKG_HASH:=69ad4df0123742a29cc783b35de34771ed74d085482470df6313b6abeb799b11
+PKG_HASH:=9398f0ec5a581d4e1cd6856b88ae83927e458d643788c3391a39e61b75db3d3b
PKG_INSTALL:=1
PKG_BUILD_PARALLEL:=1
include $(TOPDIR)/rules.mk
PKG_NAME:=openldap
-PKG_VERSION:=2.6.0
+PKG_VERSION:=2.6.2
PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tgz
http://mirror.eu.oneandone.net/software/openldap/openldap-release/ \
http://mirror.switch.ch/ftp/software/mirror/OpenLDAP/openldap-release/ \
https://www.openldap.org/software/download/OpenLDAP/openldap-release/
-PKG_HASH:=b71c580eac573e9aba15d95f33dd4dd08f2ed4f0d7fc09e08ad4be7ed1e41a4f
+PKG_HASH:=81d09345232eb62486ecf5acacd2c56c0c45b4a6c8c066612e7f421a23a1cf87
PKG_LICENSE:=OLDAP-2.8
PKG_LICENSE_FILES:=LICENSE
PKG_CPE_ID:=cpe:/a:openldap:openldap
include $(TOPDIR)/rules.mk
PKG_NAME:=vips
-PKG_VERSION:=8.12.1
+PKG_VERSION:=8.12.2
PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://github.com/libvips/libvips/releases/download/v$(PKG_VERSION)
-PKG_HASH:=474d8439244cd26c504812fd623259f806c32553b38d2a54798c9766135f5a5c
+PKG_HASH:=565252992aff2c7cd10c866c7a58cd57bc536e03924bde29ae0f0cb9e074010b
PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org>
PKG_LICENSE:=LGPL-2.1-or-later
include $(INCLUDE_DIR)/kernel.mk
PKG_NAME:=usb-serial-xr_usb_serial_common
-PKG_SOURCE_DATE:=2017-08-01
-PKG_SOURCE_VERSION:=b8dad8cf15de160afbd9989f880dc74b921a857b
-PKG_RELEASE:=2
+PKG_SOURCE_DATE:=2022-03-30
+PKG_SOURCE_VERSION:=ecc6ebe0141b97942d774e6c6be37a330cc11a74
+PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://github.com/kasbert/epsolar-tracer
-PKG_MIRROR_HASH:=2cf23fec2625480bb4a630f96cd172219d401bd3cf90943394504ea0ba814faf
+PKG_MIRROR_HASH:=487c4259211411d3c435284016f90c6770539c0a6f904f3327f18381a33c23e3
PKG_MAINTAINER:=Daniel Golle <daniel@makrotopia.org>
PKG_LICENSE:=GPL-2.0-or-later
+++ /dev/null
-From e4d127ddc83c5fbd93b9c8e2e4fe63b820ac28b6 Mon Sep 17 00:00:00 2001
-From: David Bauer <mail@david-bauer.net>
-Date: Sat, 22 May 2021 10:37:06 +0200
-Subject: [PATCH] common.c: fix kernel 5.10 builds with CONFIG_PM enabled
-
-Building the xr_usb_serial module fails for Kenel 5.10 with CONFIG_PM
-enabled:
-
-xr_usb_serial_common.c:1574:15: error: 'ASYNCB_INITIALIZED' undeclared
-(first use in this function); did you mean 'RCU_INITIALIZER'?
-
-Use tty_port_initialized in order to determine the status of the TTY
-port. This is compatible with Kernel 5.10 and at least Kernel 5.4.
-
-Signed-off-by: David Bauer <mail@david-bauer.net>
----
- xr_usb_serial_common-1a/xr_usb_serial_common.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
---- a/xr_usb_serial_common-1a/xr_usb_serial_common.c
-+++ b/xr_usb_serial_common-1a/xr_usb_serial_common.c
-@@ -1571,7 +1571,7 @@ static int xr_usb_serial_suspend(struct
- if (cnt)
- return 0;
-
-- if (test_bit(ASYNCB_INITIALIZED, &xr_usb_serial->port.flags))
-+ if (tty_port_initialized(&xr_usb_serial->port))
- stop_data_traffic(xr_usb_serial);
-
- return 0;
-@@ -1592,7 +1592,7 @@ static int xr_usb_serial_resume(struct u
- if (cnt)
- return 0;
-
-- if (test_bit(ASYNCB_INITIALIZED, &xr_usb_serial->port.flags)) {
-+ if (tty_port_initialized(&xr_usb_serial->port)) {
- rv = usb_submit_urb(xr_usb_serial->ctrlurb, GFP_NOIO);
-
- spin_lock_irq(&xr_usb_serial->write_lock);
-@@ -1623,7 +1623,7 @@ static int xr_usb_serial_reset_resume(st
- {
- struct xr_usb_serial *xr_usb_serial = usb_get_intfdata(intf);
- struct tty_struct *tty;
-- if (test_bit(ASYNCB_INITIALIZED, &xr_usb_serial->port.flags)){
-+ if (tty_port_initialized(&xr_usb_serial->port)){
- #if LINUX_VERSION_CODE > KERNEL_VERSION(3, 9, 0)
- tty_port_tty_hangup(&xr_usb_serial->port, false);
- #else
include $(TOPDIR)/rules.mk
PKG_NAME:=dovecot
-PKG_VERSION:=2.3.16
+PKG_VERSION:=2.3.18
PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://dovecot.org/releases/2.3
-PKG_HASH:=03a71d53055bd9ec528d55e07afaf15c09dec9856cba734904bfd05acbc6cf12
+PKG_HASH:=06e73f668c6c093c45bdeeeb7c20398ab8dc49317234f4b5781ac5e2cc5d6c33
PKG_MAINTAINER:=Lucian Cristian <lucian.cristian@gmail.com>
PKG_LICENSE:=LGPL-2.1-only MIT BSD-3-Clause
include $(TOPDIR)/rules.mk
PKG_NAME:=dovecot-pigeonhole
-PKG_VERSION_PLUGIN:=0.5.16
+PKG_VERSION_PLUGIN:=0.5.18
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:=$(AUTORELEASE)
PKG_SOURCE:=dovecot-$(DOVECOT_VERSION)-pigeonhole-$(PKG_VERSION_PLUGIN).tar.gz
PKG_SOURCE_URL:=https://pigeonhole.dovecot.org/releases/$(DOVECOT_VERSION)
-PKG_HASH:=5ca36780e23b99e6206440f1b3fe3c6598eda5b699b99cebb15d418ba3c6e938
+PKG_HASH:=a6d828f8d6f2decba5105343ece5c7a65245bd94e46a8ae4432a6d97543108a5
PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org>
PKG_LICENSE:=LGPL-2.1-or-later
include $(TOPDIR)/rules.mk
PKG_NAME:=gst1-libav
-PKG_VERSION:=1.18.5
+PKG_VERSION:=1.20.2
PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE:=gst-libav-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=https://gstreamer.freedesktop.org/src/gst-libav
-PKG_HASH:=822e008a910e9dd13aedbdd8dc63fedef4040c0ee2e927bab3112e9de693a548
+PKG_HASH:=b5c531dd8413bf771c79dab66b8e389f20b3991f745115133f0fa0b8e32809f9
PKG_BUILD_DIR:=$(BUILD_DIR)/gst-libav-$(PKG_VERSION)
PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org> \
+++ /dev/null
---- a/meson.build
-+++ b/meson.build
-@@ -202,5 +202,5 @@ endif
-
- configure_file(output: 'config.h', configuration: cdata)
-
--python3 = import('python').find_installation()
-+python3 = 'python3'
- run_command(python3, '-c', 'import shutil; shutil.copy("hooks/pre-commit.hook", ".git/hooks/pre-commit")')
+++ /dev/null
-From 6ea56e7fd39c48e718a10b6e69ec214532789a59 Mon Sep 17 00:00:00 2001
-From: Xi Ruoyao <xry111@mengyan1223.wang>
-Date: Mon, 17 Jan 2022 01:33:47 +0800
-Subject: [PATCH] gst-libav: fix build with ffmpeg-5.0.0
-
-Latest ffmpeg has removed avcodec_get_context_defaults(), and its
-documentation says a new AVCodecContext should be allocated for this
-purpose. The pointer returned by avcodec_find_decoder() is now
-const-qualified so we also need to adjust for it. And, AVCOL_RANGE_MPEG
-is now rejected with strict_std_compliance > FF_COMPLIANCE_UNOFFICIAL.
-
-Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1531>
----
- ext/libav/gstavauddec.c | 22 ++++------
- ext/libav/gstavaudenc.c | 40 +++++++++----------
- .../gst-libav/ext/libav/gstavcodecmap.c | 7 ++--
- ext/libav/gstavutils.c | 2 +-
- ext/libav/gstavviddec.c | 28 +++++--------
- ext/libav/gstavvidenc.c | 21 +++++-----
- 6 files changed, 54 insertions(+), 66 deletions(-)
-
---- a/ext/libav/gstavauddec.c
-+++ b/ext/libav/gstavauddec.c
-@@ -168,12 +168,7 @@ gst_ffmpegauddec_finalize (GObject * obj
- GstFFMpegAudDec *ffmpegdec = (GstFFMpegAudDec *) object;
-
- av_frame_free (&ffmpegdec->frame);
--
-- if (ffmpegdec->context != NULL) {
-- gst_ffmpeg_avcodec_close (ffmpegdec->context);
-- av_free (ffmpegdec->context);
-- ffmpegdec->context = NULL;
-- }
-+ avcodec_free_context (&ffmpegdec->context);
-
- G_OBJECT_CLASS (parent_class)->finalize (object);
- }
-@@ -193,14 +188,12 @@ gst_ffmpegauddec_close (GstFFMpegAudDec
- gst_ffmpeg_avcodec_close (ffmpegdec->context);
- ffmpegdec->opened = FALSE;
-
-- if (ffmpegdec->context->extradata) {
-- av_free (ffmpegdec->context->extradata);
-- ffmpegdec->context->extradata = NULL;
-- }
-+ av_freep (&ffmpegdec->context->extradata);
-
- if (reset) {
-- if (avcodec_get_context_defaults3 (ffmpegdec->context,
-- oclass->in_plugin) < 0) {
-+ avcodec_free_context (&ffmpegdec->context);
-+ ffmpegdec->context = avcodec_alloc_context3 (oclass->in_plugin);
-+ if (ffmpegdec->context == NULL) {
- GST_DEBUG_OBJECT (ffmpegdec, "Failed to set context defaults");
- return FALSE;
- }
-@@ -219,8 +212,9 @@ gst_ffmpegauddec_start (GstAudioDecoder
- oclass = (GstFFMpegAudDecClass *) (G_OBJECT_GET_CLASS (ffmpegdec));
-
- GST_OBJECT_LOCK (ffmpegdec);
-- gst_ffmpeg_avcodec_close (ffmpegdec->context);
-- if (avcodec_get_context_defaults3 (ffmpegdec->context, oclass->in_plugin) < 0) {
-+ avcodec_free_context (&ffmpegdec->context);
-+ ffmpegdec->context = avcodec_alloc_context3 (oclass->in_plugin);
-+ if (ffmpegdec->context == NULL) {
- GST_DEBUG_OBJECT (ffmpegdec, "Failed to set context defaults");
- GST_OBJECT_UNLOCK (ffmpegdec);
- return FALSE;
---- a/ext/libav/gstavaudenc.c
-+++ b/ext/libav/gstavaudenc.c
-@@ -175,10 +175,8 @@ gst_ffmpegaudenc_finalize (GObject * obj
-
- /* clean up remaining allocated data */
- av_frame_free (&ffmpegaudenc->frame);
-- gst_ffmpeg_avcodec_close (ffmpegaudenc->context);
-- gst_ffmpeg_avcodec_close (ffmpegaudenc->refcontext);
-- av_free (ffmpegaudenc->context);
-- av_free (ffmpegaudenc->refcontext);
-+ avcodec_free_context (&ffmpegaudenc->context);
-+ avcodec_free_context (&ffmpegaudenc->refcontext);
-
- G_OBJECT_CLASS (parent_class)->finalize (object);
- }
-@@ -193,9 +191,9 @@ gst_ffmpegaudenc_start (GstAudioEncoder
- ffmpegaudenc->opened = FALSE;
- ffmpegaudenc->need_reopen = FALSE;
-
-- gst_ffmpeg_avcodec_close (ffmpegaudenc->context);
-- if (avcodec_get_context_defaults3 (ffmpegaudenc->context,
-- oclass->in_plugin) < 0) {
-+ avcodec_free_context (&ffmpegaudenc->context);
-+ ffmpegaudenc->context = avcodec_alloc_context3 (oclass->in_plugin);
-+ if (ffmpegaudenc->context == NULL) {
- GST_DEBUG_OBJECT (ffmpegaudenc, "Failed to set context defaults");
- return FALSE;
- }
-@@ -241,10 +239,10 @@ gst_ffmpegaudenc_set_format (GstAudioEnc
-
- /* close old session */
- if (ffmpegaudenc->opened) {
-- gst_ffmpeg_avcodec_close (ffmpegaudenc->context);
-+ avcodec_free_context (&ffmpegaudenc->context);
- ffmpegaudenc->opened = FALSE;
-- if (avcodec_get_context_defaults3 (ffmpegaudenc->context,
-- oclass->in_plugin) < 0) {
-+ ffmpegaudenc->context = avcodec_alloc_context3 (oclass->in_plugin);
-+ if (ffmpegaudenc->context == NULL) {
- GST_DEBUG_OBJECT (ffmpegaudenc, "Failed to set context defaults");
- return FALSE;
- }
-@@ -286,11 +284,11 @@ gst_ffmpegaudenc_set_format (GstAudioEnc
- /* open codec */
- if (gst_ffmpeg_avcodec_open (ffmpegaudenc->context, oclass->in_plugin) < 0) {
- gst_caps_unref (allowed_caps);
-- gst_ffmpeg_avcodec_close (ffmpegaudenc->context);
-+ avcodec_free_context (&ffmpegaudenc->context);
- GST_DEBUG_OBJECT (ffmpegaudenc, "avenc_%s: Failed to open FFMPEG codec",
- oclass->in_plugin->name);
-- if (avcodec_get_context_defaults3 (ffmpegaudenc->context,
-- oclass->in_plugin) < 0)
-+ ffmpegaudenc->context = avcodec_alloc_context3 (oclass->in_plugin);
-+ if (ffmpegaudenc->context == NULL)
- GST_DEBUG_OBJECT (ffmpegaudenc, "Failed to set context defaults");
-
- if ((oclass->in_plugin->capabilities & AV_CODEC_CAP_EXPERIMENTAL) &&
-@@ -312,10 +310,10 @@ gst_ffmpegaudenc_set_format (GstAudioEnc
-
- if (!other_caps) {
- gst_caps_unref (allowed_caps);
-- gst_ffmpeg_avcodec_close (ffmpegaudenc->context);
-+ avcodec_free_context (&ffmpegaudenc->context);
- GST_DEBUG ("Unsupported codec - no caps found");
-- if (avcodec_get_context_defaults3 (ffmpegaudenc->context,
-- oclass->in_plugin) < 0)
-+ ffmpegaudenc->context = avcodec_alloc_context3 (oclass->in_plugin);
-+ if (ffmpegaudenc->context == NULL)
- GST_DEBUG_OBJECT (ffmpegaudenc, "Failed to set context defaults");
- return FALSE;
- }
-@@ -331,10 +329,10 @@ gst_ffmpegaudenc_set_format (GstAudioEnc
-
- if (!gst_audio_encoder_set_output_format (GST_AUDIO_ENCODER (ffmpegaudenc),
- icaps)) {
-- gst_ffmpeg_avcodec_close (ffmpegaudenc->context);
-+ avcodec_free_context (&ffmpegaudenc->context);
- gst_caps_unref (icaps);
-- if (avcodec_get_context_defaults3 (ffmpegaudenc->context,
-- oclass->in_plugin) < 0)
-+ ffmpegaudenc->context = avcodec_alloc_context3 (oclass->in_plugin);
-+ if (ffmpegaudenc->context == NULL)
- GST_DEBUG_OBJECT (ffmpegaudenc, "Failed to set context defaults");
- return FALSE;
- }
-@@ -403,8 +401,8 @@ buffer_info_free (void *opaque, guint8 *
- gst_buffer_unmap (info->buffer, &info->map);
- gst_buffer_unref (info->buffer);
- } else {
-- av_free (info->ext_data);
-- av_free (info->ext_data_array);
-+ av_freep (&info->ext_data);
-+ av_freep (&info->ext_data_array);
- }
- g_slice_free (BufferInfo, info);
- }
---- a/ext/libav/gstavcodecmap.c
-+++ b/ext/libav/gstavcodecmap.c
-@@ -2331,7 +2331,7 @@ gst_ffmpeg_codecid_to_caps (enum AVCodec
- }
-
- if (buildcaps) {
-- AVCodec *codec;
-+ const AVCodec *codec;
-
- if ((codec = avcodec_find_decoder (codec_id)) ||
- (codec = avcodec_find_encoder (codec_id))) {
-@@ -2975,6 +2975,7 @@ gst_ffmpeg_videoinfo_to_context (GstVide
- context->color_range = AVCOL_RANGE_JPEG;
- } else {
- context->color_range = AVCOL_RANGE_MPEG;
-+ context->strict_std_compliance = FF_COMPLIANCE_UNOFFICIAL;
- }
- }
-
-@@ -4330,7 +4331,7 @@ gst_ffmpeg_caps_to_codecid (const GstCap
- audio = TRUE;
- } else if (!strncmp (mimetype, "audio/x-gst-av-", 15)) {
- gchar ext[16];
-- AVCodec *codec;
-+ const AVCodec *codec;
-
- if (strlen (mimetype) <= 30 &&
- sscanf (mimetype, "audio/x-gst-av-%s", ext) == 1) {
-@@ -4342,7 +4343,7 @@ gst_ffmpeg_caps_to_codecid (const GstCap
- }
- } else if (!strncmp (mimetype, "video/x-gst-av-", 15)) {
- gchar ext[16];
-- AVCodec *codec;
-+ const AVCodec *codec;
-
- if (strlen (mimetype) <= 30 &&
- sscanf (mimetype, "video/x-gst-av-%s", ext) == 1) {
---- a/ext/libav/gstavutils.c
-+++ b/ext/libav/gstavutils.c
-@@ -36,7 +36,7 @@
- const gchar *
- gst_ffmpeg_get_codecid_longname (enum AVCodecID codec_id)
- {
-- AVCodec *codec;
-+ const AVCodec *codec;
- /* Let's use what ffmpeg can provide us */
-
- if ((codec = avcodec_find_decoder (codec_id)) ||
---- a/ext/libav/gstavviddec.c
-+++ b/ext/libav/gstavviddec.c
-@@ -320,12 +320,7 @@ gst_ffmpegviddec_finalize (GObject * obj
- GstFFMpegVidDec *ffmpegdec = (GstFFMpegVidDec *) object;
-
- av_frame_free (&ffmpegdec->picture);
--
-- if (ffmpegdec->context != NULL) {
-- gst_ffmpeg_avcodec_close (ffmpegdec->context);
-- av_free (ffmpegdec->context);
-- ffmpegdec->context = NULL;
-- }
-+ avcodec_free_context (&ffmpegdec->context);
-
- G_OBJECT_CLASS (parent_class)->finalize (object);
- }
-@@ -363,13 +358,11 @@ gst_ffmpegviddec_close (GstFFMpegVidDec
-
- gst_buffer_replace (&ffmpegdec->palette, NULL);
-
-- if (ffmpegdec->context->extradata) {
-- av_free (ffmpegdec->context->extradata);
-- ffmpegdec->context->extradata = NULL;
-- }
-+ av_freep (&ffmpegdec->context->extradata);
- if (reset) {
-- if (avcodec_get_context_defaults3 (ffmpegdec->context,
-- oclass->in_plugin) < 0) {
-+ avcodec_free_context (&ffmpegdec->context);
-+ ffmpegdec->context = avcodec_alloc_context3 (oclass->in_plugin);
-+ if (ffmpegdec->context == NULL) {
- GST_DEBUG_OBJECT (ffmpegdec, "Failed to set context defaults");
- return FALSE;
- }
-@@ -1704,7 +1697,7 @@ gst_ffmpegviddec_video_frame (GstFFMpegV
- if (side_data) {
- GST_LOG_OBJECT (ffmpegdec,
- "Found CC side data of type AV_FRAME_DATA_A53_CC, size %d",
-- side_data->size);
-+ (int) side_data->size);
- GST_MEMDUMP ("A53 CC", side_data->data, side_data->size);
-
- /* do not add closed caption meta if it already exists */
-@@ -1966,8 +1959,9 @@ gst_ffmpegviddec_start (GstVideoDecoder
- oclass = (GstFFMpegVidDecClass *) (G_OBJECT_GET_CLASS (ffmpegdec));
-
- GST_OBJECT_LOCK (ffmpegdec);
-- gst_ffmpeg_avcodec_close (ffmpegdec->context);
-- if (avcodec_get_context_defaults3 (ffmpegdec->context, oclass->in_plugin) < 0) {
-+ avcodec_free_context (&ffmpegdec->context);
-+ ffmpegdec->context = avcodec_alloc_context3 (oclass->in_plugin);
-+ if (ffmpegdec->context == NULL) {
- GST_DEBUG_OBJECT (ffmpegdec, "Failed to set context defaults");
- GST_OBJECT_UNLOCK (ffmpegdec);
- return FALSE;
-@@ -2261,10 +2255,10 @@ gst_ffmpegviddec_get_property (GObject *
-
- switch (prop_id) {
- case PROP_LOWRES:
-- g_value_set_enum (value, ffmpegdec->context->lowres);
-+ g_value_set_enum (value, ffmpegdec->lowres);
- break;
- case PROP_SKIPFRAME:
-- g_value_set_enum (value, ffmpegdec->context->skip_frame);
-+ g_value_set_enum (value, ffmpegdec->skip_frame);
- break;
- case PROP_DIRECT_RENDERING:
- g_value_set_boolean (value, ffmpegdec->direct_rendering);
---- a/ext/libav/gstavvidenc.c
-+++ b/ext/libav/gstavvidenc.c
-@@ -224,8 +224,8 @@ gst_ffmpegvidenc_finalize (GObject * obj
- av_frame_free (&ffmpegenc->picture);
- gst_ffmpeg_avcodec_close (ffmpegenc->context);
- gst_ffmpeg_avcodec_close (ffmpegenc->refcontext);
-- av_free (ffmpegenc->context);
-- av_free (ffmpegenc->refcontext);
-+ av_freep (&ffmpegenc->context);
-+ av_freep (&ffmpegenc->refcontext);
-
- G_OBJECT_CLASS (parent_class)->finalize (object);
- }
-@@ -247,10 +247,10 @@ gst_ffmpegvidenc_set_format (GstVideoEnc
-
- /* close old session */
- if (ffmpegenc->opened) {
-- gst_ffmpeg_avcodec_close (ffmpegenc->context);
-+ avcodec_free_context (&ffmpegenc->context);
- ffmpegenc->opened = FALSE;
-- if (avcodec_get_context_defaults3 (ffmpegenc->context,
-- oclass->in_plugin) < 0) {
-+ ffmpegenc->context = avcodec_alloc_context3 (oclass->in_plugin);
-+ if (ffmpegenc->context == NULL) {
- GST_DEBUG_OBJECT (ffmpegenc, "Failed to set context defaults");
- return FALSE;
- }
-@@ -454,9 +454,9 @@ bad_input_fmt:
- }
- close_codec:
- {
-- gst_ffmpeg_avcodec_close (ffmpegenc->context);
-- if (avcodec_get_context_defaults3 (ffmpegenc->context,
-- oclass->in_plugin) < 0)
-+ avcodec_free_context (&ffmpegenc->context);
-+ ffmpegenc->context = avcodec_alloc_context3 (oclass->in_plugin);
-+ if (ffmpegenc->context == NULL)
- GST_DEBUG_OBJECT (ffmpegenc, "Failed to set context defaults");
- goto cleanup_stats_in;
- }
-@@ -896,8 +896,9 @@ gst_ffmpegvidenc_start (GstVideoEncoder
- ffmpegenc->need_reopen = FALSE;
-
- /* close old session */
-- gst_ffmpeg_avcodec_close (ffmpegenc->context);
-- if (avcodec_get_context_defaults3 (ffmpegenc->context, oclass->in_plugin) < 0) {
-+ avcodec_free_context (&ffmpegenc->context);
-+ ffmpegenc->context = avcodec_alloc_context3 (oclass->in_plugin);
-+ if (ffmpegenc->context == NULL) {
- GST_DEBUG_OBJECT (ffmpegenc, "Failed to set context defaults");
- return FALSE;
- }
include $(TOPDIR)/rules.mk
PKG_NAME:=gst1-plugins-bad
-PKG_VERSION:=1.18.5
+PKG_VERSION:=1.20.2
PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE:=gst-plugins-bad-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=http://gstreamer.freedesktop.org/src/gst-plugins-bad/
-PKG_HASH:=a164923b94f0d08578a6fcaeaac6e0c05da788a46903a1086870e9ca45ad678e
+PKG_HASH:=4adc4c05f41051f8136b80cda99b0d049a34e777832f9fea7c5a70347658745b
PKG_BUILD_DIR:=$(BUILD_DIR)/gst-plugins-bad-$(PKG_VERSION)
PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org> \
-Dfluidsynth=disabled \
-Dgl=disabled \
-Dgme=disabled \
+ -Dgpl=enabled \
-Dgsm=disabled \
-Dipcpipeline=disabled \
-Diqa=disabled \
-Dkms=disabled \
-Dladspa=disabled \
-Dlibde265=disabled \
- -Dlibmms=disabled \
-Dlv2=disabled \
-Dmediafoundation=disabled \
-Dmicrodns=disabled \
-Dmusepack=disabled \
-Dneon=disabled \
-Dnvcodec=disabled \
- -Dofa=disabled \
-Dopenal=disabled \
-Dopenexr=disabled \
-Dopenh264=disabled \
--- a/meson.build
+++ b/meson.build
-@@ -441,7 +441,7 @@ gst_plugins_bad_args = ['-DHAVE_CONFIG_H
+@@ -468,7 +468,7 @@ gst_plugins_bad_args = ['-DHAVE_CONFIG_H
configinc = include_directories('.')
libsinc = include_directories('gst-libs')
include $(TOPDIR)/rules.mk
PKG_NAME:=gst1-plugins-base
-PKG_VERSION:=1.18.5
+PKG_VERSION:=1.20.2
PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE:=gst-plugins-base-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=https://gstreamer.freedesktop.org/src/gst-plugins-base
-PKG_HASH:=960b7af4585700db0fdd5b843554e11e2564fed9e061f591fae88a7be6446fa3
+PKG_HASH:=ab0656f2ad4d38292a803e0cb4ca090943a9b43c8063f650b4d3e3606c317f17
PKG_BUILD_DIR:=$(BUILD_DIR)/gst-plugins-base-$(PKG_VERSION)
PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org> \
$(eval $(call GstBuildLibrary,riff,RIFF media,audio tag,,))
$(eval $(call GstBuildLibrary,rtp,RTP,,))
$(eval $(call GstBuildLibrary,rtsp,RTSP,,))
-$(eval $(call GstBuildLibrary,sdp,SDP,rtp,))
+$(eval $(call GstBuildLibrary,sdp,SDP,pbutils rtp,))
$(eval $(call GstBuildLibrary,tag,tag support,,))
$(eval $(call GstBuildLibrary,video,video,,))
--- a/meson.build
+++ b/meson.build
-@@ -431,7 +431,7 @@ if get_option('default_library') == 'sha
- plugins_pkgconfig_install_dir = disabler()
- endif
+@@ -457,7 +457,7 @@ pkgconfig_subdirs = ['gstreamer-1.0']
+
+ meson_pkg_config_file_fixup_script = find_program('scripts/meson-pkg-config-file-fixup.py')
-python3 = import('python').find_installation()
+python3 = 'python3'
include $(TOPDIR)/rules.mk
PKG_NAME:=gst1-plugins-good
-PKG_VERSION:=1.18.5
+PKG_VERSION:=1.20.2
PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE:=gst-plugins-good-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=https://gstreamer.freedesktop.org/src/gst-plugins-good/
-PKG_HASH:=3aaeeea7765fbf8801acce4a503a9b05f73f04e8a35352e9d00232cfd555796b
+PKG_HASH:=83589007bf002b8f9ef627718f308c16d83351905f0db8e85c3060f304143aae
PKG_BUILD_DIR:=$(BUILD_DIR)/gst-plugins-good-$(PKG_VERSION)
PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org> \
--- a/meson.build
+++ b/meson.build
-@@ -422,7 +422,7 @@ endif
+@@ -441,7 +441,7 @@ endif
presetdir = join_paths(get_option('datadir'), 'gstreamer-' + api_version, 'presets')
include $(TOPDIR)/rules.mk
PKG_NAME:=gst1-plugins-ugly
-PKG_VERSION:=1.18.5
+PKG_VERSION:=1.20.2
PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE:=gst-plugins-ugly-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=https://gstreamer.freedesktop.org/src/gst-plugins-ugly
-PKG_HASH:=df32803e98f8a9979373fa2ca7e05e62f977b1097576d3a80619d9f5c69f66d9
+PKG_HASH:=b43fb4df94459afbf67ec22003ca58ffadcd19e763f276dca25b64c848adb7bf
PKG_BUILD_DIR:=$(BUILD_DIR)/gst-plugins-ugly-$(PKG_VERSION)
PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org> \
-Dsidplay=disabled \
-Dx264=disabled \
\
+ -Dgpl=enabled \
-Dnls=enabled \
-Dorc=disabled \
-Dtests=disabled \
--- a/meson.build
+++ b/meson.build
-@@ -257,7 +257,7 @@ if get_option('default_library') == 'sha
- plugins_pkgconfig_install_dir = disabler()
- endif
+@@ -279,7 +279,7 @@ endif
+
+ gpl_allowed = get_option('gpl').allowed()
-python3 = import('python').find_installation()
+python3 = 'python3'
+
subdir('gst')
subdir('ext')
- subdir('tests')
include $(TOPDIR)/rules.mk
PKG_NAME:=gstreamer1
-PKG_VERSION:=1.18.5
+PKG_VERSION:=1.20.2
PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE:=gstreamer-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=https://gstreamer.freedesktop.org/src/gstreamer
-PKG_HASH:=55862232a63459bbf56abebde3085ca9aec211b478e891dacea4d6df8cafe80a
+PKG_HASH:=df24e8792691a02dfe003b3833a51f1dbc6c3331ae625d143b17da939ceb5e0a
PKG_BUILD_DIR:=$(BUILD_DIR)/gstreamer-$(PKG_VERSION)
PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org> \
-Dexamples=disabled \
-Dbenchmarks=disabled \
-Dtools=enabled \
- -Dgtk_doc=disabled \
-Dintrospection=disabled \
-Dnls=enabled \
-Dgobject-cast-checks=disabled \
--- a/gst/gstplugin.c
+++ b/gst/gstplugin.c
-@@ -790,15 +790,8 @@ _priv_gst_plugin_load_file_for_registry
+@@ -851,15 +851,8 @@ _priv_gst_plugin_load_file_for_registry
}
#endif
--- a/meson.build
+++ b/meson.build
-@@ -522,7 +522,7 @@ if get_option('default_library') == 'sta
+@@ -528,7 +528,7 @@ if get_option('default_library') == 'sta
endif
# Used in gst/parse/meson.build and below
PKG_NAME:=adblock
PKG_VERSION:=4.1.3
-PKG_RELEASE:=8
+PKG_RELEASE:=9
PKG_LICENSE:=GPL-3.0-or-later
PKG_MAINTAINER:=Dirk Brenken <dev@brenken.org>
| energized | | VAR | compilation | [Link](https://energized.pro) |
| firetv_tracking | | S | tracking | [Link](https://github.com/Perflyst/PiHoleBlocklist) |
| games_tracking | | S | tracking | [Link](https://www.gameindustry.eu) |
-| hblock | | XL | compilation | [Link](https://hblock.molinero.dev) |
+| hblock | | XL | compilation | [Link](https://hblock.molinero.dev) |
| notracking | | XL | tracking | [Link](https://github.com/notracking/hosts-blocklists) |
| oisd_basic | | L | general | [Link](https://oisd.nl) |
+| oisd_nsfw | | XL | general | [Link](https://oisd.nl) |
| oisd_full | | XXL | general | [Link](https://oisd.nl) |
| openphish | | S | phishing | [Link](https://openphish.com) |
| phishing_army | | S | phishing | [Link](https://phishing.army) |
| reg_fr | | S | reg_france | [Link](https://forums.lanik.us/viewforum.php?f=91) |
| reg_id | | M | reg_indonesia | [Link](https://easylist.to) |
| reg_it | | M | reg_italy | [Link](https://easylist.to) |
-| reg_kr | | S | reg_korea | [Link](https://list-kr.github.io) |
+| reg_kr | | S | reg_korea | [Link](https://github.com/List-KR/List-KR) |
| reg_nl | | M | reg_netherlands | [Link](https://easylist.to) |
| reg_pl1 | | S | reg_poland | [Link](https://kadantiscam.netlify.com) |
| reg_pl2 | | S | reg_poland | [Link](https://www.certyficate.it) |
"focus": "general",
"descurl": "https://oisd.nl"
},
+ "oisd_nsfw": {
+ "url": "https://dbl.oisd.nl/nsfw/",
+ "rule": "/^([[:alnum:]_-]{1,63}\\.)+[[:alpha:]]+([[:space:]]|$)/{print tolower($1)}",
+ "size": "XL",
+ "focus": "general",
+ "descurl": "https://oisd.nl"
+ },
"oisd_full": {
"url": "https://dbl.oisd.nl",
"rule": "/^([[:alnum:]_-]{1,63}\\.)+[[:alpha:]]+([[:space:]]|$)/{print tolower($1)}",
"descurl": "https://easylist.to"
},
"reg_kr": {
- "url": "https://raw.githubusercontent.com/List-KR/List-KR/master/filters-share/adserver.txt",
+ "url": "https://raw.githubusercontent.com/List-KR/List-KR/master/filters-share/adservice.txt",
"rule": "BEGIN{FS=\"[|^]\"}/^\\|\\|([[:alnum:]_-]{1,63}\\.)+[[:alpha:]]+\\^(\\$third-party)?$/{print tolower($3)}",
"size": "S",
"focus": "reg_korea",
- "descurl": "https://list-kr.github.io"
+ "descurl": "https://github.com/List-KR/List-KR"
},
"reg_nl": {
"url": "https://easylist-downloads.adblockplus.org/easylistdutch+easylist.txt",
include $(TOPDIR)/rules.mk
PKG_NAME:=cloudflared
-PKG_VERSION:=2022.5.0
+PKG_VERSION:=2022.5.1
PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/cloudflare/cloudflared/tar.gz/$(PKG_VERSION)?
-PKG_HASH:=65ad3379f21736fbbda6bd95f23860af9491274fd25b75780ccd9693b332a3f0
+PKG_HASH:=9ddf09100b3c9ee8c1a0cf0ba3d5ff85ee04987bfa51e885a32dec83df5dfee2
PKG_LICENSE:=Apache-2.0
PKG_LICENSE_FILES:=LICENSE
include $(TOPDIR)/rules.mk
PKG_NAME:=dawn
-PKG_SOURCE_DATE:=2022-01-17
+PKG_SOURCE_DATE:=2022-05-09
PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://github.com/berlin-open-wireless-lab/DAWN.git
-PKG_SOURCE_VERSION:=7a72674063dd34bd21f39c7be8aadb867db67658
-PKG_MIRROR_HASH:=4fbca0139c8c3fc08bf430887c9f0835d6b4645cc316b96f2d58c2d8ceb89f24
+PKG_SOURCE_VERSION:=2bfd7397e1ad2a814a0aa4b38d66b2bbba79f5ba
+PKG_MIRROR_HASH:=275dd2f4c8670833cb82fec7bc96a9bd068b6ee27498eda1a9f92ff960678570
PKG_MAINTAINER:=Nick Hainke <vincent@systemli.org>
PKG_LICENSE:=GPL-2.0-only
PKG_NAME:=ddns-scripts
PKG_VERSION:=2.8.2
-PKG_RELEASE:=23
+PKG_RELEASE:=24
PKG_LICENSE:=GPL-2.0
+++ /dev/null
-{
- "name": "mydns.jp",
- "ipv4": {
- "url": "http://www.mydns.jp/directip.html?MID=[USERNAME]&PWD=[PASSWORD]&IPV4ADDR=[IP]"
- },
- "ipv6": {
- "url": "http://www.mydns.jp/directip.html?MID=[USERNAME]&PWD=[PASSWORD]&IPV6ADDR=[IP]"
- }
-}
--- /dev/null
+{
+ "name": "mydns.jp",
+ "ipv4": {
+ "url": "http://www.mydns.jp/directip.html?MID=[USERNAME]&PWD=[PASSWORD]&IPV4ADDR=[IP]"
+ },
+ "ipv6": {
+ "url": "http://www.mydns.jp/directip.html?MID=[USERNAME]&PWD=[PASSWORD]&IPV6ADDR=[IP]"
+ }
+}
joker.com
loopia.se
moniker.com
-mydns.ip
+mydns.jp
myip.co.ua
myonlineportal.net
mythic-beasts.com
include $(TOPDIR)/rules.mk
PKG_NAME:=dmapd
-PKG_VERSION:=0.0.86
-PKG_RELEASE:=1
+PKG_VERSION:=0.0.91
+PKG_RELEASE:=$(AUTORELEASE)
PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org>
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://www.flyn.org/projects/dmapd
-PKG_HASH:=9abda655b22b1802932bc13c8c7e18687c51f8f1f3a97974b16fafec0191a053
+PKG_HASH:=494647918e15ef1b6b9aa1e3bff35fad26d0c17e13c65ab87a7b0d3f8ceced02
PKG_INSTALL:=1
PKG_BUILD_PARALLEL:=1
define Package/dmapd
SECTION:=net
CATEGORY:=Network
- DEPENDS:=+libdmapsharing +libdb47 +vips +libgst1pbutils
+ DEPENDS:=+libdmapsharing +libdb47 +vips +libgst1pbutils +totem-pl-parser
TITLE:= dmapd
URL:=http://www.flyn.org/projects/dmapd/
USERID:=dmapd=56:dmapd=56
include $(TOPDIR)/rules.mk
PKG_NAME:=dnsproxy
-PKG_VERSION:=0.42.2
+PKG_VERSION:=0.42.3
PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/AdguardTeam/dnsproxy/tar.gz/v$(PKG_VERSION)?
-PKG_HASH:=399a7a1f7d1afef85d8557bbe445541872bfe005e15c36e242f69b78fa94f1ca
+PKG_HASH:=56ea44289b1178e8663604dbd77831636132def9462f3de3f781d11d14e4a36b
PKG_MAINTAINER:=Tianling Shen <cnsztl@immortalwrt.org>
PKG_LICENSE:=Apache-2.0
include $(TOPDIR)/rules.mk
PKG_NAME:=haproxy
-PKG_VERSION:=2.4.15
+PKG_VERSION:=2.4.16
PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://www.haproxy.org/download/2.4/src
-PKG_HASH:=3958b17b7ee80eb79712aaf24f0d83e753683104b36e282a8b3dcd2418e30082
+PKG_HASH:=8c5533779bb8125ef8dbd56a72b1d3fd47fa6bcdf2d257d3cc001269b059cee9
PKG_MAINTAINER:=Thomas Heil <heil@terminal-consulting.de>, \
Christian Lachner <gladiac@gmail.com>
#!/bin/sh
CLONEURL=https://git.haproxy.org/git/haproxy-2.4.git
-BASE_TAG=v2.4.15
+BASE_TAG=v2.4.16
TMP_REPODIR=tmprepo
PATCHESDIR=patches
include $(TOPDIR)/rules.mk
PKG_NAME:=krb5
-PKG_VERSION:=1.19.2
+PKG_VERSION:=1.19.3
PKG_RELEASE:=$(AUTORELEASE)
PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org>
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://web.mit.edu/kerberos/dist/krb5/1.19
-PKG_HASH:=10453fee4e3a8f8ce6129059e5c050b8a65dab1c257df68b99b3112eaa0cdf6a
+PKG_HASH:=56d04863cfddc9d9eb7af17556e043e3537d41c6e545610778676cf551b9dcd0
PKG_BUILD_PARALLEL:=1
PKG_INSTALL:=1
include $(TOPDIR)/rules.mk
PKG_NAME:=modemmanager
-PKG_SOURCE_VERSION:=1.18.6
+PKG_SOURCE_VERSION:=1.18.8
PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://gitlab.freedesktop.org/mobile-broadband/ModemManager.git
-PKG_MIRROR_HASH:=72f1a865153745d05c482ed3a77f2045d24387f1f9a37177fe7bc35ab7663765
+PKG_MIRROR_HASH:=a9347149ade61f3b4befd9cda105b0d997079d11fd228177c2a4a5557f3166ec
PKG_MAINTAINER:=Nicholas Smith <nicholas@nbembedded.com>
PKG_LICENSE:=GPL-2.0-or-later
$(CP) $(PKG_INSTALL_DIR)/usr/lib/ModemManager/libmm-shared-*.so* $(1)/usr/lib/ModemManager
$(CP) $(PKG_INSTALL_DIR)/usr/lib/ModemManager/libmm-plugin-*.so* $(1)/usr/lib/ModemManager
+ $(INSTALL_DIR) $(1)/usr/lib/ModemManager/connection.d
+ $(INSTALL_BIN) ./files/10-report-down $(1)/usr/lib/ModemManager/connection.d
+
$(INSTALL_DIR) $(1)/etc/dbus-1/system.d
$(INSTALL_CONF) $(PKG_INSTALL_DIR)/etc/dbus-1/system.d/org.freedesktop.ModemManager1.conf $(1)/etc/dbus-1/system.d
$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/share/ModemManager/*.conf $(1)/usr/share/ModemManager
$(INSTALL_DATA) ./files/modemmanager.common $(1)/usr/share/ModemManager
+ $(INSTALL_DIR) $(1)/usr/share/ModemManager/fcc-unlock.available.d
+ $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/share/ModemManager/fcc-unlock.available.d/* $(1)/usr/share/ModemManager/fcc-unlock.available.d
+
$(INSTALL_DIR) $(1)/etc/init.d
$(INSTALL_BIN) ./files/modemmanager.init $(1)/etc/init.d/modemmanager
--- /dev/null
+#!/bin/sh
+
+# SPDX-License-Identifier: CC0-1.0
+# 2022 Aleksander Morgado <aleksander@aleksander.es>
+#
+# Automatically report to netifd that the underlying modem
+# is really disconnected
+#
+# require program name and at least 4 arguments
+[ $# -lt 4 ] && exit 1
+
+MODEM_PATH="$1"
+BEARER_PATH="$2"
+INTERFACE="$3"
+STATE="$4"
+
+[ "${STATE}" = "disconnected" ] || exit 0
+
+. /usr/share/ModemManager/modemmanager.common
+. /lib/netifd/netifd-proto.sh
+INCLUDE_ONLY=1 . /lib/netifd/proto/modemmanager.sh
+
+MODEM_STATUS=$(mmcli --modem="${MODEM_PATH}" --output-keyvalue)
+[ -n "${MODEM_STATUS}" ] || exit 1
+
+MODEM_DEVICE=$(modemmanager_get_field "${MODEM_STATUS}" "modem.generic.device")
+[ -n "${MODEM_DEVICE}" ] || exit 2
+
+CFG=$(mm_get_modem_config "${MODEM_DEVICE}")
+[ -n "${CFG}" ] || exit 3
+
+logger -t "modemmanager" "interface ${CFG} (network device ${INTERFACE}) ${STATE}"
+proto_init_update $INTERFACE 0
+proto_send_update $CFG
+exit 0
+++ /dev/null
---- a/plugins/broadmobi/mm-plugin-broadmobi.c
-+++ b/plugins/broadmobi/mm-plugin-broadmobi.c
-@@ -19,7 +19,6 @@
- #define _LIBMM_INSIDE_MM
- #include <libmm-glib.h>
-
--#include "mm-port-enums-types.h"
- #include "mm-log-object.h"
- #include "mm-plugin-broadmobi.h"
- #include "mm-broadband-modem.h"
---- a/plugins/dlink/mm-plugin-dlink.c
-+++ b/plugins/dlink/mm-plugin-dlink.c
-@@ -19,7 +19,6 @@
- #define _LIBMM_INSIDE_MM
- #include <libmm-glib.h>
-
--#include "mm-port-enums-types.h"
- #include "mm-log-object.h"
- #include "mm-plugin-dlink.h"
- #include "mm-broadband-modem.h"
---- a/plugins/meson.build
-+++ b/plugins/meson.build
-@@ -461,7 +461,7 @@ if plugins_options['huawei']
- plugins += {'plugin-huawei': {
- 'plugin': true,
- 'helper': {'sources': files('huawei/mm-modem-helpers-huawei.c'), 'include_directories': plugins_incs + [huawei_inc], 'c_args': common_c_args + ['-DMM_MODULE_NAME="huawei"']},
-- 'module': {'sources': sources + enums_sources, 'include_directories': plugins_incs + [huawei_inc], 'c_args': common_c_args + ['-DMM_MODULE_NAME="huawei"']},
-+ 'module': {'sources': sources + enums_sources + port_enums_sources, 'include_directories': plugins_incs + [huawei_inc], 'c_args': common_c_args + ['-DMM_MODULE_NAME="huawei"']},
- 'test': {'sources': files('huawei/tests/test-modem-helpers-huawei.c') + enums_sources, 'include_directories': huawei_inc, 'dependencies': libhelpers_dep},
- }}
-
---- a/plugins/telit/mm-plugin-telit.c
-+++ b/plugins/telit/mm-plugin-telit.c
-@@ -21,7 +21,6 @@
- #define _LIBMM_INSIDE_MM
- #include <libmm-glib.h>
-
--#include "mm-port-enums-types.h"
- #include "mm-log-object.h"
- #include "mm-modem-helpers.h"
- #include "mm-plugin-telit.h"
---- a/plugins/tplink/mm-plugin-tplink.c
-+++ b/plugins/tplink/mm-plugin-tplink.c
-@@ -19,7 +19,6 @@
- #define _LIBMM_INSIDE_MM
- #include <libmm-glib.h>
-
--#include "mm-port-enums-types.h"
- #include "mm-log-object.h"
- #include "mm-plugin-tplink.h"
- #include "mm-broadband-modem.h"
---- a/src/meson.build
-+++ b/src/meson.build
-@@ -147,15 +147,15 @@ endif
-
- enums_types = 'mm-port-enums-types'
-
--enums_sources = []
--enums_sources += gnome.mkenums(
-+port_enums_sources = []
-+port_enums_sources += gnome.mkenums(
- enums_types + '.c',
- sources: headers,
- c_template: build_aux_dir / enums_types + '.c.template',
- fhead: '#include "mm-port-enums-types.h"',
- )
-
--enums_sources += gnome.mkenums(
-+port_enums_sources += gnome.mkenums(
- enums_types + '.h',
- sources: headers,
- h_template: build_aux_dir / enums_types + '.h.template',
-@@ -165,13 +165,13 @@ enums_sources += gnome.mkenums(
-
- libport = static_library(
- 'port',
-- sources: sources + enums_sources,
-+ sources: sources + port_enums_sources,
- include_directories: top_inc,
- dependencies: deps + private_deps,
- )
-
- libport_dep = declare_dependency(
-- sources: enums_sources[1],
-+ sources: port_enums_sources[1],
- include_directories: '.',
- dependencies: deps,
- link_with: libport,
+++ /dev/null
---- a/plugins/meson.build
-+++ b/plugins/meson.build
-@@ -88,7 +88,7 @@ if plugins_shared['icera']
- plugins += {'shared-icera': {
- 'plugin': false,
- 'helper': {'sources': files('icera/mm-modem-helpers-icera.c'), 'include_directories': plugins_incs, 'c_args': common_c_args},
-- 'module': {'sources': sources, 'include_directories': plugins_incs, 'c_args': common_c_args},
-+ 'module': {'sources': sources + daemon_enums_sources, 'include_directories': plugins_incs, 'c_args': common_c_args},
- 'test': {'sources': files('icera/tests/test-modem-helpers-icera.c'), 'include_directories': plugins_incs + [icera_inc], 'dependencies': libhelpers_dep},
- }}
- endif
-@@ -185,7 +185,7 @@ if plugins_shared['telit']
- plugins += {'shared-telit': {
- 'plugin': false,
- 'helper': {'sources': files('telit/mm-modem-helpers-telit.c'), 'include_directories': plugins_incs, 'c_args': common_c_args},
-- 'module': {'sources': sources, 'include_directories': plugins_incs + [telit_inc], 'c_args': common_c_args},
-+ 'module': {'sources': sources + daemon_enums_sources, 'include_directories': plugins_incs + [telit_inc], 'c_args': common_c_args},
- 'test': {'sources': files('telit/tests/test-mm-modem-helpers-telit.c'), 'include_directories': telit_inc, 'dependencies': libmm_test_common_dep},
- }}
- endif
-@@ -285,7 +285,7 @@ if plugins_options['cinterion']
- plugins += {'plugin-cinterion': {
- 'plugin': true,
- 'helper': {'sources': files('cinterion/mm-modem-helpers-cinterion.c'), 'include_directories': plugins_incs, 'c_args': common_c_args},
-- 'module': {'sources': sources, 'include_directories': plugins_incs, 'c_args': common_c_args},
-+ 'module': {'sources': sources + daemon_enums_sources, 'include_directories': plugins_incs, 'c_args': common_c_args},
- 'test': {'sources': files('cinterion/tests/test-modem-helpers-cinterion.c'), 'include_directories': plugins_incs + [include_directories('cinterion')], 'dependencies': libport_dep},
- }}
-
-@@ -460,8 +460,8 @@ if plugins_options['huawei']
-
- plugins += {'plugin-huawei': {
- 'plugin': true,
-- 'helper': {'sources': files('huawei/mm-modem-helpers-huawei.c'), 'include_directories': plugins_incs + [huawei_inc], 'c_args': common_c_args + ['-DMM_MODULE_NAME="huawei"']},
-- 'module': {'sources': sources + enums_sources + port_enums_sources, 'include_directories': plugins_incs + [huawei_inc], 'c_args': common_c_args + ['-DMM_MODULE_NAME="huawei"']},
-+ 'helper': {'sources': files('huawei/mm-modem-helpers-huawei.c') + daemon_enums_sources, 'include_directories': plugins_incs + [huawei_inc], 'c_args': common_c_args + ['-DMM_MODULE_NAME="huawei"']},
-+ 'module': {'sources': sources + enums_sources + port_enums_sources + daemon_enums_sources, 'include_directories': plugins_incs + [huawei_inc], 'c_args': common_c_args + ['-DMM_MODULE_NAME="huawei"']},
- 'test': {'sources': files('huawei/tests/test-modem-helpers-huawei.c') + enums_sources, 'include_directories': huawei_inc, 'dependencies': libhelpers_dep},
- }}
-
-@@ -534,7 +534,7 @@ if plugins_options['mbm']
- plugins += {'plugin-ericsson-mbm': {
- 'plugin': true,
- 'helper': {'sources': files('mbm/mm-modem-helpers-mbm.c'), 'include_directories': plugins_incs, 'c_args': common_c_args + ['-DMM_MODULE_NAME="ericsson-mbm"']},
-- 'module': {'sources': sources, 'include_directories': plugins_incs, 'c_args': common_c_args + ['-DMM_MODULE_NAME="ericsson-mbm"']},
-+ 'module': {'sources': sources + daemon_enums_sources, 'include_directories': plugins_incs, 'c_args': common_c_args + ['-DMM_MODULE_NAME="ericsson-mbm"']},
- 'test': {'sources': files('mbm/tests/test-modem-helpers-mbm.c'), 'include_directories': plugins_incs + [include_directories('mbm')], 'dependencies': libhelpers_dep},
- }}
-
-@@ -644,7 +644,7 @@ if plugins_options['option-hso']
-
- plugins += {'plugin-option-hso': {
- 'plugin': true,
-- 'module': {'sources': sources, 'include_directories': plugins_incs, 'c_args': '-DMM_MODULE_NAME="option-hso"'},
-+ 'module': {'sources': sources + daemon_enums_sources, 'include_directories': plugins_incs, 'c_args': '-DMM_MODULE_NAME="option-hso"'},
- }}
- endif
-
-@@ -852,7 +852,7 @@ if plugins_options['ublox']
- plugins += {'plugin-ublox': {
- 'plugin': true,
- 'helper': {'sources': files('ublox/mm-modem-helpers-ublox.c'), 'include_directories': plugins_incs, 'c_args': common_c_args},
-- 'module': {'sources': sources, 'include_directories': plugins_incs + [ublox_inc], 'c_args': common_c_args},
-+ 'module': {'sources': sources + daemon_enums_sources, 'include_directories': plugins_incs + [ublox_inc], 'c_args': common_c_args},
- 'test': {'sources': files('ublox/tests/test-modem-helpers-ublox.c'), 'include_directories': ublox_inc, 'dependencies': libmm_test_common_dep},
- }}
-
---- a/src/meson.build
-+++ b/src/meson.build
-@@ -225,14 +225,15 @@ sources = files(
-
- enums_types = 'mm-daemon-enums-types'
-
--sources += gnome.mkenums(
-+daemon_enums_sources = []
-+daemon_enums_sources += gnome.mkenums(
- enums_types + '.c',
- sources: headers,
- c_template: build_aux_dir / enums_types + '.c.template',
- fhead: '#include "mm-daemon-enums-types.h"',
- )
-
--sources += gnome.mkenums(
-+daemon_enums_sources += gnome.mkenums(
- enums_types + '.h',
- sources: headers,
- h_template: build_aux_dir / enums_types + '.h.template',
-@@ -296,7 +297,7 @@ endif
-
- executable(
- 'ModemManager',
-- sources: sources,
-+ sources: sources + daemon_enums_sources,
- include_directories: top_inc,
- dependencies: deps,
- c_args: c_args,
include $(TOPDIR)/rules.mk
PKG_NAME:=nfdump
-PKG_VERSION:=1.6.23
+PKG_VERSION:=1.6.24
PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/phaag/nfdump/tar.gz/v$(PKG_VERSION)?
-PKG_HASH:=8c5a7959e66bb90fcbd8ad508933a14ebde4ccf7f4ae638d8f18c9473c63af33
+PKG_HASH:=11ea7ecba405d57076c321f6f77491f1c64538062630131c98ac62dc4870545e
PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org>
PKG_LICENSE:=BSD-3-Clause
+++ /dev/null
---- a/configure.ac
-+++ b/configure.ac
-@@ -9,7 +9,6 @@ AC_CONFIG_HEADER([config.h])
- AM_INIT_AUTOMAKE([subdir-objects])
-
- # Checks for programs.
--CFLAGS="-g -O3"
- AC_PROG_CC([clang gcc])
- AX_CHECK_C11
- CFLAGS="$CFLAGS -Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wmissing-noreturn -fno-strict-aliasing"
PKG_NAME:=nut
PKG_VERSION:=2.7.4
-PKG_RELEASE:=27
+PKG_RELEASE:=28
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=http://www.networkupstools.org/source/2.7/
echo "[$cfg]" >>"$UPS_C"
get_write_driver_config "$cfg" bus
+ get_write_driver_config "$cfg" cable
get_write_driver_config "$cfg" community
get_write_driver_config "$cfg" desc
get_write_driver_config "$cfg" driver "usbhid-ups"
config OPENCONNECT_OPENSSL
bool "OpenSSL"
+ select OPENSSL_WITH_DEPRECATED
endchoice
include $(TOPDIR)/rules.mk
PKG_NAME:=openconnect
-PKG_VERSION:=8.20
+PKG_VERSION:=9.01
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=ftp://ftp.infradead.org/pub/openconnect/
-PKG_HASH:=c1452384c6f796baee45d4e919ae1bfc281d6c88862e1f646a2cc513fc44e58b
+PKG_HASH:=b3d7faf830e9793299d6a41e81d84cd4a3e2789c148c9e598e4585010090e4c7
PKG_LICENSE:=LGPL-2.1-or-later
PKG_LICENSE_FILES:=COPYING.LGPL
include $(TOPDIR)/rules.mk
PKG_NAME:=privoxy
-PKG_VERSION:=3.0.28
-PKG_RELEASE:=1
+PKG_VERSION:=3.0.33
+PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE:=privoxy-$(PKG_VERSION)-stable-src.tar.gz
PKG_SOURCE_URL:=@SF/ijbswa
-PKG_HASH:=b5d78cc036aaadb3b7cf860e9d598d7332af468926a26e2d56167f1cb6f2824a
+PKG_HASH:=04b104e70dac61561b9dd110684b250fafc8c13dbe437a60fae18ddd9a881fae
PKG_BUILD_DIR:=$(BUILD_DIR)/privoxy-$(PKG_VERSION)-stable
PKG_FIXUP:=autoreconf
PKG_INSTALL:=1
local _PID=$(cat $PIDFILE 2>/dev/null)
kill -15 $_PID 2>/dev/null
sleep 1 # give time to shutdown
- local _tmp=$(pgrep privoxy | tr "\n" " ")
+ local _tmp=$(pgrep /usr/sbin/privoxy | tr "\n" " ")
if [ -z "$_tmp" ]; then
logger -p daemon.notice -t "privoxy[$_PID]" "Shutdown successfully"
else
include $(TOPDIR)/rules.mk
PKG_NAME:=snort3
-PKG_VERSION:=3.1.18.0
+PKG_VERSION:=3.1.29.0
PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE:=$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://github.com/snort3/snort3/archive/refs/tags/
-PKG_HASH:=6e45c16b1815d832b5d6edcd2b705e7838e25c76bfd54b3e86c55ecba6de420a
+PKG_HASH:=becec36b57af3d65ae8289b73cd6d56bf8bde774539c74b35b0ec2262a587281
PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org>
PKG_LICENSE:=GPL-2.0-only
--- a/src/network_inspectors/appid/appid_inspector.cc
+++ b/src/network_inspectors/appid/appid_inspector.cc
-@@ -66,7 +66,6 @@ static THREAD_LOCAL PacketTracer::Tracer
+@@ -68,7 +68,6 @@ static THREAD_LOCAL PacketTracer::Tracer
// should probably be done outside of appid
static void openssl_cleanup()
{
+++ /dev/null
---- /dev/null
-+++ b/cmake/FindAtomic.cmake
-@@ -0,0 +1,11 @@
-+find_library(ATOMIC_LIBRARIES NAMES atomic
-+ HINTS ${ATOMIC_LIBRARIES_DIR_HINT})
-+
-+include(FindPackageHandleStandardArgs)
-+find_package_handle_standard_args(Atomic DEFAULT_MSG ATOMIC_LIBRARIES)
-+
-+mark_as_advanced(ATOMIC_LIBRARIES)
-+
-+if (ATOMIC_LIBRARIES)
-+ set(HAVE_ATOMIC "1")
-+endif()
---- a/cmake/include_libraries.cmake
-+++ b/cmake/include_libraries.cmake
-@@ -15,6 +15,7 @@ if (ENABLE_UNIT_TESTS)
- endif (ENABLE_UNIT_TESTS)
-
- # optional libraries
-+find_package(Atomic QUIET)
- find_package(LibLZMA QUIET)
- find_package(Asciidoc QUIET)
- find_package(DBLATEX QUIET)
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -116,6 +116,14 @@ else ()
- DAQ Modules: Dynamic")
- endif ()
-
-+if (HAVE_ATOMIC)
-+ message("\
-+ libatomic: ON")
-+else ()
-+ message("\
-+ libatomic: OFF")
-+endif ()
-+
- if (HAVE_FLATBUFFERS)
- message("\
- Flatbuffers: ON")
---- a/configure_cmake.sh
-+++ b/configure_cmake.sh
-@@ -108,6 +108,8 @@ Optional Packages:
- libhs include directory
- --with-hyperscan-libraries=DIR
- libhs library directory
-+ --with-atomic-libraries=DIR
-+ atomic library directory
- --with-flatbuffers-includes=DIR
- flatbuffers include directory
- --with-flatbuffers-libraries=DIR
-@@ -447,6 +449,9 @@ while [ $# -ne 0 ]; do
- --with-hyperscan-libraries=*)
- append_cache_entry HS_LIBRARIES_DIR PATH $optarg
- ;;
-+ --with-atomic-libraries=*)
-+ append_cache_entry ATOMIC_LIBRARIES_DIR_HINT PATH $optarg
-+ ;;
- --with-flatbuffers-includes=*)
- append_cache_entry FLATBUFFERS_INCLUDE_DIR_HINT PATH $optarg
- ;;
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -25,6 +25,10 @@ set(EXTERNAL_INCLUDES
- ${ZLIB_INCLUDE_DIRS}
- )
-
-+if ( HAVE_ATOMIC )
-+ LIST(APPEND EXTERNAL_LIBRARIES ${ATOMIC_LIBRARIES})
-+endif()
-+
- if ( ENABLE_STATIC_DAQ )
- LIST(APPEND EXTERNAL_LIBRARIES ${DAQ_STATIC_MODULE_LIBS})
- endif ()
PKG_NAME:=softflowd
PKG_VERSION:=1.0.0
-PKG_RELEASE:=2
+PKG_RELEASE:=3
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/irino/softflowd/tar.gz/softflowd-$(PKG_VERSION)?
option tracking_level 'full'
option track_ipv6 '0'
option sampling_rate '100'
+ option filter ''
[ "$enabled" -gt 0 ] || return 1
config_get pid_file "$section" 'pid_file'
+ config_get filter "$section" 'filter'
args=""
append_string "$section" 'interface' '-i'
append_bool "$section" track_ipv6 '-6'
procd_open_instance
- procd_set_param command /usr/sbin/softflowd -d $args${pid_file:+ -p $pid_file}
+ procd_set_param command /usr/sbin/softflowd -d $args${pid_file:+ -p $pid_file} "$filter"
procd_set_param respawn
procd_close_instance
}
local startaction
local if_id
local rekeytime
+ local rekeybytes
+ local lifebytes
+ local rekeypackets
+ local lifepackets
config_get startaction "$1" startaction "route"
config_get local_nat "$1" local_nat ""
config_get interface "$1" interface ""
config_get hw_offload "$1" hw_offload ""
config_get priority "$1" priority ""
+ config_get rekeybytes "$1" rekeybytes ""
+ config_get lifebytes "$1" lifebytes ""
+ config_get rekeypackets "$1" rekeypackets ""
+ config_get lifepackets "$1" lifepackets ""
config_list_foreach "$1" local_subnet append_var local_subnet ","
config_list_foreach "$1" remote_subnet append_var remote_subnet ","
swanctl_xappend4 "life_time = $(seconds2time $(((110 * $(time2seconds $rekeytime)) / 100)))"
fi
[ -n "$rekeytime" ] && swanctl_xappend4 "rekey_time = $rekeytime"
+ if [ -n "$lifebytes" ]; then
+ swanctl_xappend4 "life_bytes = $lifebytes"
+ elif [ -n "$rekeybytes" ]; then
+ swanctl_xappend4 "life_bytes = $(((110 * rekeybytes) / 100))"
+ fi
+ [ -n "$rekeybytes" ] && swanctl_xappend4 "rekey_bytes = $rekeybytes"
+ if [ -n "$lifepackets" ]; then
+ swanctl_xappend4 "life_packets = $lifepackets"
+ elif [ -n "$rekeypackets" ]; then
+ swanctl_xappend4 "life_packets = $(((110 * rekeypackets) / 100))"
+ fi
+ [ -n "$rekeypackets" ] && swanctl_xappend4 "rekey_packets = $rekeypackets"
[ -n "$inactivity" ] && swanctl_xappend4 "inactivity = $inactivity"
[ -n "$updown" ] && swanctl_xappend4 "updown = $updown"
include $(TOPDIR)/rules.mk
PKG_NAME:=tailscale
-PKG_VERSION:=1.18.2
+PKG_VERSION:=1.24.2
PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE:=tailscale-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/tailscale/tailscale/tar.gz/v$(PKG_VERSION)?
-PKG_HASH:=57206181868299027689651b6cd133627acad0c8c38f0151f469ab36d4130012
+PKG_HASH:=f1fe7770b4e372ace47c5b0ac4cbe21af95c3a6fb1828ee4f407fcfe35b7958f
PKG_MAINTAINER:=Jan Pavlinec <jan.pavlinec1@gmail.com>
PKG_LICENSE:=BSD-3-Clause
include $(TOPDIR)/rules.mk
PKG_NAME:=xfrpc
-PKG_VERSION:=1.04.515
+PKG_VERSION:=1.05.548
PKG_RELEASE:=1
PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://github.com/liudf0716/xfrpc.git
PKG_SOURCE_VERSION:=$(PKG_VERSION)
-PKG_MIRROR_HASH:=1fd9b3dc9a38236dfd5bf4a8ad908d370820b4841f111b3078c5994bdaf3273e
+PKG_MIRROR_HASH:=67e0db1ea3986fdde6073db269a50fdf660cd97f4c21bfd8f2d4923a519e630e
PKG_MAINTAINER:=Dengfeng Liu <liudf0716@gmail.com>
PKG_LICENSE:=GPL-3.0-or-later
option loglevel 7
config xfrpc 'common'
- option server_addr 127.0.0.1
+ option server_addr frps_ip_address
option server_port 7000
- option auth_token abdesf13d
config xfrpc 'ssh01'
option type tcp
option local_ip 127.0.0.1
option local_port 22
option remote_port 6000
-
-#config xfrpc 'ftp01'
-# option type ftp
-# option local_ip 127.0.01
-# option local_port 21
-# option remote_port 8021
-# option remote_data_port 8022
#config xfrpc 'web01'
# option type http
# option local_ip 127.0.0.1
# option local_port 8080
+# option custom_domains your_domain_name
#config xfrpc 'web02'
# option type https
# option local_ip 127.0.0.1
# option local_port 8443
+# option custom_domains your_domain_name
handle_type() {
uci_validate_section xfrpc xfrpc "$name" \
- 'type:or("tcp", "udp", "ftp", "http", "https")' \
+ 'type:or("tcp", "http", "https")' \
'local_ip:ipaddr:127.0.0.1' \
'local_port:uinteger'
echo "local_ip = $local_ip" >> "$config"
echo "local_port = $local_port" >> "$config"
case "$type" in
- "tcp"|"udp")
+ tcp)
config_get remote_port "$name" remote_port
echo "remote_port = $remote_port" >> "$config"
;;
- "ftp")
- config_get remote_port "$name" remote_port
- config_get remote_data_port "$name" remote_data_port
- echo "remote_port = $remote_port" >> "$config"
- echo "remote_data_port = $remote_data_port" >> "$config"
+ http|https)
+ config_get custom_domains "$name" custom_domains
+ echo "custom_domains = $custom_domains" >> "$config"
;;
esac
}
if [ "$name" = "common" ]; then
uci_validate_section xfrpc xfrpc "$name" \
'server_addr:ipaddr' \
- 'server_port:uinteger' \
- 'auth_token:string'
+ 'server_port:uinteger'
- [ -z "$auth_token" ] && {
- echo "no auth_token"
- exit
- }
echo "server_addr = $server_addr" >> "$config"
echo "server_port = $server_port" >> "$config"
- echo "auth_token = $auth_token" >> "$config"
else
handle_type
fi
PKG_FIXUP:=autoreconf
include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/nls.mk
define Package/bluez-tools
SECTION:=Utilities
include $(TOPDIR)/rules.mk
PKG_NAME:=cni
-PKG_VERSION:=1.0.1
+PKG_VERSION:=1.1.0
PKG_RELEASE:=$(AUTORELEASE)
PKG_LICENSE:=Apache-2.0
PKG_LICENSE_FILES:=LICENSE
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://github.com/containernetworking/$(PKG_NAME)/archive/v$(PKG_VERSION)
-PKG_HASH:=0e5376f70fb36c26935ddfb90b0da69736592ba8b577fbfb904750034c053d3b
+PKG_HASH:=d06305d6daf271838964c00591ddc53a9cc506e1e249b435ec31b0ea3353cbc5
PKG_MAINTAINER:=Daniel Golle <daniel@makrotopia.org>, Paul Spooren <mail@aparcar.org>, Oskari Rauta <oskari.rauta@gmail.com>
include $(TOPDIR)/rules.mk
PKG_NAME:=containerd
-PKG_VERSION:=1.5.11
+PKG_VERSION:=1.6.4
PKG_RELEASE:=1
PKG_LICENSE:=Apache-2.0
PKG_LICENSE_FILES:=LICENSE
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/containerd/containerd/tar.gz/v${PKG_VERSION}?
-PKG_HASH:=02b79d5e2b07b5e64cd28f1fe84395ee11eef95fc49fd923a9ab93022b148be6
-PKG_SOURCE_VERSION:=3df54a852345ae127d1fa3092b95168e4a88e2f8
+PKG_HASH:=f422e21e35705d1e741c1f3280813e43f811eaff4dcc5cdafac8b8952b15f468
PKG_MAINTAINER:=Gerard Ryan <G.M0N3Y.2503@gmail.com>
MAKE_VARS += $(GO_PKG_VARS)
MAKE_FLAGS += \
VERSION=$(PKG_VERSION) \
- REVISION=$(PKG_SOURCE_VERSION)
+ REVISION=$(PKG_SOURCE_VERSION) \
+ PREFIX=""
ifeq ($(CONFIG_SELINUX),y)
MAKE_FLAGS += BUILDTAGS='selinux'
include $(TOPDIR)/rules.mk
PKG_NAME:=crun
-PKG_VERSION:=1.4.2
+PKG_VERSION:=1.4.5
PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://github.com/containers/crun.git
-PKG_SOURCE_DATE:=2022-03-02
-PKG_SOURCE_VERSION:=c677a1cfc04f24499513a743b828a8d9db6d95ce
-PKG_MIRROR_HASH:=7f5084aac03afa7685ea240e8e47551c42cfa40a33e5ced5ef40cb0c3f587fb6
+PKG_SOURCE_DATE:=2022-05-09
+PKG_SOURCE_VERSION:=85649a8c561f7fbf018e5c5640a7e9370c80ce73
+PKG_MIRROR_HASH:=69b7db70fc13d16244609bbbd5240792519810a60d9f68ba6d5ed3def1b23fe9
PKG_BUILD_DEPENDS:=argp-standalone
PKG_BUILD_PARALLEL:=1
include $(TOPDIR)/rules.mk
PKG_NAME:=docker
-PKG_VERSION:=20.10.14
+PKG_VERSION:=20.10.16
PKG_RELEASE:=$(AUTORELEASE)
PKG_LICENSE:=Apache-2.0
PKG_LICENSE_FILES:=LICENSE
PKG_GIT_URL:=github.com/docker/cli
PKG_GIT_REF:=v$(PKG_VERSION)
PKG_SOURCE_URL:=https://codeload.$(PKG_GIT_URL)/tar.gz/$(PKG_GIT_REF)?
-PKG_HASH:=bda289b27b18675d6a6ff07568453768fe68c16c27b5e52724e46896d5464a55
-PKG_GIT_SHORT_COMMIT:=a224086 # SHA1 used within the docker executables
+PKG_HASH:=af34131b1f08a068906336092a4dc3dfd8921c8039528cb698b32491951c33e2
+PKG_GIT_SHORT_COMMIT:=aa7e414 # SHA1 used within the docker executables
PKG_MAINTAINER:=Gerard Ryan <G.M0N3Y.2503@gmail.com>
+config DOCKER_CHECK_CONFIG
+ bool "Installs check-config.sh with dependencies"
+ default n
+ depends on PACKAGE_dockerd
+ select PACKAGE_bash
+ select PACKAGE_kmod-ikconfig
+
# These options are mostly specified by https://github.com/moby/moby/blob/master/contrib/check-config.sh
config DOCKER_CGROUP_OPTIONS
menu "Storage"
depends on PACKAGE_dockerd
+ config DOCKER_STO_DEVMAPPER
+ bool "Enables support for devmapper snapshotting"
+ default n
+ select PACKAGE_libdevmapper
+
config DOCKER_STO_EXT4
bool "Enables support for ext3 or ext4 as the backing filesystem"
default n
bool "Enables support for btrfs as the backing filesystem"
default n
select KERNEL_BTRFS_FS_POSIX_ACL
+ select PACKAGE_btrfs-progs
endmenu
include $(TOPDIR)/rules.mk
PKG_NAME:=dockerd
-PKG_VERSION:=20.10.14
+PKG_VERSION:=20.10.16
PKG_RELEASE:=$(AUTORELEASE)
PKG_LICENSE:=Apache-2.0
PKG_LICENSE_FILES:=LICENSE
PKG_GIT_URL:=github.com/moby/moby
PKG_GIT_REF:=v$(PKG_VERSION)
PKG_SOURCE_URL:=https://codeload.$(PKG_GIT_URL)/tar.gz/$(PKG_GIT_REF)?
-PKG_HASH:=dbe1ae342351108b7b30232c4bce0559c81ad9fb6c978d7c8425d6aa53e476c1
-PKG_GIT_SHORT_COMMIT:=87a90dc # SHA1 used within the docker executables
+PKG_HASH:=2cd69e2cc67053300aa8d78988c92fd63ea0d0d84fe2071597191a149d5548f8
+PKG_GIT_SHORT_COMMIT:=f756502 # SHA1 used within the docker executables
PKG_MAINTAINER:=Gerard Ryan <G.M0N3Y.2503@gmail.com>
CATEGORY:=Utilities
TITLE:=Docker Community Edition Daemon
URL:=https://www.docker.com/
- DEPENDS:=$(GO_ARCH_DEPENDS) +btrfs-progs +ca-certificates +containerd +libdevmapper +libnetwork +tini \
- +KERNEL_SECCOMP:libseccomp +iptables-mod-extra +kmod-br-netfilter +kmod-ikconfig +kmod-nf-conntrack-netlink +kmod-nf-ipvs \
- +kmod-nf-nat +kmod-veth +iptables-legacy +iptables-mod-nat-extra
+ DEPENDS:=$(GO_ARCH_DEPENDS) \
+ +ca-certificates \
+ +containerd \
+ +iptables \
+ +iptables-mod-extra \
+ +IPV6:ip6tables \
+ +IPV6:kmod-ipt-nat6 \
+ +KERNEL_SECCOMP:libseccomp \
+ +kmod-ipt-nat \
+ +kmod-ipt-physdev \
+ +kmod-nf-ipvs \
+ +kmod-veth \
+ +libnetwork \
+ +tini \
+ +uci-firewall
USERID:=docker:docker
MENU:=1
endef
$(INSTALL_BIN) $(PKG_BUILD_DIR)/bundles/binary-daemon/dockerd $(1)/usr/bin/
$(INSTALL_DIR) $(1)/opt/docker/
+
+ ifeq ($(CONFIG_DOCKER_CHECK_CONFIG),y)
$(INSTALL_DIR) $(1)/usr/share/docker/
$(INSTALL_BIN) $(PKG_BUILD_DIR)/contrib/check-config.sh $(1)/usr/share/docker/
+ endif
$(INSTALL_DIR) $(1)/etc/init.d
$(INSTALL_BIN) ./files/dockerd.init $(1)/etc/init.d/dockerd
# list registry_mirrors 'https://<my-docker-mirror-host>'
# list registry_mirrors 'https://hub.docker.com'
-# Docker ignores fw3 rules and by default all external source IPs are allowed to connect to the Docker host.
+# Docker doesn't work well out of the box with fw4. This is because Docker relies on a compatibility layer that
+# naively translates iptables rules. For the best compatibility replace the following dependencies:
+# `firewall4` -> `firewall`
+# `iptables-nft` -> `iptables-legacy`
+# `ip6tables-nft` -> `ip6tables-legacy`
+
+# Docker undermines the fw3 rules. By default all external source IPs are allowed to connect to the Docker host.
# See https://docs.docker.com/network/iptables/ for more details.
+
# firewall config changes are only additive i.e firewall will need to be restarted first to clear old changes,
# then docker restarted to load in new changes.
config firewall 'firewall'
--- /dev/null
+#
+# Copyright (C) 2022 Nita Vesa
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=hexedit
+PKG_VERSION:=1.6
+PKG_RELEASE:=1
+
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=https://github.com/pixel/hexedit.git
+PKG_SOURCE_VERSION:=$(PKG_VERSION)
+PKG_MIRROR_HASH:=138f8aff0466a33f33be43e25e7a47ba48216c0b2d41cbb6cc23ca848bd8a564
+
+PKG_LICENSE:=GPL-2.0-or-later
+PKG_LICENSE_FILES:=COPYING
+PKG_MAINTAINER:=Nita Vesa <werecatf@outlook.com>
+
+PKG_INSTALL:=1
+PKG_BUILD_PARALLEL:=1
+PKG_FIXUP:=autoreconf
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/hexedit
+ TITLE:=Viewer and editor in hexadecimal or ASCII
+ SUBMENU:=Editors
+ SECTION:=utils
+ CATEGORY:=Utilities
+ URL:=http://rigaux.org/hexedit.html
+ DEPENDS:=+libncurses
+endef
+
+define Package/hexedit/description
+ Viewer and editor in hexadecimal or ASCII for files or devices
+
+ hexedit shows a target both in hexadecimal and in ASCII. This target can be
+ a device or a file. You can edit the target and search through it. There are
+ also copy&paste and save to file functions. Is allowed truncating or appending
+ to the target. All modifications are shown in bold.
+
+ hexedit is ideal to edit or inspect very large files or devices, as hard disks
+ or its partitions, flash drives, etc. These elements will not be wholly read
+ because hexedit loads a piece at a time.
+
+ hexedit can be used by programmers in several activities. It also is useful
+ for debugging, forensics investigations and recovering from digital disasters.
+endef
+
+define Package/hexedit/install
+ $(INSTALL_DIR) $(1)/usr/bin
+ $(CP) $(PKG_INSTALL_DIR)/usr/bin/hexedit $(1)/usr/bin/
+endef
+
+$(eval $(call BuildPackage,hexedit))
PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://$(GO_PKG)
-PKG_SOURCE_VERSION:=64b7a4574d1426139437d20e81c0b6d391130ec8
-PKG_SOURCE_DATE:=2021-05-25
-PKG_MIRROR_HASH:=4e3463c3d723a7a9b9d682515084e667feb24ca297cfbc05ce1768bed6249752
+PKG_SOURCE_VERSION:=339b972b464ee3d401b5788b2af9e31d09d6b7da
+PKG_SOURCE_DATE:=2022-03-16
+PKG_MIRROR_HASH:=0f99357acc839619d108d358da09e288fd741f299fe5cf500bb5e8267f64aad1
PKG_MAINTAINER:=Gerard Ryan <G.M0N3Y.2503@gmail.com>
$(INSTALL_BIN) ./files/lxc-auto.init $(1)/etc/init.d/lxc-auto
endef
+define Package/lxc-auto/postinst
+[ "$${PKG_UPGRADE}" = "0" ] && /etc/init.d/lxc-auto boot
+endef
+
define Package/lxc-common/conffiles
/etc/lxc/default.conf
/etc/lxc/lxc.conf
include $(TOPDIR)/rules.mk
PKG_NAME:=miniflux
-PKG_VERSION:=2.0.35
+PKG_VERSION:=2.0.36
PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/miniflux/v2/tar.gz/${PKG_VERSION}?
-PKG_HASH:=8f9693380754072d1a74671c6b645abe7ddb0c8d22651ebc867b1af6dfcc4229
+PKG_HASH:=15ac4ad4ab6f87de2143a85f52252e80d7c216a69aab334363e1972b81f231fd
PKG_MAINTAINER:=Michal Vasilek <michal.vasilek@nic.cz>
PKG_LICENSE:=Apache-2.0
PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://git.kernel.org/pub/scm/utils/mmc/mmc-utils.git
-PKG_SOURCE_DATE:=2022-02-11
-PKG_SOURCE_VERSION:=4303889c8bd9a2357587eb6ebacecb70098a264d
-PKG_MIRROR_HASH:=b204fa4417dac01b4a17b3db41ef9bfe77b4fc85a5a0762004872e5dcb039b2f
+PKG_SOURCE_DATE:=2022-04-17
+PKG_SOURCE_VERSION:=b7e4d5a6ae9942d26a11de9b05ae7d52c0802802
+PKG_MIRROR_HASH:=7865294ec7619d6696bb06a6e2ad4a3803a0bfbd9754b7d0d617bfb30ab828a1
PKG_LICENSE:=GPL-2.0-only
PKG_LICENSE_FILES:=
#
-# Copyright (C) 2016 Rafał Miłecki <rafal@milecki.pl>
+# Copyright (C) 2022 Oskari Rauta <oskari.rauta@gmail.com>
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
include $(TOPDIR)/rules.mk
PKG_NAME:=nsutils
-PKG_VERSION:=0.2
+BASE_VERSION:=0.2
PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://github.com/rd235/nsutils.git
-PKG_SOURCE_DATE:=2022-02-27
-PKG_SOURCE_VERSION:=d70867d11d455c19aece0c75791dae5c40b88ca6
-PKG_MIRROR_HASH:=94b33cde9240bad9803e2c796437d59c57405e3da95cdb762c9ba8fe041e9643
+PKG_SOURCE_DATE:=2022-05-13
+PKG_SOURCE_VERSION:=d6570bdec8435dfc781b95f6b404dedf965294dd
+PKG_MIRROR_HASH:=3f058b7bf0c1b941f0039a7951ffa053f6f0ecf89abdc3d6cbceb4824d52b0de
+
+PKG_VERSION:=$(BASE_VERSION)-$(PKG_SOURCE_DATE)-$(call version_abbrev,$(PKG_SOURCE_VERSION))
-PKG_FIXUP:=autoreconf
PKG_MAINTAINER:=Oskari Rauta <oskari.rauta@gmail.com>
PKG_LICENSE:=GPL-2.0-only
PKG_LICENSE_FILES:=COPYING
include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/cmake.mk
define Package/nsutils
SECTION:=utils
CATEGORY:=Utilities
TITLE:=Linux namespace utilities
- DEPENDS:=+libbsd +libcap
+ DEPENDS:=+libcap
+ URL:=https://github.com/rd235/nsutils
endef
define Package/nsutils/description
include $(TOPDIR)/rules.mk
PKG_NAME:=podman
-PKG_VERSION:=4.0.2
+PKG_VERSION:=4.1.0
PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://github.com/containers/podman/archive/v$(PKG_VERSION)
-PKG_HASH:=cac4328b0a5e618f4f6567944e255d15fad3e1f7901df55603f1efdd7aaeda95
+PKG_HASH:=f814e12a7311d486c1ccdc4eb021bc6dd24499569de7a572e436342876f70e95
PKG_LICENSE:=Apache-2.0
PKG_LICENSE_FILES:=LICENSE
CATEGORY:=Utilities
TITLE:=Podman
URL:=https://podman.io
- DEPENDS:=$(GO_ARCH_DEPENDS) +conmon +cni +cni-plugins +btrfs-progs +glib2 +gnupg2 +uci-firewall +libgpg-error +libseccomp +libgpgme +nsenter +zoneinfo-simple +kmod-veth +catatonit +PODMAN_SELINUX_SUPPORT:libselinux +PODMAN_IPTABLES_FW:iptables
+ DEPENDS:=$(GO_ARCH_DEPENDS) +conmon +cni +cni-plugins +btrfs-progs +glib2 +gnupg2 +uci-firewall +libgpg-error +libseccomp +libgpgme +nsenter +zoneinfo-simple +kmod-veth +catatonit +PODMAN_SELINUX_SUPPORT:libselinux
endef
define Package/podman/description
include $(TOPDIR)/rules.mk
PKG_NAME:=runc
-PKG_VERSION:=1.0.3
+PKG_VERSION:=1.1.1
PKG_RELEASE:=1
PKG_LICENSE:=Apache-2.0
PKG_LICENSE_FILES:=LICENSE
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/opencontainers/runc/tar.gz/v${PKG_VERSION}?
-PKG_HASH:=0eaf2f6606d72f166a5e7138a8a8d4d8f85d84e43448c08c66a1c93ead17a574
-PKG_SOURCE_VERSION:=f46b6ba2c9314cfc8caae24a32ec5fe9ef1059fe
+PKG_HASH:=11a34535c108b36fd59de58e7bef3a130444c9ea41e4b8bb8f8d4654c8ad654c
PKG_MAINTAINER:=Gerard Ryan <G.M0N3Y.2503@gmail.com>
include $(TOPDIR)/rules.mk
PKG_NAME:=slirp4netns
-PKG_VERSION:=1.1.12
+PKG_VERSION:=1.2.0
PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://github.com/rootless-containers/slirp4netns/archive/v$(PKG_VERSION)
-PKG_HASH:=279dfe58a61b9d769f620b6c0552edd93daba75d7761f7c3742ec4d26aaa2962
+PKG_HASH:=b584edde686d3cfbac210cbdb93c4b0ba5d8cc0a6a4d92b9dfc3c5baec99c727
PKG_MAINTAINER:=Oskari Rauta <oskari.rauta@gmail.com>
PKG_LICENSE:=GPL-2.0-or-later
include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/cmake.mk
+define Download/argp-cmake
+ URL:=@GITHUB/alehaa/CMake-argp/e7e77e68d062708edf055f944d3094b0ce0b11b8/cmake
+ FILE:=Findargp.cmake
+ HASH:=b74e961260d17bc9af868be59053e50739dc94e06cbe73e3fced414a070a29fd
+endef
+
+define Build/Prepare
+ $(eval $(call Download,argp-cmake))
+ $(Build/Prepare/Default)
+ $(CP) $(DL_DIR)/Findargp.cmake $(PKG_BUILD_DIR)/cmake/
+endef
+
define Package/telldus-core
SECTION:=utils
CATEGORY:=Utilities
std::string ProtocolIkea::getStringForMethod(int method, unsigned char level, Controller *) {
const char B1[] = {84, 84, 0};
- const char B0[] = {170, 0};
-+ const char B0[] = {(char)170, 0};
++ const char B0[] = {char(170), 0};
int intSystem = this->getIntParameter(L"system", 1, 16)-1;
int intFadeStyle = TelldusCore::comparei(this->getStringParameter(L"fade", L"true"), L"true");
const unsigned char S = 59, L = 169;
const char B0[] = {S, S, 0};
- const char B1[] = {S, L, 0};
-+ const char B1[] = {S, (char)L, 0};
++ const char B1[] = {S, char(L), 0};
const unsigned char START_CODE[] = {'S', 255, 1, 255, 1, 255, 1, 100, 255, 1, 180, 0};
const unsigned char STOP_CODE[] = {S, 0};
--- a/tdadmin/CMakeLists.txt
+++ b/tdadmin/CMakeLists.txt
-@@ -38,8 +38,11 @@ ELSEIF (CMAKE_SYSTEM_NAME MATCHES "FreeB
- ${ARGP_LIBRARY}
+@@ -30,16 +30,11 @@ ELSEIF (APPLE)
+ TARGET_LINK_LIBRARIES(tdadmin
+ TelldusCore
)
+-ELSEIF (CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
+- # FreeBSD does not have argp in base libc; port devel/argp-standalone is required.
+- FIND_LIBRARY(ARGP_LIBRARY argp)
+- TARGET_LINK_LIBRARIES(tdadmin
+- ${CMAKE_BINARY_DIR}/client/libtelldus-core.so
+- ${ARGP_LIBRARY}
+- )
ELSE (WIN32)
-+ # Linux, in this case openwrt that requires argp-standalone
-+ FIND_LIBRARY(ARGP_LIBRARY argp)
++ FIND_PACKAGE(argp)
TARGET_LINK_LIBRARIES(tdadmin
${CMAKE_BINARY_DIR}/client/libtelldus-core.so
-+ ${ARGP_LIBRARY}
++ ${ARGP_LIBRARIES}
)
ENDIF (WIN32)
--- /dev/null
+--- a/service/DeviceManager.cpp
++++ b/service/DeviceManager.cpp
+@@ -74,7 +74,7 @@ void DeviceManager::executeActionEvent()
+ }
+ Log::notice("Execute a TellStick Action for device %i", data->deviceId);
+
+- std::auto_ptr<TelldusCore::MutexLocker> deviceLocker(0);
++ std::unique_ptr<TelldusCore::MutexLocker> deviceLocker;
+ {
+ // devicelist locked
+ TelldusCore::MutexLocker deviceListLocker(&d->lock);
+@@ -84,7 +84,7 @@ void DeviceManager::executeActionEvent()
+ return;
+ }
+ // device locked
+- deviceLocker = std::auto_ptr<TelldusCore::MutexLocker>(new TelldusCore::MutexLocker(it->second));
++ deviceLocker = std::make_unique<TelldusCore::MutexLocker>(it->second);
+ device = it->second;
+ } // devicelist unlocked
+
projects / feed / packages.git / commitdiff