Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	community-staging/happy/PKGBUILD
	community-staging/haskell-quickcheck/PKGBUILD
	community/mingw32-gcc-base/PKGBUILD
	core/mlocate/PKGBUILD
	core/procps-ng/PKGBUILD
	core/sysvinit/PKGBUILD
	elementary/gtk-engine-equinox/PKGBUILD
	extra/audacious/PKGBUILD
	extra/libsigc++/PKGBUILD
	extra/postgresql-old-upgrade/PKGBUILD
	extra/qt/PKGBUILD
	extra/tftp-hpa/PKGBUILD
	extra/transmission/PKGBUILD
	gnome-unstable/at-spi2-atk/PKGBUILD
	gnome-unstable/at-spi2-core/PKGBUILD
	gnome-unstable/atk/PKGBUILD
	gnome-unstable/clutter/PKGBUILD
	gnome-unstable/evolution-data-server/PKGBUILD
	gnome-unstable/evolution/PKGBUILD
	gnome-unstable/gjs/PKGBUILD
	gnome-unstable/glib-networking/PKGBUILD
	gnome-unstable/glib2/PKGBUILD
	gnome-unstable/gnome-desktop/PKGBUILD
	gnome-unstable/gnome-online-accounts/PKGBUILD
	gnome-unstable/gnome-settings-daemon/PKGBUILD
	gnome-unstable/gnome-themes-standard/PKGBUILD
	gnome-unstable/gobject-introspection/PKGBUILD
	gnome-unstable/gtk3/PKGBUILD
	gnome-unstable/gtkhtml4/PKGBUILD
	gnome-unstable/gvfs/PKGBUILD
	gnome-unstable/libsoup/PKGBUILD
	gnome-unstable/nautilus/PKGBUILD
	gnome-unstable/vala/PKGBUILD
	gnome-unstable/webkitgtk3/PKGBUILD
	libre/libretools/PKGBUILD
	multilib/lib32-gtk2/PKGBUILD
	multilib/lib32-qt/PKGBUILD
	multilib/lib32-util-linux/PKGBUILD
	testing/mlocate/PKGBUILD
	testing/openmpi/PKGBUILD
	testing/run-parts/PKGBUILD
	testing/systemd/PKGBUILD
	testing/transmission/PKGBUILD
	testing/transmission/transmission-cli.install
	testing/transmission/transmission.systemd

2 files changed, 26 insertions, 26 deletions

diff --git a/core/procps-ng/PKGBUILD b/core/procps-ng/PKGBUILD
index fe2c7d8b9..71a967c00 100644
--- a/core/procps-ng/PKGBUILD
+++ b/core/procps-ng/PKGBUILD
@@ -1,10 +1,11 @@
-# $Id: PKGBUILD 163561 2012-07-15 23:10:42Z eric $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
+# $Id: PKGBUILD 166961 2012-09-23 12:22:10Z tomegun $
+# Maintainer: Gaetan Bisson <bisson@archlinux.org>
+# Contributor: Eric Bélanger <eric@archlinux.org>
 
 pkgname=procps-ng
 pkgver=3.3.3
-pkgrel=3
-pkgdesc="Utilities for monitoring your system and processes on your system"
+pkgrel=6
+pkgdesc='Utilities for monitoring your system and its processes'
 arch=('i686' 'x86_64' 'mips64el')
 url="http://gitorious.org/procps"
 license=('GPL' 'LGPL')
@@ -19,7 +20,7 @@ options=('!libtool')
 source=(procps-ng-${pkgver}.tar.gz::http://gitorious.org/procps/procps/archive-tarball/v${pkgver}
         sysctl.conf)
 sha1sums=('e78a098f1a3c06722155800cc5cfa0c865af03c0'
-          'efb6cdc17ee39be8433ae9c8e9bb02d1f47eeefc')
+          '97ff07bab9aa5daa8d54a1346f73ba74f8e12a53')
 
 build() {
   cd "${srcdir}/procps-procps"
@@ -32,5 +33,9 @@ build() {
 package() {
   cd "${srcdir}/procps-procps"
   make DESTDIR="${pkgdir}" install
-  install -D -m644 "${srcdir}/sysctl.conf" "${pkgdir}/etc/sysctl.conf"
+  install -D -m644 ../sysctl.conf "${pkgdir}/etc/sysctl.conf"
+
+  # provided by util-linux
+  rm "${pkgdir}/bin/kill"
+  rm "${pkgdir}/usr/share/man/man1/kill.1"
 }
diff --git a/core/procps-ng/sysctl.conf b/core/procps-ng/sysctl.conf
index baddd90a6..4695cdd92 100644
--- a/core/procps-ng/sysctl.conf
+++ b/core/procps-ng/sysctl.conf
@@ -1,46 +1,41 @@
-# /etc/sysctl.conf - Configuration file for setting system variables
-# See sysctl.conf (5) for information.
+# Configuration file for runtime kernel parameters.
+# See sysctl.conf(5) for more information.
 
-# you can have the CD-ROM close when you use it, and open
-# when you are done.
-#dev.cdrom.autoeject = 1
+# Have the CD-ROM close when you use it, and open when you are done.
 #dev.cdrom.autoclose = 1
+#dev.cdrom.autoeject = 1
 
-# protection from the SYN flood attack
+# Protection from the SYN flood attack.
 net.ipv4.tcp_syncookies = 1
 
-# see the evil packets in your log files
+# See evil packets in your logs.
 #net.ipv4.conf.all.log_martians = 1
 
-# if not functioning as a router, there is no need to accept redirects or source routes
+# Never accept redirects or source routes (these are only useful for routers).
 #net.ipv4.conf.all.accept_redirects = 0
 #net.ipv4.conf.all.accept_source_route = 0
 #net.ipv6.conf.all.accept_redirects = 0
 #net.ipv6.conf.all.accept_source_route = 0
 
-# Disable packet forwarding
+# Disable packet forwarding.
 net.ipv4.ip_forward = 0
 net.ipv6.conf.all.forwarding = 0
 
-# Enable IPv6 Privacy Extensions
-net.ipv6.conf.default.use_tempaddr = 2
-net.ipv6.conf.all.use_tempaddr = 2
-
-# sets the port range used for outgoing connections
-#net.ipv4.ip_local_port_range = 32768    61000
+# Tweak the port range used for outgoing connections.
+#net.ipv4.ip_local_port_range = 32768 61000
 
-# Swapping too much or not enough? Disks spinning up when you'd
-# rather they didn't? Tweak these.
+# Tweak those values to alter disk syncing and swap behavior.
 #vm.vfs_cache_pressure = 100
 #vm.laptop_mode = 0
 #vm.swappiness = 60
 
+# Tweak how the flow of kernel messages is throttled.
 #kernel.printk_ratelimit_burst = 10
 #kernel.printk_ratelimit = 5
-#kernel.panic_on_oops = 0
 
-# Reboot 600 seconds after a panic
+# Reboot 600 seconds after kernel panic or oops.
+#kernel.panic_on_oops = 1
 #kernel.panic = 600
 
-# Disable SysRq key (note: console security issues)
+# Disable SysRq key to avoid console security issues.
 kernel.sysrq = 0