[arch-commits] Commit in acpid/trunk (PKGBUILD acpid acpid.conf.d handler.sh)

[Andrea Scarpino]

    Date: Sunday, May 15, 2011 @ 07:10:08
  Author: andrea
Revision: 123979

upgpkg: acpid 2.0.9-2
reintroduce acpid.conf.d; add support for differents adapters names (FS#21767)

Added:
  acpid/trunk/acpid.conf.d
Modified:
  acpid/trunk/PKGBUILD
  acpid/trunk/acpid
  acpid/trunk/handler.sh

--------------+
 PKGBUILD     |   13 ++++++++-----
 acpid        |    4 +++-
 acpid.conf.d |    5 +++++
 handler.sh   |    2 +-
 4 files changed, 17 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-05-15 10:48:28 UTC (rev 123978)
+++ PKGBUILD	2011-05-15 11:10:08 UTC (rev 123979)
@@ -6,7 +6,7 @@
 
 pkgname=acpid
 pkgver=2.0.9
-pkgrel=1
+pkgrel=2
 pkgdesc="A daemon for delivering ACPI power management events with netlink support"
 arch=('i686' 'x86_64')
 url="http://tedfelix.com/linux/acpid-netlink.html"
@@ -15,8 +15,9 @@
 source=("http://www.tedfelix.com/linux/$pkgname-$pkgver.tar.gz"
         'acpid'
         'anything'
-        'handler.sh')
-backup=('etc/acpi/handler.sh' 'etc/acpi/events/anything')
+        'handler.sh'
+        'acpid.conf.d')
+backup=('etc/acpi/handler.sh' 'etc/acpi/events/anything' 'etc/conf.d/acpid')
 
 build() {
   cd "${srcdir}"/$pkgname-$pkgver
@@ -30,10 +31,12 @@
   install -Dm755 "$srcdir/acpid" "$pkgdir/etc/rc.d/acpid"
   install -Dm644 "$srcdir/anything" "$pkgdir/etc/acpi/events/anything"
   install -Dm755 "$srcdir/handler.sh" "$pkgdir/etc/acpi/handler.sh"
+  install -Dm644 "$srcdir/acpid.conf.d" "$pkgdir/etc/conf.d/acpid"
 
   chmod 755 "${pkgdir}"/usr/sbin/acpid
 }
 md5sums=('8b30aa1b31f607161745a4ac7a19699b'
-         '277d6f5199650ac83fd3ad3612f79d2f'
+         '955490c4db5233ec44461db694b873a4'
          '2d37b98d6e74bab815604b8b48c6cfd4'
-         '0e8dd13793b1baa79a745f4034888367')
+         '7b2e4c299af5eb87e1a81c07b6916c97'
+         '929c6d2e91295c22ed9ec6212d7eabef')

Modified: acpid
===================================================================
--- acpid	2011-05-15 10:48:28 UTC (rev 123978)
+++ acpid	2011-05-15 11:10:08 UTC (rev 123979)
@@ -3,11 +3,13 @@
 . /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
+    [ -z "$PID" ] && /usr/sbin/acpid $ACPID_ARGS
     if [ $? -gt 0 ]; then
       stat_fail
     else

Added: acpid.conf.d
===================================================================
--- acpid.conf.d	                        (rev 0)
+++ acpid.conf.d	2011-05-15 11:10:08 UTC (rev 123979)
@@ -0,0 +1,5 @@
+#
+# Arguments to be passed to the acpid daemon
+#
+
+ACPID_ARGS=""

Modified: handler.sh
===================================================================
--- handler.sh	2011-05-15 10:48:28 UTC (rev 123978)
+++ handler.sh	2011-05-15 11:10:08 UTC (rev 123979)
@@ -26,7 +26,7 @@
         ;;
     ac_adapter)
         case "$2" in
-            AC)
+            AC|ACAD|ADP0)
                 case "$4" in
                     00000000)
                         echo -n $minspeed >$setspeed