aboutsummaryrefslogtreecommitdiffstats
path: root/main/cryptsetup
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2014-10-24 13:04:35 +0200
committerNatanael Copa <ncopa@alpinelinux.org>2014-10-24 13:05:37 +0200
commit24721fe3c7f2979b4031e78bdc15262b4d586593 (patch)
treef5a2695c18e8429dfe0a1648a0b937d503e7859c /main/cryptsetup
parent27b42993848c39a9c02a8fe56544894b3c2577a2 (diff)
downloadaports-24721fe3c7f2979b4031e78bdc15262b4d586593.tar.bz2
aports-24721fe3c7f2979b4031e78bdc15262b4d586593.tar.xz
main/cryptsetup: make sure we flush stdout when prompting user
ref #3471
Diffstat (limited to 'main/cryptsetup')
-rw-r--r--main/cryptsetup/APKBUILD6
-rw-r--r--main/cryptsetup/flush-stdout.patch17
2 files changed, 22 insertions, 1 deletions
diff --git a/main/cryptsetup/APKBUILD b/main/cryptsetup/APKBUILD
index 88b2ad1fff..0c89afbfa8 100644
--- a/main/cryptsetup/APKBUILD
+++ b/main/cryptsetup/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=cryptsetup
pkgver=1.6.6
-pkgrel=1
+pkgrel=2
pkgdesc="Userspace setup tool for transparent encryption of block devices using the Linux 2.6 cryptoapi"
url="http://code.google.com/p/cryptsetup/"
arch="all"
@@ -10,6 +10,7 @@ depends=""
makedepends="lvm2-dev openssl-dev popt-dev util-linux-dev !libiconv-dev"
subpackages="$pkgname-dev $pkgname-doc $pkgname-libs"
source="https://www.kernel.org/pub/linux/utils/cryptsetup/v${pkgver%.*}/cryptsetup-$pkgver.tar.gz
+ flush-stdout.patch
dmcrypt.confd
dmcrypt.initd
"
@@ -59,11 +60,14 @@ libs() {
}
md5sums="24790bd4f4fa24570d7ea9af27ccf079 cryptsetup-1.6.6.tar.gz
+7d5c8727ea417cabe86df67a9de1de16 flush-stdout.patch
1369aeaed84e41c8d585695596a24bd6 dmcrypt.confd
bef4b9289822c47a293f2a0be3526e9c dmcrypt.initd"
sha256sums="38ccd1ceff41760ccfbaaa5394ebb6117d69bd0ea2e00bf07c0d1353c41be6ac cryptsetup-1.6.6.tar.gz
+6ac335bb14ff2f90de00769be20da4c5527101fab6593259a4d87be84904ae67 flush-stdout.patch
0c30e081c0b8f879964ae49735f10b05a1d92f4f481042851958860945e13271 dmcrypt.confd
02faf27470ea0e50b764c923786724847e77dfdf9680a50cc202546cad2bf02f dmcrypt.initd"
sha512sums="ce8ea9402f0eb9f3ab920df51837492802dd35394422ef4643a0eb82e6aad67cf72ac428b7caf622539af188f9fe5ba530f06b522f65ed55b0133c5c67ab2723 cryptsetup-1.6.6.tar.gz
+301e3e3da5a899e0a6f01f44fbf37bb6a3f5b6a4fb41243bae6d3b7aea747276e784626cd1b19721cc264652c10ae8c560c4d20094e33bb82fb2fae0160682c0 flush-stdout.patch
d04ae17d3708ef20ade7afb223d4ef19e1b6812e0be8f9499e37e9c71344568b42030d9dd8f6918a9bfb211a3a94b40a9354e3b32a009cb165e84508d0a5e14b dmcrypt.confd
660d1a29294e8e01343aea0b92d9159d42891261d41313c3f9e77ed3bd69e648d19d3799a8ad1b00884b6f4c0f48d4e12cb406ca291e64b789e71ba70ab3c29f dmcrypt.initd"
diff --git a/main/cryptsetup/flush-stdout.patch b/main/cryptsetup/flush-stdout.patch
new file mode 100644
index 0000000000..ae21a235f5
--- /dev/null
+++ b/main/cryptsetup/flush-stdout.patch
@@ -0,0 +1,17 @@
+--- ./src/utils_tools.c.orig 2014-10-24 12:58:35.151717616 -0200
++++ ./src/utils_tools.c 2014-10-24 13:00:42.716855265 -0200
+@@ -105,10 +105,13 @@
+
+ case CRYPT_LOG_NORMAL:
+ fputs(msg, stdout);
++ fflush(stdout);
+ break;
+ case CRYPT_LOG_VERBOSE:
+- if (opt_verbose)
++ if (opt_verbose) {
+ fputs(msg, stdout);
++ fflush(stdout);
++ }
+ break;
+ case CRYPT_LOG_ERROR:
+ fputs(msg, stderr);