include $(TOPDIR)/rules.mk
PKG_NAME:=netdata
-PKG_VERSION:=1.29.1
+PKG_VERSION:=1.29.2
PKG_RELEASE:=1
PKG_MAINTAINER:=Josef Schlehofer <pepe.schlehofer@gmail.com>, Daniel Engberg <daniel.engberg.lists@pyret.net>
PKG_SOURCE:=$(PKG_NAME)-v$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/netdata/netdata/tar.gz/v$(PKG_VERSION)?
-PKG_HASH:=d5029b466e801966b7fb483905d61a290cec7c19ec95f96ae2fbff14c723ee37
+PKG_HASH:=def61f78b03b92ff95d0511681f125afb0338961b7e6a7d7ea91f7463dc7d11e
PKG_INSTALL:=1
PKG_BUILD_PARALLEL:=1
# GONOPROXY
# GOSUMDB
# GONOSUMDB
+# GOVCS
# Environment variables for use with cgo:
unexport \
endif
ifeq ($(GO_ARCH),386)
- # ensure binaries can run on older CPUs
- GO_386:=387
+ ifeq ($(CONFIG_TARGET_x86_geode)$(CONFIG_TARGET_x86_legacy),y)
+ GO_386:=softfloat
+ else
+ GO_386:=sse2
+ endif
# -fno-plt: causes "unexpected GOT reloc for non-dynamic symbol" errors
GO_CFLAGS_TO_REMOVE:=-fno-plt
# ASLR/PIE
GO_PIE_SUPPORTED_OS_ARCH:= \
- android_386 android_amd64 android_arm android_arm64 \
- linux_386 linux_amd64 linux_arm linux_arm64 \
+ android_386 android_amd64 android_arm android_arm64 \
+ linux_386 linux_amd64 linux_arm linux_arm64 \
+ \
+ windows_386 windows_amd64 windows_arm \
\
- windows_386 windows_amd64 windows_arm \
+ darwin_amd64 darwin_arm64 \
\
- darwin_amd64 \
freebsd_amd64 \
\
aix_ppc64 \
\
- linux_ppc64le linux_s390x
+ linux_ppc64le linux_riscv64 linux_s390x
go_pie_install_suffix=$(if $(filter $(1),aix_ppc64 windows_386 windows_amd64 windows_arm),,shared)
include $(TOPDIR)/rules.mk
-GO_VERSION_MAJOR_MINOR:=1.15
-GO_VERSION_PATCH:=8
+GO_VERSION_MAJOR_MINOR:=1.16
+GO_VERSION_PATCH:=
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:=540c0ab7781084d124991321ed1458e479982de94454a98afab6acadf38497c2
+PKG_HASH:=7688063d55656105898f323d90a79a39c378d86fe89ae192eb3b7fc46347c95a
PKG_MAINTAINER:=Jeffery To <jeffery.to@gmail.com>
PKG_LICENSE:=BSD-3-Clause
freebsd_386 freebsd_amd64 freebsd_arm freebsd_arm64 \
linux_386 linux_amd64 linux_arm linux_arm64 \
openbsd_386 openbsd_amd64 openbsd_arm openbsd_arm64 \
+ netbsd_386 netbsd_amd64 netbsd_arm netbsd_arm64 \
\
- netbsd_386 netbsd_amd64 netbsd_arm \
plan9_386 plan9_amd64 plan9_arm \
windows_386 windows_amd64 windows_arm \
\
darwin_amd64 darwin_arm64 \
+ ios_amd64 ios_arm64 \
\
dragonfly_amd64 \
illumos_amd64 \
\
linux_ppc64 linux_ppc64le \
linux_mips linux_mipsle linux_mips64 linux_mips64le \
- linux_riscv64 linux_s390x
+ linux_riscv64 linux_s390x \
+ \
+ openbsd_mips64
BOOTSTRAP_SOURCE:=go1.4-bootstrap-20171003.tar.gz
BOOTSTRAP_SOURCE_URL:=$(GO_SOURCE_URLS)
$(eval $(call GoCompiler/AddProfile,Package,$(PKG_BUILD_DIR),$(PKG_GO_PREFIX),$(PKG_GO_VERSION_ID),$(GO_OS_ARCH),$(PKG_GO_INSTALL_SUFFIX)))
PKG_GO_ZBOOTSTRAP_MODS:= \
- s/defaultGO386 = `[^`]*`/defaultGO386 = `$(or $(GO_386),387)`/; \
+ s/defaultGO386 = `[^`]*`/defaultGO386 = `$(or $(GO_386),sse2)`/; \
s/defaultGOARM = `[^`]*`/defaultGOARM = `$(or $(GO_ARM),5)`/; \
s/defaultGOMIPS = `[^`]*`/defaultGOMIPS = `$(or $(GO_MIPS),hardfloat)`/; \
s/defaultGOMIPS64 = `[^`]*`/defaultGOMIPS64 = `$(or $(GO_MIPS64),hardfloat)`/; \
#
-# Copyright (C) 2019-2020 CZ.NIC, z. s. p. o. (https://www.nic.cz/)
+# Copyright (C) 2019-2021 CZ.NIC, z. s. p. o. (https://www.nic.cz/)
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
include $(TOPDIR)/rules.mk
PKG_NAME:=python-more-itertools
-PKG_VERSION:=8.6.0
+PKG_VERSION:=8.7.0
PKG_RELEASE:=1
PYPI_NAME:=more-itertools
-PKG_HASH:=b3a9005928e5bed54076e6e549c792b306fddfe72b2d1d22dd63d42d5d3899cf
+PKG_HASH:=c5d6da9ca3ff65220c3bfd2a8db06d698f05d4d2b9be57e1deb2be5a45019713
PKG_MAINTAINER:=Jan Pavlinec <jan.pavlinec@nic.cz>
PKG_LICENSE:=MIT
#
-# Copyright (C) 2020 CZ.NIC, z. s. p. o. (https://www.nic.cz/)
+# Copyright (C) 2020-2021 CZ.NIC, z. s. p. o. (https://www.nic.cz/)
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
include $(TOPDIR)/rules.mk
PKG_NAME:=python-packaging
-PKG_VERSION:=20.4
+PKG_VERSION:=20.9
PKG_RELEASE:=1
PYPI_NAME:=packaging
-PKG_HASH:=4357f74f47b9c12db93624a82154e9b120fa8293699949152b22065d556079f8
+PKG_HASH:=5b327ac1320dc863dca72f4514ecc086f31186744b84a230374cc1fd776feae5
PKG_MAINTAINER:=Jan Pavlinec <jan.pavlinec@nic.cz>
PKG_LICENSE:=Apache-2.0 BSD-2-Clause
SUBMENU:=Python
TITLE:=Core utilities for Python packages
URL:=https://github.com/pypa/packaging
- DEPENDS:=+python3-light +python3-pyparsing +python3-six +python3-logging +python3-distutils
+ DEPENDS:=+python3-light +python3-pyparsing +python3-six +python3-logging +python3-distutils +python3-urllib
endef
define Package/python3-packaging/description
#
-# Copyright (C) 2019-2020 CZ.NIC, z. s. p. o. (https://www.nic.cz/)
+# Copyright (C) 2019-2021 CZ.NIC, z. s. p. o. (https://www.nic.cz/)
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
include $(TOPDIR)/rules.mk
PKG_NAME:=python-py
-PKG_VERSION:=1.9.0
-PKG_RELEASE:=2
+PKG_VERSION:=1.10.0
+PKG_RELEASE:=1
PYPI_NAME:=py
-PKG_HASH:=9ca6883ce56b4e8da7e79ac18787889fa5206c79dcc67fb065376cd2fe03f342
+PKG_HASH:=21b81bda15b66ef5e1a777a21c4dcd9c20ad3efd0b3f817e7a809035269e1bd3
PKG_MAINTAINER:=Jan Pavlinec <jan.pavlinec@nic.cz>
PKG_LICENSE:=MIT
include $(TOPDIR)/rules.mk
PKG_NAME:=python-pytest-xdist
-PKG_VERSION:=2.2.0
+PKG_VERSION:=2.2.1
PKG_RELEASE:=1
PYPI_NAME:=pytest-xdist
-PKG_HASH:=1d8edbb1a45e8e1f8e44b1260583107fc23f8bc8da6d18cb331ff61d41258ecf
+PKG_HASH:=718887296892f92683f6a51f25a3ae584993b06f7076ce1e1fd482e59a8220a2
PKG_MAINTAINER:=Jan Pavlinec <jan.pavlinec@nic.cz>
PKG_LICENSE:=MIT
# Note: keep in sync with setuptools & pip
PYTHON3_VERSION_MAJOR:=3
PYTHON3_VERSION_MINOR:=9
-PYTHON3_VERSION_MICRO:=1
+PYTHON3_VERSION_MICRO:=2
PYTHON3_VERSION:=$(PYTHON3_VERSION_MAJOR).$(PYTHON3_VERSION_MINOR)
include ../python3-version.mk
PKG_NAME:=python3
-PKG_RELEASE:=2
+PKG_RELEASE:=1
PKG_VERSION:=$(PYTHON3_VERSION).$(PYTHON3_VERSION_MICRO)
PKG_SOURCE:=Python-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=https://www.python.org/ftp/python/$(PKG_VERSION)
-PKG_HASH:=991c3f8ac97992f3d308fefeb03a64db462574eadbff34ce8bc5bb583d9903ff
+PKG_HASH:=3c2034c54f811448f516668dce09d24008a0716c3a794dd8639b5388cbde247d
PKG_MAINTAINER:=Alexandru Ardelean <ardeleanalex@gmail.com>, Jeffery To <jeffery.to@gmail.com>
PKG_LICENSE:=Python/2.0
global _config_vars
--- a/Lib/sysconfig.py
+++ b/Lib/sysconfig.py
-@@ -342,6 +342,7 @@ def get_makefile_filename():
+@@ -352,6 +352,7 @@ def get_makefile_filename():
def _get_sysconfigdata_name():
fi
elif test "$cross_compiling" = maybe; then
as_fn_error $? "Cross compiling required --host=HOST-TUPLE and --build=ARCH" "$LINENO" 5
-@@ -15441,7 +15441,7 @@ fi
+@@ -15435,7 +15435,7 @@ fi
fi
elif test "$cross_compiling" = maybe; then
AC_MSG_ERROR([Cross compiling required --host=HOST-TUPLE and --build=ARCH])
-@@ -4833,7 +4833,7 @@ fi],
+@@ -4828,7 +4828,7 @@ fi],
dnl define LIBPL after ABIFLAGS and LDVERSION is defined.
AC_SUBST(PY_ENABLE_SHARED)
include $(TOPDIR)/rules.mk
PKG_NAME:=gdbm
-PKG_VERSION:=1.18.1
-PKG_RELEASE:=2
+PKG_VERSION:=1.19
+PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=@GNU/gdbm
-PKG_HASH:=86e613527e5dba544e73208f42b78b7c022d4fa5a6d5498bf18c8d6f745b91dc
+PKG_HASH:=37ed12214122b972e18a0d94995039e57748191939ef74115b1d41d8811364bc
PKG_MAINTAINER:=Marcel Denia <naoir@gmx.net>
PKG_LICENSE:=GPL-3.0-or-later
+++ /dev/null
---- a/src/parseopt.c
-+++ b/src/parseopt.c
-@@ -255,8 +255,6 @@ print_option_descr (const char *descr, s
- }
- \f
- char *parseopt_program_name;
--char *parseopt_program_doc;
--char *parseopt_program_args;
- const char *program_bug_address = "<" PACKAGE_BUGREPORT ">";
- void (*parseopt_help_hook) (FILE *stream);
- \f
MAJOR_VERSION:=68
MINOR_VERSION:=2
PKG_VERSION:=$(MAJOR_VERSION).$(MINOR_VERSION)
-PKG_RELEASE:=1
+PKG_RELEASE:=2
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)
HOST_CONFIGURE_CMD:= ./runConfigureICU
HOST_CONFIGURE_VARS:=
-HOST_CONFIGURE_ARGS:= \
- Linux/gcc \
+ifeq ($(HOST_OS),Darwin)
+HOST_CONFIGURE_ARGS:= MacOSX
+else
+HOST_CONFIGURE_ARGS:= Linux/gcc
+endif
+HOST_CONFIGURE_ARGS+= \
--disable-debug \
--enable-release \
--enable-shared \
$(INSTALL_DATA) $(HOST_BUILD_DIR)/config/icucross.* $(STAGING_DIR_HOSTPKG)/share/icu/$(PKG_VERSION)/config/
$(INSTALL_BIN) $(HOST_BUILD_DIR)/bin/icupkg $(STAGING_DIR_HOSTPKG)/share/icu/$(PKG_VERSION)/bin/
$(INSTALL_BIN) $(HOST_BUILD_DIR)/bin/pkgdata $(STAGING_DIR_HOSTPKG)/share/icu/$(PKG_VERSION)/bin/
+ifeq ($(HOST_OS),Darwin)
+ $(CP) $(HOST_BUILD_DIR)/lib/*.dylib* $(STAGING_DIR_HOSTPKG)/share/icu/$(PKG_VERSION)/lib/
+else
$(CP) $(HOST_BUILD_DIR)/lib/*.so* $(STAGING_DIR_HOSTPKG)/share/icu/$(PKG_VERSION)/lib/
+endif
$(RM) $(STAGING_DIR_HOSTPKG)/share/icu/current
(cd $(STAGING_DIR_HOSTPKG)/share/icu;$(LN) $(PKG_VERSION) current)
endef
include $(TOPDIR)/rules.mk
PKG_NAME:=libedit
-PKG_VERSION:=20191231-3.1
+PKG_VERSION:=20210216-3.1
PKG_RELEASE:=1
PKG_MAINTAINER:=Daniel Salzman <daniel.salzman@nic.cz>
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=http://thrysoee.dk/editline/
-PKG_HASH:=dbb82cb7e116a5f8025d35ef5b4f7d4a3cdd0a3909a146a39112095a2d229071
+PKG_HASH:=2283f741d2aab935c8c52c04b57bf952d02c2c02e651172f8ac811f77b1fc77a
PKG_INSTALL:=1
include $(TOPDIR)/rules.mk
PKG_NAME:=libmaxminddb
-PKG_VERSION:=1.5.0
+PKG_VERSION:=1.5.2
PKG_RELEASE=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://github.com/maxmind/libmaxminddb/releases/download/$(PKG_VERSION)/
-PKG_HASH:=7c56e791ff2a655215e7ed3864b1ffdd7d34a38835779efed56a42f056bd58aa
+PKG_HASH:=5237076d250a5f7c297e331c35a433eeaaf0dc205e070e4db353c9ba10f340a2
PKG_INSTALL:=1
PKG_FIXUP:=autoreconf
include $(TOPDIR)/rules.mk
PKG_NAME:=libshout
-PKG_VERSION:=2.4.4
-PKG_RELEASE:=1
+PKG_VERSION:=2.4.5
+PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://downloads.us.xiph.org/releases/libshout/
-PKG_HASH:=8ce90c5d05e7ad1da4c12f185837e8a867c22df2d557b0125afaba4b1438e6c3
+PKG_HASH:=d9e568668a673994ebe3f1eb5f2bee06e3236a5db92b8d0c487e1c0f886a6890
PKG_MAINTAINER:=Ted Hess <thess@kitschensync.net>
PKG_LICENSE:=LGPL-2.1-or-later
+++ /dev/null
---- a/examples/nonblocking.c
-+++ b/examples/nonblocking.c
-@@ -6,6 +6,7 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
-+#include <time.h>
- #include <unistd.h>
-
- #include <shout/shout.h>
-@@ -70,8 +71,10 @@ int main()
- if (ret == SHOUTERR_BUSY)
- printf("Connection pending...\n");
-
-+ const struct timespec req = {0, 10 * 1000 * 1000};
-+ struct timespec rem;
- while (ret == SHOUTERR_BUSY) {
-- usleep(10000);
-+ nanosleep(&req, &rem);
- ret = shout_get_connected(shout);
- }
-
include $(TOPDIR)/rules.mk
PKG_NAME:=liburcu
-PKG_VERSION:=0.12.1
+PKG_VERSION:=0.12.2
PKG_RELEASE:=3
PKG_MAINTAINER:=Daniel Salzman <daniel.salzman@nic.cz>
PKG_SOURCE:=userspace-rcu-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=https://lttng.org/files/urcu/
-PKG_HASH:=bbfaead0345642b97e0de90f889dfbab4b2643a6a5e5c6bb59cd0d26fc0bcd0e
+PKG_HASH:=4eefc11e4f6c212fc7d84d871e1cc139da0669a46ff3fda557a6fdd4d74ca67b
PKG_BUILD_DIR:=$(BUILD_DIR)/userspace-rcu-$(PKG_VERSION)
PKG_FIXUP:=autoreconf
PKG_NAME:=v4l-utils
PKG_VERSION:=1.20.0
-PKG_RELEASE:=2
+PKG_RELEASE:=3
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=https://www.linuxtv.org/downloads/v4l-utils
TARGET_CFLAGS += -flto
TARGET_CXXFLAGS += -std=c++11
TARGET_LDFLAGS += \
- $(if $(CONFIG_LIBC_USE_GLIBC),,-largp) \
+ $(if $(CONFIG_USE_GLIBC),,-largp) \
-Wl,--gc-sections,--as-needed
CONFIGURE_ARGS+= \
include $(TOPDIR)/rules.mk
PKG_NAME:=loudmouth
-PKG_VERSION:=1.5.3
-PKG_RELEASE:=4
+PKG_VERSION:=1.5.4
+PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/mcabber/loudmouth/tar.gz/$(PKG_VERSION)?
-PKG_HASH:=12972fcffd9bbcc4a3b2b9fbf4b0e549f7b4caf0f11c8d2af2059087ce4e8792
+PKG_HASH:=d1f66d479bb9a2794c52e997a9db9271f7fd004e264fe1ff4302607deb083375
PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org>
-PKG_LICENSE:=LGPLv2.1
+PKG_LICENSE:=LGPL-2.1-or-later
PKG_LICENSE_FILES:=COPYING
PKG_FIXUP:=autoreconf
+++ /dev/null
---- a/configure.ac
-+++ b/configure.ac
-@@ -109,9 +109,22 @@ else
- fi
- AC_SUBST([TEST_DIRS])
-
--PKG_CHECK_MODULES(LIBIDN, libidn, have_idn=yes, have_idn=no)
--if test "x$have_idn" = "xyes"; then
-- AC_DEFINE(HAVE_IDN, 1, [Define if IDN support is included])
-+dnl +--------------------------------------------------------+
-+dnl | Checking for libidn support |-
-+dnl +--------------------------------------------------------+
-+AC_ARG_WITH(idn,
-+ AS_HELP_STRING([--with-idn=@<:@auto|no@:>@],
-+ [Whether to use libidn [[default=auto]]]),
-+ ac_idn=$withval,
-+ ac_idn=auto)
-+
-+if test "x$ac_idn" = "xauto"; then
-+ PKG_CHECK_MODULES(LIBIDN, libidn, enable_idn=yes, enable_idn=no)
-+ if test "x$enable_idn" = "xyes"; then
-+ AC_DEFINE(HAVE_IDN, 1, [Define if IDN support is included])
-+ fi
-+else
-+ enable_idn=no
- fi
-
- dnl Gtk doc
-@@ -323,7 +336,7 @@ echo "
-
- prefix: ${prefix}
- compiler: ${CC}
-- Have IDN support: ${have_idn}
-+ Enable IDN support: ${enable_idn}
- Enable SSL: ${enable_ssl}
- Asynchronous DNS: ${enable_asyncns}
- Linux TCP keepalives: ${use_keepalives}
+++ /dev/null
---- a/loudmouth/lm-sasl.c
-+++ b/loudmouth/lm-sasl.c
-@@ -529,7 +529,7 @@ sasl_md5_prepare_response (LmSASL *sasl,
- }
-
- nonce = g_hash_table_lookup (challenge, "nonce");
-- if (nonce == NULL || nonce == '\0') {
-+ if (nonce == NULL || *nonce == '\0') {
- g_log (LM_LOG_DOMAIN, LM_LOG_LEVEL_SASL,
- "%s: server didn't provide a nonce in the challenge",
- G_STRFUNC);
+++ /dev/null
-From 110bd9800bb9cb3afdd724e4e4a3292d29c817a1 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20K=C4=99pie=C5=84?= <github@kempniu.pl>
-Date: Thu, 27 Sep 2018 21:29:29 +0200
-Subject: [PATCH] Move away from g_type_class_add_private()
-
-g_type_class_add_private() will be deprecated in GLib 2.58. Replace:
-
- - g_type_class_add_private() with G_DEFINE_TYPE_WITH_PRIVATE()
- - G_TYPE_INSTANCE_GET_PRIVATE() with *_get_instance_private()
----
- loudmouth/lm-blocking-resolver.c | 17 +++++++----------
- loudmouth/lm-feature-ping.c | 22 ++++++++++------------
- loudmouth/lm-resolver.c | 28 +++++++++++++---------------
- 3 files changed, 30 insertions(+), 37 deletions(-)
-
---- a/loudmouth/lm-blocking-resolver.c
-+++ b/loudmouth/lm-blocking-resolver.c
-@@ -38,10 +38,10 @@
-
- #define SRV_LEN 8192
-
--#define GET_PRIV(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), LM_TYPE_BLOCKING_RESOLVER, LmBlockingResolverPriv))
-+#define GET_PRIV(obj) (lm_blocking_resolver_get_instance_private (LM_BLOCKING_RESOLVER(obj)))
-
--typedef struct LmBlockingResolverPriv LmBlockingResolverPriv;
--struct LmBlockingResolverPriv {
-+typedef struct LmBlockingResolverPrivate LmBlockingResolverPrivate;
-+struct LmBlockingResolverPrivate {
- GSource *idle_source;
- };
-
-@@ -49,7 +49,7 @@ static void blocking_resolver_finali
- static void blocking_resolver_lookup (LmResolver *resolver);
- static void blocking_resolver_cancel (LmResolver *resolver);
-
--G_DEFINE_TYPE (LmBlockingResolver, lm_blocking_resolver, LM_TYPE_RESOLVER)
-+G_DEFINE_TYPE_WITH_PRIVATE (LmBlockingResolver, lm_blocking_resolver, LM_TYPE_RESOLVER)
-
- static void
- lm_blocking_resolver_class_init (LmBlockingResolverClass *class)
-@@ -61,9 +61,6 @@ lm_blocking_resolver_class_init (LmBlock
-
- resolver_class->lookup = blocking_resolver_lookup;
- resolver_class->cancel = blocking_resolver_cancel;
--
-- g_type_class_add_private (object_class,
-- sizeof (LmBlockingResolverPriv));
- }
-
- static void
-@@ -194,7 +191,7 @@ blocking_resolver_lookup_service (LmBloc
- static gboolean
- blocking_resolver_idle_lookup (LmBlockingResolver *resolver)
- {
-- LmBlockingResolverPriv *priv = GET_PRIV (resolver);
-+ LmBlockingResolverPrivate *priv = GET_PRIV (resolver);
- gint type;
-
- /* Start the DNS querying */
-@@ -219,7 +216,7 @@ blocking_resolver_idle_lookup (LmBlockin
- static void
- blocking_resolver_lookup (LmResolver *resolver)
- {
-- LmBlockingResolverPriv *priv;
-+ LmBlockingResolverPrivate *priv;
- GMainContext *context;
-
- g_return_if_fail (LM_IS_BLOCKING_RESOLVER (resolver));
-@@ -236,7 +233,7 @@ blocking_resolver_lookup (LmResolver *re
- static void
- blocking_resolver_cancel (LmResolver *resolver)
- {
-- LmBlockingResolverPriv *priv;
-+ LmBlockingResolverPrivate *priv;
-
- g_return_if_fail (LM_IS_BLOCKING_RESOLVER (resolver));
-
---- a/loudmouth/lm-feature-ping.c
-+++ b/loudmouth/lm-feature-ping.c
-@@ -28,10 +28,10 @@
-
- #define XMPP_NS_PING "urn:xmpp:ping"
-
--#define GET_PRIV(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), LM_TYPE_FEATURE_PING, LmFeaturePingPriv))
-+#define GET_PRIV(obj) (lm_feature_ping_get_instance_private (LM_FEATURE_PING(obj)))
-
--typedef struct LmFeaturePingPriv LmFeaturePingPriv;
--struct LmFeaturePingPriv {
-+typedef struct LmFeaturePingPrivate LmFeaturePingPrivate;
-+struct LmFeaturePingPrivate {
- LmConnection *connection;
- guint keep_alive_rate;
- GSource *keep_alive_source;
-@@ -55,7 +55,7 @@ feature_ping_keep_alive_reply
- gpointer user_data);
- static gboolean feature_ping_send_keep_alive (LmFeaturePing *fp);
-
--G_DEFINE_TYPE (LmFeaturePing, lm_feature_ping, G_TYPE_OBJECT)
-+G_DEFINE_TYPE_WITH_PRIVATE (LmFeaturePing, lm_feature_ping, G_TYPE_OBJECT)
-
- enum {
- PROP_0,
-@@ -103,8 +103,6 @@ lm_feature_ping_class_init (LmFeaturePin
- NULL, NULL,
- _lm_marshal_VOID__VOID,
- G_TYPE_NONE, 0);
--
-- g_type_class_add_private (object_class, sizeof (LmFeaturePingPriv));
- }
-
- static void
-@@ -127,7 +125,7 @@ feature_ping_get_property (GObject *o
- GValue *value,
- GParamSpec *pspec)
- {
-- LmFeaturePingPriv *priv;
-+ LmFeaturePingPrivate *priv;
-
- priv = GET_PRIV (object);
-
-@@ -147,7 +145,7 @@ feature_ping_set_property (GObject
- const GValue *value,
- GParamSpec *pspec)
- {
-- LmFeaturePingPriv *priv;
-+ LmFeaturePingPrivate *priv;
-
- priv = GET_PRIV (object);
-
-@@ -171,7 +169,7 @@ feature_ping_keep_alive_reply (LmMessage
- LmMessage *m,
- gpointer user_data)
- {
-- LmFeaturePingPriv *priv;
-+ LmFeaturePingPrivate *priv;
-
- priv = GET_PRIV (user_data);
-
-@@ -183,7 +181,7 @@ feature_ping_keep_alive_reply (LmMessage
- static gboolean
- feature_ping_send_keep_alive (LmFeaturePing *fp)
- {
-- LmFeaturePingPriv *priv;
-+ LmFeaturePingPrivate *priv;
- LmMessage *ping;
- LmMessageNode *ping_node;
- LmMessageHandler *keep_alive_handler;
-@@ -237,7 +235,7 @@ feature_ping_send_keep_alive (LmFeatureP
- void
- lm_feature_ping_start (LmFeaturePing *fp)
- {
-- LmFeaturePingPriv *priv;
-+ LmFeaturePingPrivate *priv;
-
- g_return_if_fail (LM_IS_FEATURE_PING (fp));
-
-@@ -260,7 +258,7 @@ lm_feature_ping_start (LmFeaturePing *fp
- void
- lm_feature_ping_stop (LmFeaturePing *fp)
- {
-- LmFeaturePingPriv *priv;
-+ LmFeaturePingPrivate *priv;
-
- g_return_if_fail (LM_IS_FEATURE_PING (fp));
-
---- a/loudmouth/lm-resolver.c
-+++ b/loudmouth/lm-resolver.c
-@@ -36,10 +36,10 @@
- #include "lm-marshal.h"
- #include "lm-resolver.h"
-
--#define GET_PRIV(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), LM_TYPE_RESOLVER, LmResolverPriv))
-+#define GET_PRIV(obj) (lm_resolver_get_instance_private (LM_RESOLVER(obj)))
-
--typedef struct LmResolverPriv LmResolverPriv;
--struct LmResolverPriv {
-+typedef struct LmResolverPrivate LmResolverPrivate;
-+struct LmResolverPrivate {
- GMainContext *context;
-
- LmResolverCallback callback;
-@@ -71,7 +71,7 @@ static void resolver_set_property
- const GValue *value,
- GParamSpec *pspec);
-
--G_DEFINE_TYPE (LmResolver, lm_resolver, G_TYPE_OBJECT)
-+G_DEFINE_TYPE_WITH_PRIVATE (LmResolver, lm_resolver, G_TYPE_OBJECT)
-
- enum {
- PROP_0,
-@@ -151,8 +151,6 @@ lm_resolver_class_init (LmResolverClass
- "Protocol for SRV lookup",
- NULL,
- G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
--
-- g_type_class_add_private (object_class, sizeof (LmResolverPriv));
- }
-
- static void
-@@ -164,7 +162,7 @@ lm_resolver_init (LmResolver *resolver)
- static void
- resolver_finalize (GObject *object)
- {
-- LmResolverPriv *priv;
-+ LmResolverPrivate *priv;
-
- priv = GET_PRIV (object);
-
-@@ -190,7 +188,7 @@ resolver_get_property (GObject *objec
- GValue *value,
- GParamSpec *pspec)
- {
-- LmResolverPriv *priv;
-+ LmResolverPrivate *priv;
-
- priv = GET_PRIV (object);
-
-@@ -228,7 +226,7 @@ resolver_set_property (GObject *obj
- const GValue *value,
- GParamSpec *pspec)
- {
-- LmResolverPriv *priv;
-+ LmResolverPrivate *priv;
-
- priv = GET_PRIV (object);
-
-@@ -301,7 +299,7 @@ lm_resolver_new_for_host (const gchar
- gpointer user_data)
- {
- LmResolver *resolver;
-- LmResolverPriv *priv;
-+ LmResolverPrivate *priv;
-
- g_return_val_if_fail (host != NULL, NULL);
- g_return_val_if_fail (callback != NULL, NULL);
-@@ -327,7 +325,7 @@ lm_resolver_new_for_service (const gchar
- gpointer user_data)
- {
- LmResolver *resolver;
-- LmResolverPriv *priv;
-+ LmResolverPrivate *priv;
-
- g_return_val_if_fail (domain != NULL, NULL);
- g_return_val_if_fail (service != NULL, NULL);
-@@ -373,7 +371,7 @@ lm_resolver_cancel (LmResolver *resolver
- struct addrinfo *
- lm_resolver_results_get_next (LmResolver *resolver)
- {
-- LmResolverPriv *priv;
-+ LmResolverPrivate *priv;
- struct addrinfo *ret_val;
-
- g_return_val_if_fail (LM_IS_RESOLVER (resolver), NULL);
-@@ -401,7 +399,7 @@ skipresult:
- void
- lm_resolver_results_reset (LmResolver *resolver)
- {
-- LmResolverPriv *priv;
-+ LmResolverPrivate *priv;
-
- g_return_if_fail (LM_IS_RESOLVER (resolver));
-
-@@ -427,7 +425,7 @@ _lm_resolver_set_result (LmResolver
- LmResolverResult result,
- struct addrinfo *results)
- {
-- LmResolverPriv *priv;
-+ LmResolverPrivate *priv;
-
- g_return_if_fail (LM_IS_RESOLVER (resolver));
-
+++ /dev/null
---- a/loudmouth/lm-ssl-openssl.c
-+++ b/loudmouth/lm-ssl-openssl.c
-@@ -345,9 +345,11 @@ _lm_ssl_initialize (LmSSL *ssl)
- /*const char *cert_file = NULL;*/
-
- if (!initialized) {
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
- SSL_library_init();
- /* FIXME: Is this needed when we are not in debug? */
- SSL_load_error_strings();
-+#endif
- initialized = TRUE;
- }
-
include $(TOPDIR)/rules.mk
PKG_NAME:=dovecot
-PKG_VERSION:=2.3.11.3
-PKG_RELEASE:=2
+PKG_VERSION:=2.3.13
+PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://dovecot.org/releases/2.3
-PKG_HASH:=d3d9ea9010277f57eb5b9f4166a5d2ba539b172bd6d5a2b2529a6db524baafdc
+PKG_HASH:=a3f875b80ec11a452480690108660030978c94fa8e796ad6d943a874b496f1c4
PKG_MAINTAINER:=Lucian Cristian <lucian.cristian@gmail.com>
PKG_LICENSE:=LGPL-2.1-only MIT BSD-3-Clause
---- a/src/lib-dcrypt/dcrypt-openssl.c
-+++ b/src/lib-dcrypt/dcrypt-openssl.c
-@@ -23,6 +23,7 @@
- #include <openssl/engine.h>
- #include <openssl/hmac.h>
- #include <openssl/objects.h>
-+#include <openssl/bn.h>
- #include "dcrypt.h"
- #include "dcrypt-private.h"
-
--- a/src/lib-ssl-iostream/dovecot-openssl-common.c
+++ b/src/lib-ssl-iostream/dovecot-openssl-common.c
@@ -63,9 +63,11 @@ void dovecot_openssl_common_global_ref(v
--- a/src/lib-ssl-iostream/iostream-openssl-context.c
+++ b/src/lib-ssl-iostream/iostream-openssl-context.c
-@@ -6,6 +6,9 @@
- #include "dovecot-openssl-common.h"
-
- #include <openssl/crypto.h>
-+#include <openssl/rsa.h>
-+#include <openssl/dh.h>
-+#include <openssl/bn.h>
- #include <openssl/x509.h>
- #include <openssl/pem.h>
- #include <openssl/ssl.h>
-@@ -555,8 +558,10 @@ ssl_proxy_ctx_set_crypto_params(SSL_CTX
+@@ -558,8 +558,10 @@ ssl_proxy_ctx_set_crypto_params(SSL_CTX
int nid;
const char *curve_name;
#endif
#include "dcrypt.h"
#include "dcrypt-private.h"
-@@ -235,11 +237,13 @@ dcrypt_openssl_padding_mode(enum dcrypt_
+@@ -236,11 +238,13 @@ dcrypt_openssl_padding_mode(enum dcrypt_
static bool dcrypt_openssl_initialize(const struct dcrypt_settings *set,
const char **error_r)
{
include $(TOPDIR)/rules.mk
PKG_NAME:=curl
-PKG_VERSION:=7.74.0
-PKG_RELEASE:=1
+PKG_VERSION:=7.75.0
+PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=https://dl.uxnr.de/mirror/curl/ \
https://curl.mirror.anstey.ca/ \
https://curl.askapache.com/download/ \
https://curl.haxx.se/download/
-PKG_HASH:=999d5f2c403cf6e25d58319fdd596611e455dd195208746bc6e6d197a77e878b
+PKG_HASH:=fe0c49d8468249000bda75bcfdf9e30ff7e9a86d35f1a21f428d79c389d55675
PKG_LICENSE:=MIT
PKG_LICENSE_FILES:=COPYING
--- /dev/null
+menu "Configuration"
+ config PACKAGE_knot-resolver_dnstap
+ bool "Build with dnstap support"
+ default n
+ help
+ knot-resolver dnstap module supports logging DNS responses
+ to a unix socket in dnstap format using fstrm framing library.
+ This logging is useful if you need effectivelly log all
+ DNS traffic.
+ The unix socket and the socket reader must be present before
+ starting resolver instances.
+endmenu
--- /dev/null
+#
+# Copyright (C) 2015-2021 CZ.NIC, z. s. p. o. (https://www.nic.cz/)
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+PKG_RELRO_FULL:=0
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=knot-resolver
+PKG_VERSION:=5.2.1
+PKG_RELEASE:=1
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
+PKG_SOURCE_URL:=https://secure.nic.cz/files/knot-resolver
+PKG_HASH:=aa37b744c400f437acba7a54aebcbdbe722ece743d342cbc39f2dd8087f05826
+
+PKG_MAINTAINER:=Jan Pavlinec <jan.pavlinec@nic.cz>
+PKG_LICENSE:=GPL-3.0-later
+PKG_LICENSE_FILES:=COPYING
+
+PKG_BUILD_DEPENDS:=meson/host
+PKG_INSTALL:=1
+
+include $(INCLUDE_DIR)/package.mk
+include ../../devel/meson/meson.mk
+
+define Package/knot-resolver
+ SECTION:=net
+ CATEGORY:=Network
+ SUBMENU:=IP Addresses and Names
+ TITLE:=Knot DNS Resolver
+ URL:=https://www.knot-resolver.cz
+ DEPENDS=\
+ +knot-libs \
+ +knot-libzscanner \
+ +libuv \
+ +luajit \
+ +luasec \
+ +luasocket \
+ +libstdcpp \
+ +lmdb \
+ PACKAGE_knot-resolver_dnstap:libfstrm \
+ PACKAGE_knot-resolver_dnstap:libprotobuf-c \
+ @(aarch64||mips64||mips64el||powerpc64||x86_64)
+ USERID:=kresd=3536:kresd=3536
+endef
+
+define Package/knot-resolver/description
+ The Knot Resolver is a caching full resolver
+ implementation, including both a resolver library and a daemon.
+endef
+
+define Package/knot-resolver/config
+ source "$(SOURCE)/Config.in"
+endef
+
+MESON_ARGS+= \
+ $(if $(CONFIG_PACKAGE_knot-resolver_dnstap), -Ddnstap=enabled,-Ddnstap=disabled) \
+ -Dcapng=disabled \
+ -Dclient=disabled \
+ -Dconfig_tests=disabled \
+ -Ddnstap=disabled \
+ -Ddoc=disabled \
+ -Dinstall_kresd_conf=disabled \
+ -Dinstall_root_keys=disabled \
+ -Dkeyfile_default=/etc/knot-resolver/root.keys \
+ -Dprefix=/usr \
+ -Dunit_tests=disabled \
+ -Dutils=disabled
+
+define Package/knot-resolver/install
+ $(INSTALL_DIR) $(1)/usr/sbin
+ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/kresd $(1)/usr/sbin/
+
+ $(INSTALL_DIR) $(1)/usr/lib/knot-resolver
+ $(CP) $(PKG_INSTALL_DIR)/usr/lib/*.so* $(1)/usr/lib/
+ $(CP) $(PKG_INSTALL_DIR)/usr/lib/knot-resolver/{*.lua,*.so} $(1)/usr/lib/knot-resolver/
+ $(INSTALL_DIR) $(1)/usr/lib/knot-resolver/kres_modules
+ $(CP) $(PKG_INSTALL_DIR)/usr/lib/knot-resolver/kres_modules/{*.lua,*.so} $(1)/usr/lib/knot-resolver/kres_modules/
+ $(INSTALL_DIR) $(1)/etc/init.d
+ $(INSTALL_BIN) ./files/kresd.init $(1)/etc/init.d/kresd
+
+ $(INSTALL_DIR) $(1)/etc/knot-resolver
+ $(CP) $(PKG_INSTALL_DIR)/etc/knot-resolver/root.hints $(1)/etc/knot-resolver/
+ $(CP) ./files/root.keys $(1)/etc/knot-resolver
+endef
+
+$(eval $(call BuildPackage,knot-resolver))
--- /dev/null
+#!/bin/sh /etc/rc.common
+
+START=61
+STOP=00
+
+USE_PROCD=1
+PROG=/usr/sbin/kresd
+CONFIGFILE=/tmp/kresd/kresd.config
+ROOTKEYFILE=/etc/knot-resolver/root.keys
+DEFAULT_RUNDIR=/tmp/kresd
+USERNAME=kresd
+GROUP=kresd
+
+init_header() {
+ {
+ echo "--Automatically generated file; DO NOT EDIT"
+ echo "modules = {"
+ echo " 'hints > iterate'"
+ echo " , 'policy'"
+ if [ "$prefetch" \!= 0 ]; then
+ echo " , 'stats'"
+ echo " , predict = {"
+ echo " window = 30 -- 30 minutes sampling window"
+ echo " , period = 24*(60/30) -- track last 24 hours"
+ echo " }"
+ fi
+ echo "}"
+ echo "hints.use_nodata(true)"
+ } > $CONFIGFILE
+}
+
+init_rootkey() {
+ {
+ echo "trust_anchors.remove('.')"
+ echo "trust_anchors.add_file('$ROOTKEYFILE', true)"
+ } >> $CONFIGFILE
+}
+
+modify_rundir() {
+ local rundir
+
+ #create rundir
+ rundir="$DEFAULT_RUNDIR"
+
+ if [ ! -d "$rundir" ]; then
+ mkdir -p "$rundir"
+ fi
+
+ if id "$1" >/dev/null 2>&1; then
+ chown -R $USERNAME:$GROUP "$rundir"
+ fi
+}
+
+start_service() {
+ procd_open_instance
+ procd_set_param file /etc/config/resolver
+ procd_set_param command "$PROG"
+ procd_append_param command --noninteractive
+ procd_set_param respawn
+ modify_rundir
+ init_header
+ init_rootkey
+
+ # knot-resolver config
+ procd_append_param command -c "$CONFIGFILE"
+ procd_append_param command -a "0.0.0.0#53"
+ procd_append_param command -a "::0#53"
+ procd_close_instance
+}
+
+reload_service()
+{
+ stop
+ start
+}
--- /dev/null
+. IN DS 20326 8 2 e06d44b80b8f1d39a95c0b0d7c65d08458e880409bbc683457104237c7f8ec8d
--- /dev/null
+This is just workaround. It should be removed after proper fixing in upstream.
+Patch fixes problem with lmdb pkg config. It also adds workaround for get_option
+which is now not propagated in OpenWrt meson host package.
+--- a/meson.build
++++ b/meson.build
+@@ -23,10 +23,10 @@ libknot = dependency('libknot', version:
+ libdnssec = dependency('libdnssec', version: knot_version)
+ libzscanner = dependency('libzscanner', version: knot_version)
+ libuv = dependency('libuv', version: '>=1.7')
+-lmdb = dependency('lmdb', required: false)
+-if not lmdb.found() # darwin workaround: missing pkgconfig
+- lmdb = meson.get_compiler('c').find_library('lmdb')
+-endif
++##lmdb = dependency('lmdb', required: false)
++##if not lmdb.found() # darwin workaround: missing pkgconfig
++lmdb = meson.get_compiler('c').find_library('lmdb')
++##endif
+ gnutls = dependency('gnutls')
+ luajit = dependency('luajit')
+ # NOTE avoid using link_args for luajit due to a macOS issue
--- /dev/null
+This patch fixes the problem with forwarding in knot-resolver v4.3.0.
+It reintroduces a fix which enables policy related hack (knot/knot-resolver#205 (comment 94566) )
+--- a/modules/policy/policy.lua
++++ b/modules/policy/policy.lua
+@@ -985,7 +985,7 @@ policy.layer = {
+ if bit.band(state, bit.bor(kres.FAIL, kres.DONE)) ~= 0 then return state end
+ local qry = req:initial() -- same as :current() but more descriptive
+ return policy.evaluate(policy.rules, req, qry, state)
+- or (special_names_optim(req, qry.sname)
++ or (true--special_names_optim(req, qry.sname)
+ and policy.evaluate(policy.special_names, req, qry, state))
+ or state
+ end,
--- /dev/null
+#!/bin/sh
+
+kresd --version | grep "$2"
PKG_NAME:=mini_snmpd
PKG_VERSION:=1.6
-PKG_RELEASE:=2
+PKG_RELEASE:=3
PKG_MAINTAINER:=Marcin Jurkowski <marcin1j@gmail.com>
PKG_LICENSE:=GPL-2.0
PKG_LICENSE_FILES:=COPYING
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://github.com/troglobit/mini-snmpd.git
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=203d92e60ed09466d6676c6ad20ad6cb2ce08a5d
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_MIRROR_HASH:=f3a19ea0a24ddf57b90e122acdb765f8a2323b1f63ca82a5b56a919ccca16d70
+PKG_SOURCE:=mini-snmpd-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=https://codeload.github.com/troglobit/mini-snmpd/tar.gz/v$(PKG_VERSION)?
+PKG_BUILD_DIR:=$(BUILD_DIR)/mini-snmpd-$(PKG_VERSION)
+PKG_HASH:=de00c475a3c70c56f3ee97cd683cb71009d3521d60b1f589c5a91b4671ede9f3
PKG_FIXUP:=autoreconf
PKG_BUILD_PARALLEL:=1
# --disable-demo - Upstream Github Issue #4 Fixed 20160707
define Package/mini_snmpd/install
- $(INSTALL_DIR) $(1)/usr/bin
- $(CP) $(PKG_INSTALL_DIR)/usr/bin/mini_snmpd $(1)/usr/bin/
+ $(INSTALL_DIR) $(1)/usr/sbin
+ $(CP) $(PKG_INSTALL_DIR)/usr/sbin/mini-snmpd $(1)/usr/sbin
$(INSTALL_DIR) $(1)/etc/config
$(INSTALL_CONF) ./files/mini_snmpd.config $(1)/etc/config/mini_snmpd
$(INSTALL_DIR) $(1)/etc/init.d
START=98
USE_PROCD=1
-PROG=/usr/bin/mini_snmpd
+PROG=/usr/sbin/mini-snmpd
NAME=mini_snmpd
global_respawn_threshold=
include $(TOPDIR)/rules.mk
PKG_NAME:=pingcheck
-PKG_VERSION:=2020-02-12
-PKG_RELEASE:=2
+PKG_VERSION:=2021-02-22
+PKG_RELEASE:=1
PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://github.com/br101/pingcheck
-PKG_SOURCE_VERSION:=520718f9377eab49888a3e38ece59f9ad94d978e
-PKG_MIRROR_HASH:=3890cd39add7e523ab7418faf6a7ae1a1f71d2739982e6e09aa33cc6defac8be
+PKG_SOURCE_VERSION:=c82e03ec536476b978aad2c23711450724b80b91
+PKG_MIRROR_HASH:=6a81a1f6253bcb1dc64abb58e5f8113f1e0061a920c5a975ad34c06f5adc2719
PKG_MAINTAINER:=Bruno Randolf <br1@einfach.org>
PKG_LICENSE:=GPL-2.0-or-later
include $(TOPDIR)/rules.mk
PKG_NAME:=stunnel
-PKG_VERSION:=5.57
+PKG_VERSION:=5.58
PKG_RELEASE:=1
PKG_LICENSE:=GPL-2.0-or-later
PKG_MAINTAINER:=Florian Eckert <fe@dev.tdt.de>
-PKG_LICENSE_FILES:=COPYING COPYRIGHT.GPL
+PKG_LICENSE_FILES:=COPYING.md COPYRIGHT.md
PKG_CPE_ID:=cpe:/a:stunnel:stunnel
PKG_SOURCE_URL:= \
https://www.usenix.org.uk/mirrors/stunnel/archive/$(word 1, $(subst .,$(space),$(PKG_VERSION))).x/
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_HASH:=af5ab973dde11807c38735b87bdd87563a47d2fa1c72a07929fcfce80a600fe1
+PKG_HASH:=d4c14cc096577edca3f6a2a59c2f51869e35350b3988018ddf808c88e5973b79
PKG_FIXUP:=autoreconf
PKG_FIXUP:=patch-libtool
include $(TOPDIR)/rules.mk
PKG_NAME:=unbound
-PKG_VERSION:=1.13.0
-PKG_RELEASE:=1
+PKG_VERSION:=1.13.1
+PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://nlnetlabs.nl/downloads/unbound
-PKG_HASH:=a954043a95b0326ca4037e50dace1f3a207a0a19e9a4a22f4c6718fc623db2a1
+PKG_HASH:=8504d97b8fc5bd897345c95d116e0ee0ddf8c8ff99590ab2b4bd13278c9f50b8
PKG_MAINTAINER:=Eric Luehrsen <ericluehrsen@gmail.com>
PKG_LICENSE:=BSD-3-Clause
PKG_NAME:=vpn-policy-routing
PKG_VERSION:=0.3.2
-PKG_RELEASE:=10
+PKG_RELEASE:=12
PKG_LICENSE:=GPL-3.0-or-later
PKG_MAINTAINER:=Stan Grishin <stangri@melmac.net>
option dest_ipset '0'
option resolver_ipset 'dnsmasq.ipset'
option ipv6_enabled '0'
- list supported_interface ''
- list ignored_interface 'vpnserver wgserver'
+ list ignored_interface 'vpnserver wgserver'
option boot_timeout '30'
option iptables_rule_option 'append'
+ option procd_reload_delay '1'
option webui_enable_column '0'
option webui_protocol_column '0'
option webui_chain_column '0'
readonly _ERROR_='\033[0;31mERROR\033[0m'
readonly _WARNING_='\033[0;33mWARNING\033[0m'
-# declare gatewaySummary errorSummary warningSummary
-# declare serviceEnabled verbosity strictMode
-# declare wanTableID wanMark fwMask
-# declare ipv6Enabled srcIpset destIpset resolverIpset
-# declare wanIface4 wanIface6 ifaceMark ifaceTableID
-# declare ifAll ifSupported ignoredIfaces supportedIfaces icmpIface
-# declare wanGW4 wanGW6 bootTimeout insertOption
-# declare webuiChainColumn webuiShowIgnore dnsmasqIpsetSupported
+gatewaySummary=''; errorSummary=''; warningSummary='';
+serviceEnabled=''; verbosity=''; strictMode='';
+wanTableID=''; wanMark=''; fwMask='';
+ipv6Enabled=''; srcIpset=''; destIpset=''; resolverIpset='';
+wanIface4=''; wanIface6=''; ifaceMark=''; ifaceTableID='';
+ifAll=''; ifSupported=''; ignoredIfaces=''; supportedIfaces=''; icmpIface='';
+wanGW4=''; wanGW6=''; bootTimeout=''; insertOption='';
+webuiChainColumn=''; webuiShowIgnore=''; dnsmasqIpsetSupported='';
+procdReloadDelay='';
usedChainsList='PREROUTING'
ipsetSupported='true'
configLoaded='false'
config_get supportedIfaces 'config' 'supported_interface'
config_get bootTimeout 'config' 'boot_timeout' '30'
config_get insertOption 'config' 'iptables_rule_option' 'append'
+ config_get procdReloadDelay 'config' 'procd_reload_delay' '0'
config_get_bool webuiChainColumn 'config' 'webui_chain_column' '0'
config_get_bool webuiShowIgnore 'config' 'webui_show_ignore_target' '0'
config_foreach append_chains_targets 'policy'
local n
is_enabled || return 1
+ if [ "$procdReloadDelay" -gt 0 ] && [ "$procdReloadDelay" -lt 100 ]; then
+# shellcheck disable=SC2034
+ PROCD_RELOAD_DELAY=$(( procdReloadDelay * 1000 ))
+ fi
+
procd_open_validate
validate_config
validate_policy
validate_config() {
uci_validate_section "${packageName}" config "${1}" \
'enabled:bool:0' \
- 'verbosity:range(0,2):1' \
'strict_enforcement:bool:1' \
+ 'ipv6_enabled:bool:0' \
'src_ipset:bool:0' \
'dest_ipset:bool:0' \
'resolver_ipset::or("", "none", "dnsmasq.ipset")' \
- 'ipv6_enabled:bool:0' \
- 'supported_interface:list(string)' \
+ 'verbosity:range(0,2):1' \
+ 'wan_tid:integer:201' \
+ 'wan_fw_mark:hex(8)' \
+ 'fw_mask:hex(8)' \
+ 'icmp_interface:string' \
'ignored_interface:list(string)' \
+ 'supported_interface:list(string)' \
'boot_timeout:integer:30' \
'iptables_rule_option:or("", "append", "insert")' \
+ 'procd_reload_delay:integer:0' \
'webui_enable_column:bool:0' \
'webui_protocol_column:bool:0' \
'webui_supported_protocol:list(string)' \
'webui_chain_column:bool:0' \
'webui_sorting:bool:1' \
- 'icmp_interface:string' \
- 'wan_tid:integer:201' \
- 'wan_fw_mark:hex(8)' \
- 'fw_mask:hex(8)'
+ 'webui_show_ignore_target:bool:0'
}
# shellcheck disable=SC2120
include $(TOPDIR)/rules.mk
PKG_NAME:=bonnie++
-PKG_VERSION:=1.98
-PKG_RELEASE:=4
+PKG_VERSION:=2.00a
+PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tgz
-PKG_SOURCE_URL:=https://www.coker.com.au/bonnie++/
-PKG_HASH:=6e0bcbc08b78856fd998dd7bcb352d4615a99c26c2dc83d5b8345b102bad0b04
+PKG_SOURCE_URL:=https://www.coker.com.au/bonnie++
+PKG_HASH:=a8d33bbd81bc7eb559ce5bf6e584b9b53faea39ccfb4ae92e58f27257e468f0e
PKG_MAINTAINER:=
PKG_LICENSE:=GPL-2.0
PKG_LICENSE_FILES:=copyright.txt
-PKG_FIXUP:=autoreconf
-PKG_BUILD_PARALLEL:=1
+PKG_INSTALL:=1
+PKG_BUILD_DEPENDS:=meson/host
-include $(INCLUDE_DIR)/uclibc++.mk
include $(INCLUDE_DIR)/package.mk
+include ../../devel/meson/meson.mk
define Package/bonniexx
SECTION:=utils
CATEGORY:=Utilities
- DEPENDS:=$(CXX_DEPENDS) +libpthread
+ DEPENDS:=+libstdcpp +libpthread
TITLE:=Bonnie++ - hard drive bottleneck testing program.
URL:=https://www.coker.com.au/bonnie++/
endef
tests of hard drive and file system performance.
endef
-TARGET_CXXFLAGS += -ffunction-sections -fdata-sections -fno-rtti -flto
+MESON_ARGS += \
+ -Db_lto=true \
+ -Dcpp_eh=none \
+ -Dcpp_rtti=false
+
+TARGET_CXXFLAGS += -ffunction-sections -fdata-sections
define Package/bonniexx/install
$(INSTALL_DIR) $(1)/usr/bin
- $(CP) $(PKG_BUILD_DIR)/bonnie++ $(1)/usr/bin/
- $(CP) $(PKG_BUILD_DIR)/bon_csv2html $(1)/usr/bin/
+ $(CP) $(PKG_INSTALL_DIR)/usr/bin/bonnie++ $(1)/usr/bin/
+ $(CP) $(PKG_INSTALL_DIR)/usr/bin/bon_csv2html $(1)/usr/bin/
endef
$(eval $(call BuildPackage,bonniexx))
--- /dev/null
+--- /dev/null
++++ b/conf.h.meson
+@@ -0,0 +1 @@
++#mesondefine HAVE_ALGORITHM
+--- /dev/null
++++ b/meson.build
+@@ -0,0 +1,73 @@
++project('bonnie++', 'cpp',
++ version : '2.00a',
++ default_options : [ 'cpp_std=c++11' ])
++
++cxx = meson.get_compiler('cpp')
++cdata = configuration_data()
++
++cdata.set('HAVE_ALGORITHM', cxx.has_header('algorithm'))
++
++configure_file(input : 'conf.h.meson',
++ output : 'conf.h',
++ configuration : cdata)
++
++bonniepp_incdir = include_directories('.')
++thread_dep = dependency('threads')
++
++add_global_arguments('-DHAVE_CONFIG_H', language : 'cpp')
++
++executable('bonnie++',
++ 'bonnie++.cpp',
++ 'bon_io.cpp',
++ 'bon_file.cpp',
++ 'bon_time.cpp',
++ 'semaphore.cpp',
++ 'sync.cpp',
++ 'thread.cpp',
++ 'bon_suid.cpp',
++ 'duration.cpp',
++ 'util.cpp',
++ 'rand.cpp',
++ install: true,
++ include_directories : bonniepp_incdir,
++ dependencies : thread_dep,
++)
++
++executable('bon_csv2html',
++ 'bon_csv2html.cpp',
++ install: true,
++ include_directories : bonniepp_incdir,
++)
++
++executable('zcav',
++ 'zcav.cpp',
++ 'thread.cpp',
++ 'zcav_io.cpp',
++ 'bon_suid.cpp',
++ 'duration.cpp',
++ install: true,
++ include_directories : bonniepp_incdir,
++ dependencies : [ thread_dep ]
++)
++
++executable('getc_putc',
++ 'getc_putc.cpp',
++ 'bon_suid.cpp',
++ 'duration.cpp',
++ 'util.cpp',
++ install: true,
++ include_directories : bonniepp_incdir,
++)
++
++executable('getc_putc_helper',
++ 'getc_putc_helper.cpp',
++ 'duration.cpp',
++ install: true,
++ include_directories : bonniepp_incdir,
++)
++
++executable('generate_randfile',
++ 'generate_randfile.cpp',
++ install: true,
++ include_directories : bonniepp_incdir,
++)
+++ /dev/null
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -7,12 +7,6 @@ SCRIPTS=bon_csv2txt
-
- prefix=@prefix@
- eprefix=@exec_prefix@
--#MORE_WARNINGS=-Weffc++
--WFLAGS=-Wall -W -Wshadow -Wpointer-arith -Wwrite-strings -pedantic -ffor-scope -Wcast-align -Wsign-compare -Wpointer-arith -Wwrite-strings -Wformat-security -Wswitch-enum -Winit-self $(MORE_WARNINGS)
--CFLAGS=-O2 @debug@ -DNDEBUG $(WFLAGS) $(MORECFLAGS)
--CXX=@CXX@ $(CFLAGS)
--LINK=@CXX@
--THREAD_LFLAGS=@thread_ldflags@
-
- INSTALL=@INSTALL@
- INSTALL_PROGRAM=@INSTALL_PROGRAM@
-@@ -34,22 +28,22 @@ GETCHSRC=getc_putc_helper.cpp duration.c
- GETCHOBJS=$(GETCHSRC:.cpp=.o)
-
- bonnie++: $(BONOBJS)
-- $(LINK) -o bonnie++ $(BONOBJS) $(THREAD_LFLAGS)
-+ $(CXX) $(CXXFLAGS) -o bonnie++ $(BONOBJS) @thread_ldflags@
-
- zcav: $(ZCAVOBJS)
-- $(LINK) -o zcav $(ZCAVOBJS) $(THREAD_LFLAGS)
-+ $(CXX) $(CXXFLAGS) -o zcav $(ZCAVOBJS) @thread_ldflags@
-
- getc_putc: $(GETCOBJS) getc_putc_helper
-- $(LINK) -o getc_putc $(GETCOBJS) $(THREAD_LFLAGS)
-+ $(CXX) $(CXXFLAGS) -o getc_putc $(GETCOBJS)
-
- getc_putc_helper: $(GETCHOBJS)
-- $(CXX) -o getc_putc_helper $(GETCHOBJS)
-+ $(CXX) $(CXXFLAGS) -o getc_putc_helper $(GETCHOBJS)
-
- bon_csv2html: bon_csv2html.o
-- $(LINK) bon_csv2html.o -o bon_csv2html
-+ $(CXX) $(CXXFLAGS) bon_csv2html.o -o bon_csv2html
-
- generate_randfile: generate_randfile.o
-- $(LINK) generate_randfile.o -o generate_randfile
-+ $(CXX) $(CXXFLAGS) generate_randfile.o -o generate_randfile
-
- install-bin: $(EXE) $(EXES)
- mkdir -p $(eprefix)/bin $(eprefix)/sbin
-@@ -63,7 +57,7 @@ install: install-bin
- @INSTALL_DATA@ $(MAN8) @mandir@/man8
-
- %.o: %.cpp
-- $(CXX) -c $<
-+ $(CXX) $(CXXFLAGS) -c $<
-
- clean:
- rm -f $(EXE) $(EXES) *.o build-stamp install-stamp
---- a/configure.in
-+++ b/configure.in
-@@ -31,7 +31,6 @@ fi
-
- dnl Checks for programs.
- AC_LANG_CPLUSPLUS
--AC_PROG_CC
- AC_PROG_CXX
- AC_PROG_CXXCPP
- AC_PROG_INSTALL
-@@ -66,7 +65,7 @@ AC_SUBST(linux_pthread)
- AC_TRY_COMPILE([#define _GNU_SOURCE
- #include <pthread.h>
- ] , [pthread_mutexattr_t attr;
-- pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE_NP);]
-+ pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE);]
- , linux_pthread="yes")
- if [[ -n "$linux_pthread" ]]; then
- linux_pthread="#define LINUX_PTHREAD"
-@@ -83,7 +82,7 @@ void * thread_func(void * param) { retur
- , thread_ldflags="-pthread")
-
- AC_SUBST(large_file)
--AC_TRY_RUN([#ifndef _LARGEFILE64_SOURCE
-+AC_TRY_COMPILE([#ifndef _LARGEFILE64_SOURCE
- #define _LARGEFILE64_SOURCE
- #endif
- #include <stdio.h>
--- /dev/null
+From 4f60ce245b3cfe2117fdaf00a9e74a49f769daca Mon Sep 17 00:00:00 2001
+From: Rosen Penev <rosenp@gmail.com>
+Date: Mon, 22 Feb 2021 16:03:21 -0800
+Subject: [PATCH] remove using namespace std
+
+Fixes: warning: using directive refers to implicitly-defined namespace 'std'
+
+Signed-off-by: Rosen Penev <rosenp@gmail.com>
+---
+ bon_time.cpp | 8 ++++----
+ bonnie++.cpp | 8 ++++----
+ bonnie.h | 2 --
+ duration.cpp | 4 +---
+ getc_putc.cpp | 2 +-
+ rand.cpp | 4 ++--
+ rand.h | 5 ++---
+ 7 files changed, 14 insertions(+), 19 deletions(-)
+
+--- a/bon_time.cpp
++++ b/bon_time.cpp
+@@ -26,12 +26,12 @@ void BonTimer::add_delta_report(report_s
+ }
+ else
+ {
+- m_delta[test].FirstStart = min(m_delta[test].FirstStart, rep.StartTime);
+- m_delta[test].LastStop = max(m_delta[test].LastStop, rep.EndTime);
++ m_delta[test].FirstStart = std::min(m_delta[test].FirstStart, rep.StartTime);
++ m_delta[test].LastStop = std::max(m_delta[test].LastStop, rep.EndTime);
+ }
+ m_delta[test].CPU += rep.CPU;
+ m_delta[test].Elapsed = m_delta[test].LastStop - m_delta[test].FirstStart;
+- m_delta[test].Latency = max(m_delta[test].Latency, rep.Latency);
++ m_delta[test].Latency = std::max(m_delta[test].Latency, rep.Latency);
+ }
+
+ BonTimer::BonTimer()
+@@ -56,7 +56,7 @@ BonTimer::Initialize()
+ void
+ BonTimer::add_latency(tests_t test, double t)
+ {
+- m_delta[test].Latency = max(m_delta[test].Latency, t);
++ m_delta[test].Latency = std::max(m_delta[test].Latency, t);
+ }
+
+ int BonTimer::print_cpu_stat(tests_t test)
+--- a/bonnie++.cpp
++++ b/bonnie++.cpp
+@@ -75,7 +75,7 @@ public:
+ void set_io_chunk_size(int size)
+ { delete m_buf; pa_new(size, m_buf, m_buf_pa); m_io_chunk_size = size; }
+ void set_file_chunk_size(int size)
+- { delete m_buf; m_buf = new char[max(size, m_io_chunk_size)]; m_file_chunk_size = size; }
++ { delete m_buf; m_buf = new char[std::max(size, m_io_chunk_size)]; m_file_chunk_size = size; }
+
+ // Return the page-aligned version of the local buffer
+ char *buf() { return m_buf_pa; }
+@@ -142,7 +142,7 @@ CGlobalItems::CGlobalItems(bool *exitFla
+ , m_buf(NULL)
+ , m_buf_pa(NULL)
+ {
+- pa_new(max(m_io_chunk_size, m_file_chunk_size), m_buf, m_buf_pa);
++ pa_new(std::max(m_io_chunk_size, m_file_chunk_size), m_buf, m_buf_pa);
+ SetName(".");
+ }
+
+@@ -407,8 +407,8 @@ int main(int argc, char *argv[])
+ usage();
+ }
+ #endif
+- globals.byte_io_size = min(file_size, globals.byte_io_size);
+- globals.byte_io_size = max(0, globals.byte_io_size);
++ globals.byte_io_size = std::min(file_size, globals.byte_io_size);
++ globals.byte_io_size = std::max(0, globals.byte_io_size);
+
+ if(machine == NULL)
+ {
+--- a/bonnie.h
++++ b/bonnie.h
+@@ -1,8 +1,6 @@
+ #ifndef BONNIE
+ #define BONNIE
+
+-using namespace std;
+-
+ #define BON_VERSION "2.00"
+ #define CSV_VERSION "1.98"
+
+--- a/duration.cpp
++++ b/duration.cpp
+@@ -1,5 +1,3 @@
+-using namespace std;
+-
+ #include <stdlib.h>
+
+ #include "duration.h"
+@@ -38,7 +36,7 @@ double Duration_Base::stop()
+ getTime(&tv);
+ double ret;
+ ret = tv - m_start;
+- m_max = max(m_max, ret);
++ m_max = std::max(m_max, ret);
+ return ret;
+ }
+
+--- a/getc_putc.cpp
++++ b/getc_putc.cpp
+@@ -140,7 +140,7 @@ int main(int argc, char *argv[])
+ int size = 0, wrote;
+ while(size < file_size)
+ {
+- wrote = write(FILE_FD, buf, min(sizeof(buf), (size_t)file_size - size));
++ wrote = write(FILE_FD, buf, std::min(sizeof(buf), (size_t)file_size - size));
+ if(wrote < 0)
+ {
+ fprintf(stderr, "Can't extend file - disk full?\n");
+--- a/rand.cpp
++++ b/rand.cpp
+@@ -31,7 +31,7 @@ bool Rand::seedFile(CPCCHAR name)
+ }
+ close(fd);
+ m_ind = -1;
+- m_name = string(name);
++ m_name = std::string(name);
+ return false;
+ }
+
+@@ -44,7 +44,7 @@ void Rand::seedNum(UINT num)
+ m_init = num;
+ char buf[12];
+ sprintf(buf, "%u", num);
+- m_name = string(buf);
++ m_name = std::string(buf);
+ }
+
+ void Rand::reset()
+--- a/rand.h
++++ b/rand.h
+@@ -1,7 +1,6 @@
+ #ifndef RAND_H
+ #define RAND_H
+
+-using namespace std;
+ #include "port.h"
+ #include <string>
+ #include <stdio.h>
+@@ -31,7 +30,7 @@ public:
+
+ int getSize() { return m_size; }
+
+- string getSeed() { return m_name; }
++ std::string getSeed() { return m_name; }
+
+ void reset();
+
+@@ -39,7 +38,7 @@ private:
+ int *m_arr;
+ int m_size;
+ int m_ind;
+- string m_name;
++ std::string m_name;
+ UINT m_init;
+
+ Rand(const Rand &t);
--- /dev/null
+From 4f4d854b7758da89ced4dc800fcbec11667d61c8 Mon Sep 17 00:00:00 2001
+From: Rosen Penev <rosenp@gmail.com>
+Date: Mon, 22 Feb 2021 16:05:54 -0800
+Subject: [PATCH] fix wrong printf off_t format
+
+It's long vs. long long. There's a macro for this.
+
+Signed-off-by: Rosen Penev <rosenp@gmail.com>
+---
+ port.h | 5 ++---
+ 1 file changed, 2 insertions(+), 3 deletions(-)
+
+--- a/port.h
++++ b/port.h
+@@ -3,14 +3,13 @@
+
+ #include "conf.h"
+
+-
+-
++#include <inttypes.h>
+
+ #ifndef _LARGEFILE64_SOURCE
+ #define _LARGEFILE64_SOURCE
+ #endif
+ #ifdef _LARGEFILE64_SOURCE
+-#define OFF_T_PRINTF "%lld"
++#define OFF_T_PRINTF "%" PRId64
+ #else
+ #define OFF_T_PRINTF "%d"
+ #endif
--- /dev/null
+From 2e3e25454a165d55cbcd4fc78539454d4e0d8d51 Mon Sep 17 00:00:00 2001
+From: Rosen Penev <rosenp@gmail.com>
+Date: Mon, 22 Feb 2021 16:07:02 -0800
+Subject: [PATCH] add missing cast
+
+Fixes -Wformat
+
+Signed-off-by: Rosen Penev <rosenp@gmail.com>
+---
+ bon_time.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/bon_time.cpp
++++ b/bon_time.cpp
+@@ -146,7 +146,7 @@ int BonTimer::print_stat(tests_t test, i
+ }
+ else
+ {
+- fprintf(m_fp, " %5d", stat);
++ fprintf(m_fp, " %5d", int(stat));
+ }
+ }
+ else
include $(TOPDIR)/rules.mk
PKG_NAME:=canutils
-PKG_VERSION:=2020.11.0
+PKG_VERSION:=2020.12.0
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/linux-can/can-utils/tar.gz/v$(PKG_VERSION)?
-PKG_HASH:=b8e53081c076fca248c39ae9ae5791359a81f1eb3e5fe23ff6fb0d0e1f1033fa
+PKG_HASH:=c5c22a00ce2ea7578d7617ac0affef8f47a349be58e708780d703b979f324a2b
PKG_BUILD_DIR:=$(BUILD_DIR)/can-utils-$(PKG_VERSION)
PKG_MAINTAINER:=Anton Glukhov <anton.a.glukhov@gmail.com>
+++ /dev/null
---- a/j1939cat.c
-+++ b/j1939cat.c
-@@ -13,6 +13,7 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
-+#include <time.h>
- #include <unistd.h>
-
- #include <linux/errqueue.h>
PKG_NAME:=dockerd
PKG_VERSION:=20.10.2
-PKG_RELEASE:=2
+PKG_RELEASE:=3
PKG_LICENSE:=Apache-2.0
PKG_LICENSE_FILES:=LICENSE
config_get data_root globals data_root "/opt/docker/"
config_get log_level globals log_level "warn"
config_get_bool iptables globals iptables "1"
+
+ # Don't add these options by default
+ # omission == docker defaults
config_get bip globals bip ""
+ config_get registry_mirrors globals registry_mirrors ""
+ config_get hosts globals hosts ""
. /usr/share/libubox/jshn.sh
json_init
json_add_string "data-root" "${data_root}"
json_add_string "log-level" "${log_level}"
+ json_add_boolean "iptables" "${iptables}"
[ -z "${bip}" ] || json_add_string "bip" "${bip}"
- json_add_array "registry-mirrors"
- config_list_foreach globals registry_mirrors json_add_array_string
- json_close_array
- json_add_array "hosts"
- config_list_foreach globals hosts json_add_array_string
- json_close_array
-
- json_add_boolean iptables "${iptables}"
- [ "${iptables}" -ne "0" ] && config_foreach iptables_add_blocking_rule firewall
-
+ [ -z "${registry_mirrors}" ] || json_add_array "registry-mirrors"
+ [ -z "${registry_mirrors}" ] || config_list_foreach globals registry_mirrors json_add_array_string
+ [ -z "${registry_mirrors}" ] || json_close_array
+ [ -z "${hosts}" ] || json_add_array "hosts"
+ [ -z "${hosts}" ] || config_list_foreach globals hosts json_add_array_string
+ [ -z "${hosts}" ] || json_close_array
json_dump > "${DOCKERD_CONF}"
+
+ [ "${iptables}" -eq "1" ] && config_foreach iptables_add_blocking_rule firewall
}
start_service() {
return
}
+ # Wait for a maximum of 10 second per command, retrying every millisecond
+ local iptables_wait_args="--wait 10 --wait-interval 1000"
+
# Ignore errors as it might already be present
- iptables --table filter --new DOCKER-USER 2>/dev/null
- if ! iptables --table filter --check DOCKER-USER --in-interface "${inbound}" --out-interface "${outbound}" ${extra_iptables_args} --jump DROP 2>/dev/null; then
+ iptables ${iptables_wait_args} --table filter --new DOCKER-USER 2>/dev/null
+ if ! iptables ${iptables_wait_args} --table filter --check DOCKER-USER --in-interface "${inbound}" --out-interface "${outbound}" ${extra_iptables_args} --jump REJECT 2>/dev/null; then
logger -t "dockerd-init" -p notice "Drop traffic from ${inbound} to ${outbound}"
- iptables --table filter --insert DOCKER-USER --in-interface "${inbound}" --out-interface "${outbound}" ${extra_iptables_args} --jump DROP
+ iptables ${iptables_wait_args} --table filter --insert DOCKER-USER --in-interface "${inbound}" --out-interface "${outbound}" ${extra_iptables_args} --jump REJECT
fi
}
# device
config globals 'globals'
-# option alt_config_file "/etc/docker/daemon.json"
- option data_root "/opt/docker/"
- option log_level "warn"
- list hosts "unix:///var/run/docker.sock"
- option bip "172.18.0.1/24"
-# option iptables "0"
-# list registry_mirrors "https://<my-docker-mirror-host>"
-# list registry_mirrors "https://hub.docker.com"
+# option alt_config_file '/etc/docker/daemon.json'
+ option data_root '/opt/docker/'
+ option log_level 'warn'
+ option iptables '1'
+# list hosts 'unix:///var/run/docker.sock'
+# option bip '172.18.0.1/24'
+# 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.
# See https://docs.docker.com/network/iptables/ for more details.
#
-# Copyright (C) 2006-2011 OpenWrt.org
-# Copyright (C) 2017-2018 Luiz Angelo Daros de Luca <luizluca@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:=hplip
-PKG_VERSION:=3.20.9
-PKG_RELEASE:=3
+PKG_VERSION:=3.21.2
+PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=@SF/hplip
-PKG_HASH:=36251189aa9cc349f6a3eacbb7ac3c4fd26fc9f087c9f75cee051010c85d2ddf
+PKG_HASH:=410421a13e62205d41bacd3215993c89e513fb4d7fab07e23e2720465aea7c41
PKG_MAINTAINER:=Luiz Angelo Daros de Luca <luizluca@gmail.com>
PKG_LICENSE:=GPL-2.0 GPL-2.0-or-later
# ui (qt3)
--- a/configure.in
+++ b/configure.in
-@@ -601,6 +601,10 @@ if test "$class_driver" = "no" && test "
+@@ -611,6 +611,10 @@ if test "$class_driver" = "no" && test "
else
AC_CHECK_LIB([usb-1.0], [libusb_init], [LIBS="$LIBS"], [AC_MSG_ERROR([cannot find libusb 1.0 support], 2)])
AC_CHECK_HEADERS(libusb-1.0/libusb.h, ,[AC_MSG_ERROR([cannot find libusb-1.0-devel support], 11)])
--- a/scan/sane/hpaio.c
+++ b/scan/sane/hpaio.c
-@@ -34,9 +34,7 @@
+@@ -34,7 +34,6 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <cups/cups.h>
#include "hpmud.h"
--#include "avahiDiscovery.h"
- #include "hp_ipp.h"
- #include "soap.h"
- #include "soapht.h"
-@@ -146,98 +144,6 @@ static int GetUriLine(char *buf, char *u
+
+ #ifdef HAVE_LIBAVAHI
+@@ -150,98 +149,6 @@ static int GetUriLine(char *buf, char *u
return i;
}
static int AddDevice(char *uri)
{
struct hpmud_model_attributes ma;
-@@ -290,7 +196,6 @@ static int DevDiscovery(int localOnly)
+@@ -294,7 +201,6 @@ static int DevDiscovery(int localOnly)
char uri[HPMUD_LINE_SIZE];
char *tail = message;
int i, scan_type, cnt=0, total=0, bytes_read;
char* token = NULL;
enum HPMUD_RESULT stat;
-@@ -305,39 +210,6 @@ static int DevDiscovery(int localOnly)
+@@ -308,38 +214,6 @@ static int DevDiscovery(int localOnly)
+ GetUriLine(tail, uri, &tail);
total += AddDevice(uri);
}
- //memset(message, 0, sizeof(message));
- /* Look for Network Scan devices if localonly flag if FALSE. */
- if (!localOnly)
- {
- }
- if (cups_printer)
- free(cups_printer);
--#ifdef HAVE_LIBNETSNMP
+-#ifdef HAVE_LIBAVAHI
- /* Discover NW scanners using Bonjour*/
-- //bytes_read = avahi_probe_nw_scanners();
- if( (avahi_probe_nw_scanners() == AVAHI_STATUS_OK) && (aUriBuf != NULL) )
- {
- token = strtok(aUriBuf, ";");
--- /dev/null
+Fix missing definition of uint64_t while compiling
+under uclibc or glibc
+
+https://bugs.launchpad.net/hplip/+bug/1826965
+
+--- a/scan/sane/OrbliteScan/LinuxCommon.h
++++ b/scan/sane/OrbliteScan/LinuxCommon.h
+@@ -2,6 +2,7 @@
+ #define H_LinuxCommon\r
+ \r
+ #include <sys/types.h>\r
++#include <stdint.h>\r
+ \r
+ /* Common typedefs for Linux */\r
+ \r
+++ /dev/null
-Fix missing definition of uint64_t while compiling
-under uclibc
-
-https://bugs.launchpad.net/hplip/+bug/1826965
-
---- a/scan/sane/OrbliteScan/LinuxCommon.h
-+++ b/scan/sane/OrbliteScan/LinuxCommon.h
-@@ -2,6 +2,7 @@
- #define H_LinuxCommon\r
- \r
- #include <sys/types.h>\r
-+#include <stdint.h>\r
- \r
- /* Common typedefs for Linux */\r
- \r
include $(TOPDIR)/rules.mk
PKG_NAME:=sane-backends
-PKG_VERSION:=1.0.31
+PKG_VERSION:=1.0.32
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=https://gitlab.com/sane-project/backends/uploads/8bf1cae2e1803aefab9e5331550e5d5d/
-PKG_HASH:=4a3b10fcb398ed854777d979498645edfe66fcac2f2fd2b9117a79ff45e2a5aa
+PKG_SOURCE_URL:=https://gitlab.com/sane-project/backends/uploads/104f09c07d35519cc8e72e604f11643f
+PKG_HASH:=3a28c237c0a72767086202379f6dc92dbb63ec08dfbab22312cba80e238bb114
PKG_MAINTAINER:=Luiz Angelo Daros de Luca <luizluca@gmail.com>
PKG_LICENSE:=GPL-2.0 GPL-2.0-or-later
--- a/Makefile.in
+++ b/Makefile.in
-@@ -442,7 +442,7 @@ target_alias = @target_alias@
+@@ -451,7 +451,7 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
+++ /dev/null
-https://gitlab.com/sane-project/backends/issues/237
-
---- a/backend/genesys/image_pipeline.cpp
-+++ b/backend/genesys/image_pipeline.cpp
-@@ -754,7 +754,11 @@ bool ImagePipelineNodeCalibrate::get_nex
-
- float value_f = static_cast<float>(value) / max_value;
- value_f = (value_f - offset_[curr_calib_i]) * multiplier_[curr_calib_i];
-+#if defined(__UCLIBC__)
-+ value_f = round(value_f * max_value);
-+#else
- value_f = std::round(value_f * max_value);
-+#endif
- value = clamp<std::int32_t>(static_cast<std::int32_t>(value_f), 0, max_value);
- set_raw_channel_to_row(out_data, x, ch, value, format);
-
+++ /dev/null
-From a380fb089499f6b5192c07ae2feaa3376997382f Mon Sep 17 00:00:00 2001
-From: Olaf Meeuwissen <paddy-hack@member.fsf.org>
-Date: Sun, 13 Sep 2020 18:47:32 +0900
-Subject: [PATCH] pixma: Restore old behaviour in case XML support is missing
-
-Fixes #345.
----
- backend/pixma/pixma_common.c | 4 ++--
- backend/pixma/pixma_common.h | 2 ++
- backend/pixma/pixma_mp150.c | 8 ++++++++
- backend/pixma/pixma_mp800.c | 8 ++++++++
- 4 files changed, 20 insertions(+), 2 deletions(-)
-
---- a/backend/pixma/pixma_common.c
-+++ b/backend/pixma/pixma_common.c
-@@ -56,8 +56,6 @@
-
- #if defined(HAVE_LIBXML2)
- # include <libxml/parser.h>
--#else
--# error "The pixma backend requires libxml2"
- #endif
-
- #include "pixma_rename.h"
-@@ -1241,6 +1239,7 @@ pixma_get_device_status (pixma_t * s, pi
- return s->ops->get_status (s, status);
- }
-
-+#if defined(HAVE_LIBXML2)
- static const char *
- format_xml_response(const char *resp_details)
- {
-@@ -1334,3 +1333,4 @@ clean:
- xmlFreeDoc(doc);
- return status;
- }
-+#endif
---- a/backend/pixma/pixma_common.h
-+++ b/backend/pixma/pixma_common.h
-@@ -205,7 +205,9 @@ uint8_t *pixma_newcmd (pixma_cmdbuf_t *,
- int pixma_exec (pixma_t *, pixma_cmdbuf_t *);
- int pixma_exec_short_cmd (pixma_t *, pixma_cmdbuf_t *, unsigned cmd);
- int pixma_map_status_errno (unsigned status);
-+#if defined(HAVE_LIBXML2)
- int pixma_parse_xml_response(const char *xml_message);
-+#endif
- /**@}*/
-
- #define pixma_fill_checksum(start, end) do { \
---- a/backend/pixma/pixma_mp150.c
-+++ b/backend/pixma/pixma_mp150.c
-@@ -322,6 +322,10 @@
- <ivec:param_set servicetype=\"scan\"><ivec:jobID>00000001</ivec:jobID>\
- </ivec:param_set></ivec:contents></cmd>"
-
-+#if !defined(HAVE_LIBXML2)
-+#define XML_OK "<ivec:response>OK</ivec:response>"
-+#endif
-+
- enum mp150_state_t
- {
- state_idle,
-@@ -459,7 +463,11 @@ send_xml_dialog (pixma_t * s, const char
- PDBG (pixma_dbg (10, "XML message sent to scanner:\n%s\n", xml_message));
- PDBG (pixma_dbg (10, "XML response back from scanner:\n%s\n", mp->cb.buf));
-
-+#if defined(HAVE_LIBXML2)
- return pixma_parse_xml_response((const char*)mp->cb.buf) == PIXMA_STATUS_OK;
-+#else
-+ return (strcasestr ((const char *) mp->cb.buf, XML_OK) != NULL);
-+#endif
- }
-
- static int
---- a/backend/pixma/pixma_mp800.c
-+++ b/backend/pixma/pixma_mp800.c
-@@ -152,6 +152,10 @@
- <ivec:param_set servicetype=\"scan\"><ivec:jobID>00000001</ivec:jobID>\
- </ivec:param_set></ivec:contents></cmd>"
-
-+#if !defined(HAVE_LIBXML2)
-+#define XML_OK "<ivec:response>OK</ivec:response>"
-+#endif
-+
- enum mp810_state_t
- {
- state_idle,
-@@ -291,7 +295,11 @@ static int send_xml_dialog (pixma_t * s,
- PDBG(pixma_dbg (10, "XML message sent to scanner:\n%s\n", xml_message));
- PDBG(pixma_dbg (10, "XML response back from scanner:\n%s\n", mp->cb.buf));
-
-+#if defined(HAVE_LIBXML2)
- return pixma_parse_xml_response((const char*)mp->cb.buf) == PIXMA_STATUS_OK;
-+#else
-+ return (strcasestr ((const char *) mp->cb.buf, XML_OK) != NULL);
-+#endif
- }
-
- static void new_cmd_tpu_msg (pixma_t *s, pixma_cmdbuf_t * cb, uint16_t cmd)
PKG_NAME:=screen
PKG_VERSION:=4.8.0
-PKG_RELEASE:=1
+PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=@GNU/screen
--- /dev/null
+Description: [CVE-2021-26937] Fix out of bounds array access
+Author: Michael Schröder <mls@suse.de>
+Bug-Debian: https://bugs.debian.org/982435
+Bug: https://savannah.gnu.org/bugs/?60030
+Bug: https://lists.gnu.org/archive/html/screen-devel/2021-02/msg00000.html
+Bug-OSS-Security: https://www.openwall.com/lists/oss-security/2021/02/09/3
+Origin: https://lists.gnu.org/archive/html/screen-devel/2021-02/msg00010.html
+
+--- a/encoding.c
++++ b/encoding.c
+@@ -43,7 +43,7 @@ static int encmatch __P((char *, char *
+ # ifdef UTF8
+ static int recode_char __P((int, int, int));
+ static int recode_char_to_encoding __P((int, int));
+-static void comb_tofront __P((int, int));
++static void comb_tofront __P((int));
+ # ifdef DW_CHARS
+ static int recode_char_dw __P((int, int *, int, int));
+ static int recode_char_dw_to_encoding __P((int, int *, int));
+@@ -1263,6 +1263,8 @@ int c;
+ {0x30000, 0x3FFFD},
+ };
+
++ if (c >= 0xdf00 && c <= 0xdfff)
++ return 1; /* dw combining sequence */
+ return ((bisearch(c, wide, sizeof(wide) / sizeof(struct interval) - 1)) ||
+ (cjkwidth &&
+ bisearch(c, ambiguous,
+@@ -1330,11 +1332,12 @@ int c;
+ }
+
+ static void
+-comb_tofront(root, i)
+-int root, i;
++comb_tofront(i)
++int i;
+ {
+ for (;;)
+ {
++ int root = i >= 0x700 ? 0x801 : 0x800;
+ debug1("bring to front: %x\n", i);
+ combchars[combchars[i]->prev]->next = combchars[i]->next;
+ combchars[combchars[i]->next]->prev = combchars[i]->prev;
+@@ -1396,9 +1399,9 @@ struct mchar *mc;
+ {
+ /* full, recycle old entry */
+ if (c1 >= 0xd800 && c1 < 0xe000)
+- comb_tofront(root, c1 - 0xd800);
++ comb_tofront(c1 - 0xd800);
+ i = combchars[root]->prev;
+- if (c1 == i + 0xd800)
++ if (i == 0x800 || i == 0x801 || c1 == i + 0xd800)
+ {
+ /* completely full, can't recycle */
+ debug("utf8_handle_comp: completely full!\n");
+@@ -1422,7 +1425,7 @@ struct mchar *mc;
+ mc->font = (i >> 8) + 0xd8;
+ mc->fontx = 0;
+ debug3("combinig char %x %x -> %x\n", c1, c, i + 0xd800);
+- comb_tofront(root, i);
++ comb_tofront(i);
+ }
+
+ #else /* !UTF8 */
include $(TOPDIR)/rules.mk
PKG_NAME:=yq
-PKG_VERSION:=4.5.1
+PKG_VERSION:=4.6.0
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/mikefarah/yq/tar.gz/v$(PKG_VERSION)?
-PKG_HASH:=6fef6989069d241dead6203e5cd3e647511b5a9fb73c1c0bddb03a17e36c4037
+PKG_HASH:=67c2c4d832da46e3f2d2f364f8b85af5468c9dc1800d5cf066bd25ff5beb9a66
-PKG_MAINTAINER:=Tianling Shen <cnsztl@project-openwrt.eu.org>
+PKG_MAINTAINER:=
PKG_LICENSE:=MIT
PKG_LICENSE_FILES:=LICENSE
projects / feed / packages.git / commitdiff