aboutsummaryrefslogtreecommitdiffstats
path: root/package/utils/busybox
Commit message (Collapse)AuthorAgeFilesLines
* busybox: sysntpd: add trigger to reload serverAlexey Dobrovolsky2021-06-301-2/+22
| | | | | | | | | | | | | sysntpd server becomes unavailable if the index of the bound interface changes. So let's add an interface trigger to reload sysntpd. This patch also adds the ability for the sysntpd script to handle uci interface name from configuration. Fixes: 4da60500ebd2 ("busybox: sysntpd: option to bind server to iface") Signed-off-by: Alexey Dobrovolsky <dobrovolskiy.alexey@gmail.com> Reviewed-by: Philip Prindeville <philipp@redfish-solutions.com> (cherry picked from commit 88114f617ae7bffe13d19d7b9575659a3d3cd9b6)
* busybox: sysntpd: option to bind server to ifaceAlexey Dobrovolsky2021-06-271-2/+10
| | | | | | | | | | | | NTPD in busybox has option -I to bind server to IFACE. However, capabilities of the busybox are limited, the -I option cannot be repeated and only one interface can be effectively specified in it. This option is currently not configurable via UCI. The patch adds an interface option to the system config, ntp section. Also sort options for uci_load_validate alphabetically. Signed-off-by: Alexey Dobrovolsky <dobrovolskiy.alexey@gmail.com> (cherry picked from commit e12fcf0fe5597467f7cc21144e5f4da60500ebd2)
* busybox: show reproducible timestampPaul Spooren2021-05-272-4/+80
| | | | | | | | | | | | | | | | | | | | | On login busybox shows a timestamp per default contianing the build date. Since the build date isn't reproducible per default this behaviour was disabled by default via 34df4d40 "busybox: disable timestamp in version". This commit modifies busybox so that the printed timestamp reproducible using SOURCE_DATE_EPOCH and therefore shouldn't be disabled anymore. Before: BusyBox v1.33.1 () built-in shell (ash) After: BusyBox v1.33.1 (2021-05-13 09:34:34 UTC) built-in shell (ash) Signed-off-by: Paul Spooren <mail@aparcar.org> (cherry picked from commit a725382978515abfb2eb7be3bafef735dca97dbd)
* busybox: use $(AUTORELEASE) and SPDXPaul Spooren2021-05-271-6/+3
| | | | | | | | | use AUTORELEASE since BusyBox is often updaten and PKG_RELEASE is not consistently bumped. Also use SPDX license headers to be machine readable and bump the copyright year to 2021. Signed-off-by: Paul Spooren <mail@aparcar.org> (cherry picked from commit 25fdb42249aef7b5eb53675f82f0091c532bf90c)
* busybox: disable PREFER_IPV4_ADDRESSBaptiste Jonglez2021-05-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PREFER_IPV4_ADDRESS is broken on IPv6-only hosts, as it causes busybox utilities (ping, traceroute, ntpd) to forcibly use the A record instead of the AAAA record when resolving a DNS name. This obviously fails when there is no IPv4 connectivity. Since IPv6-only hosts or routers will only become more common over time, disable PREFER_IPV4_ADDRESS to support this use-case. As a side-effect, disabling PREFER_IPV4_ADDRESS changes the default resolution behaviour of busybox utilities on dual-stack hosts. Busybox utilities now simply use the order given by getaddrinfo(), so they will now prefer IPv6 addresses when resolving a name with both A and AAAA records if there is IPv6 connectivity. This is in line with RFC 6724. PREFER_IPV4_ADDRESS was likely intended to work around naive implementations of getaddrinfo() that could return AAAA records first, even on an IPv4-only host. But both musl (since 1.1.3) and glibc correctly implement RFC 6724 for getaddrinfo() and check connectivity to determine the correct order in which to return records. On IPv4-only hosts, getaddrinfo() will return A records first, so there is no need for the PREFER_IPV4_ADDRESS hack. See also: https://bugs.busybox.net/show_bug.cgi?id=12381 Fixes: FS#84 Fixes: FS#2608 References: https://github.com/openwrt/openwrt/pull/4167 Signed-off-by: Alexander Traud <pabstraud@compuserve.com> Signed-off-by: Baptiste Jonglez <git@bitsofnetworks.org> (cherry picked from commit 7fea9d9f5dd282a7049d77cc6b75e0a703ead26c)
* busybox: update to 1.33.1Nick Hainke2021-05-145-132/+3
| | | | | | | | | | | | | | | Remove backports: - 001-backport1330fix-ash-make-strdup-copy.patch - 002-backport1330fix-traceroute.patch - 005-backport-CVE-2021-28831.patch Remove upstreamed: - 010-fix-wrong-variable.patch Signed-off-by: Nick Hainke <vincent@systemli.org> [don't use $(AUTORELEASE) for now] Signed-off-by: Paul Spooren <mail@aparcar.org> (cherry picked from commit 6713fe030fca32fc3d5ad9761f3b2f96501aedd6)
* busybox: add SRV support to nslookup_lede.c patchPerry Melange2021-05-142-2/+22
| | | | | | | | | | | Add support for querying and parsing SRV DNS records to nslookup_lede.c This patch is based on http://lists.busybox.net/pipermail/busybox/2019-June/087359.html Signed-off-by: Perry Melange <isprotejesvalkata@gmail.com> [reword subject, bump PKG_RELEASE] Signed-off-by: Paul Spooren <mail@aparcar.org> (cherry picked from commit 3a359398f04f3f4c4a42d1ca274bb1a0f0303e05)
* busybox: backport fix for CVE-2021-28831Hauke Mehrtens2021-05-042-1/+53
| | | | | | | | | | This backports a fix for the low priority CVE-2021-28831: decompress_gunzip.c in BusyBox through 1.32.1 mishandles the error bit on the huft_build result pointer, with a resultant invalid free or segmentation fault, via malformed gzip data. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> (cherry picked from commit 13397b2b95b4800fb0a29c3d483fa280d10f0eb0)
* busybox: udhcpc, allow zero length dhcp optionsRussell Senior2021-03-291-0/+49
| | | | | | | This patch skips zero length DHCP options instead of failing. Signed-off-by: Russell Senior <russell@personaltelco.net> (cherry picked from commit 1c0436507156dc136d9e2668507817395434109e)
* busybox: backport fixes for 1.33.0Hannu Nyman2021-03-133-1/+67
| | | | | | | | | Backport two fixes for 1.33.0 * history file storing * traceroute command option parsing Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi> (cherry picked from commit c1f3c52564fdec85394e7c338f56df0943ce8b10)
* busybox: remove useless busybox patchesRosen Penev2021-02-143-26/+0
| | | | | | | | | The first two are useless as /bin/sh can execute those scripts just fine. Shellcheck reports no problems. Telnetd patch is useless as telnet is no longer used in OpenWrt. Signed-off-by: Rosen Penev <rosenp@gmail.com>
* busybox: update to 1.33Rosen Penev2021-02-1431-429/+255
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove stime backport. Remove static libgcc patch as upstream fixed it with BUSYBOX_DEFAULT_STATIC_LIBGCC which defauls to off. Remove date -k patch as it no longer applies. It's also pointless as busybox' hwclock utility can do the same thing. Remove ntpd patch as that seems to have been applied upstream. Add smalll patch fixing compilation with SELinux. Upstream commit 2496616b0a8d1c80cd1416b73a4847b59b9f969a renamed the variable without renaming it in the SELinux path. Refresh config and patches. Config refresh: Refresh commands, run after busybox is first built once: cd package/utils/busybox/config/ ../convert_menuconfig.pl ../../../../build_dir/target-mips_24kc_musl/busybox-default/busybox-1.33.0 cd .. ./convert_defaults.pl < ../../../build_dir/target-mips_24kc_musl/busybox-default/busybox-1.33.0/.config > Config-defaults.in Manual edits needed afterward: * Config-defaults.in: OpenWrt config symbol IPV6 logic applied to BUSYBOX_DEFAULT_FEATURE_IPV6 * Config-defaults.in: OpenWrt configTARGET_bcm53xx logic applied to BUSYBOX_DEFAULT_TRUNCATE (commit 547f1ec) * editors/Config.in: Add USE_GLIBC dependency to BUSYBOX_CONFIG_FEATURE_VI_REGEX_SEARCH (commit f141090) * shell/Config.in : change at "Options common to all shells" the symbol SHELL_ASH --> BUSYBOX_CONFIG_SHELL_ASH (discussion in http://lists.openwrt.org/pipermail/openwrt-devel/2021-January/033140.html Apparently our script does not see the hidden option while prepending config options with "BUSYBOX_CONFIG_" which leads to a missed dependency when the options are later evaluated.) * Edit Config.in files by adding quotes to sourced items in config/Config.in, networking/Config.in and util-linux/Config.in (commit 1da014f) Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> [Added comments from Hannu Nyman to commit message] Signed-off-by: Rosen Penev <rosenp@gmail.com>
* busybox: sysntpd: make use of new ubus hotplug.ntp objectDaniel Golle2021-02-084-4/+28
| | | | Signed-off-by: Daniel Golle <daniel@makrotopia.org>
* busybox: define BUSYBOX_SYM before the first useMaxim Storchak2020-12-291-4/+4
| | | | | | Since PKG_FILE_MODES relies on BUSYBOX_SYM, it should be defined early enough Signed-off-by: Maxim Storchak <m.storchak@gmail.com>
* busybox: add check for capabilities fileDaniel Golle2020-11-302-2/+2
| | | | | | | | | Similar to the previous commit adding a check to the init script of umdns, do a similar change for sysntpd, just to be on the safe side. Inspired-by: 520403cd49 ("umdns: add check for seccomp list") Signed-off-by: Daniel Golle <daniel@makrotopia.org>
* busybox: enable find -mmin support by defaultLukas Tribus2020-11-251-1/+1
| | | | | | | | | | | | | | | Enable busybox's find -mmin time support, which is extremely small, however also very useful in scripts: https://github.com/mirror/busybox/commit/72d1a2357d2168f241458e4d6cebb7589ac82f4f Comparing package sizes... Change Local Remote Package +7 229009 229002 busybox Signed-off-by: Lukas Tribus <lukas@ltri.eu> [fix commit message long line and missing size change] Signed-off-by: Paul Spooren <mail@aparcar.org>
* busybox: Let procd respawn cronBruno Randolf2020-11-122-1/+2
| | | | | | | On some systems I see the issue that crond dies after a few days. Simply letting procd respawn the process is a simple safety-net. Signed-off-by: Bruno Randolf <br1@einfach.org>
* busybox: make username consistentDaniel Golle2020-10-252-3/+3
| | | | | | | | | ntpd in packages feed had already a user 'ntp' with UID 123 declared. Rename the username of busybox-ntpd to be 'ntp' instead of 'ntpd' so it doesn't clash. Reported-by: Etienne Champetier <champetier.etienne@gmail.com> Signed-off-by: Daniel Golle <daniel@makrotopia.org>
* busybox: allow ntpd to run as non-root ntpd userDaniel Golle2020-10-254-1/+45
| | | | Signed-off-by: Daniel Golle <daniel@makrotopia.org>
* busybox: Use PKG_FILE_MODES for SUIDPaul Spooren2020-08-311-4/+5
| | | | | | | Instead of using INSTALL_SUID use the more flexible PKG_FILE_MODES variable withn the Makefile to set the SUID bit. Signed-off-by: Paul Spooren <mail@aparcar.org>
* busybox: fix typo in MakefileDaniel Golle2020-08-231-1/+1
| | | | | | | | 'conffiiles' -> 'conffiles' Fixes: 2e06f8ae24 ("busybox: add selinux variant") Reported-by: Adrian Schmutzler <freifunk@adrianschmutzler.de> Signed-off-by: Daniel Golle <daniel@makrotopia.org>
* busybox: add selinux variantPaul Spooren2020-08-233-5/+45
| | | | | | | This commit adds a `selinux` variant which comes with with a number of SELinux applets and also SELinux label support. Signed-off-by: Paul Spooren <mail@aparcar.org>
* busybox: delete redundant patchMagnus Kroken2020-08-122-14/+1
| | | | | | | | | | This problem has been fixed in upstream commit 6b6a3d9339f1c08efaa18a7fb7357e20b48bdc95. This patch now (harmlessly) adds the same definition a second time. Signed-off-by: Magnus Kroken <mkroken@gmail.com> [bump PKG_RELEASE] Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
* busybox: store applet usage messages uncompressedRui Salvaterra2020-07-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The rootfs squashfs is already highly (XZ) compressed. Storing the applet messages in compressed form will increase the entropy and reduce the overall image compression ratio. Size diffs (compressed vs uncompressed): busybox (the executable): 364596 vs 384804 bytes. OpenWrt target images (the kernel image is unchanged, obviously): omnia-medkit-openwrt-mvebu-cortexa9-cznic_turris-omnia-initramfs.tar.gz: 9163597 vs 9162531 bytes (1066 bytes difference). openwrt-mvebu-cortexa9-cznic_turris-omnia-initramfs-kernel.bin: 9161688 vs 9160600 bytes (1088 bytes difference). openwrt-mvebu-cortexa9-cznic_turris-omnia-sysupgrade.img.gz: 9729550 vs 9729230 bytes (320 bytes difference). All in all, we save just a little bit over 1 kiB. As an added bonus, we also don't have to decompress the messages twice, (first from squashfs, then from the bzip2 message storage). Signed-off-by: Rui Salvaterra <rsalvaterra@gmail.com> [added additional size comparision diff detaisl] Signed-off-by: Petr Štetiar <ynezz@true.cz>
* busybox: use CLOCK_MONOTONIC instead of gettimeofdayRui Salvaterra2020-07-111-1/+1
| | | | | | | | | | | The clock_gettime(CLOCK_MONOTONIC) syscall exists for so long that the first kernel version to support it is not even specified in the man page [1]. Let's enable it on BusyBox by default. Otherwise, gettimeofday will be used instead, which will give wrong results if the date/time is reset (time moving backwards). [1] https://linux.die.net/man/2/clock_gettime Signed-off-by: Rui Salvaterra <rsalvaterra@gmail.com>
* busybox: backport Remove stime() function callsHauke Mehrtens2020-04-181-0/+84
| | | | | | | glibc 2.31 does not provide stime() any more, backport a fix from current busybox master to avoid using this function. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
* busybox: quote 'source' filenames in Config.inEneas U de Queiroz2020-04-093-24/+24
| | | | | | | Newer versions of the kconfig program requires quoting the arguments of the 'source' directive. These are the last ones not using them. Signed-off-by: Eneas U de Queiroz <cotequeiroz@gmail.com>
* busybox: enable truncate on bcm53xx targetRafał Miłecki2020-03-211-0/+1
| | | | | | | It's needed for optimized sysupgrade. On host machine this change increased busybox size by 4096 B. Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
* busybox: fix build issuesJohn Crispin2020-01-151-1/+3
| | | | | Fixes: f704f97e4c57 ("busybox: Include hdparm by default on nas type device") Signed-off-by: John Crispin <john@phrozen.org>
* busybox: Include hdparm by default on nas type deviceLinus Walleij2020-01-151-0/+3
| | | | | | | | | NAS devices certainly need to have hdparm to configure things like spin-down time or their disks will be constantly spinning. Just catenate CONFIG_HDPARM=y on these configs. Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
* busybox: add glibc dependency for vi regex optionSatadru Pramanik2019-11-301-1/+2
| | | | | | | | | | | | | | | | | | Build with musl libc fails with BUSYBOX_DEFAULT_FEATURE_VI_REGEX_SEARCH enabled. Enabling BusyBox's vi regex search option depends upon GNU regex. Musl libc does not support GNU regex[1]. So this patch adds explicit dependency on GNU libc and while at it remove the FIXME comment. 1. https://wiki.musl-libc.org/functional-differences-from-glibc.html Ref: https://dev.archive.openwrt.org/ticket/21741.html Ref: https://forum.openwrt.org/t/busybox-not-compiling/ Ref: https://github.com/openwrt/packages/issues/4453 Signed-off-by: Satadru Pramanik <satadru@umich.edu> [commit subject/description tweaks, From: fix, USE_GLIBC fix, removed comments] Signed-off-by: Petr Štetiar <ynezz@true.cz>
* busybox: update to 1.31.1Hannu Nyman2019-11-091-2/+2
| | | | | | | | | | | Update busybox to 1.31.1 Small bug fix release. Fixes for dc, ash (PS1 expansion fix), hush, dpkg-deb, telnet and wget. No need to refresh patches or config. Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
* busybox: disable default config option FEATURE_SUID=yHenrique de Moraes Holschuh2019-11-071-1/+1
| | | | | | | | | | | | | | | | | | | | | Commit ad7c6102f209 ("busybox: fix missing install with suid bit set if FEATURE_SUID=y") actually fixes BUSYBOX_CONFIG_FEATURE_SUID option and thus would install busybox setuid root by default which would result in possibly unwanted change of current behaviour, so let's disable this option by default in order to preserve the current status-quo. For the record: disabling FEATURE_SUID to preserve the status-quo does *not* imply the current status-quo is "safer", or for that matter, in any way desireable. That is a discussion to be had on the mailing lists. Switching the FEATURE_SUID default to "n" is simply a compromise to facilitate the merge of the changes that unbreak FEATURE_SUID. Ref: PR#2502 Signed-off-by: Henrique de Moraes Holschuh <henrique@nic.br> [commit title/description facelift] Signed-off-by: Petr Štetiar <ynezz@true.cz>
* busybox: fix missing install with suid bit set if FEATURE_SUID=yHenrique de Moraes Holschuh2019-11-071-0/+3
| | | | | | | | | | | | | | | | | | | | With FEATURE_SUID=y one can install busybox binary belonging to root with the suid bit set, enabling some applets to perform root-level operations even when run by ordinary users. Busybox then drops privileges for applets that don't need root access, before entering their main() function. Currently we don't install busybox binary with suid bit set, rendering this feature unusable. Note that we can't just "chmod u+s /bin/busybox" at runtime as a "cheaper" solution: it would waste approximately 200KiB of FLASH (the whole /bin/busybox binary gets copied into the overlay). Ref: PR#2502 Signed-off-by: Henrique de Moraes Holschuh <henrique@nic.br> [commit title/description facelift, use INSTALL_SUID variable] Signed-off-by: Petr Štetiar <ynezz@true.cz>
* busybox: enable swapon/off by default to make it consistent with mkswapEmil Muratov2019-07-071-4/+4
| | | | | | | | | No size increase on busybox binary. Since busybox mkswap is already enabled by default it seems reasonable to enable swapon/off too. For ex. this obsoletes installing block-mount dependency for zram-swap. Signed-off-by: Emil Muratov <gpm@hotplug.ru>
* busybox: update to 1.31.0Hannu Nyman2019-06-1515-237/+81
| | | | | | | | | | | | | | | | | | | | | | * Update busybox to version 1.31.0. New applets: ts, i2ctransfer New (restored) feature: error/info levels in syslog messages. Leave new features disabled by default. * Refresh patches * Remove patch that was backported from upstream Config refreshed with commands below, after which the OpenWrt specific config defaults (ipv6, login session child) were corrected: make package/busybox/compile (to populate the build_dir) cd package/utils/busybox/config/ ../convert_menuconfig.pl ../../../../build_dir/target-mips_24kc_musl/busybox-1.31.0 cd package/utils/busybox ./convert_defaults.pl < ../../../build_dir/target-mips_24kc_musl/busybox-1.31.0/.config > Config-defaults.in Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
* busybox: strip off ALTERNATIVES specYousong Zhou2019-06-141-19/+3
| | | | | | | Now that busybox is a known alternatives provider by opkg, we remove the ALTERNATIVES spec and add a note to make the implicit situation clear Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
* busybox: add ALTERNATIVES for brctlKonstantin Demin2019-06-081-1/+2
| | | | | | | | Busybox brctl applet conflicts with the version from bridge-utils. Fix this by using ALTERNATIVE support for brctl in busybox. Signed-off-by: Konstantin Demin <rockdrilla@gmail.com> Signed-off-by: Hans Dedecker <dedeckeh@gmail.com> [PKG_RELEASE increase]
* busybox: fix: ip addr flush hangs when run by non-root userMikael Magnusson2019-05-282-1/+215
| | | | | | | | | | | | | Add upstream patch from: https://git.busybox.net/busybox/commit/?id=028c5aa18b5273c029f0278232d922ee1a164de6 The patch fixes a problem with an infinite loop causing 100% CPU usage when running the following command /lib/preinit/10_indicate_preinit without the CAP_NET_ADMIN capability (such as in Docker): ip -4 address flush dev $pi_ifname Signed-off-by: Mikael Magnusson <mikma@users.sourceforge.net> Signed-off-by: Hans Dedecker <dedeckeh@gmail.com> [refresh patch]
* busybox: add missing install dirHans Dedecker2019-03-111-1/+2
| | | | | | | | Add missing /usr/sbin install dir fixing : install: cannot create regular file 'build_dir/target-x86_64_musl/busybox-1.30.1/.pkgdir/busybox/usr/sbin/ntpd-hotplug': No such file or directory Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
* busybox: sync Config.in filesYousong Zhou2019-03-0125-825/+1225
| | | | | | | | | | | | | | The change was made with the following commands cd package/utils/busybox/config ../convert_menuconfig.pl ~/git-repo/openwrt/openwrt/build_dir/target-mips_24kc_musl/busybox-1.30.1 convert_defaults.pl has no changes other than overwriting defaults for BUSYBOX_DEFAULT_FEATURE_IPV6 Resolves FS#2146 Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
* busybox: unindent busybox Config.inYousong Zhou2019-03-0124-2267/+2267
| | | | | | | | | | | | | This is to align with upstream change 72089cf ("config: deindent all help texts") and to make the follow-up change syncing Config.in files with current busybox version more reviewable It was made with the following commands cd package/utils/busybox/config find . -name 'Config.in' | xargs sed -ir -e 's/^\t \([^ ]\)/\t\1/' Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
* busybox: update to 1.30.1Hannu Nyman2019-02-141-3/+3
| | | | | | | | | | | | | Minor bugfix release. Fixes for * bc/dc * sed (backslash parsing for 'w' command) * ip (vlan fixes) * grep (fixes for -x -v) * ls (-i compat) No need to refresh patches or config defaults Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
* busybox: keep syslog.conf during sysupgradeVal Kulkov2019-01-301-0/+6
| | | | | | | | | | | | | If a user finds that logd is too barebone for their needs and wishes to have more control over syslog, the user presently has an option to enable CONFIG_BUSYBOX_CONFIG_FEATURE_SYSLOG and configure syslog with settings in /etc/syslog.conf. Presently /etc/syslog.conf silently disappears on sysupgrade. This patch prevents such unwanted behaviour if busybox syslog is enabled via CONFIG_BUSYBOX_CONFIG_FEATURE_SYSLOG. Signed-off-by: Val Kulkov <val.kulkov@gmail.com>
* librpc: remove packageAndy Walsh2019-01-224-31/+2
| | | | | | | | | * replaced with packages/libtirpc * remove busybox options rarely used/deprecated BUSYBOX_CONFIG_FEATURE_MOUNT_NFS BUSYBOX_CONFIG_FEATURE_INETD_RPC Signed-off-by: Andy Walsh <andy.walsh44+github@gmail.com>
* busybox: handle crypt() errors in loginutilsJo-Philipp Wich2019-01-222-1/+54
| | | | | | | | | | | | | | | | The crypt(3) function is allowed to fail with either EINVAL or ENOSYS when the given salt is either invalid or when the requested algorithm is not implemented. In such a case, libbb's pw_encrypt() function will silently convert the crypt() NULL return value into an empty string which is then processed without further errors by utilities such as chpasswd or passwd, causing them to set an empty password when an unsupported cipher is requested. Patch the relevant users of pw_encrypt() to abort in case an empty hash is returned by pw_encrypt() in order to mitigate the problem. Signed-off-by: Jo-Philipp Wich <jo@mein.io>
* procd: Add wrapper for uci_validate_section()Jeffery To2019-01-221-4/+8
| | | | | | | | | | | | | | | | | This adds a wrapper (uci_load_validate) for uci_validate_section() that allows callers (through a callback function) to access the values set by uci_validate_section(), without having to manually declare a (potentially long) list of local variables. The callback function receives two arguments when called, the config section name and the return value of uci_validate_section(). If no callback function is given, then the wrapper exits with the value returned by uci_validate_section(). This also updates several init scripts to use the new wrapper function. Signed-off-by: Jeffery To <jeffery.to@gmail.com>
* busybox: fix ALTERNATIVES alphabetical orderingHans Dedecker2019-01-131-2/+2
| | | | | | | Commit 3f0eb71dae added ALTERNATIVES for wget but not in correct alphabetical order; increase PKG_RELEASE as well. Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
* busybox: add ALTERNATIVES for wgetHans Dedecker2019-01-131-0/+1
| | | | | | | Busybox wget applet conflicts with the version from uclient. Fix this by using ALTERNATIVE support for wget in busybox. Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
* busybox: Add ALTERNATIVES for findutilsDaniel F. Dickinson2019-01-031-1/+3
| | | | | | | | | | | | Currently busybox find and xargs conflict with the versions from findutils package. Fix this by using ALTERNATIVES in busybox and the related findutils (from packages feed) commit. The conflict is due to the binaries being in the the same place in rootfs and opkg not being happy about that. Signed-off-by: Daniel F. Dickinson <cshored@thecshore.com> Signed-off-by: Hans Dedecker <dedeckeh@gmail.com> [PKG_RELEASE increase]