From 478548d7d253b76f2b9d0d49a45a7f62c4a93e02 Mon Sep 17 00:00:00 2001 From: CN_SZTL Date: Mon, 1 Feb 2021 10:18:48 +0800 Subject: [PATCH 1/6] luci-app-adguardhome: update dependencies Signed-off-by: CN_SZTL --- package/ctcgfw/luci-app-adguardhome/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/ctcgfw/luci-app-adguardhome/Makefile b/package/ctcgfw/luci-app-adguardhome/Makefile index 900f88b0db..7420fe8759 100644 --- a/package/ctcgfw/luci-app-adguardhome/Makefile +++ b/package/ctcgfw/luci-app-adguardhome/Makefile @@ -12,7 +12,7 @@ PKG_MAINTAINER:= LUCI_TITLE:=LuCI app for AdGuardHome LUCI_PKGARCH:=all -LUCI_DEPENDS:=+ca-certs +curl +wget-ssl +PACKAGE_$(PKG_NAME)_INCLUDE_binary:AdGuardHome +LUCI_DEPENDS:=+ca-certs +curl +wget-ssl +PACKAGE_$(PKG_NAME)_INCLUDE_binary:adguardhome LUCI_DESCRIPTION:=LuCI support for AdGuardHome define Package/$(PKG_NAME)/config From 33b80c2ba179a6166377347c35a9f1e03628f4b6 Mon Sep 17 00:00:00 2001 From: CN_SZTL Date: Mon, 1 Feb 2021 18:58:20 +0800 Subject: [PATCH 2/6] luci-app-adguardhome: fix wrong conf dir Signed-off-by: CN_SZTL --- package/ctcgfw/luci-app-adguardhome/root/etc/config/AdGuardHome | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/ctcgfw/luci-app-adguardhome/root/etc/config/AdGuardHome b/package/ctcgfw/luci-app-adguardhome/root/etc/config/AdGuardHome index 1169488333..6ecfde8b14 100644 --- a/package/ctcgfw/luci-app-adguardhome/root/etc/config/AdGuardHome +++ b/package/ctcgfw/luci-app-adguardhome/root/etc/config/AdGuardHome @@ -2,7 +2,7 @@ config AdGuardHome 'AdGuardHome' option enabled '0' option httpport '3000' option redirect 'none' - option configpath '/etc/AdGuardHome/AdGuardHome.yaml' + option configpath '/etc/AdGuardHome.yaml' option workdir '/etc/AdGuardHome' option logfile '/tmp/AdGuardHome.log' option verbose '0' From 8c637017e4bb6e42516464df3188fdaf77983e8f Mon Sep 17 00:00:00 2001 From: AmadeusGhost <42570690+AmadeusGhost@users.noreply.github.com> Date: Thu, 28 Jan 2021 11:30:01 +0800 Subject: [PATCH 3/6] mt7601u-ap: build error fixes --- ...-fix-control-reaches-end-of-non-void.patch | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 package/ctcgfw/mt7601u-ap/patches/010-fix-control-reaches-end-of-non-void.patch diff --git a/package/ctcgfw/mt7601u-ap/patches/010-fix-control-reaches-end-of-non-void.patch b/package/ctcgfw/mt7601u-ap/patches/010-fix-control-reaches-end-of-non-void.patch new file mode 100644 index 0000000000..b09cfaa300 --- /dev/null +++ b/package/ctcgfw/mt7601u-ap/patches/010-fix-control-reaches-end-of-non-void.patch @@ -0,0 +1,19 @@ +--- a/mcu/rtmp_mcu.c ++++ b/mcu/rtmp_mcu.c +@@ -31,6 +31,7 @@ + INT MCUBurstWrite(PRTMP_ADAPTER pAd, UINT32 Offset, UINT32 *Data, UINT32 Cnt) + { + RTUSBMultiWrite_nBytes(pAd, Offset, Data, Cnt * 4, 64); ++ return 0; + } + + INT MCURandomWrite(PRTMP_ADAPTER pAd, RTMP_REG_PAIR *RegPair, UINT32 Num) +@@ -39,6 +40,8 @@ INT MCURandomWrite(PRTMP_ADAPTER pAd, RTMP_REG_PAIR *RegPair, UINT32 Num) + + for (Index = 0; Index < Num; Index++) + RTMP_IO_WRITE32(pAd, RegPair->Register, RegPair->Value); ++ ++ return 0; + } + + VOID ChipOpsMCUHook(PRTMP_ADAPTER pAd, enum MCU_TYPE MCUType) From 80c7de1a91376fd0cbb4bd9ed27be0b70500f07d Mon Sep 17 00:00:00 2001 From: CN_SZTL Date: Mon, 1 Feb 2021 20:12:06 +0800 Subject: [PATCH 4/6] rtl_wifi: update PKG_MAINTAINTER Signed-off-by: CN_SZTL --- package/ctcgfw/rtl8812au-ac/Makefile | 6 +++--- package/ctcgfw/rtl8821cu/Makefile | 3 ++- package/ctcgfw/rtl88x2bu/Makefile | 3 ++- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/package/ctcgfw/rtl8812au-ac/Makefile b/package/ctcgfw/rtl8812au-ac/Makefile index 259f95c7a2..07e931784b 100644 --- a/package/ctcgfw/rtl8812au-ac/Makefile +++ b/package/ctcgfw/rtl8812au-ac/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2020 Marty Jones +# Copyright (C) 2020 stepheny # # Copyright (C) 2021 CTCGFW Project-OpenWrt # @@ -19,8 +19,9 @@ PKG_SOURCE_DATE:=2020-06-26 PKG_SOURCE_VERSION:=58f6be25f7c86d7ba67b0ccc638cf667755e6e1b PKG_MIRROR_HASH:=60359df8b49fa433d38b968b0df7eaddaca10f13cdd57471394bac1f6e5a162e -PKG_LICENSE:=GPLv2 +PKG_LICENSE:=GPL-2.0 PKG_LICENSE_FILES:=LICENSE +PKG_MAINTAINER:=Marty Jones PKG_BUILD_PARALLEL:=1 @@ -58,7 +59,6 @@ NOSTDINC_FLAGS += -DCONFIG_LITTLE_ENDIAN endif PKG_MAKE_FLAGS += USER_MODULE_NAME=rtl8812au -PKG_MAKE_FLAGS += USER_DRV_NAME=rtl8812au KERNEL_MAKE_FLAGS += CONFIG_88XXAU=m define Build/Compile diff --git a/package/ctcgfw/rtl8821cu/Makefile b/package/ctcgfw/rtl8821cu/Makefile index e6b87c5ca7..b01246ed63 100644 --- a/package/ctcgfw/rtl8821cu/Makefile +++ b/package/ctcgfw/rtl8821cu/Makefile @@ -17,8 +17,9 @@ PKG_SOURCE_DATE:=2020-07-27 PKG_SOURCE_VERSION:=93b04bfcd293fdd7d98d5a7c964ae9416a40159c PKG_MIRROR_HASH:=e3d798355625bd71596ce08741e1f7f3523951e91be775edf2a936ab260bd5de -PKG_LICENSE:=GPLv2 +PKG_LICENSE:=GPL-2.0 PKG_LICENSE_FILES:=LICENSE +PKG_MAINTAINTER:=CN_SZTL PKG_BUILD_PARALLEL:=1 diff --git a/package/ctcgfw/rtl88x2bu/Makefile b/package/ctcgfw/rtl88x2bu/Makefile index 1bbdb13e9c..7d27ca8131 100644 --- a/package/ctcgfw/rtl88x2bu/Makefile +++ b/package/ctcgfw/rtl88x2bu/Makefile @@ -17,8 +17,9 @@ PKG_SOURCE_DATE:=2020-07-21 PKG_SOURCE_VERSION:=a2abcaf523dfab2afeda8cc2cdb5e3c9510fc5f3 PKG_MIRROR_HASH:=26d5504c9323c9c133265f2c2e4213acca0ddf390b1b4399d1003e9fd45f9368 -PKG_LICENSE:=GPLv2 +PKG_LICENSE:=GPL-2.0 PKG_LICENSE_FILES:=LICENSE +PKG_MAINTAINTER:=ElonH PKG_BUILD_PARALLEL:=1 From 60610ff4c61180123c1ad252030698afbe15f589 Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Sun, 31 Jan 2021 14:01:19 +0000 Subject: [PATCH 5/6] selinux-policy: update to git tag v0.5 Signed-off-by: Daniel Golle Signed-off-by: Tianling Shen --- package/system/selinux-policy/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/system/selinux-policy/Makefile b/package/system/selinux-policy/Makefile index dad57e16b8..491b26a83e 100644 --- a/package/system/selinux-policy/Makefile +++ b/package/system/selinux-policy/Makefile @@ -8,8 +8,8 @@ include $(TOPDIR)/rules.mk PKG_NAME:=selinux-policy PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://git.defensec.nl/selinux-policy.git -PKG_VERSION:=0.4 -PKG_MIRROR_HASH:=6bf4df7df2e1a4f641e4068ec79b1f4921e29e531d5b76843f39c79470e646f8 +PKG_VERSION:=0.5 +PKG_MIRROR_HASH:=c96a8cf7ac3445c52a28150c5000a55bde8112402bc77ccfee825cff0bdc8a03 PKG_SOURCE_VERSION:=v$(PKG_VERSION) PKG_BUILD_DEPENDS:=secilc/host policycoreutils/host From 2db38112f15e4f54cbad26f8b0e033ad0e7197b5 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Wed, 27 Jan 2021 21:17:07 -0800 Subject: [PATCH 6/6] util-linux: remove custom pkgconfig patch Replace with sed as done elsewhere. Fixes error with at least btrfs-progs: Package '@LIBSELINUX@', required by 'mount', not found Package '@LIBCRYPTSETUP@', required by 'mount', not foun Signed-off-by: Rosen Penev Signed-off-by: Tianling Shen --- package/utils/util-linux/Makefile | 12 ++- .../patches/003-fix_pkgconfig_files.patch | 76 ------------------- 2 files changed, 11 insertions(+), 77 deletions(-) delete mode 100644 package/utils/util-linux/patches/003-fix_pkgconfig_files.patch diff --git a/package/utils/util-linux/Makefile b/package/utils/util-linux/Makefile index 31a66493e9..f4b870cc47 100644 --- a/package/utils/util-linux/Makefile +++ b/package/utils/util-linux/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=util-linux PKG_VERSION:=2.36.1 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=@KERNEL/linux/utils/$(PKG_NAME)/v2.36 @@ -534,10 +534,20 @@ TARGET_CFLAGS += $(FPIC) -std=gnu99 define Build/InstallDev $(INSTALL_DIR) $(1)/usr/lib/pkgconfig $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/blkid.pc $(1)/usr/lib/pkgconfig + $(SED) 's,/usr/include,$$$${prefix}/include,g' $(1)/usr/lib/pkgconfig/blkid.pc + $(SED) 's,/usr/lib,$$$${exec_prefix}/lib,g' $(1)/usr/lib/pkgconfig/blkid.pc $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/fdisk.pc $(1)/usr/lib/pkgconfig + $(SED) 's,/usr/include,$$$${prefix}/include,g' $(1)/usr/lib/pkgconfig/fdisk.pc + $(SED) 's,/usr/lib,$$$${exec_prefix}/lib,g' $(1)/usr/lib/pkgconfig/fdisk.pc $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/mount.pc $(1)/usr/lib/pkgconfig + $(SED) 's,/usr/include,$$$${prefix}/include,g' $(1)/usr/lib/pkgconfig/mount.pc + $(SED) 's,/usr/lib,$$$${exec_prefix}/lib,g' $(1)/usr/lib/pkgconfig/mount.pc $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/smartcols.pc $(1)/usr/lib/pkgconfig + $(SED) 's,/usr/include,$$$${prefix}/include,g' $(1)/usr/lib/pkgconfig/smartcols.pc + $(SED) 's,/usr/lib,$$$${exec_prefix}/lib,g' $(1)/usr/lib/pkgconfig/smartcols.pc $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/uuid.pc $(1)/usr/lib/pkgconfig + $(SED) 's,/usr/include,$$$${prefix}/include,g' $(1)/usr/lib/pkgconfig/uuid.pc + $(SED) 's,/usr/lib,$$$${exec_prefix}/lib,g' $(1)/usr/lib/pkgconfig/uuid.pc $(INSTALL_DIR) $(1)/usr/include/blkid $(CP) $(PKG_INSTALL_DIR)/usr/include/blkid/blkid.h $(1)/usr/include/blkid diff --git a/package/utils/util-linux/patches/003-fix_pkgconfig_files.patch b/package/utils/util-linux/patches/003-fix_pkgconfig_files.patch deleted file mode 100644 index 4797f7d159..0000000000 --- a/package/utils/util-linux/patches/003-fix_pkgconfig_files.patch +++ /dev/null @@ -1,76 +0,0 @@ ---- a/libuuid/Makemodule.am -+++ b/libuuid/Makemodule.am -@@ -4,7 +4,6 @@ include libuuid/man/Makemodule.am - include libuuid/src/Makemodule.am - - pkgconfig_DATA += libuuid/uuid.pc --PATHFILES += libuuid/uuid.pc - EXTRA_DIST += libuuid/COPYING - - endif # BUILD_LIBUUID ---- a/configure.ac -+++ b/configure.ac -@@ -2522,18 +2522,23 @@ AC_CONFIG_HEADERS([config.h]) - # - AC_CONFIG_FILES([ - Makefile -+libblkid/blkid.pc - libblkid/docs/Makefile - libblkid/docs/version.xml - libblkid/src/blkid.h -+libfdisk/fdisk.pc - libfdisk/docs/Makefile - libfdisk/docs/version.xml - libfdisk/src/libfdisk.h -+libmount/mount.pc - libmount/docs/Makefile - libmount/docs/version.xml - libmount/src/libmount.h -+libsmartcols/smartcols.pc - libsmartcols/docs/Makefile - libsmartcols/docs/version.xml - libsmartcols/src/libsmartcols.h -+libuuid/uuid.pc - po/Makefile.in - ]) - ---- a/libblkid/Makemodule.am -+++ b/libblkid/Makemodule.am -@@ -9,7 +9,6 @@ SUBDIRS += libblkid/docs - endif - - pkgconfig_DATA += libblkid/blkid.pc --PATHFILES += libblkid/blkid.pc - dist_man_MANS += libblkid/libblkid.3 - EXTRA_DIST += libblkid/COPYING - ---- a/libmount/Makemodule.am -+++ b/libmount/Makemodule.am -@@ -9,7 +9,6 @@ SUBDIRS += libmount/docs - endif - - pkgconfig_DATA += libmount/mount.pc --PATHFILES += libmount/mount.pc - EXTRA_DIST += libmount/COPYING - - endif # BUILD_LIBMOUNT ---- a/libsmartcols/Makemodule.am -+++ b/libsmartcols/Makemodule.am -@@ -9,7 +9,6 @@ SUBDIRS += libsmartcols/docs - endif - - pkgconfig_DATA += libsmartcols/smartcols.pc --PATHFILES += libsmartcols/smartcols.pc - EXTRA_DIST += libsmartcols/COPYING - - endif # BUILD_LIBSMARTCOLS ---- a/libfdisk/Makemodule.am -+++ b/libfdisk/Makemodule.am -@@ -9,7 +9,6 @@ SUBDIRS += libfdisk/docs - endif - - pkgconfig_DATA += libfdisk/fdisk.pc --PATHFILES += libfdisk/fdisk.pc - EXTRA_DIST += libfdisk/COPYING - - endif # BUILD_LIBFDISK