aboutsummaryrefslogtreecommitdiffstats
path: root/main
diff options
context:
space:
mode:
authorSören Tempel <soeren+git@soeren-tempel.net>2018-01-19 18:25:24 +0100
committerSören Tempel <soeren+git@soeren-tempel.net>2018-01-24 20:26:12 +0100
commit6f13e59b1dd3f29b18acdbb5b6ee49743cd0b2c1 (patch)
treee9547016069f4e72b137499c0f3ffc905664df35 /main
parent03f715c930f99e82076d5f2d536933a89b09787e (diff)
downloadaports-6f13e59b1dd3f29b18acdbb5b6ee49743cd0b2c1.tar.bz2
aports-6f13e59b1dd3f29b18acdbb5b6ee49743cd0b2c1.tar.xz
main/cryptsetup: depend on argon2
Upstream highly recommends this.
Diffstat (limited to 'main')
-rw-r--r--main/argon2/APKBUILD31
-rw-r--r--main/cryptsetup/APKBUILD6
2 files changed, 35 insertions, 2 deletions
diff --git a/main/argon2/APKBUILD b/main/argon2/APKBUILD
new file mode 100644
index 0000000000..b29b65a033
--- /dev/null
+++ b/main/argon2/APKBUILD
@@ -0,0 +1,31 @@
+# Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
+# Contributor: Corey Oliver <coreyjonoliver@gmail.com>
+# Maintainer: Corey Oliver <coreyjonoliver@gmail.com>
+pkgname=argon2
+_pkgname=phc-winner-argon2
+pkgver=20171227
+pkgrel=0
+pkgdesc="The password hash Argon2, winner of PHC"
+url="https://github.com/P-H-C/phc-winner-argon2"
+arch="all !armhf"
+license="Apache-2.0 CC0-1.0"
+subpackages="$pkgname-dev $pkgname-dev $pkgname-libs"
+source="$pkgname-$pkgver.tar.gz::https://github.com/P-H-C/$_pkgname/archive/$pkgver.tar.gz"
+builddir="$srcdir/$_pkgname-$pkgver"
+
+build() {
+ cd "$builddir"
+ make OPTTARGET=none
+}
+
+check() {
+ cd "$builddir"
+ make OPTTARGET=none test
+}
+
+package() {
+ cd "$builddir"
+ make OPTTARGET=none DESTDIR="$pkgdir" install
+}
+
+sha512sums="9c9e1a3905e61ac6913d1e073c104477e419ddd0506adc4487e88e98d19165ed8901fe8bb11246ed0cc71b3523c190da9692d5926642f86be09c3e67510afe4d argon2-20171227.tar.gz"
diff --git a/main/cryptsetup/APKBUILD b/main/cryptsetup/APKBUILD
index 4a35f3b2bc..1939d9c16b 100644
--- a/main/cryptsetup/APKBUILD
+++ b/main/cryptsetup/APKBUILD
@@ -2,14 +2,15 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=cryptsetup
pkgver=2.0.0
-pkgrel=0
+pkgrel=1
pkgdesc="Userspace setup tool for transparent encryption of block devices using the Linux 2.6 cryptoapi"
url="https://gitlab.com/cryptsetup/cryptsetup"
arch="all"
license="GPL-2.0-or-later"
depends=""
makedepends_build=""
-makedepends_host="lvm2-dev libressl-dev popt-dev util-linux-dev json-c-dev"
+makedepends_host="lvm2-dev libressl-dev popt-dev util-linux-dev
+ json-c-dev argon2-dev"
makedepends="$makedepends_build $makedepends_host"
subpackages="$pkgname-dev $pkgname-doc $pkgname-libs"
source="https://www.kernel.org/pub/linux/utils/$pkgname/v${pkgver%.*}/$pkgname-$pkgver.tar.gz
@@ -28,6 +29,7 @@ build() {
--libdir=/lib \
--sbindir=/sbin \
--disable-static \
+ --enable-libargon2 \
--with-crypto_backend=openssl \
--with-luks2-lock-path=/run/cryptsetup # https://gitlab.com/cryptsetup/cryptsetup/issues/362
make