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

Conflicts:
	community/bird/PKGBUILD
	community/gmic/PKGBUILD
	community/linux-tools/PKGBUILD
	community/linux-tools/cpupower.systemd
	community/linux-tools/usbipd.service
	community/macchanger/PKGBUILD
	community/ndisc6/PKGBUILD
	community/nemiver/PKGBUILD
	core/gpgme/PKGBUILD
	extra/amarok/PKGBUILD
	extra/java-commons-daemon/PKGBUILD
	extra/libao/PKGBUILD
	extra/liblastfm/PKGBUILD

3 files changed, 57 insertions, 16 deletions

diff --git a/community/acpid/0001-Fix-format-of-video-tabletmode-event-string.patch b/community/acpid/0001-Fix-format-of-video-tabletmode-event-string.patch
new file mode 100644
index 000000000..d111214d3
--- /dev/null
+++ b/community/acpid/0001-Fix-format-of-video-tabletmode-event-string.patch
@@ -0,0 +1,45 @@
+From ddf5be1f8fc35c38dc241ca935bf4d408f2ff61d Mon Sep 17 00:00:00 2001
+From: Ted Felix <ted@tedfelix.com>
+Date: Thu, 17 Jan 2013 20:03:54 -0500
+Subject: [PATCH] Fix format of video/tabletmode event string
+
+The previous format caused Xorg's xserver to crash in
+lnxACPIGetEventFromOs() because it doesn't check for NULL
+returns from strtok().
+---
+ input_layer.c | 12 ++++++++++--
+ 1 file changed, 10 insertions(+), 2 deletions(-)
+
+diff --git a/input_layer.c b/input_layer.c
+index 591ad64..db410c0 100644
+--- a/input_layer.c
++++ b/input_layer.c
+@@ -56,6 +56,14 @@ struct evtab_entry {
+    evtest.c, acpi_genl, or kacpimon to find new events to add to this
+    table. */
+ 
++/*
++ * The two numbers (e.g. "00000080 00000000") in each string is a format
++ * that Xorg and maybe others expect.
++ *
++ * See hw/xfree86/os-support/linux/lnx_acpi.c in xserver and specifically
++ * lnxACPIGetEventFromOs().
++ */
++
+ static struct evtab_entry evtab[] = {
+ 
+ 	/*** COMMON EVENTS ***/
+@@ -66,8 +74,8 @@ static struct evtab_entry evtab[] = {
+ 	{{{0,0}, EV_KEY, KEY_SLEEP, 1}, "button/sleep SBTN 00000080 00000000"},
+ 	{{{0,0}, EV_SW, SW_LID, 1}, "button/lid LID close"},
+ 	{{{0,0}, EV_SW, SW_LID, 0}, "button/lid LID open"},
+-	{{{0,0}, EV_SW, SW_TABLET_MODE, 0}, "video/tabletmode TBLT off"},
+-	{{{0,0}, EV_SW, SW_TABLET_MODE, 1}, "video/tabletmode TBLT on"},
++	{{{0,0}, EV_SW, SW_TABLET_MODE, 0}, "video/tabletmode TBLT 0000008A 00000000"},
++	{{{0,0}, EV_SW, SW_TABLET_MODE, 1}, "video/tabletmode TBLT 0000008A 00000001"},
+ 
+ 
+ 	/*** VIDEO ***/
+-- 
+1.8.1.1
+
diff --git a/community/acpid/PKGBUILD b/community/acpid/PKGBUILD
index 5bf2b9974..355f848fb 100644
--- a/community/acpid/PKGBUILD
+++ b/community/acpid/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 77739 2012-10-14 03:02:21Z seblu $
+# $Id: PKGBUILD 82787 2013-01-24 12:57:51Z seblu $
 # Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org>
 # Contributor: xduugu
 # Contributor: Manolis Tzanidakis
@@ -6,7 +6,7 @@
 
 pkgname=acpid
 pkgver=2.0.17
-pkgrel=3
+pkgrel=4
 pkgdesc='A daemon for delivering ACPI power management events with netlink support'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://tedfelix.com/linux/acpid-netlink.html'
@@ -14,24 +14,23 @@ license=('GPL')
 depends=('bash')
 optdepends=('perl: use perl based examples')
 replaces=('acpid2')
-backup=('etc/acpi/handler.sh' 'etc/acpi/events/anything' 'etc/conf.d/acpid')
+backup=('etc/acpi/handler.sh' 'etc/acpi/events/anything')
 source=("http://www.tedfelix.com/linux/$pkgname-$pkgver.tar.xz"
-        'acpid.rc'
-        'acpid.conf'
         'acpid.socket'
         'acpid.service'
         'anything'
-        'handler.sh')
+        'handler.sh'
+        '0001-Fix-format-of-video-tabletmode-event-string.patch')
 md5sums=('d858729b7d984c5e3a0c7558e9de1584'
-         '077475c75fbdd9de75f9a397130ccd91'
-         '929c6d2e91295c22ed9ec6212d7eabef'
          'ee6cb99e50e580c50331a73045412ae9'
-         '7f545754db5be7296d2dd97c049062ee'
+         '10290f69491206cd104654e5b900b661'
          '2d37b98d6e74bab815604b8b48c6cfd4'
-         '47f44ff5f02685dce8bcdab8568f0c38')
+         '47f44ff5f02685dce8bcdab8568f0c38'
+         'a813e00553104f2129f64cae95a7983f')
 
 build() {
   cd $pkgname-$pkgver
+  patch -p1 -i "$srcdir/0001-Fix-format-of-video-tabletmode-event-string.patch"
   ./configure --prefix=/usr
   make
 }
@@ -45,9 +44,7 @@ package() {
   install -Dm644 anything "$pkgdir/etc/acpi/events/anything"
   install -Dm755 handler.sh "$pkgdir/etc/acpi/handler.sh"
 
-  # initscripts
-  install -Dm755 acpid.rc "$pkgdir/etc/rc.d/acpid"
-  install -Dm644 acpid.conf "$pkgdir/etc/conf.d/acpid"
+  # systemd
   install -Dm644 acpid.socket "$pkgdir/usr/lib/systemd/system/acpid.socket"
   install -Dm644 acpid.service "$pkgdir/usr/lib/systemd/system/acpid.service"
 
@@ -55,4 +52,4 @@ package() {
   chmod 755 "$pkgdir/usr/sbin/acpid"
 }
 
-# vim:set ts=2 sw=2 ft=sh et:
+# vim:set ts=2 sw=2 et:
diff --git a/community/acpid/acpid.service b/community/acpid/acpid.service
index 4c0e073b0..e4ddacdbe 100644
--- a/community/acpid/acpid.service
+++ b/community/acpid/acpid.service
@@ -3,8 +3,7 @@ Description=ACPI event daemon
 Requires=acpid.socket
 
 [Service]
-EnvironmentFile=/etc/conf.d/acpid
-ExecStart=/usr/sbin/acpid -f $ACPID_ARGS
+ExecStart=/usr/sbin/acpid -f
 
 [Install]
 WantedBy=multi-user.target