diff options
| author | Timo Teräs <timo.teras@iki.fi> | 2017-01-31 11:14:23 +0200 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2017-01-31 11:15:45 +0200 |
| commit | ad3f68e3e5e9153aed56f3e551600ab5ceee6dd8 (patch) | |
| tree | 536a06fd2bc268b202c9e61e66dd62e95ea91896 /testing | |
| parent | cc6c92eeccb66075874a10ba803ed88ad020b876 (diff) | |
| download | aports-ad3f68e3e5e9153aed56f3e551600ab5ceee6dd8.tar.bz2 aports-ad3f68e3e5e9153aed56f3e551600ab5ceee6dd8.tar.xz | |
testing/ecryptfs-utils: flush stdout before prompting things
musl has line buffered stdout, so flush it before waiting for input.
Diffstat (limited to 'testing')
| -rw-r--r-- | testing/ecryptfs-utils/APKBUILD | 12 | ||||
| -rw-r--r-- | testing/ecryptfs-utils/fix-stdout-flush.patch | 30 |
2 files changed, 38 insertions, 4 deletions
diff --git a/testing/ecryptfs-utils/APKBUILD b/testing/ecryptfs-utils/APKBUILD index fbf5b76d76..68d1c39ed5 100644 --- a/testing/ecryptfs-utils/APKBUILD +++ b/testing/ecryptfs-utils/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Timo Teräs <timo.teras@iki.fi> pkgname=ecryptfs-utils pkgver=111 -pkgrel=1 +pkgrel=2 pkgdesc="Enterprise-class stacked cryptographic filesystem for Linux" url="https://launchpad.net/ecryptfs" arch="all" @@ -15,6 +15,7 @@ options="suid" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang py-ecryptfs-utils:py" source="http://launchpad.net/ecryptfs/trunk/${pkgver}/+download/${pkgname}_${pkgver}.orig.tar.gz fix-build.patch + fix-stdout-flush.patch " builddir="$srcdir"/${pkgname}-${pkgver} @@ -46,8 +47,11 @@ py() { } md5sums="83513228984f671930752c3518cac6fd ecryptfs-utils_111.orig.tar.gz -d42bb467a5912df0d2e83e9fdd2553dd fix-build.patch" +d42bb467a5912df0d2e83e9fdd2553dd fix-build.patch +12c5334bb856151cdbd70d174ce88c01 fix-stdout-flush.patch" sha256sums="112cb3e37e81a1ecd8e39516725dec0ce55c5f3df6284e0f4cc0f118750a987f ecryptfs-utils_111.orig.tar.gz -7f1038542a3aaba0cf5dd898f2e6e2ffbb9792fecff1a4eb532bb8bc39907fb9 fix-build.patch" +7f1038542a3aaba0cf5dd898f2e6e2ffbb9792fecff1a4eb532bb8bc39907fb9 fix-build.patch +fe38e0813485fdc09832fe81538089f772372bc830a3d8140d9b3f8ed99670d2 fix-stdout-flush.patch" sha512sums="d8643f3a1f9981fecc6a08b4aa0adb6272e7340db794f6e7507cba7b712247c6beb239f27875eab6e38a69b45bc2476e6bf6b4485eb82d58f65cc469f8613c18 ecryptfs-utils_111.orig.tar.gz -09ff196e6d3ef54ef57e22e78a4af748c2989928a5c8bc3ece1f8c21c5f301b7e56142c5098111ac853ac88c1b2ee2d0b5c606a210fb53cdf0fde534aa0af92f fix-build.patch" +09ff196e6d3ef54ef57e22e78a4af748c2989928a5c8bc3ece1f8c21c5f301b7e56142c5098111ac853ac88c1b2ee2d0b5c606a210fb53cdf0fde534aa0af92f fix-build.patch +c9eb924890a8fa3ffe8b8344a493419cf93336743b1a3a8dba984f62f8eb7a43ed6b6dbbbb7efe9e7fc84b60e71d7100f042a72c407fc9e8c4fcbeeb73d848a3 fix-stdout-flush.patch" diff --git a/testing/ecryptfs-utils/fix-stdout-flush.patch b/testing/ecryptfs-utils/fix-stdout-flush.patch new file mode 100644 index 0000000000..7f097be242 --- /dev/null +++ b/testing/ecryptfs-utils/fix-stdout-flush.patch @@ -0,0 +1,30 @@ +diff -ru ecryptfs-utils-111.orig/src/libecryptfs/key_management.c ecryptfs-utils-111/src/libecryptfs/key_management.c +--- ecryptfs-utils-111.orig/src/libecryptfs/key_management.c 2015-12-21 22:38:59.000000000 +0200 ++++ ecryptfs-utils-111/src/libecryptfs/key_management.c 2017-01-31 11:11:55.190995428 +0200 +@@ -1245,6 +1245,7 @@ + if (prompt != NULL) { + printf("%s: ", prompt); + } ++ fflush(stdout); + ecryptfs_disable_echo(¤t_settings); + if (fgets(passphrase, + ECRYPTFS_MAX_PASSWORD_LENGTH+2, stdin) == NULL) { +diff -ru ecryptfs-utils-111.orig/src/utils/io.c ecryptfs-utils-111/src/utils/io.c +--- ecryptfs-utils-111.orig/src/utils/io.c 2015-12-21 22:38:59.000000000 +0200 ++++ ecryptfs-utils-111/src/utils/io.c 2017-01-31 11:11:34.127379788 +0200 +@@ -70,6 +70,7 @@ + int c; + + printf("%s: ", prompt); ++ fflush(stdout); + temp = malloc(length); + if (!temp) { + rc = -ENOMEM; +@@ -122,6 +123,7 @@ + int rc = 0; + int c; + ++ fflush(stdout); + if (echo == ECRYPTFS_ECHO_OFF) { + rc = disable_echo(&saved_settings); + if (rc) |