summarylogtreecommitdiffstats
path: root/PKGBUILD
diff options
context:
space:
mode:
authorAlexey D2017-12-20 10:47:30 +0300
committerAlexey D2017-12-20 10:47:30 +0300
commit925d029bc10ed35d7fa4581119eaba5dd1dd4952 (patch)
tree19b758f9af3831901b9abe84027a11fe5378036a /PKGBUILD
parentd39e8690d3b2ab54bcd64b879a4590789cd124c7 (diff)
downloadaur-925d029bc10ed35d7fa4581119eaba5dd1dd4952.tar.gz
mainstream fix for https://bugs.archlinux.org/task/56681
Diffstat (limited to 'PKGBUILD')
-rw-r--r--PKGBUILD22
1 files changed, 12 insertions, 10 deletions
diff --git a/PKGBUILD b/PKGBUILD
index ec630cfb0787..fe0752a14753 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,17 +4,19 @@
pkgname=procps-ng-nosystemd
pkgver=3.3.12
-pkgrel=1
+pkgrel=2
pkgdesc='Utilities for monitoring your system and its processes'
url='https://gitlab.com/procps-ng/procps'
license=('GPL' 'LGPL')
arch=('i686' 'x86_64')
depends=('ncurses')
backup=('etc/sysctl.conf')
-source=("http://downloads.sourceforge.net/project/procps-ng/Production/procps-ng-${pkgver}.tar.xz"
- 'sysctl.conf')
-sha1sums=('82c0745f150f1385ca01fe7d24f05f74e31c94c6'
- '674282245d8ab2e09017b8f8cdce20a3ff81e631')
+source=("https://downloads.sourceforge.net/project/procps-ng/Production/procps-ng-${pkgver}.tar.xz"
+ 'sysctl.conf'
+ 'impossibly-high-memory.patch')
+sha256sums=('6ed65ab86318f37904e8f9014415a098bec5bc53653e5d9ab404f95ca5e1a7d4'
+ 'bbb659d6e670921312ca205f16e92f47a80d7530160b3277bfc00e5ea0ac3836'
+ '1095223d697cf86b7086839666222b853bfa80bb83c7b09eaeceb0c506bea980')
groups=('base')
conflicts=('procps' 'procps-ng' 'sysvinit-tools' 'sysctl-default-conf')
replaces=('procps' 'procps-ng' 'sysvinit-tools' 'sysctl-default-conf')
@@ -24,6 +26,7 @@ install=procps-ng.install
prepare() {
cd "${srcdir}/procps-ng-${pkgver}"
+ patch -p1 -i ../impossibly-high-memory.patch
sed 's:<ncursesw/:<:g' -i watch.c
}
@@ -37,7 +40,10 @@ build() {
--libdir=/usr/lib \
--bindir=/usr/bin \
--sbindir=/usr/bin \
- --enable-watch8bit
+ --enable-watch8bit \
+ --disable-kill
+ # kill is provided by util-linux
+
make
}
@@ -46,8 +52,4 @@ package() {
make DESTDIR="${pkgdir}" install
install -Dm644 "sysctl.conf" "$pkgdir/etc/sysctl.conf"
-
- # provided by util-linux
- rm "${pkgdir}/usr/bin/kill"
- rm "${pkgdir}/usr/share/man/man1/kill.1"
}