mark
/
firmware
forked from freifunk-franken/firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

treewide: Force use of busybox wget 

In OpenWrt commit 055cdab2bb22 ("uclient: add ALTERNATIVES for wget")
uclient is registered as ALTERNATIVES provider for wget. Since
the priority for busybox as provider is lowest, this overwrites
the link set for /usr/bin/wget, now pointing to uclient wget.

However, uclient wget does not support IPv6 link-local addresses,
as it's not aware of the "%" to separate address from link identifier.

To prevent wget from failing when those addresses are used, this
patch explicitly uses busybox wget.

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
Reviewed-by: Fabian Bläse <fabian@blaese.de>
This commit is contained in:
Adrian Schmutzler 2019-11-11 14:24:22 +01:00
parent 3720af5ee5
commit 40cad0a9b9
6 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/packages/fff/fff-hoods/Makefile
View File

@ -1,7 +1,7 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=fff-hoods
PKG_RELEASE:=6
PKG_RELEASE:=7
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)

10
src/packages/fff/fff-hoods/files/usr/lib/functions/fff/hoodfile
View File

@ -31,9 +31,9 @@ getWirelessHoodfile() {
# wait a moment to start the interface
sleep 10;
if wget -T15 -O "$file" "http://[fe80::1%w2sta]:2342/keyxchangev2data"; then
if /bin/busybox wget -T15 -O "$file" "http://[fe80::1%w2sta]:2342/keyxchangev2data"; then
return 0
elif wget -T15 -O "$file" "http://[fe80::1%w5sta]:2342/keyxchangev2data"; then
elif /bin/busybox wget -T15 -O "$file" "http://[fe80::1%w5sta]:2342/keyxchangev2data"; then
return 0
else
return 1
@ -57,7 +57,7 @@ getEthernetHoodfile() {
neighbor_addrs=$(ping6 -c2 ff02::1%"${ethmesh_dev}" | grep seq | grep DUP | cut -d " " -f4 | sed s/:$//g | sort -u)
for addr in $neighbor_addrs; do
wget -T2 -qO "$file" "http://[${addr}%${ethmesh_dev}]:2342/keyxchangev2data" && return 0
/bin/busybox wget -T2 -qO "$file" "http://[${addr}%${ethmesh_dev}]:2342/keyxchangev2data" && return 0
done
# got no hoodfile
@ -73,7 +73,7 @@ getGatewayHoodfile() {
echo "Trying to get hoodfile from gateway..."
if wget -T15 -O "$file" "http://[fe80::1%br-mesh]:2342/keyxchangev2data"; then
if /bin/busybox wget -T15 -O "$file" "http://[fe80::1%br-mesh]:2342/keyxchangev2data"; then
return 0
else
return 1
@ -95,7 +95,7 @@ getKeyserverHoodfile() {
echo "Getting hoodfile from Keyserver"
if wget -T15 -O "$file" "http://keyserver.freifunk-franken.de/v2/?lat=$lat&long=$long"; then
if /bin/busybox wget -T15 -O "$file" "http://keyserver.freifunk-franken.de/v2/?lat=$lat&long=$long"; then
return 0
else
return 1

2
src/packages/fff/fff-sysupgrade/Makefile
View File

@ -1,7 +1,7 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=fff-sysupgrade
PKG_RELEASE:=9
PKG_RELEASE:=10
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)

6
src/packages/fff/fff-sysupgrade/files/etc/sysupgrade.sh
View File

@ -34,7 +34,7 @@ case $BOARD in
BOARD="cpe510-520-v1" ;;
esac
wget "${UPGRADE_PATH}/release.nfo"
/bin/busybox wget "${UPGRADE_PATH}/release.nfo"
if [ ! -f release.nfo ]; then
echo "Latest release information not found. Please try to update manually."
echo ""
@ -72,8 +72,8 @@ fi
FILE="fff-${VERSION}-${SOC}-${BOARD}-sysupgrade.bin"
echo "Downloading $FILE"
echo ""
wget "${UPGRADE_PATH}/${FILE}"
wget "${UPGRADE_PATH}/${FILE}.sha256"
/bin/busybox wget "${UPGRADE_PATH}/${FILE}"
/bin/busybox wget "${UPGRADE_PATH}/${FILE}.sha256"
sum=$(sha256sum -c "${FILE}.sha256")
ret=$?

2
src/packages/fff/fff-web/Makefile
View File

@ -1,7 +1,7 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=fff-web
PKG_RELEASE:=9
PKG_RELEASE:=10
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)

2
src/packages/fff/fff-web/files/www/ssl/cgi-bin/header
View File

@ -24,7 +24,7 @@ if ( [ ! -s /tmp/fwcheck ] || [ "$(cat /tmp/fwcheck)" -lt "$NOW" ] ) && [ ! "$(u
rm -f /tmp/isupdate
NEXTUPDATE=$(($(date +%s)+86400))
echo $NEXTUPDATE > /tmp/fwcheck
/usr/bin/wget "${UPGRADE_PATH}/release.nfo" -P /tmp -T 2
/bin/busybox wget "${UPGRADE_PATH}/release.nfo" -P /tmp -T 2
VERSION=$(cat /tmp/release.nfo|awk -F: '/VERSION:/ { print $2 }')
rm -f /tmp/release.nfo
if [ "$VERSION" != "$FIRMWARE_VERSION" -a -n "$VERSION" ]; then