3 files changed, 40 insertions, 11 deletions
diff --git a/file2key-libpassphrase/PKGBUILD b/file2key-libpassphrase/PKGBUILD
new file mode 100644
index 0000000..fe5a842
--- /dev/null
+++ b/file2key-libpassphrase/PKGBUILD
@@ -0,0 +1,31 @@
+# Maintainer: Mattias Andrée <`base64 -d`(bWFhbmRyZWUK)@kth.se>
+
+pkgname=file2key-libpassphrase
+pkgver=3
+pkgrel=1
+pkgdesc="A simple command that generates a key from a file and a passphrase, libpassphrase version"
+arch=(i686 x86_64)
+url="https://github.com/maandree/file2key"
+license=('custom:ISC')
+conflicts=(file2key)
+provides=(file2key)
+depends=(glibc libkeccak libpassphrase)
+makedepends=(make coreutils gcc glibc libkeccak libpassphrase)
+source=(file2key-$pkgver.tar.gz::$url/archive/$pkgver.tar.gz)
+sha256sums=(018b8b2b44a5781d15f464b85e8787492af816d79f3e7af2561901cd7644812b)
+
+prepare() {
+  cd "${srcdir}/file2key-${pkgver}"
+  sed '/CPPFLAGS/s/$/ -DWITH_LIBPASSPHRASE/' < config.mk > config.mk.tmp
+  sed '/LDFLAGS/s/$/ -lpassphrase/' < config.mk.tmp > config.mk
+}
+
+build() {
+  cd "$srcdir/file2key-$pkgver"
+  make PREFIX=/usr
+}
+
+package() {
+  cd "$srcdir/file2key-$pkgver"
+  make PREFIX=/usr install DESTDIR="$pkgdir"
+}
diff --git a/file2key-libpassphrase/upload b/file2key-libpassphrase/upload
new file mode 120000
index 0000000..1e7a8be
--- /dev/null
+++ b/file2key-libpassphrase/upload
@@ -0,0 +1 @@
+../upload
+\ No newline at end of file
diff --git a/file2key/PKGBUILD b/file2key/PKGBUILD
index 3422a64..c75dddc 100644
--- a/file2key/PKGBUILD
+++ b/file2key/PKGBUILD
@@ -1,26 +1,23 @@
-# Maintainer: Mattias Andrée <`base64 -d`(bWFhbmRyZWUK)@member.fsf.org>
+# Maintainer: Mattias Andrée <`base64 -d`(bWFhbmRyZWUK)@kth.se>
 
 pkgname=file2key
-pkgver=2
-pkgrel=1
+pkgver=3
+pkgrel=2
 pkgdesc="A simple command that generates a key from a file and a passphrase"
 arch=(i686 x86_64)
 url="https://github.com/maandree/file2key"
-license=('GPL3')
-depends=(glibc libpassphrase libkeccak)
-makedepends=(make coreutils gcc glibc libpassphrase libkeccak)
-source=($url/archive/$pkgver.tar.gz)
-sha256sums=(aa8d50ade18a77a5f721d2c843e089abf5a6ee9aa163821c564db19e0de75ac8)
-
+license=('custom:ISC')
+depends=(glibc libkeccak)
+makedepends=(make coreutils gcc glibc libkeccak)
+source=($pkgname-$pkgver.tar.gz::$url/archive/$pkgver.tar.gz)
+sha256sums=(018b8b2b44a5781d15f464b85e8787492af816d79f3e7af2561901cd7644812b)
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
   make PREFIX=/usr
 }
 
-
 package() {
   cd "$srcdir/$pkgname-$pkgver"
   make PREFIX=/usr install DESTDIR="$pkgdir"
 }
-