summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--zfsutils/debian/patches/series1
-rw-r--r--zfsutils/debian/patches/zpool-time.patch12
-rwxr-xr-xzfsutils/debian/rules2
3 files changed, 15 insertions, 0 deletions
diff --git a/zfsutils/debian/patches/series b/zfsutils/debian/patches/series
index 48a8ccc..b91b013 100644
--- a/zfsutils/debian/patches/series
+++ b/zfsutils/debian/patches/series
@@ -15,3 +15,4 @@ libdiskmgt-avoid-libadm.patch
libdiskmgt-NULL-0.patch
libdiskmgt-avoid-meta.h.patch
libdiskmgt-time.patch
+zpool-time.patch
diff --git a/zfsutils/debian/patches/zpool-time.patch b/zfsutils/debian/patches/zpool-time.patch
new file mode 100644
index 0000000..95cce4d
--- /dev/null
+++ b/zfsutils/debian/patches/zpool-time.patch
@@ -0,0 +1,12 @@
+Index: zfsutils/usr/src/cmd/stat/common/timestamp.c
+===================================================================
+--- zfsutils.orig/usr/src/cmd/stat/common/timestamp.c 2012-10-08 00:25:33.000000000 +0000
++++ zfsutils/usr/src/cmd/stat/common/timestamp.c 2012-11-12 11:04:29.221856294 +0000
+@@ -25,6 +25,7 @@
+
+ #include "statcommon.h"
+
++#include <time.h>
+ #include <langinfo.h>
+
+ /*
diff --git a/zfsutils/debian/rules b/zfsutils/debian/rules
index d11e294..6a16464 100755
--- a/zfsutils/debian/rules
+++ b/zfsutils/debian/rules
@@ -37,6 +37,8 @@ unpack-stamp:
usr/src/uts/common/fs/zfs \
usr/src/lib/libadm/common/rdwr_vtoc.c \
usr/src/lib/libadm/common/fulldevnm.c \
+ usr/src/cmd/stat/common/timestamp.c \
+ usr/src/cmd/stat/common/statcommon.h \
usr/src/common/list/list.c
# Buggy and unused:
echo > usr/src/Makefile.msg.targ