diff options
| author |   Sergey Popov <pinkbyte@gentoo.org> | 2022-01-21 12:02:19 +0300 |
|---|---|---|
| committer | Sergey Popov <pinkbyte@gentoo.org> | 2022-01-21 12:05:39 +0300 |
| commit | b678ff1362a8416e109899b4794446c8380dbd5f (patch) | |
| tree | 5306685df69b7e6adbaccbe94f99161d5997b203 /sys-apps/proot/files | |
| parent | dev-python/blessed: mark ALLARCHES (diff) | |
| download | gentoo-b678ff1362a8416e109899b4794446c8380dbd5f.tar.gz gentoo-b678ff1362a8416e109899b4794446c8380dbd5f.tar.bz2 gentoo-b678ff1362a8416e109899b4794446c8380dbd5f.zip | |
sys-apps/proot: version bump
Closes: https://bugs.gentoo.org/716836
Closes: https://bugs.gentoo.org/829854
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Sergey Popov <pinkbyte@gentoo.org>
Diffstat (limited to 'sys-apps/proot/files')
| -rw-r--r-- | sys-apps/proot/files/proot-5.3.0-lib-paths-fix.patch | 21 | ||||
| -rw-r--r-- | sys-apps/proot/files/proot-5.3.0-makefile.patch | 11 |
2 files changed, 32 insertions, 0 deletions
diff --git a/sys-apps/proot/files/proot-5.3.0-lib-paths-fix.patch b/sys-apps/proot/files/proot-5.3.0-lib-paths-fix.patch new file mode 100644 index 000000000000..188caa4eaf41 --- /dev/null +++ b/sys-apps/proot/files/proot-5.3.0-lib-paths-fix.patch @@ -0,0 +1,21 @@ +--- a/src/execve/ldso.c 2022-01-21 11:42:37.539816477 +0300 ++++ b/src/execve/ldso.c 2022-01-21 11:42:40.490817464 +0300 +@@ -506,18 +506,10 @@ + /* 6. /lib, /usr/lib + /usr/local/lib */ + if (IS_CLASS32(elf_header)) + status = add_host_ldso_paths(host_ldso_paths, +-#if defined(ARCH_X86) || defined(ARCH_X86_64) +- "/lib/i386-linux-gnu:/usr/lib/i386-linux-gnu:" +-#endif + "/lib32:/usr/lib32:/usr/local/lib32" + ":/lib:/usr/lib:/usr/local/lib"); + else + status = add_host_ldso_paths(host_ldso_paths, +-#if defined(ARCH_X86_64) +- "/lib/x86_64-linux-gnu:/usr/lib/x86_64-linux-gnu:" +-#elif defined(ARCH_ARM64) +- "/lib/aarch64-linux-gnu:/usr/lib/aarch64-linux-gnu:" +-#endif + "/lib64:/usr/lib64:/usr/local/lib64" + ":/lib:/usr/lib:/usr/local/lib"); + if (status < 0) diff --git a/sys-apps/proot/files/proot-5.3.0-makefile.patch b/sys-apps/proot/files/proot-5.3.0-makefile.patch new file mode 100644 index 000000000000..15d7fc916b0e --- /dev/null +++ b/sys-apps/proot/files/proot-5.3.0-makefile.patch @@ -0,0 +1,11 @@ +--- a/src/GNUmakefile 2022-01-21 11:40:00.957743804 +0300 ++++ b/src/GNUmakefile 2022-01-21 11:40:34.876741798 +0300 +@@ -21,8 +21,8 @@ + HAS_PYTHON_CONFIG := $(shell ${PYTHON}-config --ldflags ${PYTHON_EMBED} 2>/dev/null) + + CPPFLAGS += -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -I. -I$(VPATH) +-CFLAGS += -g -Wall -Wextra -O2 ++CFLAGS += -Wall -Wextra + CFLAGS += $(shell pkg-config --cflags talloc libarchive) + LDFLAGS += -Wl,-z,noexecstack + LDFLAGS += $(shell pkg-config --libs talloc libarchive) |