🎨 Sync 2023-10-11 20:29:07

This commit is contained in:
github-actions[bot] 2023-10-11 20:29:07 +08:00
parent 11e9ae186a
commit 4d8882346f
11 changed files with 44 additions and 16 deletions

View File

@ -9,10 +9,10 @@ include $(TOPDIR)/rules.mk
include $(INCLUDE_DIR)/nls.mk
PKG_NAME:=curl
PKG_VERSION:=8.3.0
PKG_RELEASE:=12
PKG_VERSION:=8.4.0
PKG_RELEASE:=13
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=https://github.com/curl/curl/releases/download/curl-$(subst .,_,$(PKG_VERSION))/ \
https://dl.uxnr.de/mirror/curl/ \
https://curl.askapache.com/download/ \

View File

@ -8,8 +8,8 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=frp
PKG_VERSION:=0.52.0
PKG_RELEASE:=27
PKG_VERSION:=0.52.1
PKG_RELEASE:=28
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/fatedier/frp/tar.gz/v${PKG_VERSION}?

View File

@ -1369,7 +1369,7 @@ function gen_config(var)
local _, i = string.find(s, "#")
local m = string.len(s) - i + 1
local n = w:sub(m + 1)
sys.call("nft flush set inet fw4 " .. n .. "2>/dev/null")
sys.call("nft flush set inet fw4 " .. n .. " 2>/dev/null")
end)
end
end

View File

@ -1248,7 +1248,7 @@ function gen_config(var)
local _, i = string.find(s, "#")
local m = string.len(s) - i + 1
local n = w:sub(m + 1)
sys.call("nft flush set inet fw4 " .. n .. "2>/dev/null")
sys.call("nft flush set inet fw4 " .. n .. " 2>/dev/null")
end)
end
end

View File

@ -11,12 +11,12 @@ LUCI_DEPENDS:=@(x86_64||aarch64) +curl +opkg +luci-lib-ipkg +tar +coreutils +cor
LUCI_EXTRA_DEPENDS:=luci-lib-taskd (>=1.0.17)
LUCI_PKGARCH:=all
PKG_VERSION:=0.1.14-1
PKG_VERSION:=0.1.14-2
# PKG_RELEASE MUST be empty for luci.mk
PKG_RELEASE:=66
PKG_RELEASE:=67
ISTORE_UI_VERSION:=0.1.14
ISTORE_UI_RELEASE:=1
ISTORE_UI_RELEASE:=2
PKG_HASH:=skip
PKG_SOURCE_URL_FILE:=v$(ISTORE_UI_VERSION)-$(ISTORE_UI_RELEASE).tar.gz

View File

@ -227,7 +227,7 @@ function store_action(param)
local metadata = fs.readfile(metadir .. "/" .. pkg .. ".json")
if metadata ~= nil then
meta = json_parse(metadata)
meta = json_parse(metadata) or {}
end
meta.installed = false
local status = ipkg.status(metapkg)
@ -247,6 +247,20 @@ function store_action(param)
local metadata = fs.readfile(metadir .. "/" .. pkg)
if metadata ~= nil then
local meta = json_parse(metadata)
if meta == nil then
local i18n = require("luci.i18n")
local name = pkg:gsub("^(.-)%.json$", "%1")
meta = {
name = name,
title = "{ " .. name .. " }",
author = "<UNKNOWN>",
version = "0.0.0",
description = i18n.translate("This package is broken! Please reinstall or uninstall it."),
depends = {},
tags = {"broken"},
broken = true,
}
end
local metapkg = metapkgpre .. meta.name
local status = ipkg.status(metapkg)
if next(status) ~= nil then
@ -267,6 +281,11 @@ function store_action(param)
else
local meta = json_parse(fs.readfile(metadir .. "/" .. pkg .. ".json"))
local pkgs = {}
if meta == nil then
meta = {
depends = {},
}
end
if action == "upgrade" then
pkgs = meta.depends
table.insert(pkgs, metapkg)

View File

@ -6,3 +6,6 @@ msgstr "en"
msgid "iStore"
msgstr ""
msgid "This package is broken! Please reinstall or uninstall it."
msgstr ""

View File

@ -6,3 +6,6 @@ msgstr "zh-cn"
msgid "iStore"
msgstr "iStore"
msgid "This package is broken! Please reinstall or uninstall it."
msgstr "此软件包已损坏!请重新安装或卸载它。"

View File

@ -6,3 +6,6 @@ msgstr "zh-cn"
msgid "iStore"
msgstr "iStore"
msgid "This package is broken! Please reinstall or uninstall it."
msgstr "此軟體包已損壞!請重新安裝或卸載它。"

View File

@ -9,12 +9,12 @@ include $(TOPDIR)/rules.mk
include $(INCLUDE_DIR)/kernel.mk
PKG_NAME:=ppp
PKG_RELEASE:=39
PKG_RELEASE:=40
PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://github.com/paulusmack/ppp
PKG_SOURCE_DATE:=2021-01-04
PKG_SOURCE_VERSION:=c268205e1c861b8898c722a499fa4befac490dc4
PKG_SOURCE_VERSION:=1480d439ca62d17d7a8a4704194860148dc27689
PKG_MIRROR_HASH:=skip
PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>
PKG_LICENSE:=BSD-4-Clause

View File

@ -9,13 +9,13 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=redsocks2
PKG_VERSION:=test2
PKG_RELEASE:=11
PKG_VERSION:=test3
PKG_RELEASE:=12
PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://github.com/semigodking/redsocks.git
PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
PKG_SOURCE_VERSION:=005637874e40320a04242b879b65b6c239192e53
PKG_SOURCE_VERSION:=d5bce4516ecb1187d3385c9972adfb0f31e48528
PKG_MIRROR_HASH:=skip
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
PKG_MAINTAINER:=semigodking <semigodking@gmail.com>