[arch-commits] Commit in psmisc/trunk (PKGBUILD psmisc22.18-usage.patch)

[Eric Bélanger]

    Date: Wednesday, June 20, 2012 @ 05:17:25
  Author: eric
Revision: 162108

upgpkg: psmisc 22.18-2

Fix dangerous behaviour of killall (close FS#30372)

Added:
  psmisc/trunk/psmisc22.18-usage.patch
Modified:
  psmisc/trunk/PKGBUILD

-------------------------+
 PKGBUILD                |    8 +++++---
 psmisc22.18-usage.patch |   11 +++++++++++
 2 files changed, 16 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-06-20 04:58:59 UTC (rev 162107)
+++ PKGBUILD	2012-06-20 09:17:25 UTC (rev 162108)
@@ -3,18 +3,20 @@
 
 pkgname=psmisc
 pkgver=22.18
-pkgrel=1
+pkgrel=2
 pkgdesc="Miscellaneous procfs tools"
 arch=('i686' 'x86_64')
 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
 }

Added: psmisc22.18-usage.patch
===================================================================
--- psmisc22.18-usage.patch	                        (rev 0)
+++ psmisc22.18-usage.patch	2012-06-20 09:17:25 UTC (rev 162108)
@@ -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);
+ }
+ 
+