Merge branch 'openwrt:master' into master
This commit is contained in:
GitHub
commit
7a0a055f13
28 changed files with 224 additions and 143 deletions
|
|
@ -6,7 +6,7 @@
|
|||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=php
|
||||
PKG_VERSION:=8.2.11
|
||||
PKG_VERSION:=8.2.12
|
||||
PKG_RELEASE:=1
|
||||
|
||||
PKG_MAINTAINER:=Michael Heimpold <mhei@heimpold.de>
|
||||
|
|
@ -16,7 +16,7 @@ PKG_CPE_ID:=cpe:/a:php:php
|
|||
|
||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
|
||||
PKG_SOURCE_URL:=http://www.php.net/distributions/
|
||||
PKG_HASH:=29af82e4f7509831490552918aad502697453f0869a579ee1b80b08f9112c5b8
|
||||
PKG_HASH:=e1526e400bce9f9f9f774603cfac6b72b5e8f89fa66971ebc3cc4e5964083132
|
||||
|
||||
PKG_BUILD_PARALLEL:=1
|
||||
PKG_BUILD_FLAGS:=no-mips16
|
||||
|
|
|
|||
|
|
@ -8,11 +8,11 @@
|
|||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=python-trove-classifiers
|
||||
PKG_VERSION:=2023.9.19
|
||||
PKG_VERSION:=2023.10.18
|
||||
PKG_RELEASE:=1
|
||||
|
||||
PYPI_NAME:=trove-classifiers
|
||||
PKG_HASH:=3e700af445c802f251ce2b741ee78d2e5dfa5ab8115b933b89ca631b414691c9
|
||||
PKG_HASH:=2cdfcc7f31f7ffdd57666a9957296089ac72daad4d11ab5005060e5cd7e29939
|
||||
|
||||
PKG_LICENSE:=Apache-2.0
|
||||
PKG_LICENSE_FILES:=LICENSE
|
||||
|
|
|
|||
38
libs/nghttp3/Makefile
Normal file
38
libs/nghttp3/Makefile
Normal file
|
|
@ -0,0 +1,38 @@
|
|||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=nghttp3
|
||||
PKG_VERSION:=1.0.0
|
||||
PKG_RELEASE:=1
|
||||
|
||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
|
||||
PKG_SOURCE_URL:=https://github.com/ngtcp2/nghttp3/releases/download/v$(PKG_VERSION)/
|
||||
PKG_HASH:=2e5b5a39415b9a0d160bbcb90b37bef7d8aee44ae504e8c0ddcb31aa92435988
|
||||
|
||||
PKG_LICENSE:=MIT
|
||||
PKG_LICENSE_FILES:=COPYING
|
||||
PKG_MAINTAINER:=Stan Grishin <stangri@melmac.ca>
|
||||
|
||||
CMAKE_INSTALL:=1
|
||||
|
||||
include $(INCLUDE_DIR)/package.mk
|
||||
include $(INCLUDE_DIR)/cmake.mk
|
||||
|
||||
define Package/libnghttp3
|
||||
SECTION:=libs
|
||||
CATEGORY:=Libraries
|
||||
TITLE:=HTTP/3 library written in C
|
||||
URL:=https://nghttp2.org/nghttp3
|
||||
endef
|
||||
|
||||
define Package/libnghttp3/description
|
||||
nghttp3 is a thin HTTP/3 layer over an underlying QUIC stack.
|
||||
endef
|
||||
|
||||
CMAKE_OPTIONS += -DENABLE_LIB_ONLY=ON
|
||||
|
||||
define Package/libnghttp3/install
|
||||
$(INSTALL_DIR) $(1)/usr/lib
|
||||
$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libnghttp3.so* $(1)/usr/lib
|
||||
endef
|
||||
|
||||
$(eval $(call BuildPackage,libnghttp3))
|
||||
39
libs/ngtcp2/Makefile
Normal file
39
libs/ngtcp2/Makefile
Normal file
|
|
@ -0,0 +1,39 @@
|
|||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=ngtcp2
|
||||
PKG_VERSION:=1.0.0
|
||||
PKG_RELEASE:=1
|
||||
|
||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
|
||||
PKG_SOURCE_URL:=https://github.com/ngtcp2/ngtcp2/releases/download/v$(PKG_VERSION)/
|
||||
PKG_HASH:=a40b18af654baaebee3431af9bb4e347f40080bf1189d658ad53f8e66bf39da3
|
||||
|
||||
PKG_LICENSE:=MIT
|
||||
PKG_LICENSE_FILES:=COPYING
|
||||
PKG_MAINTAINER:=Stan Grishin <stangri@melmac.ca>
|
||||
|
||||
CMAKE_INSTALL:=1
|
||||
|
||||
include $(INCLUDE_DIR)/package.mk
|
||||
include $(INCLUDE_DIR)/cmake.mk
|
||||
|
||||
define Package/libngtcp2
|
||||
SECTION:=libs
|
||||
CATEGORY:=Libraries
|
||||
TITLE:=Implementation of QUIC protocol
|
||||
URL:=https://nghttp2.org/ngtcp2
|
||||
DEPENDS:=+libnghttp3 +libopenssl
|
||||
endef
|
||||
|
||||
define Package/libngtcp2/description
|
||||
ngtcp2 project is an effort to implement QUIC protocol which is now being discussed in IETF QUICWG for its standardization.
|
||||
endef
|
||||
|
||||
CMAKE_OPTIONS += -DENABLE_LIB_ONLY=ON
|
||||
|
||||
define Package/libngtcp2/install
|
||||
$(INSTALL_DIR) $(1)/usr/lib
|
||||
$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libngtcp2*.so* $(1)/usr/lib
|
||||
endef
|
||||
|
||||
$(eval $(call BuildPackage,libngtcp2))
|
||||
|
|
@ -105,6 +105,16 @@ config LIBCURL_NGHTTP2
|
|||
bool "HTTP2 protocol"
|
||||
default y
|
||||
|
||||
config LIBCURL_NGHTTP3
|
||||
bool "HTTP/3 protocol"
|
||||
depends on LIBCURL_OPENSSL
|
||||
default n
|
||||
|
||||
config LIBCURL_NGTCP2
|
||||
bool "QUIC protocol"
|
||||
depends on LIBCURL_OPENSSL
|
||||
default n
|
||||
|
||||
comment "Miscellaneous"
|
||||
|
||||
config LIBCURL_PROXY
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ include $(INCLUDE_DIR)/nls.mk
|
|||
|
||||
PKG_NAME:=curl
|
||||
PKG_VERSION:=8.4.0
|
||||
PKG_RELEASE:=1
|
||||
PKG_RELEASE:=2
|
||||
|
||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
|
||||
PKG_SOURCE_URL:=https://github.com/curl/curl/releases/download/curl-$(subst .,_,$(PKG_VERSION))/ \
|
||||
|
|
@ -58,6 +58,8 @@ PKG_CONFIG_DEPENDS:= \
|
|||
CONFIG_LIBCURL_TELNET \
|
||||
CONFIG_LIBCURL_TFTP \
|
||||
CONFIG_LIBCURL_NGHTTP2 \
|
||||
CONFIG_LIBCURL_NGHTTP3 \
|
||||
CONFIG_LIBCURL_NGTCP2 \
|
||||
\
|
||||
CONFIG_LIBCURL_COOKIES \
|
||||
CONFIG_LIBCURL_CRYPTO_AUTH \
|
||||
|
|
@ -95,7 +97,7 @@ define Package/libcurl
|
|||
CATEGORY:=Libraries
|
||||
DEPENDS:= +LIBCURL_WOLFSSL:libwolfssl +LIBCURL_OPENSSL:libopenssl +LIBCURL_GNUTLS:libgnutls +LIBCURL_MBEDTLS:libmbedtls
|
||||
DEPENDS += +LIBCURL_ZLIB:zlib +LIBCURL_ZSTD:libzstd +LIBCURL_THREADED_RESOLVER:libpthread +LIBCURL_LDAP:libopenldap
|
||||
DEPENDS += +LIBCURL_LIBIDN2:libidn2 +LIBCURL_SSH2:libssh2 +LIBCURL_NGHTTP2:libnghttp2 +ca-bundle
|
||||
DEPENDS += +LIBCURL_LIBIDN2:libidn2 +LIBCURL_SSH2:libssh2 +LIBCURL_NGHTTP2:libnghttp2 +LIBCURL_NGHTTP3:libnghttp3 +LIBCURL_NGTCP2:libngtcp2 +ca-bundle
|
||||
TITLE:=A client-side URL transfer library
|
||||
MENU:=1
|
||||
ABI_VERSION:=4
|
||||
|
|
@ -135,6 +137,8 @@ CONFIGURE_ARGS += \
|
|||
$(if $(CONFIG_LIBCURL_ZLIB),--with-zlib="$(STAGING_DIR)/usr",--without-zlib) \
|
||||
$(if $(CONFIG_LIBCURL_ZSTD),--with-zstd="$(STAGING_DIR)/usr",--without-zstd) \
|
||||
$(if $(CONFIG_LIBCURL_NGHTTP2),--with-nghttp2="$(STAGING_DIR)/usr",--without-nghttp2) \
|
||||
$(if $(CONFIG_LIBCURL_NGHTTP3),--with-nghttp3="$(STAGING_DIR)/usr",--without-nghttp3) \
|
||||
$(if $(CONFIG_LIBCURL_NGTCP2),--with-ngtcp2="$(STAGING_DIR)/usr",--without-ngtcp2) \
|
||||
\
|
||||
$(call autoconf_bool,CONFIG_LIBCURL_DICT,dict) \
|
||||
$(call autoconf_bool,CONFIG_LIBCURL_FILE,file) \
|
||||
|
|
|
|||
|
|
@ -1,14 +1,14 @@
|
|||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=https-dns-proxy
|
||||
PKG_VERSION:=2023-05-25
|
||||
PKG_RELEASE:=8
|
||||
PKG_VERSION:=2023-10-25
|
||||
PKG_RELEASE:=1
|
||||
|
||||
PKG_SOURCE_PROTO:=git
|
||||
PKG_SOURCE_URL:=https://github.com/aarond10/https_dns_proxy/
|
||||
PKG_SOURCE_DATE:=$(PKG_VERSION)
|
||||
PKG_SOURCE_VERSION:=d03e11572562f008f68df217a7378628f1bb7b79
|
||||
PKG_MIRROR_HASH:=5af3683c48bc9e493ca2761a6f7ee756431692a695d6008f61b8b92431036dca
|
||||
PKG_SOURCE_VERSION:=977341a4e35a37ee454e97e82caf4276b1b4961a
|
||||
PKG_MIRROR_HASH:=8622846f1038ac05436a48d9b36a07c516cbb6504ce68e7ee8c5529788fac39b
|
||||
PKG_MAINTAINER:=Stan Grishin <stangri@melmac.ca>
|
||||
PKG_LICENSE:=MIT
|
||||
PKG_LICENSE_FILES:=LICENSE
|
||||
|
|
|
|||
|
|
@ -5,10 +5,10 @@
|
|||
endif()
|
||||
|
||||
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra --pedantic -Wno-strict-aliasing -Wno-variadic-macros")
|
||||
-set(CMAKE_C_FLAGS_DEBUG "-g -DDEBUG")
|
||||
-set(CMAKE_C_FLAGS_DEBUG "-gdwarf-4 -DDEBUG")
|
||||
-set(CMAKE_C_FLAGS_RELEASE "-O2")
|
||||
+#set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra --pedantic -Wno-strict-aliasing -Wno-variadic-macros")
|
||||
+#set(CMAKE_C_FLAGS_DEBUG "-g -DDEBUG")
|
||||
+#set(CMAKE_C_FLAGS_DEBUG "-gdwarf-4 -DDEBUG")
|
||||
+#set(CMAKE_C_FLAGS_RELEASE "-O2")
|
||||
|
||||
if ((CMAKE_C_COMPILER_ID MATCHES GNU AND CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL 9) OR
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
--- a/src/options.c
|
||||
+++ b/src/options.c
|
||||
@@ -22,7 +22,7 @@ const char * options_sw_version() {
|
||||
@@ -24,7 +24,7 @@ const char * options_sw_version(void) {
|
||||
#ifdef SW_VERSION
|
||||
return SW_VERSION;
|
||||
#else
|
||||
- return "2023.01.01-atLeast"; // update date sometimes, like 1-2 times a year
|
||||
+ return "2023-05-25-1"; // update date sometimes, like 1-2 times a year
|
||||
- return "2023.10.10-atLeast"; // update date sometimes, like 1-2 times a year
|
||||
+ return "2023-10-25-1"; // update date sometimes, like 1-2 times a year
|
||||
#endif
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,11 +0,0 @@
|
|||
--- a/src/logging.c
|
||||
+++ b/src/logging.c
|
||||
@@ -78,7 +78,7 @@ void _log(const char *file, int line, in
|
||||
|
||||
struct timeval tv;
|
||||
gettimeofday(&tv, NULL);
|
||||
- fprintf(logf, "%s %8lu.%06lu %s:%d ", SeverityStr[severity],
|
||||
+ fprintf(logf, "%s %8llu.%06llu %s:%d ", SeverityStr[severity],
|
||||
(uint64_t)tv.tv_sec,
|
||||
(uint64_t)tv.tv_usec, file, line);
|
||||
|
||||
|
|
@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
|
|||
|
||||
PKG_NAME:=mDNSResponder
|
||||
PKG_VERSION:=IETF104
|
||||
PKG_RELEASE:=6
|
||||
PKG_RELEASE:=5
|
||||
|
||||
PKG_SOURCE:=mDNSResponder-$(PKG_VERSION).tar.gz
|
||||
PKG_SOURCE_URL:=https://opensource.apple.com/tarballs/mDNSResponder/IETF/
|
||||
|
|
@ -121,11 +121,11 @@ define Build/Compile
|
|||
endef
|
||||
|
||||
define Build/InstallDev
|
||||
$(INSTALL_DIR) $(1)/usr/include/mdns
|
||||
$(CP) $(PKG_INSTALL_DIR)/usr/include/dns_sd.h $(1)/usr/include/mdns
|
||||
$(INSTALL_DIR) $(1)/usr/lib/mdns
|
||||
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libdns_sd.so.1 $(1)/usr/lib/mdns
|
||||
$(LN) -s libdns_sd.so.1 $(1)/usr/lib/mdns/libdns_sd.so
|
||||
$(INSTALL_DIR) $(1)/usr/include
|
||||
$(CP) $(PKG_INSTALL_DIR)/usr/include/dns_sd.h $(1)/usr/include/
|
||||
$(INSTALL_DIR) $(1)/usr/lib
|
||||
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libdns_sd.so.1 $(1)/usr/lib/
|
||||
$(LN) -s libdns_sd.so.1 $(1)/usr/lib/libdns_sd.so
|
||||
endef
|
||||
|
||||
define Package/mdns-utils/install
|
||||
|
|
@ -152,9 +152,9 @@ define Package/mdnsd/install
|
|||
$(INSTALL_DIR) $(1)/etc/hotplug.d/iface
|
||||
$(INSTALL_DIR) $(1)/etc/init.d
|
||||
$(INSTALL_BIN) ./files/mdnsd.init $(1)/etc/init.d/mdnsd
|
||||
$(INSTALL_DIR) $(1)/usr/lib/mdns
|
||||
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libdns_sd.so.1 $(1)/usr/lib/mdns
|
||||
$(LN) -s libdns_sd.so.1 $(1)/usr/lib/mdns/libdns_sd.so
|
||||
$(INSTALL_DIR) $(1)/usr/lib/
|
||||
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libdns_sd.so.1 $(1)/usr/lib/
|
||||
$(LN) -s libdns_sd.so.1 $(1)/usr/lib/libdns_sd.so
|
||||
endef
|
||||
|
||||
define Package/mdnsresponder/install
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
|
|||
|
||||
PKG_NAME:=modemmanager
|
||||
PKG_SOURCE_VERSION:=1.22.0
|
||||
PKG_RELEASE:=1
|
||||
PKG_RELEASE:=3
|
||||
|
||||
PKG_SOURCE_PROTO:=git
|
||||
PKG_SOURCE_URL:=https://gitlab.freedesktop.org/mobile-broadband/ModemManager.git
|
||||
|
|
|
|||
|
|
@ -277,7 +277,7 @@ mm_report_event() {
|
|||
local sysfspath="$4"
|
||||
|
||||
# Do not save virtual devices
|
||||
local virtual
|
||||
local virtual result
|
||||
virtual="$(echo "$sysfspath" | cut -d'/' -f4)"
|
||||
[ "$virtual" = "virtual" ] && {
|
||||
mm_log "debug" "sysfspath is a virtual device ($sysfspath)"
|
||||
|
|
@ -298,11 +298,15 @@ mm_report_event() {
|
|||
esac
|
||||
|
||||
# Report the event
|
||||
mm_log "debug" "event reported: action=${action}, name=${name}, subsystem=${subsystem}"
|
||||
mmcli --report-kernel-event="action=${action},name=${name},subsystem=${subsystem}" 1>/dev/null 2>&1 &
|
||||
mm_log "debug" "Report event: action=${action}, name=${name}, subsystem=${subsystem}"
|
||||
result=$(mmcli --report-kernel-event="action=${action},name=${name},subsystem=${subsystem}" 2>&1)
|
||||
if [ "$?" -eq "0" ]; then
|
||||
# Wait for added modem if a sysfspath is given
|
||||
[ -n "${sysfspath}" ] && [ "$action" = "add" ] && mm_report_modem_wait "${sysfspath}"
|
||||
else
|
||||
mm_log "error" "Couldn't report kernel event: ${result}"
|
||||
fi
|
||||
|
||||
# Wait for added modem if a sysfspath is given
|
||||
[ -n "${sysfspath}" ] && [ "$action" = "add" ] && mm_report_modem_wait "${sysfspath}"
|
||||
}
|
||||
|
||||
mm_report_event_from_cache_line() {
|
||||
|
|
@ -319,9 +323,6 @@ mm_report_event_from_cache_line() {
|
|||
}
|
||||
|
||||
mm_report_events_from_cache() {
|
||||
# Remove the sysfs cache
|
||||
rm -f "${MODEMMANAGER_SYSFS_CACHE}"
|
||||
|
||||
local n=60
|
||||
local step=1
|
||||
local mmrunning=0
|
||||
|
|
@ -346,6 +347,9 @@ mm_report_events_from_cache() {
|
|||
return
|
||||
}
|
||||
|
||||
# Remove the sysfs cache
|
||||
rm -f "${MODEMMANAGER_SYSFS_CACHE}"
|
||||
|
||||
# Report cached kernel events
|
||||
while IFS= read -r event_line; do
|
||||
mm_report_event_from_cache_line "${event_line}"
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk
|
|||
PKG_NAME:=openthread-br
|
||||
PKG_SOURCE_DATE:=2023-08-01
|
||||
PKG_SOURCE_VERSION:=1738d8cd8b42106c2ef1262fbbac2f06beab83ba
|
||||
PKG_RELEASE:=2
|
||||
PKG_RELEASE:=1
|
||||
|
||||
PKG_SOURCE_PROTO:=git
|
||||
PKG_SOURCE_URL=https://github.com/openthread/ot-br-posix.git
|
||||
|
|
@ -74,9 +74,7 @@ CMAKE_OPTIONS += \
|
|||
-DOTBR_SRP_SERVER_AUTO_ENABLE:BOOL=ON \
|
||||
-DOTBR_TREL:BOOL=ON
|
||||
|
||||
TARGET_CFLAGS += -DOPENTHREAD_POSIX_CONFIG_DAEMON_SOCKET_BASENAME=\\\"/var/run/openthread-%s\\\" \
|
||||
-I$(STAGING_DIR)/usr/include/mdns \
|
||||
-L$(STAGING_DIR)/usr/lib/mdns
|
||||
TARGET_CFLAGS += -DOPENTHREAD_POSIX_CONFIG_DAEMON_SOCKET_BASENAME=\\\"/var/run/openthread-%s\\\"
|
||||
|
||||
define Package/luci-app-openthread/install
|
||||
$(INSTALL_DIR) \
|
||||
|
|
@ -96,6 +94,7 @@ endef
|
|||
|
||||
define Package/openthread-br/install
|
||||
$(INSTALL_DIR) \
|
||||
$(1)/etc/init.d \
|
||||
$(1)/lib/netifd/proto \
|
||||
$(1)/usr/sbin \
|
||||
$(1)/var/lib/thread
|
||||
|
|
|
|||
|
|
@ -16,6 +16,8 @@ otDatasetCreateNewNetwork).
|
|||
src/rest/resource.hpp | 1 +
|
||||
3 files changed, 57 insertions(+)
|
||||
|
||||
diff --git a/src/rest/openapi.yaml b/src/rest/openapi.yaml
|
||||
index 2ba2a4dd56..2edc4af29a 100644
|
||||
--- a/src/rest/openapi.yaml
|
||||
+++ b/src/rest/openapi.yaml
|
||||
@@ -248,6 +248,18 @@ paths:
|
||||
|
|
@ -53,6 +55,8 @@ otDatasetCreateNewNetwork).
|
|||
components:
|
||||
schemas:
|
||||
LeaderData:
|
||||
diff --git a/src/rest/resource.cpp b/src/rest/resource.cpp
|
||||
index a60e9d9483..829835341a 100644
|
||||
--- a/src/rest/resource.cpp
|
||||
+++ b/src/rest/resource.cpp
|
||||
@@ -767,12 +767,47 @@ exit:
|
||||
|
|
@ -103,6 +107,8 @@ otDatasetCreateNewNetwork).
|
|||
case HttpMethod::kGet:
|
||||
GetDataset(aDatasetType, aRequest, aResponse);
|
||||
break;
|
||||
diff --git a/src/rest/resource.hpp b/src/rest/resource.hpp
|
||||
index d79085dbfc..362e501471 100644
|
||||
--- a/src/rest/resource.hpp
|
||||
+++ b/src/rest/resource.hpp
|
||||
@@ -150,6 +150,7 @@ private:
|
||||
|
|
@ -113,3 +119,6 @@ otDatasetCreateNewNetwork).
|
|||
|
||||
void DeleteOutDatedDiagnostic(void);
|
||||
void UpdateDiag(std::string aKey, std::vector<otNetworkDiagTlv> &aDiag);
|
||||
--
|
||||
2.41.0
|
||||
|
||||
|
|
|
|||
|
|
@ -1,13 +1,13 @@
|
|||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=restic-rest-server
|
||||
PKG_VERSION:=0.11.0
|
||||
PKG_RELEASE:=2
|
||||
PKG_VERSION:=0.12.1
|
||||
PKG_RELEASE:=1
|
||||
|
||||
PKG_BUILD_DIR:=$(BUILD_DIR)/rest-server-$(PKG_VERSION)
|
||||
PKG_SOURCE:=rest-server-$(PKG_VERSION).tar.gz
|
||||
PKG_SOURCE_URL:=https://codeload.github.com/restic/rest-server/tar.gz/v${PKG_VERSION}?
|
||||
PKG_HASH:=cd9b35ad2224244207a967ebbc78d84f4298d725e95c1fa9341ed95a350ea68f
|
||||
PKG_HASH:=cfbeb4a66cac6fc36b1cb11256f06c6e4fcc7a28c2ef590550adf1c199b9aa4b
|
||||
|
||||
PKG_LICENSE:=BSD-2-Clause
|
||||
PKG_LICENSE_FILES:=LICENSE
|
||||
|
|
|
|||
|
|
@ -6,12 +6,12 @@
|
|||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=snort3
|
||||
PKG_VERSION:=3.1.71.0
|
||||
PKG_VERSION:=3.1.73.0
|
||||
PKG_RELEASE:=1
|
||||
|
||||
PKG_SOURCE:=$(PKG_VERSION).tar.gz
|
||||
PKG_SOURCE_URL:=https://github.com/snort3/snort3/archive/refs/tags/
|
||||
PKG_HASH:=b5dd52b46ca2570986d7c12750bbf9db00ee3c294983ce272b3ca321aee8fb73
|
||||
PKG_HASH:=d04edf07e9b695fb22de73f0987537d35b4c8466119940e39a056d1a13888b27
|
||||
|
||||
PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org>
|
||||
PKG_LICENSE:=GPL-2.0-only
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
#
|
||||
# Copyright (c) 2016-2022 Dirk Brenken (dev@brenken.org)
|
||||
# Copyright (c) 2016-2023 Dirk Brenken (dev@brenken.org)
|
||||
# This is free software, licensed under the GNU General Public License v3.
|
||||
#
|
||||
|
||||
|
|
@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk
|
|||
|
||||
PKG_NAME:=travelmate
|
||||
PKG_VERSION:=2.1.1
|
||||
PKG_RELEASE:=1
|
||||
PKG_RELEASE:=2
|
||||
PKG_LICENSE:=GPL-3.0-or-later
|
||||
PKG_MAINTAINER:=Dirk Brenken <dev@brenken.org>
|
||||
|
||||
|
|
@ -17,7 +17,7 @@ define Package/travelmate
|
|||
SECTION:=net
|
||||
CATEGORY:=Network
|
||||
TITLE:=A wlan connection manager for travel router
|
||||
DEPENDS:=+iwinfo +jshn +jsonfilter +curl +ca-bundle
|
||||
DEPENDS:=+iwinfo +jshn +jsonfilter +curl +ca-bundle +rpcd +rpcd-mod-rpcsys
|
||||
PKGARCH:=all
|
||||
endef
|
||||
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
#!/bin/sh /etc/rc.common
|
||||
# Copyright (c) 2016-2022 Dirk Brenken (dev@brenken.org)
|
||||
# Copyright (c) 2016-2023 Dirk Brenken (dev@brenken.org)
|
||||
# This is free software, licensed under the GNU General Public License v3.
|
||||
|
||||
# set (s)hellcheck exceptions
|
||||
# shellcheck disable=2034,2086,2154,3043,3060
|
||||
# shellcheck disable=all
|
||||
|
||||
START=25
|
||||
USE_PROCD=1
|
||||
|
|
|
|||
|
|
@ -9,7 +9,6 @@
|
|||
export LC_ALL=C
|
||||
export PATH="/usr/sbin:/usr/bin:/sbin:/bin"
|
||||
|
||||
trm_ver="2.1.1"
|
||||
trm_enabled="0"
|
||||
trm_debug="0"
|
||||
trm_iface=""
|
||||
|
|
@ -37,6 +36,8 @@ trm_vpninfolist=""
|
|||
trm_stdvpnservice=""
|
||||
trm_stdvpniface=""
|
||||
trm_rtfile="/tmp/trm_runtime.json"
|
||||
trm_ubuscmd="$(command -v ubus)"
|
||||
trm_jsoncmd="$(command -v jsonfilter)"
|
||||
trm_wifi="$(command -v wifi)"
|
||||
trm_fetch="$(command -v curl)"
|
||||
trm_iwinfo="$(command -v iwinfo)"
|
||||
|
|
@ -62,7 +63,7 @@ f_env() {
|
|||
|
||||
unset trm_stalist trm_radiolist trm_uplinklist trm_vpnifacelist trm_uplinkcfg trm_activesta trm_opensta
|
||||
|
||||
trm_sysver="$(ubus -S call system board 2>/dev/null | jsonfilter -q -e '@.model' -e '@.release.description' |
|
||||
trm_sysver="$("${trm_ubuscmd}" -S call system board 2>/dev/null | "${trm_jsoncmd}" -ql1 -e '@.model' -e '@.release.description' |
|
||||
awk 'BEGIN{RS="";FS="\n"}{printf "%s, %s",$1,$2}')"
|
||||
|
||||
config_cb() {
|
||||
|
|
@ -75,7 +76,7 @@ f_env() {
|
|||
}
|
||||
list_cb() {
|
||||
local option="${1}" value="${2}"
|
||||
if [ "${option}" = "trm_vpnifacelist" ]; then
|
||||
if [ "${option}" = "trm_vpnifacelist" ] && ! printf "%s" "${trm_vpnifacelist}" | grep -q "${value}"; then
|
||||
eval "trm_vpnifacelist=\"$(printf "%s" "${trm_vpnifacelist}") ${value}\""
|
||||
fi
|
||||
}
|
||||
|
|
@ -97,7 +98,7 @@ f_env() {
|
|||
elif [ -z "${trm_iface}" ]; then
|
||||
f_log "info" "travelmate is currently not configured, please use the 'Interface Setup' in LuCI or the 'setup' option in CLI"
|
||||
/etc/init.d/travelmate stop
|
||||
elif ! ubus -t "${trm_maxwait}" wait_for network.wireless network.interface."${trm_iface}" >/dev/null 2>&1; then
|
||||
elif ! "${trm_ubuscmd}" -t "${trm_maxwait}" wait_for network.wireless network.interface."${trm_iface}" >/dev/null 2>&1; then
|
||||
f_log "info" "travelmate interface '${trm_iface}' does not appear on ubus, please check your network setup"
|
||||
/etc/init.d/travelmate stop
|
||||
fi
|
||||
|
|
@ -172,8 +173,8 @@ f_wifi() {
|
|||
break 2
|
||||
fi
|
||||
status="$("${trm_wifi}" status 2>/dev/null)"
|
||||
if [ "$(printf "%s" "${status}" | jsonfilter -q -l1 -e "@.${radio}.up")" != "true" ] ||
|
||||
[ "$(printf "%s" "${status}" | jsonfilter -q -l1 -e "@.${radio}.pending")" != "false" ]; then
|
||||
if [ "$(printf "%s" "${status}" | "${trm_jsoncmd}" -ql1 -e "@.${radio}.up")" != "true" ] ||
|
||||
[ "$(printf "%s" "${status}" | "${trm_jsoncmd}" -ql1 -e "@.${radio}.pending")" != "false" ]; then
|
||||
if [ "${radio}" != "${radio_up}" ]; then
|
||||
"${trm_wifi}" up "${radio}"
|
||||
radio_up="${radio}"
|
||||
|
|
@ -206,9 +207,10 @@ f_vpn() {
|
|||
for info in ${trm_vpninfolist}; do
|
||||
iface="${info%%&&*}"
|
||||
[ "${iface}" = "${info}" ] && vpn_instance="" || vpn_instance="${info##*&&}"
|
||||
vpn_status="$(ifstatus "${iface}" | jsonfilter -q -l1 -e '@.up')"
|
||||
vpn_status="$(ifstatus "${iface}" | "${trm_jsoncmd}" -ql1 -e '@.up')"
|
||||
if [ "${vpn_status}" = "true" ]; then
|
||||
ifdown "${iface}"
|
||||
/sbin/ifdown "${iface}"
|
||||
"${trm_ubuscmd}" -S call network.interface."${iface}" remove >/dev/null 2>&1
|
||||
if [ -x "/etc/init.d/openvpn" ] && [ -n "${vpn_instance}" ] && /etc/init.d/openvpn running "${vpn_instance}"; then
|
||||
/etc/init.d/openvpn stop "${vpn_instance}"
|
||||
fi
|
||||
|
|
@ -220,7 +222,7 @@ f_vpn() {
|
|||
for info in ${trm_vpninfolist}; do
|
||||
iface="${info%%&&*}"
|
||||
[ "${iface}" = "${info}" ] && vpn_instance="" || vpn_instance="${info##*&&}"
|
||||
vpn_status="$(ifstatus "${iface}" | jsonfilter -q -l1 -e '@.up')"
|
||||
vpn_status="$(ifstatus "${iface}" | "${trm_jsoncmd}" -ql1 -e '@.up')"
|
||||
if [ "${vpn_status}" = "true" ] && [ "${iface}" != "${vpn_iface}" ]; then
|
||||
ifdown "${iface}"
|
||||
if [ -x "/etc/init.d/openvpn" ] && [ -n "${vpn_instance}" ] && /etc/init.d/openvpn running "${vpn_instance}"; then
|
||||
|
|
@ -253,7 +255,7 @@ f_vpn() {
|
|||
[ -n "${rc}" ] && f_jsnup
|
||||
fi
|
||||
fi
|
||||
f_log "debug" "f_vpn ::: vpn: ${trm_vpn:-"-"}, enabled: ${vpn:-"-"}, action: ${vpn_action}, service: ${vpn_service:-"-"}, iface: ${vpn_iface:-"-"}, instance: ${vpn_instance:-"-"}, infolist: ${trm_vpninfolist:-"-"}, result: ${result}, rc: ${rc:-"-"}"
|
||||
f_log "debug" "f_vpn ::: vpn: ${trm_vpn:-"-"}, enabled: ${vpn:-"-"}, action: ${vpn_action}, vpn_service: ${vpn_service:-"-"}, vpn_iface: ${vpn_iface:-"-"}, vpn_instance: ${vpn_instance:-"-"}, vpn_infolist: ${trm_vpninfolist:-"-"}, result: ${result}, rc: ${rc:-"-"}"
|
||||
}
|
||||
|
||||
# mac helper function
|
||||
|
|
@ -273,13 +275,13 @@ f_mac() {
|
|||
uci_set "wireless" "${section}" "macaddr" "${result}"
|
||||
else
|
||||
uci_remove "wireless" "${section}" "macaddr" 2>/dev/null
|
||||
ifname="$(ubus -S call network.wireless status 2>/dev/null | jsonfilter -q -l1 -e '@.*.interfaces[@.config.mode="sta"].ifname')"
|
||||
ifname="$("${trm_ubuscmd}" -S call network.wireless status 2>/dev/null | "${trm_jsoncmd}" -ql1 -e '@.*.interfaces[@.config.mode="sta"].ifname')"
|
||||
result="$(${trm_iwinfo} "${ifname}" info 2>/dev/null | awk '/Access Point:/{printf "%s",$3}')"
|
||||
fi
|
||||
elif [ "${action}" = "get" ]; then
|
||||
result="$(uci_get "wireless" "${section}" "macaddr")"
|
||||
if [ -z "${result}" ]; then
|
||||
ifname="$(ubus -S call network.wireless status 2>/dev/null | jsonfilter -q -l1 -e '@.*.interfaces[@.config.mode="sta"].ifname')"
|
||||
ifname="$("${trm_ubuscmd}" -S call network.wireless status 2>/dev/null | "${trm_jsoncmd}" -ql1 -e '@.*.interfaces[@.config.mode="sta"].ifname')"
|
||||
result="$(${trm_iwinfo} "${ifname}" info 2>/dev/null | awk '/Access Point:/{printf "%s",$3}')"
|
||||
fi
|
||||
fi
|
||||
|
|
@ -378,7 +380,7 @@ f_getovpn() {
|
|||
config_load openvpn
|
||||
config_foreach uci_config "openvpn"
|
||||
fi
|
||||
f_log "debug" "f_getovpn ::: ovpninfolist: ${trm_ovpninfolist:-"-"}"
|
||||
f_log "debug" "f_getovpn ::: ovpn_infolist: ${trm_ovpninfolist:-"-"}"
|
||||
}
|
||||
|
||||
# get logical vpn network interfaces
|
||||
|
|
@ -389,7 +391,7 @@ f_getvpn() {
|
|||
proto="$(uci_get "network" "${iface}" "proto")"
|
||||
device="$(uci_get "network" "${iface}" "device")"
|
||||
if [ "${proto}" = "wireguard" ]; then
|
||||
if { [ -z "${trm_vpnifacelist}" ] || printf "%s" "${trm_vpnifacelist}" | grep -q "${iface}"; }; then
|
||||
if [ -z "${trm_vpnifacelist}" ] || printf "%s" "${trm_vpnifacelist}" | grep -q "${iface}"; then
|
||||
if ! printf "%s" "${trm_vpninfolist}" | grep -q "${iface}"; then
|
||||
trm_vpninfolist="$(f_trim "${trm_vpninfolist} ${iface}")"
|
||||
fi
|
||||
|
|
@ -398,7 +400,7 @@ f_getvpn() {
|
|||
if [ -z "${trm_ovpninfolist}" ]; then
|
||||
f_getovpn
|
||||
fi
|
||||
if { [ -z "${trm_vpnifacelist}" ] || printf "%s" "${trm_vpnifacelist}" | grep -q "${iface}"; }; then
|
||||
if [ -z "${trm_vpnifacelist}" ] || printf "%s" "${trm_vpnifacelist}" | grep -q "${iface}"; then
|
||||
for info in ${trm_ovpninfolist}; do
|
||||
if [ "${info%%&&*}" = "${device}" ]; then
|
||||
if ! printf "%s" "${trm_vpninfolist}" | grep -q "${iface}"; then
|
||||
|
|
@ -409,7 +411,7 @@ f_getvpn() {
|
|||
done
|
||||
fi
|
||||
fi
|
||||
f_log "debug" "f_getvpn ::: iface: ${iface:-"-"}, proto: ${proto:-"-"}, device: ${device:-"-"}, ifacelist: ${trm_vpnifacelist:-"-"}, infolist: ${trm_vpninfolist:-"-"}"
|
||||
f_log "debug" "f_getvpn ::: iface: ${iface:-"-"}, proto: ${proto:-"-"}, device: ${device:-"-"}, vpn_ifacelist: ${trm_vpnifacelist:-"-"}, vpn_infolist: ${trm_vpninfolist:-"-"}"
|
||||
}
|
||||
|
||||
# get wan gateway addresses
|
||||
|
|
@ -608,9 +610,9 @@ f_net() {
|
|||
json_raw="${raw#*\{}"
|
||||
html_raw="${raw%%\{*}"
|
||||
if [ -n "${json_raw}" ]; then
|
||||
json_ec="$(printf "%s" "{${json_raw}" | jsonfilter -q -l1 -e '@.exitcode')"
|
||||
json_rc="$(printf "%s" "{${json_raw}" | jsonfilter -q -l1 -e '@.response_code')"
|
||||
json_cp="$(printf "%s" "{${json_raw}" | jsonfilter -q -l1 -e '@.redirect_url' | awk 'BEGIN{FS="/"}{printf "%s",tolower($3)}')"
|
||||
json_ec="$(printf "%s" "{${json_raw}" | "${trm_jsoncmd}" -ql1 -e '@.exitcode')"
|
||||
json_rc="$(printf "%s" "{${json_raw}" | "${trm_jsoncmd}" -ql1 -e '@.response_code')"
|
||||
json_cp="$(printf "%s" "{${json_raw}" | "${trm_jsoncmd}" -ql1 -e '@.redirect_url' | awk 'BEGIN{FS="/"}{printf "%s",tolower($3)}')"
|
||||
if [ "${json_ec}" = "0" ]; then
|
||||
if [ -n "${json_cp}" ]; then
|
||||
result="net cp '${json_cp}'"
|
||||
|
|
@ -628,7 +630,7 @@ f_net() {
|
|||
fi
|
||||
fi
|
||||
else
|
||||
err_msg="$(printf "%s" "{${json_raw}" | jsonfilter -q -l1 -e '@.errormsg')"
|
||||
err_msg="$(printf "%s" "{${json_raw}" | "${trm_jsoncmd}" -ql1 -e '@.errormsg')"
|
||||
json_ed="$(printf "%s" "{${err_msg}" | awk '/([[:alnum:]_-]{1,63}\.)+[[:alpha:]]+$/{printf "%s",tolower($NF)}')"
|
||||
if [ "${json_ec}" = "6" ]; then
|
||||
if [ -n "${json_ed}" ] && [ "${json_ed}" != "${trm_captiveurl#http*://*}" ]; then
|
||||
|
|
@ -670,7 +672,7 @@ f_check() {
|
|||
while [ "${wait_time}" -le "${trm_maxwait}" ]; do
|
||||
[ "${wait_time}" -gt "0" ] && sleep 1
|
||||
wait_time="$((wait_time + 1))"
|
||||
dev_status="$(ubus -S call network.wireless status 2>/dev/null)"
|
||||
dev_status="$("${trm_ubuscmd}" -S call network.wireless status 2>/dev/null)"
|
||||
if [ -n "${dev_status}" ]; then
|
||||
if [ "${mode}" = "dev" ]; then
|
||||
if [ "${trm_ifstatus}" != "${status}" ]; then
|
||||
|
|
@ -686,13 +688,13 @@ f_check() {
|
|||
trm_ifstatus="${status}"
|
||||
break
|
||||
else
|
||||
ifname="$(printf "%s" "${dev_status}" | jsonfilter -q -l1 -e '@.*.interfaces[@.config.mode="sta"].ifname')"
|
||||
ifname="$(printf "%s" "${dev_status}" | "${trm_jsoncmd}" -ql1 -e '@.*.interfaces[@.config.mode="sta"].ifname')"
|
||||
if [ -n "${ifname}" ] && [ "${enabled}" = "1" ]; then
|
||||
trm_ifquality="$(${trm_iwinfo} "${ifname}" info 2>/dev/null | awk -F '[ ]' '/Link Quality: [0-9]+\/[0-9]+/{split($NF,var0,"/");printf "%i\n",(var0[1]*100/var0[2])}')"
|
||||
if [ -z "${trm_ifquality}" ]; then
|
||||
continue
|
||||
elif [ "${trm_ifquality}" -ge "${trm_minquality}" ]; then
|
||||
trm_ifstatus="$(ubus -S call network.interface dump 2>/dev/null | jsonfilter -q -l1 -e "@.interface[@.device=\"${ifname}\"].up")"
|
||||
trm_ifstatus="$("${trm_ubuscmd}" -S call network.interface dump 2>/dev/null | "${trm_jsoncmd}" -ql1 -e "@.interface[@.device=\"${ifname}\"].up")"
|
||||
if [ "${trm_ifstatus}" = "true" ]; then
|
||||
result="$(f_net)"
|
||||
if [ "${trm_captive}" = "1" ]; then
|
||||
|
|
@ -788,8 +790,8 @@ f_jsnup() {
|
|||
|
||||
if [ "${status}" = "true" ]; then
|
||||
status="connected (${trm_connection:-"-"})"
|
||||
dev_status="$(ubus -S call network.wireless status 2>/dev/null)"
|
||||
section="$(printf "%s" "${dev_status}" | jsonfilter -q -l1 -e '@.*.interfaces[@.config.mode="sta"].section')"
|
||||
dev_status="$("${trm_ubuscmd}" -S call network.wireless status 2>/dev/null)"
|
||||
section="$(printf "%s" "${dev_status}" | "${trm_jsoncmd}" -ql1 -e '@.*.interfaces[@.config.mode="sta"].section')"
|
||||
if [ -n "${section}" ]; then
|
||||
sta_iface="$(uci_get "wireless" "${section}" "network")"
|
||||
sta_radio="$(uci_get "wireless" "${section}" "device")"
|
||||
|
|
@ -865,8 +867,8 @@ f_log() {
|
|||
# main function for connection handling
|
||||
#
|
||||
f_main() {
|
||||
local radio cnt retrycnt scan_dev scan_list scan_essid scan_bssid scan_open scan_quality
|
||||
local station_id section sta sta_essid sta_bssid sta_radio sta_mac config_essid config_bssid config_radio
|
||||
local radio cnt retrycnt scan_dev scan_list scan_essid scan_bssid scan_open scan_quality station_id section
|
||||
local sta sta_essid sta_bssid sta_radio sta_mac open_sta open_essid config_radio config_essid config_bssid
|
||||
|
||||
f_check "initial" "false"
|
||||
f_log "debug" "f_main-1 ::: status: ${trm_ifstatus}, proactive: ${trm_proactive}"
|
||||
|
|
@ -922,7 +924,7 @@ f_main() {
|
|||
f_log "debug" "f_main-5 ::: sta_radio: ${sta_radio}, sta_essid: \"${sta_essid}\", sta_bssid: ${sta_bssid:-"-"}"
|
||||
fi
|
||||
if [ -z "${scan_list}" ]; then
|
||||
scan_dev="$(ubus -S call network.wireless status 2>/dev/null | jsonfilter -q -l1 -e "@.${radio}.interfaces[0].ifname")"
|
||||
scan_dev="$("${trm_ubuscmd}" -S call network.wireless status 2>/dev/null | "${trm_jsoncmd}" -ql1 -e "@.${radio}.interfaces[0].ifname")"
|
||||
scan_list="$("${trm_iwinfo}" "${scan_dev:-${radio}}" scan 2>/dev/null |
|
||||
awk 'BEGIN{FS="[[:space:]]"}/Address:/{var1=$NF}/ESSID:/{var2="";for(i=12;i<=NF;i++)if(var2==""){var2=$i}else{var2=var2" "$i}}
|
||||
/Quality:/{split($NF,var0,"/")}/Encryption:/{if($NF=="none"){var3="+"}else{var3="-"};
|
||||
|
|
@ -943,9 +945,9 @@ f_main() {
|
|||
if [ "${trm_autoadd}" = "1" ] && [ "${scan_open}" = "+" ] && [ "${scan_essid}" != "unknown" ]; then
|
||||
open_essid="${scan_essid%?}"
|
||||
open_essid="${open_essid:1}"
|
||||
result="$(f_addsta "${radio}" "${open_essid}")"
|
||||
if [ -n "${result}" ]; then
|
||||
section="${result%%-*}"
|
||||
open_sta="$(f_addsta "${radio}" "${open_essid}")"
|
||||
if [ -n "${open_sta}" ]; then
|
||||
section="${open_sta%%-*}"
|
||||
sta_radio="$(uci_get "wireless" "${section}" "device")"
|
||||
sta_essid="$(uci_get "wireless" "${section}" "ssid")"
|
||||
sta_bssid=""
|
||||
|
|
@ -1005,6 +1007,10 @@ f_main() {
|
|||
fi
|
||||
}
|
||||
|
||||
# get travelmate version
|
||||
#
|
||||
trm_ver="$("${trm_ubuscmd}" -S call rpc-sys packagelist '{ "all": true }' 2>/dev/null | "${trm_jsoncmd}" -ql1 -e '@.packages.travelmate')"
|
||||
|
||||
# source required system libraries
|
||||
#
|
||||
if [ -r "/lib/functions.sh" ] && [ -r "/lib/functions/network.sh" ] && [ -r "/usr/share/libubox/jshn.sh" ]; then
|
||||
|
|
|
|||
|
|
@ -21,6 +21,8 @@ vpn_instance="${5}"
|
|||
trm_maxwait="$(uci_get travelmate global trm_maxwait "30")"
|
||||
trm_captiveurl="$(uci_get travelmate global trm_captiveurl "http://detectportal.firefox.com")"
|
||||
trm_useragent="$(uci_get travelmate global trm_useragent "Mozilla/5.0 (X11; Linux x86_64; rv:109.0) Gecko/20100101 Firefox/118.0")"
|
||||
trm_ubuscmd="$(command -v ubus)"
|
||||
trm_jsoncmd="$(command -v jsonfilter)"
|
||||
trm_logger="$(command -v logger)"
|
||||
trm_fetch="$(command -v curl)"
|
||||
trm_vpnfile="/var/state/travelmate.vpn"
|
||||
|
|
@ -37,25 +39,24 @@ f_net() {
|
|||
|
||||
if [ "${vpn}" = "1" ] && [ "${vpn_action%_*}" = "enable" ]; then
|
||||
if [ "${vpn_action}" = "enable_keep" ]; then
|
||||
vpn_status="$(ubus -S call network.interface."${vpn_iface}" status 2>/dev/null | jsonfilter -q -l1 -e '@.up')"
|
||||
vpn_status="$("${trm_ubuscmd}" -S call network.interface."${vpn_iface}" status 2>/dev/null | "${trm_jsoncmd}" -ql1 -e '@.up')"
|
||||
fi
|
||||
if [ "${vpn_action}" = "enable" ] || [ "${vpn_status}" != "true" ]; then
|
||||
if [ "${vpn_status}" != "true" ]; then
|
||||
ifdown "${vpn_iface}"
|
||||
/sbin/ifdown "${vpn_iface}"
|
||||
"${trm_ubuscmd}" -S call network.interface."${vpn_iface}" remove >/dev/null 2>&1
|
||||
if [ "${vpn_service}" = "openvpn" ] && [ -n "${vpn_instance}" ] && [ -x "/etc/init.d/openvpn" ] && /etc/init.d/openvpn running "${vpn_instance}"; then
|
||||
/etc/init.d/openvpn stop "${vpn_instance}"
|
||||
elif [ "${vpn_service}" = "wireguard" ]; then
|
||||
ubus -S call network.interface."${vpn_iface}" remove >/dev/null 2>&1
|
||||
fi
|
||||
sleep 1
|
||||
fi
|
||||
if [ "${vpn_service}" = "openvpn" ] && [ -n "${vpn_instance}" ] && [ -x "/etc/init.d/openvpn" ] && ! /etc/init.d/openvpn running "${vpn_instance}"; then
|
||||
/etc/init.d/openvpn start "${vpn_instance}"
|
||||
fi
|
||||
ifup "${vpn_iface}"
|
||||
/sbin/ifup "${vpn_iface}"
|
||||
cnt=0
|
||||
while true; do
|
||||
vpn_status="$(ubus -S call network.interface."${vpn_iface}" status 2>/dev/null | jsonfilter -q -l1 -e '@.up')"
|
||||
vpn_status="$("${trm_ubuscmd}" -S call network.interface."${vpn_iface}" status 2>/dev/null | "${trm_jsoncmd}" -ql1 -e '@.up')"
|
||||
if [ "${vpn_status}" = "true" ]; then
|
||||
net_status="$(f_net)"
|
||||
if [ "${net_status}" = "net ok" ]; then
|
||||
|
|
@ -65,11 +66,10 @@ if [ "${vpn}" = "1" ] && [ "${vpn_action%_*}" = "enable" ]; then
|
|||
fi
|
||||
fi
|
||||
if [ "${cnt}" -ge "$((trm_maxwait / 3))" ]; then
|
||||
ifdown "${vpn_iface}"
|
||||
/sbin/ifdown "${vpn_iface}"
|
||||
"${trm_ubuscmd}" -S call network.interface."${vpn_iface}" remove >/dev/null 2>&1
|
||||
if [ "${vpn_service}" = "openvpn" ] && [ -n "${vpn_instance}" ] && [ -x "/etc/init.d/openvpn" ] && /etc/init.d/openvpn running "${vpn_instance}"; then
|
||||
/etc/init.d/openvpn stop "${vpn_instance}"
|
||||
elif [ "${vpn_service}" = "wireguard" ]; then
|
||||
ubus -S call network.interface."${vpn_iface}" remove >/dev/null 2>&1
|
||||
fi
|
||||
rm -f "${trm_vpnfile}"
|
||||
"${trm_logger}" -p "info" -t "trm-vpn [${$}]" "${vpn_service} client connection can't be established '${vpn_iface}/${vpn_instance:-"-", rc: ${net_status:-"-"}}'" 2>/dev/null
|
||||
|
|
@ -80,11 +80,10 @@ if [ "${vpn}" = "1" ] && [ "${vpn_action%_*}" = "enable" ]; then
|
|||
done
|
||||
fi
|
||||
elif { [ "${vpn}" != "1" ] && [ "${vpn_action%_*}" = "enable" ]; } || [ "${vpn_action}" = "disable" ]; then
|
||||
ifdown "${vpn_iface}"
|
||||
/sbin/ifdown "${vpn_iface}"
|
||||
"${trm_ubuscmd}" -S call network.interface."${vpn_iface}" remove >/dev/null 2>&1
|
||||
if [ "${vpn_service}" = "openvpn" ] && [ -n "${vpn_instance}" ] && [ -x "/etc/init.d/openvpn" ] && /etc/init.d/openvpn running "${vpn_instance}"; then
|
||||
/etc/init.d/openvpn stop "${vpn_instance}"
|
||||
elif [ "${vpn_service}" = "wireguard" ]; then
|
||||
ubus -S call network.interface."${vpn_iface}" remove >/dev/null 2>&1
|
||||
fi
|
||||
rm -f "${trm_vpnfile}"
|
||||
"${trm_logger}" -p "info" -t "trm-vpn [${$}]" "${vpn_service} client connection disabled '${vpn_iface}/${vpn_instance:-"-"}'" 2>/dev/null
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk
|
|||
|
||||
PKG_NAME:=zerotier
|
||||
PKG_VERSION:=1.12.2
|
||||
PKG_RELEASE:=1
|
||||
PKG_RELEASE:=2
|
||||
|
||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
|
||||
PKG_SOURCE_URL:=https://codeload.github.com/zerotier/ZeroTierOne/tar.gz/$(PKG_VERSION)?
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@ start_instance() {
|
|||
local args=""
|
||||
|
||||
if ! section_enabled "$cfg"; then
|
||||
echo "disabled in /ect/config/zerotier"
|
||||
echo "disabled in /etc/config/zerotier"
|
||||
return 1
|
||||
fi
|
||||
|
||||
|
|
|
|||
|
|
@ -8,12 +8,12 @@
|
|||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=pulseaudio
|
||||
PKG_VERSION:=14.2
|
||||
PKG_RELEASE:=10
|
||||
PKG_VERSION:=16.1
|
||||
PKG_RELEASE:=1
|
||||
|
||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
|
||||
PKG_SOURCE_URL:=https://freedesktop.org/software/pulseaudio/releases
|
||||
PKG_HASH:=75d3f7742c1ae449049a4c88900e454b8b350ecaa8c544f3488a2562a9ff66f1
|
||||
PKG_HASH:=8eef32ce91d47979f95fd9a935e738cd7eb7463430dabc72863251751e504ae4
|
||||
|
||||
PKG_MAINTAINER:=Peter Wagner <tripolar@gmx.at>
|
||||
PKG_LICENSE:=LGPL-2.1-or-later
|
||||
|
|
@ -29,7 +29,7 @@ include $(INCLUDE_DIR)/meson.mk
|
|||
define Package/pulseaudio-daemon/Default
|
||||
SECTION:=sound
|
||||
CATEGORY:=Sound
|
||||
DEPENDS:=+libsndfile +libltdl +libpthread +librt +alsa-lib \
|
||||
DEPENDS:=+libsndfile +libltdl +alsa-lib \
|
||||
+libopenssl +libcap $(ICONV_DEPENDS) $(INTL_DEPENDS)
|
||||
TITLE:=Network sound server
|
||||
URL:=https://www.freedesktop.org/wiki/Software/PulseAudio/
|
||||
|
|
@ -45,7 +45,7 @@ endef
|
|||
|
||||
define Package/pulseaudio-daemon-avahi
|
||||
$(call Package/pulseaudio-daemon/Default)
|
||||
DEPENDS+=+dbus +libavahi-client +sbc
|
||||
DEPENDS+=+dbus +libavahi-client +sbc +bluez-daemon
|
||||
TITLE+= (avahi/bluez)
|
||||
VARIANT:=avahi
|
||||
endef
|
||||
|
|
@ -121,19 +121,20 @@ MESON_ARGS += \
|
|||
-Dudev=disabled \
|
||||
-Dx11=disabled \
|
||||
-Dadrian-aec=true \
|
||||
-Dwebrtc-aec=disabled
|
||||
-Dwebrtc-aec=disabled \
|
||||
-Ddoxygen=false
|
||||
|
||||
ifeq ($(BUILD_VARIANT),avahi)
|
||||
MESON_ARGS += \
|
||||
-Davahi=enabled \
|
||||
-Dbluez5=true \
|
||||
-Dbluez5=enabled \
|
||||
-Ddbus=enabled
|
||||
endif
|
||||
|
||||
ifeq ($(BUILD_VARIANT),noavahi)
|
||||
MESON_ARGS += \
|
||||
-Davahi=disabled \
|
||||
-Dbluez5=false \
|
||||
-Dbluez5=disabled \
|
||||
-Ddbus=disabled
|
||||
endif
|
||||
|
||||
|
|
@ -183,8 +184,8 @@ define Package/pulseaudio-daemon/install
|
|||
$(CP) $(PKG_INSTALL_DIR)/usr/lib/pulseaudio/* $(1)/usr/lib/pulseaudio/
|
||||
|
||||
$(INSTALL_DIR) $(1)/usr/lib/pulse-$(PKG_VERSION)/modules
|
||||
$(CP) $(PKG_INSTALL_DIR)/usr/lib/pulse-$(PKG_VERSION)/modules/lib*.so $(1)/usr/lib/
|
||||
$(CP) $(PKG_INSTALL_DIR)/usr/lib/pulse-$(PKG_VERSION)/modules/module*.so $(1)/usr/lib/pulse-$(PKG_VERSION)/modules/
|
||||
$(CP) $(PKG_INSTALL_DIR)/usr/lib/pulseaudio/modules/lib*.so $(1)/usr/lib/
|
||||
$(CP) $(PKG_INSTALL_DIR)/usr/lib/pulseaudio/modules/module*.so $(1)/usr/lib/pulseaudio/modules/
|
||||
endef
|
||||
|
||||
define Package/pulseaudio-daemon-avahi/install
|
||||
|
|
|
|||
|
|
@ -1,18 +0,0 @@
|
|||
--- a/meson.build
|
||||
+++ b/meson.build
|
||||
@@ -390,12 +390,11 @@ if dl_dep.found()
|
||||
endif
|
||||
|
||||
have_iconv = false
|
||||
-if cc.has_function('iconv_open')
|
||||
+iconv_dep = cc.find_library('iconv', required : false)
|
||||
+have_iconv = iconv_dep.found()
|
||||
+if not have_iconv and cc.has_function('iconv_open')
|
||||
iconv_dep = dependency('', required : false)
|
||||
have_iconv = true
|
||||
-else
|
||||
- iconv_dep = cc.find_library('iconv', required : false)
|
||||
- have_iconv = iconv_dep.found()
|
||||
endif
|
||||
if have_iconv
|
||||
cdata.set('HAVE_ICONV', 1)
|
||||
11
sound/pulseaudio/patches/010-meson_gio.patch
Normal file
11
sound/pulseaudio/patches/010-meson_gio.patch
Normal file
|
|
@ -0,0 +1,11 @@
|
|||
--- a/meson.build
|
||||
+++ b/meson.build
|
||||
@@ -681,7 +681,7 @@ if get_option('daemon')
|
||||
cdata.set('HAVE_ALSA_UCM', 1)
|
||||
endif
|
||||
|
||||
- gio_dep = dependency('gio-2.0', version : '>= 2.26.0')
|
||||
+ gio_dep = dependency('gio-2.0', version : '>= 2.26.0', required : false)
|
||||
if get_option('gsettings').enabled()
|
||||
assert(gio_dep.found(), 'GSettings support needs glib I/O library (GIO)')
|
||||
cdata.set('HAVE_GSETTINGS', 1)
|
||||
|
|
@ -1,10 +0,0 @@
|
|||
--- a/meson.build
|
||||
+++ b/meson.build
|
||||
@@ -698,7 +698,6 @@ check_dep = dependency('check', version
|
||||
|
||||
# Subdirs
|
||||
|
||||
-subdir('doxygen')
|
||||
subdir('po')
|
||||
if get_option('man')
|
||||
subdir('man')
|
||||
|
|
@ -1,12 +1,12 @@
|
|||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=restic
|
||||
PKG_VERSION:=0.15.2
|
||||
PKG_VERSION:=0.16.1
|
||||
PKG_RELEASE:=1
|
||||
|
||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
|
||||
PKG_SOURCE_URL:=https://codeload.github.com/restic/restic/tar.gz/v${PKG_VERSION}?
|
||||
PKG_HASH:=52aca841486eaf4fe6422b059aa05bbf20db94b957de1d3fca019ed2af8192b7
|
||||
PKG_HASH:=31339090e3e8a044d014b9341c025cf59bf7bc133ae267bc5acdea5ac07837a9
|
||||
|
||||
PKG_LICENSE:=BSD-2-Clause
|
||||
PKG_LICENSE_FILES:=LICENSE
|
||||
|
|
|
|||
Loading…
Reference in a new issue