summaryrefslogtreecommitdiff
path: root/user
diff options
context:
space:
mode:
authorA. Wilcox <AWilcox@Wilcox-Tech.com>2020-01-22 19:52:23 +0000
committerA. Wilcox <AWilcox@Wilcox-Tech.com>2020-01-22 19:52:23 +0000
commitd64a2e33d6ed31aa61d77861e2d24b70a0b3f177 (patch)
treea6412e612d61f0656bdd990a41c209e73c3d2207 /user
parent65d8dceefe84e5bf7e0280162e74b4370e1282b5 (diff)
downloadpackages-d64a2e33d6ed31aa61d77861e2d24b70a0b3f177.tar.gz
packages-d64a2e33d6ed31aa61d77861e2d24b70a0b3f177.tar.bz2
packages-d64a2e33d6ed31aa61d77861e2d24b70a0b3f177.tar.xz
packages-d64a2e33d6ed31aa61d77861e2d24b70a0b3f177.zip
user/mdadm: Fix build on time64
Diffstat (limited to 'user')
-rw-r--r--user/mdadm/APKBUILD6
-rw-r--r--user/mdadm/time64.patch19
2 files changed, 23 insertions, 2 deletions
diff --git a/user/mdadm/APKBUILD b/user/mdadm/APKBUILD
index 40e626919..4025c9cc3 100644
--- a/user/mdadm/APKBUILD
+++ b/user/mdadm/APKBUILD
@@ -3,7 +3,7 @@
# Maintainer:
pkgname=mdadm
pkgver=4.1
-pkgrel=1
+pkgrel=2
pkgdesc="Tool for managing Linux soft RAID arrays"
url="http://neil.brown.name/blog/mdadm"
arch="all"
@@ -18,6 +18,7 @@ source="https://mirrors.kernel.org/pub/linux/utils/raid/$pkgname/$pkgname-$pkgve
$pkgname.confd
$pkgname-raid.initd
sysmacros.patch
+ time64.patch
"
build() {
@@ -52,4 +53,5 @@ sha512sums="f9bff760795ba7361f19fd1cbc02efedcdaa4b0125b99cf1369e78f30e5c12812675
ca5f4e3ff5b284102b44e818d11622e1889066e3d18edce2d62c1a44ee8f4cfdc0979121c0462a916c638423c5ebc706c46aa996a7c4f68e030589adc62803f4 mdadm.initd
7d45bf489ef93a4f217ffcf72311eb661b8de7fbf63a5344697252c0d3a684b0123ff60efa5f218da4eb4cda7c88d91c2ef3625d5e44a588e3e1210cb60b0ab9 mdadm.confd
37022593ba090eb0690669b99d6386152242c017c1e608cea7b5420b7a6f754b377e916e4f81e2abf9941e791db78b5820e63db0e706d5de8b35e796678e921c mdadm-raid.initd
-47564bba9d45dfb39d63df9e6cd96ad03b37b314e794af180911481feb4e038035aa1ea6d3de2061982f46b51d1a205168f98e6f0a092f55f6f8e760dbabdae6 sysmacros.patch"
+47564bba9d45dfb39d63df9e6cd96ad03b37b314e794af180911481feb4e038035aa1ea6d3de2061982f46b51d1a205168f98e6f0a092f55f6f8e760dbabdae6 sysmacros.patch
+53c2fe442e8657a7a5a011eab1cd1bfcca6c315ee42e4148a50e1314d238f957e7e722e1264c64c548d398a2c6b10600cccf45a4fb69351d3d9ad403f90c1fde time64.patch"
diff --git a/user/mdadm/time64.patch b/user/mdadm/time64.patch
new file mode 100644
index 000000000..fd05fcb2f
--- /dev/null
+++ b/user/mdadm/time64.patch
@@ -0,0 +1,19 @@
+--- mdadm-4.1/monitor.c.old 2018-10-01 18:26:06.000000000 +0000
++++ mdadm-4.1/monitor.c 2020-01-22 19:51:39.575877908 +0000
+@@ -20,6 +20,7 @@
+
+ #include "mdadm.h"
+ #include "mdmon.h"
++#include <inttypes.h>
+ #include <sys/syscall.h>
+ #include <sys/select.h>
+ #include <signal.h>
+@@ -447,7 +448,7 @@
+ }
+
+ gettimeofday(&tv, NULL);
+- dprintf("(%d): %ld.%06ld state:%s prev:%s action:%s prev: %s start:%llu\n",
++ dprintf("(%d): %"PRId64".%06"PRId64" state:%s prev:%s action:%s prev: %s start:%llu\n",
+ a->info.container_member,
+ tv.tv_sec, tv.tv_usec,
+ array_states[a->curr_state],