- arch: mips_24kc
target: ath79-generic
runtime_test: false
-
+
- arch: mipsel_24kc
target: mt7621
runtime_test: false
echo "PACKAGES=$PACKAGES" >> $GITHUB_ENV
- name: Build
- uses: openwrt/gh-action-sdk@v3
+ uses: openwrt/gh-action-sdk@v4
env:
ARCH: ${{ matrix.arch }}-${{ env.BRANCH }}
FEEDNAME: packages_ci
include $(TOPDIR)/rules.mk
PKG_NAME:=perl-net-dns
-PKG_VERSION:=1.32
+PKG_VERSION:=1.33
PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE_NAME:=Net-DNS
PKG_SOURCE:=$(PKG_SOURCE_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://www.net-dns.org/download
-PKG_HASH:=b890a7b44d573f27cc713caadf1e12eaaa4478a6504d1157194df614316b5b50
+PKG_HASH:=5a40e7cf524e4bd2c33cf03b82b47d5308b712083aa5ee180b0b5af54c71fbd2
PKG_BUILD_DIR:=$(BUILD_DIR)/perl/$(PKG_SOURCE_NAME)-$(PKG_VERSION)
HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/perl/$(PKG_SOURCE_NAME)-$(PKG_VERSION)
PECL_NAME:=pecl_http
PECL_LONGNAME:=Extended HTTP Support
-PKG_VERSION:=4.2.1
-PKG_RELEASE:=2
-PKG_HASH:=ab07d55ccdfa897c897c26f1c0851b557b363431766c9ea4c799ea61443bdcdc
+PKG_VERSION:=4.2.2
+PKG_RELEASE:=1
+PKG_HASH:=c338afd29259f0093f07f4e99b80705a2d5bb046c7ab32e5938eef29bbb63a6e
PKG_NAME:=php8-pecl-http
PKG_SOURCE:=$(PECL_NAME)-$(PKG_VERSION).tgz
include $(TOPDIR)/rules.mk
PKG_NAME:=php
-PKG_VERSION:=8.1.3
+PKG_VERSION:=8.1.4
PKG_RELEASE:=1
PKG_MAINTAINER:=Michael Heimpold <mhei@heimpold.de>
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=http://www.php.net/distributions/
-PKG_HASH:=5d65a11071b47669c17452fb336c290b67c101efb745c1dbe7525b5caf546ec6
+PKG_HASH:=05a8c0ac30008154fb38a305560543fc172ba79fb957084a99b8d3b10d5bdb4b
PKG_BUILD_PARALLEL:=1
PKG_USE_MIPS16:=0
PKG_NAME:=Flask
PKG_VERSION:=2.0.2
-PKG_RELEASE:=1
+PKG_RELEASE:=$(AUTORELEASE)
PYPI_NAME:=$(PKG_NAME)
PKG_HASH:=7b2fb8e934ddd50731893bdcdb00fc8c0315916f9fcd50d22c7cc1a95ab634e2
-PKG_MAINTAINER:=Daniel Golle <daniel@makrotopia.org>
+PKG_MAINTAINER:=Josef Schlehofer <josef.schlehofer@nic.cz>
PKG_LICENSE:=BSD-3-Clause
PKG_LICENSE_FILES:=LICENSE.rst
PKG_CPE_ID:=cpe:/a:palletsprojects:flask
PYPI_NAME:=$(PKG_NAME)
PKG_HASH:=611bb273cd68f3b993fabdc4064fc858c5b47a973cb5aa7999ec1ba405c87cd7
-PKG_MAINTAINER:=Daniel Golle <daniel@makrotopia.org>
+PKG_MAINTAINER:=Josef Schlehofer <josef.schlehofer@nic.cz>
PKG_LICENSE:=BSD-3-Clause
PKG_LICENSE_FILES:=LICENSE
PKG_CPE_ID:=cpe:/a:pocoo:jinja2
+++ /dev/null
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=Mako
-PKG_VERSION:=1.1.5
-PKG_RELEASE:=1
-
-PYPI_NAME:=$(PKG_NAME)
-PKG_HASH:=169fa52af22a91900d852e937400e79f535496191c63712e3b9fda5a9bed6fc3
-
-PKG_MAINTAINER:=Daniel Golle <daniel@makrotopia.org>
-PKG_LICENSE:=BSD-3-Clause
-PKG_LICENSE_FILES:=LICENSE.rst
-PKG_CPE_ID:=cpe:/a:palletsprojects:flask
-
-HOST_BUILD_DEPENDS:=python3/host
-
-include ../pypi.mk
-include $(INCLUDE_DIR)/host-build.mk
-include $(INCLUDE_DIR)/package.mk
-include ../python3-package.mk
-
-define Package/python3-mako
- SECTION:=lang
- CATEGORY:=Languages
- SUBMENU:=Python
- TITLE:=Mako
- URL:=https://www.makotemplates.org/
- DEPENDS:=+python3-light
-endef
-
-define Package/python3-mako/description
- Mako is a template library written in Python.
-endef
-
-define Host/Compile
- $(call HostPython3/ModSetup,,install --prefix="" --root="$(STAGING_DIR_HOSTPKG)")
-endef
-
-Host/Install:=
-
-$(eval $(call Py3Package,python3-mako))
-$(eval $(call BuildPackage,python3-mako))
-$(eval $(call BuildPackage,python3-mako-src))
-$(eval $(call HostBuild))
# Note: keep in sync with setuptools & pip
PYTHON3_VERSION_MAJOR:=3
PYTHON3_VERSION_MINOR:=10
-PYTHON3_VERSION_MICRO:=2
+PYTHON3_VERSION_MICRO:=3
PYTHON3_VERSION:=$(PYTHON3_VERSION_MAJOR).$(PYTHON3_VERSION_MINOR)
PYTHON3_PIP_PKG_RELEASE:=1
PYTHON3_SETUPTOOLS_VERSION:=58.1.0
-PYTHON3_PIP_VERSION:=21.2.4
+PYTHON3_PIP_VERSION:=22.0.4
PKG_SOURCE:=Python-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=https://www.python.org/ftp/python/$(PKG_VERSION)
-PKG_HASH:=17de3ac7da9f2519aa9d64378c603a73a0e9ad58dffa8812e45160c086de64c7
+PKG_HASH:=596c72de998dc39205bc4f70ef0dbf7edec740a306d09b49a9bd0a77806730dc
PKG_MAINTAINER:=Jeffery To <jeffery.to@gmail.com>
PKG_LICENSE:=PSF-2.0
--- a/setup.py
+++ b/setup.py
-@@ -830,7 +830,8 @@ class PyBuildExt(build_ext):
+@@ -832,7 +832,8 @@ class PyBuildExt(build_ext):
# only change this for cross builds for 3.3, issues on Mageia
if CROSS_COMPILING:
self.add_cross_compiling_paths()
--- a/configure
+++ b/configure
-@@ -15649,7 +15649,7 @@ $as_echo_n "checking ABIFLAGS... " >&6;
+@@ -15616,7 +15616,7 @@ $as_echo_n "checking ABIFLAGS... " >&6;
$as_echo "$ABIFLAGS" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking SOABI" >&5
$as_echo_n "checking SOABI... " >&6; }
--- a/configure.ac
+++ b/configure.ac
-@@ -4825,7 +4825,7 @@ AC_SUBST(SOABI)
+@@ -4824,7 +4824,7 @@ AC_SUBST(SOABI)
AC_MSG_CHECKING(ABIFLAGS)
AC_MSG_RESULT($ABIFLAGS)
AC_MSG_CHECKING(SOABI)
fi
elif test "$cross_compiling" = maybe; then
as_fn_error $? "Cross compiling required --host=HOST-TUPLE and --build=ARCH" "$LINENO" 5
-@@ -15719,7 +15719,7 @@ fi
+@@ -15686,7 +15686,7 @@ fi
fi
elif test "$cross_compiling" = maybe; then
AC_MSG_ERROR([Cross compiling required --host=HOST-TUPLE and --build=ARCH])
-@@ -4883,7 +4883,7 @@ fi],
+@@ -4882,7 +4882,7 @@ fi],
dnl define LIBPL after ABIFLAGS and LDVERSION is defined.
AC_SUBST(PY_ENABLE_SHARED)
/* Cached module state, also used in SSLSocket and SSLSession code. */
_sslmodulestate *state;
} PySSLContext;
-@@ -2346,8 +2359,14 @@ _ssl__SSLSocket_write_impl(PySSLSocket *
+@@ -2358,8 +2371,14 @@ _ssl__SSLSocket_write_impl(PySSLSocket *
do {
PySSL_BEGIN_ALLOW_THREADS
PySSL_END_ALLOW_THREADS
self->err = err;
-@@ -2498,8 +2517,14 @@ _ssl__SSLSocket_read_impl(PySSLSocket *s
+@@ -2510,8 +2529,14 @@ _ssl__SSLSocket_read_impl(PySSLSocket *s
do {
PySSL_BEGIN_ALLOW_THREADS
PySSL_END_ALLOW_THREADS
self->err = err;
-@@ -3062,8 +3087,10 @@ _ssl__SSLContext_impl(PyTypeObject *type
+@@ -3074,8 +3099,10 @@ _ssl__SSLContext_impl(PyTypeObject *type
self->hostflags = X509_CHECK_FLAG_NO_PARTIAL_WILDCARDS;
self->protocol = proto_version;
self->msg_cb = NULL;
self->alpn_protocols = NULL;
self->set_sni_cb = NULL;
self->state = get_ssl_state(module);
-@@ -3187,6 +3214,7 @@ context_clear(PySSLContext *self)
+@@ -3199,6 +3226,7 @@ context_clear(PySSLContext *self)
{
Py_CLEAR(self->set_sni_cb);
Py_CLEAR(self->msg_cb);
Py_CLEAR(self->keylog_filename);
if (self->keylog_bio != NULL) {
PySSL_BEGIN_ALLOW_THREADS
-@@ -3194,6 +3222,7 @@ context_clear(PySSLContext *self)
+@@ -3206,6 +3234,7 @@ context_clear(PySSLContext *self)
PySSL_END_ALLOW_THREADS
self->keylog_bio = NULL;
}
return 0;
}
-@@ -4603,8 +4632,10 @@ static PyGetSetDef context_getsetlist[]
+@@ -4615,8 +4644,10 @@ static PyGetSetDef context_getsetlist[]
(setter) set_minimum_version, NULL},
{"maximum_version", (getter) get_maximum_version,
(setter) set_maximum_version, NULL},
include $(TOPDIR)/rules.mk
PKG_NAME:=vala
-PKG_VERSION:=0.54.2
+PKG_VERSION:=0.54.8
PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=@GNOME/vala/0.54
-PKG_HASH:=884de745317d4d56e4e8cede993dc8f04d50cfca36cf60d2f2f278c30c2b1311
+PKG_HASH:=edfb3e79486a4bf48cebaea9291e57fc77da9322b6961e9549df6d973d04bc80,
PKG_MAINTAINER:=
PKG_LICENSE:=LGPL-2.1-or-later
PKG_NAME:=afalg_engine
PKG_VERSION:=1.2.0-beta.1
-PKG_RELEASE:=1
+PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://github.com/cotequeiroz/afalg_engine/archive/v$(PKG_VERSION)
include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/cmake.mk
+include $(INCLUDE_DIR)/openssl-engine.mk
-ENGINES_DIR:=engines-1.1
-
+$(eval $(call Package/openssl/add-engine,afalg,libopenssl-afalg_sync))
define Package/libopenssl-afalg_sync
- SECTION:=libs
- CATEGORY:=Libraries
- SUBMENU:=SSL
- MDEPENDS:=libopenssl
+ $(call Package/openssl/engine/Default)
TITLE:=AF_ALG engine using sync crypto API
URL:=https://github.com/cotequeiroz/afalg_engine
- DEPENDS:=libopenssl @OPENSSL_ENGINE @!OPENSSL_ENGINE_BUILTIN_AFALG \
- +libopenssl-conf +kmod-crypto-user
+ DEPENDS += @!OPENSSL_ENGINE_BUILTIN_AFALG +kmod-crypto-user
CONFLICTS:=libopenssl-afalg $(if $(CONFIG_AFALG_FALLBACK),libopenssl-devcrypto)
MENU:=1
endef
-DUPDATE_CTR_IV=$(if $(CONFIG_AFALG_UPDATE_CTR_IV),ON,OFF) \
-DUSE_ZERO_COPY=$(if $(CONFIG_AFALG_ZERO_COPY),ON,OFF)
-define Package/libopenssl-afalg_sync/install
- $(INSTALL_DIR) $(1)/usr/lib/$(ENGINES_DIR)
- $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/$(ENGINES_DIR)/afalg.so \
- $(1)/usr/lib/$(ENGINES_DIR)/
-endef
-
$(eval $(call BuildPackage,libopenssl-afalg_sync))
--- /dev/null
+[afalg]
+# Leave this alone and configure algorithms with CIPERS/DIGESTS below
+default_algorithms = ALL
+
+# The following commands are only available if using the alternative
+# (sync) AFALG engine
+# Configuration commands:
+# Run 'openssl engine -t -c -vv -pre DUMP_INFO devcrypto' to see a
+# list of supported algorithms, along with their driver, whether they
+# are hw accelerated or not, and the engine's configuration commands.
+
+# USE_SOFTDRIVERS: specifies whether to use software (not accelerated)
+# drivers (0=use only accelerated drivers, 1=allow all drivers, 2=use
+# if acceleration can't be determined) [default=2]
+#USE_SOFTDRIVERS = 2
+
+# CIPHERS: either ALL, NONE, NO_ECB (all except ECB-mode) or a
+# comma-separated list of ciphers to enable [default=NO_ECB]
+# Starting in 1.2.0, if you use a cipher list, each cipher may be
+# followed by a colon (:) and the minimum request length to use
+# AF_ALG drivers for that cipher; smaller requests are processed by
+# softare; a negative value will use the default for that cipher
+#CIPHERS=AES-128-CBC:1024, AES-256-CBC:768, DES-EDE3-CBC:0
+
+# DIGESTS: either ALL, NONE, or a comma-separated list of digests to
+# enable [default=NONE]
+# It is strongly recommended not to enable digests; their performance
+# is poor, and there are many cases in which they will not work,
+# especially when calling fork with open crypto contexts. Openssh,
+# for example, does this, and you may not be able to login.
+#DIGESTS = NONE
+
include $(TOPDIR)/rules.mk
PKG_NAME:=glib2
-PKG_VERSION:=2.70.0
+PKG_VERSION:=2.70.4
PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE:=glib-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=@GNOME/glib/2.70
-PKG_HASH:=200d7df811c5ba634afbf109f14bb40ba7fde670e89389885da14e27c0840742
+PKG_HASH:=ab3d176f3115dcc4e5d02db795984e04e4f4b48d836252e23e8c468e9d423c33
PKG_MAINTAINER:=Peter Wagner <tripolar@gmx.at>
PKG_LICENSE:=LGPL-2.1-or-later
PKG_CONFIG_DEPENDS:=CONFIG_BUILD_NLS
PKG_INSTALL:=1
+HOST_PATCH_DIR:=./patches-host
+
include $(INCLUDE_DIR)/host-build.mk
include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/nls.mk
The GLib library of C routines
endef
-HOST_LDFLAGS += -Wl,-rpath,$(STAGING_DIR_HOSTPKG)/lib
TARGET_CFLAGS += -ffunction-sections -fdata-sections
TARGET_LDFLAGS += -Wl,--gc-sections $(if $(INTL_FULL),-lintl)
--- /dev/null
+--- a/meson.build
++++ b/meson.build
+@@ -2047,9 +2047,6 @@ endif
+ # FIXME: glib-gettext.m4 has much more checks to detect broken/uncompatible
+ # implementations. This could be extended if issues are found in some platforms.
+ libintl_deps = []
+-if cc.has_function('ngettext', args : osx_ldflags)
+- have_bind_textdomain_codeset = cc.has_function('bind_textdomain_codeset')
+-else
+ # First just find the bare library.
+ libintl = cc.find_library('intl', required : false)
+ # The bare library probably won't link without help if it's static.
+@@ -2081,7 +2078,6 @@ else
+ have_bind_textdomain_codeset = cc.has_function('bind_textdomain_codeset', args : osx_ldflags,
+ dependencies : libintl_deps)
+ endif
+-endif
+
+ glib_conf.set('HAVE_BIND_TEXTDOMAIN_CODESET', have_bind_textdomain_codeset)
+
--- a/meson.build
+++ b/meson.build
-@@ -949,7 +949,7 @@ if host_system == 'windows' and (cc.get_
+@@ -948,7 +948,7 @@ if host_system == 'windows' and (cc.get_
glib_conf.set('HAVE_C99_SNPRINTF', false)
glib_conf.set('HAVE_C99_VSNPRINTF', false)
glib_conf.set('HAVE_UNIX98_PRINTF', false)
include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/cmake.mk
+include $(INCLUDE_DIR)/openssl-engine.mk
PKG_UNPACK:=$(HOST_TAR) -C "$(PKG_BUILD_DIR)" --strip-components=1 -xzf "$(DL_DIR)/$(PKG_SOURCE)"
PKG_INSTALL:=
-ENGINES_DIR:=engines-1.1
-
define Package/gost_engine/Default
+ $(call Package/openssl/engine/Default)
TITLE:=GOST engine for OpenSSL
URL:=http://www.openssl.org/
- SECTION:=libs
- CATEGORY:=Libraries
endef
define Package/gost_engine/Default/description
Russian GOST crypto algorithms for OpenSSL.
endef
+$(eval $(call Package/openssl/add-engine,gost,libopenssl-gost_engine))
define Package/libopenssl-gost_engine
$(call Package/gost_engine/Default)
- SUBMENU:=SSL
+ $(call Package/openssl/engine/Default)
TITLE+= (library)
URL:=https://github.com/gost-engine/engine/
- DEPENDS:=libopenssl @OPENSSL_ENGINE +libopenssl-conf
endef
define Package/libopenssl-gost_engine/description
CMAKE_OPTIONS += -DOPENSSL_ENGINES_DIR=/usr/lib/$(ENGINES_DIR)
define Package/libopenssl-gost_engine/install
- $(INSTALL_DIR) $(1)/usr/lib/$(ENGINES_DIR)
+ $(INSTALL_DIR) $(1)/usr/lib/$(ENGINES_DIR) $(1)/etc/ssl/engines.cnf.d
$(INSTALL_DATA) $(PKG_BUILD_DIR)/bin/gost.so \
$(1)/usr/lib/$(ENGINES_DIR)/
+ $(INSTALL_DATA) ./files/gost.cnf $(1)/etc/ssl/engines.cnf.d/
endef
define Package/gost_engine-util/install
--- /dev/null
+[gost]
+default_algorithms = ALL
+# CRYPT_PARAMS: OID of default GOST 28147-89 parameters It allows the
+# user to choose between different parameter sets of symmetric cipher
+# algorithm. RFC 4357 specifies several parameters for the
+# GOST 28147-89 algorithm, but OpenSSL doesn't provide user interface
+# to choose one when encrypting. So use engine configuration parameter
+# instead.
+# Value of this parameter can be either short name, defined in OpenSSL
+# obj_dat.h header file or numeric representation of OID, defined in
+# RFC 4357. Defaults to id-tc26-gost-28147-param-Z
+#CRYPT_PARAMS = id-tc26-gost-28147-param-Z
+
+# PBE_PARAMS: Shortname of default digest alg for PBE
+#PBE_PARAMS =
+
include $(TOPDIR)/rules.mk
PKG_NAME:=gpgme
-PKG_VERSION:=1.16.0
-PKG_RELEASE:=2
+PKG_VERSION:=1.17.1
+PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=https://gnupg.org/ftp/gcrypt/$(PKG_NAME)
-PKG_HASH:=6c8cc4aedb10d5d4c905894ba1d850544619ee765606ac43df7405865de29ed0
+PKG_HASH:=711eabf5dd661b9b04be9edc9ace2a7bc031f6bd9d37a768d02d0efdef108f5f
PKG_MAINTAINER:=Daniel Golle <daniel@makrotopia.org>
PKG_LICENSE:=GPL-3.0-or-later
+++ /dev/null
-From: Jiri Kucera <sanczes@gmail.com>
-Date: Sun, 25 Jul 2021 09:35:54 +0000 (+0200)
-Subject: core: Support closefrom also for glibc.
-X-Git-Url: http://git.gnupg.org/cgi-bin/gitweb.cgi?p=gpgme.git;a=commitdiff_plain;h=4b64774b6d13ffa4f59dddf947a97d61bcfa2f2e
-
-core: Support closefrom also for glibc.
-
-* src/posix-io.c (_gpgme_io_spawn): Use glibc's closefrom.
---
-
-Since 2.34, glibc introduces closefrom (the implementation
-follows *BSD standard).
-
-Signed-off-by: Werner Koch <wk@gnupg.org>
----
-
---- a/src/posix-io.c
-+++ b/src/posix-io.c
-@@ -570,7 +570,7 @@ _gpgme_io_spawn (const char *path, char
- if (fd_list[i].fd > fd)
- fd = fd_list[i].fd;
- fd++;
--#if defined(__sun) || defined(__FreeBSD__)
-+#if defined(__sun) || defined(__FreeBSD__) || defined(__GLIBC__)
- closefrom (fd);
- max_fds = fd;
- #else /*!__sun */
include $(TOPDIR)/rules.mk
PKG_NAME:=libinput
-PKG_VERSION:=1.19.2
+PKG_VERSION:=1.19.3
PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=http://www.freedesktop.org/software/libinput
-PKG_HASH:=0fc39f0af3ee1a77c60c34bc45391a4d0879169f7c0f7bbbeb5eef590b98b883
+PKG_HASH:=3cae78ccde19d7d0f387e58bc734d4d17ab5f6426f54a9e8b728c90b17baa068
PKG_MAINTAINER:=Daniel Golle <daniel@makrotopia.org>
PKG_LICENSE:=MIT
PKG_NAME:=liboping
PKG_VERSION:=1.10.0
-PKG_RELEASE:=2
+PKG_RELEASE:=$(AUTORELEASE)
PKG_MAINTAINER:=Jo-Philipp Wich <jo@mein.io>
PKG_LICENSE:=LGPL-2.1-or-later
--- /dev/null
+--- a/src/oping.c
++++ b/src/oping.c
+@@ -1125,7 +1125,7 @@ static int update_graph_prettyping (ping
+ wattron (ctx->window, COLOR_PAIR(color));
+
+ if (has_utf8())
+- mvwprintw (ctx->window, /* y = */ 3, /* x = */ x + 2, symbol);
++ mvwprintw (ctx->window, /* y = */ 3, /* x = */ x + 2, "%s", symbol);
+ else
+ mvwaddch (ctx->window, /* y = */ 3, /* x = */ x + 2, symbolc);
+
+@@ -1223,7 +1223,7 @@ static int update_graph_histogram (ping_
+ mvwaddch (ctx->window, /* y = */ 3, /* x = */ x + 2, ' ');
+ else if (has_utf8 ())
+ mvwprintw (ctx->window, /* y = */ 3, /* x = */ x + 2,
+- hist_symbols_utf8[index]);
++ "%s", hist_symbols_utf8[index]);
+ else
+ mvwaddch (ctx->window, /* y = */ 3, /* x = */ x + 2,
+ hist_symbols_acs[index] | A_ALTCHARSET);
+@@ -1600,8 +1600,7 @@ static void update_host_hook (pingobj_it
+
+ HOST_PRINTF ("%zu bytes from %s (%s): icmp_seq=%u ttl=%i ",
+ data_len, context->host, context->addr,
+- sequence, recv_ttl,
+- format_qos (recv_qos, recv_qos_str, sizeof (recv_qos_str)));
++ sequence, recv_ttl);
+ if ((recv_qos != 0) || (opt_send_qos != 0))
+ {
+ HOST_PRINTF ("qos=%s ",
include $(TOPDIR)/rules.mk
PKG_NAME:=libudev-zero
-PKG_VERSION:=1.0.0
+PKG_VERSION:=1.0.1
PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/illiliti/libudev-zero/tar.gz/$(PKG_VERSION)?
-PKG_HASH:=68c20aefd7aa89abe446cf5ec76f5846315ded719f0665eabed9261cc3c7f47a
+PKG_HASH:=c4cf149ea96295c1e6e86038d10c725344c751982ed4a790b06c76776923e0ea
PKG_MAINTAINER:=Daniel Golle <daniel@makrotopia.org>
PKG_LICENSE:=MIT
+++ /dev/null
-From 3c2593376a7870c8ae6411ff3fc83c13da98f219 Mon Sep 17 00:00:00 2001
-From: illiliti <illiliti@protonmail.com>
-Date: Thu, 2 Sep 2021 21:39:59 +0300
-Subject: [PATCH 01/15] readme: future directions
-
----
- README.md | 6 ++++++
- 1 file changed, 6 insertions(+)
-
---- a/README.md
-+++ b/README.md
-@@ -71,6 +71,12 @@ for example how it could be implemented
- Don't hesitate to ask me everything you don't understand. I'm usually hanging
- around in #kisslinux at libera.chat, but you can also email me or open an issue here.
-
-+## Future directions
-+
-+1. Write a better cross-platform(*nix, maybe macos and windows) device enumeration library.
-+2. Convince mainstream apps(libinput, wlroots, ...) to use new library instead of libudev.
-+3. Declare libudev as obsolete library and archive this project.
-+
- ## Donate
-
- You can send a donation to `BTC: 1BwrcsgtWZeLVvNeEQSg4A28a3yrGN3FpK`
+++ /dev/null
-From c7669d8eecd831e278bee8f5ee591d5b6577a445 Mon Sep 17 00:00:00 2001
-From: illiliti <illiliti@protonmail.com>
-Date: Sun, 5 Sep 2021 17:22:32 +0300
-Subject: [PATCH 02/15] udev_enumerate.c: fix endless loop in filter_property
-
----
- udev_enumerate.c | 12 +++++-------
- 1 file changed, 5 insertions(+), 7 deletions(-)
-
---- a/udev_enumerate.c
-+++ b/udev_enumerate.c
-@@ -175,13 +175,11 @@ static int filter_property(struct udev_e
- property2 = udev_list_entry_get_name(list_entry2);
- value2 = udev_list_entry_get_value(list_entry2);
-
-- if (!value || !value2) {
-- continue;
-- }
--
-- if (fnmatch(property, property2, 0) == 0 &&
-- fnmatch(value, value2, 0) == 0) {
-- return 1;
-+ if (value && value2) {
-+ if (fnmatch(property, property2, 0) == 0 &&
-+ fnmatch(value, value2, 0) == 0) {
-+ return 1;
-+ }
- }
-
- list_entry2 = udev_list_entry_get_next(list_entry2);
+++ /dev/null
-From 99676e0e0463dc5674c6aff1d158ae3c796815d9 Mon Sep 17 00:00:00 2001
-From: illiliti <illiliti@protonmail.com>
-Date: Tue, 7 Sep 2021 01:49:28 +0300
-Subject: [PATCH 03/15] readme: What works -> What doesn't work
-
----
- README.md | 23 ++++++++++++-----------
- 1 file changed, 12 insertions(+), 11 deletions(-)
-
---- a/README.md
-+++ b/README.md
-@@ -24,17 +24,18 @@ of `libudev` which can be used with any
- [0] https://github.com/FreeBSDDesktop/libudev-devd
- [1] https://github.com/oasislinux/libinput
-
--## What Works
-+## What doesn't work
-
--* [x] xorg-server
--* [ ] dosfstools - need to implement udev_enumerate_add_match_parent()
--* [x] libinput
--* [x] usbutils
--* [x] wlroots
--* [x] weston
--* [x] libusb
--* [x] kwin
--* [ ] ???
-+* dosfstools - requires udev_enumerate_add_match_parent()
-+* PulseAudio - highly depends on udev internal properties
-+* udisks2 - highly depends on udev internal properties
-+* android-tools - requires udev rules for non-root usage
-+* NetworkManager - needs investigation
-+* libgudev - needs investigation
-+* PipeWare - depends on udev internal properties
-+* ldm - depends on udev internal properties
-+* lvm2 - uses deprecated `udev_queue` API
-+* ???
-
- ## Dependencies
-
+++ /dev/null
-From af4dc2ff14b020840bf5d4ac3501d639314fb55d Mon Sep 17 00:00:00 2001
-From: illiliti <illiliti@protonmail.com>
-Date: Wed, 8 Sep 2021 21:26:18 +0300
-Subject: [PATCH 04/15] readme: rewrite why, add pros/cons
-
----
- README.md | 50 +++++++++++++++++++++++++++++++-------------------
- 1 file changed, 31 insertions(+), 19 deletions(-)
-
---- a/README.md
-+++ b/README.md
-@@ -4,25 +4,37 @@ Drop-in replacement for `libudev` intend
-
- ## Why?
-
--Because `udev` sucks, it is bloated and overengineered. `udev` is just
--like `systemd`, it locks you into using non-portable crap that you can't
--avoid because multiple programs depend on it. Look, even FreeBSD was forced
--to rewrite[0] this crappy library because `libinput` hard-depends on `udev`.
--Without `libinput` you can't use `wayland` and many other cool stuff.
--
--Michael Forney (author of `cproc`, `samurai`, Oasis Linux, ...) decided to
--fork[1] `libinput` and remove the hard dependency on `udev`. However, this
--fork has a drawback that requires patching applications to use `libinput_netlink`
--instead of the `libinput_udev` API in order to use the automatic detection of
--input devices and hotplugging. Static configuration is also required for anything
--other than input devices (e.g drm devices).
--
--Thankfully `udev` has stable API and hopefully no changes will be made to it
--the future. On this basis I decided to create this clean-room implementation
--of `libudev` which can be used with any or without a device manager.
--
--[0] https://github.com/FreeBSDDesktop/libudev-devd
--[1] https://github.com/oasislinux/libinput
-+We all know that systemd is very hostile towards portability. Udev inherited
-+the same problem by exposing a very badly designed library interface. This is
-+dramatically reduces portability, user choice and basically creates vendor
-+lock-in because library interface highly tied to udev daemon.
-+
-+Another udev problem is non-portable home-grown language called "udev rules".
-+Udev authors definitely don't know(or care) why it's better to avoid reinventing
-+the wheel. Strictly speaking, I think they did that on purpose to overcomplicate
-+udev as much as possible. Why? So that only authors(RedHat/IBM) can rule and dictate
-+the future of udev. The recent eudev death only proves that it's really hard to
-+support such unmaintainable mess.
-+
-+Udev hwdb is yet another illustration of systemd-like approach. What the hell
-+"userspace /dev" has to do with parsing hardware database(pci.ids, usb.ids)
-+and setting/remapping buttons? Udev smells like systemd by trying to implement
-+all possible functionality in the single daemon/code base. Standalone UNIX-way
-+programs much better suited for such purposes.
-+
-+Keep in mind that libudev-zero isn't ideal. Here is some pros/cons:
-+
-+### Pros
-+
-+* Very portable. Doesn't depend on GNU features.
-+* No lock-in. Any device manager can be used, even smdev and CONFIG_UEVENT_HELPER.
-+* Source code is much cleaner than udev because of less abstractions and clever code.
-+
-+### Cons
-+
-+* Udev rules must be converted to shell script in order to work with any device manager.
-+* Udev hwdb interface isn't implemented. pciutils and usbutils will not display any meaningful info.
-+* Many functions and interfaces still aren't implemented, which may lead to breakage in some programs.
-
- ## What doesn't work
-
+++ /dev/null
-From 000ff7bf2fa463ea99afaea8503c2ed9f8a1852c Mon Sep 17 00:00:00 2001
-From: illiliti <illiliti@protonmail.com>
-Date: Wed, 8 Sep 2021 21:44:45 +0300
-Subject: [PATCH 05/15] Makefile: add stub symbol versioning
-
-Fixes: #38
----
- Makefile | 3 ++-
- libudev.sym | 1 +
- 2 files changed, 3 insertions(+), 1 deletion(-)
- create mode 100644 libudev.sym
-
---- a/Makefile
-+++ b/Makefile
-@@ -8,7 +8,8 @@ PKGCONFIGDIR = ${LIBDIR}/pkgconfig
- XCFLAGS = ${CPPFLAGS} ${CFLAGS} -std=c99 -fPIC -pthread -D_XOPEN_SOURCE=700 \
- -Wall -Wextra -Wpedantic -Wmissing-prototypes -Wstrict-prototypes \
- -Wno-unused-parameter
--XLDFLAGS = ${LDFLAGS} -shared -Wl,-soname,libudev.so.1
-+XLDFLAGS = ${LDFLAGS} -shared -Wl,-soname,libudev.so.1 \
-+ -Wl,-version-script,libudev.sym
- XARFLAGS = -rc
-
- OBJ = \
---- /dev/null
-+++ b/libudev.sym
-@@ -0,0 +1 @@
-+LIBUDEV_183 {};
+++ /dev/null
-From 858f0b107f90b08d4031d2e3ca25a5f2145b61c4 Mon Sep 17 00:00:00 2001
-From: illiliti <illiliti@protonmail.com>
-Date: Thu, 9 Sep 2021 03:01:12 +0300
-Subject: [PATCH 06/15] readme: pros/cons
-
----
- README.md | 2 ++
- 1 file changed, 2 insertions(+)
-
---- a/README.md
-+++ b/README.md
-@@ -22,6 +22,8 @@ and setting/remapping buttons? Udev smel
- all possible functionality in the single daemon/code base. Standalone UNIX-way
- programs much better suited for such purposes.
-
-+## Pros/Cons
-+
- Keep in mind that libudev-zero isn't ideal. Here is some pros/cons:
-
- ### Pros
+++ /dev/null
-From 6250984089514d7751985476a31d268c16b3d8f2 Mon Sep 17 00:00:00 2001
-From: illiliti <illiliti@protonmail.com>
-Date: Thu, 9 Sep 2021 23:53:51 +0300
-Subject: [PATCH 07/15] readme: add cups and workaround for pulseaudio
-
----
- README.md | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
---- a/README.md
-+++ b/README.md
-@@ -41,7 +41,7 @@ Keep in mind that libudev-zero isn't ide
- ## What doesn't work
-
- * dosfstools - requires udev_enumerate_add_match_parent()
--* PulseAudio - highly depends on udev internal properties
-+* PulseAudio - highly depends on udev internal properties. [workaround](https://gist.github.com/capezotte/03ee5548218e819b06459819bb120b4b#pulseaudio)
- * udisks2 - highly depends on udev internal properties
- * android-tools - requires udev rules for non-root usage
- * NetworkManager - needs investigation
-@@ -49,6 +49,7 @@ Keep in mind that libudev-zero isn't ide
- * PipeWare - depends on udev internal properties
- * ldm - depends on udev internal properties
- * lvm2 - uses deprecated `udev_queue` API
-+* cups - needs investigation
- * ???
-
- ## Dependencies
+++ /dev/null
-From caaa021290a1b84c44d084865c2512f4adf98297 Mon Sep 17 00:00:00 2001
-From: illiliti <illiliti@protonmail.com>
-Date: Fri, 8 Oct 2021 08:36:20 +0300
-Subject: [PATCH 08/15] udev_device.c: ignore devices without subsystem
-
-Do not allocate udev_device if device doesn't have subsystem.
-
-Fixes: #43
----
- udev_device.c | 7 +++----
- 1 file changed, 3 insertions(+), 4 deletions(-)
-
---- a/udev_device.c
-+++ b/udev_device.c
-@@ -530,18 +530,18 @@ static void set_properties_from_props(st
-
- struct udev_device *udev_device_new_from_syspath(struct udev *udev, const char *syspath)
- {
-- char path[PATH_MAX], file[PATH_MAX];
- char *subsystem, *driver, *sysname;
- struct udev_device *udev_device;
-+ char path[PATH_MAX];
- int i;
-
- if (!udev || !syspath) {
- return NULL;
- }
-
-- snprintf(file, sizeof(file), "%s/uevent", syspath);
-+ subsystem = read_symlink(syspath, "subsystem");
-
-- if (access(file, R_OK) == -1) {
-+ if (!subsystem) {
- return NULL;
- }
-
-@@ -567,7 +567,6 @@ struct udev_device *udev_device_new_from
-
- sysname = strrchr(path, '/') + 1;
- driver = read_symlink(path, "driver");
-- subsystem = read_symlink(path, "subsystem");
-
- udev_list_entry_add(&udev_device->properties, "SUBSYSTEM", subsystem, 0);
- udev_list_entry_add(&udev_device->properties, "SYSNAME", sysname, 0);
+++ /dev/null
-From 7265d305c27dee05436a25dc60481ad62e022756 Mon Sep 17 00:00:00 2001
-From: illiliti <illiliti@protonmail.com>
-Date: Fri, 8 Oct 2021 08:53:04 +0300
-Subject: [PATCH 09/15] various: fix memory leaks
-
-Closes: #41
----
- udev_device.c | 2 ++
- udev_list.c | 3 +++
- 2 files changed, 5 insertions(+)
-
---- a/udev_device.c
-+++ b/udev_device.c
-@@ -546,12 +546,14 @@ struct udev_device *udev_device_new_from
- }
-
- if (!realpath(syspath, path)) {
-+ free(subsystem);
- return NULL;
- }
-
- udev_device = calloc(1, sizeof(*udev_device));
-
- if (!udev_device) {
-+ free(subsystem);
- return NULL;
- }
-
---- a/udev_list.c
-+++ b/udev_list.c
-@@ -78,6 +78,7 @@ struct udev_list_entry *udev_list_entry_
- list_entry2->name = strdup(name);
-
- if (!list_entry2->name) {
-+ free(list_entry2);
- return NULL;
- }
-
-@@ -85,6 +86,8 @@ struct udev_list_entry *udev_list_entry_
- list_entry2->value = strdup(value);
-
- if (!list_entry2->value) {
-+ free(list_entry2->name);
-+ free(list_entry2);
- return NULL;
- }
- }
+++ /dev/null
-From 6651ccc9d60637919f1c05a801f3edc3ba623cd7 Mon Sep 17 00:00:00 2001
-From: Firas Khalil Khana <firasuke@gmail.com>
-Date: Sun, 24 Oct 2021 19:59:06 +0300
-Subject: [PATCH 10/15] Fix typo
-
----
- README.md | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/README.md
-+++ b/README.md
-@@ -46,7 +46,7 @@ Keep in mind that libudev-zero isn't ide
- * android-tools - requires udev rules for non-root usage
- * NetworkManager - needs investigation
- * libgudev - needs investigation
--* PipeWare - depends on udev internal properties
-+* PipeWire - depends on udev internal properties
- * ldm - depends on udev internal properties
- * lvm2 - uses deprecated `udev_queue` API
- * cups - needs investigation
+++ /dev/null
-From b8a0b953e6305dffeea57886fa379c5aca1b8397 Mon Sep 17 00:00:00 2001
-From: illiliti <illiliti@protonmail.com>
-Date: Tue, 16 Nov 2021 16:17:40 +0300
-Subject: [PATCH 11/15] Revert "Makefile: add stub symbol versioning"
-
-This reverts commit 000ff7bf2fa463ea99afaea8503c2ed9f8a1852c.
----
- Makefile | 3 +--
- libudev.sym | 1 -
- 2 files changed, 1 insertion(+), 3 deletions(-)
- delete mode 100644 libudev.sym
-
---- a/Makefile
-+++ b/Makefile
-@@ -8,8 +8,7 @@ PKGCONFIGDIR = ${LIBDIR}/pkgconfig
- XCFLAGS = ${CPPFLAGS} ${CFLAGS} -std=c99 -fPIC -pthread -D_XOPEN_SOURCE=700 \
- -Wall -Wextra -Wpedantic -Wmissing-prototypes -Wstrict-prototypes \
- -Wno-unused-parameter
--XLDFLAGS = ${LDFLAGS} -shared -Wl,-soname,libudev.so.1 \
-- -Wl,-version-script,libudev.sym
-+XLDFLAGS = ${LDFLAGS} -shared -Wl,-soname,libudev.so.1
- XARFLAGS = -rc
-
- OBJ = \
---- a/libudev.sym
-+++ /dev/null
-@@ -1 +0,0 @@
--LIBUDEV_183 {};
+++ /dev/null
-From ec47f63d6b2aeebec25efd64a0788329fdec7d0d Mon Sep 17 00:00:00 2001
-From: illiliti <illiliti@protonmail.com>
-Date: Tue, 16 Nov 2021 16:17:47 +0300
-Subject: [PATCH 12/15] Revert "udev_enumerate.c: fix pipeware"
-
-This reverts commit 4510b27a9b589a0ce82fef776c2648e19e79f2a4.
----
- udev_enumerate.c | 9 +--------
- 1 file changed, 1 insertion(+), 8 deletions(-)
-
---- a/udev_enumerate.c
-+++ b/udev_enumerate.c
-@@ -240,7 +240,7 @@ static int filter_sysattr(struct udev_en
- static void *add_device(void *ptr)
- {
- struct udev_enumerate_thread *thread = ptr;
-- struct udev_device *udev_device, *parent;
-+ struct udev_device *udev_device;
-
- udev_device = udev_device_new_from_syspath(thread->udev_enumerate->udev, thread->path);
-
-@@ -256,14 +256,7 @@ static void *add_device(void *ptr)
- return NULL;
- }
-
-- parent = udev_device_get_parent(udev_device);
--
- pthread_mutex_lock(thread->mutex);
--
-- if (parent) {
-- udev_list_entry_add(&thread->udev_enumerate->devices, udev_device_get_syspath(parent), NULL, 0);
-- }
--
- udev_list_entry_add(&thread->udev_enumerate->devices, udev_device_get_syspath(udev_device), NULL, 0);
- pthread_mutex_unlock(thread->mutex);
-
+++ /dev/null
-From 938b959402552483f010401051eb800c04607a41 Mon Sep 17 00:00:00 2001
-From: illiliti <illiliti@protonmail.com>
-Date: Wed, 17 Nov 2021 00:20:57 +0300
-Subject: [PATCH 13/15] readme: mention PipeWire patch
-
----
- README.md | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/README.md
-+++ b/README.md
-@@ -46,7 +46,7 @@ Keep in mind that libudev-zero isn't ide
- * android-tools - requires udev rules for non-root usage
- * NetworkManager - needs investigation
- * libgudev - needs investigation
--* PipeWire - depends on udev internal properties
-+* PipeWire - depends on udev internal properties. [patch](https://github.com/illiliti/libudev-zero/issues/26#issuecomment-846858706)
- * ldm - depends on udev internal properties
- * lvm2 - uses deprecated `udev_queue` API
- * cups - needs investigation
+++ /dev/null
-From 505c61819b371a1802e054fe2601e64f2dc6d79e Mon Sep 17 00:00:00 2001
-From: Alyssa Ross <hi@alyssa.is>
-Date: Mon, 29 Nov 2021 22:38:45 +0000
-Subject: [PATCH 14/15] Makefile: support static-only builds
-
-One of the problems with udev is that systemd cannot be built
-statically[1]. With libudev-zero, on the other hand, no code changes
-are required to be able to do a static-only build, only Makefile
-changes.
-
-With this change, it's possible to "make install-static" to do a
-static-only build of libudev-zero.
-
-[1]: https://github.com/systemd/systemd/pull/20621#issuecomment-912014839
----
- Makefile | 24 ++++++++++++++++++------
- 1 file changed, 18 insertions(+), 6 deletions(-)
-
---- a/Makefile
-+++ b/Makefile
-@@ -45,13 +45,24 @@ libudev.pc: libudev.pc.in
- -e 's|@VERSION@|243|g' \
- libudev.pc.in > libudev.pc
-
--install: libudev.so.1 libudev.a libudev.pc
-- mkdir -p ${DESTDIR}${INCLUDEDIR} ${DESTDIR}${LIBDIR} ${DESTDIR}${PKGCONFIGDIR}
-- cp -f udev.h ${DESTDIR}${INCLUDEDIR}/libudev.h
-- cp -f libudev.a ${DESTDIR}${LIBDIR}/libudev.a
-+install-headers: udev.h
-+ mkdir -p ${DESTDIR}${INCLUDEDIR}
-+ cp -f udev.h ${DESTDIR}${INCLUDEDIR}/libudev.h
-+
-+install-pkgconfig: libudev.pc
-+ mkdir -p ${DESTDIR}${PKGCONFIGDIR}
-+ cp -f libudev.pc ${DESTDIR}${PKGCONFIGDIR}/libudev.pc
-+
-+install-shared: libudev.so.1 install-headers install-pkgconfig
-+ mkdir -p ${DESTDIR}${LIBDIR}
- cp -f libudev.so.1 ${DESTDIR}${LIBDIR}/libudev.so.1
- ln -fs libudev.so.1 ${DESTDIR}${LIBDIR}/libudev.so
-- cp -f libudev.pc ${DESTDIR}${PKGCONFIGDIR}/libudev.pc
-+
-+install-static: libudev.a install-headers install-pkgconfig
-+ mkdir -p ${DESTDIR}${LIBDIR}
-+ cp -f libudev.a ${DESTDIR}${LIBDIR}/libudev.a
-+
-+install: install-shared install-static
-
- uninstall:
- rm -f ${DESTDIR}${LIBDIR}/libudev.a \
-@@ -63,4 +74,5 @@ uninstall:
- clean:
- rm -f libudev.so.1 libudev.a libudev.pc ${OBJ}
-
--.PHONY: all clean install uninstall
-+.PHONY: all clean install-headers install-pkgconfig install-shared \
-+ install-static install uninstall
+++ /dev/null
-From 4154cf252c17297f98a8ca33693ead003b4509da Mon Sep 17 00:00:00 2001
-From: illiliti <illiliti@protonmail.com>
-Date: Thu, 16 Dec 2021 07:09:16 +0300
-Subject: [PATCH 15/15] udev_enumerate.c: support NULL value in match/nomatch
-
-Fixes: #45
----
- udev_enumerate.c | 16 +++++-----------
- 1 file changed, 5 insertions(+), 11 deletions(-)
-
---- a/udev_enumerate.c
-+++ b/udev_enumerate.c
-@@ -193,20 +193,17 @@ static int filter_property(struct udev_e
-
- static int filter_sysattr(struct udev_enumerate *udev_enumerate, struct udev_device *udev_device)
- {
-+ const char *sysattr, *value, *value2;
- struct udev_list_entry *list_entry;
-- const char *sysattr, *value;
-
- list_entry = udev_list_entry_get_next(&udev_enumerate->sysattr_nomatch);
-
- while (list_entry) {
- sysattr = udev_list_entry_get_name(list_entry);
-+ value2 = udev_list_entry_get_value(list_entry);
- value = udev_device_get_sysattr_value(udev_device, sysattr);
-
-- if (!value) {
-- return 1;
-- }
--
-- if (fnmatch(udev_list_entry_get_value(list_entry), value, 0) == 0) {
-+ if (value && value2 && fnmatch(value2, value, 0) == 0) {
- return 0;
- }
-
-@@ -218,13 +215,10 @@ static int filter_sysattr(struct udev_en
- if (list_entry) {
- while (list_entry) {
- sysattr = udev_list_entry_get_name(list_entry);
-+ value2 = udev_list_entry_get_value(list_entry);
- value = udev_device_get_sysattr_value(udev_device, sysattr);
-
-- if (!value) {
-- return 0;
-- }
--
-- if (fnmatch(udev_list_entry_get_value(list_entry), value, 0) == 0) {
-+ if (value && value2 && fnmatch(value2, value, 0) == 0) {
- return 1;
- }
-
include $(TOPDIR)/rules.mk
PKG_NAME:=postgresql
-PKG_VERSION:=14.1
+PKG_VERSION:=14.2
PKG_RELEASE:=$(AUTORELEASE)
PKG_MAINTAINER:=Daniel Golle <daniel@makrotopia.org>
PKG_LICENSE:=PostgreSQL
http://ftp.postgresql.org/pub/source/v$(PKG_VERSION) \
ftp://ftp.postgresql.org/pub/source/v$(PKG_VERSION)
-PKG_HASH:=4d3c101ea7ae38982f06bdc73758b53727fb6402ecd9382006fa5ecc7c2ca41f
+PKG_HASH:=2cf78b2e468912f8101d695db5340cf313c2e9f68a612fb71427524e8c9a977a
PKG_USE_MIPS16:=0
PKG_FIXUP:=autoreconf
--- a/configure.ac
+++ b/configure.ac
-@@ -2091,9 +2091,9 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([], [
+@@ -2127,9 +2127,9 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([], [
# flags. If not, check if adding -march=armv8-a+crc flag helps.
# CFLAGS_ARMV8_CRC32C is set if the extra flag is required.
PGAC_ARMV8_CRC32C_INTRINSICS([])
include $(TOPDIR)/rules.mk
PKG_NAME:=spice-protocol
-PKG_VERSION:=0.14.3
+PKG_VERSION:=0.14.4
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=https://www.spice-space.org/download/releases
-PKG_HASH:=f986e5bc2a1598532c4897f889afb0df9257ac21c160c083703ae7c8de99487a
+PKG_HASH:=04ffba610d9fd441cfc47dfaa135d70096e60b1046d2119d8db2f8ea0d17d912
PKG_LICENSE:=BSD-3-Clause
PKG_LICENSE_FILES:=COPYING
PKG_MAINTAINER:=Yousong Zhou <yszhou4tech@gmail.com>
PKG_NAME:=adblock
PKG_VERSION:=4.1.3
-PKG_RELEASE:=6
+PKG_RELEASE:=7
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) |
-| gaming | | S | gaming | [Link](https://github.com/abyssin/pihole-blocklist) |
| notracking | | XL | tracking | [Link](https://github.com/notracking/hosts-blocklists) |
| oisd_basic | | L | general | [Link](https://oisd.nl) |
| oisd_full | | XXL | general | [Link](https://oisd.nl) |
"focus": "tracking",
"descurl": "https://www.gameindustry.eu"
},
- "gaming": {
- "url": "https://raw.githubusercontent.com/stopgaming/pihole-blocklist/master/game.txt",
- "rule": "/^0\\.0\\.0\\.0[[:space:]]+([[:alnum:]_-]{1,63}\\.)+[[:alpha:]]+([[:space:]]|$)/{print tolower($2)}",
- "size": "S",
- "focus": "gaming",
- "descurl": "https://github.com/abyssin/pihole-blocklist"
- },
"notracking": {
"url": "https://raw.githubusercontent.com/notracking/hosts-blocklists/master/dnscrypt-proxy/dnscrypt-proxy.blacklist.txt",
"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/filter.txt",
+ "url": "https://raw.githubusercontent.com/List-KR/List-KR/master/filters-share/adserver.txt",
"rule": "BEGIN{FS=\"[|^]\"}/^\\|\\|([[:alnum:]_-]{1,63}\\.)+[[:alpha:]]+\\^(\\$third-party)?$/{print tolower($3)}",
"size": "S",
"focus": "reg_korea",
include $(TOPDIR)/rules.mk
PKG_NAME:=bind
-PKG_VERSION:=9.18.0
+PKG_VERSION:=9.18.1
PKG_RELEASE:=$(AUTORELEASE)
USERID:=bind=57:bind=57
PKG_SOURCE_URL:= \
https://www.mirrorservice.org/sites/ftp.isc.org/isc/bind9/$(PKG_VERSION) \
https://ftp.isc.org/isc/bind9/$(PKG_VERSION)
-PKG_HASH:=56525bf5caf01fd8fd9d90910880cc0f8a90a27a97d169187d651d4ecf0c411c
+PKG_HASH:=57c7afd871694d615cb4defb1c1bd6ed023350943d7458414db8d493ef560427
PKG_FIXUP:=autoreconf
PKG_REMOVE_FILES:=aclocal.m4 libtool.m4
+bind-nslookup \
+bind-dnssec \
+bind-host \
- +bind-rndc
+ +bind-rndc \
+ +bind-ddns-confgen
endef
define Package/bind-rndc
200:/usr/bin/nslookup:/usr/libexec/nslookup-bind
endef
+define Package/bind-ddns-confgen
+ $(call Package/bind/Default)
+ TITLE+= administration tools (ddns-confgen and tsig-keygen only)
+endef
+
export BUILD_CC="$(TARGET_CC)"
TARGET_LDFLAGS += -Wl,--gc-sections,--as-needed
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/nslookup $(1)/usr/libexec/nslookup-bind
endef
+define Package/bind-ddns-confgen/install
+ $(INSTALL_DIR) $(1)/usr/sbin
+ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/ddns-confgen $(1)/usr/sbin/ddns-confgen
+ $(LN) -s ddns-confgen $(1)/usr/sbin/tsig-keygen
+endef
+
$(eval $(call BuildPackage,bind-libs))
$(eval $(call BuildPackage,bind-server))
$(eval $(call BuildPackage,bind-server-filter-aaaa))
$(eval $(call BuildPackage,bind-host))
$(eval $(call BuildPackage,bind-dig))
$(eval $(call BuildPackage,bind-nslookup))
+$(eval $(call BuildPackage,bind-ddns-confgen))
include $(TOPDIR)/rules.mk
PKG_NAME:=cloudflared
-PKG_VERSION:=2022.3.2
+PKG_VERSION:=2022.3.4
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:=58ed53896b7ee2cc4ac84ec2d6f47423476b4292a56b5379aa9715103a4cb226
+PKG_HASH:=e810ccc855cc25e8a2f33b42d33570edf97856b227baf4ca0def8e47a4b8d387
PKG_LICENSE:=Apache-2.0
PKG_LICENSE_FILES:=LICENSE
--- /dev/null
+From 471d5f44c5189bd78f8839ce8ac1b4b14f4b7d61 Mon Sep 17 00:00:00 2001
+From: Daniel Stenberg <daniel@haxx.se>
+Date: Mon, 7 Mar 2022 08:40:47 +0100
+Subject: [PATCH] wolfssl: fix compiler error without IPv6
+
+Reported-by: Joseph Chen
+Fixes #8550
+Closes #8552
+---
+ lib/vtls/wolfssl.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/lib/vtls/wolfssl.c
++++ b/lib/vtls/wolfssl.c
+@@ -462,9 +462,9 @@ wolfssl_connect_step1(struct Curl_easy *
+ const char * const hostname = SSL_HOST_NAME();
+ size_t hostname_len = strlen(hostname);
+ if((hostname_len < USHRT_MAX) &&
+- (0 == Curl_inet_pton(AF_INET, hostname, &addr4)) &&
++ !Curl_inet_pton(AF_INET, hostname, &addr4)
+ #ifdef ENABLE_IPV6
+- (0 == Curl_inet_pton(AF_INET6, hostname, &addr6))
++ && !Curl_inet_pton(AF_INET6, hostname, &addr6)
+ #endif
+ ) {
+ size_t snilen;
include $(TOPDIR)/rules.mk
PKG_NAME:=frr
-PKG_VERSION:=8.2.0
-PKG_RELEASE:=1
-PKG_SOURCE_DATE:=2022-03-05
+PKG_VERSION:=8.2.2
+PKG_RELEASE:=$(AUTORELEASE)
+PKG_SOURCE_DATE:=2022-03-22
PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_DATE).tar.gz
-PKG_SOURCE_VERSION:=47a5de9c038c17038cef61786fd1216d33ee0f66
+PKG_SOURCE_VERSION:=830ba8bb25fb9968a4cd331a60344ad53ea0e300
PKG_SOURCE_URL:=https://codeload.github.com/FRRouting/frr/tar.gz/$(PKG_SOURCE_VERSION)?
-PKG_HASH:=6007ae2fdb2e068696f92dd000f247ef2a27d846863b0b1552752e41ed5f4017
+PKG_HASH:=bf75b6443c65937d1b2713e75359c0d1e0f02c049c9ab5c7b9af4a0ce05f5700
PKG_MAINTAINER:=Lucian Cristian <lucian.cristian@gmail.com>
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_SOURCE_VERSION)
--- /dev/null
+ config GENSIO_SSHD
+ depends on PACKAGE_gensio-bin
+ select GENSIO_SSL
+ bool "Build gtlsshd"
+ default n
--- /dev/null
+ config GENSIO_SSL
+ depends on PACKAGE_libgensio
+ bool "Enable SSL-support via OpenSSL"
+ default n
+
+ config GENSIO_WRAP
+ depends on PACKAGE_libgensio
+ bool "Build with libwrap"
+ default n
+
+ config GENSIO_SCTP
+ depends on PACKAGE_libgensio
+ bool "Enable SCTP-support via libsctp"
+ default n
+
+ config GENSIO_PTHREADS
+ depends on PACKAGE_libgensio
+ bool "Enable pthreads"
+ default y
+
+ config GENSIO_AVAHI
+ depends on PACKAGE_libgensio
+ bool "Enable mDNS via Avahi"
+ default n
+
+ config GENSIO_GLIB
+ depends on PACKAGE_libgensio
+ bool "Build with glib2"
+ default n
+
+ config GENSIO_TCL
+ depends on PACKAGE_libgensio
+ bool "Build with tcl"
+ default n
--- /dev/null
+#
+# Copyright (C) 2022 Nita Vesa (werecatf@outlook.com)
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=gensio
+PKG_VERSION:=2.3.5
+PKG_RELEASE:=1
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=@SF/ser2net
+PKG_HASH:=e9943b392ba85bdc13063059125794554f07e569d8ca0afd38f773a390f5f234
+
+PKG_LICENSE:=GPL-2.0-or-later
+PKG_LICENSE_FILES:=COPYING
+PKG_MAINTAINER:=Nita Vesa <werecatf@outlook.com>
+
+PKG_FIXUP:=autoreconf
+PKG_INSTALL:=1
+PYTHON3_PKG_BUILD:=0
+
+PKG_CONFIG_DEPENDS:= \
+ CONFIG_GENSIO_SSL \
+ CONFIG_GENSIO_WRAP \
+ CONFIG_GENSIO_SCTP \
+ CONFIG_GENSIO_PTHREADS \
+ CONFIG_GENSIO_AVAHI \
+ CONFIG_GENSIO_GLIB \
+ CONFIG_GENSIO_TCL \
+ CONFIG_GENSIO_SSHD
+
+include $(INCLUDE_DIR)/package.mk
+include ../../lang/python/python3-package.mk
+
+CONFIGURE_ARGS += \
+ --$(if $(CONFIG_GENSIO_SSL),with,without)-openssl \
+ --$(if $(CONFIG_GENSIO_SCTP),with,without)-sctp \
+ --$(if $(CONFIG_GENSIO_WRAP),with,without)-tcp-wrappers \
+ --$(if $(CONFIG_GENSIO_PTHREADS),with,without)-pthreads \
+ --$(if $(CONFIG_GENSIO_GLIB),with,without)-glib \
+ --$(if $(CONFIG_GENSIO_TCL),with,without)-tcl \
+ --without-openipmi \
+ --with-cplusplus \
+ --disable-doc
+
+CONFIGURE_VARS += \
+ ac_cv_lib_avahi_client_avahi_client_new=$(if $(CONFIG_GENSIO_AVAHI),yes,no) \
+ ac_cv_lib_pam_pam_start=$(if $(CONFIG_GENSIO_SSHD),yes,no)
+
+ifneq ($(CONFIG_PACKAGE_python3-gensio),)
+CONFIGURE_ARGS += \
+ --with-swig \
+ --with-python \
+ --with-pythoninstall=$(PYTHON3_PKG_DIR)
+
+CONFIGURE_VARS += \
+ PYTHON_LIBS="$(shell $(STAGING_DIR)/host/bin/$(PYTHON3)-config --ldflags) -l${PYTHON3}" \
+ PYTHON_CPPFLAGS="$(shell $(STAGING_DIR)/host/bin/$(PYTHON3)-config --includes)" \
+ PYTHON="$(STAGING_DIR_HOSTPKG)/bin/$(PYTHON3)"
+else
+CONFIGURE_ARGS += \
+ --without-python \
+ --without-swig
+endif
+
+define Package/gensio/Default
+ TITLE:=Abstract stream I/O
+ URL:=https://github.com/cminyard/gensio
+endef
+
+define Package/gensio/Default/description
+ This project (pronounced gen'-see-oh) is used to abstract stream I/O
+ like serial port, TCP, telnet, UDP, SSL, IPMI SOL etc and offers a
+ framework for giving a consistent view of various stream (and packet)
+ I/O types. You create a gensio object (or a gensio), and you can use
+ that gensio without having to know too much about what is going on
+ underneath. You can stack gensio on top of another one to add protocol
+ funcionality. For instance, you can create a TCP gensio, stack SSL on
+ top of that, and stack Telnet on top of that. It supports a number of
+ network I/O and serial ports. Gensio can be used for sending and
+ receiving ports, and it also supports establishing encrypted and
+ authenticated connections.
+endef
+
+define Package/libgensio
+$(call Package/gensio/Default)
+ TITLE+= (runtime files)
+ SECTION:=libs
+ CATEGORY:=Libraries
+ ABI_VERSION:=0
+ MENU:=1
+ DEPENDS:=+GENSIO_SSL:libopenssl +GENSIO_WRAP:libwrap +GENSIO_SCTP:libsctp +GENSIO_PTHREADS:libpthread +GENSIO_AVAHI:libavahi-client +GENSIO_TCL:tcl +GENSIO_GLIB:glib2 +GENSIO_SSHD:libpam
+endef
+
+define Package/libgensio/description
+$(call Package/gensio/Default/description)
+ .
+ This package contains the runtime libraries.
+endef
+
+define Package/libgensio/config
+ source "$(SOURCE)/Config.in"
+endef
+
+define Package/gensio-bin
+$(call Package/gensio/Default)
+ TITLE+= (command-line tools)
+ SECTION:=net
+ CATEGORY:=Network
+ MENU:=1
+ DEPENDS:=+libgensio
+endef
+
+define Package/gensio-bin/description
+$(call Package/gensio/Default/description)
+ .
+ This package contains the command-line tools.
+endef
+
+define Package/gensio-bin/config
+ source "$(SOURCE)/Config-bin.in"
+endef
+
+define Package/python3-gensio
+$(call Package/gensio/Default)
+ TITLE+= (Python3-bindings)
+ SECTION:=lang
+ CATEGORY:=Languages
+ BUILD_DEPENDS:=+swig +python3
+ DEPENDS:=+python3-light +libgensio
+endef
+
+define Package/python3-gensio/description
+$(call Package/gensio/Default/description)
+ .
+ This package contains the Python3-bindings for libgensio.
+endef
+
+define Package/libgensiocpp
+$(call Package/gensio/Default)
+ TITLE+= (C++ - bindings)
+ SECTION:=libs
+ CATEGORY:=Libraries
+ ABI_VERSION:=0
+ DEPENDS:=+libgensio +libstdcpp
+endef
+
+define Package/libgensiocpp/description
+$(call Package/gensio/Default/description)
+ .
+ This package contains the C++ runtime files.
+endef
+
+define Build/InstallDev
+ $(INSTALL_DIR) $(1)/usr/include/gensio/
+ $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/include/gensio/* $(1)/usr/include/gensio/
+ $(INSTALL_DIR) $(1)/usr/lib/
+ $(CP) $(PKG_INSTALL_DIR)/usr/lib/*.{so*,a,la} $(1)/usr/lib/
+ $(INSTALL_DIR) $(1)/usr/lib/pkgconfig/
+ $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* $(1)/usr/lib/pkgconfig/
+ifneq ($(CONFIG_PACKAGE_python3-gensio),)
+ $(INSTALL_DIR) $(1)/$(PYTHON3_PKG_DIR)
+ $(CP) $(PKG_INSTALL_DIR)/$(PYTHON3_PKG_DIR)/*.{so*,a,la} $(1)/$(PYTHON3_PKG_DIR)
+ $(CP) $(PKG_INSTALL_DIR)/$(PYTHON3_PKG_DIR)/*.py* $(1)/$(PYTHON3_PKG_DIR)
+endif
+endef
+
+define Package/libgensio/install
+ $(INSTALL_DIR) $(1)/usr/lib
+ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libgensio.so.* $(1)/usr/lib/
+ifeq ($(CONFIG_GENSIO_GLIB),y)
+ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libgensioglib.so.* $(1)/usr/lib/
+endif
+endef
+
+define Package/gensio-bin/install
+ $(INSTALL_DIR) $(1)/usr/bin
+ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin/
+ifeq ($(CONFIG_GENSIO_SSHD),y)
+ $(INSTALL_DIR) $(1)/usr/sbin
+ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/* $(1)/usr/sbin/
+endif
+endef
+
+define Package/python3-gensio/install
+ $(INSTALL_DIR) $(1)/$(PYTHON3_PKG_DIR)
+ $(CP) $(PKG_INSTALL_DIR)/$(PYTHON3_PKG_DIR)/*.so* $(1)/$(PYTHON3_PKG_DIR)
+ $(CP) $(PKG_INSTALL_DIR)/$(PYTHON3_PKG_DIR)/*.py* $(1)/$(PYTHON3_PKG_DIR)
+
+ $(INSTALL_DIR) $(1)/usr/lib
+ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libgensio_python_swig.so.* $(1)/usr/lib/
+endef
+
+define Package/libgensiocpp/install
+ $(INSTALL_DIR) $(1)/usr/lib
+ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libgensiocpp.so.* $(1)/usr/lib/
+endef
+
+$(eval $(call BuildPackage,libgensio))
+$(eval $(call BuildPackage,gensio-bin))
+$(eval $(call BuildPackage,python3-gensio))
+$(eval $(call BuildPackage,libgensiocpp))
--- /dev/null
+--- a/tools/gensiotool.c
++++ b/tools/gensiotool.c
+@@ -44,7 +44,7 @@
+ #include <signal.h>
+ #include <errno.h>
+ #include <sys/types.h>
+-#include <sys/unistd.h>
++#include <unistd.h>
+ #include <syslog.h>
+ #endif
+
PKG_NAME:=gnunet-fuse
-PKG_VERSION:=0.14.0
+PKG_VERSION:=0.16.0
PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=@GNU/gnunet
-PKG_HASH:=4e7d470e2a119e13e4fa8ca9d2b7db58a90bf415dde099499f9e189b4319d774
+PKG_HASH:=2cbeb79cc2aa9939d5faaaf52c21da125029cb6646c1db0d3b9e9feea7f23fa6
PKG_LICENSE:=GPL-3.0
PKG_LICENSE_FILES:=COPYING
PKG_NAME:=gnunet
-PKG_VERSION:=0.16.1
+PKG_VERSION:=0.16.2
PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=@GNU/gnunet
-PKG_HASH:=df8026dd0b1c285ebc57e820e6b29e87c3d0f210bb0899f6b5317261f8e01c5c
+PKG_HASH:=b5858833836509b71d5c0d9bdc11fd1beeeaba5a75be4bbd93581a4d13e0f49a
PKG_LICENSE:=AGPL-3.0
PKG_LICENSE_FILES:=COPYING
# minimal persistency in /etc/gnunet
[ ! -d /etc/gnunet ] && mkdir -m 0750 -p /etc/gnunet
- chown gnunet:gnunet /etc/gnunet
+ chown -R gnunet:gnunet /etc/gnunet
# defaults paths for persistent files
gnunet-config -c "$CONFIGFILE" -s PATHS -o GNUNET_CONFIG_HOME -V /etc/gnunet
--- a/configure.ac
+++ b/configure.ac
-@@ -978,33 +978,13 @@ AC_ARG_WITH([mysql],
+@@ -981,33 +981,13 @@ AC_ARG_WITH([mysql],
AC_CHECK_LIB([mysqlclient], [mysql_init],
[AC_CHECK_HEADERS([mysql/mysql.h],
[MYSQL_LDFLAGS="-L$MYSQL_LIBDIR"
PKG_NAME:=horst
PKG_VERSION:=5.1
-PKG_RELEASE:=3
+PKG_RELEASE:=4
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://github.com/br101/horst/archive/v$(PKG_VERSION)/
--- /dev/null
+--- a/display-main.c
++++ b/display-main.c
+@@ -53,7 +53,7 @@ static struct ewma bpsn_avg;
+ void print_dump_win(const char *str, int refresh)
+ {
+ wattron(dump_win, RED);
+- wprintw(dump_win, str);
++ wprintw(dump_win, "%s", str);
+ wattroff(dump_win, RED);
+ if (refresh)
+ wrefresh(dump_win);
+--- a/display.c
++++ b/display.c
+@@ -86,7 +86,7 @@ print_centered(WINDOW* win, int line, in
+ vsnprintf(buf, cols, fmt, ap);
+ va_end(ap);
+
+- mvwprintw(win, line, cols / 2 - strlen(buf) / 2, buf);
++ mvwprintw(win, line, cols / 2 - strlen(buf) / 2, "%s", buf);
+ free(buf);
+ }
+
#
PKG_NAME:=openvswitch
PKG_VERSION:=$(ovs_version)
-PKG_RELEASE:=11
+PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://www.openvswitch.org/releases/
-PKG_HASH:=7d5797f2bf2449c6a266149e88f72123540f7fe7f31ad52902057ae8d8f88c38
+PKG_HASH:=e03bfab7ca82d81a7d3a36de4f390a3b5210e3f39657671f922877cd4ea6dc73
PKG_LICENSE:=Apache-2.0
PKG_LICENSE_FILES:=LICENSE
# Versions
-ovs_version:=2.15.0
+ovs_version:=2.17.0
ovs_builddir=$(KERNEL_BUILD_DIR)/openvswitch-$(ovs_version)
# Shared vars, macros
--- a/lib/netdev-linux.c
+++ b/lib/netdev-linux.c
-@@ -3469,7 +3469,13 @@ update_flags(struct netdev_linux *netdev
+@@ -3546,7 +3546,13 @@ update_flags(struct netdev_linux *netdev
unsigned int old_flags, new_flags;
int error = 0;
BUILT_SOURCES =
--- a/m4/openvswitch.m4
+++ b/m4/openvswitch.m4
-@@ -372,6 +372,8 @@ else:
+@@ -400,6 +400,8 @@ else:
AC_MSG_ERROR([Python 3.4 or later is required but not found in $PATH, please install it or set $PYTHON3 to point to it])
fi
AC_ARG_VAR([PYTHON3])
Cflags: -I${includedir}/openvswitch
--- a/m4/openvswitch.m4
+++ b/m4/openvswitch.m4
-@@ -646,7 +646,8 @@ AC_DEFUN([OVS_CHECK_UNBOUND],
+@@ -677,7 +677,8 @@ AC_DEFUN([OVS_CHECK_UNBOUND],
[AC_CHECK_LIB(unbound, ub_ctx_create, [HAVE_UNBOUND=yes], [HAVE_UNBOUND=no])
if test "$HAVE_UNBOUND" = yes; then
AC_DEFINE([HAVE_UNBOUND], [1], [Define to 1 if unbound is detected.])
fi
AM_CONDITIONAL([HAVE_UNBOUND], [test "$HAVE_UNBOUND" = yes])
AC_SUBST([HAVE_UNBOUND])])
-@@ -658,7 +659,8 @@ AC_DEFUN([OVS_CHECK_UNWIND],
+@@ -689,7 +690,8 @@ AC_DEFUN([OVS_CHECK_UNWIND],
[HAVE_UNWIND=no])
if test "$HAVE_UNWIND" = yes; then
AC_DEFINE([HAVE_UNWIND], [1], [Define to 1 if unwind is detected.])
include ../openvswitch/openvswitch.mk
PKG_NAME:=ovn
-PKG_VERSION:=20.12.0
-PKG_RELEASE:=2
+PKG_VERSION:=22.03.0
+PKG_RELEASE:=1
PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://github.com/ovn-org/ovn.git
PKG_SOURCE_VERSION:=v$(PKG_VERSION)
-PKG_MIRROR_HASH:=6d1b5d907b4445e84653527ccf5977b05555c785f90587dee0fc1950d96727cc
+PKG_MIRROR_HASH:=eb494796a7a21e7c1ba5b3f60c037385eb5f0c33007ebc627437f36187f860fe
PKG_LICENSE:=Apache-2.0
PKG_LICENSE_FILES:=LICENSE
ovs_libovn_title:=Open vSwitch (libovn.so)
ovs_libovn_hidden:=1
-ovs_libovn_depends+=+libatomic
+ovs_libovn_depends+=+libatomic +openvswitch-libopenvswitch
ovs_libovn_files:=usr/lib/libovn*.so*
$(eval $(call OvsPackageTemplate,libovn))
TARGET_CFLAGS += -flto -std=gnu99
+# This is needed otherwise libtool --mode=install libovn.la will fail with
+# "cannot find -lopenvswitch" when doing libtool --mode=relink. Likely this
+# was caused by libovn now depends on libopenvswitch.la (installed=no) since
+# upstream commit 1b587c4f ("controller: add datapath meter capability check")
+TARGET_LDFLAGS += -L$(ovs_builddir)/lib/.libs
MAKE_VARS += PYTHONPATH="$(HOST_PYTHON3PATH)"
$(foreach p,$(ovs_packages),\
--- a/configure.ac
+++ b/configure.ac
-@@ -130,7 +130,6 @@ OVS_CHECK_LINUX_HOST
+@@ -131,7 +131,6 @@ OVS_CHECK_LINUX_HOST
OVS_LIBTOOL_VERSIONS
OVS_CHECK_CXX
AX_FUNC_POSIX_MEMALIGN
-OVN_CHECK_UNBOUND
+ OVS_CHECK_DDLOG_FAST_BUILD
OVS_CHECK_INCLUDE_NEXT([stdio.h string.h])
- AC_CONFIG_FILES([lib/libovn.sym])
--- a/Makefile.am
+++ b/Makefile.am
-@@ -479,11 +479,9 @@ dist-docs:
+@@ -483,11 +483,9 @@ dist-docs:
include automake.mk
--- /dev/null
+Fix the following compilation errors
+
+ic/ovn-ic.c: In function 'main':
+ic/ovn-ic.c:689:5: warning: 'ls' may be used uninitialized in this function [-Wmaybe-uninitialized]
+ 689 | nbrec_logical_switch_update_ports_addvalue(ls, lsp);
+ | ^
+ic/ovn-ic.c:430:40: note: 'ls' was declared here
+ 430 | const struct nbrec_logical_switch *ls;
+ | ^
+
+--- a/ic/ovn-ic.c
++++ b/ic/ovn-ic.c
+@@ -427,7 +427,7 @@ find_ts_in_nb(struct ic_context *ctx, ch
+ nbrec_logical_switch_index_init_row(ctx->nbrec_ls_by_name);
+ nbrec_logical_switch_index_set_name(key, ts_name);
+
+- const struct nbrec_logical_switch *ls;
++ const struct nbrec_logical_switch *ls = NULL;
+ bool found = false;
+ NBREC_LOGICAL_SWITCH_FOR_EACH_EQUAL (ls, key, ctx->nbrec_ls_by_name) {
+ const char *ls_ts_name = smap_get(&ls->other_config, "interconn-ts");
include $(TOPDIR)/rules.mk
PKG_NAME:=rclone
-PKG_VERSION:=1.57.0
+PKG_VERSION:=1.58.0
PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/rclone/rclone/tar.gz/v$(PKG_VERSION)?
-PKG_HASH:=294f7a6b0874509997d3a9ffae7c74f0c45b687df0ac7d7742f284ad3814fe55
+PKG_HASH:=b3f953a282964d6d73a7278ccb2bb836d9aca855e9dc5fb6f4bc986b0e5656fa
PKG_LICENSE:=MIT
PKG_LICENSE_FILE:=LICENSE
endef
define Package/rclone-config
+ $(call Package/rclone/Default)
TITLE+= (Config Scripts)
DEPENDS:=+rclone
endef
_ "github.com/rclone/rclone/fs/sync" // import sync/*
- _ "github.com/rclone/rclone/lib/plugin" // import plugins
+ // _ "github.com/rclone/rclone/lib/plugin" // import plugins
- )
-
- // RcloneInitialize initializes rclone as a library
+ _ "github.com/rclone/rclone/cmd/mount" // import mount
+ _ "github.com/rclone/rclone/cmd/mount2" // import mount2
+ _ "github.com/rclone/rclone/cmd/cmount" // import cmount
--- a/rclone.go
+++ b/rclone.go
@@ -7,7 +7,7 @@ import (
include $(TOPDIR)/rules.mk
PKG_NAME:=usteer
-PKG_SOURCE_DATE:=2022-02-19
-PKG_SOURCE_VERSION:=98247d1edab89603d1d27bfdd2d864b9b88b0872
+PKG_SOURCE_DATE:=2022-03-18
+PKG_SOURCE_VERSION:=f4e120c9a3f460cd8478f072d4c7879e1bf98136
PKG_RELEASE:=1
PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL=https://git.openwrt.org/project/usteer.git
-PKG_MIRROR_HASH:=c9594c019d2722f5e4ffe23267834897dc44195381a4fd19d1e2d2dc09272fbc
+PKG_MIRROR_HASH:=6167eab61ca222cfe257c304b92e36a7883157abfb205ab2fffe521d332fb274
PKG_MAINTAINER:=David Bauer <mail@david-bauer.net>
PKG_LICENSE:=GPL-2.0-only
include $(TOPDIR)/rules.mk
PKG_NAME:=xl2tpd
-PKG_VERSION:=1.3.16
-PKG_RELEASE:=2
+PKG_VERSION:=1.3.17
+PKG_RELEASE:=1
PKG_MAINTAINER:=Yousong Zhou <yszhou4tech@gmail.com>
PKG_LICENSE:=GPL-2.0
PKG_LICENSE_FILES:=LICENSE
PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
PKG_SOURCE_VERSION:=v$(PKG_VERSION)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_MIRROR_HASH:=bbb5e21967ec036bb59e18d2a8792b29d7525a1ba13de49f0b80325ab7bce2c6
+PKG_MIRROR_HASH:=5fbc1fe5a01ebd5b0eb2929b85e68eb271e29cc2989320aa1ae2b32f0ac0e540
PKG_INSTALL:=1
--- /dev/null
+From f374c10c77d25863606566edcddaf02481f25032 Mon Sep 17 00:00:00 2001
+From: Yousong Zhou <zhouyousong@yunionyun.com>
+Date: Fri, 18 Oct 2019 11:29:03 +0000
+Subject: [PATCH] Skip building pfc
+
+It can cause build failure, see [1]
+
+ [1] https://github.com/openwrt/packages/issues/10270
+---
+ Makefile | 15 +++------------
+ 1 file changed, 3 insertions(+), 12 deletions(-)
+
+--- a/Makefile
++++ b/Makefile
+@@ -115,10 +115,10 @@ BINDIR?=$(DESTDIR)${PREFIX}/bin
+ MANDIR?=$(DESTDIR)${PREFIX}/share/man
+
+
+-all: $(EXEC) pfc $(CONTROL_EXEC)
++all: $(EXEC) $(CONTROL_EXEC)
+
+ clean:
+- rm -f $(OBJS) $(EXEC) pfc.o pfc $(CONTROL_EXEC)
++ rm -f $(OBJS) $(EXEC) $(CONTROL_EXEC)
+
+ $(EXEC): $(OBJS) $(HDRS)
+ $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LDLIBS)
+@@ -126,10 +126,6 @@ $(EXEC): $(OBJS) $(HDRS)
+ $(CONTROL_EXEC): $(CONTROL_SRCS)
+ $(CC) $(CFLAGS) $(LDFLAGS) $(CONTROL_SRCS) -o $@
+
+-pfc:
+- $(CC) $(CFLAGS) -c contrib/pfc.c
+- $(CC) $(LDFLAGS) -o pfc pfc.o -lpcap $(LDLIBS)
+-
+ romfs:
+ $(ROMFSINST) /bin/$(EXEC)
+
+@@ -142,7 +138,7 @@ packagingprep:
+ sed -i "s/Version: .*/Version: ${XL2TPDBASEVERSION}/" packaging/*/*.spec
+ sed -i "s/PKG_VERSION:=.*/PKG_VERSION:=${XL2TPDBASEVERSION}/" packaging/openwrt/Makefile
+
+-install: ${EXEC} pfc ${CONTROL_EXEC}
++install: ${EXEC} ${CONTROL_EXEC}
+ install -d -m 0755 ${SBINDIR}
+ install -m 0755 $(EXEC) ${SBINDIR}/$(EXEC)
+ install -d -m 0755 ${MANDIR}/man5
+@@ -151,11 +147,6 @@ install: ${EXEC} pfc ${CONTROL_EXEC}
+ install -m 0644 doc/xl2tpd-control.8 ${MANDIR}/man8/
+ install -m 0644 doc/xl2tpd.conf.5 doc/l2tp-secrets.5 \
+ ${MANDIR}/man5/
+- # pfc
+- install -d -m 0755 ${BINDIR}
+- install -m 0755 pfc ${BINDIR}/pfc
+- install -d -m 0755 ${MANDIR}/man1
+- install -m 0644 contrib/pfc.1 ${MANDIR}/man1/
+ # control exec
+ install -d -m 0755 ${SBINDIR}
+ install -m 0755 $(CONTROL_EXEC) ${SBINDIR}/$(CONTROL_EXEC)
+++ /dev/null
-From 06bd6af97055071be5ed0f83a808032688a503db Mon Sep 17 00:00:00 2001
-From: Yousong Zhou <yszhou4tech@gmail.com>
-Date: Thu, 12 Nov 2020 14:33:05 +0800
-Subject: [PATCH] xl2tpd-control: fix typo in usage
-
----
- xl2tpd-control.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/xl2tpd-control.c
-+++ b/xl2tpd-control.c
-@@ -96,7 +96,7 @@ void usage()
- " --help show this help message\n\n"
- "List of supported commands:\n"
- "add-lac, status-lac, remove-lac, connect-lac, disconnect-lac\n"
-- "add-lns, status-lns, remove-lns, avaliable\n\n"
-+ "add-lns, status-lns, remove-lns, available\n\n"
- "See xl2tpd-control(8) man page for more details.\n");
- }
-
+++ /dev/null
-From f374c10c77d25863606566edcddaf02481f25032 Mon Sep 17 00:00:00 2001
-From: Yousong Zhou <zhouyousong@yunionyun.com>
-Date: Fri, 18 Oct 2019 11:29:03 +0000
-Subject: [PATCH] Skip building pfc
-
-It can cause build failure, see [1]
-
- [1] https://github.com/openwrt/packages/issues/10270
----
- Makefile | 15 +++------------
- 1 file changed, 3 insertions(+), 12 deletions(-)
-
---- a/Makefile
-+++ b/Makefile
-@@ -115,10 +115,10 @@ BINDIR?=$(DESTDIR)${PREFIX}/bin
- MANDIR?=$(DESTDIR)${PREFIX}/share/man
-
-
--all: $(EXEC) pfc $(CONTROL_EXEC)
-+all: $(EXEC) $(CONTROL_EXEC)
-
- clean:
-- rm -f $(OBJS) $(EXEC) pfc.o pfc $(CONTROL_EXEC)
-+ rm -f $(OBJS) $(EXEC) $(CONTROL_EXEC)
-
- $(EXEC): $(OBJS) $(HDRS)
- $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LDLIBS)
-@@ -126,10 +126,6 @@ $(EXEC): $(OBJS) $(HDRS)
- $(CONTROL_EXEC): $(CONTROL_SRCS)
- $(CC) $(CFLAGS) $(LDFLAGS) $(CONTROL_SRCS) -o $@
-
--pfc:
-- $(CC) $(CFLAGS) -c contrib/pfc.c
-- $(CC) $(LDFLAGS) -o pfc pfc.o -lpcap $(LDLIBS)
--
- romfs:
- $(ROMFSINST) /bin/$(EXEC)
-
-@@ -142,7 +138,7 @@ packagingprep:
- sed -i "s/Version: .*/Version: ${XL2TPDBASEVERSION}/" packaging/*/*.spec
- sed -i "s/PKG_VERSION:=.*/PKG_VERSION:=${XL2TPDBASEVERSION}/" packaging/openwrt/Makefile
-
--install: ${EXEC} pfc ${CONTROL_EXEC}
-+install: ${EXEC} ${CONTROL_EXEC}
- install -d -m 0755 ${SBINDIR}
- install -m 0755 $(EXEC) ${SBINDIR}/$(EXEC)
- install -d -m 0755 ${MANDIR}/man5
-@@ -151,11 +147,6 @@ install: ${EXEC} pfc ${CONTROL_EXEC}
- install -m 0644 doc/xl2tpd-control.8 ${MANDIR}/man8/
- install -m 0644 doc/xl2tpd.conf.5 doc/l2tp-secrets.5 \
- ${MANDIR}/man5/
-- # pfc
-- install -d -m 0755 ${BINDIR}
-- install -m 0755 pfc ${BINDIR}/pfc
-- install -d -m 0755 ${MANDIR}/man1
-- install -m 0644 contrib/pfc.1 ${MANDIR}/man1/
- # control exec
- install -d -m 0755 ${SBINDIR}
- install -m 0755 $(CONTROL_EXEC) ${SBINDIR}/$(CONTROL_EXEC)
include $(TOPDIR)/rules.mk
PKG_NAME:=xray-core
-PKG_VERSION:=1.5.3
+PKG_VERSION:=1.5.4
PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/XTLS/Xray-core/tar.gz/v$(PKG_VERSION)?
-PKG_HASH:=4b8d78cc20bdf2e8936c02b05d22f0a3231075155ffdc67508d8448ab8858252
+PKG_HASH:=af9b9b5b0a2d4f055d19f3580d1c2d3141bbaab9dd7824428c12ae0ced5f511e
PKG_MAINTAINER:=Tianling Shen <cnsztl@immortalwrt.org>
PKG_LICENSE:=MPL-2.0
/etc/config/xray
endef
-GEOIP_VER:=202202030030
+GEOIP_VER:=202203170039
GEOIP_FILE:=geoip.dat.$(GEOIP_VER)
define Download/geoip
URL:=https://github.com/v2fly/geoip/releases/download/$(GEOIP_VER)/
URL_FILE:=geoip.dat
FILE:=$(GEOIP_FILE)
- HASH:=6250675cac06d8c032f7f5203666fd2f72476b60886b28657e10b0e12deae8bc
+ HASH:=12c183defbc052e6bd96eb088a7f955f9d3a62d662009d5fb63da040e954e6c8
endef
-GEOSITE_VER:=20220201175515
+GEOSITE_VER:=20220313173740
GEOSITE_FILE:=dlc.dat.$(GEOSITE_VER)
define Download/geosite
URL:=https://github.com/v2fly/domain-list-community/releases/download/$(GEOSITE_VER)/
URL_FILE:=dlc.dat
FILE:=$(GEOSITE_FILE)
- HASH:=697e78c8c0dab19f08ae17ba6aa9c7c50dcb9be566bb9a314aa9f5da29d76200
+ HASH:=85ae4443a4192c0ff4c759e8a959dac02fac3628be62531939cc9059c3285ad0
endef
define Build/Prepare
include $(TOPDIR)/rules.mk
PKG_NAME:=auc
-PKG_VERSION:=0.2.4
+PKG_VERSION:=0.2.5
PKG_RELEASE:=$(AUTORELEASE)
PKG_LICENSE:=GPL-3.0
blobmsg_add_string(&reqbuf, "version_code", branch->version_code);
blobmsg_add_string(&reqbuf, "target", target);
+ if (target_fstype || rootfs_type)
+ blobmsg_add_string(&reqbuf, "filesystem", target_fstype?target_fstype:rootfs_type);
+
sanetized_board_name = strdup(board_name);
tmp = sanetized_board_name;
while ((tmp = strchr(tmp, ',')))
include $(TOPDIR)/rules.mk
PKG_NAME:=ccid
-PKG_VERSION:=1.4.36
+PKG_VERSION:=1.5.0
PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=https://ccid.apdu.fr/files/
-PKG_HASH:=2b73ac885f1bcab819dc3578944d17406241e0c724042989cea437353b6749c1
+PKG_HASH:=81549b3422469d503996d03a3aed2ef1375b359167f10d66be9e3844e729322e
PKG_MAINTAINER:=Daniel Golle <daniel@makrotopia.org>
PKG_LICENSE:=LGPL-2.1-or-later
PKG_LICENSE_FILES:=COPYING
include $(TOPDIR)/rules.mk
PKG_NAME:=LVM2
-PKG_VERSION:=2.03.14
+PKG_VERSION:=2.03.15
PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE:=$(PKG_NAME).$(PKG_VERSION).tgz
PKG_SOURCE_URL:=https://sourceware.org/pub/lvm2
-PKG_HASH:=4a63bc8a084a8ae3c7bc5e6530cac264139d218575c64416c8b99e3fe039a05c
+PKG_HASH:=935283a51ee17abd752a545a0ed1cf4edc993359265bc9e562edf81500edc99e
PKG_BUILD_DIR:=$(BUILD_DIR)/lvm2-$(BUILD_VARIANT)/$(PKG_NAME).$(PKG_VERSION)
PKG_MAINTAINER:=Daniel Golle <daniel@makrotopia.org>
--- a/lib/commands/toolcontext.c
+++ b/lib/commands/toolcontext.c
-@@ -1677,7 +1677,7 @@ struct cmd_context *create_toolcontext(u
+@@ -1673,7 +1673,7 @@ struct cmd_context *create_toolcontext(u
/* FIXME Make this configurable? */
reset_lvm_errno(1);
/* Set in/out stream buffering before glibc */
if (set_buffering
#ifdef SYS_gettid
-@@ -2064,7 +2064,7 @@ void destroy_toolcontext(struct cmd_cont
+@@ -2053,7 +2053,7 @@ void destroy_toolcontext(struct cmd_cont
+ dm_hash_destroy(cmd->cft_def_hash);
- if (cmd->pending_delete_mem)
- dm_pool_destroy(cmd->pending_delete_mem);
+ dm_device_list_destroy(&cmd->cache_dm_devs);
-#ifndef VALGRIND_POOL
+#if defined(__GLIBC__) && !defined(VALGRIND_POOL)
if (cmd->linebuffer) {
if (is_valid_fd(STDIN_FILENO) &&
--- a/tools/lvmcmdline.c
+++ b/tools/lvmcmdline.c
-@@ -3381,6 +3381,7 @@ int lvm_split(char *str, int *argc, char
+@@ -3398,6 +3398,7 @@ int lvm_split(char *str, int *argc, char
/* Make sure we have always valid filedescriptors 0,1,2 */
static int _check_standard_fds(void)
{
int err = is_valid_fd(STDERR_FILENO);
if (!is_valid_fd(STDIN_FILENO) &&
-@@ -3407,6 +3408,12 @@ static int _check_standard_fds(void)
+@@ -3424,6 +3425,12 @@ static int _check_standard_fds(void)
strerror(errno));
return 0;
}
PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://git.kernel.org/pub/scm/utils/mmc/mmc-utils.git
-PKG_SOURCE_DATE:=2022-01-16
-PKG_SOURCE_VERSION:=3969aa4804edb8aed7bcb3c958e49d0c7388b067
-PKG_MIRROR_HASH:=a9ad550e5cc2cae54facb000a1d5e98c41215ccaca439cec6ffddc9fd595f269
+PKG_SOURCE_DATE:=2022-02-11
+PKG_SOURCE_VERSION:=4303889c8bd9a2357587eb6ebacecb70098a264d
+PKG_MIRROR_HASH:=b204fa4417dac01b4a17b3db41ef9bfe77b4fc85a5a0762004872e5dcb039b2f
PKG_LICENSE:=GPL-2.0-only
PKG_LICENSE_FILES:=
VARIANT:=plus
endef
+define Package/nano-full
+ $(call Package/nano/Default)
+ TITLE:=GNU nano text editor (all features, Unicode)
+ VARIANT:=full
+endef
+
define Package/nano/description
Nano is a small and simple text editor for use on the terminal.
$(call Package/nano/description)
endef
-ifeq ($(BUILD_VARIANT),plus)
-# plus variant with more features included
+define Package/nano-full/description
+ nano-full - all features, including syntax highlighting (also uci),
+ multibuffer, Unicode/UTF-8, nanorc, some key bindings.
+ (libmagic-based file type detection is disabled)
+
+ Example /etc/nanorc is included. nanorc documentation at
+ https://www.nano-editor.org/dist/latest/nanorc.5.html
+
+ $(call Package/nano/description)
+endef
+
+ifeq ($(BUILD_VARIANT),full)
+# full variant with almost all features included
+ CONFIGURE_ARGS += \
+ --disable-extra \
+ --disable-libmagic \
+ --enable-utf8
+else ifeq ($(BUILD_VARIANT),plus)
+# plus variant with some features included
CONFIGURE_ARGS += \
--enable-help \
--enable-justify \
CONFIGURE_VARS += \
ac_cv_header_regex_h=no \
+define Package/nano-plus/conffiles
+/etc/nanorc
+endef
+
+define Package/nano-full/conffiles
+/etc/nanorc
+endef
+
define Package/nano/install
$(INSTALL_DIR) $(1)/usr/bin
$(CP) $(PKG_INSTALL_DIR)/usr/bin/$(PKG_NAME) $(1)/usr/bin/
$(call Package/nano/install,$1)
endef
+define Package/nano-full/install
+ $(call Package/nano/install,$1)
+ $(INSTALL_DIR) $(1)/etc $(1)/usr/share/nano
+ $(INSTALL_CONF) ./files/nanorc $(1)/etc/nanorc
+ $(INSTALL_DATA) ./files/uci.nanorc $(1)/usr/share/nano
+ $(CP) $(PKG_INSTALL_DIR)/usr/share/nano/* $(1)/usr/share/nano
+endef
+
$(eval $(call BuildPackage,nano))
$(eval $(call BuildPackage,nano-plus))
+$(eval $(call BuildPackage,nano-full))
--- /dev/null
+## General Settings ##
+set multibuffer # Open multiple files
+set linenumbers # show line numbers Alt+N to toggle
+
+## Syntax highlighting ##
+include /usr/share/nano/*.nanorc
+include /usr/share/nano/extra/*.nanorc
+
--- /dev/null
+## Syntax highlighting for OpenWrt uci config files.
+
+syntax uci "/etc/config/*"
+comment "#"
+
+# Keywords
+color green "\<(package|config|option|list)\>"
+
+# Comments.
+color cyan "(^|[[:blank:]])#.*"
+
+# Strings.
+color yellow ""([^"\]|\\.)*"|'([^'\]|\\.)*'"
+
+# Trailing whitespace.
+color ,green "[[:space:]]+$"
+
include $(TOPDIR)/rules.mk
PKG_NAME:=pcsc-lite
-PKG_VERSION:=1.9.4
+PKG_VERSION:=1.9.5
PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=https://pcsclite.apdu.fr/files/
-PKG_HASH:=8a8caac227e0a266015298dda663e81576a0d11d698685101e6aa6c9fdb51c4b
+PKG_HASH:=9ee3f9b333537562177893559ad4f7b8d5c23ebe828eef53056c02db14049d08
PKG_MAINTAINER:=Daniel Golle <daniel@makrotopia.org>
PKG_LICENSE:=BSD-3-Clause
PKG_LICENSE_FILES:=COPYING
--- /dev/null
+# SPDX-License-Identifier: GPL-2.0-only
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=poemgr
+PKG_SOURCE_DATE:=2022-03-19
+PKG_SOURCE_VERSION:=77395242f9b3cb6ef003c5ed74f9b5be78404450
+PKG_RELEASE:=1
+
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL=https://github.com/blocktrron/poemgr.git
+PKG_MIRROR_HASH:=68034f886af8a4ebfd869af940510f755d660362a6069ac49c1ae6ce16cbd950
+
+PKG_MAINTAINER:=David Bauer <mail@david-bauer.net>
+PKG_LICENSE:=GPL-2.0-only
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/poemgr
+ SECTION:=utils
+ CATEGORY:=Utilities
+ DEPENDS:=+libuci +libjson-c
+ TITLE:=Utility to control PoE ports on the UniFi Flex switch
+endef
+
+define Package/poemgr/conffiles
+/etc/config/usteer
+endef
+
+define Package/poemgr/install
+ $(INSTALL_DIR) $(1)/sbin $(1)/usr/lib/poemgr/config $(1)/etc/config $(1)/etc/uci-defaults $(1)/etc/init.d
+ $(INSTALL_BIN) $(PKG_BUILD_DIR)/poemgr $(1)/sbin/poemgr
+ $(INSTALL_BIN) $(PKG_BUILD_DIR)/contrib/uswlite-pse-enable $(1)/usr/lib/poemgr/uswlite-pse-enable
+ $(CP) $(PKG_BUILD_DIR)/contrib/usw-lite.config $(1)/usr/lib/poemgr/config/usw-lite.config
+ $(INSTALL_BIN) $(PKG_BUILD_DIR)/contrib/uci-defaults.sh $(1)/etc/uci-defaults/99-poemgr
+ $(INSTALL_BIN) $(PKG_BUILD_DIR)/contrib/procd-init.sh $(1)/etc/init.d/poemgr
+endef
+
+
+$(eval $(call BuildPackage,poemgr))
include $(TOPDIR)/rules.mk
PKG_NAME:=powertop
-PKG_VERSION:=2.10
-PKG_RELEASE:=5
+PKG_VERSION:=2.14
+PKG_RELEASE:=$(AUTORELEASE)
-PKG_SOURCE:=$(PKG_NAME)-v$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=https://01.org/sites/default/files/downloads/
-PKG_HASH:=d3b7459eaba7d01c8841dd33a3b4d369416c01e9bd8951b0d88234cf18fe4a75
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_VERSION:=v$(PKG_VERSION)
+PKG_SOURCE_URL:=https://github.com/fenrus75/powertop
+PKG_MIRROR_HASH:=9b49054a7e9684781287eb25c50003f68669e7dcad1c234573bd6a5e26474da7
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-v$(PKG_VERSION)
PKG_MAINTAINER:=Lucian Cristain <lucian.cristian@gmail.com>
-PKG_LICENSE:=GPL-2.0
+PKG_LICENSE:=GPL-2.0-only
+PKG_LICENSE_FILES:=COPYING
-PKG_BUILD_PARALLEL:=1
+PKG_FIXUP:=autoreconf
PKG_INSTALL:=1
+PKG_BUILD_PARALLEL:=1
+PKG_BUILD_DEPENDS:=gettext-full/host
include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/nls.mk
endef
TARGET_LDFLAGS += \
- $(if $(INTL_FULL),-lintl) \
- $(if $(CONFIG_USE_GLIBC),-lm) \
- $(if $(CONFIG_USE_GLIBC),-lpthread)
+ $(if $(INTL_FULL),-lintl)
define Package/powertop/install
$(INSTALL_DIR) $(1)/usr/sbin
+++ /dev/null
---- a/traceevent/event-parse.c
-+++ b/traceevent/event-parse.c
-@@ -5121,12 +5121,17 @@ int pevent_strerror(struct pevent *peven
- const char *msg;
-
- if (errnum >= 0) {
-+#if defined(__GLIBC__)
- msg = strerror_r(errnum, buf, buflen);
- if (msg != buf) {
- size_t len = strlen(msg);
- memcpy(buf, msg, min(buflen - 1, len));
- *(buf + min(buflen - 1, len)) = '\0';
- }
-+#else
-+ if (strerror_r(errnum, buf, buflen))
-+ snprintf(buf, buflen, "errnum %i", errnum);
-+#endif
- return 0;
- }
-
--- /dev/null
+From 9ef1559a1582f23d599c149601c3a8e06809296c Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <alex@linutronix.de>
+Date: Mon, 25 Oct 2021 17:47:23 +0200
+Subject: [PATCH] src: fix compatibility with ncurses 6.3
+
+Signed-off-by: Alexander Kanavin <alex@linutronix.de>
+---
+ src/devices/devfreq.cpp | 2 +-
+ src/display.cpp | 2 +-
+ src/lib.cpp | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+--- a/src/devices/devfreq.cpp
++++ b/src/devices/devfreq.cpp
+@@ -297,7 +297,7 @@ void display_devfreq_devices(void)
+ df->fill_freq_utilization(j, buf);
+ strcat(fline, buf);
+ strcat(fline, "\n");
+- wprintw(win, fline);
++ wprintw(win, "%s", fline);
+ }
+ wprintw(win, "\n");
+ }
+--- a/src/display.cpp
++++ b/src/display.cpp
+@@ -125,7 +125,7 @@ void show_tab(unsigned int tab)
+
+ c = bottom_lines[tab_names[tab]].c_str();
+ if (c && strlen(c) > 0)
+- mvwprintw(bottom_line, 0,0, c);
++ mvwprintw(bottom_line, 0,0, "%s", c);
+ else
+ mvwprintw(bottom_line, 0, 0,
+ "<ESC> %s | <TAB> / <Shift + TAB> %s | ", _("Exit"),
+--- a/src/lib.cpp
++++ b/src/lib.cpp
+@@ -583,7 +583,7 @@ void ui_notify_user_ncurses(const char *
+ * buffer */
+ vsnprintf(notify, UI_NOTIFY_BUFF_SZ - 1, frmt, list);
+ va_end(list);
+- mvprintw(1, 0, notify);
++ mvprintw(1, 0, "%s", notify);
+ attroff(COLOR_PAIR(1));
+ }
+
+++ /dev/null
-From 7235a786ea30ae5ca7c1b3458ef5b2388c08dfd9 Mon Sep 17 00:00:00 2001
-From: Rosen Penev <rosenp@gmail.com>
-Date: Thu, 28 Mar 2019 18:44:27 -0700
-Subject: [PATCH] src/main: Add missing pthread header
-
-Otherwise compilation can fail with:
-
-main.cpp: In function 'void one_measurement(int, int, char*)':
-main.cpp:226:3: error: 'pthread_t' was not declared in this scope
- pthread_t thread = 0UL;
- ^~~~~~~~~
-main.cpp:226:3: note: suggested alternative: 'pread'
- pthread_t thread = 0UL;
- ^~~~~~~~~
- pread
-
-et al.
-
-Signed-off-by: Rosen Penev <rosenp@gmail.com>
----
- src/main.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
---- a/src/main.cpp
-+++ b/src/main.cpp
-@@ -39,6 +39,7 @@
- #include <locale.h>
- #include <sys/resource.h>
- #include <limits.h>
-+#include <pthread.h>
-
- #include "cpu/cpu.h"
- #include "process/process.h"
+++ /dev/null
-From 8cdf846922ffb3e0d2a828be473fdf9c45a56e7c Mon Sep 17 00:00:00 2001
-From: Rosen Penev <rosenp@gmail.com>
-Date: Sat, 30 Mar 2019 20:19:17 -0700
-Subject: [PATCH] intel_cpus.cpp: Change open parameter to const char *
-
-ifstream::open takes std::string starting with C++11, not before.
-
-This fixes compilation with uClibc++ and potentially other older libraries
-
-Signed-off-by: Rosen Penev <rosenp@gmail.com>
----
- src/cpu/intel_cpus.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/src/cpu/intel_cpus.cpp
-+++ b/src/cpu/intel_cpus.cpp
-@@ -92,7 +92,7 @@ int is_supported_intel_cpu(int model, in
-
- int is_intel_pstate_driver_loaded()
- {
-- const string filename("/sys/devices/system/cpu/cpu0/cpufreq/scaling_driver");
-+ const char *filename = "/sys/devices/system/cpu/cpu0/cpufreq/scaling_driver";
- const string intel_pstate("intel_pstate");
- char line[32] = { '\0' };
- ifstream file;
include $(TOPDIR)/rules.mk
PKG_NAME:=telegraf
-PKG_VERSION:=1.21.4
+PKG_VERSION:=1.22.0
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/influxdata/telegraf/tar.gz/v$(PKG_VERSION)?
-PKG_HASH:=dc1f04662fe81c970019271a215979c5549aec86b896562376d69bc76d7eaeda
+PKG_HASH:=7d1624773e4e5c801eaaa0f52b75ee612cc12a975c625077a57cd7dbe612a2b3
PKG_MAINTAINER:=Jonathan Pagel <jonny_tischbein@systemli.org>
PKG_LICENSE:=MIT
lv_mode="${lv_name:0:2}"
lv_name="${lv_name:3}"
lv_size=${lv_size%B}
- [ "${lv_name:0:1}" = "." ] && continue
- if [ "$json_output" = "1" ]; then
- [ "$json_notfirst" = "1" ] && echo ","
- echo -e "\t{"
- echo -e "\t\t\"name\": \"$lv_name\","
- echo -e "\t\t\"mode\": \"$lv_mode\","
- echo -e "\t\t\"size\": $lv_size"
- echo -n -e "\t}"
- json_notfirst=1
- else
- echo "$lv_name $lv_mode $lv_size"
+ if [ "${lv_name:0:1}" != "." ]; then
+ if [ "$json_output" = "1" ]; then
+ [ "$json_notfirst" = "1" ] && echo ","
+ echo -e "\t{"
+ echo -e "\t\t\"name\": \"$lv_name\","
+ echo -e "\t\t\"mode\": \"$lv_mode\","
+ echo -e "\t\t\"size\": $lv_size"
+ echo -n -e "\t}"
+ json_notfirst=1
+ else
+ echo "$lv_name $lv_mode $lv_size"
+ fi
fi
json_select ..
done
include $(TOPDIR)/rules.mk
PKG_NAME:=yq
-PKG_VERSION:=4.22.1
+PKG_VERSION:=4.23.1
PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/mikefarah/yq/tar.gz/v$(PKG_VERSION)?
-PKG_HASH:=79b4f01774849323db7cc649a270ac4aaccacea2e97260b25f51a634670ecb6e
+PKG_HASH:=f55ffb9c6d7926b06d5862eb6a9e9ea942ec2883286df8e2e3d6f0716cc36eed
PKG_MAINTAINER:=Tianling Shen <cnsztl@immortalwrt.org>
PKG_LICENSE:=MIT
#
-# Copyright (C) 2007-2021 OpenWrt.org
+# Copyright (C) 2007-2022 OpenWrt.org
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
include $(TOPDIR)/rules.mk
PKG_NAME:=zoneinfo
-PKG_VERSION:=2021e
+PKG_VERSION:=2022a
PKG_RELEASE:=1
#As i couldn't find real license used "Public Domain"
PKG_SOURCE:=tzdata$(PKG_VERSION).tar.gz
PKG_SOURCE_CODE:=tzcode$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=http://www.iana.org/time-zones/repository/releases
-PKG_HASH:=07ec42b737d0d3c6be9c337f8abb5f00554a0f9cc4fcf01a703d69403b6bb2b1
+PKG_HASH:=ef7fffd9f4f50f4f58328b35022a32a5a056b245c5cb3d6791dddb342f871664
include $(INCLUDE_DIR)/package.mk
define Download/tzcode
FILE=$(PKG_SOURCE_CODE)
URL=$(PKG_SOURCE_URL)
- HASH:=584666393a5424d13d27ec01183da17703273664742e049d4f62f62dab631775
+ HASH:=f8575e7e33be9ee265df2081092526b81c80abac3f4a04399ae9d4d91cdadac7
endef
$(eval $(call Download,tzcode))
projects / feed / packages.git / commitdiff