Merge Offcial Source
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
This commit is contained in:
commit
3acafc69a5
|
@ -11,13 +11,13 @@
|
|||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=boost
|
||||
PKG_VERSION:=1.87.0
|
||||
PKG_SOURCE_VERSION:=1_87_0
|
||||
PKG_VERSION:=1.88.0
|
||||
PKG_SOURCE_VERSION:=1_88_0
|
||||
PKG_RELEASE:=1
|
||||
|
||||
PKG_SOURCE:=$(PKG_NAME)_$(PKG_SOURCE_VERSION).tar.bz2
|
||||
PKG_SOURCE_URL:=@SF/$(PKG_NAME)/$(PKG_NAME)/$(PKG_VERSION) https://boostorg.jfrog.io/artifactory/main/release/$(PKG_VERSION)/source/
|
||||
PKG_HASH:=af57be25cb4c4f4b413ed692fe378affb4352ea50fbe294a11ef548f4d527d89
|
||||
PKG_HASH:=46d9d2c06637b219270877c9e16155cbd015b6dc84349af064c088e9b5b12f7b
|
||||
|
||||
PKG_MAINTAINER:=Carlos M. Ferreira <carlosmf.pt@gmail.com>
|
||||
PKG_LICENSE:=BSL-1.0
|
||||
|
@ -42,7 +42,7 @@ define Package/boost/Default
|
|||
endef
|
||||
|
||||
define Package/boost/description
|
||||
This package provides the Boost v1.87.0 libraries.
|
||||
This package provides the Boost v1.88.0 libraries.
|
||||
Boost is a set of free, peer-reviewed, portable C++ source libraries.
|
||||
|
||||
This package provides the following run-time libraries:
|
||||
|
@ -80,7 +80,7 @@ This package provides the following run-time libraries:
|
|||
- wave
|
||||
|
||||
There are many more header-only libraries supported by Boost.
|
||||
See more at http://www.boost.org/doc/libs/1_87_0/
|
||||
See more at http://www.boost.org/doc/libs/1_88_0/
|
||||
endef
|
||||
|
||||
PKG_BUILD_DEPENDS:=boost/host
|
||||
|
@ -348,10 +348,10 @@ $(eval $(call DefineBoostLibrary,date_time))
|
|||
#$(eval $(call DefineBoostLibrary,exception,,))
|
||||
$(eval $(call DefineBoostLibrary,fiber,coroutine filesystem,,!boost-fiber-exclude))
|
||||
$(eval $(call DefineBoostLibrary,filesystem,system atomic))
|
||||
$(eval $(call DefineBoostLibrary,graph,regex))
|
||||
$(eval $(call DefineBoostLibrary,graph))
|
||||
$(eval $(call DefineBoostLibrary,iostreams,system random regex,,,zlib liblzma libbz2 libzstd))
|
||||
$(eval $(call DefineBoostLibrary,json,container))
|
||||
$(eval $(call DefineBoostLibrary,locale,system chrono thread,,,icu))
|
||||
$(eval $(call DefineBoostLibrary,locale,system chrono thread charconv,,,icu))
|
||||
$(eval $(call DefineBoostLibrary,log,system chrono date_time thread filesystem regex))
|
||||
$(eval $(call DefineBoostLibrary,math, container random system))
|
||||
#$(eval $(call DefineBoostLibrary,mpi,,)) # OpenMPI does no exist in OpenWRT at this time.
|
||||
|
@ -368,7 +368,7 @@ $(eval $(call DefineBoostLibrary,thread,system chrono atomic))
|
|||
$(eval $(call DefineBoostLibrary,timer,chrono))
|
||||
$(eval $(call DefineBoostLibrary,type_erasure,chrono system thread))
|
||||
$(eval $(call DefineBoostLibrary,url, system))
|
||||
$(eval $(call DefineBoostLibrary,wave,date_time thread filesystem container serialization))
|
||||
$(eval $(call DefineBoostLibrary,wave,date_time thread filesystem container serialization regex))
|
||||
|
||||
include $(INCLUDE_DIR)/host-build.mk
|
||||
|
||||
|
|
|
@ -11,7 +11,7 @@ PKG_HASH:=16a7cee93ce2868ae63ab1a8164dc7de43577c59983b9f61293a310d6888dceb
|
|||
PKG_MAINTAINER:=Ted Hess <thess@kitschensync.net>
|
||||
PKG_LICENSE:=BSD-3-Clause
|
||||
PKG_LICENSE_FILES:=COPYING
|
||||
PKG_CPE_ID:=cpe:/a:libupnp_project:libupnp
|
||||
PKG_CPE_ID:=cpe:/a:pupnp_project:pupnp
|
||||
|
||||
PKG_CONFIG_DEPENDS:= \
|
||||
CONFIG_PACKAGE_libupnp-sample \
|
||||
|
|
|
@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
|
|||
|
||||
PKG_NAME:=pthsem
|
||||
PKG_VERSION:=2.0.8
|
||||
PKG_RELEASE:=7
|
||||
PKG_RELEASE:=8
|
||||
|
||||
PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).tar.gz
|
||||
PKG_SOURCE_URL:=http://www.auto.tuwien.ac.at/~mkoegler/pth/
|
||||
|
|
|
@ -1,11 +0,0 @@
|
|||
--- a/acinclude.m4
|
||||
+++ b/acinclude.m4
|
||||
@@ -892,6 +892,8 @@ case $PLATFORM in
|
||||
case "x`uname -r`" in
|
||||
changequote(, )dnl
|
||||
x2.[23456789]* ) ;;
|
||||
+changequote(, )dnl
|
||||
+ x3.* ) ;;
|
||||
changequote([, ])
|
||||
* ) braindead=yes ;;
|
||||
esac
|
|
@ -1,11 +0,0 @@
|
|||
--- a/acinclude.m4
|
||||
+++ b/acinclude.m4
|
||||
@@ -894,6 +894,8 @@ changequote(, )dnl
|
||||
x2.[23456789]* ) ;;
|
||||
changequote(, )dnl
|
||||
x3.* ) ;;
|
||||
+changequote(, )dnl
|
||||
+ x4.* ) ;;
|
||||
changequote([, ])
|
||||
* ) braindead=yes ;;
|
||||
esac
|
|
@ -0,0 +1,30 @@
|
|||
From 3ec1a1c22142c547bc7f44622291bf0abdc322f1 Mon Sep 17 00:00:00 2001
|
||||
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
Date: Sun, 25 Feb 2024 14:33:02 +0100
|
||||
Subject: [PATCH] acinclude.m4: fix build with autoconf >= 2.72
|
||||
|
||||
Move fi statement where it belongs to fix the following build failure
|
||||
with autoconf >= 2.72:
|
||||
|
||||
checking for stack setup via makecontext... ./configure: line 15863: syntax error near unexpected token `;;'
|
||||
|
||||
Fixes:
|
||||
- http://autobuild.buildroot.org/results/013e0d3f72582ce3675f65786c014518682d703b
|
||||
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
---
|
||||
acinclude.m4 | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
--- a/acinclude.m4
|
||||
+++ b/acinclude.m4
|
||||
@@ -1426,8 +1426,8 @@ ac_cv_stacksetup_$1='guessed:(skaddr),(s
|
||||
])
|
||||
dnl # restore original compile environment
|
||||
CFLAGS="$OCFLAGS"
|
||||
-])dnl
|
||||
fi
|
||||
+])dnl
|
||||
dnl # extract result ingredients of single cached result value
|
||||
type=`echo $ac_cv_stacksetup_$1 | sed -e 's;:.*$;;'`
|
||||
addr=`echo $ac_cv_stacksetup_$1 | sed -e 's;^.*:;;' -e 's;,.*$;;'`
|
|
@ -0,0 +1,18 @@
|
|||
--- a/acinclude.m4
|
||||
+++ b/acinclude.m4
|
||||
@@ -953,6 +953,7 @@ changequote(<<, >>)dnl
|
||||
#include <stdio.h>
|
||||
#include <sys/types.h>
|
||||
#include <signal.h>
|
||||
+#include <stdlib>
|
||||
|
||||
int main(int argc, char *argv[])
|
||||
{
|
||||
@@ -1001,6 +1002,7 @@ changequote(<<, >>)dnl
|
||||
#include <stdio.h>
|
||||
#include <sys/types.h>
|
||||
#include <unistd.h>
|
||||
+#include <stdlib.h>
|
||||
int main(int argc, char *argv[])
|
||||
{
|
||||
FILE *fp;
|
|
@ -8,19 +8,20 @@
|
|||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=sqlite
|
||||
PKG_VERSION:=3470200
|
||||
PKG_VERSION:=3.49.1
|
||||
PKG_SRC_VERSION:=3490100
|
||||
PKG_RELEASE:=1
|
||||
|
||||
PKG_SOURCE:=$(PKG_NAME)-autoconf-$(PKG_VERSION).tar.gz
|
||||
PKG_SOURCE_URL:=https://www.sqlite.org/2024/
|
||||
PKG_HASH:=f1b2ee412c28d7472bc95ba996368d6f0cdcf00362affdadb27ed286c179540b
|
||||
PKG_SOURCE:=$(PKG_NAME)-autoconf-$(PKG_SRC_VERSION).tar.gz
|
||||
PKG_SOURCE_URL:=https://www.sqlite.org/2025/
|
||||
PKG_HASH:=106642d8ccb36c5f7323b64e4152e9b719f7c0215acf5bfeac3d5e7f97b59254
|
||||
|
||||
PKG_CPE_ID:=cpe:/a:sqlite:sqlite
|
||||
PKG_LICENSE:=PUBLICDOMAIN
|
||||
PKG_LICENSE_FILES:=
|
||||
PKG_MAINTAINER:=
|
||||
|
||||
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-autoconf-$(PKG_VERSION)
|
||||
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-autoconf-$(PKG_SRC_VERSION)
|
||||
PKG_BUILD_PARALLEL:=1
|
||||
PKG_FIXUP:=autoreconf
|
||||
PKG_INSTALL:=1
|
||||
|
@ -99,13 +100,14 @@ TARGET_CFLAGS += \
|
|||
$(if $(CONFIG_SQLITE3_BATCH_ATOMIC_WRITE),-DSQLITE_ENABLE_BATCH_ATOMIC_WRITE) \
|
||||
$(if $(CONFIG_SQLITE3_COLUMN_METADATA),-DSQLITE_ENABLE_COLUMN_METADATA)
|
||||
|
||||
CONFIGURE_ARGS += \
|
||||
CONFIGURE_ARGS := \
|
||||
$(filter-out --target=% $(DISABLE_IPV6) $(DISABLE_NLS),$(CONFIGURE_ARGS)) \
|
||||
--disable-debug \
|
||||
--disable-static-shell \
|
||||
--enable-shared \
|
||||
--enable-static \
|
||||
--enable-threadsafe \
|
||||
$(if $(CONFIG_SQLITE3_DYNAMIC_EXTENSIONS),--enable-dynamic-extensions,--disable-dynamic-extensions) \
|
||||
$(if $(CONFIG_SQLITE3_DYNAMIC_EXTENSIONS),--enable-load-extension,--disable-load-extension) \
|
||||
$(if $(CONFIG_SQLITE3_FTS3),--enable-fts3,--disable-fts3) \
|
||||
$(if $(CONFIG_SQLITE3_FTS4),--enable-fts4,--disable-fts4) \
|
||||
$(if $(CONFIG_SQLITE3_FTS5),--enable-fts5,--disable-fts5) \
|
||||
|
@ -130,7 +132,7 @@ endef
|
|||
|
||||
define Package/libsqlite3/install
|
||||
$(INSTALL_DIR) $(1)/usr/lib
|
||||
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libsqlite3.so.$(ABI_VERSION)* $(1)/usr/lib
|
||||
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libsqlite3.so* $(1)/usr/lib
|
||||
endef
|
||||
|
||||
define Package/sqlite3-cli/install
|
||||
|
|
|
@ -0,0 +1,5 @@
|
|||
#!/bin/sh
|
||||
|
||||
if [ "$1" = 'sqlite3-cli' ]; then
|
||||
sqlite3 -version 2>&1 | cut -d' ' -f1 | grep -x "$PKG_VERSION"
|
||||
fi
|
|
@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk
|
|||
|
||||
PKG_NAME:=banip
|
||||
PKG_VERSION:=1.5.6
|
||||
PKG_RELEASE:=1
|
||||
PKG_RELEASE:=2
|
||||
PKG_LICENSE:=GPL-3.0-or-later
|
||||
PKG_MAINTAINER:=Dirk Brenken <dev@brenken.org>
|
||||
|
||||
|
@ -66,6 +66,9 @@ define Package/banip/install
|
|||
|
||||
$(INSTALL_DIR) $(1)/www/cgi-bin
|
||||
$(INSTALL_BIN) ./files/banip.cgi $(1)/www/cgi-bin/banip
|
||||
|
||||
$(INSTALL_DIR) $(1)/etc/uci-defaults
|
||||
$(INSTALL_BIN) ./files/95-banip-housekeeping $(1)/etc/uci-defaults
|
||||
endef
|
||||
|
||||
$(eval $(call BuildPackage,banip))
|
||||
|
|
|
@ -0,0 +1,31 @@
|
|||
#!/bin/sh
|
||||
# Copyright (c) 2015-2025 Dirk Brenken (dev@brenken.org)
|
||||
# This is free software, licensed under the GNU General Public License v3.
|
||||
|
||||
# (s)hellcheck exceptions
|
||||
# shellcheck disable=all
|
||||
|
||||
export LC_ALL=C
|
||||
export PATH="/usr/sbin:/usr/bin:/sbin:/bin"
|
||||
|
||||
config="banip"
|
||||
old_options="ban_loginput ban_logforwardwan ban_logforwardlan ban_blockinput ban_blockforwardwan ban_blockforwardlan"
|
||||
|
||||
for option in ${old_options}; do
|
||||
if uci -q get ${config}.global.${option} >/dev/null 2>&1; then
|
||||
old_values="$(uci -q get "${config}.global.${option}")"
|
||||
for value in ${old_values}; do
|
||||
case "${option}" in
|
||||
"ban_loginput" | "ban_logforwardwan")
|
||||
uci -q set "${config}".global.ban_loginbound="${value}"
|
||||
;;
|
||||
"ban_logforwardlan")
|
||||
uci -q set "${config}".global.ban_logoutbound="${value}"
|
||||
;;
|
||||
esac
|
||||
done
|
||||
uci -q delete "${config}.global.${option}"
|
||||
fi
|
||||
done
|
||||
[ -n "$(uci -q changes "${config}")" ] && uci -q commit "${config}"
|
||||
exit 0
|
|
@ -546,17 +546,17 @@ f_etag() {
|
|||
if [ -z "${etag_id}" ]; then
|
||||
etag_id="$(printf "%s" "${http_head}" | "${ban_awkcmd}" 'tolower($0)~/^[[:space:]]*last-modified: /{gsub(/[Ll]ast-[Mm]odified:|[[:space:]]|,|:/,"");printf "%s\n",$1}')"
|
||||
fi
|
||||
etag_cnt="$("${ban_grepcmd}" -c "^${feed}" "${ban_backupdir}/banIP.etag")"
|
||||
etag_cnt="$("${ban_grepcmd}" -c "^${feed} " "${ban_backupdir}/banIP.etag")"
|
||||
if [ "${http_code}" = "200" ] && [ "${etag_cnt}" = "${feed_cnt}" ] && [ -n "${etag_id}" ] &&
|
||||
"${ban_grepcmd}" -q "^${feed}${feed_suffix}[[:space:]]\+${etag_id}\$" "${ban_backupdir}/banIP.etag"; then
|
||||
"${ban_grepcmd}" -q "^${feed} ${feed_suffix}[[:space:]]\+${etag_id}\$" "${ban_backupdir}/banIP.etag"; then
|
||||
out_rc="0"
|
||||
elif [ -n "${etag_id}" ]; then
|
||||
if [ "${feed_cnt}" -lt "${etag_cnt}" ]; then
|
||||
"${ban_sedcmd}" -i "/^${feed}/d" "${ban_backupdir}/banIP.etag"
|
||||
"${ban_sedcmd}" -i "/^${feed} /d" "${ban_backupdir}/banIP.etag"
|
||||
else
|
||||
"${ban_sedcmd}" -i "/^${feed}${feed_suffix}/d" "${ban_backupdir}/banIP.etag"
|
||||
"${ban_sedcmd}" -i "/^${feed} ${feed_suffix//\//\\/}/d" "${ban_backupdir}/banIP.etag"
|
||||
fi
|
||||
printf "%-50s%s\n" "${feed}${feed_suffix}" "${etag_id}" >>"${ban_backupdir}/banIP.etag"
|
||||
printf "%-50s%s\n" "${feed} ${feed_suffix}" "${etag_id}" >>"${ban_backupdir}/banIP.etag"
|
||||
out_rc="2"
|
||||
fi
|
||||
fi
|
||||
|
@ -1162,7 +1162,7 @@ f_down() {
|
|||
if [ "${feed_rc}" = "0" ]; then
|
||||
for split_file in "${tmp_file}".*; do
|
||||
if [ -s "${split_file}" ]; then
|
||||
"${ban_sedcmd}" -i "1 i #!${ban_nftcmd} -f\nadd element inet banIP "${feed}" { " "${split_file}"
|
||||
"${ban_sedcmd}" -i "1 i #!${ban_nftcmd} -f\nadd element inet banIP ${feed} { " "${split_file}"
|
||||
printf "%s\n" "}" >>"${split_file}"
|
||||
# load split file to nftset
|
||||
#
|
||||
|
@ -1371,7 +1371,7 @@ f_getstatus() {
|
|||
else
|
||||
json_get_var value "${key}" >/dev/null 2>&1
|
||||
if [ "${key}" = "status" ]; then
|
||||
[ "${value}" = "active" ] && value="${value} ($(f_actual))" || value="${value}"
|
||||
[ "${value}" = "active" ] && value="${value} ($(f_actual))"
|
||||
fi
|
||||
fi
|
||||
if [ "${key}" != "wan_interfaces" ] && [ "${key}" != "vlan_allow" ] && [ "${key}" != "vlan_block" ]; then
|
||||
|
|
|
@ -2,11 +2,11 @@ include $(TOPDIR)/rules.mk
|
|||
|
||||
PKG_NAME:=gnunet-fuse
|
||||
|
||||
PKG_VERSION:=0.23.0
|
||||
PKG_VERSION:=0.24.0
|
||||
PKG_RELEASE:=1
|
||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
|
||||
PKG_SOURCE_URL:=@GNU/gnunet
|
||||
PKG_HASH:=025f94f4f01bd4b87c52df638d9a6bfb5d8f21b3b7a12f72f02d3569980bca5f
|
||||
PKG_HASH:=2ea8943d49488908700e8aad628491ed1ed63275a44e6426580ff087c4242349
|
||||
|
||||
PKG_LICENSE:=GPL-3.0
|
||||
PKG_LICENSE_FILES:=COPYING
|
||||
|
|
|
@ -2,11 +2,11 @@ include $(TOPDIR)/rules.mk
|
|||
|
||||
PKG_NAME:=gnunet
|
||||
|
||||
PKG_VERSION:=0.23.1
|
||||
PKG_VERSION:=0.24.1
|
||||
PKG_RELEASE:=1
|
||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
|
||||
PKG_SOURCE_URL:=@GNU/gnunet
|
||||
PKG_HASH:=6fd05b69076b3b1a8e7e20b254e044fdd4c6da5313196317f3de088f7d025cf2
|
||||
PKG_HASH:=c4f8f9d25d3a00f80709583b87aa8312d01454090b73a413b43ec7ec7c07ba39
|
||||
|
||||
PKG_LICENSE:=AGPL-3.0
|
||||
PKG_LICENSE_FILES:=COPYING
|
||||
|
|
|
@ -9,12 +9,12 @@
|
|||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=kea
|
||||
PKG_VERSION:=2.6.0
|
||||
PKG_VERSION:=2.6.2
|
||||
PKG_RELEASE:=1
|
||||
|
||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
|
||||
PKG_SOURCE_URL:=https://ftp.isc.org/isc/kea/$(PKG_VERSION)
|
||||
PKG_HASH:=207ceae33eb3b81ec4e6ac5605249a85b93779333b62aadf39e489f11dbcdc8d
|
||||
PKG_HASH:=8a50b63103734b59c3b8619ccd6766d2dfee3f02e3a5f9f3abc1cd55f70fa424
|
||||
|
||||
PKG_MAINTAINER:=BangLang Huang <banglang.huang@foxmail.com>, Rosy Song <rosysong@rosinson.com>
|
||||
PKG_LICENSE:=MPL-2.0
|
||||
|
|
|
@ -0,0 +1,176 @@
|
|||
From 81edc181f85395c39964104ef049a195bafb9737 Mon Sep 17 00:00:00 2001
|
||||
From: q66 <q66@chimera-linux.org>
|
||||
Date: Sun, 15 Dec 2024 03:04:53 +0100
|
||||
Subject: [PATCH] [#3696] Update asiolink for boost 1.87
|
||||
|
||||
---
|
||||
src/lib/asiolink/io_address.cc | 4 ++--
|
||||
src/lib/asiolink/io_service.cc | 8 ++++----
|
||||
src/lib/asiolink/tcp_endpoint.h | 2 +-
|
||||
src/lib/asiolink/udp_endpoint.h | 2 +-
|
||||
src/lib/asiolink/unix_domain_socket.cc | 16 ++++++++--------
|
||||
src/lib/dhcp/iface_mgr.cc | 2 +-
|
||||
6 files changed, 17 insertions(+), 17 deletions(-)
|
||||
|
||||
--- a/src/lib/asiolink/io_address.cc
|
||||
+++ b/src/lib/asiolink/io_address.cc
|
||||
@@ -37,7 +37,7 @@ IOAddress::Hash::operator()(const IOAddr
|
||||
// because we'd like to throw our own exception on failure.
|
||||
IOAddress::IOAddress(const std::string& address_str) {
|
||||
boost::system::error_code err;
|
||||
- asio_address_ = ip::address::from_string(address_str, err);
|
||||
+ asio_address_ = ip::make_address(address_str, err);
|
||||
if (err) {
|
||||
isc_throw(IOError, "Failed to convert string to address '"
|
||||
<< address_str << "': " << err.message());
|
||||
@@ -116,7 +116,7 @@ IOAddress::isV6Multicast() const {
|
||||
uint32_t
|
||||
IOAddress::toUint32() const {
|
||||
if (asio_address_.is_v4()) {
|
||||
- return (asio_address_.to_v4().to_ulong());
|
||||
+ return (asio_address_.to_v4().to_uint());
|
||||
} else {
|
||||
isc_throw(BadValue, "Can't convert " << toText()
|
||||
<< " address to IPv4.");
|
||||
--- a/src/lib/asiolink/io_service.cc
|
||||
+++ b/src/lib/asiolink/io_service.cc
|
||||
@@ -30,7 +30,7 @@ public:
|
||||
/// @brief The constructor.
|
||||
IOServiceImpl() :
|
||||
io_service_(),
|
||||
- work_(new boost::asio::io_service::work(io_service_)) {
|
||||
+ work_(boost::asio::make_work_guard(io_service_)) {
|
||||
};
|
||||
|
||||
/// @brief The destructor.
|
||||
@@ -92,7 +92,7 @@ public:
|
||||
|
||||
/// @brief Restarts the IOService in preparation for a subsequent @ref run() invocation.
|
||||
void restart() {
|
||||
- io_service_.reset();
|
||||
+ io_service_.restart();
|
||||
}
|
||||
|
||||
/// @brief Removes IO service work object to let it finish running
|
||||
@@ -115,12 +115,12 @@ public:
|
||||
///
|
||||
/// @param callback The callback to be run on the IO service.
|
||||
void post(const std::function<void ()>& callback) {
|
||||
- io_service_.post(callback);
|
||||
+ boost::asio::post(io_service_, callback);
|
||||
}
|
||||
|
||||
private:
|
||||
boost::asio::io_service io_service_;
|
||||
- boost::shared_ptr<boost::asio::io_service::work> work_;
|
||||
+ boost::asio::executor_work_guard<boost::asio::io_service::executor_type> work_;
|
||||
};
|
||||
|
||||
IOService::IOService() : io_impl_(new IOServiceImpl()) {
|
||||
--- a/src/lib/asiolink/tcp_endpoint.h
|
||||
+++ b/src/lib/asiolink/tcp_endpoint.h
|
||||
@@ -42,7 +42,7 @@ public:
|
||||
/// \param port The TCP port number of the endpoint.
|
||||
TCPEndpoint(const IOAddress& address, const unsigned short port) :
|
||||
asio_endpoint_placeholder_(
|
||||
- new boost::asio::ip::tcp::endpoint(boost::asio::ip::address::from_string(address.toText()),
|
||||
+ new boost::asio::ip::tcp::endpoint(boost::asio::ip::make_address(address.toText()),
|
||||
port)),
|
||||
asio_endpoint_(*asio_endpoint_placeholder_)
|
||||
{}
|
||||
--- a/src/lib/asiolink/udp_endpoint.h
|
||||
+++ b/src/lib/asiolink/udp_endpoint.h
|
||||
@@ -42,7 +42,7 @@ public:
|
||||
/// \param port The UDP port number of the endpoint.
|
||||
UDPEndpoint(const IOAddress& address, const unsigned short port) :
|
||||
asio_endpoint_placeholder_(
|
||||
- new boost::asio::ip::udp::endpoint(boost::asio::ip::address::from_string(address.toText()),
|
||||
+ new boost::asio::ip::udp::endpoint(boost::asio::ip::make_address(address.toText()),
|
||||
port)),
|
||||
asio_endpoint_(*asio_endpoint_placeholder_)
|
||||
{}
|
||||
--- a/src/lib/asiolink/unix_domain_socket.cc
|
||||
+++ b/src/lib/asiolink/unix_domain_socket.cc
|
||||
@@ -83,7 +83,7 @@ public:
|
||||
/// @param buffer Buffers holding the data to be sent.
|
||||
/// @param handler User supplied callback to be invoked when data have
|
||||
/// been sent or sending error is signalled.
|
||||
- void doSend(const boost::asio::const_buffers_1& buffer,
|
||||
+ void doSend(const boost::asio::const_buffer& buffer,
|
||||
const UnixDomainSocket::Handler& handler);
|
||||
|
||||
|
||||
@@ -103,7 +103,7 @@ public:
|
||||
/// @param ec Error code returned as a result of sending the data.
|
||||
/// @param length Length of the data sent.
|
||||
void sendHandler(const UnixDomainSocket::Handler& remote_handler,
|
||||
- const boost::asio::const_buffers_1& buffer,
|
||||
+ const boost::asio::const_buffer& buffer,
|
||||
const boost::system::error_code& ec,
|
||||
size_t length);
|
||||
|
||||
@@ -127,7 +127,7 @@ public:
|
||||
/// @param buffer A buffer into which the data should be received.
|
||||
/// @param handler User supplied callback invoked when data have been
|
||||
/// received on an error is signalled.
|
||||
- void doReceive(const boost::asio::mutable_buffers_1& buffer,
|
||||
+ void doReceive(const boost::asio::mutable_buffer& buffer,
|
||||
const UnixDomainSocket::Handler& handler);
|
||||
|
||||
/// @brief Local handler invoked as a result of asynchronous receive.
|
||||
@@ -146,7 +146,7 @@ public:
|
||||
/// @param ec Error code returned as a result of asynchronous receive.
|
||||
/// @param length Size of the received data.
|
||||
void receiveHandler(const UnixDomainSocket::Handler& remote_handler,
|
||||
- const boost::asio::mutable_buffers_1& buffer,
|
||||
+ const boost::asio::mutable_buffer& buffer,
|
||||
const boost::system::error_code& ec,
|
||||
size_t length);
|
||||
|
||||
@@ -197,7 +197,7 @@ UnixDomainSocketImpl::asyncSend(const vo
|
||||
}
|
||||
|
||||
void
|
||||
-UnixDomainSocketImpl::doSend(const boost::asio::const_buffers_1& buffer,
|
||||
+UnixDomainSocketImpl::doSend(const boost::asio::const_buffer& buffer,
|
||||
const UnixDomainSocket::Handler& handler) {
|
||||
auto local_handler = std::bind(&UnixDomainSocketImpl::sendHandler,
|
||||
shared_from_this(),
|
||||
@@ -207,7 +207,7 @@ UnixDomainSocketImpl::doSend(const boost
|
||||
|
||||
void
|
||||
UnixDomainSocketImpl::sendHandler(const UnixDomainSocket::Handler& remote_handler,
|
||||
- const boost::asio::const_buffers_1& buffer,
|
||||
+ const boost::asio::const_buffer& buffer,
|
||||
const boost::system::error_code& ec,
|
||||
size_t length) {
|
||||
// The asynchronous send may return EWOULDBLOCK or EAGAIN on some
|
||||
@@ -230,7 +230,7 @@ UnixDomainSocketImpl::asyncReceive(void*
|
||||
}
|
||||
|
||||
void
|
||||
-UnixDomainSocketImpl::doReceive(const boost::asio::mutable_buffers_1& buffer,
|
||||
+UnixDomainSocketImpl::doReceive(const boost::asio::mutable_buffer& buffer,
|
||||
const UnixDomainSocket::Handler& handler) {
|
||||
auto local_handler = std::bind(&UnixDomainSocketImpl::receiveHandler,
|
||||
shared_from_this(),
|
||||
@@ -240,7 +240,7 @@ UnixDomainSocketImpl::doReceive(const bo
|
||||
|
||||
void
|
||||
UnixDomainSocketImpl::receiveHandler(const UnixDomainSocket::Handler& remote_handler,
|
||||
- const boost::asio::mutable_buffers_1& buffer,
|
||||
+ const boost::asio::mutable_buffer& buffer,
|
||||
const boost::system::error_code& ec,
|
||||
size_t length) {
|
||||
// The asynchronous receive may return EWOULDBLOCK or EAGAIN on some
|
||||
--- a/src/lib/dhcp/iface_mgr.cc
|
||||
+++ b/src/lib/dhcp/iface_mgr.cc
|
||||
@@ -1034,7 +1034,7 @@ IfaceMgr::getLocalAddress(const IOAddres
|
||||
}
|
||||
|
||||
// Create socket that will be used to connect to remote endpoint.
|
||||
- boost::asio::io_service io_service;
|
||||
+ boost::asio::io_context io_service;
|
||||
boost::asio::ip::udp::socket sock(io_service);
|
||||
|
||||
boost::system::error_code err_code;
|
|
@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
|
|||
|
||||
PKG_NAME:=net-snmp
|
||||
PKG_VERSION:=5.9.4
|
||||
PKG_RELEASE:=3
|
||||
PKG_RELEASE:=4
|
||||
|
||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
|
||||
PKG_SOURCE_URL:=@SF/net-snmp
|
||||
|
|
|
@ -353,7 +353,7 @@ service_triggers(){
|
|||
procd_add_raw_trigger "interface.*" 2000 /etc/init.d/$name reload
|
||||
procd_close_trigger
|
||||
|
||||
procd_add_reload_trigger 'snmpd'
|
||||
procd_add_reload_trigger 'snmpd' 'system'
|
||||
}
|
||||
|
||||
service_started() {
|
||||
|
|
|
@ -1,12 +1,12 @@
|
|||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=netbird
|
||||
PKG_VERSION:=0.42.0
|
||||
PKG_VERSION:=0.43.0
|
||||
PKG_RELEASE:=1
|
||||
|
||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
|
||||
PKG_SOURCE_URL:=https://codeload.github.com/netbirdio/netbird/tar.gz/v$(PKG_VERSION)?
|
||||
PKG_HASH:=fb9f46acd38c2ac043c7dd66b715453f1c7b2973879001d3c1812df21bed618e
|
||||
PKG_HASH:=7450a173b755597461cc0fdd0a3d5c91384c7a4c985677eb17362dd40ee01296
|
||||
|
||||
PKG_MAINTAINER:=Wesley Gimenes <wehagy@proton.me>
|
||||
PKG_LICENSE:=BSD-3-Clause
|
||||
|
|
|
@ -11,6 +11,7 @@ PKG_HASH:=7322775498602c8850afcfc1ae38f99df4cbcd51386e873d6b0f8047e55c0c26
|
|||
PKG_MAINTAINER:=Daniel Golle <daniel@makrotopia.org>
|
||||
PKG_LICENSE:=BSD-3c
|
||||
PKG_LICENSE_FILES:=COPYING LICENSE
|
||||
PKG_CPE_ID:=cpe:/a:wavpack:wavpack
|
||||
|
||||
CMAKE_INSTALL:=1
|
||||
|
||||
|
|
|
@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
|
|||
|
||||
PKG_NAME:=coreutils
|
||||
PKG_VERSION:=9.6
|
||||
PKG_RELEASE:=4
|
||||
PKG_RELEASE:=5
|
||||
|
||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
|
||||
PKG_SOURCE_URL:=@GNU/coreutils
|
||||
|
@ -22,9 +22,6 @@ PKG_CPE_ID:=cpe:/a:gnu:coreutils
|
|||
|
||||
PKG_INSTALL:=1
|
||||
PKG_BUILD_PARALLEL:=1
|
||||
ifeq ($(CONFIG_GCC_VERSION_14),y)
|
||||
PKG_FIXUP:=autoreconf
|
||||
endif
|
||||
|
||||
include $(INCLUDE_DIR)/package.mk
|
||||
|
||||
|
@ -134,6 +131,8 @@ CONFIGURE_ARGS += \
|
|||
--without-selinux \
|
||||
--with-gmp
|
||||
|
||||
TARGET_CFLAGS += -std=c17
|
||||
|
||||
define Package/coreutils/install
|
||||
true
|
||||
endef
|
||||
|
|
|
@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
|
|||
|
||||
PKG_NAME:=grep
|
||||
PKG_VERSION:=3.11
|
||||
PKG_RELEASE:=1
|
||||
PKG_RELEASE:=2
|
||||
|
||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
|
||||
PKG_SOURCE_URL:=@GNU/grep
|
||||
|
@ -23,10 +23,10 @@ PKG_CPE_ID:=cpe:/a:gnu:grep
|
|||
PKG_INSTALL:=1
|
||||
PKG_BUILD_PARALLEL:=1
|
||||
|
||||
MAKE_FLAGS += SHELL="/bin/sh"
|
||||
|
||||
include $(INCLUDE_DIR)/package.mk
|
||||
|
||||
MAKE_FLAGS += SHELL="/bin/sh"
|
||||
|
||||
define Package/grep
|
||||
SECTION:=utils
|
||||
CATEGORY:=Utilities
|
||||
|
|
|
@ -11,7 +11,7 @@ include $(TOPDIR)/rules.mk
|
|||
PKG_NAME:=LVM2
|
||||
PKG_VERSION:=2.03.31
|
||||
PKG_VERSION_DM:=1.02.205
|
||||
PKG_RELEASE:=1
|
||||
PKG_RELEASE:=2
|
||||
|
||||
PKG_SOURCE:=$(PKG_NAME).$(PKG_VERSION).tgz
|
||||
PKG_SOURCE_URL:=https://sourceware.org/pub/lvm2 \
|
||||
|
@ -68,7 +68,7 @@ define Package/lvm2/default
|
|||
SUBMENU:=Disc
|
||||
TITLE:=The Linux Logical Volume Manager
|
||||
URL:=https://sourceware.org/lvm2/
|
||||
DEPENDS:=+libreadline +libncurses +libaio
|
||||
DEPENDS:=+libreadline +libncurses +libaio +libnvme
|
||||
endef
|
||||
|
||||
define Package/lvm2
|
||||
|
|
|
@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
|
|||
|
||||
PKG_NAME:=mariadb
|
||||
PKG_VERSION:=11.4.4
|
||||
PKG_RELEASE:=1
|
||||
PKG_RELEASE:=2
|
||||
|
||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
|
||||
PKG_SOURCE_URL := https://archive.mariadb.org/$(PKG_NAME)-$(PKG_VERSION)/source
|
||||
|
@ -372,6 +372,7 @@ CMAKE_OPTIONS += \
|
|||
-DWITH_INNODB_LZO=OFF \
|
||||
-DWITH_INNODB_SNAPPY=OFF \
|
||||
-DWITH_JEMALLOC=OFF \
|
||||
-DWITH_LIBAIO=$(if $(CONFIG_KERNEL_IO_URING),OFF,ON) \
|
||||
-DWITH_LIBARCHIVE=OFF \
|
||||
-DWITH_LIBFMT=system \
|
||||
-DWITH_LIBWRAP=OFF \
|
||||
|
@ -381,6 +382,7 @@ CMAKE_OPTIONS += \
|
|||
-DWITH_SAFEMALLOC=OFF \
|
||||
-DWITH_SSL=system \
|
||||
-DWITH_SYSTEMD=no \
|
||||
-DWITH_URING=$(if $(CONFIG_KERNEL_IO_URING),ON,OFF) \
|
||||
-DWITH_VALGRIND=OFF \
|
||||
-DWITH_ZLIB=system
|
||||
|
||||
|
|
|
@ -0,0 +1,13 @@
|
|||
--- a/tpool/CMakeLists.txt
|
||||
+++ b/tpool/CMakeLists.txt
|
||||
@@ -9,7 +9,9 @@ ELSEIF(CMAKE_SYSTEM_NAME STREQUAL "Linux
|
||||
ELSEIF(WITH_LIBAIO)
|
||||
SET(LIBAIO_REQUIRED REQUIRED)
|
||||
ENDIF()
|
||||
- FIND_PACKAGE(URING QUIET ${URING_REQUIRED})
|
||||
+ IF(WITH_URING)
|
||||
+ FIND_PACKAGE(URING QUIET ${URING_REQUIRED})
|
||||
+ ENDIF()
|
||||
IF(URING_FOUND)
|
||||
SET(URING_FOUND ${URING_FOUND} PARENT_SCOPE)
|
||||
SET(TPOOL_DEFINES "-DHAVE_URING" PARENT_SCOPE)
|
Loading…
Reference in New Issue