diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2014-07-28 14:45:14 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2014-07-28 14:49:44 +0000 |
| commit | ce41db40a7eb89f052ce3019b34f3227b96398a4 (patch) | |
| tree | 3be3e0775b991418c7f4207ba24a2de68fc384f9 | |
| parent | cecad8b1c1be62906f7788828ae425519408ad81 (diff) | |
| download | aports-ce41db40a7eb89f052ce3019b34f3227b96398a4.tar.bz2 aports-ce41db40a7eb89f052ce3019b34f3227b96398a4.tar.xz | |
main/busybox: fix the top patch
ref #3234
| -rw-r--r-- | main/busybox/APKBUILD | 6 | ||||
| -rw-r--r-- | main/busybox/fix-top.patch | 14 |
2 files changed, 19 insertions, 1 deletions
diff --git a/main/busybox/APKBUILD b/main/busybox/APKBUILD index 5325a3b559..5f10a9a161 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=10 +pkgrel=11 pkgdesc="Size optimized toolbox of many common UNIX utilities" url=http://busybox.net arch="all" @@ -32,6 +32,7 @@ source="http://busybox.net/downloads/$pkgname-$pkgver.tar.bz2 0002-sendmail-use-FQDN-in-default-envelope-sender.patch 0001-linedit-deluser-use-POSIX-getpwent-instead-of-getpwe.patch 0001-top-fix-and-merge-code-to-parse-proc-meminfo.patch + fix-top.patch 0001-diff-add-support-for-no-dereference.patch busyboxconfig @@ -130,6 +131,7 @@ d372d376820957fd5f2aee158af9867e 0001-sendmail-make-f-optional-document-its-def 9d83db6173fe5b0fb8ee6ce741d5bb18 0002-sendmail-use-FQDN-in-default-envelope-sender.patch 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 2fe6e74affe7d4e5e112035cead59432 busyboxconfig befaac2c59c380e36a452b3f1c1d4a3a glibc.patch" @@ -151,6 +153,7 @@ a31ce8bcb8b81b20e80ffa407600a530d085806c6471f4e4249fcb3a491b79ef busybox-uname- 7c88ef1d837ec8efb7c21e5b1b16e4ac3060ccde7ad5f698e9e6ef630d412593 0002-sendmail-use-FQDN-in-default-envelope-sender.patch 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 9bfb197fb57f9b3ac5b7a8800dfda6e5f7bee10db5e892d58176fa3733fe5229 busyboxconfig c604ef791c31d35a8c5ee4558d21428a46f37a6d762c4a7e29864f4037fc44a0 glibc.patch" @@ -172,6 +175,7 @@ b1a1cc2ada657a3d3364c8c96853575d73784e769cd8768c170c27a3e59abd2beace75dff6d5047c d466676cd2779ff33f288bb073aa2baa4f3606cf8b96ec514e624a7acb46442a2839ef18c47e19cc18a8234a485de39596773b44e4be2eff39617d7cf677dd38 0002-sendmail-use-FQDN-in-default-envelope-sender.patch 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 35ab915e729e73c4909793f58530edcfc10f10d750df0d41913892137f799f773a7bb476e29ed742c86d0f279603f85ed9bf5c660714571bc5f5179ea852aade busyboxconfig 1d2739379dab1deb3eae7cffd4845300eb7d30f7343b4a1209b21a5680860d55080ad45fdefe098b249ce3040c01951fa7f0a79cd447b2d7b260eb000099d9dc glibc.patch" diff --git a/main/busybox/fix-top.patch b/main/busybox/fix-top.patch new file mode 100644 index 0000000000..7d1cd4a364 --- /dev/null +++ b/main/busybox/fix-top.patch @@ -0,0 +1,14 @@ +diff --git a/procps/top.c b/procps/top.c +index 62f9421..119c32b 100644 +--- a/procps/top.c ++++ b/procps/top.c +@@ -536,7 +536,7 @@ static void parse_meminfo(unsigned long meminfo[MI_MAX]) + FILE *f; + int i; + +- memset(meminfo, 0, sizeof(meminfo)); ++ memset(meminfo, 0, MI_MAX*sizeof(unsigned long)); + f = xfopen_for_read("meminfo"); + while (fgets(buf, sizeof(buf), f) != NULL) { + char *c = strchr(buf, ':'); + |