diff --git a/admin/htop/Makefile b/admin/htop/Makefile index 829f53464..01208ea13 100644 --- a/admin/htop/Makefile +++ b/admin/htop/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=htop -PKG_VERSION:=3.2.1 -PKG_RELEASE:=$(AUTORELEASE) +PKG_VERSION:=3.2.2 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/htop-dev/htop/tar.gz/$(PKG_VERSION)? -PKG_HASH:=b5ffac1949a8daaabcffa659c0964360b5008782aae4dfa7702d2323cfb4f438 +PKG_HASH:=3829c742a835a0426db41bb039d1b976420c21ec65e93b35cd9bfd2d57f44ac8 PKG_LICENSE:=GPL-2.0-or-later PKG_LICENSE_FILES:=COPYING diff --git a/lang/php8/Makefile b/lang/php8/Makefile index 0a1de9d4e..b2c138f1e 100644 --- a/lang/php8/Makefile +++ b/lang/php8/Makefile @@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=php -PKG_VERSION:=8.2.1 +PKG_VERSION:=8.2.2 PKG_RELEASE:=1 PKG_MAINTAINER:=Michael Heimpold @@ -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:=650d3bd7a056cabf07f6a0f6f1dd8ba45cd369574bbeaa36de7d1ece212c17af +PKG_HASH:=bdc4aa38e652bac86039601840bae01c0c3653972eaa6f9f93d5f71953a7ee33 PKG_BUILD_PARALLEL:=1 PKG_USE_MIPS16:=0 diff --git a/net/cloudflared/Makefile b/net/cloudflared/Makefile index c0e13fdbe..9c80f8426 100644 --- a/net/cloudflared/Makefile +++ b/net/cloudflared/Makefile @@ -5,12 +5,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=cloudflared -PKG_VERSION:=2023.1.0 +PKG_VERSION:=2023.2.1 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/cloudflare/cloudflared/tar.gz/$(PKG_VERSION)? -PKG_HASH:=68b66ec333329cda386b304a333b6f24e3ecc09696184603ca37426d522c4cd2 +PKG_HASH:=468b0953eca6ab189859073067857062c91ed9adb18e12a43527e0dba3aa6409 PKG_LICENSE:=Apache-2.0 PKG_LICENSE_FILES:=LICENSE diff --git a/net/dnscrypt-proxy2/Makefile b/net/dnscrypt-proxy2/Makefile index c3c7affb3..137e71bb9 100644 --- a/net/dnscrypt-proxy2/Makefile +++ b/net/dnscrypt-proxy2/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=dnscrypt-proxy2 -PKG_VERSION:=2.1.2 +PKG_VERSION:=2.1.4 PKG_RELEASE:=1 PKG_SOURCE:=dnscrypt-proxy-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/DNSCrypt/dnscrypt-proxy/tar.gz/$(PKG_VERSION)? -PKG_HASH:=aa55fd52b9c1b983405bf98b42ec754f5d6f59b429ba9c98115df617eef5dea4 +PKG_HASH:=05f0a3e8c8f489caf95919e2a75a1ec4598edd3428d2b9dd357caba6adb2607d PKG_BUILD_DIR:=$(BUILD_DIR)/dnscrypt-proxy-$(PKG_VERSION) PKG_MAINTAINER:=Josef Schlehofer diff --git a/net/sing-box/Makefile b/net/sing-box/Makefile new file mode 100644 index 000000000..921f599cc --- /dev/null +++ b/net/sing-box/Makefile @@ -0,0 +1,140 @@ +include $(TOPDIR)/rules.mk + +PKG_NAME:=sing-box +PKG_VERSION:=1.1.5 +PKG_RELEASE:=1 + +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=https://codeload.github.com/SagerNet/sing-box/tar.gz/v$(PKG_VERSION)? +PKG_HASH:=a1e642362f41bd0e362cd9c8d2f0d29d2eca6a55a948677f6f03cfb81c4f0657 + +PKG_LICENSE:=GPL-3.0-or-later +PKG_LICENSE_FILES:=LICENSE +PKG_MAINTAINER:=Van Waholtz + +PKG_BUILD_DEPENDS:=golang/host +PKG_BUILD_PARALLEL:=1 +PKG_USE_MIPS16:=0 + +GO_PKG:=github.com/sagernet/sing-box +GO_PKG_BUILD_PKG:=$(GO_PKG)/cmd/sing-box + +include $(INCLUDE_DIR)/package.mk +include ../../lang/golang/golang-package.mk + +define Package/sing-box + TITLE:=The universal proxy platform + SECTION:=net + CATEGORY:=Network + URL:=https://sing-box.sagernet.org + DEPENDS:=$(GO_ARCH_DEPENDS) +ca-bundle +kmod-tun + USERID:=sing-box=5566:sing-box=5566 +endef + +define Package/sing-box/description + Sing-box is a universal proxy platform which supports hysteria, SOCKS, Shadowsocks, + ShadowsocksR, ShadowTLS, Tor, trojan, VLess, VMess, WireGuard and so on. +endef + +define Package/sing-box/config + menu "Select build options" + depends on PACKAGE_sing-box + + config SINGBOX_WITH_ACME + bool "Build with ACME TLS certificate issuer support" + default n + + config SINGBOX_WITH_CLASH_API + bool "Build with Clash API support" + default y + + config SINGBOX_WITH_ECH + bool "Build with TLS ECH extension support for TLS outbound" + default n + + config SINGBOX_WITH_EMBEDDED_TOR + bool "Build with embedded Tor support" + default n + + config SINGBOX_WITH_GRPC + bool "Build with standard gRPC support" + default n + + config SINGBOX_WITH_GVISOR + bool "Build with gVisor support" + default y + + config SINGBOX_WITH_LWIP + bool "Build with LWIP Tun stack support" + default n + + config SINGBOX_WITH_QUIC + bool "Build with QUIC support" + default y + + config SINGBOX_WITH_SHADOWSOCKSR + bool "Build with ShadowsocksR support" + default n + + config SINGBOX_WITH_UTLS + bool "Build with uTLS support for TLS outbound" + default y + + config SINGBOX_WITH_V2RAY_API + bool "Build with V2Ray API support" + default n + + config SINGBOX_WITH_WIREGUARD + bool "Build with WireGuard support" + default y + endmenu +endef + +PKG_CONFIG_DEPENDS:= \ + CONFIG_SINGBOX_WITH_ACME \ + CONFIG_SINGBOX_WITH_CLASH_API \ + CONFIG_SINGBOX_WITH_ECH \ + CONFIG_SINGBOX_WITH_EMBEDDED_TOR \ + CONFIG_SINGBOX_WITH_GRPC \ + CONFIG_SINGBOX_WITH_GVISOR \ + CONFIG_SINGBOX_WITH_LWIP \ + CONFIG_SINGBOX_WITH_QUIC \ + CONFIG_SINGBOX_WITH_SHADOWSOCKSR \ + CONFIG_SINGBOX_WITH_UTLS \ + CONFIG_SINGBOX_WITH_V2RAY_API \ + CONFIG_SINGBOX_WITH_WIREGUARD + +GO_PKG_TAGS:=$(subst $(space),$(comma),$(strip \ + $(if $(CONFIG_SINGBOX_WITH_ACME),with_acme) \ + $(if $(CONFIG_SINGBOX_WITH_CLASH_API),with_clash_api) \ + $(if $(CONFIG_SINGBOX_WITH_ECH),with_ech) \ + $(if $(CONFIG_SINGBOX_WITH_EMBEDDED_TOR),with_embedded_tor) \ + $(if $(CONFIG_SINGBOX_WITH_GRPC),with_grpc) \ + $(if $(CONFIG_SINGBOX_WITH_GVISOR),with_gvisor) \ + $(if $(CONFIG_SINGBOX_WITH_LWIP),with_lwip) \ + $(if $(CONFIG_SINGBOX_WITH_QUIC),with_quic) \ + $(if $(CONFIG_SINGBOX_WITH_SHADOWSOCKSR),with_shadowsocksr) \ + $(if $(CONFIG_SINGBOX_WITH_UTLS),with_utls) \ + $(if $(CONFIG_SINGBOX_WITH_V2RAY_API),with_v2ray_api) \ + $(if $(CONFIG_SINGBOX_WITH_WIREGUARD),with_wireguard) \ +)) + +define Package/sing-box/conffiles +/etc/config/sing-box +/etc/sing-box/ +endef + +define Package/sing-box/install + $(INSTALL_DIR) $(1)/usr/bin/ + $(INSTALL_BIN) $(GO_PKG_BUILD_BIN_DIR)/sing-box $(1)/usr/bin/sing-box + + $(INSTALL_DIR) $(1)/etc/sing-box + $(INSTALL_DATA) $(PKG_BUILD_DIR)/release/config/config.json $(1)/etc/sing-box + + $(INSTALL_DIR) $(1)/etc/config/ + $(INSTALL_CONF) ./files/sing-box.conf $(1)/etc/config/sing-box + $(INSTALL_DIR) $(1)/etc/init.d/ + $(INSTALL_BIN) ./files/sing-box.init $(1)/etc/init.d/sing-box +endef + +$(eval $(call BuildPackage,sing-box)) diff --git a/net/sing-box/files/sing-box.conf b/net/sing-box/files/sing-box.conf new file mode 100644 index 000000000..c776790e8 --- /dev/null +++ b/net/sing-box/files/sing-box.conf @@ -0,0 +1,7 @@ + +config sing-box 'main' + option enabled '0' + option user 'sing-box' + option conffile '/etc/sing-box/config.json' + option workdir '/usr/share/sing-box' + diff --git a/net/sing-box/files/sing-box.init b/net/sing-box/files/sing-box.init new file mode 100755 index 000000000..277c9f2ee --- /dev/null +++ b/net/sing-box/files/sing-box.init @@ -0,0 +1,39 @@ +#!/bin/sh /etc/rc.common + +USE_PROCD=1 +START=99 + +NAME="sing-box" +PROG="/usr/bin/sing-box" + +start_service() { + config_load "$NAME" + + local enabled user group conffile workdir + config_get_bool enabled "main" "enabled" "0" + [ "$enabled" -eq "1" ] || return 0 + + config_get user "main" "user" "root" + config_get conffile "main" "conffile" + config_get workdir "main" "workdir" "/usr/share/sing-box" + + mkdir -p "$workdir" + local group="$(id -ng $user)" + chown $user:$group "$workdir" + + procd_open_instance "$NAME.main" + procd_set_param command "$PROG" run -c "$conffile" -D "$workdir" + + # Use root user if you want to use the TUN mode. + procd_set_param user "$user" + procd_set_param file "$conffile" + procd_set_param stdout 1 + procd_set_param stderr 1 + procd_set_param respawn + + procd_close_instance +} + +service_triggers() { + procd_add_reload_trigger "$NAME" +} diff --git a/net/sing-box/test.sh b/net/sing-box/test.sh new file mode 100644 index 000000000..2470c5139 --- /dev/null +++ b/net/sing-box/test.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +sing-box version | grep -F "$PKG_VERSION" diff --git a/net/v2ray-core/Makefile b/net/v2ray-core/Makefile index 14fa12fc0..db526da72 100644 --- a/net/v2ray-core/Makefile +++ b/net/v2ray-core/Makefile @@ -5,12 +5,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=v2ray-core -PKG_VERSION:=5.2.1 +PKG_VERSION:=5.3.0 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/v2fly/v2ray-core/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=97bc872e798fed51c23c39f8f63ee25984658e2b252b0ec2c8ec469c00a4d77a +PKG_HASH:=8e97e2647cb1dee8aa7e71df276c56d74258b2d97bb490a362afa84bdf1b9e25 PKG_LICENSE:=MIT PKG_LICENSE_FILES:=LICENSE diff --git a/net/v2ray-geodata/Makefile b/net/v2ray-geodata/Makefile index c77a14bb7..9d67d1419 100644 --- a/net/v2ray-geodata/Makefile +++ b/net/v2ray-geodata/Makefile @@ -12,22 +12,22 @@ PKG_MAINTAINER:=Tianling Shen include $(INCLUDE_DIR)/package.mk -GEOIP_VER:=202212220043 +GEOIP_VER:=202302090046 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:=2c19f53055777a126a4687feb41dab033180b517de058a0d18b6344c4987f57d + HASH:=38e200a655c3e401dde6a438e79d493c3dbdd224e104a5158bef01f78ad4a151 endef -GEOSITE_VER:=20221226075817 +GEOSITE_VER:=20230208103804 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:=7651fe111ed789d3508f2d6bfaa547141beb7bf1d392b57207889c5f6df53e19 + HASH:=479fe1557bf873a2951483315eb75d769e7e74e4523fd130c6762b30b7c49a2c endef define Package/v2ray-geodata/template diff --git a/net/xray-core/Makefile b/net/xray-core/Makefile index 2e502157e..d06c5a50f 100644 --- a/net/xray-core/Makefile +++ b/net/xray-core/Makefile @@ -1,12 +1,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=xray-core -PKG_VERSION:=1.7.2 +PKG_VERSION:=1.7.5 PKG_RELEASE:=1 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:=e35824e19e8acc06296ce6bfa78a14a6f3ee8f42a965f7762b7056b506457a29 +PKG_HASH:=a5fc936136a57a463bf9a895d068fdfa895b168ae6093c58a10208e098b6b2d3 PKG_MAINTAINER:=Tianling Shen PKG_LICENSE:=MPL-2.0 diff --git a/utils/stress-ng/Makefile b/utils/stress-ng/Makefile index 8792198f4..97e86c846 100644 --- a/utils/stress-ng/Makefile +++ b/utils/stress-ng/Makefile @@ -6,12 +6,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=stress-ng -PKG_VERSION:=0.15.01 +PKG_VERSION:=0.15.03 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/ColinIanKing/stress-ng/tar.gz/refs/tags/V$(PKG_VERSION)? -PKG_HASH:=2168627350d8e3b7f4571732d6117ab054a9851600899c30ad82fd3c9649d644 +PKG_HASH:=7cceca64da37fd3c8db7167ed386fd7d3e1d9d6891a1f6227911ab8d4b17379c PKG_MAINTAINER:=Alexandru Ardelean PKG_LICENSE:=GPL-2.0-only diff --git a/utils/stress/Makefile b/utils/stress/Makefile index 953b21cd5..8e13158e5 100644 --- a/utils/stress/Makefile +++ b/utils/stress/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=stress +PKG_VERSION:=1.0.7 PKG_RELEASE:=1 -PKG_SOURCE_PROTO:=git -PKG_SOURCE_VERSION:=1.0.5 -PKG_SOURCE_URL:=https://github.com/resurrecting-open-source-projects/stress -PKG_MIRROR_HASH:=711e42ead6fd220a98821aae0cf024930785e439d3d0d50663fed1b2cd021bd1 +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_SOURCE_URL:=https://github.com/resurrecting-open-source-projects/stress/releases/download/${PKG_VERSION}/ +PKG_HASH:=e63adb57597e617c14ecb0d841b5d990460796d9e9ec69bd56fe645ef02eb239 PKG_MAINTAINER:=Alexandru Ardelean PKG_LICENSE:=GPL-2.0-only diff --git a/utils/stress/patches/010-usleep.patch b/utils/stress/patches/010-usleep.patch index fde51cf85..02a220184 100644 --- a/utils/stress/patches/010-usleep.patch +++ b/utils/stress/patches/010-usleep.patch @@ -1,46 +1,51 @@ --- a/src/stress.c +++ b/src/stress.c -@@ -263,6 +263,7 @@ main (int argc, char **argv) +@@ -266,9 +266,12 @@ main (int argc, char **argv) + while ((forks = (do_cpu + do_io + do_vm + do_hdd))) + { + long long backoff, timeout = 0; ++ struct timespec b; - /* Calculate the backoff value so we get good fork throughput. */ - backoff = do_backoff * forks; -+ struct timespec b = {backoff / 1000000, (backoff % 1000000) * 1000}; - dbg (stdout, "using backoff sleep of %llius\n", backoff); + /* Calculate the backoff value so we get good fork throughput. */ + backoff = do_backoff * forks; ++ b.tv_sec = backoff / 1000000; ++ b.tv_nsec = (backoff % 1000000) * 1000; + dbg (stdout, "using backoff sleep of %llius\n", backoff); - /* If we are supposed to respect a timeout, calculate it. */ -@@ -297,7 +298,7 @@ main (int argc, char **argv) - { + /* If we are supposed to respect a timeout, calculate it. */ +@@ -304,7 +307,7 @@ main (int argc, char **argv) case 0: /* child */ - alarm (timeout); -- usleep (backoff); -+ nanosleep(&b, NULL); - if (do_dryrun) - exit (0); - exit (hogcpu ()); -@@ -318,7 +319,7 @@ main (int argc, char **argv) - { + worker_init(); + alarm (timeout); +- usleep (backoff); ++ nanosleep (&b, NULL); + if (do_dryrun) + exit (0); + exit (hogcpu ()); +@@ -326,7 +329,7 @@ main (int argc, char **argv) case 0: /* child */ - alarm (timeout); -- usleep (backoff); -+ nanosleep(&b,&b); - if (do_dryrun) - exit (0); - exit (hogio ()); -@@ -338,7 +339,7 @@ main (int argc, char **argv) - { + worker_init(); + alarm (timeout); +- usleep (backoff); ++ nanosleep (&b, NULL); + if (do_dryrun) + exit (0); + exit (hogio ()); +@@ -347,7 +350,7 @@ main (int argc, char **argv) case 0: /* child */ - alarm (timeout); -- usleep (backoff); -+ nanosleep(&b, &b); - if (do_dryrun) - exit (0); - exit (hogvm -@@ -359,7 +360,7 @@ main (int argc, char **argv) - { + worker_init(); + alarm (timeout); +- usleep (backoff); ++ nanosleep (&b, NULL); + if (do_dryrun) + exit (0); + exit (hogvm (do_vm_bytes, do_vm_stride, do_vm_hang, do_vm_keep)); +@@ -368,7 +371,7 @@ main (int argc, char **argv) case 0: /* child */ - alarm (timeout); -- usleep (backoff); -+ nanosleep(&b, &b); - if (do_dryrun) - exit (0); - exit (hoghdd (do_hdd_bytes)); + worker_init(); + alarm (timeout); +- usleep (backoff); ++ nanosleep (&b, NULL); + if (do_dryrun) + exit (0); + exit (hoghdd (do_hdd_bytes));