diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-06-22 13:47:48 +0200 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-06-22 13:47:48 +0200 |
| commit | 287cbaf608ace8e8317083ad957a4cb5c3c58dd9 (patch) | |
| tree | f685fe175f487dda450e70fccb125ad0aa5a671e /core | |
| parent | dcb73722d5cac1feef0018aacec43106dcb0fa77 (diff) | |
| parent | fb930f28bff4a4b4b37444e3f570904d6db3d06e (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community-staging/motion/PKGBUILD
community-testing/tor/PKGBUILD
community/icecast/PKGBUILD
libre/hplip-libre/PKGBUILD
libre/virtualbox-modules/PKGBUILD
Diffstat (limited to 'core')
| -rw-r--r-- | core/psmisc/PKGBUILD | 10 | ||||
| -rw-r--r-- | core/psmisc/psmisc22.18-usage.patch | 11 |
2 files changed, 17 insertions, 4 deletions
diff --git a/core/psmisc/PKGBUILD b/core/psmisc/PKGBUILD index 9a2b4a648..ef3538c6e 100644 --- a/core/psmisc/PKGBUILD +++ b/core/psmisc/PKGBUILD @@ -1,20 +1,22 @@ -# $Id: PKGBUILD 162104 2012-06-20 02:05:56Z eric $ +# $Id: PKGBUILD 162110 2012-06-20 09:21:46Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=psmisc pkgver=22.18 -pkgrel=1 +pkgrel=2 pkgdesc="Miscellaneous procfs tools" arch=('i686' 'x86_64' 'mips64el') url="http://psmisc.sourceforge.net/index.html" license=('GPL') groups=('base') depends=('ncurses') -source=(http://downloads.sourceforge.net/psmisc/${pkgname}-${pkgver}.tar.gz) -sha1sums=('964f6daa0950b128a0840d9df4dc0b671730a83c') +source=(http://downloads.sourceforge.net/psmisc/${pkgname}-${pkgver}.tar.gz psmisc22.18-usage.patch) +sha1sums=('964f6daa0950b128a0840d9df4dc0b671730a83c' + '5cd326dd969b07c46d10c7d1172b91d65cbc6e10') build() { cd "${srcdir}/${pkgname}-${pkgver}" + patch -p1 -i "${srcdir}/psmisc22.18-usage.patch" ./configure --prefix=/usr make } diff --git a/core/psmisc/psmisc22.18-usage.patch b/core/psmisc/psmisc22.18-usage.patch new file mode 100644 index 000000000..7736a6542 --- /dev/null +++ b/core/psmisc/psmisc22.18-usage.patch @@ -0,0 +1,11 @@ +diff -Naur psmisc-22.18-orig/src/killall.c psmisc-22.18/src/killall.c +--- psmisc-22.18-orig/src/killall.c 2012-06-20 05:07:16.563742846 -0400 ++++ psmisc-22.18/src/killall.c 2012-06-20 05:08:38.250412923 -0400 +@@ -637,6 +637,7 @@ + " (must precede other arguments)\n")); + #endif /*WITH_SELINUX*/ + fputc('\n', stderr); ++ exit (1); + } + + |