[arch-commits] Commit in procps-ng/trunk (PKGBUILD impossibly-high-memory.patch)
Bartłomiej Piotrowski
bpiotrowski at archlinux.org
Wed Apr 4 07:38:47 UTC 2018
Date: Wednesday, April 4, 2018 @ 07:38:47
Author: bpiotrowski
Revision: 320919
3.3.13-1: new upstream release
Modified:
procps-ng/trunk/PKGBUILD
Deleted:
procps-ng/trunk/impossibly-high-memory.patch
------------------------------+
PKGBUILD | 69 ++++++++++++++++---------------------
impossibly-high-memory.patch | 75 -----------------------------------------
2 files changed, 31 insertions(+), 113 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2018-04-04 07:37:55 UTC (rev 320918)
+++ PKGBUILD 2018-04-04 07:38:47 UTC (rev 320919)
@@ -1,55 +1,48 @@
# $Id$
-# Maintainer: Gaetan Bisson <bisson at archlinux.org>
+# Maintainer: Bartłomiej Piotrowski <bpiotrowski at archlinux.org>
+# Contributor: Gaetan Bisson <bisson at archlinux.org>
# Contributor: Eric Bélanger <eric at archlinux.org>
pkgname=procps-ng
-pkgver=3.3.12
-pkgrel=3
+pkgver=3.3.13
+pkgrel=1
pkgdesc='Utilities for monitoring your system and its processes'
url='https://gitlab.com/procps-ng/procps'
-license=('GPL' 'LGPL')
-arch=('x86_64')
-makedepends=('systemd')
-depends=('ncurses' 'libsystemd')
-source=("https://downloads.sourceforge.net/project/${pkgname}/Production/${pkgname}-${pkgver}.tar.xz"
- 'impossibly-high-memory.patch')
-sha256sums=('6ed65ab86318f37904e8f9014415a098bec5bc53653e5d9ab404f95ca5e1a7d4'
- '1095223d697cf86b7086839666222b853bfa80bb83c7b09eaeceb0c506bea980')
-
-groups=('base')
-
-conflicts=('procps' 'sysvinit-tools')
-provides=('procps' 'sysvinit-tools')
-replaces=('procps' 'sysvinit-tools')
-
+license=(GPL LGPL)
+arch=(x86_64)
+groups=(base)
+depends=(ncurses libsystemd)
+makedepends=(systemd)
+conflicts=(procps sysvinit-tools)
+provides=(procps sysvinit-tools)
+replaces=(procps sysvinit-tools)
install=install
+source=(https://downloads.sourceforge.net/project/$pkgname/Production/${pkgname}-${pkgver}.tar.xz)
+sha256sums=('52b05b2bd5b05f46f24766a10474337ebadd828df9915e2b178df291cf88f7d3')
prepare() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- patch -p1 -i ../impossibly-high-memory.patch
- sed 's:<ncursesw/:<:g' -i watch.c
+ cd $pkgname-$pkgver
+ sed 's:<ncursesw/:<:g' -i watch.c
}
build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- ./configure \
- --prefix=/usr \
- --exec-prefix=/ \
- --sysconfdir=/etc \
- --libdir=/usr/lib \
- --bindir=/usr/bin \
- --sbindir=/usr/bin \
- --enable-watch8bit \
- --with-systemd \
- --disable-modern-top \
- --disable-kill \
+ cd $pkgname-$pkgver
+ ./configure \
+ --prefix=/usr \
+ --exec-prefix=/ \
+ --sysconfdir=/etc \
+ --libdir=/usr/lib \
+ --bindir=/usr/bin \
+ --sbindir=/usr/bin \
+ --enable-watch8bit \
+ --with-systemd \
+ --disable-modern-top \
+ --disable-kill
- # kill is provided by util-linux
-
- make
+ make
}
package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make DESTDIR="${pkgdir}" install
+ cd $pkgname-$pkgver
+ make DESTDIR="$pkgdir" install
}
Deleted: impossibly-high-memory.patch
===================================================================
--- impossibly-high-memory.patch 2018-04-04 07:37:55 UTC (rev 320918)
+++ impossibly-high-memory.patch 2018-04-04 07:38:47 UTC (rev 320919)
@@ -1,75 +0,0 @@
-From a2ceb95e2a7d5bf0270f0d342d2edb560f5cfcf4 Mon Sep 17 00:00:00 2001
-From: Jim Warner <james.warner at comcast.net>
-Date: Thu, 17 Aug 2017 01:11:11 -0500
-Subject: [PATCH] top: protect against the anomalous 'Mem' graph display
-
-Until this patch, top falsely assumed that there would
-always be some (small) amount of physical memory after
-subtracting 'used' and 'available' from the total. But
-as the issue referenced below attests, a sum of 'used'
-and 'available' might exceed that total memory amount.
-
-I'm not sure if this is a problem with our calculation
-of the 'used' amount, a flaw in the kernel 'available'
-algorithms or some other reason I cannot even imagine.
-
-Anyway, this patch protects against such a contingency
-through the following single line addition of new code
-. if (pct_used + pct_misc > 100.0 || pct_misc < 0) ...
-
-The check for less than zero is not actually necessary
-as long as the source numbers remain unsigned. However
-should they ever become signed, we'll have protection.
-
-[ Most of the changes in this commit simply separate ]
-[ a variable's definition from its associated logic. ]
-
-Reference(s):
-https://gitlab.com/procps-ng/procps/issues/64
-
-Signed-off-by: Jim Warner <james.warner at comcast.net>
----
- top/top.c | 19 ++++++++++++-------
- 1 files changed, 12 insertions(+), 7 deletions(-)
-
-diff --git a/top/top.c b/top/top.c
-index 385df1d..948805e 100644
---- a/top/top.c
-+++ b/top/top.c
-@@ -5249,21 +5249,26 @@ numa_nope:
- { "%-.*s~4", "%-.*s~6", "%-.*s~6", Graph_blks }
- };
- char used[SMLBUFSIZ], util[SMLBUFSIZ], dual[MEDBUFSIZ];
-- int ix = w->rc.graph_mems - 1;
-- float pct_used = (float)kb_main_used * (100.0 / (float)kb_main_total),
-+ float pct_used, pct_misc, pct_swap;
-+ int ix, num_used, num_misc;
-+
-+ pct_used = (float)kb_main_used * (100.0 / (float)kb_main_total);
- #ifdef MEMGRAPH_OLD
-- pct_misc = (float)(kb_main_buffers + kb_main_cached) * (100.0 / (float)kb_main_total),
-+ pct_misc = (float)(kb_main_buffers + kb_main_cached) * (100.0 / (float)kb_main_total);
- #else
-- pct_misc = (float)(kb_main_total - kb_main_available - kb_main_used) * (100.0 / (float)kb_main_total),
-+ pct_misc = (float)(kb_main_total - kb_main_available - kb_main_used) * (100.0 / (float)kb_main_total);
- #endif
-- pct_swap = kb_swap_total ? (float)kb_swap_used * (100.0 / (float)kb_swap_total) : 0;
-+ if (pct_used + pct_misc > 100.0 || pct_misc < 0) pct_misc = 0;
-+ pct_swap = kb_swap_total ? (float)kb_swap_used * (100.0 / (float)kb_swap_total) : 0;
-+ ix = w->rc.graph_mems - 1;
- #ifndef QUICK_GRAPHS
-- int num_used = (int)((pct_used * Graph_adj) + .5),
-- num_misc = (int)((pct_misc * Graph_adj) + .5);
-+ num_used = (int)((pct_used * Graph_adj) + .5),
-+ num_misc = (int)((pct_misc * Graph_adj) + .5);
- if (num_used + num_misc > Graph_len) --num_misc;
- snprintf(used, sizeof(used), gtab[ix].used, num_used, gtab[ix].type);
- snprintf(util, sizeof(util), gtab[ix].misc, num_misc, gtab[ix].type);
- #else
-+ (void)num_used; (void)num_misc;
- snprintf(used, sizeof(used), gtab[ix].used, (int)((pct_used * Graph_adj) + .5), gtab[ix].type);
- snprintf(util, sizeof(util), gtab[ix].misc, (int)((pct_misc * Graph_adj) + .4), gtab[ix].type);
- #endif
---
-libgit2 0.26.0
-
More information about the arch-commits
mailing list