From 8d60dfeb9a161ba00a67f4269ca3f18ebe6e2704 Mon Sep 17 00:00:00 2001 From: Patrick McDermott Date: Fri, 06 Nov 2020 01:19:43 -0500 Subject: busybox: Depend on wolfutil for wget "OpenSSL" opkhelper-3.0 (>= 3.1.3) is needed for proper newline termination of substvars files by oh-shlibdeps. --- diff --git a/build b/build index 1bc353f..51761e6 100755 --- a/build +++ b/build @@ -95,3 +95,6 @@ install: build fi oh-installfiles oh-shlibdeps + if config_enabled FEATURE_WGET_OPENSSL; then \ + printf 'Extra-Depends: wolfutil\n' >>busybox.substvars; \ + fi diff --git a/busybox.pkg/control b/busybox.pkg/control index 250e5ea..ed9cc41 100644 --- a/busybox.pkg/control +++ b/busybox.pkg/control @@ -1,7 +1,7 @@ Architecture: any Platform: any Essential: yes -Depends: ${Shlib-Depends} +Depends: ${Shlib-Depends}, ${Extra-Depends} Description: Multi-call binary that combines many common UNIX utilities BusyBox combines tiny versions of many common UNIX utilities into a single small executable. It provides replacements for most of the utilities you diff --git a/changelog b/changelog index bc5e8e8..b425867 100644 --- a/changelog +++ b/changelog @@ -10,7 +10,8 @@ busybox (1.32.0-1) trunk . This also fixes networking on read-only root file systems. * Update Maintainer. - * busybox: Use automatic shared library dependencies. + * busybox: Use automatic shared library dependencies, and depend on + wolfutil if wget is configured to use "OpenSSL". -- Patrick McDermott Wed, 04 Nov 2020 03:58:13 -0500 diff --git a/control b/control index a8ada12..3d2df9a 100644 --- a/control +++ b/control @@ -1,5 +1,5 @@ Maintainer: Patrick McDermott -Build-Depends: opkbuild (>= 4.0.1), opkhelper-3.0 (>= 3.1.2), +Build-Depends: opkbuild (>= 4.0.1), opkhelper-3.0 (>= 3.1.3), config-busybox-${Host-Plat}, gpg, dirmngr, pkgconf, libncurses.6-dev, terminfo, -- cgit v0.9.1