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 | 36 |
1 files changed, 18 insertions, 18 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 4556293a..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 1db2db7783bd7ec2aa1da86e640019891634c659 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 +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 e8570692a..f7291b0cc 100755 +index a62ddf482..690307338 100755 --- a/templates/lxc-download.in +++ b/templates/lxc-download.in -@@ -75,9 +75,9 @@ cleanup() { +@@ -59,9 +59,9 @@ cleanup() { fi } @@ -28,18 +30,16 @@ index e8570692a..f7291b0cc 100755 return 0 fi done -@@ -86,8 +86,8 @@ wget_wrapper() { +@@ -70,7 +70,7 @@ wget_wrapper() { } download_file() { - 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 ! wget_wrapper --user-agent="lxc/@PACKAGE_VERSION@ compat:${DOWNLOAD_COMPAT_LEVEL}" -T 30 -q "http://${DOWNLOAD_SERVER}/$1" -O "$2" >/dev/null 2>&1; then -+ if ! curl_wrapper --user-agent="lxc/@PACKAGE_VERSION@ compat:${DOWNLOAD_COMPAT_LEVEL}" -m 30 -s "https://${DOWNLOAD_SERVER}/$1" -o "$2" >/dev/null 2>&1; then -+ if ! curl_wrapper --user-agent="lxc/@PACKAGE_VERSION@ compat:${DOWNLOAD_COMPAT_LEVEL}" -m 30 -s "http://${DOWNLOAD_SERVER}/$1" -o "$2" >/dev/null 2>&1; then - if [ "$3" = "noexit" ]; then - return 1 - else -@@ -277,7 +277,7 @@ while :; do ++ 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 @@ -49,5 +49,5 @@ index e8570692a..f7291b0cc 100755 echo "ERROR: Missing required tool: ${bin}" 1>&2 exit 1 -- -2.27.0 +2.25.1 |