Skip to content

Commit b8d17e8

Browse files
github-actions[bot]github-actions[bot]
committed
[bot] AutoMerging: merge all upstream's changes:
* https://github.com/coolsnowwolf/lede: procd: ujail upgrade patch for latest version (coolsnowwolf#10384) procd: ujail static-linked binary (coolsnowwolf#10381) tools: update versions and sync with upstream (coolsnowwolf#10380)
2 parents b57b9d3 + 39ed1b7 commit b8d17e8

File tree

16 files changed

+1605
-3702
lines changed

16 files changed

+1605
-3702
lines changed

‎config/Config-devel.in

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,13 @@ menuconfig DEVEL
5959
This allows you to symlink build_dir into a scratch location, e.g. a ramdisk,
6060
which does not have enough space to keep a complete build_dir.
6161

62+
config BUILD_ALL_HOST_TOOLS
63+
bool "Compile all host tools" if DEVEL
64+
default n
65+
help
66+
Compile all host host tools even if not needed. This is needed to prepare a
67+
universal precompiled host tools archive to use in another buildroot.
68+
6269
config BUILD_SUFFIX
6370
string "Build suffix to append to the target BUILD_DIR variable" if DEVEL
6471
default ""

‎package/system/procd/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ define Package/procd-ujail
6868
SECTION:=base
6969
CATEGORY:=Base system
7070
DEPENDS:=@KERNEL_NAMESPACES +@KERNEL_UTS_NS +@KERNEL_IPC_NS +@KERNEL_PID_NS \
71-
+libubox +libubus +libblobmsg-json
71+
+libubox +libubus +libuci +libblobmsg-json
7272
TITLE:=OpenWrt process jail helper
7373
endef
7474

‎package/system/procd/patches/001-procd_ujail_static_binary_fix.patch

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
--- a/jail/elf.c
2+
+++ b/jail/elf.c
3+
@@ -236,18 +236,18 @@ int elf_load_deps(const char *path, cons
4+
unsigned long load_offset, load_vaddr;
5+
unsigned long interp_offset;
6+
7+
- if (elf_find_section(map, PT_LOAD, &load_offset, NULL, &load_vaddr)) {
8+
- ERROR("failed to load the .load section from %s\n", path);
9+
- return -1;
10+
+ if (elf_find_section(map, PT_INTERP, &interp_offset, NULL, NULL) == 0) {
11+
+ add_path_and_deps(map+interp_offset, 1, -1, 0);
12+
}
13+
14+
- if (elf_find_section(map, PT_DYNAMIC, &dyn_offset, &dyn_size, NULL)) {
15+
- ERROR("failed to load the .dynamic section from %s\n", path);
16+
- return -1;
17+
+ if (elf_find_section(map, PT_LOAD, &load_offset, NULL, &load_vaddr)) {
18+
+ DEBUG("failed to load the .load section from %s\n", path);
19+
+ return 0;
20+
}
21+
22+
- if (elf_find_section(map, PT_INTERP, &interp_offset, NULL, NULL) == 0) {
23+
- add_path_and_deps(map+interp_offset, 1, -1, 0);
24+
+ if (elf_find_section(map, PT_DYNAMIC, &dyn_offset, &dyn_size, NULL)) {
25+
+ DEBUG("failed to load the .dynamic section from %s\n", path);
26+
+ return 0;
27+
}
28+
29+
int clazz = map[EI_CLASS];

‎tools/ccache/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ include $(TOPDIR)/rules.mk
88
include $(INCLUDE_DIR)/target.mk
99

1010
PKG_NAME:=ccache
11-
PKG_VERSION:=4.6.3
11+
PKG_VERSION:=4.7.2
1212

1313
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
1414
PKG_SOURCE_URL:=https://github.com/ccache/ccache/releases/download/v$(PKG_VERSION)
15-
PKG_HASH:=1e3a251bb112632553b8255a78661fe526c3a16598496d51128c32b218fd8b22
15+
PKG_HASH:=17ca75a577d49c1e4f2ac86d53126859de52b789cfe85dd532758518db114eaf
1616

1717
include $(INCLUDE_DIR)/host-build.mk
1818
include $(INCLUDE_DIR)/cmake.mk

‎tools/ccache/patches/100-honour-copts.patch

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
--- a/src/ccache.cpp
22
+++ b/src/ccache.cpp
3-
@@ -1756,6 +1756,7 @@ calculate_result_and_manifest_key(Contex
4-
"CPLUS_INCLUDE_PATH",
5-
"OBJC_INCLUDE_PATH",
6-
"OBJCPLUS_INCLUDE_PATH", // clang
7-
+ "GCC_HONOUR_COPTS",
8-
nullptr};
9-
for (const char** p = envvars; *p; ++p) {
10-
const char* v = getenv(*p);
3+
@@ -1762,6 +1762,7 @@ get_manifest_key(Context& ctx, Hash& hash)
4+
"CPLUS_INCLUDE_PATH",
5+
"OBJC_INCLUDE_PATH",
6+
"OBJCPLUS_INCLUDE_PATH", // clang
7+
+ "GCC_HONOUR_COPTS",
8+
nullptr};
9+
for (const char** p = envvars; *p; ++p) {
10+
const char* v = getenv(*p);

‎tools/cmake/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@
77
include $(TOPDIR)/rules.mk
88

99
PKG_NAME:=cmake
10-
PKG_VERSION:=3.24.2
10+
PKG_VERSION:=3.24.3
1111
PKG_VERSION_MAJOR:=$(word 1,$(subst ., ,$(PKG_VERSION))).$(word 2,$(subst ., ,$(PKG_VERSION)))
1212
PKG_RELEASE:=1
1313
PKG_CPE_ID:=cpe:/a:kitware:cmake
1414

1515
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
1616
PKG_SOURCE_URL:=https://github.com/Kitware/CMake/releases/download/v$(PKG_VERSION)/ \
1717
https://cmake.org/files/v$(PKG_VERSION_MAJOR)/
18-
PKG_HASH:=0d9020f06f3ddf17fb537dc228e1a56c927ee506b486f55fe2dc19f69bf0c8db
18+
PKG_HASH:=b53aa10fa82bff84ccdb59065927b72d3bee49f4d86261249fc0984b3b367291
1919

2020
HOST_BUILD_PARALLEL:=1
2121
HOST_CONFIGURE_PARALLEL:=1

‎tools/elfutils/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
include $(TOPDIR)/rules.mk
44

55
PKG_NAME:=elfutils
6-
PKG_VERSION:=0.187
6+
PKG_VERSION:=0.188
77
PKG_RELEASE:=1
88

99
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
1010
PKG_SOURCE_URL:=https://sourceware.org/$(PKG_NAME)/ftp/$(PKG_VERSION)
11-
PKG_HASH:=e70b0dfbe610f90c4d1fe0d71af142a4e25c3c4ef9ebab8d2d72b65159d454c8
11+
PKG_HASH:=fb8b0e8d0802005b9a309c60c1d8de32dd2951b56f0c3a3cb56d21ce01595dff
1212

1313
PKG_LICENSE:=GPL-3.0-or-later
1414
PKG_LICENSE_FILES:=COPYING COPYING-GPLV2 COPYING-LGPLV3

‎tools/expat/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ include $(TOPDIR)/rules.mk
99

1010
PKG_NAME:=expat
1111
PKG_CPE_ID:=cpe:/a:libexpat:expat
12-
PKG_VERSION:=2.4.9
12+
PKG_VERSION:=2.5.0
1313

1414
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
15-
PKG_HASH:=6e8c0728fe5c7cd3f93a6acce43046c5e4736c7b4b68e032e9350daa0efc0354
15+
PKG_HASH:=ef2420f0232c087801abf705e89ae65f6257df6b7931d37846a193ef2e8cdcbe
1616
PKG_SOURCE_URL:=https://github.com/libexpat/libexpat/releases/download/R_$(subst .,_,$(PKG_VERSION))
1717

1818
HOST_BUILD_PARALLEL:=1

‎tools/fakeroot/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55
include $(TOPDIR)/rules.mk
66

77
PKG_NAME:=fakeroot
8-
PKG_VERSION:=1.29
8+
PKG_VERSION:=1.30.1
99
PKG_RELEASE:=1
1010

1111
PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).orig.tar.gz
1212
PKG_SOURCE_URL:=@DEBIAN/pool/main/f/fakeroot
13-
PKG_HASH:=8fbbafb780c9173e3ace4a04afbc1d900f337f3216883939f5c7db3431be7c20
13+
PKG_HASH:=32ebb1f421aca0db7141c32a8c104eb95d2b45c393058b9435fbf903dd2b6a75
1414
PKG_LICENSE:=GPL-3.0-or-later
1515
PKG_LICENSE_FILES:=COPYING
1616
PKG_FIXUP:=autoreconf

‎tools/fakeroot/patches/600-macOS.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
#include <spawn.h>
2525
--- a/wrapfunc.inp
2626
+++ b/wrapfunc.inp
27-
@@ -48,9 +48,11 @@ getattrlist$UNIX2003;int;(const char *pa
27+
@@ -50,9 +50,11 @@ getattrlist$UNIX2003;int;(const char *pa
2828
#endif
2929
#endif
3030
#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5
@@ -36,7 +36,7 @@
3636
posix_spawn;int;(pid_t * __restrict pid, const char * __restrict path, const posix_spawn_file_actions_t *file_actions, const posix_spawnattr_t * __restrict attrp, char *const argv[ __restrict], char *const envp[ __restrict]);(pid, path, file_actions, attrp, argv, envp)
3737
posix_spawnp;int;(pid_t * __restrict pid, const char * __restrict path, const posix_spawn_file_actions_t *file_actions, const posix_spawnattr_t * __restrict attrp, char *const argv[ __restrict], char *const envp[ __restrict]);(pid, path, file_actions, attrp, argv, envp)
3838
#endif
39-
@@ -229,7 +231,7 @@ facl;int;(int fd, int cmd, int cnt, void
39+
@@ -231,7 +233,7 @@ facl;int;(int fd, int cmd, int cnt, void
4040
#ifdef HAVE_FTS_READ
4141
fts_read;FTSENT *;(FTS *ftsp);(ftsp)
4242
#ifdef __APPLE__
@@ -45,7 +45,7 @@
4545
fts_read$INODE64;FTSENT *;(FTS *ftsp);(ftsp)
4646
#endif
4747
#endif /* ifdef __APPLE__ */
48-
@@ -237,7 +239,7 @@ fts_read$INODE64;FTSENT *;(FTS *ftsp);(f
48+
@@ -239,7 +241,7 @@ fts_read$INODE64;FTSENT *;(FTS *ftsp);(f
4949
#ifdef HAVE_FTS_CHILDREN
5050
fts_children;FTSENT *;(FTS *ftsp, int options);(ftsp, options)
5151
#ifdef __APPLE__

0 commit comments

Comments
 (0)