summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorAllen Wild2021-01-09 19:12:28 -0500
committerAllen Wild2021-01-09 19:15:04 -0500
commit111a7ef6893cc3ad172c21734796a5e70fd56129 (patch)
tree9c16294adec1ba078af5093c6a679c3da5807045
parent3f7b3b052e7749b3fcf72b57ceebbd6caa48eb34 (diff)
parentd6447fd4dd92e1d50daa5f0431730c6705071df7 (diff)
downloadaur-111a7ef6893cc3ad172c21734796a5e70fd56129.tar.gz
Merge v0.7.3-1
-rw-r--r--.SRCINFO13
-rw-r--r--PKGBUILD17
2 files changed, 13 insertions, 17 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 11664817c90c..9090e9cc39b5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,11 +1,12 @@
pkgbase = dislocker-noruby
- pkgdesc = Read BitLocker encrypted volumes under Linux (no ruby bindings/dependency)
- pkgver = 0.7.1
- pkgrel = 2
+ pkgdesc = Read/write BitLocker-encrypted volumes (no ruby bindings/dependency)
+ pkgver = 0.7.3
+ pkgrel = 1
url = https://github.com/Aorimn/dislocker
arch = i686
arch = x86_64
license = GPL2
+ makedepends = make
makedepends = cmake
depends = fuse
depends = mbedtls
@@ -13,11 +14,9 @@ pkgbase = dislocker-noruby
provides = dislocker
conflicts = dislocker
conflicts = dislocker-git
- source = https://github.com/Aorimn/dislocker/archive/v0.7.1.tar.gz
- source = https://github.com/Aorimn/dislocker/commit/f778706e72d9f7bac84a5a4cd37f0b56cebdef49.patch
+ source = https://github.com/Aorimn/dislocker/archive/v0.7.3.tar.gz
source = no-ruby.patch
- sha256sums = 742fb5c1b3ff540368ced54c29eae8b488ae5a5fcaca092947e17c2d358a6762
- sha256sums = ad177e697e84f88ee91f7cb6a9ab3a47100665155107abc8c9e965529bc81cff
+ sha256sums = 8d5275577c44f2bd87f6e05dd61971a71c0e56a9cbedf000bd38deadd8b6c1e6
sha256sums = 0b8d211cab004d17ec7a3841ca4597a909a5b61fe6197125d26a09f4ef669a85
pkgname = dislocker-noruby
diff --git a/PKGBUILD b/PKGBUILD
index 6b6a8f5b5d71..4fc85c92b841 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,29 +3,25 @@
_name=dislocker
pkgname=${_name}-noruby
-pkgver=0.7.1
-pkgrel=2
-pkgdesc="Read BitLocker encrypted volumes under Linux (no ruby bindings/dependency)"
+pkgver=0.7.3
+pkgrel=1
+pkgdesc="Read/write BitLocker-encrypted volumes (no ruby bindings/dependency)"
arch=('i686' 'x86_64')
url="https://github.com/Aorimn/dislocker"
license=('GPL2')
depends=('fuse' 'mbedtls')
-makedepends=('cmake')
+makedepends=('make' 'cmake')
provides=('dislocker')
conflicts=('dislocker' 'dislocker-git')
optdepends=('ntfs-3g: NTFS file system support')
-source=(https://github.com/Aorimn/dislocker/archive/v$pkgver.tar.gz
- # Fix issues with Win10 1903 https://github.com/Aorimn/dislocker/pull/187
- https://github.com/Aorimn/dislocker/commit/f778706e72d9f7bac84a5a4cd37f0b56cebdef49.patch
+source=($url/archive/v$pkgver.tar.gz
no-ruby.patch)
-sha256sums=('742fb5c1b3ff540368ced54c29eae8b488ae5a5fcaca092947e17c2d358a6762'
- 'ad177e697e84f88ee91f7cb6a9ab3a47100665155107abc8c9e965529bc81cff'
+sha256sums=('8d5275577c44f2bd87f6e05dd61971a71c0e56a9cbedf000bd38deadd8b6c1e6'
'0b8d211cab004d17ec7a3841ca4597a909a5b61fe6197125d26a09f4ef669a85')
prepare() {
cd "$srcdir/$_name-$pkgver"
- patch -p1 -i "$srcdir/f778706e72d9f7bac84a5a4cd37f0b56cebdef49.patch"
patch -p1 -i "$srcdir/no-ruby.patch"
}
@@ -34,6 +30,7 @@ build() {
cmake -DCMAKE_INSTALL_PREFIX=/usr \
-Dlibdir=/usr/lib \
+ -DC_INCLUDE_PATH="$C_INCLUDE_PATH:/usr/include/ruby-2.6.0/" \
-D WARN_FLAGS:STRING="-Wall -Wextra" \
-DWITH_RUBY=OFF \
.