diff options
| author | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2020-01-31 13:18:43 +0000 |
|---|---|---|
| committer | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2020-01-31 13:18:43 +0000 |
| commit | 41e767490df726ff68e82922bb771b63e603cf5c (patch) | |
| tree | 4249be96143310949280297a5cd3749b84366bdd | |
| parent | a191c1df758a6ca180d421e74c765e119701e6da (diff) | |
| download | packages-41e767490df726ff68e82922bb771b63e603cf5c.tar.gz packages-41e767490df726ff68e82922bb771b63e603cf5c.tar.bz2 packages-41e767490df726ff68e82922bb771b63e603cf5c.tar.xz packages-41e767490df726ff68e82922bb771b63e603cf5c.zip | |
system/e2fsprogs: Fix e2fsck output on time64
| -rw-r--r-- | system/e2fsprogs/APKBUILD | 4 | ||||
| -rw-r--r-- | system/e2fsprogs/time64.patch | 19 |
2 files changed, 22 insertions, 1 deletions
diff --git a/system/e2fsprogs/APKBUILD b/system/e2fsprogs/APKBUILD index e52b4c9e2..c72ff8c63 100644 --- a/system/e2fsprogs/APKBUILD +++ b/system/e2fsprogs/APKBUILD @@ -13,6 +13,7 @@ makedepends="$depends_dev linux-headers" subpackages="$pkgname-lang $pkgname-dev $pkgname-doc libcom_err $pkgname-libs" source="https://www.kernel.org/pub/linux/kernel/people/tytso/$pkgname/v$pkgver/$pkgname-$pkgver.tar.xz header-fix.patch + time64.patch " # secfixes: @@ -59,4 +60,5 @@ libcom_err() { } sha512sums="d1a8611b525742387061f390fb24825dfa175997cc7db05decea913fcc7b97a95a3e787091f2920d4a7d4eb1d813568af734a1610229ead09bcbf9f3e262e4ce e2fsprogs-1.45.5.tar.xz -34ca45c64a132bb4b507cd4ffb763c6d1b7979eccfed20f63417e514871b47639d32f2a3ecff090713c21a0f02ac503d5093960c80401d64081c592d01af279d header-fix.patch" +34ca45c64a132bb4b507cd4ffb763c6d1b7979eccfed20f63417e514871b47639d32f2a3ecff090713c21a0f02ac503d5093960c80401d64081c592d01af279d header-fix.patch +5f8ff2f096da4b445edff72dfa03f27dd8bf5b6733e724205f5661e32fd0bae92849a1aa53e20c6b60c026dc5ed68567b7866fade1ecd0187718509f03fe9145 time64.patch" diff --git a/system/e2fsprogs/time64.patch b/system/e2fsprogs/time64.patch new file mode 100644 index 000000000..043b7edd8 --- /dev/null +++ b/system/e2fsprogs/time64.patch @@ -0,0 +1,19 @@ +--- e2fsprogs-1.45.5/e2fsck/unix.c.old 2020-01-06 23:10:17.000000000 +0000 ++++ e2fsprogs-1.45.5/e2fsck/unix.c 2020-01-31 13:04:00.316309301 +0000 +@@ -45,6 +45,7 @@ + #ifdef HAVE_DIRENT_H + #include <dirent.h> + #endif ++#include <inttypes.h> + #include <libgen.h> + + #include "e2p/e2p.h" +@@ -1438,7 +1439,7 @@ + + fputs("<?xml version=\"1.0\" encoding=\"utf-8\"?>\n", + ctx->problem_logf); +- fprintf(ctx->problem_logf, "<problem_log time=\"%lu\">\n", ++ fprintf(ctx->problem_logf, "<problem_log time=\"%"PRIu64"\">\n", + ctx->now); + fprintf(ctx->problem_logf, "<invocation prog=\"%s\"", + argv[0]); |