diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2010-02-10 08:58:38 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2010-02-10 09:14:30 +0000 |
| commit | a6c1f3c68b552781829eaab8166c7bac96de25b7 (patch) | |
| tree | 8342cd0b6e17c42f56a317a5ddcf5b5052d664bd /main/busybox | |
| parent | bb328568465eb4144c70829a6eecb636b705df82 (diff) | |
| download | aports-a6c1f3c68b552781829eaab8166c7bac96de25b7.tar.bz2 aports-a6c1f3c68b552781829eaab8166c7bac96de25b7.tar.xz | |
main/busybox: fix use of http proxy with wget
Patch from here:
https://bugs.busybox.net/show_bug.cgi?id=1057
fixes #264
(cherry picked from commit 05e61714674f3d4387d3d575c1a8da5aef54536d)
Diffstat (limited to 'main/busybox')
| -rw-r--r-- | main/busybox/APKBUILD | 15 | ||||
| -rw-r--r-- | main/busybox/wget-proxy-user.patch | 12 |
2 files changed, 22 insertions, 5 deletions
diff --git a/main/busybox/APKBUILD b/main/busybox/APKBUILD index 16dbdfd66..54b4f67ce 100644 --- a/main/busybox/APKBUILD +++ b/main/busybox/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=busybox pkgver=1.16.0 -pkgrel=0 +pkgrel=1 pkgdesc="Size optimized toolbox of many common UNIX utilities" url=http://busybox.net license="GPL-2" @@ -10,11 +10,12 @@ install="$pkgname.post-install $pkgname.post-upgrade" triggers="busybox.trigger:/bin /usr/bin /sbin /usr/sbin /lib/modules/*" source="http://busybox.net/downloads/$pkgname-$pkgver.tar.bz2 $pkgname-1.11.1-bb.patch + wget-proxy-user.patch busyboxconfig" -build() { - cd "$srcdir"/$pkgname-$pkgver - +_builddir="$srcdir"/$pkgname-$pkgver +prepare() { + cd "$_builddir" #patches for i in ../*.patch; do msg "Applying $i" @@ -32,13 +33,16 @@ build() { # on abuild version sed -e "s:^CONFIG_PREFIX=.*:CONFIG_PREFIX=\"$pkgdir\":" \ ../busyboxconfig > .config +} +build() { + cd "$_builddir" make silentoldconfig || return 1 make || return 1 } package() { - cd "$srcdir"/$pkgname-$pkgver + cd "$_builddir" make install DESTDIR="$pkgdir" mkdir -p "$pkgdir"/usr/sbin "$pkgdir"/usr/bin "$pkgdir"/tmp \ "$pkgdir"/var/cache/misc @@ -49,4 +53,5 @@ package() { md5sums="2130884e71a1648bfb63c3250c1d288c busybox-1.16.0.tar.bz2 4c0f3b486eaa0674961b7ddcd0c60a9b busybox-1.11.1-bb.patch +8e1c898ec233f6759bca72367ee934fd wget-proxy-user.patch 9743e7ecd48f37b0d420f64bef7fb2a8 busyboxconfig" diff --git a/main/busybox/wget-proxy-user.patch b/main/busybox/wget-proxy-user.patch new file mode 100644 index 000000000..1d0680952 --- /dev/null +++ b/main/busybox/wget-proxy-user.patch @@ -0,0 +1,12 @@ +diff --git a/networking/wget.c b/networking/wget.c +index 9d813dc..5977024 100644 +--- a/networking/wget.c ++++ b/networking/wget.c +@@ -590,6 +590,7 @@ int wget_main(int argc UNUSED_PARAM, char **argv) + if (use_proxy) { + proxy = getenv(target.is_ftp ? "ftp_proxy" : "http_proxy"); + if (proxy && proxy[0]) { ++ server.user = NULL; + parse_url(proxy, &server); + } else { + use_proxy = 0; |