🔥 Sync 2023-12-05 04:43:02

naiveproxy/Makefile

@@ -5,8 +5,8 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=naiveproxy
-PKG_VERSION:=113.0.5672.62-1
-PKG_RELEASE:=96
+PKG_VERSION:=118.0.5993.65-1
+PKG_RELEASE:=97
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/klzgrad/naiveproxy/tar.gz/v$(PKG_VERSION)?
@@ -17,11 +17,7 @@ PKG_LICENSE_FILES:=LICENSE
 PKG_MAINTAINER:=Tianling Shen <cnsztl@immortalwrt.org>
 
 PKG_BUILD_DEPENDS:=gn/host
-ifneq ($(wildcard $(TOPDIR)/feeds/packages/devel/ninja/ninja.mk),)
-PKG_BUILD_DEPENDS+= ninja/host
-endif
 PKG_BUILD_PARALLEL:=1
-PKG_USE_MIPS16:=0
 PKG_BUILD_FLAGS:=no-mips16
 
 ifneq ($(CONFIG_CPU_TYPE)," ")
@@ -43,7 +39,7 @@ define Package/naiveproxy
   SUBMENU:=Web Servers/Proxies
   TITLE:=Make a fortune quietly
   URL:=https://github.com/klzgrad/naiveproxy
-  DEPENDS:=@!(arc||armeb||mips||mips64||powerpc||riscv64||TARGET_gemini) +libatomic
+  DEPENDS:=@!(arc||mips||mips64||powerpc||TARGET_gemini) +libatomic
 endef
 
 define Package/naiveproxy/description
@@ -59,7 +55,7 @@ ifneq ($(CONFIG_CCACHE),)
   export naive_ccache_flags=cc_wrapper="$(CCACHE)"
 endif
 
-CLANG_VER:=17-init-4759-g547e3456-1
+CLANG_VER:=17-init-16420-g0c545a44-8
 CLANG_FILE:=clang-llvmorg-$(CLANG_VER).tgz
 define Download/CLANG
 	URL:=https://commondatastorage.googleapis.com/chromium-browser-clang/Linux_x64
@@ -68,7 +64,7 @@ define Download/CLANG
 	HASH:=skip
 endef
 
-PGO_VER:=5672-1682419203-4df9c2f8b97b0e23303fa2b15279906232abc306
+PGO_VER:=5993-1696528594-5b0dc009ef20f14165590ea16444c1ee3dca372e
 PGO_FILE:=chrome-linux-$(PGO_VER).profdata
 define Download/PGO_PROF
 	URL:=https://storage.googleapis.com/chromium-optimization-profiles/pgo_profiles
@@ -103,12 +99,19 @@ define Build/Configure
 endef
 
 define Build/Compile
-	ninja -C "$(PKG_BUILD_DIR)/src/out/Release" naive
+	+$(NINJA) -C "$(PKG_BUILD_DIR)/src/out/Release" naive
+endef
+
+define Package/naiveproxy/conffiles
+/etc/config/naiveproxy
 endef
 
 define Package/naiveproxy/install
 	$(INSTALL_DIR) $(1)/usr/bin
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/out/Release/naive $(1)/usr/bin/naive
+	$(INSTALL_DIR) $(1)/etc/config $(1)/etc/init.d
+	$(INSTALL_CONF) $(CURDIR)/files/naiveproxy.config $(1)/etc/config/naiveproxy
+	$(INSTALL_BIN) $(CURDIR)/files/naiveproxy.init $(1)/etc/init.d/naiveproxy
 endef
 
 $(eval $(call Download,CLANG))

naiveproxy/files/naiveproxy.config

@@ -0,0 +1,6 @@
+
+config naiveproxy 'config'
+	option enable '0'
+	option listen_addr ''
+	option server_addr ''
+	option extra_argument ''

naiveproxy/files/naiveproxy.init

@@ -0,0 +1,47 @@
+#!/bin/sh /etc/rc.common
+# Copyright (C) 2021 ImmortalWrt
+
+. /lib/functions.sh
+. /lib/functions/procd.sh
+
+USE_PROCD=1
+
+START=99
+STOP=10
+
+init_conf() {
+	config_load "naiveproxy"
+	config_get "enable" "config" "enable" "0"
+	config_get "listen_addr" "config" "listen_addr"
+	config_get "server_addr" "config" "server_addr"
+	config_get "extra_argument" "config" "extra_argument"
+}
+
+start_service() {
+	init_conf
+	[ "${enable}" == "1" ] || return 0
+
+	procd_open_instance naiveproxy
+
+	procd_set_param command naive
+	procd_append_param command --listen="${listen_addr}"
+	procd_append_param command --proxy="${server_addr}"
+	[ -n "${extra_argument}" ] && procd_append_param command "${extra_argument}"
+
+	procd_set_param respawn ${respawn_threshold:-3600} ${respawn_timeout:-5} ${respawn_retry:-5}
+	procd_set_param limits core="unlimited"
+	procd_set_param stdout 1
+	procd_set_param stderr 1
+
+	procd_close_instance
+}
+
+reload_service()
+{
+	stop
+	start
+}
+
+service_triggers() {
+        procd_add_reload_trigger "naiveproxy"
+}

naiveproxy/patches/100-macros.patch

@@ -1,38 +0,0 @@
---- a/src/base/allocator/partition_allocator/tagging.cc
-+++ b/src/base/allocator/partition_allocator/tagging.cc
-@@ -18,22 +18,25 @@
- #define PR_GET_TAGGED_ADDR_CTRL 56
- #define PR_TAGGED_ADDR_ENABLE (1UL << 0)
-
--#if BUILDFLAG(IS_LINUX)
--#include <linux/version.h>
--
--// Linux headers already provide these since v5.10.
--#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 10, 0)
--#define HAS_PR_MTE_MACROS
--#endif
--#endif
--
--#ifndef HAS_PR_MTE_MACROS
-+#ifndef PR_MTE_TCF_SHIFT
- #define PR_MTE_TCF_SHIFT 1
-+#endif
-+#ifndef PR_MTE_TCF_NONE
- #define PR_MTE_TCF_NONE (0UL << PR_MTE_TCF_SHIFT)
-+#endif
-+#ifndef PR_MTE_TCF_SYNC
- #define PR_MTE_TCF_SYNC (1UL << PR_MTE_TCF_SHIFT)
-+#endif
-+#ifndef PR_MTE_TCF_ASYNC
- #define PR_MTE_TCF_ASYNC (2UL << PR_MTE_TCF_SHIFT)
-+#endif
-+#ifndef PR_MTE_TCF_MASK
- #define PR_MTE_TCF_MASK (3UL << PR_MTE_TCF_SHIFT)
-+#endif
-+#ifndef PR_MTE_TAG_SHIFT
- #define PR_MTE_TAG_SHIFT 3
-+#endif
-+#ifndef PR_MTE_TAG_MASK
- #define PR_MTE_TAG_MASK (0xffffUL << PR_MTE_TAG_SHIFT)
- #endif
- #endif

naiveproxy/src/init_env.sh

@@ -64,6 +64,9 @@ enable_reporting=false
 include_transport_security_state_preload_list=false
 use_nss_certs=false
 
+enable_backup_ref_ptr_support=false
+enable_dangling_raw_ptr_checks=false
+
 target_os=\"openwrt\"
 target_cpu=\"${naive_arch}\"
 target_sysroot=\"${toolchain_dir}\""
@@ -71,6 +74,7 @@ target_sysroot=\"${toolchain_dir}\""
 case "${target_arch}" in
 "arm")
 	naive_flags+=" arm_version=0 arm_cpu=\"${cpu_type}\""
+	case "${cpu_type}" in "arm1176jzf-s"|"arm926ej-s"|"mpcore"|"xscale") naive_flags+=" arm_use_thumb=false" ;; esac
 	if [ -n "${cpu_subtype}" ]; then
 		if grep -q "neon" <<< "${cpu_subtype}"; then
 			neon_flag="arm_use_neon=true"
@@ -81,11 +85,9 @@ case "${target_arch}" in
 	else
 		naive_flags+=" arm_float_abi=\"soft\" arm_use_neon=false"
 	fi
-	case "${cpu_type}" in
-	"arm1176jzf-s"|"arm926ej-s"|"mpcore"|"xscale")
-		naive_flags+=" arm_use_thumb=false"
-		;;
-	esac
+	;;
+"arm64")
+	[ -n "${cpu_type}" ] && naive_flags+=" arm_cpu=\"${cpu_type}\""
 	;;
 "mipsel"|"mips64el")
 	naive_flags+=" use_thin_lto=false chrome_pgo_phase=0 mips_arch_variant=\"r2\""

udp2raw/Makefile

@@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=udp2raw
 PKG_VERSION:=20230206.0
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/wangyu-/udp2raw/tar.gz/$(PKG_VERSION)?