From 1db6e9e517117d7973215034380a9424e581083e Mon Sep 17 00:00:00 2001 From: Hoildkv <42310255+xq114@users.noreply.github.com> Date: Thu, 25 May 2023 15:25:24 +0800 Subject: [PATCH] update util-linux and ncurses (#2112) * update util-linux * update ncurses --- packages/n/ncurses/xmake.lua | 4 +++- packages/u/util-linux/xmake.lua | 7 ++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/packages/n/ncurses/xmake.lua b/packages/n/ncurses/xmake.lua index cbe0b55fb..5c3e4079a 100644 --- a/packages/n/ncurses/xmake.lua +++ b/packages/n/ncurses/xmake.lua @@ -1,7 +1,8 @@ package("ncurses") - set_homepage("https://www.gnu.org/software/ncurses/") + set_homepage("https://invisible-island.net/ncurses/") set_description("A free software emulation of curses.") + set_license("MIT") add_urls("https://ftpmirror.gnu.org/ncurses/ncurses-$(version).tar.gz", "https://ftp.gnu.org/pub/gnu/ncurses/ncurses-$(version).tar.gz", @@ -9,6 +10,7 @@ package("ncurses") add_versions("6.1", "aa057eeeb4a14d470101eff4597d5833dcef5965331be3528c08d99cebaa0d17") add_versions("6.2", "30306e0c76e0f9f1f0de987cf1c82a5c21e1ce6568b9227f7da5b71cbea86c9d") add_versions("6.3", "97fc51ac2b085d4cde31ef4d2c3122c21abc217e9090a43a30fc5ec21684e059") + add_versions("6.4", "6931283d9ac87c5073f30b6290c4c75f21632bb4fc3603ac8100812bed248159") add_configs("widec", {description = "Compile with wide-char/UTF-8 code.", default = true, type = "boolean"}) diff --git a/packages/u/util-linux/xmake.lua b/packages/u/util-linux/xmake.lua index 4412dd500..72e7633da 100644 --- a/packages/u/util-linux/xmake.lua +++ b/packages/u/util-linux/xmake.lua @@ -1,13 +1,15 @@ package("util-linux") - set_homepage("https://github.com/karelzak/util-linux") + set_homepage("https://github.com/util-linux/util-linux") set_description("Collection of Linux utilities.") + set_license("GPL-2.0") set_urls("https://www.kernel.org/pub/linux/utils/util-linux/v$(version).tar.xz", {version = function (version) return format("%s.%s/util-linux-%s", version:major(), version:minor(), version) end}) add_versions("2.32.1", "86e6707a379c7ff5489c218cfaf1e3464b0b95acf7817db0bc5f179e356a67b2") add_versions("2.36.2", "f7516ba9d8689343594356f0e5e1a5f0da34adfbc89023437735872bb5024c5f") + add_versions("2.39", "32b30a336cda903182ed61feb3e9b908b762a5e66fe14e43efb88d37162075cb") add_patches("2.36.2", path.join(os.scriptdir(), "patches", "2.36.2", "includes.patch"), "7274762cac2810b5f0d17ecb5ac69c7069e7ff2b880df663b7072628df0867f3") @@ -22,8 +24,10 @@ package("util-linux") add_configs("ipcrm", {description = "Enable ipcrm.", default = false, type = "boolean"}) add_configs("wall", {description = "Enable wall.", default = false, type = "boolean"}) add_configs("libuuid", {description = "Enable libuuid.", default = false, type = "boolean"}) + add_configs("libblkid", {description = "Enable libblkid.", default = false, type = "boolean"}) add_configs("libmount", {description = "Enable libmount.", default = false, type = "boolean"}) add_configs("libsmartcols", {description = "Enable libsmartcols.", default = false, type = "boolean"}) + add_configs("libfdisk", {description = "Enable libfdisk.", default = false, type = "boolean"}) add_configs("use-tty-group", {description = "Enable use-tty-group.", default = false, type = "boolean"}) add_configs("kill", {description = "Enable kill.", default = false, type = "boolean"}) add_configs("cal", {description = "Enable cal.", default = false, type = "boolean"}) @@ -38,6 +42,7 @@ package("util-linux") on_load(function (package) package:addenv("PATH", "bin") + package:addenv("PATH", "sbin") end) on_install("macosx", "linux", function (package)