From 00aec8e3c705926c36802a1efebf45ca5d7fb1e6 Mon Sep 17 00:00:00 2001 From: actions-user Date: Fri, 29 Mar 2024 21:30:27 +0800 Subject: [PATCH] update 2024-03-29 21:30:27 --- chinadns-ng/Makefile | 28 +++++++++++++--------------- naiveproxy/Makefile | 11 +++++------ shadow-tls/Makefile | 22 ++++++++++++---------- 3 files changed, 30 insertions(+), 31 deletions(-) diff --git a/chinadns-ng/Makefile b/chinadns-ng/Makefile index 9c57a4b4..e24d6414 100644 --- a/chinadns-ng/Makefile +++ b/chinadns-ng/Makefile @@ -1,6 +1,4 @@ -# SPDX-License-Identifier: GPL-3.0-only -# -# Copyright (C) 2023 ImmortalWrt.org +# SPDX-License-Identifier: GPL-2.0-only include $(TOPDIR)/rules.mk @@ -8,38 +6,38 @@ PKG_NAME:=chinadns-ng PKG_VERSION:=2024.03.27 PKG_RELEASE:=1 -PKG_SOURCE_URL:=https://github.com/zfl9/chinadns-ng/releases/download/$(PKG_VERSION) -UNPACK_CMD=$(CP) $(DL_DIR)/$(PKG_SOURCE) $(PKG_BUILD_DIR)/chinadns-ng - ifeq ($(ARCH),aarch64) - PKG_SOURCE:=chinadns-ng@aarch64-linux-musl@generic+v8a@fast+lto + PKG_ARCH:=chinadns-ng@aarch64-linux-musl@generic+v8a@fast+lto PKG_HASH:=5255a5393d0923ca378f1076eefa8719ab301b25398ab0280e026cdc6316b0e4 else ifeq ($(ARCH),arm) ARM_CPU_FEATURES:=$(word 2,$(subst +,$(space),$(call qstrip,$(CONFIG_CPU_TYPE)))) ifeq ($(ARM_CPU_FEATURES),) - PKG_SOURCE:=chinadns-ng@arm-linux-musleabi@generic+v7a@fast+lto + PKG_ARCH:=chinadns-ng@arm-linux-musleabi@generic+v7a@fast+lto PKG_HASH:=c2e0378e20f5fda376d4f52bfbe1a3dbc7dfe23879e8edc8ef7ab55694cfd676 else - PKG_SOURCE:=chinadns-ng@arm-linux-musleabihf@generic+v7a@fast+lto + PKG_ARCH:=chinadns-ng@arm-linux-musleabihf@generic+v7a@fast+lto PKG_HASH:=d065c7d55b6c43b20dbb668d7bdafabe371c3360cc75bd0279cc2d7a83e342e9 endif else ifeq ($(ARCH),mips) - PKG_SOURCE:=chinadns-ng@mips-linux-musl@mips32+soft_float@fast+lto + PKG_ARCH:=chinadns-ng@mips-linux-musl@mips32+soft_float@fast+lto PKG_HASH:=2170011ecf8ee29057d805eb8054bcc4366b759f454c063f0a258c84403e416e else ifeq ($(ARCH),mipsel) - PKG_SOURCE:=chinadns-ng@mipsel-linux-musl@mips32+soft_float@fast+lto + PKG_ARCH:=chinadns-ng@mipsel-linux-musl@mips32+soft_float@fast+lto PKG_HASH:=9ac1462187b3b06173f908295d45fd0fa3e37eb50171e22198e29dd81710b268 else ifeq ($(ARCH),i386) - PKG_SOURCE:=chinadns-ng@i386-linux-musl@i686@fast+lto + PKG_ARCH:=chinadns-ng@i386-linux-musl@i686@fast+lto PKG_HASH:=bf22fb35fba5e9b1174b0334a5473d4db8b3f85e489cec5af94f9a92f7c9787b else ifeq ($(ARCH),x86_64) - PKG_SOURCE:=chinadns-ng@x86_64-linux-musl@x86_64@fast+lto + PKG_ARCH:=chinadns-ng@x86_64-linux-musl@x86_64@fast+lto PKG_HASH:=8adf68d15068a3a27588772deb19be0a9804077a075aa8dad9dafa12a154c529 else - PKG_SOURCE:=dummy PKG_HASH:=dummy endif +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(ARCH_PACKAGES) +PKG_SOURCE_URL:=https://github.com/zfl9/chinadns-ng/releases/download/$(PKG_VERSION)/$(PKG_ARCH)? +UNPACK_CMD=$(CP) $(DL_DIR)/$(PKG_SOURCE) $(PKG_BUILD_DIR)/$(PKG_NAME) + PKG_LICENSE:=AGPL-3.0-only PKG_LICENSE_FILES:=LICENSE PKG_MAINTAINER:=sbwml @@ -63,4 +61,4 @@ define Package/chinadns-ng/install $(INSTALL_BIN) $(PKG_BUILD_DIR)/chinadns-ng $(1)/usr/bin endef -$(eval $(call BuildPackage,chinadns-ng)) +$(eval $(call BuildPackage,chinadns-ng)) \ No newline at end of file diff --git a/naiveproxy/Makefile b/naiveproxy/Makefile index 241cc9f4..12082826 100644 --- a/naiveproxy/Makefile +++ b/naiveproxy/Makefile @@ -8,9 +8,6 @@ PKG_NAME:=naiveproxy PKG_VERSION:=122.0.6261.43-2 PKG_RELEASE:=1 -PKG_SOURCE:=naiveproxy-v$(PKG_VERSION)-openwrt-$(ARCH_PACKAGES).tar.xz -PKG_SOURCE_URL:=https://github.com/klzgrad/naiveproxy/releases/download/v$(PKG_VERSION)/ - ifeq ($(ARCH_PACKAGES),aarch64_cortex-a53) PKG_HASH:=3f7ba5f4660f801e675aac8124bd7da714ff9b5a11c72955086ed4914fdd0600 else ifeq ($(ARCH_PACKAGES),aarch64_cortex-a72) @@ -57,12 +54,14 @@ else PKG_HASH:=dummy endif +PKG_SOURCE:=naiveproxy-v$(PKG_VERSION)-openwrt-$(ARCH_PACKAGES).tar.xz +PKG_SOURCE_URL:=https://github.com/klzgrad/naiveproxy/releases/download/v$(PKG_VERSION)/ +PKG_BUILD_DIR:=$(BUILD_DIR)/naiveproxy-v$(PKG_VERSION)-openwrt-$(ARCH_PACKAGES) + PKG_LICENSE:=BSD 3-Clause PKG_LICENSE_FILES:=LICENSE PKG_MAINTAINER:=sbwml -PKG_BUILD_DIR:=$(BUILD_DIR)/naiveproxy-v$(PKG_VERSION)-openwrt-$(ARCH_PACKAGES) - include $(INCLUDE_DIR)/package.mk define Package/naiveproxy @@ -95,4 +94,4 @@ define Package/naiveproxy/install $(INSTALL_BIN) $(CURDIR)/files/naiveproxy.init $(1)/etc/init.d/naiveproxy endef -$(eval $(call BuildPackage,naiveproxy)) +$(eval $(call BuildPackage,naiveproxy)) \ No newline at end of file diff --git a/shadow-tls/Makefile b/shadow-tls/Makefile index 0ca19a61..e17cf122 100644 --- a/shadow-tls/Makefile +++ b/shadow-tls/Makefile @@ -7,36 +7,38 @@ PKG_NAME:=shadow-tls PKG_VERSION:=0.2.25 PKG_RELEASE:=1 -PKG_LICENSE_FILES:=LICENSE -PKG_MAINTAINER:=FluffyTigerFear RELEASE_HEAD:=$(PKG_NAME) RELEASE_FOOT:=unknown-linux-musl ifeq ($(ARCH),aarch64) - RELEASE_ARCH:=$(RELEASE_HEAD)-aarch64-$(RELEASE_FOOT) + PKG_ARCH:=$(RELEASE_HEAD)-aarch64-$(RELEASE_FOOT) PKG_HASH:=3295476b37f549a68906519d3eaecb74bf3b6eaf9094cebb16ee84f0151373c6 else ifeq ($(ARCH),arm) ifeq ($(CONFIG_CPU_TYPE),cortex-a7) - RELEASE_ARCH:=$(RELEASE_HEAD)-armv7-$(RELEASE_FOOT)eabihf + PKG_ARCH:=$(RELEASE_HEAD)-armv7-$(RELEASE_FOOT)eabihf PKG_HASH:=e6f918a072557c50fd0ea950af9a156a9b102af72c1d010ff85d08d13006c54f else ifeq ($(CONFIG_CPU_TYPE),cortex-a9) - RELEASE_ARCH:=$(RELEASE_HEAD)-armv7-$(RELEASE_FOOT)eabihf + PKG_ARCH:=$(RELEASE_HEAD)-armv7-$(RELEASE_FOOT)eabihf PKG_HASH:=e6f918a072557c50fd0ea950af9a156a9b102af72c1d010ff85d08d13006c54f else - RELEASE_ARCH:=$(RELEASE_HEAD)-arm-$(RELEASE_FOOT)eabi + PKG_ARCH:=$(RELEASE_HEAD)-arm-$(RELEASE_FOOT)eabi PKG_HASH:=b6743bc60e1727972ece0fd5acf3a931e5be05cedee6f637e7e3d8c5b8d58f16 endif else ifeq ($(ARCH),x86_64) - RELEASE_ARCH:=$(RELEASE_HEAD)-x86_64-$(RELEASE_FOOT) + PKG_ARCH:=$(RELEASE_HEAD)-x86_64-$(RELEASE_FOOT) PKG_HASH:=a173f5f2d57f45211b68e10ceeddc15b1791077b914fa89747bc705fddc71532 else PKG_SOURCE:=dummy PKG_HASH:=dummy endif +PKG_LICENSE:=GPL-3.0 +PKG_LICENSE_FILE:=LICENSE +PKG_MAINTAINER:=Tianling Shen + define Download/shadow-tls URL:=https://github.com/ihciah/shadow-tls/releases/download/v$(PKG_VERSION) - URL_FILE:=$(RELEASE_ARCH) - FILE:=$(RELEASE_ARCH) + URL_FILE:=$(PKG_ARCH) + FILE:=$(PKG_ARCH) HASH:=$(PKG_HASH) endef @@ -61,7 +63,7 @@ endef define Package/shadow-tls/install $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) $(DL_DIR)/$(RELEASE_ARCH) $(1)/usr/bin/shadow-tls + $(INSTALL_BIN) $(DL_DIR)/$(PKG_ARCH) $(1)/usr/bin/shadow-tls endef $(eval $(call BuildPackage,shadow-tls)) \ No newline at end of file