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:
  Rclone: bump version from 1.52.2 to 1.53.0 (coolsnowwolf#5422)
  Update Makefile (coolsnowwolf#5425)
  verysync: add more download address to avoid official changes (coolsnowwolf#5420)
  Change portainer to portainer-ce (coolsnowwolf#5431)
  UnblockNeteaseMusicGo 0.2.5 (coolsnowwolf#5429)
  • Loading branch information
github-actions[bot] committed Sep 9, 2020
2 parents c734750 + a3d51d8 commit adb5dd3
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 10 deletions.
4 changes: 2 additions & 2 deletions package/lean/UnblockNeteaseMusicGo/Makefile
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
include $(TOPDIR)/rules.mk

PKG_NAME:=UnblockNeteaseMusicGo
PKG_VERSION:=0.2.4
PKG_VERSION:=0.2.5
PKG_RELEASE:=1

PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://github.com/cnsilvan/UnblockNeteaseMusic.git
PKG_SOURCE_VERSION:=2db62fe071c9f8fbfa8bad87256f853a78bb76f1
PKG_SOURCE_VERSION:=aa1eb0186206671de9a6b4fa27d933bb306d4e25
PKG_MAINTAINER:=Silvan <cnsilvan@gmail.com>

PKG_SOURCE_SUBDIR:=$(PKG_NAME)
Expand Down
2 changes: 1 addition & 1 deletion package/lean/luci-app-docker/root/etc/docker-web
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
#!/bin/sh

docker run -d --restart=always --name="portainer" -p 9999:9000 -v /var/run/docker.sock:/var/run/docker.sock -v portainer_data:/data portainer/portainer
docker run -d --restart=always --name="portainer" -p 9999:9000 -v /var/run/docker.sock:/var/run/docker.sock -v portainer_data:/data portainer/portainer-ce
4 changes: 2 additions & 2 deletions package/lean/rclone-ng/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
include $(TOPDIR)/rules.mk

PKG_NAME:=rclone-ng
PKG_VERSION:=0.4.0
PKG_VERSION:=0.5.0
PKG_RELEASE:=1


Expand All @@ -22,7 +22,7 @@ include $(INCLUDE_DIR)/package.mk
PKG_SOURCE:=RcloneNg-v$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://github.com/ElonH/RcloneNg/releases/download/v$(PKG_VERSION)/
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
PKG_HASH:=d974d5476b89281dcc14b0081e26f286041dd799898bc6b163d349d504056bd1
PKG_HASH:=0b4916ddd0bacb5b358dc8d36b64c30f4182c0ace3eb06cda94b6578c419dcd9

define Package/$(PKG_NAME)
SECTION:=net
Expand Down
8 changes: 4 additions & 4 deletions package/lean/rclone/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,16 @@
include $(TOPDIR)/rules.mk

PKG_NAME:=rclone
PKG_VERSION:=1.52.2
PKG_VERSION:=1.53.0
PKG_RELEASE:=1

PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://github.com/rclone/rclone.git
PKG_SOURCE_DATE:=2020-06-24
PKG_SOURCE_VERSION:=d8144a7e84dc3fb4975adf1bce707a5be672fada
PKG_SOURCE_DATE:=2020-09-02
PKG_SOURCE_VERSION:=510ac341e193976171d29b8aeb81a30a37cfd2a1
PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
PKG_MIRROR_HASH:=8a6f3fd465e57f5f3b9cfe3958eeb020f72b4940bfbf4993b9580659041c3735
PKG_MIRROR_HASH:=c179138e0e8e5e54d4742622b61a22ec16f393f5a441dad02b8cb8f39de2f5a3

PKG_LICENSE:=GPLv3
PKG_MAINTAINER:=ElonH <elonhhuang@gmail.com>
Expand Down
3 changes: 2 additions & 1 deletion package/lean/verysync/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,8 @@ endif
PKG_RELEASE:=1
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
PKG_SOURCE:=$(PKG_NAME)-linux-$(PKG_ARCH_VERYSYNC)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=http://releases-cdn.verysync.com/releases/$(PKG_VERSION)/
PKG_SOURCE_URL:=http://releases-cdn.verysync.com/releases/$(PKG_VERSION)/ \
http://dl.verysync.net/$(PKG_VERSION)/
PKG_HASH:=skip

include $(INCLUDE_DIR)/package.mk
Expand Down

0 comments on commit adb5dd3

Please sign in to comment.