summaryrefslogtreecommitdiff
path: root/core/cryptsetup
diff options
context:
space:
mode:
authorroot <root@rshg054.dnsready.net>2012-04-28 00:01:35 +0000
committerroot <root@rshg054.dnsready.net>2012-04-28 00:01:35 +0000
commit00f77ef3b2b7856520daba393370f67b773c2184 (patch)
treeac5b63574a95d0d851e012957254f7456ced564f /core/cryptsetup
parent5233daa5825f00ccf0722ef9733ea6b3bbd44bc8 (diff)
Sat Apr 28 00:01:35 UTC 2012
Diffstat (limited to 'core/cryptsetup')
-rw-r--r--core/cryptsetup/PKGBUILD15
-rw-r--r--core/cryptsetup/encrypt_install8
2 files changed, 10 insertions, 13 deletions
diff --git a/core/cryptsetup/PKGBUILD b/core/cryptsetup/PKGBUILD
index 395318ac1..3e9f8bc8a 100644
--- a/core/cryptsetup/PKGBUILD
+++ b/core/cryptsetup/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 146230 2012-01-06 14:32:39Z thomas $
+# $Id: PKGBUILD 157320 2012-04-26 22:51:21Z eric $
# Maintainer: Thomas Bächler <thomas@archlinux.org>
pkgname=cryptsetup
pkgver=1.4.1
-pkgrel=1
+pkgrel=3
pkgdesc="Userspace setup tool for transparent encryption of block devices using dm-crypt"
arch=(i686 x86_64)
license=('GPL')
@@ -18,10 +18,10 @@ source=(http://cryptsetup.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2
sha256sums=('82b143328c2b427ef2b89fb76c701d311c95b54093c21bbf22342f7b393bddcb'
'71c6506d4b6d0b22b9b6c2a68e604959e4c072af04680ed6acc0126c97bdbc88'
'811bbea1337106ad811731c746d73ee81039bad00aef52398e3a377ad0766757'
- 'd4380195351b70abf8fcb3cd19461879c55a7a07e4915d1f0365b295b112a573')
+ 'ddbbdcb8eff93a3a7622ec633e90d5c0d68e3afbeaf942dc2309adab345047d4')
build() {
cd "${srcdir}"/$pkgname-${pkgver}
- ./configure --prefix=/usr --disable-static --sbindir=/sbin --libdir=/lib
+ ./configure --prefix=/usr --disable-static --sbindir=/sbin
make
}
@@ -29,9 +29,6 @@ package() {
cd "${srcdir}"/$pkgname-${pkgver}
make DESTDIR="${pkgdir}" install
# install hook
- install -D -m644 "${srcdir}"/encrypt_hook "${pkgdir}"/lib/initcpio/hooks/encrypt
- install -D -m644 "${srcdir}"/encrypt_install "${pkgdir}"/lib/initcpio/install/encrypt
- # Fix pkgconfig location
- install -d -m755 "${pkgdir}"/usr/lib
- mv "${pkgdir}"/lib/pkgconfig "${pkgdir}"/usr/lib/
+ install -D -m644 "${srcdir}"/encrypt_hook "${pkgdir}"/usr/lib/initcpio/hooks/encrypt
+ install -D -m644 "${srcdir}"/encrypt_install "${pkgdir}"/usr/lib/initcpio/install/encrypt
}
diff --git a/core/cryptsetup/encrypt_install b/core/cryptsetup/encrypt_install
index 13174ec06..9ed50e863 100644
--- a/core/cryptsetup/encrypt_install
+++ b/core/cryptsetup/encrypt_install
@@ -12,10 +12,10 @@ build()
[ -f "/sbin/cryptsetup" ] && add_binary "/sbin/cryptsetup" "/sbin/cryptsetup"
[ -f "/usr/sbin/cryptsetup" ] && add_binary "/usr/sbin/cryptsetup" "/sbin/cryptsetup"
add_binary "/sbin/dmsetup"
- add_file "/lib/udev/rules.d/10-dm.rules"
- add_file "/lib/udev/rules.d/13-dm-disk.rules"
- add_file "/lib/udev/rules.d/95-dm-notify.rules"
- add_file "/lib/initcpio/udev/11-dm-initramfs.rules" "/lib/udev/rules.d/11-dm-initramfs.rules"
+ add_file "/usr/lib/udev/rules.d/10-dm.rules"
+ add_file "/usr/lib/udev/rules.d/13-dm-disk.rules"
+ add_file "/usr/lib/udev/rules.d/95-dm-notify.rules"
+ add_file "/usr/lib/initcpio/udev/11-dm-initramfs.rules" "/usr/lib/udev/rules.d/11-dm-initramfs.rules"
}
help ()