diff --git a/.github/workflows/build-openwrt-huge.yml b/.github/workflows/build-openwrt-huge.yml index c88a99aa..c628def9 100644 --- a/.github/workflows/build-openwrt-huge.yml +++ b/.github/workflows/build-openwrt-huge.yml @@ -68,7 +68,7 @@ jobs: run: | docker rmi `docker images -q` sudo -E rm -rf /usr/share/dotnet /etc/mysql /etc/php /etc/apt/sources.list.d /usr/local/lib/android - sudo -E apt -y purge azure-cli* docker* ghc* zulu* llvm* firefox google* dotnet* powershell* openjdk* mysql* php* mongodb* dotnet* moby* snap* + sudo -E apt -y purge azure-cli* docker* ghc* zulu* llvm* firefox google* dotnet* powershell* openjdk* mysql* php* mongodb* dotnet* moby* snap* aspnetcore* [ -n "$AGENT_TOOLSDIRECTORY" ] && sudo rm -rf "$AGENT_TOOLSDIRECTORY" sudo -E apt update sudo -E apt -y install $(curl -fsSL https://is.gd/depends_ubuntu_2204) diff --git a/.github/workflows/build-openwrt.yml b/.github/workflows/build-openwrt.yml index bde75193..800213c6 100644 --- a/.github/workflows/build-openwrt.yml +++ b/.github/workflows/build-openwrt.yml @@ -68,7 +68,7 @@ jobs: run: | docker rmi `docker images -q` sudo -E rm -rf /usr/share/dotnet /etc/mysql /etc/php /etc/apt/sources.list.d /usr/local/lib/android - sudo -E apt -y purge azure-cli* docker* ghc* zulu* llvm* firefox google* dotnet* powershell* openjdk* mysql* php* mongodb* dotnet* moby* snap* + sudo -E apt -y purge azure-cli* docker* ghc* zulu* llvm* firefox google* dotnet* powershell* openjdk* mysql* php* mongodb* dotnet* moby* snap* aspnetcore* [ -n "$AGENT_TOOLSDIRECTORY" ] && sudo rm -rf "$AGENT_TOOLSDIRECTORY" sudo -E apt update sudo -E apt -y install $(curl -fsSL https://is.gd/depends_ubuntu_2204) diff --git a/.github/workflows/x86_64.yml b/.github/workflows/x86_64.yml index 760062a7..cd4a4328 100644 --- a/.github/workflows/x86_64.yml +++ b/.github/workflows/x86_64.yml @@ -68,7 +68,7 @@ jobs: run: | docker rmi `docker images -q` sudo -E rm -rf /usr/share/dotnet /etc/mysql /etc/php /etc/apt/sources.list.d /usr/local/lib/android - sudo -E apt -y purge azure-cli* docker* ghc* zulu* llvm* firefox google* dotnet* powershell* openjdk* mysql* php* mongodb* dotnet* moby* snap* + sudo -E apt -y purge azure-cli* docker* ghc* zulu* llvm* firefox google* dotnet* powershell* openjdk* mysql* php* mongodb* dotnet* moby* snap* aspnetcore* [ -n "$AGENT_TOOLSDIRECTORY" ] && sudo rm -rf "$AGENT_TOOLSDIRECTORY" sudo -E apt update sudo -E apt -y install $(curl -fsSL https://is.gd/depends_ubuntu_2204) diff --git a/diy-part2.sh b/diy-part2.sh index 6577874a..02a5aa02 100755 --- a/diy-part2.sh +++ b/diy-part2.sh @@ -205,7 +205,7 @@ rm -rf feeds/packages/utils/btrfs-progs/patches #sed -i '41i\ +qt5-sql \\' feeds/packages/net/qBittorrent/Makefile cp -rf $GITHUB_WORKSPACE/general/qBittorrent/patches feeds/packages/net/qBittorrent cp -f $GITHUB_WORKSPACE/general/qBittorrent/Makefile feeds/packages/net/qBittorrent/Makefile -sed -i 's/zh/zh_CN/g' feeds/luci/applications/luci-app-qbittorrent/root/etc/config/qbittorrent +#sed -i 's/zh/zh_CN/g' feeds/luci/applications/luci-app-qbittorrent/root/etc/config/qbittorrent # libtorrent-rasterbar_v2 rm -rf feeds/packages/libs/libtorrent-rasterbar/patches @@ -226,14 +226,14 @@ sed -i 's/PKG_RELEASE:=.*/PKG_RELEASE:=1/g' feeds/packages/net/curl/Makefile #svn co https://github.com/openwrt/packages/trunk/net/curl feeds/packages/net/curl # Qt5 -qtbase -sed -i "s/PKG_BUGFIX:=.*/PKG_BUGFIX:=8/g" feeds/packages/libs/qtbase/Makefile -sed -i "s/PKG_HASH:=.*/PKG_HASH:=bfb11126c7f3abc3fdf86425ce912988b864a7e79a606d77325cffdbacb4be9c/g" feeds/packages/libs/qtbase/Makefile +sed -i "s/PKG_BUGFIX:=.*/PKG_BUGFIX:=9/g" feeds/packages/libs/qtbase/Makefile +sed -i "s/PKG_HASH:=.*/PKG_HASH:=1947deb9d98aaf46bf47e6659b3e1444ce6616974470523756c082041d396d1e/g" feeds/packages/libs/qtbase/Makefile #rm -rf feeds/packages/libs/qtbase/patches #cp -rf $GITHUB_WORKSPACE/general/qt6base feeds/packages/libs # Qt5 -qttools -sed -i "s/PKG_BUGFIX:=.*/PKG_BUGFIX:=8/g" feeds/packages/libs/qttools/Makefile -sed -i "s/PKG_HASH:=.*/PKG_HASH:=a3bef8de13032dae17450f5df35e8abbb4f41f71e3b628871d3da5633577e9c4/g" feeds/packages/libs/qttools/Makefile +sed -i "s/PKG_BUGFIX:=.*/PKG_BUGFIX:=9/g" feeds/packages/libs/qttools/Makefile +sed -i "s/PKG_HASH:=.*/PKG_HASH:=40dce7845bc156dce7878b304e05b19f1ce7dedd4221c67af3bdf0138196006d/g" feeds/packages/libs/qttools/Makefile #rm -rf feeds/packages/libs/qttools #cp -rf $GITHUB_WORKSPACE/general/qt6tools feeds/packages/libs @@ -282,9 +282,9 @@ sed -i 's/PKG_HASH:=.*/PKG_HASH:=d6e6de858ecdb0104991c86c66dde5dd4fb6a1160d70730 cp -f $GITHUB_WORKSPACE/general/containerd/Makefile feeds/packages/utils/containerd # runc -sed -i 's/PKG_VERSION:=.*/PKG_VERSION:=1.1.4/g' feeds/packages/utils/runc/Makefile -sed -i 's/PKG_HASH:=.*/PKG_HASH:=4f02077432642eebd768fc857318ae7929290b3a3511eb1be338005e360cfa34/g' feeds/packages/utils/runc/Makefile -sed -i 's/PKG_SOURCE_VERSION:=.*/PKG_SOURCE_VERSION:=5fd4c4d144137e991c4acebb2146ab1483a97925/g' feeds/packages/utils/runc/Makefile +sed -i 's/PKG_VERSION:=.*/PKG_VERSION:=1.1.5/g' feeds/packages/utils/runc/Makefile +sed -i 's/PKG_HASH:=.*/PKG_HASH:=76cbf30637cbb828794d72d32fb3fd6ff3139cd9743b8b44790fd110f43d96b2/g' feeds/packages/utils/runc/Makefile +sed -i 's/PKG_SOURCE_VERSION:=.*/PKG_SOURCE_VERSION:=f19387a6bec4944c770f7668ab51c4348d9c2f38/g' feeds/packages/utils/runc/Makefile #sed -i '12d' feeds/packages/utils/runc/Makefile # bsdtar @@ -321,8 +321,8 @@ sed -i 's/PKG_MIRROR_HASH:=.*/PKG_MIRROR_HASH:=45e0c37b8e275c8d088506f953aa25b30 # php8 #rm -rf feeds/packages/lang/php8 #svn co https://github.com/openwrt/packages/trunk/lang/php8 feeds/packages/lang/php8 -sed -i 's/PKG_VERSION:=.*/PKG_VERSION:=8.2.4/g' feeds/packages/lang/php8/Makefile -sed -i 's/PKG_HASH:=.*/PKG_HASH:=bc7bf4ca7ed0dd17647e3ea870b6f062fcb56b243bfdef3f59ff7f94e96176a8/g' feeds/packages/lang/php8/Makefile +sed -i 's/PKG_VERSION:=.*/PKG_VERSION:=8.2.5/g' feeds/packages/lang/php8/Makefile +sed -i 's/PKG_HASH:=.*/PKG_HASH:=800738c359b7f1e67e40c22713d2d90276bc85ba1c21b43d99edd43c254c5f76/g' feeds/packages/lang/php8/Makefile # python-docker #sed -i 's/PKG_VERSION:=.*/PKG_VERSION:=6.0.1/g' feeds/packages/lang/python/python-docker/Makefile @@ -340,8 +340,8 @@ sed -i 's/PKG_HASH:=.*/PKG_HASH:=bc7bf4ca7ed0dd17647e3ea870b6f062fcb56b243bfdef3 #sed -i 's/PKG_HASH:=.*/PKG_HASH:=f6a08f0fe75fa85d15f9c0c28182c69a5ad909229b4c230a8cbe38f91ba2d038/g' package/kcptun/Makefile # parted -sed -i 's/PKG_VERSION:=.*/PKG_VERSION:=3.5/g' feeds/packages/utils/parted/Makefile -sed -i 's/PKG_HASH:=.*/PKG_HASH:=4938dd5c1c125f6c78b1f4b3e297526f18ee74aa43d45c248578b1d2470c05a2/g' feeds/packages/utils/parted/Makefile +sed -i 's/PKG_VERSION:=.*/PKG_VERSION:=3.6/g' feeds/packages/utils/parted/Makefile +sed -i 's/PKG_HASH:=.*/PKG_HASH:=3b43dbe33cca0f9a18601ebab56b7852b128ec1a3df3a9b30ccde5e73359e612/g' feeds/packages/utils/parted/Makefile # wolfSSL #sed -i 's/PKG_VERSION:=.*/PKG_VERSION:=5.4.0-stable/g' package/libs/wolfssl/Makefile @@ -402,16 +402,16 @@ sed -i 's/PKG_HASH:=.*/PKG_HASH:=3f09e6d8230892547132177f575a4e3e73cfdf06526e20c #sed -i 's/PKG_HASH:=.*/PKG_HASH:=42ee7b9e15f7b225747c3fa08f43c5d6c83bc899f80ff9bae9319334824076e9/g' feeds/packages/lang/python/python-texttable/Makefile # python-urllib3 -sed -i 's/PKG_VERSION:=.*/PKG_VERSION:=1.26.14/g' feeds/packages/lang/python/python-urllib3/Makefile -sed -i 's/PKG_HASH:=.*/PKG_HASH:=076907bf8fd355cde77728471316625a4d2f7e713c125f51953bb5b3eecf4f72/g' feeds/packages/lang/python/python-urllib3/Makefile +sed -i 's/PKG_VERSION:=.*/PKG_VERSION:=1.26.15/g' feeds/packages/lang/python/python-urllib3/Makefile +sed -i 's/PKG_HASH:=.*/PKG_HASH:=8a388717b9476f934a21484e8c8e61875ab60644d29b9b39e11e4b9dc1c6b305/g' feeds/packages/lang/python/python-urllib3/Makefile # python-sqlalchemy -sed -i 's/PKG_VERSION:=.*/PKG_VERSION:=2.0.3/g' feeds/packages/lang/python/python-sqlalchemy/Makefile -sed -i 's/PKG_HASH:=.*/PKG_HASH:=c2b924f6d0162ed1c0d8f47db1e56498702b1c3c953ad84f0eefbf5b4e53bb05/g' feeds/packages/lang/python/python-sqlalchemy/Makefile +sed -i 's/PKG_VERSION:=.*/PKG_VERSION:=2.0.9/g' feeds/packages/lang/python/python-sqlalchemy/Makefile +sed -i 's/PKG_HASH:=.*/PKG_HASH:=95719215e3ec7337b9f57c3c2eda0e6a7619be194a5166c07c1e599f6afc20fa/g' feeds/packages/lang/python/python-sqlalchemy/Makefile # python-simplejson -sed -i 's/PKG_VERSION:=.*/PKG_VERSION:=3.18.3/g' feeds/packages/lang/python/python-simplejson/Makefile -sed -i 's/PKG_HASH:=.*/PKG_HASH:=ebb53837c5ffcb6100646018565d3f1afed6f4b185b14b2c9cbccf874fe40157/g' feeds/packages/lang/python/python-simplejson/Makefile +sed -i 's/PKG_VERSION:=.*/PKG_VERSION:=3.19.1/g' feeds/packages/lang/python/python-simplejson/Makefile +sed -i 's/PKG_HASH:=.*/PKG_HASH:=6277f60848a7d8319d27d2be767a7546bc965535b28070e310b3a9af90604a4c/g' feeds/packages/lang/python/python-simplejson/Makefile # python-pyrsistent sed -i 's/PKG_VERSION:=.*/PKG_VERSION:=0.19.3/g' feeds/packages/lang/python/python-pyrsistent/Makefile @@ -425,8 +425,8 @@ sed -i 's/PKG_HASH:=.*/PKG_HASH:=1a2994773706bbb4995c31a97bc94f1418314923bd1048c #sed -i 's/PKG_HASH:=.*/PKG_HASH:=e644fdec12f7872f86c58ff790da456218b10f863970249516d60a5eaca77206/g' feeds/packages/lang/python/python-pycparser/Makefile # python-paramiko -sed -i 's/PKG_VERSION:=.*/PKG_VERSION:=3.0.0/g' feeds/packages/lang/python/python-paramiko/Makefile -sed -i 's/PKG_HASH:=.*/PKG_HASH:=fedc9b1dd43bc1d45f67f1ceca10bc336605427a46dcdf8dec6bfea3edf57965/g' feeds/packages/lang/python/python-paramiko/Makefile +sed -i 's/PKG_VERSION:=.*/PKG_VERSION:=3.1.0/g' feeds/packages/lang/python/python-paramiko/Makefile +sed -i 's/PKG_HASH:=.*/PKG_HASH:=6950faca6819acd3219d4ae694a23c7a87ee38d084f70c1724b0c0dbb8b75769/g' feeds/packages/lang/python/python-paramiko/Makefile # python-lxml sed -i 's/PKG_VERSION:=.*/PKG_VERSION:=4.9.2/g' feeds/packages/lang/python/python-lxml/Makefile @@ -452,8 +452,8 @@ sed -i 's/PKG_RELEASE:=.*/PKG_RELEASE:=1/g' feeds/packages/lang/python/bcrypt/Ma sed -i 's/PKG_HASH:=.*/PKG_HASH:=433c410c2177057705da2a9f2cd01dd157493b2a7ac14c8593a16b3dab6b6bfb/g' feeds/packages/lang/python/bcrypt/Makefile # python-dotenv -sed -i 's/PKG_VERSION:=.*/PKG_VERSION:=0.21.1/g' feeds/packages/lang/python/python-dotenv/Makefile -sed -i 's/PKG_HASH:=.*/PKG_HASH:=1c93de8f636cde3ce377292818d0e440b6e45a82f215c3744979151fa8151c49/g' feeds/packages/lang/python/python-dotenv/Makefile +sed -i 's/PKG_VERSION:=.*/PKG_VERSION:=1.0.0/g' feeds/packages/lang/python/python-dotenv/Makefile +sed -i 's/PKG_HASH:=.*/PKG_HASH:=a8df96034aae6d2d50a4ebe8216326c61c3eb64836776504fcca410e5937a3ba/g' feeds/packages/lang/python/python-dotenv/Makefile #sed -i 's/DEPENDS:=.*/DEPENDS:=+python3-click +python3-light +python3-logging/g' feeds/packages/lang/python/python-dotenv/Makefile # python-cffi @@ -613,8 +613,8 @@ cp -rf $GITHUB_WORKSPACE/general/at feeds/packages/utils #cp -rf $GITHUB_WORKSPACE/general/nano feeds/packages/utils # dnsproxy -sed -i 's/PKG_VERSION:=.*/PKG_VERSION:=0.48.2/g' feeds/packages/net/dnsproxy/Makefile -sed -i 's/PKG_HASH:=.*/PKG_HASH:=fd385b3414e616aef5d96b7b007d5fc4fd21b73d6bc097811508e9ddb9b3f4cb/g' feeds/packages/net/dnsproxy/Makefile +sed -i 's/PKG_VERSION:=.*/PKG_VERSION:=0.49.0/g' feeds/packages/net/dnsproxy/Makefile +sed -i 's/PKG_HASH:=.*/PKG_HASH:=4a6a698d830195fd8c04dd32c67e872bfd304fc39dbdaa982935892566b3ae37/g' feeds/packages/net/dnsproxy/Makefile # libnl-tiny #sed -i 's/PKG_RELEASE:=.*/PKG_RELEASE:=1/g' package/libs/libnl-tiny/Makefile @@ -642,8 +642,8 @@ sed -i 's/PKG_HASH:=.*/PKG_HASH:=fd385b3414e616aef5d96b7b007d5fc4fd21b73d6bc0978 #sed -i 's/PKG_HASH:=.*/PKG_HASH:=e3ee4fb5af4abc9335aed7a749c319917c652ac1af687ba40aabd04a6b71f1ca/g' feeds/packages/utils/exfatprogs/Makefile # shairport-sync -#sed -i 's/PKG_VERSION:=.*/PKG_VERSION:=3.3.9/g' feeds/packages/sound/shairport-sync/Makefile -#sed -i 's/PKG_HASH:=.*/PKG_HASH:=17990cb2620551caa07a1c3b371889e55803071eaada04e958c356547a7e1795/g' feeds/packages/sound/shairport-sync/Makefile +sed -i 's/PKG_VERSION:=.*/PKG_VERSION:=4.1.1/g' feeds/packages/sound/shairport-sync/Makefile +sed -i 's/PKG_HASH:=.*/PKG_HASH:=e55caad73dcd36341baf8947cf5e0923997370366d6caf3dd917b345089c4a20/g' feeds/packages/sound/shairport-sync/Makefile # less sed -i 's/PKG_VERSION:=.*/PKG_VERSION:=608/g' feeds/packages/utils/less/Makefile @@ -749,15 +749,15 @@ sed -i 's/DEPENDS:=.*/DEPENDS:=@(LINUX_5_4||LINUX_5_10) +kmod-nls-utf8/g' packag #rm -f package/kernel/mac80211/patches/brcm/999-backport-to-linux-5.18.patch #replace coremark.sh with the new one -#rm feeds/packages/utils/coremark/coremark.sh -#cp $GITHUB_WORKSPACE/general/coremark.sh feeds/packages/utils/coremark/ +rm -f feeds/packages/utils/coremark/coremark.sh +cp -f $GITHUB_WORKSPACE/general/coremark.sh feeds/packages/utils/coremark # replace banner cp -f $GITHUB_WORKSPACE/general/openwrt_banner package/base-files/files/etc/banner # boost -#rm -rf feeds/packages/libs/boost -#cp -r $GITHUB_WORKSPACE/general/boost feeds/packages/libs +rm -rf feeds/packages/libs/boost +cp -r $GITHUB_WORKSPACE/general/boost feeds/packages/libs # wxbase #rm -rf feeds/packages/libs/wxbase @@ -866,6 +866,8 @@ cp -rf $GITHUB_WORKSPACE/general/tailscale feeds/packages/net/tailscale #sed -i 's/PKG_VERSION:=.*/PKG_VERSION:=3.0.4/g' feeds/packages/lang/ruby/Makefile #sed -i 's/PKG_RELEASE:=.*/PKG_RELEASE:=1/g' feeds/packages/lang/ruby/Makefile #sed -i 's/PKG_HASH:=.*/PKG_HASH:=8e22fc7304520435522253210ed0aa9a50545f8f13c959fe01a05aea06bef2f0/g' feeds/packages/lang/ruby/Makefile +rm -rf feeds/packages/lang/ruby +svn co https://github.com/openwrt/packages/trunk/lang/ruby feeds/packages/lang/ruby # libnetfilter-conntrack #sed -i 's/PKG_VERSION:=.*/PKG_VERSION:=1.0.9/g' package/libs/libnetfilter-conntrack/Makefile diff --git a/general/boost/Makefile b/general/boost/Makefile index 88a8d131..a3daa5f7 100644 --- a/general/boost/Makefile +++ b/general/boost/Makefile @@ -11,13 +11,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=boost -PKG_VERSION:=1.80.0 -PKG_SOURCE_VERSION:=1_80_0 -PKG_RELEASE:=$(AUTORELEASE) +PKG_VERSION:=1.82.0 +PKG_SOURCE_VERSION:=1_82_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:=1e19565d82e43bc59209a168f5ac899d3ba471d55c7610c677d4ccf2c9c500c0 +PKG_HASH:=a6e1ab9b0860e6a2881dd7b21fe9f737a095e5f33a3a874afc6a345228597ee6 PKG_MAINTAINER:=Carlos M. Ferreira PKG_LICENSE:=BSL-1.0 @@ -42,7 +42,7 @@ define Package/boost/Default endef define Package/boost/description -This package provides the Boost v1.80.0 libraries. +This package provides the Boost v1.82.0 libraries. Boost is a set of free, peer-reviewed, portable C++ source libraries. This package provides the following run-time libraries: @@ -74,10 +74,11 @@ This package provides the following run-time libraries: - thread - timer - type_erasure + - url - wave There are many more header-only libraries supported by Boost. -See more at http://www.boost.org/doc/libs/1_80_0/ +See more at http://www.boost.org/doc/libs/1_82_0/ endef PKG_BUILD_DEPENDS:=boost/host @@ -362,6 +363,7 @@ $(eval $(call DefineBoostLibrary,system)) $(eval $(call DefineBoostLibrary,thread,system chrono atomic)) $(eval $(call DefineBoostLibrary,timer,chrono)) $(eval $(call DefineBoostLibrary,type_erasure,chrono system thread)) +$(eval $(call DefineBoostLibrary,url)) $(eval $(call DefineBoostLibrary,wave,date_time thread filesystem)) include $(INCLUDE_DIR)/host-build.mk @@ -382,7 +384,13 @@ TARGET_LDFLAGS += -pthread -lrt -lstdc++ -Wl,--gc-sections,--as-needed,--print-g TARGET_CFLAGS += \ $(if $(CONFIG_SOFT_FLOAT),-DBOOST_NO_FENV_H) -fPIC -ffunction-sections -fdata-sections -flto -EXTRA_CXXFLAGS += $(if $(CONFIG_GCC_USE_VERSION_10),-std=gnu++20,$(if $(CONFIG_GCC_USE_VERSION_5),-std=gnu++14,-std=gnu++17)) +ifeq ($(word 1,$(subst ., ,$(call qstrip,$(CONFIG_GCC_VERSION)))),5) + EXTRA_CXXFLAGS += -std=gnu++14 +else ifneq ($(filter-out 6 7 8 9,$(word 1,$(subst ., ,$(call qstrip,$(CONFIG_GCC_VERSION))))),) + EXTRA_CXXFLAGS += -std=gnu++17 +else + EXTRA_CXXFLAGS += -std=gnu++2a +endif ifneq ($(findstring mips,$(ARCH)),) BOOST_ABI = o32 diff --git a/general/containerd/Makefile b/general/containerd/Makefile index 849259f6..5a34ec89 100644 --- a/general/containerd/Makefile +++ b/general/containerd/Makefile @@ -1,15 +1,15 @@ include $(TOPDIR)/rules.mk PKG_NAME:=containerd -PKG_VERSION:=1.6.19 +PKG_VERSION:=1.6.20 PKG_RELEASE:=1 PKG_LICENSE:=Apache-2.0 PKG_LICENSE_FILES:=LICENSE PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/containerd/containerd/tar.gz/v${PKG_VERSION}? -PKG_HASH:=7a90dc72f44e230eb5228ebac23b37e91f7d26d175d563099a8e1c0592047a28 -PKG_SOURCE_VERSION:=1e1ea6e986c6c86565bc33d52e34b81b3e2bc71f +PKG_HASH:=819086ccdca44cfc5f108e226c7a9294d8fad3eb32031a621623da80dedbfb11 +PKG_SOURCE_VERSION:=2806fc1057397dbaeefbea0e4e17bddfbd388f38 PKG_MAINTAINER:=Gerard Ryan diff --git a/general/coremark.sh b/general/coremark.sh old mode 100644 new mode 100755 index a87d1e1e..545726f7 --- a/general/coremark.sh +++ b/general/coremark.sh @@ -1,4 +1,7 @@ -#!/bin/sh +#!/bin/bash + +LOG=/etc/bench.log +echo "
" > $LOG GOV="/sys/devices/system/cpu/cpufreq/policy0/scaling_governor" if [ -f "$GOV" ];then @@ -8,16 +11,28 @@ else GOV_FLAG=0 fi -LOG=/etc/bench.log -echo "
" > $LOG trap "echo killed;test $GOV_FLAG -eq 1 && echo ${CURRENT_GOVERNOR} > ${GOV} 2>/dev/null;echo '
' >> $LOG;rm -f /tmp/*.score;exit" 1 2 3 9 15 -test $GOV_FLAG -eq 1 && echo "performance" > ${GOV} 2>/dev/null +GOV_HOME='/sys/devices/system/cpu/cpufreq/' +govs=() +if [ $GOV_FLAG -eq 1 ];then + POLICIES=$(cd $GOV_HOME && ls -d policy*) + i=1 + for POLICY in $POLICIES;do + CUR_GOV="${GOV_HOME}/${POLICY}/scaling_governor" + govs[$i]=$(cat $CUR_GOV) + echo "performance" > ${CUR_GOV} 2>/dev/null + i=$((i+1)) + done +fi echo "testing coremark ... " +sleep 1 COREMARK=$(/bin/coremark | tail -n 1 | awk '{print $4}') +# 分数取整 +#COREMARK=${COREMARK%.*} echo "CPU CoreMark : $COREMARK" -echo "CPU CoreMark$COREMARK" >> $LOG +echo "CPU CoreMark$COREMARK" >> $LOG if [ -x /usr/bin/openssl ];then CORES=$(grep processor /proc/cpuinfo | wc -l) @@ -25,6 +40,7 @@ if [ -x /usr/bin/openssl ];then PROJS="aes-128-gcm aes-256-gcm chacha20-poly1305" for P in $PROJS;do echo "testing $P ..." + sleep 1 /usr/bin/openssl speed -multi $CORES -evp $P 1>/tmp/${P}.score 2>/dev/null || echo "NA" >/tmp/${P}.score S=$(tail -n 1 /tmp/${P}.score | awk '{print $5}') echo "${P}(1K) : ${S}" @@ -36,7 +52,14 @@ fi echo "" >> $LOG -test $GOV_FLAG -eq 1 && echo "${CURRENT_GOVERNOR}" >${GOV} 2>/dev/null +if [ $GOV_FLAG -eq 1 ];then + i=1 + for POLICY in $POLICIES;do + CUR_GOV="${GOV_HOME}/${POLICY}/scaling_governor" + echo "${govs[$i]}" > ${CUR_GOV} 2>/dev/null + i=$((i+1)) + done +fi if [ -f "$LOG" ]; then sed -i '/coremark/d' /etc/crontabs/root diff --git a/general/docker/Makefile b/general/docker/Makefile index 71706d0c..636d71f7 100644 --- a/general/docker/Makefile +++ b/general/docker/Makefile @@ -1,7 +1,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=docker -PKG_VERSION:=23.0.2 +PKG_VERSION:=23.0.4 PKG_RELEASE:=1 PKG_LICENSE:=Apache-2.0 PKG_LICENSE_FILES:=LICENSE @@ -10,8 +10,8 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_GIT_URL:=github.com/docker/cli PKG_GIT_REF:=v$(PKG_VERSION) PKG_SOURCE_URL:=https://codeload.$(PKG_GIT_URL)/tar.gz/$(PKG_GIT_REF)? -PKG_HASH:=bef4fc68b9f81ab2ae8bb2605e16a0965a3c4a82f0c0cf9d9f5d2cee8e95415d -PKG_GIT_SHORT_COMMIT:=569dd73 # SHA1 used within the docker executables +PKG_HASH:=477c37f128db7bb6926dc410f337cb525af4f26ea9719d38dc2978460dbe2de8 +PKG_GIT_SHORT_COMMIT:=f480fb1 # SHA1 used within the docker executables PKG_MAINTAINER:=Gerard Ryan diff --git a/general/dockerd/Makefile b/general/dockerd/Makefile index 7c067dff..8cb31699 100644 --- a/general/dockerd/Makefile +++ b/general/dockerd/Makefile @@ -1,7 +1,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=dockerd -PKG_VERSION:=23.0.2 +PKG_VERSION:=23.0.4 PKG_RELEASE:=1 PKG_LICENSE:=Apache-2.0 PKG_LICENSE_FILES:=LICENSE @@ -10,8 +10,8 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_GIT_URL:=github.com/moby/moby PKG_GIT_REF:=v$(PKG_VERSION) PKG_SOURCE_URL:=https://codeload.$(PKG_GIT_URL)/tar.gz/$(PKG_GIT_REF)? -PKG_HASH:=4caca59c774445a5aad6114d89c97c88d9705f048704fecdd3f5712cb369dc39 -PKG_GIT_SHORT_COMMIT:=219f21b # SHA1 used within the docker executables +PKG_HASH:=6c6e965974335595eaccb17ccec927aebbc10d44b1a95262871b16c0be4c0179 +PKG_GIT_SHORT_COMMIT:=cbce331 # SHA1 used within the docker executables PKG_MAINTAINER:=Gerard Ryan diff --git a/general/golang/golang/Makefile b/general/golang/golang/Makefile index 535c6e4a..6f6f28b2 100644 --- a/general/golang/golang/Makefile +++ b/general/golang/golang/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk GO_VERSION_MAJOR_MINOR:=1.20 -GO_VERSION_PATCH:=2 +GO_VERSION_PATCH:=3 PKG_NAME:=golang PKG_VERSION:=$(GO_VERSION_MAJOR_MINOR)$(if $(GO_VERSION_PATCH),.$(GO_VERSION_PATCH)) @@ -20,7 +20,7 @@ GO_SOURCE_URLS:=https://dl.google.com/go/ \ PKG_SOURCE:=go$(PKG_VERSION).src.tar.gz PKG_SOURCE_URL:=$(GO_SOURCE_URLS) -PKG_HASH:=4d0e2850d197b4ddad3bdb0196300179d095bb3aefd4dfbc3b36702c3728f8ab +PKG_HASH:=e447b498cde50215c4f7619e5124b0fc4e25fb5d16ea47271c47f278e7aa763a PKG_MAINTAINER:=Jeffery To PKG_LICENSE:=BSD-3-Clause diff --git a/general/naiveproxy/Makefile b/general/naiveproxy/Makefile index c56ccc6a..4782c3f1 100644 --- a/general/naiveproxy/Makefile +++ b/general/naiveproxy/Makefile @@ -5,12 +5,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=naiveproxy -PKG_VERSION:=111.0.5563.64-1 +PKG_VERSION:=112.0.5615.49-1 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/klzgrad/naiveproxy/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=a5411d28943be60a273c58059e3ee81cb8e4623d8286f8e57bf5a34e4fa7e7ac +PKG_HASH:=a19110347a5dedd800f3978c7204e9a5e1b1a26935ead61086547807380610da PKG_LICENSE:=BSD 3-Clause PKG_LICENSE_FILES:=LICENSE @@ -58,31 +58,31 @@ ifneq ($(CONFIG_CCACHE),) export naive_ccache_flags=cc_wrapper="$(CCACHE)" endif -CLANG_VER:=16-init-17653-g39da55e8-2 +CLANG_VER:=17-init-2387-g68e81d7e-1 CLANG_FILE:=clang-llvmorg-$(CLANG_VER).tgz define Download/CLANG URL:=https://commondatastorage.googleapis.com/chromium-browser-clang/Linux_x64 URL_FILE:=$(CLANG_FILE) FILE:=$(CLANG_FILE) - HASH:=b4afdf625aa4b72c5d188ed28a13dd352a881a2a4149542f0c903698d0498017 + HASH:=6335f2e1f35bb235b8fe610559bbf97e630c4e50662a31b6e70226c2f4b0c290 endef -GN_VER:=fe330c0ae1ec29db30b6f830e50771a335e071fb +GN_VER:=ffeea1b1fd070cb6a8d47154a03f8523486b50a7 GN_FILE:=gn-git_revision-$(GN_VER).zip define Download/GN_TOOL URL:=https://chrome-infra-packages.appspot.com/dl/gn/gn/linux-amd64/+ URL_FILE:=git_revision:$(GN_VER) FILE:=$(GN_FILE) - HASH:=47e60075d99b9249096a34966b88f9429dd374c7bd9041fcb6ff0cbec1a38238 + HASH:=14e18b007ce1b3fe8b3ea627e70d285bf164cc01e4d2fd03561e16ab6bfed99e endef -PGO_VER:=5563-1677886924-aa8d450a18b4f7f1cd41619f60bc5da6beb3c1d0 +PGO_VER:=5615-1679995307-0baae343d55c36a01b20eb4c600fca3ba7e0825e PGO_FILE:=chrome-linux-$(PGO_VER).profdata define Download/PGO_PROF URL:=https://storage.googleapis.com/chromium-optimization-profiles/pgo_profiles URL_FILE:=$(PGO_FILE) FILE:=$(PGO_FILE) - HASH:=eb16e7be414614c215ba90538f70f431cf444b9985865ad20d8743b707a235a6 + HASH:=06a181474ca4b34f53dec1d2993e97895665cad85e5c4456ae94ed0c1d10e3ec endef define Build/Prepare diff --git a/general/qt6base/Makefile b/general/qt6base/Makefile index e61a9634..4e016dad 100644 --- a/general/qt6base/Makefile +++ b/general/qt6base/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=qt6base -PKG_BASE:=6.4 +PKG_BASE:=6.5 PKG_BUGFIX:=0 PKG_VERSION:=$(PKG_BASE).$(PKG_BUGFIX) PKG_RELEASE:=$(AUTORELEASE) @@ -17,7 +17,7 @@ PKG_SOURCE:=qtbase-everywhere-src-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://mirrors.tencent.com/qt/archive/qt/$(PKG_BASE)/$(PKG_VERSION)/submodules/ \ https://mirrors.aliyun.com/qt/archive/qt/$(PKG_BASE)/$(PKG_VERSION)/submodules/ \ http://download.qt-project.org/archive/qt/$(PKG_BASE)/$(PKG_VERSION)/submodules/ -PKG_HASH:=cb6475a0bd8567c49f7ffbb072a05516ee6671171bed55db75b22b94ead9b37d +PKG_HASH:=fde1aa7b4fbe64ec1b4fc576a57f4688ad1453d2fab59cbadd948a10a6eaf5ef HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/qtbase-everywhere-src-$(PKG_VERSION) PKG_BUILD_DIR:=$(BUILD_DIR)/qtbase-everywhere-src-$(PKG_VERSION) diff --git a/general/qt6tools/Makefile b/general/qt6tools/Makefile index be928771..00ced810 100644 --- a/general/qt6tools/Makefile +++ b/general/qt6tools/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=qt6tools -PKG_BASE:=6.4 +PKG_BASE:=6.5 PKG_BUGFIX:=0 PKG_VERSION:=$(PKG_BASE).$(PKG_BUGFIX) PKG_RELEASE:=$(AUTORELEASE) @@ -17,7 +17,7 @@ PKG_SOURCE:=qttools-everywhere-src-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://mirrors.tencent.com/qt/archive/qt/$(PKG_BASE)/$(PKG_VERSION)/submodules/ \ https://mirrors.aliyun.com/qt/archive/qt/$(PKG_BASE)/$(PKG_VERSION)/submodules/ \ http://download.qt-project.org/archive/qt/$(PKG_BASE)/$(PKG_VERSION)/submodules/ -PKG_HASH:=97f3d5f88c458be7a8f7b7b08efc06c4ebad39ca51669476b18bf9e4c11afba2 +PKG_HASH:=49c33d96b0a44988be954269b8ce3d1a495b439726e03a6be7c0d50a686369c4 HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/qttools-everywhere-src-$(PKG_VERSION) PKG_MAINTAINER:=Krypton Lee diff --git a/general/tailscale/Makefile b/general/tailscale/Makefile index 132232c0..0ffdac81 100644 --- a/general/tailscale/Makefile +++ b/general/tailscale/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=tailscale -PKG_VERSION:=1.38.3 +PKG_VERSION:=1.38.4 PKG_RELEASE:=1 PKG_SOURCE:=tailscale-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/tailscale/tailscale/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=63ef41e642f4b2c322c794742f03e9e06b593992e9a1299c94f495a496cffb3a +PKG_HASH:=b574bf5570200f357cdbcee9b84e37172469bd421389def33c6ef2d84894ea4f PKG_MAINTAINER:=Jan Pavlinec PKG_LICENSE:=BSD-3-Clause diff --git a/general/tools/Makefile b/general/tools/Makefile index 32be2797..c9c86036 100644 --- a/general/tools/Makefile +++ b/general/tools/Makefile @@ -17,20 +17,63 @@ ifeq ($(CONFIG_EXTERNAL_TOOLCHAIN),) BUILD_ISL = y endif endif -ifneq ($(CONFIG_SDK)$(CONFIG_PACKAGE_kmod-b43)$(CONFIG_PACKAGE_b43legacy-firmware)$(CONFIG_BRCMSMAC_USE_FW_FROM_WL),) +ifneq ($(CONFIG_SDK)$(CONFIG_PACKAGE_kmod-b43)$(CONFIG_BRCMSMAC_USE_FW_FROM_WL),) BUILD_B43_TOOLS = y endif +ifneq ($(CONFIG_SDK)$(CONFIG_TARGET_INITRAMFS_COMPRESSION_LZ4),) + BUILD_LZ4_TOOLS = y +endif +ifneq ($(CONFIG_SDK)$(CONFIG_TARGET_INITRAMFS_COMPRESSION_LZO),) + BUILD_LZO_TOOLS = y +endif -tools-y += autoconf autoconf-archive automake bc bison cmake cpio dosfstools -tools-y += e2fsprogs expat fakeroot findutils firmware-utils flex gengetopt -tools-y += libressl libtool lzma m4 make-ext4fs meson missing-macros mkimage -tools-y += mklibs mtd-utils mtools ninja padjffs2 patch-image -tools-y += patchelf pkgconf quilt squashfskit4 sstrip ucl upx zip zlib zstd +tools-y += autoconf +tools-y += autoconf-archive +tools-y += automake +tools-y += bc +tools-y += bison +tools-y += cmake +tools-y += cpio +tools-y += dosfstools +tools-y += e2fsprogs +tools-y += expat +tools-y += fakeroot +tools-y += findutils +tools-y += firmware-utils +tools-y += flex +tools-y += gengetopt +tools-y += libressl +tools-y += libtool +tools-y += lzma +tools-y += m4 +tools-y += make-ext4fs +tools-y += meson +tools-y += missing-macros +tools-y += mkimage +tools-y += mklibs +tools-y += mtd-utils +tools-y += mtools +tools-y += ninja +tools-y += padjffs2 +tools-y += patch-image +tools-y += patchelf +tools-y += pkgconf +tools-y += quilt +tools-y += squashfs4 +tools-y += sstrip +tools-y += ucl +tools-y += upx +tools-y += zip +tools-y += zlib +tools-y += zstd +tools-$(if $(CONFIG_BUILD_ALL_HOST_TOOLS),y) += liblzo tools-$(if $(CONFIG_BUILD_ALL_HOST_TOOLS)$(BUILD_B43_TOOLS),y) += b43-tools tools-$(if $(CONFIG_BUILD_ALL_HOST_TOOLS)$(BUILD_ISL),y) += isl +tools-$(if $(CONFIG_BUILD_ALL_HOST_TOOLS)$(BUILD_LZ4_TOOLS),y) += lz4 +tools-$(if $(CONFIG_BUILD_ALL_HOST_TOOLS)$(BUILD_LZO_TOOLS),y) += lzop tools-$(if $(CONFIG_BUILD_ALL_HOST_TOOLS)$(BUILD_TOOLCHAIN),y) += gmp mpc mpfr tools-$(if $(CONFIG_BUILD_ALL_HOST_TOOLS)$(CONFIG_TARGET_apm821xx)$(CONFIG_TARGET_gemini),y) += genext2fs -tools-$(if $(CONFIG_BUILD_ALL_HOST_TOOLS)$(CONFIG_TARGET_ath79),y) += lzma-old squashfs +tools-$(if $(CONFIG_BUILD_ALL_HOST_TOOLS)$(CONFIG_TARGET_ath79),y) += lzma-old squashfs3-lzma tools-$(if $(CONFIG_BUILD_ALL_HOST_TOOLS)$(CONFIG_TARGET_mxs),y) += elftosb sdimage tools-$(if $(CONFIG_BUILD_ALL_HOST_TOOLS)$(CONFIG_TARGET_realtek),y) += 7z tools-$(if $(CONFIG_BUILD_ALL_HOST_TOOLS)$(CONFIG_TARGET_tegra),y) += cbootimage cbootimage-configs @@ -40,25 +83,29 @@ tools-$(if $(CONFIG_BUILD_ALL_HOST_TOOLS)$(CONFIG_USE_LLVM_BUILD),y) += llvm-bpf # builddir dependencies $(curdir)/autoconf/compile := $(curdir)/m4/compile -$(curdir)/automake/compile := $(curdir)/m4/compile $(curdir)/autoconf/compile $(curdir)/pkgconf/compile $(curdir)/xz/compile +$(curdir)/automake/compile := $(curdir)/autoconf/compile $(curdir)/pkgconf/compile $(curdir)/xz/compile $(curdir)/b43-tools/compile := $(curdir)/bison/compile $(curdir)/bc/compile := $(curdir)/bison/compile $(curdir)/libtool/compile $(curdir)/upx/compile := $(curdir)/ucl/compile $(curdir)/bison/compile := $(curdir)/flex/compile $(curdir)/cbootimage/compile += $(curdir)/automake/compile -$(curdir)/cmake/compile += $(curdir)/libressl/compile $(curdir)/ninja/compile $(curdir)/expat/compile $(curdir)/xz/compile $(curdir)/zlib/compile $(curdir)/zstd/compile -$(curdir)/dosfstools/compile := $(curdir)/autoconf/compile $(curdir)/automake/compile +$(curdir)/cmake/compile += $(curdir)/libressl/compile $(curdir)/ninja/compile $(curdir)/expat/compile $(curdir)/xz/compile +$(curdir)/zlib/compile $(curdir)/zstd/compile +$(curdir)/dosfstools/compile := $(curdir)/automake/compile $(curdir)/e2fsprogs/compile := $(curdir)/libtool/compile $(curdir)/fakeroot/compile := $(curdir)/libtool/compile $(curdir)/findutils/compile := $(curdir)/bison/compile -$(curdir)/firmware-utils/compile += $(curdir)/cmake/compile $(curdir)/zlib/compile +$(curdir)/firmware-utils/compile += $(curdir)/cmake/compile $(curdir)/flex/compile := $(curdir)/libtool/compile +$(curdir)/genext2fs/compile := $(curdir)/libtool/compile $(curdir)/gengetopt/compile := $(curdir)/libtool/compile $(curdir)/gmp/compile := $(curdir)/libtool/compile $(curdir)/isl/compile := $(curdir)/gmp/compile +$(curdir)/liblzo/compile := $(curdir)/cmake/compile $(curdir)/libressl/compile := $(curdir)/pkgconf/compile -$(curdir)/libtool/compile := $(curdir)/m4/compile $(curdir)/autoconf/compile $(curdir)/automake/compile $(curdir)/missing-macros/compile +$(curdir)/libtool/compile := $(curdir)/automake/compile $(curdir)/missing-macros/compile $(curdir)/lzma-old/compile := $(curdir)/zlib/compile +$(curdir)/lzop/compile := $(curdir)/cmake/compile $(curdir)/liblzo/compile $(curdir)/llvm-bpf/compile := $(curdir)/cmake/compile $(curdir)/make-ext4fs/compile := $(curdir)/zlib/compile $(curdir)/meson/compile := $(curdir)/ninja/compile @@ -73,12 +120,12 @@ $(curdir)/patchelf/compile := $(curdir)/libtool/compile $(curdir)/pkgconf/compile := $(curdir)/meson/compile $(curdir)/quilt/compile := $(curdir)/autoconf/compile $(curdir)/findutils/compile $(curdir)/sdcc/compile := $(curdir)/bison/compile -$(curdir)/squashfs/compile := $(curdir)/lzma-old/compile -$(curdir)/squashfskit4/compile := $(curdir)/xz/compile $(curdir)/zlib/compile +$(curdir)/squashfs3-lzma/compile := $(curdir)/lzma-old/compile +$(curdir)/squashfs4/compile := $(curdir)/xz/compile $(curdir)/zlib/compile $(curdir)/zstd/compile := $(curdir)/meson/compile ifneq ($(HOST_OS),Linux) - $(curdir)/squashfskit4/compile += $(curdir)/coreutils/compile + $(curdir)/squashfs4/compile += $(curdir)/coreutils/compile tools-y += coreutils endif ifeq ($(HOST_OS),Darwin) @@ -102,8 +149,11 @@ $(foreach tool, $(tools-y), $(if $(wildcard $(curdir)/$(tool)/patches),$(eval $( $(foreach tool, $(filter-out xz,$(tools-y)), $(eval $(curdir)/$(tool)/compile += $(curdir)/xz/compile)) -# make any tool depend on tar, xz and patch to ensure that archives can be unpacked and patched properly -tools-core := tar xz patch +# make any tool depend on the following to ensure that archives can be unpacked and patched properly +tools-core += libdeflate +tools-core += patch +tools-core += tar +tools-core += xz $(foreach tool, $(tools-y), $(eval $(curdir)/$(tool)/compile += $(patsubst %,$(curdir)/%/compile,$(tools-core)))) tools-y += $(tools-core) diff --git a/general/xray-core/Makefile b/general/xray-core/Makefile index 1fd28ca1..b97dc524 100644 --- a/general/xray-core/Makefile +++ b/general/xray-core/Makefile @@ -1,12 +1,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=Xray-core -PKG_VERSION:=1.8.0 +PKG_VERSION:=1.8.1 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:=35339ee4c2ebd46cebd95ad7791d38a97db3a6afd97277a33e4ee7be35c9a3b2 +PKG_HASH:=477ad92b80700b4742e59ad7848ca4726201841a57339e4c1bf9012e395622e2 PKG_MAINTAINER:=Tianling Shen PKG_LICENSE:=MPL-2.0 diff --git a/general/xray-plugin/Makefile b/general/xray-plugin/Makefile index 464aaacc..516682c9 100644 --- a/general/xray-plugin/Makefile +++ b/general/xray-plugin/Makefile @@ -5,12 +5,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=xray-plugin -PKG_VERSION:=1.8.0 +PKG_VERSION:=1.8.1 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/teddysun/xray-plugin/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=a21e598a41e760b4286cc621311a03fbe60b05268af85a019931e90fccf6df07 +PKG_HASH:=b86b265bd55984c74b80c8b044dfa0cdded448cc92bc8a923b677ca8d54eaa86 PKG_LICENSE:=MIT PKG_LICENSE_FILES:=LICENSE diff --git a/openwrt-21.02-diy-part2.sh b/openwrt-21.02-diy-part2.sh index 6218699a..a6fe9136 100644 --- a/openwrt-21.02-diy-part2.sh +++ b/openwrt-21.02-diy-part2.sh @@ -79,8 +79,8 @@ svn co https://github.com/coolsnowwolf/lede/trunk/package/lean/ntfs3-oot package #svn co https://github.com/coolsnowwolf/lede/trunk/package/libs/libpcap package/libs/libpcap #svn co https://github.com/coolsnowwolf/lede/trunk/package/libs/nettle package/libs/nettle #svn co https://github.com/coolsnowwolf/lede/trunk/package/libs/pcre package/libs/pcre -svn co https://github.com/coolsnowwolf/lede/trunk/tools/upx tools/upx -svn co https://github.com/coolsnowwolf/lede/trunk/tools/ucl tools/ucl +svn co https://github.com/coolsnowwolf/lede/trunk/package/lean/upx tools/upx +svn co https://github.com/coolsnowwolf/lede/trunk/package/lean/ucl tools/ucl wget -P tools https://raw.githubusercontent.com/breakings/OpenWrt/main/general/tools/Makefile # Extra Packages @@ -140,7 +140,8 @@ svn co https://github.com/fw876/helloworld/trunk/shadowsocksr-libev package/shad svn co https://github.com/xiaorouji/openwrt-passwall/trunk/simple-obfs package/simple-obfs #svn co https://github.com/xiaorouji/openwrt-passwall/trunk/kcptun package/kcptun svn co https://github.com/xiaorouji/openwrt-passwall/trunk/trojan package/trojan -svn co https://github.com/xiaorouji/openwrt-passwall/trunk/naiveproxy package/naiveproxy +#svn co https://github.com/xiaorouji/openwrt-passwall/trunk/naiveproxy package/naiveproxy +cp -rf $GITHUB_WORKSPACE/general/naiveproxy package/naiveproxy svn co https://github.com/xiaorouji/openwrt-passwall/trunk/hysteria package/hysteria svn co https://github.com/xiaorouji/openwrt-passwall/trunk/dns2tcp package/dns2tcp svn co https://github.com/xiaorouji/openwrt-passwall/trunk/sagernet-core package/sagernet-core @@ -148,6 +149,7 @@ svn co https://github.com/xiaorouji/openwrt-passwall/trunk/sagernet-core package #mkdir package/xray-core/patches #wget -P package/xray-core/patches https://raw.githubusercontent.com/openwrt/packages/master/net/xray-core/patches/100-go-1.17-deps.patch svn co https://github.com/coolsnowwolf/packages/trunk/net/dnsforwarder package/lean/dnsforwarder +svn co https://github.com/immortalwrt/immortalwrt/trunk/package/utils/mhz package/mhz #菜单定制 git clone https://github.com/immortalwrt/luci-app-unblockneteasemusic package/luci-app-unblockneteasemusic @@ -173,7 +175,7 @@ svn co https://github.com/breakings/OpenWrt/trunk/general/luci-app-netdata packa svn co https://github.com/immortalwrt/luci/branches/openwrt-21.02/applications/luci-app-usb-printer package/lean/luci-app-usb-printer svn co https://github.com/immortalwrt/luci/branches/openwrt-21.02/applications/luci-app-filetransfer package/lean/luci-app-filetransfer svn co https://github.com/immortalwrt/luci/branches/openwrt-21.02/libs/luci-lib-fs package/lean/luci-lib-fs -svn co https://github.com/immortalwrt/luci/branches/openwrt-21.02/applications/luci-app-zerotier package/lean/luci-app-zerotier +svn co https://github.com/immortalwrt/luci/trunk/applications/luci-app-zerotier package/luci-app-zerotier #svn co https://github.com/coolsnowwolf/lede/trunk/package/lean/coremark package/lean/coremark #svn co https://github.com/Lienol/openwrt/branches/21.02/package/network/fullconenat package/network/fullconenat #svn co https://github.com/coolsnowwolf/lede/trunk/package/lean/luci-app-docker package/lean/luci-app-docker @@ -250,13 +252,13 @@ cp -f $GITHUB_WORKSPACE/general/libtorrent-rasterbar/Makefile feeds/packages/lib cp -f $GITHUB_WORKSPACE/general/qBittorrent/Makefile package/lean/qBittorrent # Qt5 -qtbase -sed -i "s/PKG_BUGFIX:=.*/PKG_BUGFIX:=6/" package/lean/qtbase/Makefile -sed -i "s/PKG_HASH:=.*/PKG_HASH:=396bc6b0d773ac6a7c691a4c3d901999f571e3e7033d7fd6f65e4ef2b6eb7340/" package/lean/qtbase/Makefile +#sed -i "s/PKG_BUGFIX:=.*/PKG_BUGFIX:=6/" package/lean/qtbase/Makefile +#sed -i "s/PKG_HASH:=.*/PKG_HASH:=396bc6b0d773ac6a7c691a4c3d901999f571e3e7033d7fd6f65e4ef2b6eb7340/" package/lean/qtbase/Makefile rm -rf package/lean/qtbase/patches # Qt5 -qttools -sed -i "s/PKG_BUGFIX:=.*/PKG_BUGFIX:=6/" package/lean/qttools/Makefile -sed -i "s/PKG_HASH:=.*/PKG_HASH:=2c1486ab7e6dad76fb34642cd4f91d533e5dfeec0ee527129c2c2ed4ab283c3b/" package/lean/qttools/Makefile +#sed -i "s/PKG_BUGFIX:=.*/PKG_BUGFIX:=6/" package/lean/qttools/Makefile +#sed -i "s/PKG_HASH:=.*/PKG_HASH:=2c1486ab7e6dad76fb34642cd4f91d533e5dfeec0ee527129c2c2ed4ab283c3b/" package/lean/qttools/Makefile # samba4 #sed -i 's/PKG_VERSION:.*/PKG_VERSION:=4.14.10/' feeds/packages/net/samba4/Makefile @@ -267,8 +269,8 @@ sed -i "s/PKG_HASH:=.*/PKG_HASH:=2c1486ab7e6dad76fb34642cd4f91d533e5dfeec0ee5271 #sed -i 's/PKG_HASH:=.*/PKG_HASH:=eadbad9e9ab30b25f5520fbfde99fae4a92a1ae3c0257a8d68569a4651e30e02/' feeds/packages/multimedia/ffmpeg/Makefile # btrfs-progs -sed -i 's/PKG_VERSION:=.*/PKG_VERSION:=5.19.1/' feeds/packages/utils/btrfs-progs/Makefile -sed -i 's/PKG_HASH:=.*/PKG_HASH:=26429e540343ccc7f5d4b3f8f42b916713280e898c5471da705026ef6d2c10a6/' feeds/packages/utils/btrfs-progs/Makefile +sed -i 's/PKG_VERSION:=.*/PKG_VERSION:=6.2.2/' feeds/packages/utils/btrfs-progs/Makefile +sed -i 's/PKG_HASH:=.*/PKG_HASH:=e4888db8637d92e667448386992d0856b954cf2515b98d39b667da43c482d693/' feeds/packages/utils/btrfs-progs/Makefile rm -rf feeds/packages/utils/btrfs-progs/patches # bsdtar @@ -299,8 +301,8 @@ sed -i 's/^\s*$[(]call\sEnsureVendoredVersion/#&/' feeds/packages/utils/dockerd/ #cp -f $GITHUB_WORKSPACE/general/containerd/Makefile feeds/packages/utils/containerd # runc -sed -i 's/PKG_VERSION:=.*/PKG_VERSION:=1.1.2/g' feeds/packages/utils/runc/Makefile -sed -i 's/PKG_HASH:=.*/PKG_HASH:=0ccce82b1d9c058d8fd7443d261c96fd7a803f2775bcb1fec2bdb725bc7640f6/g' feeds/packages/utils/runc/Makefile +#sed -i 's/PKG_VERSION:=.*/PKG_VERSION:=1.1.2/g' feeds/packages/utils/runc/Makefile +#sed -i 's/PKG_HASH:=.*/PKG_HASH:=0ccce82b1d9c058d8fd7443d261c96fd7a803f2775bcb1fec2bdb725bc7640f6/g' feeds/packages/utils/runc/Makefile #sed -i 's/PKG_SOURCE_VERSION:=.*/PKG_SOURCE_VERSION:=a916309fff0f838eb94e928713dbc3c0d0ac7aa4/g' feeds/packages/utils/runc/Makefile # openwrt-fullconenat @@ -321,9 +323,9 @@ sed -i 's|PKG_SOURCE_URL:=.*|PKG_SOURCE_URL:=https://github.com/PhilipHazel/pcre sed -i 's/PKG_HASH:=.*/PKG_HASH:=14e4b83c4783933dc17e964318e6324f7cae1bc75d8f3c79bc6969f00c159d68/g' feeds/packages/libs/pcre2/Makefile # socat -sed -i 's/PKG_VERSION:=.*/PKG_VERSION:=1.7.4.3/g' feeds/packages/net/socat/Makefile -sed -i 's/PKG_HASH:=.*/PKG_HASH:=d47318104415077635119dfee44bcfb41de3497374a9a001b1aff6e2f0858007/g' feeds/packages/net/socat/Makefile -sed -i '75i\ sc_cv_getprotobynumber_r=2 \\' feeds/packages/net/socat/Makefile +sed -i 's/PKG_VERSION:=.*/PKG_VERSION:=1.7.4.4/g' feeds/packages/net/socat/Makefile +sed -i 's/PKG_HASH:=.*/PKG_HASH:=fbd42bd2f0e54a3af6d01bdf15385384ab82dbc0e4f1a5e153b3e0be1b6380ac/g' feeds/packages/net/socat/Makefile +#sed -i '75i\ sc_cv_getprotobynumber_r=2 \\' feeds/packages/net/socat/Makefile # libseccomp sed -i 's/PKG_VERSION:=.*/PKG_VERSION:=2.5.4/g' feeds/packages/libs/libseccomp/Makefile @@ -344,8 +346,8 @@ sed -i 's/PKG_HASH:=.*/PKG_HASH:=d82902400405cf0068574ef3dc1fe5f5926207543ba1ae6 #sed -i 's/PKG_HASH:=.*/PKG_HASH:=b23ee315be0e50c2fb1aa374d17f2d2d9146a835b1a79c1918ea15d075a693d7/g' feeds/packages/libs/nspr/Makefile # unrar -sed -i 's/PKG_VERSION:=.*/PKG_VERSION:=6.1.7/g' feeds/packages/utils/unrar/Makefile -sed -i 's/PKG_HASH:=.*/PKG_HASH:=de75b6136958173fdfc530d38a0145b72342cf0d3842bf7bb120d336602d88ed/g' feeds/packages/utils/unrar/Makefile +sed -i 's/PKG_VERSION:=.*/PKG_VERSION:=6.2.6/g' feeds/packages/utils/unrar/Makefile +sed -i 's/PKG_HASH:=.*/PKG_HASH:=0c2d4cbc8b34d0e3bec7b474e0f52bbcc6c4320ec089b4141223ee355f63c318/g' feeds/packages/utils/unrar/Makefile # zstd #sed -i 's/PKG_VERSION:=.*/PKG_VERSION:=1.5.2/g' feeds/packages/utils/zstd/Makefile @@ -559,9 +561,5 @@ sed -i 's/PKG_HASH:=.*/PKG_HASH:=e9faa0fbcc48638c1d1f143e93573ac43b65e76646150f8 #sed -i 's/PKG_VERSION:=.*/PKG_VERSION:=5.9/g' feeds/packages/utils/zsh/Makefile #sed -i 's/PKG_HASH:=.*/PKG_HASH:=9b8d1ecedd5b5e81fbf1918e876752a7dd948e05c1a0dba10ab863842d45acd5/g' feeds/packages/utils/zsh/Makefile -# sagernet-core -sed -i 's|$(LN) v2ray $(1)/usr/bin/xray|#$(LN) v2ray $(1)/usr/bin/xray|g' package/sagernet-core/Makefile -sed -i 's|CONFLICTS:=v2ray-core xray-core|#CONFLICTS:=v2ray-core xray-core|g' package/sagernet-core/Makefile - ./scripts/feeds update -a ./scripts/feeds install -a diff --git a/opt/docker/buildImageX.sh b/opt/docker/buildImageX.sh index 32af8b3d..25034e33 100644 --- a/opt/docker/buildImageX.sh +++ b/opt/docker/buildImageX.sh @@ -57,9 +57,9 @@ cp -f patches/kmod "$TMPDIR/sbin/" && \ cat patches/luci-admin-status-index-html.patch | (cd "$TMPDIR/" && patch -p1) && \ cat patches/luci-admin-status-index-html-02.patch | (cd "$TMPDIR/" && patch -p1) -cat files/docker/init.d_turboacc.patch | (cd "$TMPDIR/" && patch -p1 ) -if ! cat files/docker/cbi_turboacc_new.patch | (cd "$TMPDIR/" && patch -p1 );then - cat files/docker/cbi_turboacc.patch | (cd "$TMPDIR/" && patch -p1 ) +cat patches/init.d_turboacc.patch | (cd "$TMPDIR/" && patch -p1 ) +if ! cat patches/cbi_turboacc_new.patch | (cd "$TMPDIR/" && patch -p1 );then + cat patches/cbi_turboacc.patch | (cd "$TMPDIR/" && patch -p1 ) ( find "$TMPDIR" -name '*.rej' -exec rm {} \; find "$TMPDIR" -name '*.orig' -exec rm {} \; ) @@ -90,7 +90,7 @@ sed -e "s/:0:0:99999:7:::/:${ddd}:0:99999:7:::/" -i "${TMPDIR}/etc/shadow" && \ sed -e "s/root::/root:\$1\$0yUsq67p\$RC5cEtaQpM6KHQfhUSIAl\.:/" -i "${TMPDIR}/etc/shadow" sed -i '/DISTRIB_REVISION/d' "${TMPDIR}/etc/openwrt_release" && \ -echo "DISTRIB_REVISION='R23.3.3'" >> "${TMPDIR}/etc/openwrt_release" && \ +echo "DISTRIB_REVISION='R23.4.4'" >> "${TMPDIR}/etc/openwrt_release" && \ sed -i '/DISTRIB_DESCRIPTION/d' "${TMPDIR}/etc/openwrt_release" && \ echo "DISTRIB_DESCRIPTION='OpenWrt'" >> "${TMPDIR}/etc/openwrt_release" && \