diff options
| author | Timo Teräs <timo.teras@iki.fi> | 2014-08-23 01:46:51 +0300 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2014-08-23 01:48:31 +0300 |
| commit | b0b84f80cb17870c57490698e092b0fd8226617c (patch) | |
| tree | 4d483c6d72f9bdd7dbf68afeeddffc7c9452457e /main/busybox | |
| parent | 9e91737b0ea5431803f4af3c657d05abadb15e4b (diff) | |
| download | aports-b0b84f80cb17870c57490698e092b0fd8226617c.tar.bz2 aports-b0b84f80cb17870c57490698e092b0fd8226617c.tar.xz | |
main/busybox: fix diff --no-dereference patch
Diffstat (limited to 'main/busybox')
| -rw-r--r-- | main/busybox/0001-diff-add-support-for-no-dereference.patch | 2 | ||||
| -rw-r--r-- | main/busybox/APKBUILD | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/main/busybox/0001-diff-add-support-for-no-dereference.patch b/main/busybox/0001-diff-add-support-for-no-dereference.patch index 6a9146337..a611e8a38 100644 --- a/main/busybox/0001-diff-add-support-for-no-dereference.patch +++ b/main/busybox/0001-diff-add-support-for-no-dereference.patch @@ -46,7 +46,7 @@ index a78a0ee..a0203af 100644 list[i].len = strlen(p[i]); - recursive_action(p[i], ACTION_RECURSE | ACTION_FOLLOWLINKS, + recursive_action(p[i], ACTION_RECURSE | -+ (option_mask32 & FLAG(no_deref)) ? 0 : ACTION_FOLLOWLINKS, ++ ((option_mask32 & FLAG(no_deref)) ? 0 : ACTION_FOLLOWLINKS), add_to_dirlist, skip_dir, &list[i], 0); /* Sort dl alphabetically. * GNU diff does this ignoring any number of trailing dots. diff --git a/main/busybox/APKBUILD b/main/busybox/APKBUILD index 4309e911b..a0c76b1a9 100644 --- a/main/busybox/APKBUILD +++ b/main/busybox/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=busybox pkgver=1.22.1 -pkgrel=12 +pkgrel=13 pkgdesc="Size optimized toolbox of many common UNIX utilities" url=http://busybox.net arch="all" @@ -134,7 +134,7 @@ d372d376820957fd5f2aee158af9867e 0001-sendmail-make-f-optional-document-its-def 239dbe5dae5d36bbf73548b2749a22b1 0001-linedit-deluser-use-POSIX-getpwent-instead-of-getpwe.patch 7cadebb1071d648b947cfbcca9839721 0001-top-fix-and-merge-code-to-parse-proc-meminfo.patch f2821edec523aadb36c3973d14386c1c fix-top.patch -118f82083ca2c9f8729800b9ee8e1475 0001-diff-add-support-for-no-dereference.patch +69fa40bee9abec058427bf67fde1b61e 0001-diff-add-support-for-no-dereference.patch 2fe6e74affe7d4e5e112035cead59432 busyboxconfig befaac2c59c380e36a452b3f1c1d4a3a glibc.patch" sha256sums="ae0b029d0a9e4dd71a077a790840e496dd838998e4571b87b60fed7462b6678b busybox-1.22.1.tar.bz2 @@ -157,7 +157,7 @@ a31ce8bcb8b81b20e80ffa407600a530d085806c6471f4e4249fcb3a491b79ef busybox-uname- ac2cd5fed91bfaec22ed1f2766396d0feb29b9b96f20b2c12d5d8ac8769afae9 0001-linedit-deluser-use-POSIX-getpwent-instead-of-getpwe.patch 79c6e19853a4ceecfec65311e5f8e66033243b8250829c06420d27d8240f1775 0001-top-fix-and-merge-code-to-parse-proc-meminfo.patch d4673907d58ce80e78a3bfe3c2414b15e7a2b072cfea0c87c2ae9f709744b9ec fix-top.patch -f2b0218c2c77369ce2d0f208dd4222d7552bcffb5e96296452891cdb504adce0 0001-diff-add-support-for-no-dereference.patch +70180473e3939402e460b25de8273a5ce7f62b130a9efe31f33d847b2406ac92 0001-diff-add-support-for-no-dereference.patch 9bfb197fb57f9b3ac5b7a8800dfda6e5f7bee10db5e892d58176fa3733fe5229 busyboxconfig c604ef791c31d35a8c5ee4558d21428a46f37a6d762c4a7e29864f4037fc44a0 glibc.patch" sha512sums="3e99fe373d638f714c3a61e1b02493d85ca532f472df038f7557db518ded38347072882ed568852941be7aac46fc34007257b4287375335ff5a09b60b295ce80 busybox-1.22.1.tar.bz2 @@ -180,6 +180,6 @@ d466676cd2779ff33f288bb073aa2baa4f3606cf8b96ec514e624a7acb46442a2839ef18c47e19cc 6781b10ca078296b243373d2c3f2bca2507a9df18a6b06d051e9ce84ed31a238aef3b2bb085daf12b145550be68c07c854272bd78a6f77da9197779b9c7cd9e9 0001-linedit-deluser-use-POSIX-getpwent-instead-of-getpwe.patch fa5f7f43bf8030f4bfcdf09d85e2e314014d5a083a24de95ac2e78c15e0dfebc14e410088e7f8eaeb8cdf24dea64e3b665b99afb8f96259e9908eebce81745bc 0001-top-fix-and-merge-code-to-parse-proc-meminfo.patch 2dea81509f73621e60d95db1b04186056add15fb24d1f9f7b32bb50aee99733d3cf45404c33b7ca6993cff23d76f31c0bcf38c04ac741dcdd2baaf3bc2afd707 fix-top.patch -8a97605736cb665b74587eda1c0458ffa678c262db677f42999e70ee383a8ec3cc4ab248180843f21f682b7e5483a4859be6b04fdc9a5f3c3ad75a527ad62607 0001-diff-add-support-for-no-dereference.patch +a35b66cd28b79ccc14b47315ac94677fdf8c14d8a6e8956707e71fb50d453dfc5b4b822832cd1faecfe9bf79e687f9b25a1357e0a88db530044c5f8514701c98 0001-diff-add-support-for-no-dereference.patch 35ab915e729e73c4909793f58530edcfc10f10d750df0d41913892137f799f773a7bb476e29ed742c86d0f279603f85ed9bf5c660714571bc5f5179ea852aade busyboxconfig 1d2739379dab1deb3eae7cffd4845300eb7d30f7343b4a1209b21a5680860d55080ad45fdefe098b249ce3040c01951fa7f0a79cd447b2d7b260eb000099d9dc glibc.patch" |