[arch-commits] Commit in hal/trunk (PKGBUILD cryptsetup_location.patch)

[Thomas Bächler]

    Date: Thursday, June 10, 2010 @ 07:09:57
  Author: thomas
Revision: 82340

Adjust for new cryptsetup path

Modified:
  hal/trunk/PKGBUILD
Deleted:
  hal/trunk/cryptsetup_location.patch

---------------------------+
 PKGBUILD                  |    5 +----
 cryptsetup_location.patch |   36 ------------------------------------
 2 files changed, 1 insertion(+), 40 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-06-10 11:09:35 UTC (rev 82339)
+++ PKGBUILD	2010-06-10 11:09:57 UTC (rev 82340)
@@ -4,7 +4,7 @@
 
 pkgname=hal
 pkgver=0.5.14
-pkgrel=2
+pkgrel=3
 pkgdesc="Hardware Abstraction Layer"
 arch=(i686 x86_64)
 license=('GPL' 'custom')
@@ -15,7 +15,6 @@
 install=hal.install
 source=(http://hal.freedesktop.org/releases/${pkgname}-${pkgver}.tar.gz
         hal
-        cryptsetup_location.patch
         hal-0.5.9-hide-diagnostic.patch
         hal-remove-dell-killswitch.patch
         hal-KVM-evdev.patch
@@ -29,7 +28,6 @@
         macbook-fix-ioperm.patch)
 md5sums=('e9163df591a6f38f59fdbfe33e73bf20'
          '277e96ac130d7bfce0b30f0b80db8782'
-         'c688a3c6574699365926f4fef7441545'
          '4d4b6801a1cedca22b8bdd9db73b16fb'
          '6d87c3e63184ae3a69caafc846f538a3'
          '6507e5091ee2d11a87ae738a8e2caecb'
@@ -44,7 +42,6 @@
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i "${srcdir}/cryptsetup_location.patch" || return 1
   patch -Np1 -i "${srcdir}/hal-0.5.9-hide-diagnostic.patch" || return 1
   patch -Np1 -i "${srcdir}/hal-remove-dell-killswitch.patch" || return 1
   patch -Np1 -i "${srcdir}/hal-KVM-evdev.patch" || return 1

Deleted: cryptsetup_location.patch
===================================================================
--- cryptsetup_location.patch	2010-06-10 11:09:35 UTC (rev 82339)
+++ cryptsetup_location.patch	2010-06-10 11:09:57 UTC (rev 82340)
@@ -1,36 +0,0 @@
-diff -Naur hal-0.5.8.1/tools/linux/hal-luks-remove-linux hal-0.5.8.1-new/tools/linux/hal-luks-remove-linux
---- hal-0.5.8.1/tools/linux/hal-luks-remove-linux	2006-09-19 22:23:25.000000000 +0200
-+++ hal-0.5.8.1-new/tools/linux/hal-luks-remove-linux	2007-02-11 13:04:46.000000000 +0100
-@@ -6,7 +6,7 @@
- # This program is free software; you can redistribute it and/or modify
- # it under the terms of the GNU General Public License version 2.
- 
--CRYPTSETUP=/sbin/cryptsetup
-+CRYPTSETUP=/usr/sbin/cryptsetup
- 
- echo LUKS cryptotext device $HAL_PROP_INFO_UDI is going away
- 
-diff -Naur hal-0.5.8.1/tools/linux/hal-luks-setup-linux hal-0.5.8.1-new/tools/linux/hal-luks-setup-linux
---- hal-0.5.8.1/tools/linux/hal-luks-setup-linux	2006-09-19 22:23:25.000000000 +0200
-+++ hal-0.5.8.1-new/tools/linux/hal-luks-setup-linux	2007-02-11 13:04:45.000000000 +0100
-@@ -9,7 +9,7 @@
- read password
- PASSWORD=${PASSWORD//[^[:alnum:]_=[:space:]:.+-]/@}
- 
--CRYPTSETUP=/sbin/cryptsetup
-+CRYPTSETUP=/usr/sbin/cryptsetup
- 
- if [ ! -f $CRYPTSETUP ]; then
-     echo org.freedesktop.Hal.Device.Volume.Crypto.SetupError >&2
-diff -Naur hal-0.5.8.1/tools/linux/hal-luks-teardown-linux hal-0.5.8.1-new/tools/linux/hal-luks-teardown-linux
---- hal-0.5.8.1/tools/linux/hal-luks-teardown-linux	2006-09-19 22:23:25.000000000 +0200
-+++ hal-0.5.8.1-new/tools/linux/hal-luks-teardown-linux	2007-02-11 13:04:44.000000000 +0100
-@@ -6,7 +6,7 @@
- # This program is free software; you can redistribute it and/or modify
- # it under the terms of the GNU General Public License version 2.
- 
--CRYPTSETUP=/sbin/cryptsetup
-+CRYPTSETUP=/usr/sbin/cryptsetup
- 
- if [ ! -f $CRYPTSETUP ]; then
- 	echo org.freedesktop.Hal.Device.Volume.Crypto.TeardownError >&2