diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2016-09-27 20:35:02 +0200 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2016-09-27 20:36:29 +0200 |
| commit | 380c607492fcd9f09d104653b664a26c4b048ff5 (patch) | |
| tree | 78f9bf23af5cb879ad99ed789492fb46af7ee8fb /main/alpine-conf | |
| parent | 5ba959bf43bef497d4256c4201890f473bc7b601 (diff) | |
| download | aports-380c607492fcd9f09d104653b664a26c4b048ff5.tar.bz2 aports-380c607492fcd9f09d104653b664a26c4b048ff5.tar.xz | |
main/alpine-conf: dont reset http_proxy in setup-apkrepos
ref #6219
Diffstat (limited to 'main/alpine-conf')
| -rw-r--r-- | main/alpine-conf/0001-setup-apkrepos-dont-reset-http_proxy.patch | 27 | ||||
| -rw-r--r-- | main/alpine-conf/APKBUILD | 12 |
2 files changed, 35 insertions, 4 deletions
diff --git a/main/alpine-conf/0001-setup-apkrepos-dont-reset-http_proxy.patch b/main/alpine-conf/0001-setup-apkrepos-dont-reset-http_proxy.patch new file mode 100644 index 0000000000..6d364b2ba5 --- /dev/null +++ b/main/alpine-conf/0001-setup-apkrepos-dont-reset-http_proxy.patch @@ -0,0 +1,27 @@ +From a41ef9ab9680ec37588620f38667be22b07c0994 Mon Sep 17 00:00:00 2001 +From: Natanael Copa <ncopa@alpinelinux.org> +Date: Tue, 27 Sep 2016 20:32:29 +0200 +Subject: [PATCH] setup-apkrepos: dont reset http_proxy + +it is likely needed if it is set. + +ref #6219 +--- + setup-apkrepos.in | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/setup-apkrepos.in b/setup-apkrepos.in +index 136dcf8..5a109a2 100644 +--- a/setup-apkrepos.in ++++ b/setup-apkrepos.in +@@ -44,7 +44,6 @@ time_cmd() { + } + + find_fastest_mirror() { +- export http_proxy= + local url= + local arch=$(apk --print-arch) + for url in $MIRRORS; do +-- +2.10.0 + diff --git a/main/alpine-conf/APKBUILD b/main/alpine-conf/APKBUILD index 77fccbc916..83203b0b37 100644 --- a/main/alpine-conf/APKBUILD +++ b/main/alpine-conf/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=alpine-conf pkgver=3.4.1 -pkgrel=4 +pkgrel=5 pkgdesc="Alpine configuration management scripts" url=http://git.alpinelinux.org/cgit/$pkgname arch="all" @@ -14,6 +14,7 @@ source="http://dev.alpinelinux.org/archive/alpine-conf/alpine-conf-$pkgver.tar.x 0004-update-kernel-new-options-hostkeys-and-repositories-.patch 0005-update-kernel-fix-bad-typo.patch 0006-update-kernel-don-t-use-local-in-non-function-scope.patch + 0001-setup-apkrepos-dont-reset-http_proxy.patch " _builddir="$srcdir"/$pkgname-$pkgver @@ -36,18 +37,21 @@ f81a04a5a485af48f86c8ef5d6f90e4e 0002-update-kernel-fix-find-unpaired.patch 90583a6d73a6ea87f154dd185f41e342 0003-update-kernel-improve-dtb-handling.patch 2e59f13898466248c883bf22251b40c8 0004-update-kernel-new-options-hostkeys-and-repositories-.patch 89cbbf3c2547c6872e0d7a66b587d12e 0005-update-kernel-fix-bad-typo.patch -87000d49a605a2be278334e76327699f 0006-update-kernel-don-t-use-local-in-non-function-scope.patch" +87000d49a605a2be278334e76327699f 0006-update-kernel-don-t-use-local-in-non-function-scope.patch +f11f475130413e874f0f2589e38100c6 0001-setup-apkrepos-dont-reset-http_proxy.patch" sha256sums="92c5cbb8078c2ee8ed9e9e749acb40f6cd69a3fbb5e49429abeff2282228f697 alpine-conf-3.4.1.tar.xz 50e9657d45d223abb323d71a00960e502f3fa75ace504ea7460b06ce9b8c1022 0001-update-kernel-fix-rpi-missing-overlays.patch 5df2436b9989797200a488a482a69db25052677b02090213a8db1ed6a2cfb1dd 0002-update-kernel-fix-find-unpaired.patch b1254df25cd50fb9018018f91969636fd0e05cc42fe8e6432c6e0f50b40a932e 0003-update-kernel-improve-dtb-handling.patch 4a07ccc8ba58faa5a82f33b644c6f572c73467eae8fc388a617b76657c026bf9 0004-update-kernel-new-options-hostkeys-and-repositories-.patch c3121d70ca93950a72d8793bd35c580f432cab8b1c4513974f64c8a6807bcf73 0005-update-kernel-fix-bad-typo.patch -38953da68a928002bd532fb0b46d945b0d1494b7fa12b89686fe0e9a9def0cf8 0006-update-kernel-don-t-use-local-in-non-function-scope.patch" +38953da68a928002bd532fb0b46d945b0d1494b7fa12b89686fe0e9a9def0cf8 0006-update-kernel-don-t-use-local-in-non-function-scope.patch +9c26545470dc1578f99b39de9d481f96ee7d54b232f819d98da16c9ee0ce1aa3 0001-setup-apkrepos-dont-reset-http_proxy.patch" sha512sums="eda1640e146727edf35713039143f6db4bb485ad34236f21a837f80f09bc27b38cae3e854310eb3a4d8b937766f3e8aab0cf887849bbf385f7f511d24e19cb30 alpine-conf-3.4.1.tar.xz be3164c3b85194040820ca6ad7f1f44749dd188d3852401c1090a452cd9ce8eadcc1a8c12aad6d480565f93a4313df7f6de96b297046a3017754d812c0bb339b 0001-update-kernel-fix-rpi-missing-overlays.patch e8ce37849ae3e9473c4ad234ab186f332b3514f05b70fb32c08ca95ffc3b44d959c48e8920acda5f735a01bfb1c0523a04d6668ef27755096f485412c2a7ff5f 0002-update-kernel-fix-find-unpaired.patch 5f7396e43fcc21809bac8c232d84bf827aaf1a925c83ceae2e73f68c822466bfc6cbe332f129996d887e115a7ff9d6f5067441dfe01dccb02dbfc9eeb16a5b9e 0003-update-kernel-improve-dtb-handling.patch 77833b9b8d6b278cd89bff4de0e05474d3191917e330e51fe6baa03bb682b853417bb92307bf66f8f9ba8c726fbe6d6e7ec816e2e3dda354bcc2c3531ccf8b66 0004-update-kernel-new-options-hostkeys-and-repositories-.patch a256633bbadae595288fe4c9b26bfb71ae5f085a21ba1dbdd449a272ab1fdd50d44dd2dfe451c5d3e9fe0ceb1acd5c2bb3949edd0f51749b13b0890a5298c8b9 0005-update-kernel-fix-bad-typo.patch -3c0854466e7994bcde959c9e5880241d87d78aa27a8a787eab7290311fccaee230c1480c77991dcf99a252c328ae6db2286d1d7f22c7c3042b9a8d79ff730be7 0006-update-kernel-don-t-use-local-in-non-function-scope.patch" +3c0854466e7994bcde959c9e5880241d87d78aa27a8a787eab7290311fccaee230c1480c77991dcf99a252c328ae6db2286d1d7f22c7c3042b9a8d79ff730be7 0006-update-kernel-don-t-use-local-in-non-function-scope.patch +c4375cb531d5bc5d6bf0fa8d0eda5e4f996c6ebacc71398bc523e7463e9437aeba237d9c99f3038a4cb6f84e070f77725b0e672d800c03dd93821ad31100d408 0001-setup-apkrepos-dont-reset-http_proxy.patch" |