include $(TOPDIR)/rules.mk
PKG_NAME:=zabbix
-PKG_VERSION:=5.0.7
-PKG_RELEASE:=4
+PKG_VERSION:=5.0.18
+PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://cdn.zabbix.com/zabbix/sources/stable/5.0/
-PKG_HASH:=d762f8a9aa9e8717d2e85d2a82d27316ea5c2b214eb00aff41b6e9b06107916a
+PKG_HASH:=7d15c4d683801edc2bdcda3fd94afdf6a7142a1a92aa71f4a9220af8e39d9e0e
PKG_MAINTAINER:=Etienne CHAMPETIER <champetier.etienne@gmail.com>
PKG_LICENSE:=GPL-2.0
PECL_LONGNAME:=Extended HTTP Support
PKG_VERSION:=4.2.1
-PKG_RELEASE:=1
+PKG_RELEASE:=2
PKG_HASH:=ab07d55ccdfa897c897c26f1c0851b557b363431766c9ea4c799ea61443bdcdc
PKG_NAME:=php8-pecl-http
PECL_cv_HAVE_LIBCURL_axTLS=no \
PECL_cv_LIBCURL_TLSAUTH_SRP=$(if $(CONFIG_LIBCURL_TLS_SRP),yes,no) \
PECL_cv_LIBCURL_SHARE_SSL=yes \
+ PECL_cv_LIBCURL_TLS13_CIPHERS=$(if $(CONFIG_OPENSSL_WITH_TLS13),yes,no) \
CONFIGURE_ARGS+= \
--with-http \
include $(TOPDIR)/rules.mk
PKG_NAME:=php
-PKG_VERSION:=8.1.0
+PKG_VERSION:=8.1.1
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:=a1317eff0723a2b3d3122bbfe107a1158570ea2822dc35a5fb360086db0f6bbc
+PKG_HASH:=33c09d76d0a8bbb5dd930d9dd32e6bfd44e9efcf867563759eb5492c3aff8856
PKG_BUILD_PARALLEL:=1
PKG_USE_MIPS16:=0
include $(TOPDIR)/rules.mk
PKG_NAME:=python-lxml
-PKG_VERSION:=4.6.4
+PKG_VERSION:=4.7.1
PKG_RELEASE:=$(AUTORELEASE)
PYPI_NAME:=lxml
-PKG_HASH:=daf9bd1fee31f1c7a5928b3e1059e09a8d683ea58fb3ffc773b6c88cb8d1399c
+PKG_HASH:=a1613838aa6b89af4ba10a0f3a972836128801ed008078f8c1244e65958f1b24
PKG_LICENSE:=BSD-3-Clause
PKG_LICENSE_FILES:=LICENSES.txt
SRC_NAME:=libselinux
PKG_NAME:=python3-$(SRC_NAME)
-PKG_VERSION:=3.2
-PKG_RELEASE:=1
+PKG_VERSION:=3.3
+PKG_RELEASE:=$(AUTORELEASE)
PKG_BUILD_DIR:=$(BUILD_DIR)/python-libselinux/$(SRC_NAME)-$(PKG_VERSION)
PKG_SOURCE:=$(SRC_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://github.com/SELinuxProject/selinux/releases/download/20200710
-PKG_HASH:=df758ef1d9d4811051dd901ea6b029ae334ffd7c671c128beb16bce1e25ac161
+PKG_HASH:=acfdee27633d2496508c28727c3d41d3748076f66d42fccde2e6b9f3463a7057
PKG_BUILD_DEPENDS:=swig/host
PKG_MAINTAINER:=Thomas Petazzoni <thomas.petazzoni@bootlin.com>
include $(TOPDIR)/rules.mk
PKG_NAME:=python3-networkx
-PKG_VERSION:=2.5
-PKG_RELEASE:=1
+PKG_VERSION:=2.6.3
+PKG_RELEASE:=$(AUTORELEASE)
PYPI_NAME:=networkx
-PKG_HASH:=7978955423fbc9639c10498878be59caf99b44dc304c2286162fd24b458c1602
+PKG_HASH:=c0946ed31d71f1b732b5aaa6da5a0388a345019af232ce2f49c766e2d6795c51
PKG_LICENSE:=BSD-3-clause
PKG_LICENSE_FILES:=LICENSE.txt
include $(TOPDIR)/rules.mk
PKG_NAME:=alsa-lib
-PKG_VERSION:=1.2.5.1
+PKG_VERSION:=1.2.6.1
PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=ftp://ftp.alsa-project.org/pub/lib/ \
http://distfiles.gentoo.org/distfiles/
-PKG_HASH:=628421d950cecaf234de3f899d520c0a6923313c964ad751ffac081df331438e
+PKG_HASH:=ad582993d52cdb5fb159a0beab60a6ac57eab0cc1bdf85dc4db6d6197f02333f
PKG_MAINTAINER:=Ted Hess <thess@kitschensync.net>, \
Peter Wagner <tripolar@gmx.at>
include $(TOPDIR)/rules.mk
PKG_NAME:=alsa-ucm-conf
-PKG_VERSION:=1.2.5.1
+PKG_VERSION:=1.2.6.2
PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=ftp://ftp.alsa-project.org/pub/lib/ \
http://distfiles.gentoo.org/distfiles/
-PKG_HASH:=5841a444166dcbf479db751303dbc3556f685085ac7e00f0c9e7755676195d97
+PKG_HASH:=8be24fb9fe789ee2778ae6f32e18e8043fe7f8bc735871e9d17c68a04566a822
PKG_MAINTAINER:=
PKG_LICENSE:=BSD-3-Clause
include $(TOPDIR)/rules.mk
PKG_NAME:=freetype
-PKG_VERSION:=2.11.0
+PKG_VERSION:=2.11.1
PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=@SF/freetype
-PKG_HASH:=8bee39bd3968c4804b70614a0a3ad597299ad0e824bc8aad5ce8aaf48067bde7
+PKG_HASH:=3333ae7cfda88429c97a7ae63b7d01ab398076c3b67182e960e5684050f2c5c8
PKG_MAINTAINER:=Val Kulkov <val.kulkov@gmail.com>
PKG_LICENSE:=FTL GPL-2.0-only MIT ZLIB GPL-3.0-or-later
include $(TOPDIR)/rules.mk
PKG_NAME:=jsoncpp
-PKG_VERSION:=1.9.4
-PKG_RELEASE:=3
+PKG_VERSION:=1.9.5
+PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/open-source-parsers/jsoncpp/tar.gz/$(PKG_VERSION)?
-PKG_HASH:=e34a628a8142643b976c7233ef381457efad79468c67cb1ae0b83a33d7493999
+PKG_HASH:=f409856e5920c18d0c2fb85276e24ee607d2a09b5e7d5f0a371368903c275da2
PKG_MAINTAINER:=Jan Pavlinec <jan.pavlinec1@gmail.com>
PKG_LICENSE:=MIT
include $(TOPDIR)/rules.mk
PKG_NAME:=minizip-ng
-PKG_VERSION:=3.0.3
+PKG_VERSION:=3.0.4
PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/zlib-ng/minizip-ng/tar.gz/$(PKG_VERSION)?
-PKG_HASH:=5f1dd0d38adbe9785cb9c4e6e47738c109d73a0afa86e58c4025ce3e2cc504ed
+PKG_HASH:=2ab219f651901a337a7d3c268128711b80330a99ea36bdc528c76b591a624c3c
PKG_MAINTAINER:=David Woodhouse <dwmw2@infradead.org>
PKG_LICENSE:=Zlib
include $(TOPDIR)/rules.mk
PKG_NAME:=neon
-PKG_VERSION:=0.31.2
-PKG_RELEASE:=2
+PKG_VERSION:=0.32.1
+PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://notroj.github.io/neon
-PKG_HASH:=cf1ee3ac27a215814a9c80803fcee4f0ede8466ebead40267a9bd115e16a8678
+PKG_HASH:=05c54bc115030c89e463a4fb28d3a3f8215879528ba5ca70d676d3d21bf3af52
PKG_MAINTAINER:=Federico Di Marco <fededim@gmail.com>
PKG_LICENSE:=LGPL-2.1-or-later
--- /dev/null
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -45,7 +45,7 @@ INSTALL = @INSTALL@
+ transform = @program_transform_name@
+
+ LIBTOOL = @LIBTOOL@
+-XMLTO = xmlto
++XMLTO = /bin/true
+ GCOV = gcov
+ XGETTEXT_OPTS = --keyword=_ --keyword=N_ --msgid-bugs-address=neon@lists.manyfish.co.uk \
+ --default-domain=neon --flag ne_print_request_header:3:c-format \
+@@ -149,7 +149,7 @@ install-memleak:
+ @echo "ERROR: purposes only; this copy of neon must not be installed."
+ @false
+
+-install-yes: install-lib install-headers install-config install-docs install-nls
++install-yes: install-lib install-headers install-config install-nls
+
+ # libtool does all the necessary magic here
+ install-lib: subdirs
include $(TOPDIR)/rules.mk
PKG_NAME:=sqlite
-PKG_VERSION:=3330000
-PKG_RELEASE:=2
+PKG_VERSION:=3370000
+PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE:=$(PKG_NAME)-autoconf-$(PKG_VERSION).tar.gz
-PKG_HASH:=106a2c48c7f75a298a7557bcc0d5f4f454e5b43811cc738b7ca294d6956bbb15
-PKG_SOURCE_URL:=https://www.sqlite.org/2020/
+PKG_HASH:=731a4651d4d4b36fc7d21db586b2de4dd00af31fd54fb5a9a4b7f492057479f7
+PKG_SOURCE_URL:=https://www.sqlite.org/2021/
PKG_LICENSE:=PUBLICDOMAIN
PKG_LICENSE_FILES:=
PKG_NAME:=adblock
PKG_VERSION:=4.1.3
-PKG_RELEASE:=3
+PKG_RELEASE:=4
PKG_LICENSE:=GPL-3.0-or-later
PKG_MAINTAINER:=Dirk Brenken <dev@brenken.org>
sleep 1
cnt=$((cnt+1))
done
+ fi
+ if [ "${adb_action}" != "stop" ]
+ then
if [ -n "${adb_dnsdir}" ] && [ ! -d "${adb_dnsdir}" ]
then
mkdir -p "${adb_dnsdir}"
f_log "err" "dns backend directory '${adb_dnsdir}' could not be created"
fi
fi
-
+
if [ ! -f "${adb_dnsdir}/${adb_dnsfile}" ]
then
printf "${adb_dnsheader}" > "${adb_dnsdir}/${adb_dnsfile}"
define Package/crowdsec-firewall-bouncer
$(call Package/crowdsec-firewall-bouncer/Default)
DEPENDS:=@(PACKAGE_iptables||PACKAGE_nftables) \
- $(GO_ARCH_DEPENDS) \
- +crowdsec
+ $(GO_ARCH_DEPENDS)
endef
define Package/golang-crowdsec-firewall-bouncer-dev
include $(TOPDIR)/rules.mk
PKG_NAME:=davfs2
-PKG_VERSION:=1.6.0
-PKG_RELEASE:=1
+PKG_VERSION:=1.6.1
+PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=@SAVANNAH/davfs2
-PKG_HASH:=2e6b675685bd917772be60f0999ae098c80f79ff20dc131e8fec4547cbb63b50
+PKG_HASH:=ce3eb948ece582a51c934ccb0cc70e659839172717caff173f69a5e2af90c5c0
PKG_MAINTAINER:=Federico Di Marco <fededim@gmail.com>
PKG_LICENSE:=GPL-3.0-or-later
if (!mpoint)
error(EXIT_FAILURE, 0,
_("can't evaluate path of mount point %s"), mpoint);
-@@ -2131,7 +2131,7 @@ read_config(dav_args *args, const char *
+@@ -2109,7 +2109,7 @@ read_config(dav_args *args, const char *
error_at_line(EXIT_FAILURE, 0, filename, lineno,
_("malformed line"));
*(parmv[0] + strlen(parmv[0]) - 1) = '\0';
if (mp) {
applies = (strcmp(mp, mpoint) == 0);
free(mp);
-@@ -2386,7 +2386,7 @@ read_secrets(dav_args *args, const char
+@@ -2364,7 +2364,7 @@ read_secrets(dav_args *args, const char
if (scheme && !port)
port = ne_uri_defaultport(scheme);
--- /dev/null
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=geoipupdate
+PKG_VERSION:=4.8.0
+PKG_RELEASE:=1
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=https://codeload.github.com/maxmind/geoipupdate/tar.gz/v$(PKG_VERSION)?
+PKG_HASH:=ca718c3ffcc595ef441363699888d20150f1d3a6583ac2d60bcbd34f052db09f
+
+PKG_LICENSE:=Apache-2.0 MIT
+PKG_LICENSE_FILES:=LICENSE-APACHE LICENSE-MIT
+PKG_MAINTAINER:=Matthew Hagan <mnhagan88@gmail.com>
+
+PKG_BUILD_DEPENDS:=golang/host
+PKG_BUILD_PARALLEL:=1
+PKG_USE_MIPS16:=0
+
+GO_PKG:=github.com/maxmind/geoipupdate
+GO_PKG_LDFLAGS_X:= \
+ main.defaultConfigFile=/etc/GeoIP.conf \
+ main.defaultDatabaseDirectory=/var/GeoIP
+
+include $(INCLUDE_DIR)/package.mk
+include ../../lang/golang/golang-package.mk
+
+define Package/geoipupdate
+ TITLE:=GeoIP Update
+ URL:=https://github.com/maxmind/geoipupdate
+ SECTION:=net
+ CATEGORY:=Network
+ DEPENDS:=$(GO_ARCH_DEPENDS)
+endef
+
+define Package/geoipupdate/description
+ The GeoIP Update program performs automatic updates of GeoIP2 and GeoIP
+ Legacy binary databases. CSV databases are not supported.
+
+ Users will need to update /etc/GeoIP.conf with their API key and DB
+ choice, currently set to country only. To update the DB, the user can
+ manually run the utility or set up a cron job.
+
+ This package contains the program and config file.
+endef
+
+define Package/geoipupdate/install
+ $(call GoPackage/Package/Install/Bin,$(PKG_INSTALL_DIR))
+
+ $(INSTALL_DIR) \
+ $(1)/usr/sbin \
+ $(1)/etc/init.d
+
+ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/geoipupdate $(1)/usr/sbin/
+ $(INSTALL_CONF) $(PKG_BUILD_DIR)/conf/GeoIP.conf.default $(1)/etc/GeoIP.conf
+ $(INSTALL_BIN) ./files/geoipupdate.init $(1)/etc/init.d/geoipupdate
+
+ $(SED) "s/^EditionIDs GeoLite2-Country GeoLite2-City/EditionIDs GeoLite2-Country/" $(1)/etc/GeoIP.conf
+endef
+
+define Package/geoipupdate/conffiles
+/etc/GeoIP.conf
+endef
+
+$(eval $(call GoBinPackage,geoipupdate))
+$(eval $(call BuildPackage,geoipupdate))
--- /dev/null
+#!/bin/sh /etc/rc.common
+
+START=99
+
+start() {
+ [ -d /var/GeoIP ] || {
+ mkdir -p /var/GeoIP
+ }
+}
--- /dev/null
+# SPDX-License-Identifier: GPL-3.0-only
+#
+# Copyright (C) 2021 ImmortalWrt.org
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=gg
+PKG_VERSION:=0.2.1
+PKG_RELEASE:=$(AUTORELEASE)
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=https://codeload.github.com/mzz2017/gg/tar.gz/v$(PKG_VERSION)?
+PKG_HASH:=51d1ccfb10ba0d9e8fdd68f4a566b8ed772980be1cf1d03da1969313f88b8bb6
+
+PKG_MAINTAINER:=Tianling Shen <cnsztl@immortalwrt.org>
+PKG_LICENSE:=AGPL-3.0-only
+PKG_LICENSE_FILES:=LICENSE-AGPL
+
+PKG_BUILD_DEPENDS:=golang/host
+PKG_BUILD_PARALLEL:=1
+PKG_USE_MIPS16:=0
+
+GO_PKG:=github.com/mzz2017/gg
+GO_PKG_LDFLAGS_X:=$(GO_PKG)/cmd.Version=$(PKG_VERSION)
+
+include $(INCLUDE_DIR)/package.mk
+include ../../lang/golang/golang-package.mk
+
+define Package/gg
+ SECTION:=net
+ CATEGORY:=Network
+ TITLE:=A command-line tool for one-click proxy
+ URL:=https://github.com/mzz2017/gg
+ DEPENDS:=@(aarch64||arm||x86_64) +ca-bundle
+endef
+
+define Package/gg/description
+ gg is a command-line tool for one-click proxy in your research and
+ development.
+
+ You can just add gg before another command to redirect its traffic
+ to your proxy without installing v2ray or anything else.
+ Usage example: gg python -m pip install torch.
+endef
+
+define Package/gg/conffiles
+/root/.config/gg/config.toml
+/root/.ggconfig.toml
+/etc/ggconfig.toml
+endef
+
+$(eval $(call GoBinPackage,gg))
+$(eval $(call BuildPackage,gg))
--- /dev/null
+#!/bin/sh
+
+gg --version | grep "$PKG_VERSION"
include $(TOPDIR)/rules.mk
PKG_NAME:=knot
-PKG_VERSION:=3.1.4
+PKG_VERSION:=3.1.5
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=https://secure.nic.cz/files/knot-dns/
-PKG_HASH:=05ebca053b4ce62205a095b6885ed1a1167c629ccac2b3c8dcc431bd2deedf70
+PKG_HASH:=2da6e50b0662297d55f80e349568224e07fe88cad20bee1d2e22f54bb32da064
PKG_MAINTAINER:=Daniel Salzman <daniel.salzman@nic.cz>
PKG_LICENSE:=GPL-3.0 LGPL-2.0 0BSD BSD-3-Clause OLDAP-2.8
include $(TOPDIR)/rules.mk
PKG_NAME:=tailscale
-PKG_VERSION:=1.12.3
+PKG_VERSION:=1.18.2
PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE:=tailscale-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/tailscale/tailscale/tar.gz/v$(PKG_VERSION)?
-PKG_HASH:=05e5b1d382cad7ac5737d87d0b61277791c75938468c2c662f21665998d431e9
+PKG_HASH:=57206181868299027689651b6cd133627acad0c8c38f0151f469ab36d4130012
PKG_MAINTAINER:=Jan Pavlinec <jan.pavlinec1@gmail.com>
PKG_LICENSE:=BSD-3-Clause
include $(TOPDIR)/rules.mk
PKG_NAME:=tgt
-PKG_VERSION:=1.0.80
+PKG_VERSION:=1.0.81
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/fujita/tgt/tar.gz/v$(PKG_VERSION)?
-PKG_HASH:=e2255482f1a2797c115a6d545c37428b10a4ba6276a2af787da5378fa4e34e75
+PKG_HASH:=f8a285549456f13fecf628131a73934ffcbb701bacb7d5802acee7b515ab5452
PKG_MAINTAINER:=Maxim Storchak <m.storchak@gmail.com>
PKG_LICENSE:=GPL-2.0-only
define Package/tgt
SECTION:=net
CATEGORY:=Network
- URL:=http://stgt.sourceforge.net/
+ URL:=https://github.com/fujita/tgt
TITLE:=userspace iSCSI target
DEPENDS:=+libpthread +libaio
endef
include $(TOPDIR)/rules.mk
PKG_NAME:=xray-core
-PKG_VERSION:=1.4.5
+PKG_VERSION:=1.5.1
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:=54c6a687dd463b25afe8d8eb44d37e18b8177f58308207cd1d74f6cd04619854
+PKG_HASH:=11b01de5da7efed2a5f066b14bfe5e0299071dc8c32b7f64af5c51daf3abc6c2
PKG_MAINTAINER:=Tianling Shen <cnsztl@immortalwrt.org>
PKG_LICENSE:=MPL-2.0
/etc/config/xray
endef
-GEOIP_VER:=202110210032
+GEOIP_VER:=202112090029
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:=932cd484471f8066c040ab84a04fdd70df6c5cee99545de610e1f337bb696220
+ HASH:=704c53a30531b74a2c4c51b5ee958340717fc81906335c4342fb7d6ef4243ba9
endef
-GEOSITE_VER:=20211018134657
+GEOSITE_VER:=20211209100918
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:=60b2388b11f1f9b6e14794fbacdf3bf693e3101e3ec651ce5423d8caceda5497
+ HASH:=a39901df0d0f7477d874cda50b045057610837dd0d80f7ff4c51b7ab87d88b18
endef
define Build/Prepare
--- /dev/null
+From c8e2a99e68109b386c541dcc157f1f64ca8cbd17 Mon Sep 17 00:00:00 2001
+From: xqzr <34030394+xqzr@users.noreply.github.com>
+Date: Fri, 17 Dec 2021 00:25:16 +0800
+Subject: [PATCH] fix unsupported cipher method: xChaCha20-IETF-Poly1305
+
+---
+ infra/conf/shadowsocks.go | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/infra/conf/shadowsocks.go
++++ b/infra/conf/shadowsocks.go
+@@ -59,7 +59,7 @@ func (v *ShadowsocksServerConfig) Build(
+ return nil, newError("Shadowsocks password is not specified.")
+ }
+ if account.CipherType < shadowsocks.CipherType_AES_128_GCM ||
+- account.CipherType > shadowsocks.CipherType_CHACHA20_POLY1305 {
++ account.CipherType > shadowsocks.CipherType_XCHACHA20_POLY1305 {
+ return nil, newError("unsupported cipher method: ", user.Cipher)
+ }
+ config.Users = append(config.Users, &protocol.User{
--- /dev/null
+From 63da3a548138640f96e631f10d6e2ee1bae3ed62 Mon Sep 17 00:00:00 2001
+From: hmol233 <82594500+hmol233@users.noreply.github.com>
+Date: Mon, 20 Dec 2021 00:47:21 +0800
+Subject: [PATCH] grpc: add initial_windows_size option
+
+---
+ infra/conf/grpc.go | 7 +++++++
+ transport/internet/grpc/config.pb.go | 23 +++++++++++++++++------
+ transport/internet/grpc/config.proto | 1 +
+ transport/internet/grpc/dial.go | 4 ++++
+ 4 files changed, 29 insertions(+), 6 deletions(-)
+
+--- a/infra/conf/grpc.go
++++ b/infra/conf/grpc.go
+@@ -12,6 +12,7 @@ type GRPCConfig struct {
+ IdleTimeout int32 `json:"idle_timeout"`
+ HealthCheckTimeout int32 `json:"health_check_timeout"`
+ PermitWithoutStream bool `json:"permit_without_stream"`
++ InitialWindowsSize int32 `json:"initial_windows_size"`
+ }
+
+ func (g *GRPCConfig) Build() (proto.Message, error) {
+@@ -21,11 +22,17 @@ func (g *GRPCConfig) Build() (proto.Mess
+ if g.HealthCheckTimeout <= 0 {
+ g.HealthCheckTimeout = 0
+ }
++ if g.InitialWindowsSize < 0 {
++ // default window size of gRPC-go
++ g.InitialWindowsSize = 0
++ }
++
+ return &grpc.Config{
+ ServiceName: g.ServiceName,
+ MultiMode: g.MultiMode,
+ IdleTimeout: g.IdleTimeout,
+ HealthCheckTimeout: g.HealthCheckTimeout,
+ PermitWithoutStream: g.PermitWithoutStream,
++ InitialWindowsSize: g.InitialWindowsSize,
+ }, nil
+ }
+--- a/transport/internet/grpc/config.pb.go
++++ b/transport/internet/grpc/config.pb.go
+@@ -31,6 +31,7 @@ type Config struct {
+ IdleTimeout int32 `protobuf:"varint,4,opt,name=idle_timeout,json=idleTimeout,proto3" json:"idle_timeout,omitempty"`
+ HealthCheckTimeout int32 `protobuf:"varint,5,opt,name=health_check_timeout,json=healthCheckTimeout,proto3" json:"health_check_timeout,omitempty"`
+ PermitWithoutStream bool `protobuf:"varint,6,opt,name=permit_without_stream,json=permitWithoutStream,proto3" json:"permit_without_stream,omitempty"`
++ InitialWindowsSize int32 `protobuf:"varint,7,opt,name=initial_windows_size,json=initialWindowsSize,proto3" json:"initial_windows_size,omitempty"`
+ }
+
+ func (x *Config) Reset() {
+@@ -107,6 +108,13 @@ func (x *Config) GetPermitWithoutStream(
+ return false
+ }
+
++func (x *Config) GetInitialWindowsSize() int32 {
++ if x != nil {
++ return x.InitialWindowsSize
++ }
++ return 0
++}
++
+ var File_transport_internet_grpc_config_proto protoreflect.FileDescriptor
+
+ var file_transport_internet_grpc_config_proto_rawDesc = []byte{
+@@ -114,7 +122,7 @@ var file_transport_internet_grpc_config_
+ 0x72, 0x6e, 0x65, 0x74, 0x2f, 0x67, 0x72, 0x70, 0x63, 0x2f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67,
+ 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x25, 0x78, 0x72, 0x61, 0x79, 0x2e, 0x74, 0x72, 0x61,
+ 0x6e, 0x73, 0x70, 0x6f, 0x72, 0x74, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x65, 0x74, 0x2e,
+- 0x67, 0x72, 0x70, 0x63, 0x2e, 0x65, 0x6e, 0x63, 0x6f, 0x64, 0x69, 0x6e, 0x67, 0x22, 0xe7, 0x01,
++ 0x67, 0x72, 0x70, 0x63, 0x2e, 0x65, 0x6e, 0x63, 0x6f, 0x64, 0x69, 0x6e, 0x67, 0x22, 0x99, 0x02,
+ 0x0a, 0x06, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x12, 0x0a, 0x04, 0x68, 0x6f, 0x73, 0x74,
+ 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x68, 0x6f, 0x73, 0x74, 0x12, 0x21, 0x0a, 0x0c,
+ 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01,
+@@ -129,11 +137,14 @@ var file_transport_internet_grpc_config_
+ 0x6f, 0x75, 0x74, 0x12, 0x32, 0x0a, 0x15, 0x70, 0x65, 0x72, 0x6d, 0x69, 0x74, 0x5f, 0x77, 0x69,
+ 0x74, 0x68, 0x6f, 0x75, 0x74, 0x5f, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x18, 0x06, 0x20, 0x01,
+ 0x28, 0x08, 0x52, 0x13, 0x70, 0x65, 0x72, 0x6d, 0x69, 0x74, 0x57, 0x69, 0x74, 0x68, 0x6f, 0x75,
+- 0x74, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x42, 0x33, 0x5a, 0x31, 0x67, 0x69, 0x74, 0x68, 0x75,
+- 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x78, 0x74, 0x6c, 0x73, 0x2f, 0x78, 0x72, 0x61, 0x79, 0x2d,
+- 0x63, 0x6f, 0x72, 0x65, 0x2f, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x6f, 0x72, 0x74, 0x2f, 0x69,
+- 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x65, 0x74, 0x2f, 0x67, 0x72, 0x70, 0x63, 0x62, 0x06, 0x70, 0x72,
+- 0x6f, 0x74, 0x6f, 0x33,
++ 0x74, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x12, 0x30, 0x0a, 0x14, 0x69, 0x6e, 0x69, 0x74, 0x69,
++ 0x61, 0x6c, 0x5f, 0x77, 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x73, 0x5f, 0x73, 0x69, 0x7a, 0x65, 0x18,
++ 0x07, 0x20, 0x01, 0x28, 0x05, 0x52, 0x12, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x61, 0x6c, 0x57, 0x69,
++ 0x6e, 0x64, 0x6f, 0x77, 0x73, 0x53, 0x69, 0x7a, 0x65, 0x42, 0x33, 0x5a, 0x31, 0x67, 0x69, 0x74,
++ 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x78, 0x74, 0x6c, 0x73, 0x2f, 0x78, 0x72, 0x61,
++ 0x79, 0x2d, 0x63, 0x6f, 0x72, 0x65, 0x2f, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x6f, 0x72, 0x74,
++ 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x65, 0x74, 0x2f, 0x67, 0x72, 0x70, 0x63, 0x62, 0x06,
++ 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+ }
+
+ var (
+--- a/transport/internet/grpc/config.proto
++++ b/transport/internet/grpc/config.proto
+@@ -10,4 +10,5 @@ message Config {
+ int32 idle_timeout = 4;
+ int32 health_check_timeout = 5;
+ bool permit_without_stream = 6;
++ int32 initial_windows_size = 7;
+ }
+--- a/transport/internet/grpc/dial.go
++++ b/transport/internet/grpc/dial.go
+@@ -135,6 +135,10 @@ func getGrpcClient(ctx context.Context,
+ }))
+ }
+
++ if grpcSettings.InitialWindowsSize > 0 {
++ dialOptions = append(dialOptions, grpc.WithInitialWindowSize(grpcSettings.InitialWindowsSize))
++ }
++
+ var grpcDestHost string
+ if dest.Address.Family().IsDomain() {
+ grpcDestHost = dest.Address.Domain()
--- /dev/null
+From 9ea1bf7c1dfad892aafc8807b56ce398bb2eb819 Mon Sep 17 00:00:00 2001
+From: yuhan6665 <1588741+yuhan6665@users.noreply.github.com>
+Date: Sat, 18 Dec 2021 23:23:09 -0500
+Subject: [PATCH] Fix shadowsocks xchacha cipher nonce size
+
+---
+ common/crypto/auth.go | 4 ----
+ proxy/shadowsocks/protocol.go | 2 +-
+ proxy/shadowsocks/validator.go | 6 +++---
+ 3 files changed, 4 insertions(+), 8 deletions(-)
+
+--- a/common/crypto/auth.go
++++ b/common/crypto/auth.go
+@@ -39,10 +39,6 @@ func GenerateIncreasingNonce(nonce []byt
+ }
+ }
+
+-func GenerateInitialAEADNonce() BytesGenerator {
+- return GenerateIncreasingNonce([]byte{0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF})
+-}
+-
+ func GenerateAEADNonceWithSize(nonceSize int) BytesGenerator {
+ c := make([]byte, nonceSize)
+ for i := 0; i < nonceSize; i++ {
+--- a/proxy/shadowsocks/protocol.go
++++ b/proxy/shadowsocks/protocol.go
+@@ -86,7 +86,7 @@ func ReadTCPSession(validator *Validator
+ if aead != nil {
+ auth := &crypto.AEADAuthenticator{
+ AEAD: aead,
+- NonceGenerator: crypto.GenerateInitialAEADNonce(),
++ NonceGenerator: crypto.GenerateAEADNonceWithSize(aead.NonceSize()),
+ }
+ r = crypto.NewAuthenticationReader(auth, &crypto.AEADChunkSizeParser{
+ Auth: auth,
+--- a/proxy/shadowsocks/validator.go
++++ b/proxy/shadowsocks/validator.go
+@@ -93,11 +93,11 @@ func (v *Validator) Get(bs []byte, comma
+ var matchErr error
+ switch command {
+ case protocol.RequestCommandTCP:
+- data := make([]byte, 16)
+- ret, matchErr = aead.Open(data[:0], data[4:16], bs[ivLen:ivLen+18], nil)
++ data := make([]byte, 4+aead.NonceSize())
++ ret, matchErr = aead.Open(data[:0], data[4:], bs[ivLen:ivLen+18], nil)
+ case protocol.RequestCommandUDP:
+ data := make([]byte, 8192)
+- ret, matchErr = aead.Open(data[:0], data[8180:8192], bs[ivLen:], nil)
++ ret, matchErr = aead.Open(data[:0], data[8192-aead.NonceSize():8192], bs[ivLen:], nil)
+ }
+
+ if matchErr == nil {
include $(TOPDIR)/rules.mk
PKG_NAME:=alsa-utils
-PKG_VERSION:=1.2.5.1
+PKG_VERSION:=1.2.6
PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=ftp://ftp.alsa-project.org/pub/utils/ \
http://distfiles.gentoo.org/distfiles/
-PKG_HASH:=9c169ae37a49295f9b97b92ace772803daf6b6510a19574e0b78f87e562118d0
+PKG_HASH:=6a1efd8a1f1d9d38e489633eaec1fffa5c315663b316cab804be486887e6145d
PKG_MAINTAINER:=Ted Hess <thess@kitschensync.net>
PKG_LICENSE:=GPL-2.0-or-later
PKG_NAME:=bandwidthd
PKG_VERSION:=2.0.1-35
-PKG_RELEASE:=3
+PKG_RELEASE:=4
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/NethServer/bandwidthd/tar.gz/$(PKG_VERSION)?
$(call Package/bandwidthd/Default)
TITLE += (with sqlite enabled)
VARIANT:=sqlite
- DEPENDS:=+libgd +libpcap +libsqlite3 +php7 +php7-cgi +php7-mod-gd +php7-mod-pdo +php7-mod-pdo-sqlite
+ DEPENDS:=+libgd +libpcap +libsqlite3 +php8 +php8-cgi +php8-mod-gd +php8-mod-pdo +php8-mod-pdo-sqlite
endef
define Package/bandwidthd-php
$(call Package/bandwidthd/Default)
TITLE = PHP files to graph bandwidthd data from postgresql
VARIANT:=php
- DEPENDS:=+libpcre +libxml2 +php7 +php7-cgi +php7-mod-pgsql +php7-mod-gd
+ DEPENDS:=+libpcre +libxml2 +php8 +php8-cgi +php8-mod-pgsql +php8-mod-gd
endef
define Package/bandwidthd/description
PKG_NAME:=logrotate
PKG_VERSION:=3.17.0
-PKG_RELEASE:=1
+PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=https://github.com/logrotate/logrotate/releases/download/$(PKG_VERSION)
define Package/logrotate/conffiles
/etc/logrotate.conf
+/etc/logrotate.d
endef
CONFIGURE_ARGS += \
include $(TOPDIR)/rules.mk
PKG_NAME:=semodule-utils
-PKG_VERSION:=3.2
-PKG_RELEASE:=1
+PKG_VERSION:=3.3
+PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://github.com/SELinuxProject/selinux/releases/download/$(PKG_VERSION)
-PKG_HASH:=be155654883c8dc4d05493e04a3eb9e56d28803009f1fdd721d42c68b878f757
+PKG_HASH:=3098ec5e5f04a1dbbf4aa569b63a4570750a9fe0d4da14ce45954aa300a17063
PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org>
PKG_LICENSE:=GPL-2.0-only
include $(TOPDIR)/rules.mk
PKG_NAME:=telegraf
-PKG_VERSION:=1.21.0
+PKG_VERSION:=1.21.1
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:=95b270fc90cea31fa221296cc9aa436c12233011b263cf149c06ecdd7ba99461
+PKG_HASH:=7ec38fa53747682290621b3162dbb0bb12cf73a559a689f8a75e1ec8b518da0b
PKG_MAINTAINER:=Jonathan Pagel <jonny_tischbein@systemli.org>
PKG_LICENSE:=MIT
include $(TOPDIR)/rules.mk
PKG_NAME:=uvol
-PKG_VERSION:=0.5
+PKG_VERSION:=0.6
PKG_RELEASE:=$(AUTORELEASE)
PKG_MAINTAINER:=Daniel Golle <daniel@makrotopia.org>
$(INSTALL_BIN) ./files/ubi.sh $(1)/usr/libexec/uvol/20-ubi.sh
$(INSTALL_BIN) ./files/lvm.sh $(1)/usr/libexec/uvol/50-lvm.sh
$(INSTALL_BIN) ./files/uvol $(1)/usr/sbin
- $(INSTALL_BIN) ./files/uvol.defaults $(1)/etc/uci-defaults/90-uvol-restore-uci
+ $(INSTALL_BIN) ./files/uvol.defaults $(1)/etc/uci-defaults/90-uvol-init
endef
$(eval $(call BuildPackage,autopart))
uuid="${uuid:5}"
case "$uciname" in
- "_uxc")
- target="/var/run/uxc"
+ "_meta")
+ target="/var/run/uvol/.meta"
;;
"_"*)
return 1
local volname="$1"
local uciname
- uciname="${volname//-/_}"
+ uciname="${volname//[-.]/_}"
uciname="${uciname//[!([:alnum:]_)]}"
if [ -e "${UCI_SPOOLDIR}/add-$1" ]; then
rm "${UCI_SPOOLDIR}/add-$1"
vg_name=
exportpv() {
- local reports rep pv pvs
vg_name=
+ config_load fstab
+ local uvolsect="$(config_foreach echo uvol)"
+ [ -n "$uvolsect" ] && config_get vg_name "$uvolsect" vg_name
+ [ -n "$vg_name" ] && return
+ local reports rep pv pvs
json_init
json_load "$(pvs -o vg_name -S "pv_name=~^/dev/$rootdev.*\$")"
json_select report
for dms in /sys/devices/virtual/block/dm-* ; do
[ "$dms" = "/sys/devices/virtual/block/dm-*" ] && break
read -r dm_name < "$dms/dm/name"
- [ $(basename "$lv_dm_path") = "$dm_name" ] && echo "$(basename "$dms")"
+ [ "$(basename "$lv_dm_path")" = "$dm_name" ] && basename "$dms"
done
}
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{"
}
detect() {
- local reports rep lv lvs lv_name lv_full_name lv_mode volname devname lv_skip_activation
+ local reports rep lv lvs lv_name lv_full_name lv_mode volname devname
local temp_up=""
json_init
esac
volmode="${volname:5:2}"
volname="${volname:8}"
+ [ "${volname:0:1}" = "." ] && continue
if [ "$json_output" = "1" ]; then
[ "$json_notfirst" = "1" ] && echo ","
echo -e "\t{"
#!/bin/sh
-uci -q get fstab.@uvol[0].initialized >/dev/null || uvol detect || true
+uvol_init() {
+ local metasz freesz totalsz
+ uvol detect
+ metasz="$(uvol size .meta 2>/dev/null)"
+ [ "$((metasz))" -gt 0 ] && return
+ totalsz="$(uvol total)"
+ freesz="$(uvol free)"
+ metasz="$((totalsz / 10240))"
+ [ "$metasz" -lt 4194304 ] && metasz=4194304
+ [ "$metasz" -gt "$freesz" ] && return
+ uvol create .meta "$metasz" rw
+ uvol up .meta
+}
+
+uci -q get fstab.@uvol[0].initialized >/dev/null || uvol_init
include $(TOPDIR)/rules.mk
PKG_NAME:=whois
-PKG_VERSION:=5.5.9
+PKG_VERSION:=5.5.10
PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=http://ftp.debian.org/debian/pool/main/w/whois
-PKG_HASH:=69088241ed33d2204f153c8005b312a69b60a1429075ff49f42f9f1f73a19c19
+PKG_HASH:=2391037b079695d0e9fd3c85ab021809a539cf093d25b6c51ca65019a54158dd
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
PKG_BUILD_DEPENDS:=perl/host
projects / feed / packages.git / commitdiff