[arch-commits] Commit in acpid/repos (4 files)

Eric Bélanger eric at archlinux.org
Wed Dec 3 02:25:59 UTC 2008


    Date: Tuesday, December 2, 2008 @ 21:25:58
  Author: eric
Revision: 20371

fixed svn conflict

Modified:
  acpid/repos/extra-x86_64/	(properties)
  acpid/repos/extra-x86_64/PKGBUILD
  acpid/repos/extra-x86_64/handler.sh
Deleted:
  acpid/repos/extra-x86_64/acpid-1.0.4-gcc4.patch

------------------------+
 PKGBUILD               |   46 +++++++++++---------
 acpid-1.0.4-gcc4.patch |   20 ---------
 handler.sh             |  103 +++++++++++++++++++++++------------------------
 3 files changed, 76 insertions(+), 93 deletions(-)


Property changes on: acpid/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /acpid/trunk:1
   + /acpid/trunk:1-20370

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2008-12-03 02:22:57 UTC (rev 20370)
+++ extra-x86_64/PKGBUILD	2008-12-03 02:25:58 UTC (rev 20371)
@@ -1,32 +1,36 @@
 # $Id$
-# Maintainer: Judd Vinet <jvinet at zeroflux.org>
 # Contributor: Manolis Tzanidakis
+# Contributor: Judd Vinet <jvinet at zeroflux.org>
+# Maintainer: Thayer Williams <thayer at archlinux.org>
+
 pkgname=acpid
-pkgver=1.0.6
+pkgver=1.0.8
 pkgrel=1
-pkgdesc="Utilities for using ACPI power management"
-arch=(i686 x86_64)
+pkgdesc="A daemon for delivering ACPI power management events"
+arch=('i686' 'x86_64')
+url="http://acpid.sourceforge.net"
 license=('GPL')
-url="http://acpid.sourceforge.net"
 depends=(glibc)
 source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz
-	acpid
-	anything
-	handler.sh)
+    acpid
+    anything
+    handler.sh)
+md5sums=('1d9c52fe2c0b51f8463f357c2a3d3ddb' '15903690f1bae4b3b0625b369de65521'\
+         '2d37b98d6e74bab815604b8b48c6cfd4' '0e8dd13793b1baa79a745f4034888367')
 backup=('etc/acpi/handler.sh' 'etc/acpi/events/anything')
-md5sums=('5c9b705700df51d232be223b6ab6414d'
-         '15903690f1bae4b3b0625b369de65521'
-         '2d37b98d6e74bab815604b8b48c6cfd4'
-         '7c304427e87e9551b885af223eb39be6')
 
 build() {
-  cd $startdir/src/$pkgname-$pkgver
-  /usr/bin/make || return 1
-  /bin/install -d -m0755 $startdir/pkg/usr/bin
-  /usr/bin/make INSTPREFIX=$startdir/pkg \
-      MAN8DIR=$startdir/pkg/usr/man/man8 install
-  /bin/install -D -m0755 ../acpid $startdir/pkg/etc/rc.d/acpid
-  /bin/install -d -m0755 $startdir/pkg/etc/acpi/events
-  /bin/install -D -m0644 ../anything $startdir/pkg/etc/acpi/events/anything
-  /bin/install -D -m0755 ../handler.sh $startdir/pkg/etc/acpi/handler.sh
+    cd $srcdir/$pkgname-$pkgver
+    /usr/bin/make || return 1
+    /bin/install -d -m0755 $pkgdir/usr/bin || return 1
+    /usr/bin/make INSTPREFIX=$pkgdir \
+        MAN8DIR=$pkgdir/usr/share/man/man8 install || return 1
+
+    # install our supplementary scripts
+    /bin/install -D -m0755 $srcdir/acpid $pkgdir/etc/rc.d/acpid || return 1
+    /bin/install -D -m0644 $srcdir/anything $pkgdir/etc/acpi/events/anything || return 1
+    /bin/install -D -m0755 $srcdir/handler.sh $pkgdir/etc/acpi/handler.sh || return 1
+
+    # set world readable bit on the acpid binary
+    /bin/chmod 755 $pkgdir/usr/sbin/acpid || return 1
 }

Deleted: extra-x86_64/acpid-1.0.4-gcc4.patch
===================================================================
--- extra-x86_64/acpid-1.0.4-gcc4.patch	2008-12-03 02:22:57 UTC (rev 20370)
+++ extra-x86_64/acpid-1.0.4-gcc4.patch	2008-12-03 02:25:58 UTC (rev 20371)
@@ -1,20 +0,0 @@
---- acpid-1.0.4/ud_socket.c	2005-04-26 10:26:29.000000000 +0000
-+++ acpid-1.0.4.az/ud_socket.c	2005-04-26 10:27:09.000000000 +0000
-@@ -60,7 +60,7 @@
- 		struct sockaddr_un cliaddr;
- 		int len = sizeof(struct sockaddr_un);
- 
--		newsock = accept(listenfd, (struct sockaddr *)&cliaddr, &len);
-+		newsock = accept(listenfd, (struct sockaddr *)&cliaddr, (socklen_t *)&len);
- 		if (newsock < 0) {
- 			if (errno == EINTR) {
- 				continue; /* signal */
-@@ -71,7 +71,7 @@
- 
- 		if (cred) {
- 			len = sizeof(struct ucred);
--			getsockopt(newsock, SOL_SOCKET, SO_PEERCRED,cred,&len);
-+			getsockopt(newsock, SOL_SOCKET, SO_PEERCRED,cred,(socklen_t *)&len);
- 		}
- 
- 		return newsock;

Modified: extra-x86_64/handler.sh
===================================================================
--- extra-x86_64/handler.sh	2008-12-03 02:22:57 UTC (rev 20370)
+++ extra-x86_64/handler.sh	2008-12-03 02:25:58 UTC (rev 20371)
@@ -11,56 +11,55 @@
 set $*
 
 case "$1" in
-	button/power)
-		#echo "PowerButton pressed!">/dev/tty5
-		case "$2" in
-			PWRF)	logger "PowerButton pressed: $2" ;;
-			*)    logger "ACPI action undefined: $2" ;;
-		esac
-		;;
-	button/sleep)
-		case "$2" in
-			SLPB) echo -n mem >/sys/power/state ;;
-			*)    logger "ACPI action undefined: $2" ;;
-		esac
-		;;
-	ac_adapter)
-		case "$2" in
-			AC)
-				case "$4" in
-					00000000)
-						echo -n $minspeed >$setspeed
-						#/etc/laptop-mode/laptop-mode start
-					;;
-					00000001)
-						echo -n $maxspeed >$setspeed
-						#/etc/laptop-mode/laptop-mode stop
-					;;
-				esac
-				;;
-			*) logger "ACPI action undefined: $2" ;;
-		esac
-		;;
-	battery)
-		case "$2" in
-			BAT0)
-				case "$4" in
-					00000000)	#echo "offline" >/dev/tty5
-					;;
-					00000001)	#echo "online"  >/dev/tty5
-					;;
-				esac
-				;;
-			CPU0)	
-				;;
-			*) logger "ACPI action undefined: $2" ;;
-		esac
-		;;
-
-	button/lid)
-		#echo "LID switched!">/dev/tty5
-		;;
-	*)
-		logger "ACPI group/action undefined: $1 / $2"
-		;;
+    button/power)
+        #echo "PowerButton pressed!">/dev/tty5
+        case "$2" in
+            PWRF)   logger "PowerButton pressed: $2" ;;
+            *)      logger "ACPI action undefined: $2" ;;
+        esac
+        ;;
+    button/sleep)
+        case "$2" in
+            SLPB)   echo -n mem >/sys/power/state ;;
+            *)      logger "ACPI action undefined: $2" ;;
+        esac
+        ;;
+    ac_adapter)
+        case "$2" in
+            AC)
+                case "$4" in
+                    00000000)
+                        echo -n $minspeed >$setspeed
+                        #/etc/laptop-mode/laptop-mode start
+                    ;;
+                    00000001)
+                        echo -n $maxspeed >$setspeed
+                        #/etc/laptop-mode/laptop-mode stop
+                    ;;
+                esac
+                ;;
+            *)  logger "ACPI action undefined: $2" ;;
+        esac
+        ;;
+    battery)
+        case "$2" in
+            BAT0)
+                case "$4" in
+                    00000000)   #echo "offline" >/dev/tty5
+                    ;;
+                    00000001)   #echo "online"  >/dev/tty5
+                    ;;
+                esac
+                ;;
+            CPU0)	
+                ;;
+            *)  logger "ACPI action undefined: $2" ;;
+        esac
+        ;;
+    button/lid)
+        #echo "LID switched!">/dev/tty5
+        ;;
+    *)
+        logger "ACPI group/action undefined: $1 / $2"
+        ;;
 esac




More information about the arch-commits mailing list