From ae5c339f804a4a004103ed2f43265ffae7d08e4e Mon Sep 17 00:00:00 2001 From: CN_SZTL Date: Thu, 27 Aug 2020 04:19:17 +0800 Subject: [PATCH] jpcre2: bump to 10.32.01 --- package/ctcgfw/jpcre2/Makefile | 16 ++++++---------- package/ctcgfw/msgpack-c/Makefile | 2 +- package/ctcgfw/rapidjson/Makefile | 15 +++++++-------- package/ctcgfw/subconverter/Makefile | 4 ++-- package/ctcgfw/tmate/Makefile | 2 +- 5 files changed, 17 insertions(+), 22 deletions(-) diff --git a/package/ctcgfw/jpcre2/Makefile b/package/ctcgfw/jpcre2/Makefile index c3e80d76c0..1ed418d42a 100644 --- a/package/ctcgfw/jpcre2/Makefile +++ b/package/ctcgfw/jpcre2/Makefile @@ -7,21 +7,17 @@ include $(TOPDIR)/rules.mk PKG_NAME:=jpcre2 -PKG_VERSION:=10.31.03 +PKG_VERSION:=10.32.01 -PKG_SOURCE_PROTO:=git -PKG_SOURCE_URL:=https://github.com/jpcre2/jpcre2.git -PKG_SOURCE_VERSION:=709ec0e866c3ae3ac61e5683b7f9b3b6feaac3f6 -PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz -PKG_HASH:=22deb97515e48adf80383ca691229b83d13d8850f6e8b98710426b24955ae5de +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=https://codeload.github.com/jpcre2/jpcre2/tar.gz/$(PKG_VERSION)? +PKG_HASH:=e8c69a6a6f77ed8d5c35dcdfa767b155f5230a83f55d35cab837b6f0a1266ca8 +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) -PKG_LICENSE:=GPLv3 +PKG_LICENSE:=BSD 3-Clause PKG_LICENSE_FILES:=LICENSE PKG_MAINTAINER:=[CTCGFW]Project OpenWrt -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) - PKG_INSTALL:=1 PKG_FIXUP:=autoreconf PKG_USE_MIPS16:=0 diff --git a/package/ctcgfw/msgpack-c/Makefile b/package/ctcgfw/msgpack-c/Makefile index 1cd33d49cb..f59ef59ad6 100644 --- a/package/ctcgfw/msgpack-c/Makefile +++ b/package/ctcgfw/msgpack-c/Makefile @@ -15,7 +15,7 @@ PKG_SOURCE_URL:=https://codeload.github.com/msgpack/msgpack-c/tar.gz/cpp-$(PKG_V PKG_HASH:=754c3ace499a63e45b77ef4bcab4ee602c2c414f58403bce826b76ffc2f77d0b PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-cpp-$(PKG_VERSION) -PKG_LICENSE:=GPLv3 +PKG_LICENSE:=BSL-1.0 PKG_LICENSE_FILES:=LICENSE PKG_MAINTAINER:=[CTCGFW]Project OpenWrt diff --git a/package/ctcgfw/rapidjson/Makefile b/package/ctcgfw/rapidjson/Makefile index 833989970d..2faa9f3d6a 100644 --- a/package/ctcgfw/rapidjson/Makefile +++ b/package/ctcgfw/rapidjson/Makefile @@ -7,24 +7,23 @@ include $(TOPDIR)/rules.mk PKG_NAME:=rapidjson -PKG_VERSION:=20200213 +PKG_VERSION:=1.1.0-ce81bc9 PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/Tencent/rapidjson.git -PKG_SOURCE_VERSION:=a895ce150fa2d73f4ee55f8657761a6b3e96236f +PKG_SOURCE_VERSION:=ce81bc9edfe773667a7a4454ba81dac72ed4364c PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz -PKG_HASH:=bf7ced29704a1e696fbccf2a2b4ea068e7774fa37f6d7dd4039d0787f8bed98e - -PKG_LICENSE:=GPLv3 -PKG_LICENSE_FILES:=LICENSE -PKG_MAINTAINER:=[CTCGFW]Project OpenWrt +PKG_MIRROR_HASH:=1a74a411aff88bd770c80bd0b797ccb50207a64bccf7f98dbb1abf71498f3e8e PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) +PKG_LICENSE:=BSD 3-Clause +PKG_LICENSE_FILES:=LICENSE +PKG_MAINTAINER:=[CTCGFW]Project OpenWrt + PKG_INSTALL:=1 -PKG_FIXUP:=autoreconf PKG_USE_MIPS16:=0 PKG_BUILD_PARALLEL:=1 diff --git a/package/ctcgfw/subconverter/Makefile b/package/ctcgfw/subconverter/Makefile index 3bc892c54a..ea88929dd3 100644 --- a/package/ctcgfw/subconverter/Makefile +++ b/package/ctcgfw/subconverter/Makefile @@ -17,12 +17,12 @@ PKG_MIRROR_HASH:=de349763b748e80b076c1ebed87c5df80e3aa0fcead472bde768d205be5084b PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) + PKG_LICENSE:=GPLv3 PKG_LICENSE_FILES:=LICENSE PKG_MAINTAINER:=[CTCGFW]Project OpenWrt -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) - PKG_INSTALL:=1 PKG_USE_MIPS16:=0 PKG_BUILD_PARALLEL:=1 diff --git a/package/ctcgfw/tmate/Makefile b/package/ctcgfw/tmate/Makefile index 14280be1fe..2a295a4f66 100644 --- a/package/ctcgfw/tmate/Makefile +++ b/package/ctcgfw/tmate/Makefile @@ -17,7 +17,7 @@ PKG_MIRROR_HASH:=a553810a740bed3770ff94237a982c0dbddaf2efec61c61f3660f6674e8320b PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz -PKG_LICENSE:=GPLv3 +PKG_LICENSE:=ISC PKG_LICENSE_FILES:=LICENSE PKG_MAINTAINER:=[CTCGFW]Project OpenWrt