diff options
Diffstat (limited to 'recipes-containers/lxc/files/templates-use-curl-instead-of-wget.patch')
| -rw-r--r-- | recipes-containers/lxc/files/templates-use-curl-instead-of-wget.patch | 41 |
1 files changed, 22 insertions, 19 deletions
diff --git a/recipes-containers/lxc/files/templates-use-curl-instead-of-wget.patch b/recipes-containers/lxc/files/templates-use-curl-instead-of-wget.patch index 156df82f..e9af8335 100644 --- a/recipes-containers/lxc/files/templates-use-curl-instead-of-wget.patch +++ b/recipes-containers/lxc/files/templates-use-curl-instead-of-wget.patch @@ -1,22 +1,24 @@ -From 07890dd8ffdcd08b7be1ddbd9f56ac55482c76bb Mon Sep 17 00:00:00 2001 -From: Joakim Roubert <joakimr@axis.com> -Date: Fri, 16 Aug 2019 07:52:48 +0200 -Subject: [PATCH] Use curl instead of wget +From 3e4cb0b738649f7750413cefbcfdb2115213ad0d Mon Sep 17 00:00:00 2001 +From: Bruce Ashfield <bruce.ashfield@gmail.com> +Date: Sun, 14 Aug 2022 14:08:56 -0400 +Subject: [PATCH] download: Use curl instead of wget When curl's MIT license is preferable to wget's GPLv3. -Change-Id: I4684ae7569704514fdcc63e0655c556efcaf44f8 -Signed-off-by: Joakim Roubert <joakimr@axis.com> +Upstream-Status: Inappropriate [embedded specific] +Signed-off-by: Joakim Roubert <joakimr@axis.com> +Signed-off-by: Yanfei Xu <yanfei.xu@windriver.com> +Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> --- - templates/lxc-download.in | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) + templates/lxc-download.in | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/templates/lxc-download.in b/templates/lxc-download.in -index d7e6128..8a4b567 100644 +index a62ddf482..690307338 100755 --- a/templates/lxc-download.in +++ b/templates/lxc-download.in -@@ -74,9 +74,9 @@ cleanup() { +@@ -59,9 +59,9 @@ cleanup() { fi } @@ -28,18 +30,16 @@ index d7e6128..8a4b567 100644 return 0 fi done -@@ -85,8 +85,8 @@ wget_wrapper() { +@@ -70,7 +70,7 @@ wget_wrapper() { } download_file() { -- if ! wget_wrapper -T 30 -q "https://${DOWNLOAD_SERVER}/$1" -O "$2" >/dev/null 2>&1; then -- if ! wget_wrapper -T 30 -q "http://${DOWNLOAD_SERVER}/$1" -O "$2" >/dev/null 2>&1; then -+ if ! curl_wrapper -m 30 -s "https://${DOWNLOAD_SERVER}/$1" -o "$2" >/dev/null 2>&1; then -+ if ! curl_wrapper -m 30 -s "http://${DOWNLOAD_SERVER}/$1" -o "$2" >/dev/null 2>&1; then - if [ "$3" = "noexit" ]; then - return 1 - else -@@ -271,7 +271,7 @@ while :; do +- if ! wget_wrapper --user-agent="lxc/@PACKAGE_VERSION@ compat:${DOWNLOAD_COMPAT_LEVEL}" -T 30 -q "https://${DOWNLOAD_SERVER}/$1" -O "$2" >/dev/null 2>&1; then ++ if ! curl_wrapper -L --user-agent "lxc/@PACKAGE_VERSION@ compat:${DOWNLOAD_COMPAT_LEVEL}" -m 30 -s "https://${DOWNLOAD_SERVER}/$1" -o "$2" >/dev/null 2>&1; then + if [ "$3" = "noexit" ]; then + return 1 + else +@@ -176,7 +176,7 @@ while :; do done # Check for required binaries @@ -48,3 +48,6 @@ index d7e6128..8a4b567 100644 if ! command -V "${bin}" >/dev/null 2>&1; then echo "ERROR: Missing required tool: ${bin}" 1>&2 exit 1 +-- +2.25.1 + |