NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

procps-ng: disable for musl libc

Browse Source 
The recent procps-ng security bump in commit 88ec06ad48 (procps-ng:
security bump to version 3.3.15) of the 2018.02.x branch, introduced use
of fopencookie() which is a GNU extension that musl version 1.1.8 does
not implement. Backporting the security fixes alone is not feasible.
Disable procps-ng for musl libc toolchains.

Propagate this dependency to procps-ng reverse dependencies that used to
allow build with musl, openvmtools and tovid.

Fixes:
http://autobuild.buildroot.net/results/eac/eac700c61e277689b46fd617b6ddcbf94b5271e5/
http://autobuild.buildroot.net/results/baa/baac54b934d5ac07d3604ae3c6016595e4d7014a/

Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
Baruch Siach 2018-07-03 14:11:33 +03:00 committed by Peter Korsgaard
parent f44524f61a
commit ad6298ce97
3 changed files with 12 additions and 5 deletions
package
openvmtools
Config.in
procps-ng
Config.in
tovid
Config.in

6
package/openvmtools/Config.in
View File

@ -6,7 +6,7 @@ config BR2_PACKAGE_OPENVMTOOLS
depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2
depends on BR2_TOOLCHAIN_HAS_NATIVE_RPC
depends on BR2_ENABLE_LOCALE
depends on !BR2_TOOLCHAIN_USES_UCLIBC
depends on BR2_TOOLCHAIN_USES_GLIBC
select BR2_PACKAGE_LIBGLIB2
select BR2_PACKAGE_LIBDNET
help
@ -47,9 +47,9 @@ comment "PAM support needs a glibc toolchain w/ dynamic library"
endif
comment "openvmtools needs a glibc or musl toolchain w/ wchar, threads, RPC, locale"
comment "openvmtools needs a glibc toolchain w/ wchar, threads, RPC, locale"
depends on BR2_i386 || BR2_x86_64
depends on BR2_USE_MMU
depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \
!BR2_TOOLCHAIN_HAS_NATIVE_RPC || !BR2_ENABLE_LOCALE || \
BR2_TOOLCHAIN_USES_UCLIBC
!BR2_TOOLCHAIN_USES_GLIBC

5
package/procps-ng/Config.in
View File

@ -2,9 +2,14 @@ config BR2_PACKAGE_PROCPS_NG
bool "procps-ng"
depends on BR2_USE_MMU # fork()
depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
depends on !BR2_TOOLCHAIN_USES_MUSL # fopencookie()
select BR2_PACKAGE_NCURSES
help
Standard informational utilities and process-handling tools.
Provides things like kill, ps, uptime, free, top, etc...
http://sourceforge.net/projects/procps-ng/
comment "procps-ng needs a glibc or uclibc toolchain"
depends on BR2_USE_MMU
depends on BR2_TOOLCHAIN_USES_MUSL

6
package/tovid/Config.in
View File

@ -8,6 +8,7 @@ config BR2_PACKAGE_TOVID
depends on BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS
depends on BR2_PACKAGE_MPLAYER_ARCH_SUPPORTS
depends on BR2_TOOLCHAIN_HAS_SYNC_4 # mplayer
depends on !BR2_TOOLCHAIN_USES_MUSL # procps-ng
# The below dependencies are runtime dependencies only
select BR2_PACKAGE_BUSYBOX_SHOW_OTHERS # procps_ng
select BR2_PACKAGE_DVDAUTHOR
@ -27,14 +28,15 @@ config BR2_PACKAGE_TOVID
http://tovid.wikia.com/wiki/Installing_tovid
comment "tovid needs a toolchain w/ threads, C++, wchar"
comment "tovid needs a glibc or uclibc toolchain w/ threads, C++, wchar"
depends on BR2_USE_MMU
depends on BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS
depends on BR2_PACKAGE_MPLAYER_ARCH_SUPPORTS
depends on BR2_TOOLCHAIN_HAS_SYNC_4
depends on !BR2_TOOLCHAIN_HAS_THREADS \
|| !BR2_INSTALL_LIBSTDCPP \
|| !BR2_USE_WCHAR
|| !BR2_USE_WCHAR \
|| BR2_TOOLCHAIN_USES_MUSL
comment "tovid depends on python or python3"
depends on !BR2_PACKAGE_PYTHON && !BR2_PACKAGE_PYTHON3