From c3b411e8d8bf359dfa2185c6f55c2de444e64ff5 Mon Sep 17 00:00:00 2001
From: coolsnowwolf <31687149+coolsnowwolf@users.noreply.github.com>
Date: Thu, 5 Mar 2020 22:03:41 +0800
Subject: [PATCH 1/2] luci-app-vlmcsd: Fix misspellings (#3574)
---
package/lean/luci-app-vlmcsd/po/zh-cn/vlmcsd.zh-cn.po | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package/lean/luci-app-vlmcsd/po/zh-cn/vlmcsd.zh-cn.po b/package/lean/luci-app-vlmcsd/po/zh-cn/vlmcsd.zh-cn.po
index b7a8ef6e6..63ec520c5 100644
--- a/package/lean/luci-app-vlmcsd/po/zh-cn/vlmcsd.zh-cn.po
+++ b/package/lean/luci-app-vlmcsd/po/zh-cn/vlmcsd.zh-cn.po
@@ -18,7 +18,7 @@ msgstr "基本设置"
msgid "Config File"
msgstr "配置文件"
-msgid "A KMS Serever Emulator to active your Windows or Office"
+msgid "A KMS Server Emulator to active your Windows or Office"
msgstr "KMS服务器可用于激活Windows或Office"
msgid "Vlmcsd is running."
From 07c59d0cc446af9512b32b8d4ba193dcefb6fb35 Mon Sep 17 00:00:00 2001
From: coolsnowwolf <31687149+coolsnowwolf@users.noreply.github.com>
Date: Thu, 5 Mar 2020 22:07:41 +0800
Subject: [PATCH 2/2] strace: update to version 5.5 (#3585)
commit:
b494734 strace: fix configuration options
ce8226a strace: Only allow libdw or libunwind
b55fbb6 strace: update to version 4.26
e669cf7 strace: Update to version 5.0
9ba5cd8 strace: update to version 5.3
b01305c strace: Fix build on PowerPC
9a3b10b strace: update to version 5.4
b55f68d strace: update to version 5.5
---
package/devel/strace/Makefile | 47 +++++++++++--------
...00-workaround--pt-reg-collisions-ppc.patch | 17 -------
2 files changed, 28 insertions(+), 36 deletions(-)
delete mode 100644 package/devel/strace/patches/100-workaround--pt-reg-collisions-ppc.patch
diff --git a/package/devel/strace/Makefile b/package/devel/strace/Makefile
index c4761a469..cdf4067ad 100644
--- a/package/devel/strace/Makefile
+++ b/package/devel/strace/Makefile
@@ -9,23 +9,25 @@ include $(TOPDIR)/rules.mk
include $(INCLUDE_DIR)/kernel.mk
PKG_NAME:=strace
-PKG_VERSION:=4.25
+PKG_VERSION:=5.5
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=https://strace.io/files/$(PKG_VERSION)
-PKG_HASH:=d685f8e65470b7832c3aff60c57ab4459f26ff89f07c10f92bd70ee89efac701
-
-PKG_LICENSE:=BSD-3c
-PKG_LICENSE_FILES:=COPYRIGHT
-PKG_CPE_ID:=cpe:/a:paul_kranenburg:strace
+PKG_HASH:=9f58958c8e59ea62293d907d10572e352b582bd7948ed21aa28ebb47e5bf30ff
PKG_MAINTAINER:=Felix Fietkau
+PKG_LICENSE:=LGPL-2.1-or-later
+PKG_LICENSE_FILES:=COPYING
+PKG_CPE_ID:=cpe:/a:paul_kranenburg:strace
PKG_FIXUP:=autoreconf
-PKG_CONFIG_DEPENDS:=CONFIG_PACKAGE_strace_libunwind
PKG_INSTALL:=1
+PKG_CONFIG_DEPENDS := \
+ CONFIG_STRACE_LIBDW \
+ CONFIG_STRACE_LIBUNWIND
+
include $(INCLUDE_DIR)/package.mk
HOST_CFLAGS += -I$(LINUX_DIR)/user_headers/include
@@ -44,27 +46,34 @@ define Package/strace
SECTION:=utils
CATEGORY:=Utilities
TITLE:=System call tracer
- DEPENDS:=+PACKAGE_strace_libunwind:libunwind
- URL:=http://strace.sourceforge.net/
+ URL:=https://strace.io/
+ DEPENDS:=+STRACE_LIBDW:libdw +STRACE_LIBUNWIND:libunwind
endef
define Package/strace/description
-A useful diagnostic, instructional, and debugging tool. Allows you to track what
-system calls a program makes while it is running.
+ A useful diagnostic, instructional, and debugging tool. Allows you to track what
+ system calls a program makes while it is running.
endef
define Package/strace/config
-config PACKAGE_strace_libdw
- bool "Enable stack tracing support using libdw"
- default n
-config PACKAGE_strace_libunwind
- bool "Enable stack tracing support using libunwind (experimental)"
- default n
+choice
+ prompt "stack tracing support"
+ default STRACE_NONE
+
+ config STRACE_NONE
+ bool "None"
+
+ config STRACE_LIBDW
+ bool "libdw"
+
+ config STRACE_LIBUNWIND
+ bool "libunwind (experimental)"
+endchoice
endef
CONFIGURE_ARGS += \
- --with-libdw=$(if $(CONFIG_PACKAGE_strace_libdw),yes,no) \
- --with-libunwind=$(if $(CONFIG_PACKAGE_strace_libunwind),yes,no)
+ --with-libdw=$(if $(CONFIG_STRACE_LIBDW),yes,no) \
+ --with-libunwind=$(if $(CONFIG_STRACE_LIBUNWIND),yes,no)
MAKE_FLAGS := \
CCOPT="$(TARGET_CFLAGS)"
diff --git a/package/devel/strace/patches/100-workaround--pt-reg-collisions-ppc.patch b/package/devel/strace/patches/100-workaround--pt-reg-collisions-ppc.patch
deleted file mode 100644
index e1b809deb..000000000
--- a/package/devel/strace/patches/100-workaround--pt-reg-collisions-ppc.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- a/ptrace.h
-+++ b/ptrace.h
-@@ -49,7 +49,14 @@
- # define ptrace_peeksiginfo_args XXX_ptrace_peeksiginfo_args
- #endif
-
-+#if POWERPC
-+#include
-+#define __ASSEMBLY__
-+#endif
- #include
-+#if POWERPC
-+#undef __ASSEMBLY__
-+#endif
-
- #ifdef HAVE_STRUCT_IA64_FPREG
- # undef ia64_fpreg