Skip to content

Commit

Permalink
[bot] AutoMerging: merge all upstream's changes:
Browse files Browse the repository at this point in the history
* https://github.com/coolsnowwolf/lede:
  Update to v2ray 4.27.5 version (coolsnowwolf#5403)
  v2ray-plugin: bump to 1.4.2 (coolsnowwolf#5404)
  Update Makefile (coolsnowwolf#5409)
  update n2n version to 2.8.0 (coolsnowwolf#5407)
  • Loading branch information
github-actions[bot] committed Sep 4, 2020
2 parents 0fe2b00 + 7ce9641 commit c41b316
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 7 deletions.
7 changes: 4 additions & 3 deletions package/lean/n2n_v2/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ include $(TOPDIR)/rules.mk

PKG_NAME:=n2n
PKG_SOURCE_URL:=https://github.com/ntop/n2n.git
PKG_SOURCE_VERSION:=bc0a6bf8b78c90dd902efa75891d41d2a489286e
PKG_VERSION:=2.6.0_git-$(PKG_SOURCE_VERSION)
PKG_SOURCE_VERSION:=3c983286184ebf2e06db6ccfb3223ea9430c216b
PKG_VERSION:=2.8.0_git-$(PKG_SOURCE_VERSION)
PKG_RELEASE:=1

PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
Expand All @@ -34,12 +34,13 @@ endef
define Package/n2n-edge
$(call Package/n2n/Default)
TITLE+= client (edge node)
DEPENDS+=+kmod-tun +resolveip +libopenssl
DEPENDS+=+kmod-tun +resolveip +libopenssl +libcap +libzstd
endef

define Package/n2n-supernode
$(call Package/n2n/Default)
TITLE+= server (supernode)
DEPENDS+=+libcap
endef

define Package/n2n-edge/description
Expand Down
4 changes: 2 additions & 2 deletions package/lean/v2ray-plugin/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@
include $(TOPDIR)/rules.mk

PKG_NAME:=v2ray-plugin
PKG_VERSION:=1.4.1
PKG_VERSION:=1.4.2
PKG_RELEASE:=1
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)

PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/teddysun/v2ray-plugin/tar.gz/v$(PKG_VERSION)?
PKG_HASH:=ecd53ea59dea178f75b47f399a48ce0e0d09ec9e9d866c5becf82d1ed35a7634
PKG_HASH:=4da541c2a6548be24db68ed74ee117b757b6620a9b61b5960637a71f77ad438a

PKG_LICENSE:=MIT
PKG_LICENSE_FILES:=LICENSE
Expand Down
4 changes: 2 additions & 2 deletions package/lean/v2ray/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@
include $(TOPDIR)/rules.mk

PKG_NAME:=v2ray
PKG_VERSION:=4.27.4
PKG_VERSION:=4.27.5
PKG_RELEASE:=1
PKG_BUILD_DIR:=$(BUILD_DIR)/v2ray-core-$(PKG_VERSION)

PKG_SOURCE:=v2ray-core-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/v2fly/v2ray-core/tar.gz/v$(PKG_VERSION)?
PKG_HASH:=4259e6b66b2c035054f4fe4416ba5109f3ac5f4bc82d42e6998e716f06ced531
PKG_HASH:=f289d8d85ab0851851a6e3c101226e77bed0052fd60f9185df8852b601e657f8

PKG_LICENSE:=MIT
PKG_LICENSE_FILES:=LICENSE
Expand Down

0 comments on commit c41b316

Please sign in to comment.