summaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authorNicolás Reynolds <fauno@kiwwwi.com.ar>2012-06-22 11:36:45 -0300
committerNicolás Reynolds <fauno@kiwwwi.com.ar>2012-06-22 11:36:45 -0300
commit07c809f1e71a03c6718f3275515ffcb2deba472d (patch)
treeb6a7c93c8428db395473046c76232fce9d9e9db6 /core
parent3e0ea869611d30b1da99b5666566ea4aa331f55f (diff)
parent287cbaf608ace8e8317083ad957a4cb5c3c58dd9 (diff)
Merge branch 'master' of ssh://gparabola/srv/git/abslibre-mips64el
Diffstat (limited to 'core')
-rw-r--r--core/gcc/PKGBUILD7
-rw-r--r--core/psmisc/PKGBUILD10
-rw-r--r--core/psmisc/psmisc22.18-usage.patch11
3 files changed, 24 insertions, 4 deletions
diff --git a/core/gcc/PKGBUILD b/core/gcc/PKGBUILD
index d5ecf392e..e3b1dc961 100644
--- a/core/gcc/PKGBUILD
+++ b/core/gcc/PKGBUILD
@@ -32,6 +32,13 @@ source=(ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2
gcc-4.7.0-cloog-0.17.patch
gcc-4.7.1-libada-pic.patch
gcc-4.7.1-libgo-write.patch)
+md5sums=('933e6f15f51c031060af64a9e14149ff'
+ '767c62f9a047c4434f2345decf1d0819'
+ 'ced48436c1b3c981d721a829f1094de1'
+ '474b8f5a7dee6ddd96b95a7240bfb961'
+ '575f7d17b022e609447a590e481b18b5'
+ '2acbc9d35cc9d72329dc71d6b1f162ef'
+ 'df82dd175ac566c8a6d46b11ac21f14c')
if [ -n "${_snapshot}" ]; then
_basedir="${srcdir}/gcc-${_snapshot}"
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);
+ }
+
+