[arch-commits] Commit in acpid/repos (26 files)
seblu at nymeria.archlinux.org
seblu at nymeria.archlinux.org
Thu Jan 24 12:57:51 UTC 2013
Date: Thursday, January 24, 2013 @ 13:57:51
Author: seblu
Revision: 82787
archrelease: copy trunk to community-i686, community-x86_64
Added:
acpid/repos/community-i686/0001-Fix-format-of-video-tabletmode-event-string.patch
(from rev 82786, acpid/trunk/0001-Fix-format-of-video-tabletmode-event-string.patch)
acpid/repos/community-i686/PKGBUILD
(from rev 82786, acpid/trunk/PKGBUILD)
acpid/repos/community-i686/acpid.service
(from rev 82786, acpid/trunk/acpid.service)
acpid/repos/community-i686/acpid.socket
(from rev 82786, acpid/trunk/acpid.socket)
acpid/repos/community-i686/anything
(from rev 82786, acpid/trunk/anything)
acpid/repos/community-i686/handler.sh
(from rev 82786, acpid/trunk/handler.sh)
acpid/repos/community-x86_64/0001-Fix-format-of-video-tabletmode-event-string.patch
(from rev 82786, acpid/trunk/0001-Fix-format-of-video-tabletmode-event-string.patch)
acpid/repos/community-x86_64/PKGBUILD
(from rev 82786, acpid/trunk/PKGBUILD)
acpid/repos/community-x86_64/acpid.service
(from rev 82786, acpid/trunk/acpid.service)
acpid/repos/community-x86_64/acpid.socket
(from rev 82786, acpid/trunk/acpid.socket)
acpid/repos/community-x86_64/anything
(from rev 82786, acpid/trunk/anything)
acpid/repos/community-x86_64/handler.sh
(from rev 82786, acpid/trunk/handler.sh)
Deleted:
acpid/repos/community-i686/PKGBUILD
acpid/repos/community-i686/acpid.conf
acpid/repos/community-i686/acpid.rc
acpid/repos/community-i686/acpid.service
acpid/repos/community-i686/acpid.socket
acpid/repos/community-i686/anything
acpid/repos/community-i686/handler.sh
acpid/repos/community-x86_64/PKGBUILD
acpid/repos/community-x86_64/acpid.conf
acpid/repos/community-x86_64/acpid.rc
acpid/repos/community-x86_64/acpid.service
acpid/repos/community-x86_64/acpid.socket
acpid/repos/community-x86_64/anything
acpid/repos/community-x86_64/handler.sh
-------------------------------------------------------------------------+
community-i686/0001-Fix-format-of-video-tabletmode-event-string.patch | 45 ++
community-i686/PKGBUILD | 113 +++----
community-i686/acpid.conf | 5
community-i686/acpid.rc | 40 --
community-i686/acpid.service | 21 -
community-i686/acpid.socket | 16 -
community-i686/anything | 6
community-i686/handler.sh | 154 +++++-----
community-x86_64/0001-Fix-format-of-video-tabletmode-event-string.patch | 45 ++
community-x86_64/PKGBUILD | 113 +++----
community-x86_64/acpid.conf | 5
community-x86_64/acpid.rc | 40 --
community-x86_64/acpid.service | 21 -
community-x86_64/acpid.socket | 16 -
community-x86_64/anything | 6
community-x86_64/handler.sh | 154 +++++-----
16 files changed, 396 insertions(+), 404 deletions(-)
Copied: acpid/repos/community-i686/0001-Fix-format-of-video-tabletmode-event-string.patch (from rev 82786, acpid/trunk/0001-Fix-format-of-video-tabletmode-event-string.patch)
===================================================================
--- community-i686/0001-Fix-format-of-video-tabletmode-event-string.patch (rev 0)
+++ community-i686/0001-Fix-format-of-video-tabletmode-event-string.patch 2013-01-24 12:57:51 UTC (rev 82787)
@@ -0,0 +1,45 @@
+From ddf5be1f8fc35c38dc241ca935bf4d408f2ff61d Mon Sep 17 00:00:00 2001
+From: Ted Felix <ted at 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
+
Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD 2013-01-24 12:57:36 UTC (rev 82786)
+++ community-i686/PKGBUILD 2013-01-24 12:57:51 UTC (rev 82787)
@@ -1,58 +0,0 @@
-# $Id$
-# Maintainer: Sébastien Luttringer <seblu at aur.archlinux.org>
-# Contributor: xduugu
-# Contributor: Manolis Tzanidakis
-# Contributor: Jonathan Schmidt <j.schmidt at archlinux.us
-
-pkgname=acpid
-pkgver=2.0.17
-pkgrel=3
-pkgdesc='A daemon for delivering ACPI power management events with netlink support'
-arch=('i686' 'x86_64')
-url='http://tedfelix.com/linux/acpid-netlink.html'
-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')
-source=("http://www.tedfelix.com/linux/$pkgname-$pkgver.tar.xz"
- 'acpid.rc'
- 'acpid.conf'
- 'acpid.socket'
- 'acpid.service'
- 'anything'
- 'handler.sh')
-md5sums=('d858729b7d984c5e3a0c7558e9de1584'
- '077475c75fbdd9de75f9a397130ccd91'
- '929c6d2e91295c22ed9ec6212d7eabef'
- 'ee6cb99e50e580c50331a73045412ae9'
- '7f545754db5be7296d2dd97c049062ee'
- '2d37b98d6e74bab815604b8b48c6cfd4'
- '47f44ff5f02685dce8bcdab8568f0c38')
-
-build() {
- cd $pkgname-$pkgver
- ./configure --prefix=/usr
- make
-}
-
-package() {
- pushd $pkgname-$pkgver
- make DESTDIR="$pkgdir" install
- popd
-
- # default config
- 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"
- install -Dm644 acpid.socket "$pkgdir/usr/lib/systemd/system/acpid.socket"
- install -Dm644 acpid.service "$pkgdir/usr/lib/systemd/system/acpid.service"
-
- # fix acpid rights
- chmod 755 "$pkgdir/usr/sbin/acpid"
-}
-
-# vim:set ts=2 sw=2 ft=sh et:
Copied: acpid/repos/community-i686/PKGBUILD (from rev 82786, acpid/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2013-01-24 12:57:51 UTC (rev 82787)
@@ -0,0 +1,55 @@
+# $Id$
+# Maintainer: Sébastien Luttringer <seblu at aur.archlinux.org>
+# Contributor: xduugu
+# Contributor: Manolis Tzanidakis
+# Contributor: Jonathan Schmidt <j.schmidt at archlinux.us
+
+pkgname=acpid
+pkgver=2.0.17
+pkgrel=4
+pkgdesc='A daemon for delivering ACPI power management events with netlink support'
+arch=('i686' 'x86_64')
+url='http://tedfelix.com/linux/acpid-netlink.html'
+license=('GPL')
+depends=('bash')
+optdepends=('perl: use perl based examples')
+replaces=('acpid2')
+backup=('etc/acpi/handler.sh' 'etc/acpi/events/anything')
+source=("http://www.tedfelix.com/linux/$pkgname-$pkgver.tar.xz"
+ 'acpid.socket'
+ 'acpid.service'
+ 'anything'
+ 'handler.sh'
+ '0001-Fix-format-of-video-tabletmode-event-string.patch')
+md5sums=('d858729b7d984c5e3a0c7558e9de1584'
+ 'ee6cb99e50e580c50331a73045412ae9'
+ '10290f69491206cd104654e5b900b661'
+ '2d37b98d6e74bab815604b8b48c6cfd4'
+ '47f44ff5f02685dce8bcdab8568f0c38'
+ 'a813e00553104f2129f64cae95a7983f')
+
+build() {
+ cd $pkgname-$pkgver
+ patch -p1 -i "$srcdir/0001-Fix-format-of-video-tabletmode-event-string.patch"
+ ./configure --prefix=/usr
+ make
+}
+
+package() {
+ pushd $pkgname-$pkgver
+ make DESTDIR="$pkgdir" install
+ popd
+
+ # default config
+ install -Dm644 anything "$pkgdir/etc/acpi/events/anything"
+ install -Dm755 handler.sh "$pkgdir/etc/acpi/handler.sh"
+
+ # systemd
+ install -Dm644 acpid.socket "$pkgdir/usr/lib/systemd/system/acpid.socket"
+ install -Dm644 acpid.service "$pkgdir/usr/lib/systemd/system/acpid.service"
+
+ # fix acpid rights
+ chmod 755 "$pkgdir/usr/sbin/acpid"
+}
+
+# vim:set ts=2 sw=2 et:
Deleted: community-i686/acpid.conf
===================================================================
--- community-i686/acpid.conf 2013-01-24 12:57:36 UTC (rev 82786)
+++ community-i686/acpid.conf 2013-01-24 12:57:51 UTC (rev 82787)
@@ -1,5 +0,0 @@
-#
-# Arguments to be passed to the acpid daemon
-#
-
-ACPID_ARGS=""
Deleted: community-i686/acpid.rc
===================================================================
--- community-i686/acpid.rc 2013-01-24 12:57:36 UTC (rev 82786)
+++ community-i686/acpid.rc 2013-01-24 12:57:51 UTC (rev 82787)
@@ -1,40 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-[[ -f /etc/conf.d/acpid ]] && . /etc/conf.d/acpid
-
-PID=$(pidof -o %PPID /usr/sbin/acpid)
-case "$1" in
- start)
- stat_busy "Starting acpid"
- [ -z "$PID" ] && /usr/sbin/acpid $ACPID_ARGS
- if [ $? -gt 0 ]; then
- stat_fail
- else
- add_daemon acpid
- stat_done
- fi
- ;;
- stop)
- stat_busy "Stopping acpid"
- [ ! -z "$PID" ] && kill $PID &> /dev/null
- if [ $? -gt 0 ]; then
- stat_fail
- else
- rm_daemon acpid
- stat_done
- fi
- ;;
- restart)
- $0 stop
- sleep 1
- $0 start
- ;;
- *)
- echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
-
-# vim:set ts=2 sw=2 ft=sh et:
Deleted: community-i686/acpid.service
===================================================================
--- community-i686/acpid.service 2013-01-24 12:57:36 UTC (rev 82786)
+++ community-i686/acpid.service 2013-01-24 12:57:51 UTC (rev 82787)
@@ -1,11 +0,0 @@
-[Unit]
-Description=ACPI event daemon
-Requires=acpid.socket
-
-[Service]
-EnvironmentFile=/etc/conf.d/acpid
-ExecStart=/usr/sbin/acpid -f $ACPID_ARGS
-
-[Install]
-WantedBy=multi-user.target
-Also=acpid.socket
Copied: acpid/repos/community-i686/acpid.service (from rev 82786, acpid/trunk/acpid.service)
===================================================================
--- community-i686/acpid.service (rev 0)
+++ community-i686/acpid.service 2013-01-24 12:57:51 UTC (rev 82787)
@@ -0,0 +1,10 @@
+[Unit]
+Description=ACPI event daemon
+Requires=acpid.socket
+
+[Service]
+ExecStart=/usr/sbin/acpid -f
+
+[Install]
+WantedBy=multi-user.target
+Also=acpid.socket
Deleted: community-i686/acpid.socket
===================================================================
--- community-i686/acpid.socket 2013-01-24 12:57:36 UTC (rev 82786)
+++ community-i686/acpid.socket 2013-01-24 12:57:51 UTC (rev 82787)
@@ -1,8 +0,0 @@
-[Unit]
-Description=ACPID Listen Socket
-
-[Socket]
-ListenStream=/run/acpid.socket
-
-[Install]
-WantedBy=sockets.target
Copied: acpid/repos/community-i686/acpid.socket (from rev 82786, acpid/trunk/acpid.socket)
===================================================================
--- community-i686/acpid.socket (rev 0)
+++ community-i686/acpid.socket 2013-01-24 12:57:51 UTC (rev 82787)
@@ -0,0 +1,8 @@
+[Unit]
+Description=ACPID Listen Socket
+
+[Socket]
+ListenStream=/run/acpid.socket
+
+[Install]
+WantedBy=sockets.target
Deleted: community-i686/anything
===================================================================
--- community-i686/anything 2013-01-24 12:57:36 UTC (rev 82786)
+++ community-i686/anything 2013-01-24 12:57:51 UTC (rev 82787)
@@ -1,3 +0,0 @@
-# Pass all events to our one handler script
-event=.*
-action=/etc/acpi/handler.sh %e
Copied: acpid/repos/community-i686/anything (from rev 82786, acpid/trunk/anything)
===================================================================
--- community-i686/anything (rev 0)
+++ community-i686/anything 2013-01-24 12:57:51 UTC (rev 82787)
@@ -0,0 +1,3 @@
+# Pass all events to our one handler script
+event=.*
+action=/etc/acpi/handler.sh %e
Deleted: community-i686/handler.sh
===================================================================
--- community-i686/handler.sh 2013-01-24 12:57:36 UTC (rev 82786)
+++ community-i686/handler.sh 2013-01-24 12:57:51 UTC (rev 82787)
@@ -1,77 +0,0 @@
-#!/bin/bash
-# Default acpi script that takes an entry for all actions
-
-case "$1" in
- button/power)
- case "$2" in
- PBTN|PWRF)
- logger 'PowerButton pressed'
- ;;
- *)
- logger "ACPI action undefined: $2"
- ;;
- esac
- ;;
- button/sleep)
- case "$2" in
- SLPB|SBTN)
- logger 'SleepButton pressed'
- ;;
- *)
- logger "ACPI action undefined: $2"
- ;;
- esac
- ;;
- ac_adapter)
- case "$2" in
- AC|ACAD|ADP0)
- case "$4" in
- 00000000)
- logger 'AC unpluged'
- ;;
- 00000001)
- logger 'AC pluged'
- ;;
- esac
- ;;
- *)
- logger "ACPI action undefined: $2"
- ;;
- esac
- ;;
- battery)
- case "$2" in
- BAT0)
- case "$4" in
- 00000000)
- logger 'Battery online'
- ;;
- 00000001)
- logger 'Battery offline'
- ;;
- esac
- ;;
- CPU0)
- ;;
- *) logger "ACPI action undefined: $2" ;;
- esac
- ;;
- button/lid)
- case "$3" in
- close)
- logger 'LID closed'
- ;;
- open)
- logger 'LID opened'
- ;;
- *)
- logger "ACPI action undefined: $3"
- ;;
- esac
- ;;
- *)
- logger "ACPI group/action undefined: $1 / $2"
- ;;
-esac
-
-# vim:set ts=4 sw=4 ft=sh et:
Copied: acpid/repos/community-i686/handler.sh (from rev 82786, acpid/trunk/handler.sh)
===================================================================
--- community-i686/handler.sh (rev 0)
+++ community-i686/handler.sh 2013-01-24 12:57:51 UTC (rev 82787)
@@ -0,0 +1,77 @@
+#!/bin/bash
+# Default acpi script that takes an entry for all actions
+
+case "$1" in
+ button/power)
+ case "$2" in
+ PBTN|PWRF)
+ logger 'PowerButton pressed'
+ ;;
+ *)
+ logger "ACPI action undefined: $2"
+ ;;
+ esac
+ ;;
+ button/sleep)
+ case "$2" in
+ SLPB|SBTN)
+ logger 'SleepButton pressed'
+ ;;
+ *)
+ logger "ACPI action undefined: $2"
+ ;;
+ esac
+ ;;
+ ac_adapter)
+ case "$2" in
+ AC|ACAD|ADP0)
+ case "$4" in
+ 00000000)
+ logger 'AC unpluged'
+ ;;
+ 00000001)
+ logger 'AC pluged'
+ ;;
+ esac
+ ;;
+ *)
+ logger "ACPI action undefined: $2"
+ ;;
+ esac
+ ;;
+ battery)
+ case "$2" in
+ BAT0)
+ case "$4" in
+ 00000000)
+ logger 'Battery online'
+ ;;
+ 00000001)
+ logger 'Battery offline'
+ ;;
+ esac
+ ;;
+ CPU0)
+ ;;
+ *) logger "ACPI action undefined: $2" ;;
+ esac
+ ;;
+ button/lid)
+ case "$3" in
+ close)
+ logger 'LID closed'
+ ;;
+ open)
+ logger 'LID opened'
+ ;;
+ *)
+ logger "ACPI action undefined: $3"
+ ;;
+ esac
+ ;;
+ *)
+ logger "ACPI group/action undefined: $1 / $2"
+ ;;
+esac
+
+# vim:set ts=4 sw=4 ft=sh et:
Copied: acpid/repos/community-x86_64/0001-Fix-format-of-video-tabletmode-event-string.patch (from rev 82786, acpid/trunk/0001-Fix-format-of-video-tabletmode-event-string.patch)
===================================================================
--- community-x86_64/0001-Fix-format-of-video-tabletmode-event-string.patch (rev 0)
+++ community-x86_64/0001-Fix-format-of-video-tabletmode-event-string.patch 2013-01-24 12:57:51 UTC (rev 82787)
@@ -0,0 +1,45 @@
+From ddf5be1f8fc35c38dc241ca935bf4d408f2ff61d Mon Sep 17 00:00:00 2001
+From: Ted Felix <ted at 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
+
Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD 2013-01-24 12:57:36 UTC (rev 82786)
+++ community-x86_64/PKGBUILD 2013-01-24 12:57:51 UTC (rev 82787)
@@ -1,58 +0,0 @@
-# $Id$
-# Maintainer: Sébastien Luttringer <seblu at aur.archlinux.org>
-# Contributor: xduugu
-# Contributor: Manolis Tzanidakis
-# Contributor: Jonathan Schmidt <j.schmidt at archlinux.us
-
-pkgname=acpid
-pkgver=2.0.17
-pkgrel=3
-pkgdesc='A daemon for delivering ACPI power management events with netlink support'
-arch=('i686' 'x86_64')
-url='http://tedfelix.com/linux/acpid-netlink.html'
-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')
-source=("http://www.tedfelix.com/linux/$pkgname-$pkgver.tar.xz"
- 'acpid.rc'
- 'acpid.conf'
- 'acpid.socket'
- 'acpid.service'
- 'anything'
- 'handler.sh')
-md5sums=('d858729b7d984c5e3a0c7558e9de1584'
- '077475c75fbdd9de75f9a397130ccd91'
- '929c6d2e91295c22ed9ec6212d7eabef'
- 'ee6cb99e50e580c50331a73045412ae9'
- '7f545754db5be7296d2dd97c049062ee'
- '2d37b98d6e74bab815604b8b48c6cfd4'
- '47f44ff5f02685dce8bcdab8568f0c38')
-
-build() {
- cd $pkgname-$pkgver
- ./configure --prefix=/usr
- make
-}
-
-package() {
- pushd $pkgname-$pkgver
- make DESTDIR="$pkgdir" install
- popd
-
- # default config
- 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"
- install -Dm644 acpid.socket "$pkgdir/usr/lib/systemd/system/acpid.socket"
- install -Dm644 acpid.service "$pkgdir/usr/lib/systemd/system/acpid.service"
-
- # fix acpid rights
- chmod 755 "$pkgdir/usr/sbin/acpid"
-}
-
-# vim:set ts=2 sw=2 ft=sh et:
Copied: acpid/repos/community-x86_64/PKGBUILD (from rev 82786, acpid/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2013-01-24 12:57:51 UTC (rev 82787)
@@ -0,0 +1,55 @@
+# $Id$
+# Maintainer: Sébastien Luttringer <seblu at aur.archlinux.org>
+# Contributor: xduugu
+# Contributor: Manolis Tzanidakis
+# Contributor: Jonathan Schmidt <j.schmidt at archlinux.us
+
+pkgname=acpid
+pkgver=2.0.17
+pkgrel=4
+pkgdesc='A daemon for delivering ACPI power management events with netlink support'
+arch=('i686' 'x86_64')
+url='http://tedfelix.com/linux/acpid-netlink.html'
+license=('GPL')
+depends=('bash')
+optdepends=('perl: use perl based examples')
+replaces=('acpid2')
+backup=('etc/acpi/handler.sh' 'etc/acpi/events/anything')
+source=("http://www.tedfelix.com/linux/$pkgname-$pkgver.tar.xz"
+ 'acpid.socket'
+ 'acpid.service'
+ 'anything'
+ 'handler.sh'
+ '0001-Fix-format-of-video-tabletmode-event-string.patch')
+md5sums=('d858729b7d984c5e3a0c7558e9de1584'
+ 'ee6cb99e50e580c50331a73045412ae9'
+ '10290f69491206cd104654e5b900b661'
+ '2d37b98d6e74bab815604b8b48c6cfd4'
+ '47f44ff5f02685dce8bcdab8568f0c38'
+ 'a813e00553104f2129f64cae95a7983f')
+
+build() {
+ cd $pkgname-$pkgver
+ patch -p1 -i "$srcdir/0001-Fix-format-of-video-tabletmode-event-string.patch"
+ ./configure --prefix=/usr
+ make
+}
+
+package() {
+ pushd $pkgname-$pkgver
+ make DESTDIR="$pkgdir" install
+ popd
+
+ # default config
+ install -Dm644 anything "$pkgdir/etc/acpi/events/anything"
+ install -Dm755 handler.sh "$pkgdir/etc/acpi/handler.sh"
+
+ # systemd
+ install -Dm644 acpid.socket "$pkgdir/usr/lib/systemd/system/acpid.socket"
+ install -Dm644 acpid.service "$pkgdir/usr/lib/systemd/system/acpid.service"
+
+ # fix acpid rights
+ chmod 755 "$pkgdir/usr/sbin/acpid"
+}
+
+# vim:set ts=2 sw=2 et:
Deleted: community-x86_64/acpid.conf
===================================================================
--- community-x86_64/acpid.conf 2013-01-24 12:57:36 UTC (rev 82786)
+++ community-x86_64/acpid.conf 2013-01-24 12:57:51 UTC (rev 82787)
@@ -1,5 +0,0 @@
-#
-# Arguments to be passed to the acpid daemon
-#
-
-ACPID_ARGS=""
Deleted: community-x86_64/acpid.rc
===================================================================
--- community-x86_64/acpid.rc 2013-01-24 12:57:36 UTC (rev 82786)
+++ community-x86_64/acpid.rc 2013-01-24 12:57:51 UTC (rev 82787)
@@ -1,40 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-[[ -f /etc/conf.d/acpid ]] && . /etc/conf.d/acpid
-
-PID=$(pidof -o %PPID /usr/sbin/acpid)
-case "$1" in
- start)
- stat_busy "Starting acpid"
- [ -z "$PID" ] && /usr/sbin/acpid $ACPID_ARGS
- if [ $? -gt 0 ]; then
- stat_fail
- else
- add_daemon acpid
- stat_done
- fi
- ;;
- stop)
- stat_busy "Stopping acpid"
- [ ! -z "$PID" ] && kill $PID &> /dev/null
- if [ $? -gt 0 ]; then
- stat_fail
- else
- rm_daemon acpid
- stat_done
- fi
- ;;
- restart)
- $0 stop
- sleep 1
- $0 start
- ;;
- *)
- echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
-
-# vim:set ts=2 sw=2 ft=sh et:
Deleted: community-x86_64/acpid.service
===================================================================
--- community-x86_64/acpid.service 2013-01-24 12:57:36 UTC (rev 82786)
+++ community-x86_64/acpid.service 2013-01-24 12:57:51 UTC (rev 82787)
@@ -1,11 +0,0 @@
-[Unit]
-Description=ACPI event daemon
-Requires=acpid.socket
-
-[Service]
-EnvironmentFile=/etc/conf.d/acpid
-ExecStart=/usr/sbin/acpid -f $ACPID_ARGS
-
-[Install]
-WantedBy=multi-user.target
-Also=acpid.socket
Copied: acpid/repos/community-x86_64/acpid.service (from rev 82786, acpid/trunk/acpid.service)
===================================================================
--- community-x86_64/acpid.service (rev 0)
+++ community-x86_64/acpid.service 2013-01-24 12:57:51 UTC (rev 82787)
@@ -0,0 +1,10 @@
+[Unit]
+Description=ACPI event daemon
+Requires=acpid.socket
+
+[Service]
+ExecStart=/usr/sbin/acpid -f
+
+[Install]
+WantedBy=multi-user.target
+Also=acpid.socket
Deleted: community-x86_64/acpid.socket
===================================================================
--- community-x86_64/acpid.socket 2013-01-24 12:57:36 UTC (rev 82786)
+++ community-x86_64/acpid.socket 2013-01-24 12:57:51 UTC (rev 82787)
@@ -1,8 +0,0 @@
-[Unit]
-Description=ACPID Listen Socket
-
-[Socket]
-ListenStream=/run/acpid.socket
-
-[Install]
-WantedBy=sockets.target
Copied: acpid/repos/community-x86_64/acpid.socket (from rev 82786, acpid/trunk/acpid.socket)
===================================================================
--- community-x86_64/acpid.socket (rev 0)
+++ community-x86_64/acpid.socket 2013-01-24 12:57:51 UTC (rev 82787)
@@ -0,0 +1,8 @@
+[Unit]
+Description=ACPID Listen Socket
+
+[Socket]
+ListenStream=/run/acpid.socket
+
+[Install]
+WantedBy=sockets.target
Deleted: community-x86_64/anything
===================================================================
--- community-x86_64/anything 2013-01-24 12:57:36 UTC (rev 82786)
+++ community-x86_64/anything 2013-01-24 12:57:51 UTC (rev 82787)
@@ -1,3 +0,0 @@
-# Pass all events to our one handler script
-event=.*
-action=/etc/acpi/handler.sh %e
Copied: acpid/repos/community-x86_64/anything (from rev 82786, acpid/trunk/anything)
===================================================================
--- community-x86_64/anything (rev 0)
+++ community-x86_64/anything 2013-01-24 12:57:51 UTC (rev 82787)
@@ -0,0 +1,3 @@
+# Pass all events to our one handler script
+event=.*
+action=/etc/acpi/handler.sh %e
Deleted: community-x86_64/handler.sh
===================================================================
--- community-x86_64/handler.sh 2013-01-24 12:57:36 UTC (rev 82786)
+++ community-x86_64/handler.sh 2013-01-24 12:57:51 UTC (rev 82787)
@@ -1,77 +0,0 @@
-#!/bin/bash
-# Default acpi script that takes an entry for all actions
-
-case "$1" in
- button/power)
- case "$2" in
- PBTN|PWRF)
- logger 'PowerButton pressed'
- ;;
- *)
- logger "ACPI action undefined: $2"
- ;;
- esac
- ;;
- button/sleep)
- case "$2" in
- SLPB|SBTN)
- logger 'SleepButton pressed'
- ;;
- *)
- logger "ACPI action undefined: $2"
- ;;
- esac
- ;;
- ac_adapter)
- case "$2" in
- AC|ACAD|ADP0)
- case "$4" in
- 00000000)
- logger 'AC unpluged'
- ;;
- 00000001)
- logger 'AC pluged'
- ;;
- esac
- ;;
- *)
- logger "ACPI action undefined: $2"
- ;;
- esac
- ;;
- battery)
- case "$2" in
- BAT0)
- case "$4" in
- 00000000)
- logger 'Battery online'
- ;;
- 00000001)
- logger 'Battery offline'
- ;;
- esac
- ;;
- CPU0)
- ;;
- *) logger "ACPI action undefined: $2" ;;
- esac
- ;;
- button/lid)
- case "$3" in
- close)
- logger 'LID closed'
- ;;
- open)
- logger 'LID opened'
- ;;
- *)
- logger "ACPI action undefined: $3"
- ;;
- esac
- ;;
- *)
- logger "ACPI group/action undefined: $1 / $2"
- ;;
-esac
-
-# vim:set ts=4 sw=4 ft=sh et:
Copied: acpid/repos/community-x86_64/handler.sh (from rev 82786, acpid/trunk/handler.sh)
===================================================================
--- community-x86_64/handler.sh (rev 0)
+++ community-x86_64/handler.sh 2013-01-24 12:57:51 UTC (rev 82787)
@@ -0,0 +1,77 @@
+#!/bin/bash
+# Default acpi script that takes an entry for all actions
+
+case "$1" in
+ button/power)
+ case "$2" in
+ PBTN|PWRF)
+ logger 'PowerButton pressed'
+ ;;
+ *)
+ logger "ACPI action undefined: $2"
+ ;;
+ esac
+ ;;
+ button/sleep)
+ case "$2" in
+ SLPB|SBTN)
+ logger 'SleepButton pressed'
+ ;;
+ *)
+ logger "ACPI action undefined: $2"
+ ;;
+ esac
+ ;;
+ ac_adapter)
+ case "$2" in
+ AC|ACAD|ADP0)
+ case "$4" in
+ 00000000)
+ logger 'AC unpluged'
+ ;;
+ 00000001)
+ logger 'AC pluged'
+ ;;
+ esac
+ ;;
+ *)
+ logger "ACPI action undefined: $2"
+ ;;
+ esac
+ ;;
+ battery)
+ case "$2" in
+ BAT0)
+ case "$4" in
+ 00000000)
+ logger 'Battery online'
+ ;;
+ 00000001)
+ logger 'Battery offline'
+ ;;
+ esac
+ ;;
+ CPU0)
+ ;;
+ *) logger "ACPI action undefined: $2" ;;
+ esac
+ ;;
+ button/lid)
+ case "$3" in
+ close)
+ logger 'LID closed'
+ ;;
+ open)
+ logger 'LID opened'
+ ;;
+ *)
+ logger "ACPI action undefined: $3"
+ ;;
+ esac
+ ;;
+ *)
+ logger "ACPI group/action undefined: $1 / $2"
+ ;;
+esac
+
+# vim:set ts=4 sw=4 ft=sh et:
More information about the arch-commits
mailing list